From 7f96f911c7fc825a070ebb1aa0c2e3e76cf3a9a8 Mon Sep 17 00:00:00 2001
From: BABA <38986298+BABA983@users.noreply.github.com>
Date: Mon, 26 Aug 2024 20:06:06 +0800
Subject: [PATCH 001/479] Resolve custom editor with canonical resource

---
 src/vs/workbench/api/browser/mainThreadCustomEditors.ts  | 4 +++-
 .../contrib/customEditor/browser/customEditors.ts        | 6 ++++--
 .../customEditor/common/customEditorModelManager.ts      | 9 +++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/api/browser/mainThreadCustomEditors.ts b/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
index 73c9a19d3d0..e9d0ca29eef 100644
--- a/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
@@ -44,6 +44,7 @@ import { ResourceWorkingCopy } from '../../services/workingCopy/common/resourceW
 import { IWorkingCopy, IWorkingCopyBackup, IWorkingCopySaveEvent, NO_TYPE_ID, WorkingCopyCapabilities } from '../../services/workingCopy/common/workingCopy.js';
 import { IWorkingCopyFileService, WorkingCopyFileEvent } from '../../services/workingCopy/common/workingCopyFileService.js';
 import { IWorkingCopyService } from '../../services/workingCopy/common/workingCopyService.js';
+import { IUriIdentityService } from '../../../platform/uriIdentity/common/uriIdentity.js';
 
 const enum CustomEditorModelType {
 	Custom,
@@ -73,6 +74,7 @@ export class MainThreadCustomEditors extends Disposable implements extHostProtoc
 		@IEditorService private readonly _editorService: IEditorService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IWebviewWorkbenchService private readonly _webviewWorkbenchService: IWebviewWorkbenchService,
+		@IUriIdentityService private readonly _uriIdentityService: IUriIdentityService,
 	) {
 		super();
 
@@ -197,7 +199,7 @@ export class MainThreadCustomEditors extends Disposable implements extHostProtoc
 				}
 
 				try {
-					await this._proxyCustomEditors.$resolveCustomEditor(resource, handle, viewType, {
+					await this._proxyCustomEditors.$resolveCustomEditor(this._uriIdentityService.asCanonicalUri(resource), handle, viewType, {
 						title: webviewInput.getTitle(),
 						contentOptions: webviewInput.webview.contentOptions,
 						options: webviewInput.webview.options,
diff --git a/src/vs/workbench/contrib/customEditor/browser/customEditors.ts b/src/vs/workbench/contrib/customEditor/browser/customEditors.ts
index 464f9a8cb19..d9bd443af2c 100644
--- a/src/vs/workbench/contrib/customEditor/browser/customEditors.ts
+++ b/src/vs/workbench/contrib/customEditor/browser/customEditors.ts
@@ -21,7 +21,7 @@ import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uri
 import { DEFAULT_EDITOR_ASSOCIATION, EditorExtensions, GroupIdentifier, IEditorFactoryRegistry, IResourceDiffEditorInput } from '../../../common/editor.js';
 import { DiffEditorInput } from '../../../common/editor/diffEditorInput.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
-import { CONTEXT_ACTIVE_CUSTOM_EDITOR_ID, CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE, CustomEditorCapabilities, CustomEditorInfo, CustomEditorInfoCollection, ICustomEditorService } from '../common/customEditor.js';
+import { CONTEXT_ACTIVE_CUSTOM_EDITOR_ID, CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE, CustomEditorCapabilities, CustomEditorInfo, CustomEditorInfoCollection, ICustomEditorModelManager, ICustomEditorService } from '../common/customEditor.js';
 import { CustomEditorModelManager } from '../common/customEditorModelManager.js';
 import { IEditorGroup, IEditorGroupContextKeyProvider, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
 import { IEditorResolverService, IEditorType, RegisteredEditorPriority } from '../../../services/editor/common/editorResolverService.js';
@@ -37,7 +37,7 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
 	private readonly _editorResolverDisposables = this._register(new DisposableStore());
 	private readonly _editorCapabilities = new Map<string, CustomEditorCapabilities>();
 
-	private readonly _models = new CustomEditorModelManager();
+	private readonly _models: ICustomEditorModelManager;
 
 	private readonly _onDidChangeEditorTypes = this._register(new Emitter<void>());
 	public readonly onDidChangeEditorTypes: Event<void> = this._onDidChangeEditorTypes.event;
@@ -55,6 +55,8 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
 	) {
 		super();
 
+		this._models = new CustomEditorModelManager(this.uriIdentityService);
+
 		this._contributedEditors = this._register(new ContributedCustomEditors(storageService));
 		// Register the contribution points only emitting one change from the resolver
 		this.editorResolverService.bufferChangeEvents(this.registerContributionPoints.bind(this));
diff --git a/src/vs/workbench/contrib/customEditor/common/customEditorModelManager.ts b/src/vs/workbench/contrib/customEditor/common/customEditorModelManager.ts
index 66d5b2b5989..7b5219d5e07 100644
--- a/src/vs/workbench/contrib/customEditor/common/customEditorModelManager.ts
+++ b/src/vs/workbench/contrib/customEditor/common/customEditorModelManager.ts
@@ -6,9 +6,17 @@
 import { createSingleCallFunction } from '../../../../base/common/functional.js';
 import { IReference } from '../../../../base/common/lifecycle.js';
 import { URI } from '../../../../base/common/uri.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { ICustomEditorModel, ICustomEditorModelManager } from './customEditor.js';
 
 export class CustomEditorModelManager implements ICustomEditorModelManager {
+	private readonly _uriIdentityService: IUriIdentityService;
+
+	constructor(
+		uriIdentityService: IUriIdentityService,
+	) {
+		this._uriIdentityService = uriIdentityService;
+	}
 
 	private readonly _references = new Map<string, {
 		readonly viewType: string;
@@ -76,6 +84,7 @@ export class CustomEditorModelManager implements ICustomEditorModelManager {
 	}
 
 	private key(resource: URI, viewType: string): string {
+		resource = this._uriIdentityService.asCanonicalUri(resource);
 		return `${resource.toString()}@@@${viewType}`;
 	}
 }

From 0b243279cc1ed6474b21c00746e6bb957aa90e91 Mon Sep 17 00:00:00 2001
From: notoriousmango <psm03120@gmail.com>
Date: Tue, 26 Nov 2024 19:53:31 +0900
Subject: [PATCH 002/479] open image

---
 .../markdown-language-features/package.json   | 15 ++++++++++++-
 .../package.nls.json                          |  1 +
 .../preview-src/index.ts                      |  6 ++++-
 .../src/commands/index.ts                     |  2 ++
 .../src/commands/openImage.ts                 | 22 +++++++++++++++++++
 .../src/preview/preview.ts                    | 13 +++++++++++
 .../types/previewMessaging.d.ts               |  7 ++++++
 7 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 extensions/markdown-language-features/src/commands/openImage.ts

diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index 3f1c3a5fd58..a06a7af2f92 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -125,6 +125,11 @@
         "title": "%markdown.copyImage.title%",
         "category": "Markdown"
       },
+      {
+        "command": "_markdown.openImage",
+        "title": "%markdown.openImage.title%",
+        "category": "Markdown"
+      },
       {
         "command": "markdown.showPreview",
         "title": "%markdown.preview.title%",
@@ -189,7 +194,11 @@
       "webview/context": [
         {
           "command": "_markdown.copyImage",
-          "when": "webviewId == 'markdown.preview' && webviewSection == 'image'"
+          "when": "webviewId == 'markdown.preview' && (webviewSection == 'image' || webviewSection == 'localImage')"
+        },
+        {
+          "command": "_markdown.openImage",
+          "when": "webviewId == 'markdown.preview' && webviewSection == 'localImage'"
         }
       ],
       "editor/title": [
@@ -244,6 +253,10 @@
         }
       ],
       "commandPalette": [
+        {
+          "command": "_markdown.openImage",
+          "when": "false"
+        },
         {
           "command": "_markdown.copyImage",
           "when": "false"
diff --git a/extensions/markdown-language-features/package.nls.json b/extensions/markdown-language-features/package.nls.json
index da567b46665..47f26b05581 100644
--- a/extensions/markdown-language-features/package.nls.json
+++ b/extensions/markdown-language-features/package.nls.json
@@ -2,6 +2,7 @@
 	"displayName": "Markdown Language Features",
 	"description": "Provides rich language support for Markdown.",
 	"markdown.copyImage.title": "Copy Image",
+	"markdown.openImage.title": "Open Image",
 	"markdown.preview.breaks.desc": "Sets how line-breaks are rendered in the Markdown preview. Setting it to `true` creates a `<br>` for newlines inside paragraphs.",
 	"markdown.preview.linkify": "Convert URL-like text to links in the Markdown preview.",
 	"markdown.preview.typographer": "Enable some language-neutral replacement and quotes beautification in the Markdown preview.",
diff --git a/extensions/markdown-language-features/preview-src/index.ts b/extensions/markdown-language-features/preview-src/index.ts
index 33c84e0a384..cd2221b140d 100644
--- a/extensions/markdown-language-features/preview-src/index.ts
+++ b/extensions/markdown-language-features/preview-src/index.ts
@@ -132,7 +132,11 @@ function addImageContexts() {
 	for (const img of images) {
 		img.id = 'image-' + idNumber;
 		idNumber += 1;
-		img.setAttribute('data-vscode-context', JSON.stringify({ webviewSection: 'image', id: img.id, 'preventDefaultContextMenuItems': true, resource: documentResource }));
+		const imageSource = img.src;
+		const imgSrcAttribute = img.getAttribute('src');
+		const isLocalFile = imageSource !== imgSrcAttribute;
+		const webviewSection = isLocalFile ? 'localImage' : 'image';
+		img.setAttribute('data-vscode-context', JSON.stringify({ webviewSection, id: img.id, 'preventDefaultContextMenuItems': true, resource: documentResource, imageSource }));
 	}
 }
 
diff --git a/extensions/markdown-language-features/src/commands/index.ts b/extensions/markdown-language-features/src/commands/index.ts
index e1a4f2b41ff..382b2a8b6d5 100644
--- a/extensions/markdown-language-features/src/commands/index.ts
+++ b/extensions/markdown-language-features/src/commands/index.ts
@@ -18,6 +18,7 @@ import { CopyImageCommand } from './copyImage';
 import { ShowPreviewSecuritySelectorCommand } from './showPreviewSecuritySelector';
 import { ShowSourceCommand } from './showSource';
 import { ToggleLockCommand } from './toggleLock';
+import { OpenImageCommand } from './openImage';
 
 export function registerMarkdownCommands(
 	commandManager: CommandManager,
@@ -28,6 +29,7 @@ export function registerMarkdownCommands(
 ): vscode.Disposable {
 	const previewSecuritySelector = new PreviewSecuritySelector(cspArbiter, previewManager);
 
+	commandManager.register(new OpenImageCommand(previewManager));
 	commandManager.register(new CopyImageCommand(previewManager));
 	commandManager.register(new ShowPreviewCommand(previewManager, telemetryReporter));
 	commandManager.register(new ShowPreviewToSideCommand(previewManager, telemetryReporter));
diff --git a/extensions/markdown-language-features/src/commands/openImage.ts b/extensions/markdown-language-features/src/commands/openImage.ts
new file mode 100644
index 00000000000..30026f7467d
--- /dev/null
+++ b/extensions/markdown-language-features/src/commands/openImage.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.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { Command } from '../commandManager';
+import { MarkdownPreviewManager } from '../preview/previewManager';
+
+export class OpenImageCommand implements Command {
+	public readonly id = '_markdown.openImage';
+
+	public constructor(
+		private readonly _webviewManager: MarkdownPreviewManager,
+	) { }
+
+	public execute(args: { resource: string, imageSource: string }) {
+		const source = vscode.Uri.parse(args.resource);
+		const { fsPath } = vscode.Uri.parse(args.imageSource);
+		this._webviewManager.findPreview(source)?.openImage(fsPath);
+	}
+}
diff --git a/extensions/markdown-language-features/src/preview/preview.ts b/extensions/markdown-language-features/src/preview/preview.ts
index 7ccbc625b47..9e4ae20e064 100644
--- a/extensions/markdown-language-features/src/preview/preview.ts
+++ b/extensions/markdown-language-features/src/preview/preview.ts
@@ -443,6 +443,7 @@ export interface IManagedMarkdownPreview {
 	readonly onDidChangeViewState: vscode.Event<vscode.WebviewPanelOnDidChangeViewStateEvent>;
 
 	copyImage(id: string): void;
+	openImage(imagePath: string): void;
 	dispose(): void;
 	refresh(): void;
 	updateConfiguration(): void;
@@ -524,6 +525,12 @@ export class StaticMarkdownPreview extends Disposable implements IManagedMarkdow
 		});
 	}
 
+	openImage(imagePath: string): void {
+		const uri = vscode.Uri.file(imagePath);
+		this._webviewPanel.reveal();
+		vscode.commands.executeCommand('vscode.open', uri);
+	}
+
 	private readonly _onDispose = this._register(new vscode.EventEmitter<void>());
 	public readonly onDispose = this._onDispose.event;
 
@@ -679,6 +686,12 @@ export class DynamicMarkdownPreview extends Disposable implements IManagedMarkdo
 		});
 	}
 
+	openImage(imagePath: string): void {
+		const uri = vscode.Uri.file(imagePath);
+		this._webviewPanel.reveal();
+		vscode.commands.executeCommand('vscode.open', uri);
+	}
+
 	private readonly _onDisposeEmitter = this._register(new vscode.EventEmitter<void>());
 	public readonly onDispose = this._onDisposeEmitter.event;
 
diff --git a/extensions/markdown-language-features/types/previewMessaging.d.ts b/extensions/markdown-language-features/types/previewMessaging.d.ts
index 05d10af6597..686b21bf1a9 100644
--- a/extensions/markdown-language-features/types/previewMessaging.d.ts
+++ b/extensions/markdown-language-features/types/previewMessaging.d.ts
@@ -71,10 +71,17 @@ export namespace ToWebviewMessage {
 		readonly id: string;
 	}
 
+	export interface OpenImageContent extends BaseMessage {
+		readonly type: 'openImage';
+		readonly source: string;
+		readonly imageSource: string;
+	}
+
 	export type Type =
 		| OnDidChangeTextEditorSelection
 		| UpdateView
 		| UpdateContent
 		| CopyImageContent
+		| OpenImageContent
 		;
 }

From 0715a50f6370fb99110104efa067b73938d1a3f1 Mon Sep 17 00:00:00 2001
From: notoriousmango <psm03120@gmail.com>
Date: Wed, 27 Nov 2024 17:03:33 +0900
Subject: [PATCH 003/479] move openImage logic to command

---
 .../src/commands/openImage.ts                       |  6 +++---
 .../src/preview/preview.ts                          | 13 -------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/extensions/markdown-language-features/src/commands/openImage.ts b/extensions/markdown-language-features/src/commands/openImage.ts
index 30026f7467d..7a0562db446 100644
--- a/extensions/markdown-language-features/src/commands/openImage.ts
+++ b/extensions/markdown-language-features/src/commands/openImage.ts
@@ -14,9 +14,9 @@ export class OpenImageCommand implements Command {
 		private readonly _webviewManager: MarkdownPreviewManager,
 	) { }
 
-	public execute(args: { resource: string, imageSource: string }) {
+	public execute(args: { resource: string; imageSource: string }) {
 		const source = vscode.Uri.parse(args.resource);
-		const { fsPath } = vscode.Uri.parse(args.imageSource);
-		this._webviewManager.findPreview(source)?.openImage(fsPath);
+		const imageSource = vscode.Uri.file(vscode.Uri.parse(args.imageSource).path);
+		vscode.commands.executeCommand('vscode.open', imageSource, this._webviewManager.findPreview(source));
 	}
 }
diff --git a/extensions/markdown-language-features/src/preview/preview.ts b/extensions/markdown-language-features/src/preview/preview.ts
index 9e4ae20e064..7ccbc625b47 100644
--- a/extensions/markdown-language-features/src/preview/preview.ts
+++ b/extensions/markdown-language-features/src/preview/preview.ts
@@ -443,7 +443,6 @@ export interface IManagedMarkdownPreview {
 	readonly onDidChangeViewState: vscode.Event<vscode.WebviewPanelOnDidChangeViewStateEvent>;
 
 	copyImage(id: string): void;
-	openImage(imagePath: string): void;
 	dispose(): void;
 	refresh(): void;
 	updateConfiguration(): void;
@@ -525,12 +524,6 @@ export class StaticMarkdownPreview extends Disposable implements IManagedMarkdow
 		});
 	}
 
-	openImage(imagePath: string): void {
-		const uri = vscode.Uri.file(imagePath);
-		this._webviewPanel.reveal();
-		vscode.commands.executeCommand('vscode.open', uri);
-	}
-
 	private readonly _onDispose = this._register(new vscode.EventEmitter<void>());
 	public readonly onDispose = this._onDispose.event;
 
@@ -686,12 +679,6 @@ export class DynamicMarkdownPreview extends Disposable implements IManagedMarkdo
 		});
 	}
 
-	openImage(imagePath: string): void {
-		const uri = vscode.Uri.file(imagePath);
-		this._webviewPanel.reveal();
-		vscode.commands.executeCommand('vscode.open', uri);
-	}
-
 	private readonly _onDisposeEmitter = this._register(new vscode.EventEmitter<void>());
 	public readonly onDispose = this._onDisposeEmitter.event;
 

From ea6463e38c6050c5b8dcf3bd9543483435cd8fd4 Mon Sep 17 00:00:00 2001
From: notoriousmango <psm03120@gmail.com>
Date: Wed, 27 Nov 2024 17:25:41 +0900
Subject: [PATCH 004/479] rename

---
 .../markdown-language-features/src/commands/openImage.ts      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/markdown-language-features/src/commands/openImage.ts b/extensions/markdown-language-features/src/commands/openImage.ts
index 7a0562db446..53f615148f3 100644
--- a/extensions/markdown-language-features/src/commands/openImage.ts
+++ b/extensions/markdown-language-features/src/commands/openImage.ts
@@ -16,7 +16,7 @@ export class OpenImageCommand implements Command {
 
 	public execute(args: { resource: string; imageSource: string }) {
 		const source = vscode.Uri.parse(args.resource);
-		const imageSource = vscode.Uri.file(vscode.Uri.parse(args.imageSource).path);
-		vscode.commands.executeCommand('vscode.open', imageSource, this._webviewManager.findPreview(source));
+		const imageSourceUri = vscode.Uri.file(vscode.Uri.parse(args.imageSource).path);
+		vscode.commands.executeCommand('vscode.open', imageSourceUri, this._webviewManager.findPreview(source));
 	}
 }

From 4685d75964105e78f64ad84a2abf898c7c91e8d8 Mon Sep 17 00:00:00 2001
From: Derek Yang <dereky@umich.edu>
Date: Wed, 4 Dec 2024 23:48:25 -0500
Subject: [PATCH 005/479] Fix CSS errors when using HTML escaped quotes

---
 .../server/src/modes/embeddedSupport.ts               | 11 +++++++++++
 .../server/src/test/embedded.test.ts                  |  7 +++++++
 2 files changed, 18 insertions(+)

diff --git a/extensions/html-language-features/server/src/modes/embeddedSupport.ts b/extensions/html-language-features/server/src/modes/embeddedSupport.ts
index 26ef68439da..a6874e043b4 100644
--- a/extensions/html-language-features/server/src/modes/embeddedSupport.ts
+++ b/extensions/html-language-features/server/src/modes/embeddedSupport.ts
@@ -198,6 +198,17 @@ function updateContent(c: EmbeddedRegion, content: string): string {
 	if (!c.attributeValue && c.languageId === 'javascript') {
 		return content.replace(`<!--`, `/* `).replace(`-->`, ` */`);
 	}
+	if (c.languageId === 'css') {
+		const quoteEscape = /(&quot;|&#34;)/g;
+		return content.replace(quoteEscape, (match, _, offset) => {
+			const spaces = ' '.repeat(match.length - 1);
+			const afterChar = content[offset + match.length];
+			if (!afterChar || afterChar.includes(' ')) {
+				return `${spaces}"`;
+			}
+			return `"${spaces}`;
+		});
+	}
 	return content;
 }
 
diff --git a/extensions/html-language-features/server/src/test/embedded.test.ts b/extensions/html-language-features/server/src/test/embedded.test.ts
index 87698f39718..c5b7bca17ea 100644
--- a/extensions/html-language-features/server/src/test/embedded.test.ts
+++ b/extensions/html-language-features/server/src/test/embedded.test.ts
@@ -128,4 +128,11 @@ suite('HTML Embedded Support', () => {
 		assertEmbeddedLanguageContent('<div onKeyUp=return\n/><script>foo();</script>', 'javascript', '             return;\n          foo();         ');
 	});
 
+	test('Script content - HTML escape characters', function (): any {
+		assertEmbeddedLanguageContent('<div style="font-family: &quot;Arial&quot;"></div>', 'css', '         __{font-family: "     Arial     "}       ');
+		assertEmbeddedLanguageContent('<div style="font-family: &#34;Arial&#34;"></div>', 'css', '         __{font-family: "    Arial    "}       ');
+		assertEmbeddedLanguageContent('<div style="font-family: &quot;Arial&#34;"></div>', 'css', '         __{font-family: "     Arial    "}       ');
+		assertEmbeddedLanguageContent('<div style="font-family:&quot; Arial &quot; "></div>', 'css', '         __{font-family:     " Arial      " }       ');
+	});
+
 });

From 77f0483dcd560b2f905e1bf192eef0865a731562 Mon Sep 17 00:00:00 2001
From: Derek Yang <dereky@umich.edu>
Date: Thu, 5 Dec 2024 14:22:54 -0500
Subject: [PATCH 006/479] Add additional test case containing no escaped quotes

---
 .../html-language-features/server/src/test/embedded.test.ts      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extensions/html-language-features/server/src/test/embedded.test.ts b/extensions/html-language-features/server/src/test/embedded.test.ts
index c5b7bca17ea..abba5b5858e 100644
--- a/extensions/html-language-features/server/src/test/embedded.test.ts
+++ b/extensions/html-language-features/server/src/test/embedded.test.ts
@@ -133,6 +133,7 @@ suite('HTML Embedded Support', () => {
 		assertEmbeddedLanguageContent('<div style="font-family: &#34;Arial&#34;"></div>', 'css', '         __{font-family: "    Arial    "}       ');
 		assertEmbeddedLanguageContent('<div style="font-family: &quot;Arial&#34;"></div>', 'css', '         __{font-family: "     Arial    "}       ');
 		assertEmbeddedLanguageContent('<div style="font-family:&quot; Arial &quot; "></div>', 'css', '         __{font-family:     " Arial      " }       ');
+		assertEmbeddedLanguageContent('<div style="font-family: Arial"></div>', 'css', '         __{font-family: Arial}       ');
 	});
 
 });

From c43ed48f5ffd68476d3c1ee0849a20032de4a558 Mon Sep 17 00:00:00 2001
From: Dirk Baeumer <dirkb@microsoft.com>
Date: Fri, 6 Dec 2024 09:14:52 +0100
Subject: [PATCH 007/479] Bump version number to 1.97

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b4c9991af6b..a16b3ecf06f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "code-oss-dev",
-  "version": "1.96.0",
+  "version": "1.97.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "code-oss-dev",
-      "version": "1.96.0",
+      "version": "1.97.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index f7a7f68cde7..f283587b8c5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "code-oss-dev",
-  "version": "1.96.0",
+  "version": "1.97.0",
   "distro": "c883c91dadf5f063b26c86ffe01851acee3747c6",
   "author": {
     "name": "Microsoft Corporation"

From 5addad41b0d7cb991e43a51341637fd8e19049b7 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Fri, 6 Dec 2024 09:25:12 +0100
Subject: [PATCH 008/479] Git/SCM - fix GC warnings (#235464)

---
 extensions/git/src/repository.ts              |  2 +-
 src/vs/workbench/contrib/scm/browser/menus.ts | 27 ++++++++++---------
 .../contrib/scm/browser/scmHistoryViewPane.ts |  2 +-
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 1c2e6ca45c2..ef7997c7542 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -986,7 +986,7 @@ export class Repository implements Disposable {
 
 		const actionButton = new ActionButton(this, this.commitCommandCenter, this.logger);
 		this.disposables.push(actionButton);
-		actionButton.onDidChange(() => this._sourceControl.actionButton = actionButton.button);
+		actionButton.onDidChange(() => this._sourceControl.actionButton = actionButton.button, this, this.disposables);
 		this._sourceControl.actionButton = actionButton.button;
 
 		const progressManager = new ProgressManager(this);
diff --git a/src/vs/workbench/contrib/scm/browser/menus.ts b/src/vs/workbench/contrib/scm/browser/menus.ts
index 486f978b768..f14d8ea79f6 100644
--- a/src/vs/workbench/contrib/scm/browser/menus.ts
+++ b/src/vs/workbench/contrib/scm/browser/menus.ts
@@ -20,18 +20,6 @@ function actionEquals(a: IAction, b: IAction): boolean {
 	return a.id === b.id;
 }
 
-const repositoryMenuDisposables = new DisposableStore();
-
-MenuRegistry.onDidChangeMenu(e => {
-	if (e.has(MenuId.SCMTitle)) {
-		repositoryMenuDisposables.clear();
-
-		for (const menuItem of MenuRegistry.getMenuItems(MenuId.SCMTitle)) {
-			repositoryMenuDisposables.add(MenuRegistry.appendMenuItem(MenuId.SCMSourceControlInline, menuItem));
-		}
-	}
-});
-
 export class SCMTitleMenu implements IDisposable {
 
 	private _actions: IAction[] = [];
@@ -244,6 +232,7 @@ export class SCMMenus implements ISCMMenus, IDisposable {
 
 	readonly titleMenu: SCMTitleMenu;
 	private readonly disposables = new DisposableStore();
+	private readonly repositoryMenuDisposables = new DisposableStore();
 	private readonly menus = new Map<ISCMProvider, { menus: SCMRepositoryMenus; dispose: () => void }>();
 
 	constructor(
@@ -252,6 +241,20 @@ export class SCMMenus implements ISCMMenus, IDisposable {
 	) {
 		this.titleMenu = instantiationService.createInstance(SCMTitleMenu);
 		scmService.onDidRemoveRepository(this.onDidRemoveRepository, this, this.disposables);
+
+		// Duplicate the `SCMTitle` menu items to the `SCMSourceControlInline` menu. We do this
+		// so that menu items can be independently hidden/shown in the "Source Control" and the
+		// "Source Control Repositories" views.
+		MenuRegistry.onDidChangeMenu(e => {
+			if (!e.has(MenuId.SCMTitle)) {
+				return;
+			}
+
+			this.repositoryMenuDisposables.clear();
+			for (const menuItem of MenuRegistry.getMenuItems(MenuId.SCMTitle)) {
+				this.repositoryMenuDisposables.add(MenuRegistry.appendMenuItem(MenuId.SCMSourceControlInline, menuItem));
+			}
+		}, this, this.disposables);
 	}
 
 	private onDidRemoveRepository(repository: ISCMRepository): void {
diff --git a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
index d6057c14ecb..af17ed451bd 100644
--- a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts
@@ -1372,7 +1372,7 @@ export class SCMHistoryViewPane extends ViewPane {
 				}
 				isFirstRun = false;
 			}));
-		});
+		}, this, this._store);
 	}
 
 	protected override layoutBody(height: number, width: number): void {

From 266cc016110147732915cfce2387e4d7aaa51175 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Fri, 6 Dec 2024 10:33:32 +0100
Subject: [PATCH 009/479] Rerender hover on modifier key press - updates hover
 on hover definition preview request (#235406)

rerender hover on modifier key press - updates hover on definition hover preview
---
 .../contrib/hover/browser/contentHoverController.ts    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/vs/editor/contrib/hover/browser/contentHoverController.ts b/src/vs/editor/contrib/hover/browser/contentHoverController.ts
index ca0677d3206..9b8252eec14 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverController.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverController.ts
@@ -244,10 +244,16 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 			return;
 		}
 		const isPotentialKeyboardShortcut = this._isPotentialKeyboardShortcut(e);
-		const isModifierKeyPressed = this._isModifierKeyPressed(e);
-		if (isPotentialKeyboardShortcut || isModifierKeyPressed) {
+		if (isPotentialKeyboardShortcut) {
 			return;
 		}
+		const isModifierKeyPressed = this._isModifierKeyPressed(e);
+		if (isModifierKeyPressed && this._mouseMoveEvent) {
+			const contentWidget: ContentHoverWidgetWrapper = this._getOrCreateContentWidget();
+			if (contentWidget.showsOrWillShow(this._mouseMoveEvent)) {
+				return;
+			}
+		}
 		this.hideContentHover();
 	}
 

From c83840631aa2b50312b9d4207c6fa6519d62ade2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Fri, 6 Dec 2024 10:34:30 +0100
Subject: [PATCH 010/479] update codicons (#235469)

---
 .../browser/ui/codicons/codicon/codicon.ttf   | Bin 82204 -> 82588 bytes
 src/vs/base/common/codiconsLibrary.ts         |   1 +
 2 files changed, 1 insertion(+)

diff --git a/src/vs/base/browser/ui/codicons/codicon/codicon.ttf b/src/vs/base/browser/ui/codicons/codicon/codicon.ttf
index 95c8a7a04c1c7b285ddd1e6ed88b0263c7333725..01f7648ad16f1fe1a31451e092708832703edd89 100644
GIT binary patch
delta 7512
zcmXZh31C#!-39P-lFUr@1d>ch2q7dP30r_9B#^LgA_%ezVV4lLu!YDjgNT$;T!Yq9
ziWIG)B1N$-lp^j+aYLk5E!Eaq`rgzcrE0Aoe&_NR_`Nf4mN$3qeed3PFMGEJ_TCb>
zqbPDMz+C|5&R;ff<**A^Jq08T2HFo^*tEW}rq7rgfwJzv<&PIFnAb4vp8b>b-cO`@
zk)DXDkJUpQm*PdsTGkb>{r+nmFA9VvH?5dI@8Gu2&*-HsK<uGq^VY45`HDB`^>%uH
z!SZ>_7PNky`|KF7G+s}BvvS4imfhV3ZU(#P^_;zT9xqCHAJk)MTRHusJEOh%errD0
zC%lc*db%s#KDwU|^61dmlwhB#D{n<yIbyFo>aI)#0#%5Mi_yE=B3;kKcssmZ-mBj0
zeu6(PTGzTQp<m>XUX8`qoWOB-mIJw$-FO2txe?d$4KCy=uEag4W;K3-_Zf#F+=CmD
z&6lwsw{kR#n9KJ3HQvUfc%BdON4SIcatm+gt-OhM@Ta_sKfz1f&fSPX90Dp=5|WXE
zRHPxjwSQt#(p=2L^_Y)FENq>a*e^02^_YQ~Sc+v>fo811I;_VAY{VvPMg&`M6Sm@J
z+=A`cfgfWRZo{3}jk|F#euh2xIricg*oXV@OWcnK@GCrshj0*&;4vJ=ul1fIcpOLZ
zJDk7^cm;3Z_jn8M;9b@1d-!7nAL1i?j6dNV{;c-?55B>F@g2S=NX9V85R;k0RAw-X
zVP-Rj9hlEfEM#Yvu$&dFWEK0chJ9JfI`-!P4&^Wo=LnAERUE~uIfi3-Eyr^rCvgg=
z@;XlAbk5~GMy}_4Hn5RP*~DdB!DhB_9oKUMH}OVp<;~p2TeyQi=1%V7ZM>7Myqo)Y
z9}n_jKFY^<m`C_HpWsnG$!B<szvXd0$CG@XFY+b+o~QUG-{RYRk7w{L{)hj=Wi(&`
zT2PA{B3Q(Guo`Qz3Ug43GN$1!{1m77tWK_WSd2?7=1l&Kz3?2Da52lcnY}p}v-tvs
zGaapXl>ruT2)eQ-OHqTq7{j0QcYK<^;Zyhx>p6=Zv6AobG~eYfd4Tux0scxS^nOIz
z;5v520ltpq_yhimzu;3$!~~2-7Cyj}cnY)7#5s5vOAy9uc%3~^fKH4>CQmRA|Hfzd
z8$6uHKM=(~@h^Odi}*V}=Pz)EgK#^72q7K`xBwqtAP;XciSejIE^;t#5uU~~T!67$
z#I-ofwtR$#Fp8^jh_9eGyR#kJ@ET0TSDef>_z|`-!sY4-j^Vd_jjv(^XLAOo;Up88
zfR}YmXW&Kb#7InGKTN`8JfRCa*t#m^a_dP3T34h76Owfy>W?n+&8gWD^(5Z)h7*+Y
zjV@An4F=CD7Z?syHX80#E;Q_>Tx58Ia<O5ia*5HU4sWS}dPJ`Yh`0^k(9SYLcfjR_
ztCTB@dIxwvP(K0By(XwuHXHRF@Kzi3BJf%a-dDOpiFy`zYYc|y8u!*}N7UWGTW8eq
zz*}#St=wSL8NqYELewq6+hlO7(tSoaTDjS<NEtEARc<kCuT&rH-J}=Qr@`B5)VsmE
z*{Gj`x6R;r<t>H}DYqN-g7AKTJM?&m;l0Y8hVDyUZ3u5y?lN?Rp5>kpH)4410792{
z8vayym!Zp6qplX-ZiAPUcN@Bbx#kh>Zv7(txdC&v=ZY-qe&HQ7>WJYzY}6&gd&H=7
zhUb2|VBt}(%?zrahIh)S$A<T&QQr;kEu&r>o~u1ke-7^*qn;h!yGDIHywgU#J-qjf
z`h9pBLLH3&@Z9+#8Vlf^btkDd8W!OF!DxVh_kqz+0q>7Sg9f}0jZQ6i9~o>>erz<P
z!26TY-~#WQ(J%w=&qf0dyibgV9-XA0YDY8*!TXERcm(gSMk5ov&y2<>cz-h*t>Arb
zG;YEByU_>+@4V4i2Jat6BNjZ*Xncd`JNhLW>fl9<20eKHG#dWkePJ{Z!uyxekO=RB
z(clR0OQT^D-bJGU6W+g#hE8~wj0RD7|1la)bp?H;jc8<r_qEX&3-24F(H7o+jmBMg
z-x`g;@cw76{Ic)#STrib`#+=c8Qx{1ks99jMq{?RY!lJ&4WC8>Is6!-Asv3K(clh0
z&S;p2A21s5;RlU|e)u7yn*jLn#@%T72}U;t@RJO5Uiryte{G<f1^6jOw+--9jcy>|
zry1Q!z)v^2ses?c==K7BTZ2!O8Ai7p@H35WKHz5=-G;yq8+@ns_tgtJQ1$rjj4A|v
zj-jiaTtino?G4>8&ogwtyn~^Bke_epepE+8_oE67T_HP3L>s!26&kvd6&bpM6&t$3
zbT)KfRAT79sMOFMu*}dMuZyAkTvtQ)xo(E#y8iv{+7VVLdl*(K^`gTnWlzIC%3g*w
z%HD>3mG1MxTBZBEuukbdFYK>$pBD~LR$mbThw6blm~fcV9ZWb}+0Sr<(j8bhQt1vX
zyh`Z~EF7hD2Nqtf9B4R3ImmFVa<JjG$|0`(hv)<2m98MdiAq-x;UuLih;WM16+}2y
z=?WsePU#9FoThXI5l&aSf(Yj-M;p#lx<ZNWQ}y5)!}&^ALSch)oMEHV6;QZTIl-_=
z=?W`crgViBu24=kY*xC03tN<~;KFrE6+GfLT(2Eha^VK0E4gr!vfl7U<qX5E%9(~Y
zD`y#QQ_eQLMLEZChtk!6@W)D51Hzr|`gb)TZW8Ic8W7&5bTuHnQ@OyfRq1L&c(-z)
z;XdUe!~2wr4G$`p7(T3YwI_U3>1wY@?a#;bz*V2{uyVQK5v8k2;p57chEFJ086H)-
zDi%JeTy6M_(p9(cnDPe0-zwJ_9#=-zY9oA3>DokiQt6sR_`K3JiSR|`M#Gnsu6cyN
zSGwjAo>Fc$d{e0(=<qG&7Q?rdH<<|E(*xI@qKOQA*Pfy&4Sd(0qR9<>*Pfzj4*cy#
z6CU_KGMf6p-(fTfg74Z{G#!G!(`aG@|0f2nMs{JC+W@ZZZZ(=V!FTO1nn1z7-DoNW
z{|=)`6?}JI2<Eh|$t&ueragB?h$dR_-BCnSF8DuytDAcbpKX03uPEZqlf4F)l)o@6
zR=RUaI8%9_;m?%&jV5mJe`(-a?|`8@-|jbb$A7@EO!+HA*Fq1vt4|yD*3LtQgO%>2
z70gyXY&0i?|A@hGr8|K|^F;WEjAo4RA2WDWdDt+Z{Iy|$@`%yQvIzd;+7YdVz;`FM
zu&45<VQFh>e$U9ywdYQ0;qR2s8a}N&X80SWJH18IQ~1XX-1F`;!g}Qi!&ypKZ=z`|
z{F4SNmF}z;zN6GnkGKs_Yv)D7ca<+0x<+`}&^5v<hOQA@JqTSRyk_Vc;dMjRzyF5e
zex<vV1Z|Y=bP-&q8NBbVCDEK3{#yp_%icDcXTx`;70tNey8?>l-tb+)MYC}D?s5~&
z$KkunP4H>!o{n{q54888(fl0#M@BPs_#Ye1+2Q}mph<boaE|iNMl*W&pBT;U;eTp0
z%ZKm2RW#p+?@A+ZCI1Wvx($1@))y2pwsmtscEmN5XS5&y-#1zsfFCtlB!K@<qvZnl
zUl=VM!2g%g5(4}SMvDpXzcgA_fPc|wfdRfdu4t(NzAnakx6!Ht{QnrOKfwRWXe9#v
z*9M;}zcE^!fd5|u)vf=n(TWB9{~6rgy1Y}})hbey#@!A_V~o}^5RElj)j%}PK&>Cu
zrQ|S488nP<z1XQPqAMYqY@n+onqssBf@rG2SY?{wB4xVK0tupR49+Us8oJCdd_<XP
zw2*>mmcb~cS~lV~T3taj+rYi4ozaR5qB#b=mAQu9mF<mNQ;oWxD|ChFV6;YqXui>E
z4WhbK9ekxMFr2J$JlaV+qQx9U3yqd_5G^v;rYts$C_5W1`XE|j+(K}))Mz0H(J}+|
zDbX&5uPM74EfXQy&1q1HM(Bb2MZ($29!9H3h?X0zCn4I?;H0vbVWQI2jA*q9(F%i?
zm6e8FT2qU&r@W}WYNORCL~D%Jr4a3FFh$wVXsrs-TBB7fMC**!ukfW#KL<~=t}K2u
zl9%;NcuDxS@Mqbn*}2)fvOj4zy4@o=$vH!F8gn-1+?KO1=aHNfIj3?i<Sx(Mk$WKb
zLi@SxceUTw{)4>2yoq^DdAswD<h_#jO^4hL13NT#*qNW0Uz<NS|8V}P{EHpicC7BW
zvg59fhdZ7tNH6GLu&>}`!TC;^o%(lb>2#`aT;Z0&J(0rGMZJoei_R8T6fY@0-nqDQ
zQ|Bi-Uo4qcvZ3T)$+42NrS+xjN_UqYDZO0QziegMzAouqws!fp>&UJvyI$xP?zXpk
zukMF>RQ1^0<Aw66<@c1I>KW5>aL>Q=n%Qeh@7&&dd!MOjThUmtq2gr4XO-!d<15!x
zo~eqfYOFd?^-iB~pEZ3V5B7Pfx^4By>Lt}5)RfmOso7I=zVH6Nr~CEox4++|+UnYd
z+D)~)YoDn7u=a9YLEXT*nROfL?y5Ud_gdZOb(i~x`;YIxtN*zH>jpeC;NyV<2TmQ>
zJScup!Jxr|ng^X7bZPL&!OesB5B_{e@{sOBh7XxNWap5lhI~9UdFb|``-grttbEwI
z$gl&$&J7O_pE`W!@DE2MkEk8dGUBcgXGdHfxozZ$tNLEGbyVZ1eWTvFy87z+s}Ej%
ze)Q<k2S%S8Q#@wfm<!hozviB64qfx{*ut^(W1GkB8GCHp&T-zg`PUvC9~{4E{GRdN
zgz$t-6An!{J+bS=krO9RN}bd)>E6k0C*L;t%#`6%HcfeQYVy=b?bIbxzrAkqbw{Qp
zPOF$Ub=rn$r>9+<9-h8r`YZLQA6(y9zo-7pjQkm!W*nYzYG(Y*-7_!GS~u(5?18hN
zoE@E0GH1)2OLJ@IJ~*#@-lgl?Uf*ke{`~Rt8|Uwuf3_j7p?|~jh9?#bUC^*#--2_E
zF^%Po;~Tdx%v(5q;iiQzEZVT>fyKp<#d8<GvH0SW?n@3VIk&WMX~WX}OFwU_XxiCy
zxapf^cPu-<;{2+8tKL}kMRR@g*5<>_uQXp;J#ux+>Q`DCTK2UZZaLBNR?E2?2Hvpw
zh7)Vz*Nj_pV$J!r)oYKho3?Jpx)0YUuOGF3-}+BBbl-5zh7%iOHV)soZ{vxL-)$<}
zv~|<|8yjvsvpKY8^B0kd$nv9kWe=A{f|`$iuVvy4{U1lJZd6uiF=`i3Q&KgM75U6e
zWl>>iNlj+BqIv+UN(zHn*>3ChYf4H>N~^2N8470g&ddsDhqHsBlAbII1&a!MGIZsc
zaJD|~{tjSG^_9OReX3kmR_OiVNOm|YGZgMf_m)&<hAVa4s!(QXOksIUO`odjig4Eb
ziJ66EoiZ~!W#(iicaKjDg%aaCB&H<lUrsO(N(^RH#s^{(;`DSNHV_v`>rj|Rw#mrL
zjSCeQb!e9rB;(=}lLE0!3nh2z(Jm_^H93^V*g(wI2m|pI8ELthZDSK+VgrFdTns}=
zq0Vhe3p1~LYg$5|KqwUG>^5VA?mH7V$1x@*zAQ745K0XM!->JzxKL~$7|ci~Cntmw
znUs){n4X#x6H^qIn2;2k8VrT<(n5jUP$)SNO3RB622+DIsiA~GX4gpDa5%6bHV_-5
zZ;#E<JA(*(|Gj$0GA%jOsjr=kx%yuWWQ4P8s$Gq#x>W0ZRPDhl6&@@s4P{m4Q#-1{
zo-yUBO0`sVO=ZmwH66NAv8q>nzOrH<_0d9Ab#}O>syb2;?!e4oVM(9t!V*{8nZec=
z#<nRbN>7PRPGwrJv{(iTvr<Zu$;5Uk!KC)NDapaMp-@b0TB@orCB3L5HojL{a@UNQ
z*qrPR*`?udX?bZlDZVm3IbQ!#<CBuolaiRE!?ul!%V?9ImJ}ZsjL*yrq-Up$iBIkj
z2*ivJCdRc%i%SXy<5GeNs?6-PoKSjlMt+-&xVX;ofy~m>%#7?0+vw0G+2PV2nW+nd
z@$tc~ZZp&!K3#VTM=K|8f1mF^eXNuRRi9^{zP=k@h)vI$zhdR$rWGwc*3N5QzIge<
Lr}KOAa-07LFYD&z

delta 7080
zcmXBZ349dQ9S88=FUN*J4swu9LI@#&B*qv*2m!(k0mC8peTFMQxFJ9|WDyY+EdoKL
zc$6wt1dAxPAhk#pDOyCdXj`>Nt+jM!OBE5RQtj{gm(O>8JDc6vH}B27H}Cn_J<*SC
zjNX<P>Id*a05vlgPG3?xt^e~tY<Hk#*_;KdYbP(d82}2ifd6fpJA3-9@w@hp(q}J8
z#az7+F)`u?y?#a7&RtmFkT>Xu8#-PXh#9_M@yzLyPGvRdPfLKv0}H1&EQ$D<cj@ox
z`h3o!=?iB!ev|p~V6fd@y?JBF;^p;cqN}sPg55yIrtPof#a{sRSvlHl<0sq09eANJ
zo2z5r#Cv+X2yY(Q%cuF&l_(w=6croYs_e&)BdQpYKfZF=6o@WER1_MQ#0FW}cwcPS
z&;flr64yDLci<R%@KF}Ao+(^|VSJOdT*Ae87!~Y<Ex5o)^x;pj4ndy6&+s4zGM5?5
z<RP5H0i09`Hsc{a!VtIeL2lqf+{NwOg4cNu8xeshM5`3d5QlgqAQ8<QdpB*?Y#M4X
z9WyW+wT)w&b`6ck1Wd#v)L{V@VJTK%6&kP_Yp@n~Vm(6GfV;2}n{W^A#eH}HKfyLM
zVkaKKZu}H`@F*U`<9Gsl@g$zYKKuet;~6}Q=kQA$(r2E>VZ5lu`YnEkH}EFj!rOQU
z=kcy;^Uopt1s~!ge2l;1B0j-2e1jYK4&UPkf@CxUY{odoGnuJu!8E2bi>;W$Hf+mw
zyp0`L#*Qp!1v|4VE7^_R*@u1Ek5%l?0lb~n9K<0U%3&PAksQr29LsSW&uOe-XgX(b
zCTFvb^SOYFxRlGeiVa-NwOq%$xRG~r6Yu4Hyq^#7C)~yz+{wrJ1fSu49^iBQC7<VE
zzQ7lGgh%-@kMlP?!B=^bukm%h#Xs;Y-{v{K$3Nn~_!c+uKg`4|EJr2kLzu&du?#D*
z1XEFfLMC84cHs{^rb{UubMY1PIElO29w#`Db6LPUS;}6R!r!5aiP(YDjACo{MiEPx
zkIv|V!Q8`F_-nqzU*RQA;ACcFG2h|4JkP!SIiKWH+{a(=X9y)>EN{Wjc?Jvd0Y1gw
zbeoOD2n<IH{0T?!D@?|GPQ`xALmGaMGb~09+AspC{4HDJD*leo@Gtxmm*FFfEBFFm
z;&c3ikKvE(iLD4A22Bu)|G>k)k%hBt${2J*CNeN|27ZmBoP|3$hb!?ullUwTqMFNa
zkZ+&^Z)K3pIT&N`HAis;Hsfxt=R*7jFXK3W&(rA7DV&ILc$Kkif>SI+3SPtg7=Y32
zf>C(k$fEdohIH$>|9AoLYK-nhc+(B8D`yxESI#uLQ{l}rIHsI!*h5)s_^5J@VUcpK
zVZCym8Os#Cs583Z;mtP~rd(k7rgEX7JNP0)^<>^+qb>rT+ZR0CI6N^pu#@(d8+9D;
z+|LT!sje{UOyI3F=%ZX^)WN`0U+G|7<Ke_$=#=)>8g)DH))}a`_U<$ss9bNDt5oee
z%usGH%v9cG)MdfjXw-SZyW6N6gSW}xr1Bmh<TiX-JDZJqIe7OPJfytO@DZguU2)Cp
zJz%(1=?W`ui1FNagsx!Q4BdO%4R<Mb7;Z;<c#YZ-b*1oj8oaK2*iZ%Z+?Rxnjn|sL
z+GCpbo-wFV?l<aa;XP~A<-&94E9!jV9W<yt@<q}lsvm}T)~H8@_qI{r49``WsF#NK
zj!}ON@4QjZ4ewo}J{+D#DM!6IygwTC>+swKA?o4by>Hal!~4KhyEf|f;r+>I0D$*r
zqoDxaUyKF?cpn-K5AZ%R8Ytj>Y&2xR`>WC50q>&GFaqxrqX7lpC8MDw1n+O!5sfnN
zJ~bL|;Qifb<bn5@(HI2pA4a1Qyw8osC3ycd8lm7_HX5to{mW=Xg6A2HU+{cKrPojf
zFKjfZ!TYz-@CNUS(Le|9KSo0yye|y)D!()u2H{;b8W7=qWi&LxyJj><!u#52xYXTq
zT^rHJ3GW-DF%;enqtO)Je~rdfc;6b0u<*V!Kc3l5y%vqS@cw5s{=)m-Xe5UBgK-Z~
zI{6=kG(5wn(LfD9!f42bA89mr!;dl=#^FaB4e0O#MngON7^6WReiNhN9)7HGk5PUz
z16^Z&oZ4R-=wSeUywPI;`~;&11o(+Yj|%Xc8$C3@PcnLZfS+viAOSzc=#c_`s?oy*
z{1!%!8Sv8#zEk`AL8E66_~{0!DnG-ha^Pngx|(Wf=xQO$(A7dKLwAPRhB`UFwV^w~
z979*&HWJc?u9Ufku9SI(u9R(!dx-Vh8M+_MH*`N*VCW8BXy^`pi=jJ4k)b=rt%kSh
z{`ZTuBkZ8m8xG5qC59c9?G4M7rG^zs_Z?wprTdPstI~Z(SgCa15q48{GVHE&->*>n
zvyWc50|@&nyBPLUx`PR;l<r`{{z`W+;Q*yOnDBOG55sC@Ps2gVUWP-Iy$y#d`?&U3
z0XR(Qeq1<0>3&=|Qt5tNI9lm`TsTJQeq1<K>3&=|PU(JJI9@r>aGKH;L|CI7Z1fze
z7p_#o8Ol2hXDVF@g|n5z4eOMyfWrAoS3uzc<tW2NN>^CnQl%@baJkYIR=7&3!iL<2
z4cc*~6|PoJFkGvgXt+)}$+%gSKiP1ja*E;I%BhB%l<usB_bT043-439lNR3Z?tgdI
z!UvS@tc5>O&NAGlbTuH{p{zCBshnf@xN@%H6Uupp&nR7u3HK{qjR_AZU5zbJ`|~-y
zSZMf5rK>*S^UB4Bhm}hVUr@Sg6~3rkW_U#Ds#thbS#S8Va)se><x0cfC_}CtgeR1)
z8HBGYT{8$zD%TjkrgTjrd|m09MEI8SPQyPa*BhQy>I5CWt=wREPU)IZLVQmzTpNle
zD)3z!il!{^T^oufFYxa%n#RE2Y&4;P@7h*0wSn*2Ry4_hf4|Xm2mThLi4T0&%mP<C
z52Byj0CTkC+FUd(g1^;hf&~8|qp1>ncP)q}P4KrHOl@43mDeFbd+wW}i4^=@MpG*I
zj~KYR*==~N@qAWZ$Xzp!8GNO5*O4$!>8>N8yXb#r=)S$zXkrHc=LW9zo-}mV-cyF|
z`1=eCl)o@^t@X6K`?O)HcAhbs-@)H+Fh%*S(VP#yyJ!Vf%7aGpK=|(Z70n3YyX#kQ
zT6xGYO8LBDYvp0X-e~-?Ra$(Bc8?h5H>PH{5AD(3F~e7s?gAG6T6x^?C8fK7MUzeV
z?sEe7{%;K@C|%76Co5kynv}vnX|P!7PEPoaQrCFMZTPNsUN=0iJY~37`G%pZes`uq
zSN*>?bk%>xaG&x`Ls$LoW)aPS;kye$kfd}si(o9K!GBvjq8T#$a|Z6mTnR<9X85j9
zqWLp?S6I<Z8os-sM00BR?uHW0uHj!WxYW3}b+<8p(%y$gvu*ev8O^)le{3`ZhyPcD
z`O1q%vvT;K7|qY&Uox22Seg^eaFy_P16R(^42v6Ua`HkE+PiF!s{EIsYctPib`Re-
zn&-n08_oFP|J!Kp5C4kMDggZd7_A4u|H5cx0RET8J#6|qR>*C%Tmb(oqlE+b*Nm1B
z;D2qjm;nE}(Xs;kZw&sSykWG|0N?df0$0`F8ZAG-|ITP30{%^-C5gtn+LR1bS;I71
zn?P7~;%Jou;Yg$P3WTE!bXkO>4Vx+hhB1vd+H_l}yCNKCa8wy@w77wAg25fiM8i4C
z=0-~&2qzi5uS_;{@1+<%t5i!lJlME5H<+<ZdqIPP%5=jw8qenjL$_*AE$GmF%AJYO
z{bnnpg%yN#7dl#EL0H{_166)F$8eOgjnM)O!nsCEF$m`w+^uYDxL(;#E$lX0sX;j3
zXw3%U0;AO%gbNMSm4tPJIn+fPE;3r%LD-#ypue)%aEkIaqm>_oON`cl5N>bqs-7sq
zrP>k3Dmxf05g}Y=a7x+HXxRwia-#(#ggY56B_Uj4w5Wt|XQSmMgu57wR(3U7azeP$
zQ4?zQ318|0bMOMtxS{RAP+W@>Ej~@_k~Sl4QQD<odGLwg_vtn1yV8%RznA`L`qlLB
zGm<lMGO99O%lJ6sdS+GTOPQB4ueL01xw7TcEl;+*oE4RonKdM9QPz&E(^(f=O>MQc
z)l1nC**Vz*vTL)qWS`2u)H<SdS?gJ?x3#{SlbX{#XKv26oHK25+C16jLYphO`JvoR
zxu^4r@;2w4XxqGPL)(+>0__I0d#>HNb~p1A@{95h<)6*JTo6?-vS3@mse-G8vkE`B
zW#}z?ZaGy{Ra95>#jTr)QG8$Vd$*<CcHlOzB&TF-$<Fo_?GLxVP`aq}iw=byYC9b7
zaIP%1tV`LfvVCQ5bu8>SzT@$Z*UQ_M*Ok9j{%xmFdZ*e>dpez{D6ZI8aiZc%=kA@a
zb;<AYV3%uMtGjOLdaUdDu9qtVl_ixUE9)zFR35H8SNVCjsBT%^D!YyBR@ZG`w@cm2
zx}WV4*Q2z@jvfbkobEZfXMN9|Jx}*4>Q&uqPp{LxuJx|$UDJC*@7=v$?0vCM(>|qr
zYWjTG=UU%EeK+<!+xL2?Us=Dpeh2zptSYIhsoGj~rt0(lMg2$i|MP(40S^xN;P&IU
zU#)Iiy`}n4_056Z2R<?I`k=Bw4TH`Ot{S|1ur~xlN{6f*a%jluAy@85xZ~o`o<o-n
zy*X^+uvdm%8Qybv-SG1xFd~1%`Vo6Z>>oK}<e8D-QMIE!9bGtj_vrIunvAI#vvo}9
z#Mq%@_m7JjH+9_RaR<ho8=pUZ!1%iHCnjW07(HR<gyR#gOe~zZY~uMz5tDKzO`ddl
z^2o_&r<6_EF}2Cm-c#31y)dnM+SX~`)@+<!J-v4NrWwm-?3;0X#-*7>GndTVHuJSv
zfmyp|9h-G^cG>K)vp3G(H~YidCAIr%&(BGlb8gO!xeaq)3eC%&H(=g|dDrX8>Q>er
ztGhP8a{lJ|7Z*e<7_#8Ah20l-UvhP6_R_vf4=w#*S;Vr;W!1~}EIYG2bNR95SL-9{
zlk0Qq%j$R3zqcZJ#pD%Fu1sFpedU%_%~w6Q>f?rzhMI=Q8m_J`U%g@V-ZjZ<#;)1D
z=IYwywZqr0Tl>M<YwM2PS$OAL>tp(^-@INo)sf=DXA46yx-p<d{471p4A)xM96b&;
z=>K^jB`w&wBA6CTYmpig%rB@YFJZv#1_Lqq1%a4AUT#55i;nJ%H2qos+H3K<AioF8
zD|$ubcPj5((YYd~EEs5|x80ka^AnhwR;G7@Wj(2*<!V1W#DemkEX!tU0&`0k?9{PE
zfiy-iGATc=d3-bzng<d~6C)#HBO?>zqa&jN$!${O$fj|rsexv>x$$u^fo3r=5s`@r
zjEs(No|hjV8QC-{(4={j(!{u;l!(ZYNv)HTTIXdaCujEy7L?=%gZU)|!NKY2>5PpC
zF)}$SDkUj9B`y#f8B>rF-8?NdHZmeAHV|kMNREye9*Axdm6Q;f5C}v?H_>OJ1Hr_M
z02AX<vXfGxqJGL2>9LH7&I&ZCZxWqS7@v}w_EA!H+w7ztH+_OX{+`>Ur=;X}QRfu+
n;Rn@tvDORXkbdOAs8#Rt!qMDYxIgmf*<!vHd30YXZzTO6TKTM#

diff --git a/src/vs/base/common/codiconsLibrary.ts b/src/vs/base/common/codiconsLibrary.ts
index 36726160fda..c578d85ee4e 100644
--- a/src/vs/base/common/codiconsLibrary.ts
+++ b/src/vs/base/common/codiconsLibrary.ts
@@ -585,4 +585,5 @@ export const codiconsLibrary = {
 	copilotWarning: register('copilot-warning', 0xec38),
 	python: register('python', 0xec39),
 	copilotLarge: register('copilot-large', 0xec3a),
+	copilotWarningLarge: register('copilot-warning-large', 0xec3b),
 } as const;

From 7ef3228c7f0d615612c8bb122022d087db03fb26 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 6 Dec 2024 11:25:23 +0100
Subject: [PATCH 011/479] remove API guidelines from copilot instructions
 (#235475)

---
 .github/copilot-instructions.md | 134 --------------------------------
 1 file changed, 134 deletions(-)

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index 6b833803b2e..6f20c66c400 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -55,137 +55,3 @@ for (let i = 0, n = str.length; i < 10; i++) {
 
 function f(x: number, y: string): void { }
 ```
-
-# Extension API Guidelines
-
-## Overview
-
-The following guidelines only apply to files in the `src/vscode-dts` folder.
-
-This is a loose collection of guidelines that you should be following when proposing API. The process for adding API is described here: [Extension API Process](https://github.com/Microsoft/vscode/wiki/Extension-API-process).
-
-## Core Principles
-
-### Avoid Breakage
-
-We DO NOT want to break API. Therefore be careful and conservative when proposing new API. It needs to hold up in the long term. Expose only the minimum but still try to anticipate potential future requests.
-
-### Namespaces
-
-The API is structured into different namespaces, like `commands`, `window`, `workspace` etc. Namespaces contain functions, constants, and events. All types (classes, enum, interfaces) are defined in the global, `vscode`, namespace.
-
-### JavaScript Feel
-
-The API should have a JavaScript’ish feel. While that is harder to put in rules, it means we use namespaces, properties, functions, and globals instead of object-factories and services. Also take inspiration from popular existing JS API, for instance `window.createStatusBarItem` is like `document.createElement`, the members of `DiagnosticsCollection` are similar to ES6 maps etc.
-
-### Global Events
-
-Events aren’t defined on the types they occur on but in the best matching namespace. For instance, document changes aren't sent by a document but via the `workspace.onDidChangeTextDocument` event. The event will contain the document in question. This **global event** pattern makes it easier to manage event subscriptions because changes happen less frequently.
-
-### Private Events
-
-Private or instance events aren't accessible via globals but exist on objects, e.g., `FileSystemWatcher#onDidCreate`.  *Don't* use private events unless the sender of the event is private. The rule of thumb is: 'Objects that can be accessed globally (editors, tasks, terminals, documents, etc)' should not have private events, objects that are private (only known by its creators, like tree views, web views) can send private events'
-
-### Event Naming
-
-Events follow the `on[Did|Will]VerbSubject` patterns, like `onDidChangeActiveEditor` or `onWillSaveTextDocument`. It doesn’t hurt to use explicit names.
-
-### Creating Objects
-
-Objects that live in the main thread but can be controlled/instantiated by extensions are declared as interfaces, e.g. `TextDocument` or `StatusBarItem`. When you allow creating such objects your API must follow the `createXYZ(args): XYZ` pattern. Because this is a constructor-replacement, the call must return synchronously.
-
-### Shy Objects
-
-Objects the API hands out to extensions should not contain more than what the API defines. Don’t expect everyone to read `vscode.d.ts` but also expect folks to use debugging-aided-intellisense, meaning whatever the debugger shows developers will program against. We don’t want to appear as making false promises. Prefix your private members with `_` as that is a common rule or, even better, use function-scopes to hide information.
-
-### Sync vs. Async
-
-Reading data, like an editor selection, a configuration value, etc. is synchronous. Setting a state that reflects on the main side is asynchronous. Despite updates being async your ‘extension host object’ should reflect the new state synchronously. This happens when setting an editor selection
-
-```
- editor.selection = newSelection
-
-     |
-     |
-     V
-
- 1. On the API object set the value as given
- 2. Make an async-call to the main side ala `trySetSelection`
- 3. The async-call returns with the actual selection (it might have changed in the meantime)
- 4. On the API object set the value again
-```
-
-We usually don’t expose the fact that setting state is asynchronous. We try to have API that feels sync -`editor.selection` is a getter/setter and not a method.
-
-### Data Driven
-
-Whenever possible, you should define a data model and define provider-interfaces. This puts VS Code into control as we can decide when to ask those providers, how to deal with multiple providers etc. The `ReferenceProvider` interface is a good sample for this.
-
-### Enrich Data Incrementally
-
-Sometimes it is expensive for a provider to compute parts of its data. For instance, creating a full `CompletionItem` (with all the documentation and symbols resolved) conflicts with being able to compute a large list of them quickly. In those cases, providers should return a lightweight version and offer a `resolve` method that allows extensions to enrich data. The `CodeLensProvider` and `CompletionItemProvider` interfaces are good samples for this.
-
-### Cancellation
-
-Calls into a provider should always include a `CancellationToken` as the last parameter. With that, the main thread can signal to the provider that its result won’t be needed anymore. When adding new parameters to provider-functions, it is OK to have the token not at the end anymore.
-
-### Objects vs. Interfaces
-
-Objects that should be returned by a provider are usually represented by a class that extensions can instantiate, e.g. `CodeLens`. We do that to provide convenience constructors and to be able to populate default values.
-
-Data that we accept in methods calls, i.e., parameter types, like in `registerRenameProvider` or `showQuickPick`, are declared as interfaces. That makes it easy to fulfill the API contract using class-instances or plain object literals.
-
-### Strict and Relaxed Data
-
-Data the API returns is strict, e.g. `activeTextEditor` is an editor or `undefined`, but not `null`. On the other side, providers can return relaxed data. We usually accept 4 types: The actual type, like `Hover`, a `Thenable` of that type, `undefined` or `null`. With that we want to make it easy to implement a provider, e.g., if you can compute results synchronous you don’t need to wrap things into a promise or if a certain condition isn’t met simple return, etc.
-
-### Validate Data
-
-Although providers can return ‘relaxed’ data, you need to verify it. The same is true for arguments etc. Throw validation errors when possible, drop data object when invalid.
-
-### Copy Data
-
-Don’t send the data that a provider returned over the wire. Often it contains more information than we need and often there are cyclic dependencies. Use the provider data to create objects that your protocol speaks.
-
-### Enums
-
-When API-work started only numeric-enums were supported, today TypeScript supports string-or-types and string-enums. Because fewer concepts are better, we stick to numeric-enums.
-
-### Strict Null
-
-We define the API with strictNull-checks in mind. That means we use the optional annotation `foo?: number` and `null` or `undefined` in type annotations. For instance, its `activeTextEditor: TextEditor | undefined`. Again, be strict for types we define and relaxed when accepting data.
-
-### Undefined is False
-
-The default value of an optional, boolean property is `false`. This is for consistency with JS where undefined never evaluates to `true`.
-
-### JSDoc
-
-We add JSDoc for all parts of the API. The doc is supported by markdown syntax. When document string-datatypes that end up in the UI, use the phrase ‘Human-readable string…’
-
-## Optional Parameters (`?` vs `| undefined`)
-
-* For implementation, treat omitting a parameter with `?` the same as explicitly passing in `undefined`
-* Use `| undefined` when you want to callers to always have to consider the parameter.
-* Use `?` when you want to allow callers to omit the parameter.
-* Never use `?` and `| undefined` on a parameter. Instead follow the two rules above to decide which version to use.
-* If adding a new parameter to an existing function, use `?` as this allows the new signature to be backwards compatible with the old version.
-* Do not add an overload to add an optional parameter to the end of the function. Instead use `?`.
-
-## Optional Properties (`?` vs `| undefined`)
-
-* Do not write code that treats the absence of a property differently than a property being present but set to `undefined`
-    * This can sometimes hit you on spreads or iterating through objects, so just something to be aware of
-
-* For readonly properties on interfaces that VS Code exposes to extensions (this include managed objects, as well as the objects passed to events):
-    * Use `| undefined` as this makes it clear the property exists but has the value `undefined`.
-
-* For readonly properties on options bag type objects passed from extensions to VS Code:
-    * Use `?` when it is ok to omit the property
-    * Use `| undefined` when you want the user to have to pass in the property but `undefined` signals that you will fall back to some default
-    * Try to avoid `?` + `| undefined` in most cases. Instead use `?`. Using both `?` + `| undefined` isn't wrong, but it's often more clear to treat omitting the property as falling back to the default rather than passing in `undefined`
-
-* For unmanaged, writable objects:
-    * If using `?`, always also add `| undefined` unless want to allow the property to be omitted during initialization, but never allow users to explicitly set it to `undefined` afterwards. I don't think we have many cases where this will be needed
-        * In these cases, you may want to try changing the api to avoid this potential confusion
-    * If adding a new property to an unmanaged object, use `?` as this ensures the type is backwards compatible with the old version

From 2443bffc6ccab10fbe32b8486055a59cd9ed99de Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 6 Dec 2024 11:50:18 +0100
Subject: [PATCH 012/479] remove cyclic dependency `notebookChatEditController
 -> notebookChatActionsOverlay -> chatEditorOverlay` (#235480)

* fix https://github.com/microsoft/vscode/issues/235383

* remove cyclic dependency `notebookChatEditController -> notebookChatActionsOverlay -> chatEditorOverlay`

fyi @DonJayamanne
---
 .../chatMarkdownContentPart.ts                |  15 +--
 .../contrib/chat/browser/chatEditorOverlay.ts | 109 +-----------------
 2 files changed, 6 insertions(+), 118 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts
index 36ba8b16096..a281df1c40c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.ts
@@ -35,7 +35,6 @@ import { IChatMarkdownContent } from '../../common/chatService.js';
 import { isRequestVM, isResponseVM } from '../../common/chatViewModel.js';
 import { CodeBlockModelCollection } from '../../common/codeBlockModelCollection.js';
 import { IChatCodeBlockInfo, IChatListItemRendererOptions } from '../chat.js';
-import { AnimatedValue, ObservableAnimatedValue } from '../chatEditorOverlay.js';
 import { IChatRendererDelegate } from '../chatListRenderer.js';
 import { ChatMarkdownDecorationsRenderer } from '../chatMarkdownDecorationsRenderer.js';
 import { ChatEditorOptions } from '../chatOptions.js';
@@ -351,23 +350,15 @@ class CollapsedCodeBlock extends Disposable {
 		this.element.title = this.labelService.getUriLabel(uri, { relative: false });
 
 		// Show a percentage progress that is driven by the rewrite
-		const slickRatio = ObservableAnimatedValue.const(0);
-		let t = Date.now();
+
 		this._progressStore.add(autorun(r => {
 			const rewriteRatio = modifiedEntry?.rewriteRatio.read(r);
-			if (rewriteRatio) {
-				slickRatio.changeAnimation(prev => {
-					const result = new AnimatedValue(prev.getValue(), rewriteRatio, Date.now() - t);
-					t = Date.now();
-					return result;
-				}, undefined);
-			}
 
 			const labelDetail = this.element.querySelector('.label-detail');
 			const isComplete = !modifiedEntry?.isCurrentlyBeingModified.read(r);
 			if (labelDetail && !isStreaming && !isComplete) {
-				const value = slickRatio.getValue(undefined);
-				labelDetail.textContent = value === 0 ? localize('chat.codeblock.applying', "Applying edits...") : localize('chat.codeblock.applyingPercentage', "Applying edits ({0}%)...", Math.round(value * 100));
+				const value = rewriteRatio;
+				labelDetail.textContent = value === 0 || !value ? localize('chat.codeblock.applying', "Applying edits...") : localize('chat.codeblock.applyingPercentage', "Applying edits ({0}%)...", Math.round(value * 100));
 			} else if (labelDetail && !isStreaming && isComplete) {
 				iconEl.classList.remove(...iconClasses);
 				const fileKind = uri.path.endsWith('/') ? FileKind.FOLDER : FileKind.FILE;
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditorOverlay.ts b/src/vs/workbench/contrib/chat/browser/chatEditorOverlay.ts
index 978b13b59a1..6a09f5ef275 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditorOverlay.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditorOverlay.ts
@@ -5,7 +5,7 @@
 
 import './media/chatEditorOverlay.css';
 import { DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
-import { autorun, IReader, ISettableObservable, ITransaction, observableFromEvent, observableSignal, observableValue, transaction } from '../../../../base/common/observable.js';
+import { autorun, observableFromEvent, observableValue, transaction } from '../../../../base/common/observable.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference } from '../../../../editor/browser/editorBrowser.js';
 import { IEditorContribution } from '../../../../editor/common/editorCommon.js';
@@ -17,7 +17,7 @@ import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionView
 import { ACTIVE_GROUP, IEditorService } from '../../../services/editor/common/editorService.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { IActionRunner } from '../../../../base/common/actions.js';
-import { $, append, EventLike, getWindow, reset, scheduleAtNextAnimationFrame } from '../../../../base/browser/dom.js';
+import { $, append, EventLike, reset } from '../../../../base/browser/dom.js';
 import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
 import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
@@ -25,7 +25,6 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { assertType } from '../../../../base/common/types.js';
 import { localize } from '../../../../nls.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
-import { ctxNotebookHasEditorModification } from '../../notebook/browser/contrib/chatEdit/notebookChatEditController.js';
 import { AcceptAction, RejectAction } from './chatEditorActions.js';
 import { ChatEditorController } from './chatEditorController.js';
 
@@ -195,22 +194,11 @@ class ChatEditorOverlayWidget implements IOverlayWidget {
 			this._domNode.classList.toggle('busy', busy);
 		}));
 
-		const slickRatio = ObservableAnimatedValue.const(0);
-		let t = Date.now();
 		this._showStore.add(autorun(r => {
 			const value = activeEntry.rewriteRatio.read(r);
-
-			slickRatio.changeAnimation(prev => {
-				const result = new AnimatedValue(prev.getValue(), value, Date.now() - t);
-				t = Date.now();
-				return result;
-			}, undefined);
-
-			const value2 = slickRatio.getValue(r);
-
 			reset(this._progressNode, (value === 0
 				? localize('generating', "Generating edits...")
-				: localize('applyingPercentage', "{0}% Applying edits...", Math.round(value2 * 100))));
+				: localize('applyingPercentage', "{0}% Applying edits...", Math.round(value * 100))));
 		}));
 
 		this._showStore.add(autorun(r => {
@@ -269,101 +257,10 @@ MenuRegistry.appendMenuItem(MenuId.ChatEditingEditorContent, {
 		title: localize('label', "Navigation Status"),
 		precondition: ContextKeyExpr.false(),
 	},
-	when: ctxNotebookHasEditorModification.negate(),
 	group: 'navigate',
 	order: -1
 });
 
-
-export class ObservableAnimatedValue {
-	public static const(value: number): ObservableAnimatedValue {
-		return new ObservableAnimatedValue(AnimatedValue.const(value));
-	}
-
-	private readonly _value: ISettableObservable<AnimatedValue>;
-
-	constructor(
-		initialValue: AnimatedValue,
-	) {
-		this._value = observableValue(this, initialValue);
-	}
-
-	setAnimation(value: AnimatedValue, tx: ITransaction | undefined): void {
-		this._value.set(value, tx);
-	}
-
-	changeAnimation(fn: (prev: AnimatedValue) => AnimatedValue, tx: ITransaction | undefined): void {
-		const value = fn(this._value.get());
-		this._value.set(value, tx);
-	}
-
-	getValue(reader: IReader | undefined): number {
-		const value = this._value.read(reader);
-		if (!value.isFinished()) {
-			Scheduler.instance.invalidateOnNextAnimationFrame(reader);
-		}
-		return value.getValue();
-	}
-}
-
-class Scheduler {
-	static instance = new Scheduler();
-
-	private readonly _signal = observableSignal(this);
-
-	private _isScheduled = false;
-
-	invalidateOnNextAnimationFrame(reader: IReader | undefined): void {
-		this._signal.read(reader);
-		if (!this._isScheduled) {
-			this._isScheduled = true;
-			scheduleAtNextAnimationFrame(getWindow(undefined), () => {
-				this._isScheduled = false;
-				this._signal.trigger(undefined);
-			});
-		}
-	}
-}
-
-export class AnimatedValue {
-
-	static const(value: number): AnimatedValue {
-		return new AnimatedValue(value, value, 0);
-	}
-
-	readonly startTimeMs = Date.now();
-
-	constructor(
-		readonly startValue: number,
-		readonly endValue: number,
-		readonly durationMs: number,
-	) {
-		if (startValue === endValue) {
-			this.durationMs = 0;
-		}
-	}
-
-	isFinished(): boolean {
-		return Date.now() >= this.startTimeMs + this.durationMs;
-	}
-
-	getValue(): number {
-		const timePassed = Date.now() - this.startTimeMs;
-		if (timePassed >= this.durationMs) {
-			return this.endValue;
-		}
-		const value = easeOutExpo(timePassed, this.startValue, this.endValue - this.startValue, this.durationMs);
-		return value;
-	}
-}
-
-function easeOutExpo(passedTime: number, start: number, length: number, totalDuration: number): number {
-	return passedTime === totalDuration
-		? start + length
-		: length * (-Math.pow(2, -10 * passedTime / totalDuration) + 1) + start;
-}
-
-
 export class ChatEditorOverlayController implements IEditorContribution {
 
 	static readonly ID = 'editor.contrib.chatOverlayController';

From 359ec5270a9c9220c418bb2e50a5b35e28b2aae1 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Fri, 6 Dec 2024 11:51:50 +0100
Subject: [PATCH 013/479] Add new line comment when pressing Enter from within
 line comment for languages that use double slash for line comment (#235407)

* add decrease and increase indent patterns for cpp

* adding new line with line comment on next line from within languages that use double slash for line comment
---
 extensions/cpp/language-configuration.json    | 122 +++++++++++++++---
 extensions/csharp/language-configuration.json | 100 +++++++++++---
 extensions/go/language-configuration.json     | 109 +++++++++++++---
 extensions/groovy/language-configuration.json |  91 +++++++++++--
 extensions/java/language-configuration.json   | 104 ++++++++++++---
 extensions/json/language-configuration.json   |  82 ++++++++++--
 extensions/less/language-configuration.json   | 107 ++++++++++++---
 .../objective-c/language-configuration.json   |  91 +++++++++++--
 extensions/php/language-configuration.json    | 115 ++++++++++++++---
 extensions/rust/language-configuration.json   |  85 ++++++++++--
 extensions/swift/language-configuration.json  | 104 ++++++++++++---
 11 files changed, 941 insertions(+), 169 deletions(-)

diff --git a/extensions/cpp/language-configuration.json b/extensions/cpp/language-configuration.json
index 0bf8df9dc01..cb1fb733b99 100644
--- a/extensions/cpp/language-configuration.json
+++ b/extensions/cpp/language-configuration.json
@@ -1,29 +1,94 @@
 {
 	"comments": {
 		"lineComment": "//",
-		"blockComment": ["/*", "*/"]
+		"blockComment": [
+			"/*",
+			"*/"
+		]
 	},
 	"brackets": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"]
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		]
 	],
 	"autoClosingPairs": [
-		{ "open": "[", "close": "]" },
-		{ "open": "{", "close": "}" },
-		{ "open": "(", "close": ")" },
-		{ "open": "'", "close": "'", "notIn": ["string", "comment"] },
-		{ "open": "\"", "close": "\"", "notIn": ["string"] },
-		{ "open": "/*", "close": "*/", "notIn": ["string", "comment"] },
-		{ "open": "/**", "close": " */", "notIn": ["string"] }
+		{
+			"open": "[",
+			"close": "]"
+		},
+		{
+			"open": "{",
+			"close": "}"
+		},
+		{
+			"open": "(",
+			"close": ")"
+		},
+		{
+			"open": "'",
+			"close": "'",
+			"notIn": [
+				"string",
+				"comment"
+			]
+		},
+		{
+			"open": "\"",
+			"close": "\"",
+			"notIn": [
+				"string"
+			]
+		},
+		{
+			"open": "/*",
+			"close": "*/",
+			"notIn": [
+				"string",
+				"comment"
+			]
+		},
+		{
+			"open": "/**",
+			"close": " */",
+			"notIn": [
+				"string"
+			]
+		}
 	],
 	"surroundingPairs": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"],
-		["\"", "\""],
-		["'", "'"],
-		["<", ">"]
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		],
+		[
+			"\"",
+			"\""
+		],
+		[
+			"'",
+			"'"
+		],
+		[
+			"<",
+			">"
+		]
 	],
 	"wordPattern": "(-?\\d*\\.\\d\\w*)|([^\\`\\~\\!\\@\\#\\%\\^\\&\\*\\(\\)\\-\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:\\'\\\"\\,\\.\\<\\>\\/\\?\\s]+)",
 	"folding": {
@@ -32,6 +97,14 @@
 			"end": "^\\s*#pragma\\s+endregion\\b"
 		}
 	},
+	"indentationRules": {
+		"decreaseIndentPattern": {
+			"pattern": "^\\s*[\\}\\]\\)].*$"
+		},
+		"increaseIndentPattern": {
+			"pattern": "^.*(\\{[^}]*|\\([^)]*|\\[[^\\]]*)$"
+		},
+	},
 	"onEnterRules": [
 		{
 			// Decrease indentation after single line if/else if/else, for, or while
@@ -41,6 +114,19 @@
 			"action": {
 				"indent": "outdent"
 			}
-		}
+		},
+		// Add // when pressing enter from inside line comment
+		{
+			"beforeText": {
+				"pattern": "\/\/.*"
+			},
+			"afterText": {
+				"pattern": "^(?!\\s*$).+"
+			},
+			"action": {
+				"indent": "none",
+				"appendText": "// "
+			}
+		},
 	]
 }
diff --git a/extensions/csharp/language-configuration.json b/extensions/csharp/language-configuration.json
index d8698b46c09..60814ae02f4 100644
--- a/extensions/csharp/language-configuration.json
+++ b/extensions/csharp/language-configuration.json
@@ -1,32 +1,100 @@
 {
 	"comments": {
 		"lineComment": "//",
-		"blockComment": ["/*", "*/"]
+		"blockComment": [
+			"/*",
+			"*/"
+		]
 	},
 	"brackets": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"]
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		]
 	],
 	"autoClosingPairs": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"],
-		{ "open": "'", "close": "'", "notIn": ["string", "comment"] },
-		{ "open": "\"", "close": "\"", "notIn": ["string", "comment"] }
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		],
+		{
+			"open": "'",
+			"close": "'",
+			"notIn": [
+				"string",
+				"comment"
+			]
+		},
+		{
+			"open": "\"",
+			"close": "\"",
+			"notIn": [
+				"string",
+				"comment"
+			]
+		}
 	],
 	"surroundingPairs": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"],
-		["<", ">"],
-		["'", "'"],
-		["\"", "\""]
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		],
+		[
+			"<",
+			">"
+		],
+		[
+			"'",
+			"'"
+		],
+		[
+			"\"",
+			"\""
+		]
 	],
 	"folding": {
 		"markers": {
 			"start": "^\\s*#region\\b",
 			"end": "^\\s*#endregion\\b"
 		}
-	}
+	},
+	"onEnterRules": [
+		// Add // when pressing enter from inside line comment
+		{
+			"beforeText": {
+				"pattern": "\/\/.*"
+			},
+			"afterText": {
+				"pattern": "^(?!\\s*$).+"
+			},
+			"action": {
+				"indent": "none",
+				"appendText": "// "
+			}
+		},
+	]
 }
diff --git a/extensions/go/language-configuration.json b/extensions/go/language-configuration.json
index a5e06a56bad..9238bf3529b 100644
--- a/extensions/go/language-configuration.json
+++ b/extensions/go/language-configuration.json
@@ -1,28 +1,86 @@
 {
 	"comments": {
 		"lineComment": "//",
-		"blockComment": [ "/*", "*/" ]
+		"blockComment": [
+			"/*",
+			"*/"
+		]
 	},
 	"brackets": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"]
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		]
 	],
 	"autoClosingPairs": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"],
-		{ "open": "`", "close": "`", "notIn": ["string"]},
-		{ "open": "\"", "close": "\"", "notIn": ["string"]},
-		{ "open": "'", "close": "'", "notIn": ["string", "comment"]}
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		],
+		{
+			"open": "`",
+			"close": "`",
+			"notIn": [
+				"string"
+			]
+		},
+		{
+			"open": "\"",
+			"close": "\"",
+			"notIn": [
+				"string"
+			]
+		},
+		{
+			"open": "'",
+			"close": "'",
+			"notIn": [
+				"string",
+				"comment"
+			]
+		}
 	],
 	"surroundingPairs": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"],
-		["\"", "\""],
-		["'", "'"],
-		["`", "`"]
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		],
+		[
+			"\"",
+			"\""
+		],
+		[
+			"'",
+			"'"
+		],
+		[
+			"`",
+			"`"
+		]
 	],
 	"indentationRules": {
 		"increaseIndentPattern": "^.*(\\bcase\\b.*:|\\bdefault\\b:|(\\b(func|if|else|switch|select|for|struct)\\b.*)?{[^}\"'`]*|\\([^)\"'`]*)$",
@@ -33,5 +91,20 @@
 			"start": "^\\s*//\\s*#?region\\b",
 			"end": "^\\s*//\\s*#?endregion\\b"
 		}
-	}
-}
\ No newline at end of file
+	},
+	"onEnterRules": [
+		// Add // when pressing enter from inside line comment
+		{
+			"beforeText": {
+				"pattern": "\/\/.*"
+			},
+			"afterText": {
+				"pattern": "^(?!\\s*$).+"
+			},
+			"action": {
+				"indent": "none",
+				"appendText": "// "
+			}
+		},
+	]
+}
diff --git a/extensions/groovy/language-configuration.json b/extensions/groovy/language-configuration.json
index a81a8864a51..39e5fd4092c 100644
--- a/extensions/groovy/language-configuration.json
+++ b/extensions/groovy/language-configuration.json
@@ -1,25 +1,88 @@
 {
 	"comments": {
 		"lineComment": "//",
-		"blockComment": [ "/*", "*/" ]
+		"blockComment": [
+			"/*",
+			"*/"
+		]
 	},
 	"brackets": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"]
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		]
 	],
 	"autoClosingPairs": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"],
-		{ "open": "\"", "close": "\"", "notIn": ["string"] },
-		{ "open": "'", "close": "'", "notIn": ["string"] }
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		],
+		{
+			"open": "\"",
+			"close": "\"",
+			"notIn": [
+				"string"
+			]
+		},
+		{
+			"open": "'",
+			"close": "'",
+			"notIn": [
+				"string"
+			]
+		}
 	],
 	"surroundingPairs": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"],
-		["\"", "\""],
-		["'", "'"]
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		],
+		[
+			"\"",
+			"\""
+		],
+		[
+			"'",
+			"'"
+		]
+	],
+	"onEnterRules": [
+		// Add // when pressing enter from inside line comment
+		{
+			"beforeText": {
+				"pattern": "\/\/.*"
+			},
+			"afterText": {
+				"pattern": "^(?!\\s*$).+"
+			},
+			"action": {
+				"indent": "none",
+				"appendText": "// "
+			}
+		},
 	]
 }
diff --git a/extensions/java/language-configuration.json b/extensions/java/language-configuration.json
index 610adc686b4..6ba09bbd15c 100644
--- a/extensions/java/language-configuration.json
+++ b/extensions/java/language-configuration.json
@@ -1,28 +1,85 @@
 {
 	"comments": {
 		"lineComment": "//",
-		"blockComment": [ "/*", "*/" ]
+		"blockComment": [
+			"/*",
+			"*/"
+		]
 	},
 	"brackets": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"]
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		]
 	],
 	"autoClosingPairs": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"],
-		{ "open": "\"", "close": "\"", "notIn": ["string"] },
-		{ "open": "'", "close": "'", "notIn": ["string"] },
-		{ "open": "/**", "close": " */", "notIn": ["string"] }
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		],
+		{
+			"open": "\"",
+			"close": "\"",
+			"notIn": [
+				"string"
+			]
+		},
+		{
+			"open": "'",
+			"close": "'",
+			"notIn": [
+				"string"
+			]
+		},
+		{
+			"open": "/**",
+			"close": " */",
+			"notIn": [
+				"string"
+			]
+		}
 	],
 	"surroundingPairs": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"],
-		["\"", "\""],
-		["'", "'"],
-		["<", ">"]
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		],
+		[
+			"\"",
+			"\""
+		],
+		[
+			"'",
+			"'"
+		],
+		[
+			"<",
+			">"
+		]
 	],
 	"folding": {
 		"markers": {
@@ -97,6 +154,19 @@
 			"action": {
 				"indent": "indent"
 			}
-		}
+		},
+		// Add // when pressing enter from inside line comment
+		{
+			"beforeText": {
+				"pattern": "\/\/.*"
+			},
+			"afterText": {
+				"pattern": "^(?!\\s*$).+"
+			},
+			"action": {
+				"indent": "none",
+				"appendText": "// "
+			}
+		},
 	]
 }
diff --git a/extensions/json/language-configuration.json b/extensions/json/language-configuration.json
index f9ec3fec781..d47efe2587e 100644
--- a/extensions/json/language-configuration.json
+++ b/extensions/json/language-configuration.json
@@ -1,22 +1,84 @@
 {
 	"comments": {
 		"lineComment": "//",
-		"blockComment": [ "/*", "*/" ]
+		"blockComment": [
+			"/*",
+			"*/"
+		]
 	},
 	"brackets": [
-		["{", "}"],
-		["[", "]"]
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		]
 	],
 	"autoClosingPairs": [
-		{ "open": "{", "close": "}", "notIn": ["string"] },
-		{ "open": "[", "close": "]", "notIn": ["string"] },
-		{ "open": "(", "close": ")", "notIn": ["string"] },
-		{ "open": "'", "close": "'", "notIn": ["string"] },
-		{ "open": "\"", "close": "\"", "notIn": ["string", "comment"] },
-		{ "open": "`", "close": "`", "notIn": ["string", "comment"] }
+		{
+			"open": "{",
+			"close": "}",
+			"notIn": [
+				"string"
+			]
+		},
+		{
+			"open": "[",
+			"close": "]",
+			"notIn": [
+				"string"
+			]
+		},
+		{
+			"open": "(",
+			"close": ")",
+			"notIn": [
+				"string"
+			]
+		},
+		{
+			"open": "'",
+			"close": "'",
+			"notIn": [
+				"string"
+			]
+		},
+		{
+			"open": "\"",
+			"close": "\"",
+			"notIn": [
+				"string",
+				"comment"
+			]
+		},
+		{
+			"open": "`",
+			"close": "`",
+			"notIn": [
+				"string",
+				"comment"
+			]
+		}
 	],
 	"indentationRules": {
 		"increaseIndentPattern": "({+(?=((\\\\.|[^\"\\\\])*\"(\\\\.|[^\"\\\\])*\")*[^\"}]*)$)|(\\[+(?=((\\\\.|[^\"\\\\])*\"(\\\\.|[^\"\\\\])*\")*[^\"\\]]*)$)",
 		"decreaseIndentPattern": "^\\s*[}\\]],?\\s*$"
-	}
+	},
+	"onEnterRules": [
+		// Add // when pressing enter from inside line comment
+		{
+			"beforeText": {
+				"pattern": "\/\/.*"
+			},
+			"afterText": {
+				"pattern": "^(?!\\s*$).+"
+			},
+			"action": {
+				"indent": "none",
+				"appendText": "// "
+			}
+		},
+	]
 }
diff --git a/extensions/less/language-configuration.json b/extensions/less/language-configuration.json
index 7325d052704..71e155ddfcc 100644
--- a/extensions/less/language-configuration.json
+++ b/extensions/less/language-configuration.json
@@ -1,26 +1,88 @@
 {
 	"comments": {
-		"blockComment": ["/*", "*/"],
+		"blockComment": [
+			"/*",
+			"*/"
+		],
 		"lineComment": "//"
 	},
 	"brackets": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"]
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		]
 	],
 	"autoClosingPairs": [
-		{ "open": "{", "close": "}", "notIn": ["string", "comment"] },
-		{ "open": "[", "close": "]", "notIn": ["string", "comment"] },
-		{ "open": "(", "close": ")", "notIn": ["string", "comment"] },
-		{ "open": "\"", "close": "\"", "notIn": ["string", "comment"] },
-		{ "open": "'", "close": "'", "notIn": ["string", "comment"] }
+		{
+			"open": "{",
+			"close": "}",
+			"notIn": [
+				"string",
+				"comment"
+			]
+		},
+		{
+			"open": "[",
+			"close": "]",
+			"notIn": [
+				"string",
+				"comment"
+			]
+		},
+		{
+			"open": "(",
+			"close": ")",
+			"notIn": [
+				"string",
+				"comment"
+			]
+		},
+		{
+			"open": "\"",
+			"close": "\"",
+			"notIn": [
+				"string",
+				"comment"
+			]
+		},
+		{
+			"open": "'",
+			"close": "'",
+			"notIn": [
+				"string",
+				"comment"
+			]
+		}
 	],
 	"surroundingPairs": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"],
-		["\"", "\""],
-		["'", "'"]
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		],
+		[
+			"\"",
+			"\""
+		],
+		[
+			"'",
+			"'"
+		]
 	],
 	"folding": {
 		"markers": {
@@ -32,5 +94,20 @@
 		"increaseIndentPattern": "(^.*\\{[^}]*$)",
 		"decreaseIndentPattern": "^\\s*\\}"
 	},
-	"wordPattern": "(#?-?\\d*\\.\\d\\w*%?)|(::?[\\w-]+(?=[^,{;]*[,{]))|(([@#.!])?[\\w-?]+%?|[@#!.])"
+	"wordPattern": "(#?-?\\d*\\.\\d\\w*%?)|(::?[\\w-]+(?=[^,{;]*[,{]))|(([@#.!])?[\\w-?]+%?|[@#!.])",
+	"onEnterRules": [
+		// Add // when pressing enter from inside line comment
+		{
+			"beforeText": {
+				"pattern": "\/\/.*"
+			},
+			"afterText": {
+				"pattern": "^(?!\\s*$).+"
+			},
+			"action": {
+				"indent": "none",
+				"appendText": "// "
+			}
+		},
+	]
 }
diff --git a/extensions/objective-c/language-configuration.json b/extensions/objective-c/language-configuration.json
index a81a8864a51..39e5fd4092c 100644
--- a/extensions/objective-c/language-configuration.json
+++ b/extensions/objective-c/language-configuration.json
@@ -1,25 +1,88 @@
 {
 	"comments": {
 		"lineComment": "//",
-		"blockComment": [ "/*", "*/" ]
+		"blockComment": [
+			"/*",
+			"*/"
+		]
 	},
 	"brackets": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"]
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		]
 	],
 	"autoClosingPairs": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"],
-		{ "open": "\"", "close": "\"", "notIn": ["string"] },
-		{ "open": "'", "close": "'", "notIn": ["string"] }
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		],
+		{
+			"open": "\"",
+			"close": "\"",
+			"notIn": [
+				"string"
+			]
+		},
+		{
+			"open": "'",
+			"close": "'",
+			"notIn": [
+				"string"
+			]
+		}
 	],
 	"surroundingPairs": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"],
-		["\"", "\""],
-		["'", "'"]
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		],
+		[
+			"\"",
+			"\""
+		],
+		[
+			"'",
+			"'"
+		]
+	],
+	"onEnterRules": [
+		// Add // when pressing enter from inside line comment
+		{
+			"beforeText": {
+				"pattern": "\/\/.*"
+			},
+			"afterText": {
+				"pattern": "^(?!\\s*$).+"
+			},
+			"action": {
+				"indent": "none",
+				"appendText": "// "
+			}
+		},
 	]
 }
diff --git a/extensions/php/language-configuration.json b/extensions/php/language-configuration.json
index f44d7a25cb6..d696ffa2950 100644
--- a/extensions/php/language-configuration.json
+++ b/extensions/php/language-configuration.json
@@ -1,28 +1,96 @@
 {
 	"comments": {
 		"lineComment": "//", // "#"
-		"blockComment": [ "/*", "*/" ]
+		"blockComment": [
+			"/*",
+			"*/"
+		]
 	},
 	"brackets": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"]
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		]
 	],
 	"autoClosingPairs": [
-		{ "open": "{", "close": "}", "notIn": ["string"] },
-		{ "open": "[", "close": "]", "notIn": ["string"] },
-		{ "open": "(", "close": ")", "notIn": ["string"] },
-		{ "open": "'", "close": "'", "notIn": ["string", "comment"] },
-		{ "open": "\"", "close": "\"", "notIn": ["string", "comment"] },
-		{ "open": "/**", "close": " */", "notIn": ["string"] }
+		{
+			"open": "{",
+			"close": "}",
+			"notIn": [
+				"string"
+			]
+		},
+		{
+			"open": "[",
+			"close": "]",
+			"notIn": [
+				"string"
+			]
+		},
+		{
+			"open": "(",
+			"close": ")",
+			"notIn": [
+				"string"
+			]
+		},
+		{
+			"open": "'",
+			"close": "'",
+			"notIn": [
+				"string",
+				"comment"
+			]
+		},
+		{
+			"open": "\"",
+			"close": "\"",
+			"notIn": [
+				"string",
+				"comment"
+			]
+		},
+		{
+			"open": "/**",
+			"close": " */",
+			"notIn": [
+				"string"
+			]
+		}
 	],
 	"surroundingPairs": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"],
-		["'", "'"],
-		["\"", "\""],
-		["`", "`"]
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		],
+		[
+			"'",
+			"'"
+		],
+		[
+			"\"",
+			"\""
+		],
+		[
+			"`",
+			"`"
+		]
 	],
 	"indentationRules": {
 		"increaseIndentPattern": "({(?!.*}).*|\\(|\\[|((else(\\s)?)?if|else|for(each)?|while|switch|case).*:)\\s*((/[/*].*|)?$|\\?>)",
@@ -85,6 +153,19 @@
 			"action": {
 				"indent": "outdent"
 			}
-		}
+		},
+		// Add // when pressing enter from inside line comment
+		{
+			"beforeText": {
+				"pattern": "\/\/.*"
+			},
+			"afterText": {
+				"pattern": "^(?!\\s*$).+"
+			},
+			"action": {
+				"indent": "none",
+				"appendText": "// "
+			}
+		},
 	]
 }
diff --git a/extensions/rust/language-configuration.json b/extensions/rust/language-configuration.json
index ecb0007f6ea..490f4409c65 100644
--- a/extensions/rust/language-configuration.json
+++ b/extensions/rust/language-configuration.json
@@ -1,25 +1,67 @@
 {
 	"comments": {
 		"lineComment": "//",
-		"blockComment": [ "/*", "*/" ]
+		"blockComment": [
+			"/*",
+			"*/"
+		]
 	},
 	"brackets": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"]
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		]
 	],
 	"autoClosingPairs": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"],
-		{ "open": "\"", "close": "\"", "notIn": ["string"] }
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		],
+		{
+			"open": "\"",
+			"close": "\"",
+			"notIn": [
+				"string"
+			]
+		}
 	],
 	"surroundingPairs": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"],
-		["\"", "\""],
-		["<", ">"]
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		],
+		[
+			"\"",
+			"\""
+		],
+		[
+			"<",
+			">"
+		]
 	],
 	"indentationRules": {
 		"increaseIndentPattern": "^.*\\{[^}\"']*$|^.*\\([^\\)\"']*$",
@@ -30,5 +72,20 @@
 			"start": "^\\s*//\\s*#?region\\b",
 			"end": "^\\s*//\\s*#?endregion\\b"
 		}
-	}
+	},
+	"onEnterRules": [
+		// Add // when pressing enter from inside line comment
+		{
+			"beforeText": {
+				"pattern": "\/\/.*"
+			},
+			"afterText": {
+				"pattern": "^(?!\\s*$).+"
+			},
+			"action": {
+				"indent": "none",
+				"appendText": "// "
+			}
+		},
+	]
 }
diff --git a/extensions/swift/language-configuration.json b/extensions/swift/language-configuration.json
index 54095ef5212..e1ceb1f6bc6 100644
--- a/extensions/swift/language-configuration.json
+++ b/extensions/swift/language-configuration.json
@@ -1,27 +1,99 @@
 {
 	"comments": {
 		"lineComment": "//",
-		"blockComment": [ "/*", "*/" ]
+		"blockComment": [
+			"/*",
+			"*/"
+		]
 	},
 	"brackets": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"]
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		]
 	],
 	"autoClosingPairs": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"],
-		{ "open": "\"", "close": "\"", "notIn": ["string"] },
-		{ "open": "'", "close": "'", "notIn": ["string"] },
-		{ "open": "`", "close": "`", "notIn": ["string"] }
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		],
+		{
+			"open": "\"",
+			"close": "\"",
+			"notIn": [
+				"string"
+			]
+		},
+		{
+			"open": "'",
+			"close": "'",
+			"notIn": [
+				"string"
+			]
+		},
+		{
+			"open": "`",
+			"close": "`",
+			"notIn": [
+				"string"
+			]
+		}
 	],
 	"surroundingPairs": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"],
-		["\"", "\""],
-		["'", "'"],
-		["`", "`"]
+		[
+			"{",
+			"}"
+		],
+		[
+			"[",
+			"]"
+		],
+		[
+			"(",
+			")"
+		],
+		[
+			"\"",
+			"\""
+		],
+		[
+			"'",
+			"'"
+		],
+		[
+			"`",
+			"`"
+		]
+	],
+	"onEnterRules": [
+		// Add // when pressing enter from inside line comment
+		{
+			"beforeText": {
+				"pattern": "\/\/.*"
+			},
+			"afterText": {
+				"pattern": "^(?!\\s*$).+"
+			},
+			"action": {
+				"indent": "none",
+				"appendText": "// "
+			}
+		},
 	]
 }

From c2037f152b2bb3119ce1d87f52987776540dd57f Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 6 Dec 2024 12:01:44 +0100
Subject: [PATCH 014/479] chat - some setup and quotas tweaks (#235477)

---
 .../parts/titlebar/media/titlebarpart.css     |  4 --
 .../chat/browser/actions/chatActions.ts       | 59 +++++++++++--------
 .../contrib/chat/browser/chatQuotasService.ts |  2 +-
 .../contrib/chat/browser/chatSetup.ts         | 26 +++++---
 4 files changed, 56 insertions(+), 35 deletions(-)

diff --git a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
index 6aa44168c7b..0264e5460d4 100644
--- a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
+++ b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
@@ -207,10 +207,6 @@
 	border-color: var(--vscode-commandCenter-inactiveBorder) !important;
 }
 
-.monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .codicon-copilot {
-	font-size: 14px;
-}
-
 .monaco-workbench .part.titlebar > .titlebar-container > .titlebar-center > .window-title > .command-center .action-item.command-center-center:HOVER {
 	color: var(--vscode-commandCenter-activeForeground);
 	background-color: var(--vscode-commandCenter-activeBackground);
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index ce421fb0491..cca372c6103 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -20,7 +20,7 @@ import { ILocalizedString, localize, localize2 } from '../../../../../nls.js';
 import { IActionViewItemService } from '../../../../../platform/actions/browser/actionViewItemService.js';
 import { DropdownWithPrimaryActionViewItem } from '../../../../../platform/actions/browser/dropdownWithPrimaryActionViewItem.js';
 import { Action2, MenuId, MenuItemAction, MenuRegistry, registerAction2, SubmenuItemAction } from '../../../../../platform/actions/common/actions.js';
-import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IsLinuxContext, IsWindowsContext } from '../../../../../platform/contextkey/common/contextkeys.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
@@ -571,9 +571,12 @@ export class ChatCommandCenterRendering extends Disposable implements IWorkbench
 		@IChatAgentService agentService: IChatAgentService,
 		@IChatQuotasService chatQuotasService: IChatQuotasService,
 		@IInstantiationService instantiationService: IInstantiationService,
+		@IContextKeyService contextKeyService: IContextKeyService,
 	) {
 		super();
 
+		const contextKeySet = new Set([ChatContextKeys.Setup.signedOut.key]);
+
 		actionViewItemService.register(MenuId.CommandCenter, MenuId.ChatCommandCenter, (action, options) => {
 			if (!(action instanceof SubmenuItemAction)) {
 				return undefined;
@@ -587,29 +590,39 @@ export class ChatCommandCenterRendering extends Disposable implements IWorkbench
 
 			const chatExtensionInstalled = agentService.getAgents().some(agent => agent.isDefault);
 			const { chatQuotaExceeded, completionsQuotaExceeded } = chatQuotasService.quotas;
-
-			let primaryAction: MenuItemAction;
-			if (chatExtensionInstalled && !chatQuotaExceeded && !completionsQuotaExceeded) {
-				primaryAction = instantiationService.createInstance(MenuItemAction, {
-					id: CHAT_OPEN_ACTION_ID,
-					title: OpenChatGlobalAction.TITLE,
-					icon: Codicon.copilot,
-				}, undefined, undefined, undefined, undefined);
-			} else if (!chatExtensionInstalled) {
-				primaryAction = instantiationService.createInstance(MenuItemAction, {
-					id: 'workbench.action.chat.triggerSetup',
-					title: localize2('triggerChatSetup', "Use AI Features with Copilot for Free..."),
-					icon: Codicon.copilot,
-				}, undefined, undefined, undefined, undefined);
+			const signedOut = contextKeyService.getContextKeyValue<boolean>(ChatContextKeys.Setup.signedOut.key) ?? false;
+
+			let primaryActionId: string;
+			let primaryActionTitle: string;
+			let primaryActionIcon: ThemeIcon;
+			if (!chatExtensionInstalled) {
+				primaryActionId = 'workbench.action.chat.triggerSetup';
+				primaryActionTitle = localize('triggerChatSetup', "Use AI Features with Copilot for Free...");
+				primaryActionIcon = Codicon.copilot;
 			} else {
-				primaryAction = instantiationService.createInstance(MenuItemAction, {
-					id: OPEN_CHAT_QUOTA_EXCEEDED_DIALOG,
-					title: quotaToButtonMessage({ chatQuotaExceeded, completionsQuotaExceeded }),
-					icon: Codicon.copilotWarning,
-				}, undefined, undefined, undefined, undefined);
+				if (signedOut) {
+					primaryActionId = CHAT_OPEN_ACTION_ID;
+					primaryActionTitle = localize('signInToChatSetup', "Sign in to Use Copilot...");
+					primaryActionIcon = Codicon.copilotWarning;
+				} else if (chatQuotaExceeded || completionsQuotaExceeded) {
+					primaryActionId = OPEN_CHAT_QUOTA_EXCEEDED_DIALOG;
+					primaryActionTitle = quotaToButtonMessage({ chatQuotaExceeded, completionsQuotaExceeded });
+					primaryActionIcon = Codicon.copilotWarning;
+				} else {
+					primaryActionId = CHAT_OPEN_ACTION_ID;
+					primaryActionTitle = OpenChatGlobalAction.TITLE.value;
+					primaryActionIcon = Codicon.copilot;
+				}
 			}
-
-			return instantiationService.createInstance(DropdownWithPrimaryActionViewItem, primaryAction, dropdownAction, action.actions, '', { ...options, skipTelemetry: true });
-		}, Event.any(agentService.onDidChangeAgents, chatQuotasService.onDidChangeQuotas));
+			return instantiationService.createInstance(DropdownWithPrimaryActionViewItem, instantiationService.createInstance(MenuItemAction, {
+				id: primaryActionId,
+				title: primaryActionTitle,
+				icon: primaryActionIcon,
+			}, undefined, undefined, undefined, undefined), dropdownAction, action.actions, '', { ...options, skipTelemetry: true });
+		}, Event.any(
+			agentService.onDidChangeAgents,
+			chatQuotasService.onDidChangeQuotas,
+			Event.filter(contextKeyService.onDidChangeContext, e => e.affectsSome(contextKeySet))
+		));
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts b/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
index 6ed345aacdb..11cb99aa8eb 100644
--- a/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
@@ -173,7 +173,7 @@ export class ChatQuotasService extends Disposable implements IChatQuotasService
 					],
 					custom: {
 						closeOnLinkClick: true,
-						icon: Codicon.copilotWarning,
+						icon: Codicon.copilotWarningLarge,
 						markdownDetails: [
 							{ markdown: new MarkdownString(message, true) },
 							{ markdown: new MarkdownString(upgradeToPro, true) }
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 0e6fa398837..b4eca48c3bb 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -180,7 +180,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 
 				await that.context.update({ triggered: true });
 
-				showCopilotView(viewsService);
+				showCopilotView(viewsService, layoutService);
 				ensureSideBarChatViewSize(400, viewDescriptorService, layoutService);
 
 				if (startSetup === true && !ASK_FOR_PUBLIC_CODE_MATCHES) {
@@ -616,7 +616,8 @@ class ChatSetupController extends Disposable {
 		@IProgressService private readonly progressService: IProgressService,
 		@IChatAgentService private readonly chatAgentService: IChatAgentService,
 		@IActivityService private readonly activityService: IActivityService,
-		@ICommandService private readonly commandService: ICommandService
+		@ICommandService private readonly commandService: ICommandService,
+		@IWorkbenchLayoutService private readonly layoutService: IWorkbenchLayoutService
 	) {
 		super();
 
@@ -692,7 +693,7 @@ class ChatSetupController extends Disposable {
 		let session: AuthenticationSession | undefined;
 		let entitlement: ChatEntitlement | undefined;
 		try {
-			showCopilotView(this.viewsService);
+			showCopilotView(this.viewsService, this.layoutService);
 			session = await this.authenticationService.createSession(defaultChat.providerId, defaultChat.providerScopes[0]);
 			entitlement = await this.requests.forceResolveEntitlement(session);
 		} catch (error) {
@@ -714,7 +715,7 @@ class ChatSetupController extends Disposable {
 		const wasInstalled = this.context.state.installed;
 		let didSignUp = false;
 		try {
-			showCopilotView(this.viewsService);
+			showCopilotView(this.viewsService, this.layoutService);
 
 			if (entitlement !== ChatEntitlement.Limited && entitlement !== ChatEntitlement.Pro && entitlement !== ChatEntitlement.Unavailable) {
 				didSignUp = await this.requests.signUpLimited(session, options);
@@ -749,7 +750,7 @@ class ChatSetupController extends Disposable {
 
 		const currentActiveElement = getActiveElement();
 		if (activeElement === currentActiveElement || currentActiveElement === mainWindow.document.body) {
-			(await showCopilotView(this.viewsService))?.focusInput();
+			(await showCopilotView(this.viewsService, this.layoutService))?.focusInput();
 		}
 	}
 }
@@ -953,7 +954,7 @@ class ChatSetupContext extends Disposable {
 		super();
 
 		this.checkExtensionInstallation();
-		this.updateContext();
+		this.updateContextSync();
 	}
 
 	private async checkExtensionInstallation(): Promise<void> {
@@ -1014,6 +1015,10 @@ class ChatSetupContext extends Disposable {
 	private async updateContext(): Promise<void> {
 		await this.updateBarrier?.wait();
 
+		this.updateContextSync();
+	}
+
+	private updateContextSync(): void {
 		this.logService.trace(`[chat setup] updateContext(): ${JSON.stringify(this._state)}`);
 
 		if (this._state.triggered && !this._state.installed) {
@@ -1060,7 +1065,14 @@ function isCopilotEditsViewActive(viewsService: IViewsService): boolean {
 	return viewsService.getFocusedView()?.id === EditsViewId;
 }
 
-function showCopilotView(viewsService: IViewsService): Promise<IChatWidget | undefined> {
+function showCopilotView(viewsService: IViewsService, layoutService: IWorkbenchLayoutService): Promise<IChatWidget | undefined> {
+
+	// Ensure main window is in front
+	if (layoutService.activeContainer !== layoutService.mainContainer) {
+		layoutService.mainContainer.focus();
+	}
+
+	// Bring up the correct view
 	if (isCopilotEditsViewActive(viewsService)) {
 		return showEditsView(viewsService);
 	} else {

From 9d3edd480c56d906565ecde462716867aa9379f9 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Fri, 6 Dec 2024 14:15:35 +0100
Subject: [PATCH 015/479] SCM - dirty diff refactoring + clean-up (#235486)

* DirtyDiff - clean-up original model variables

* Add more information to the result object

* A bit more cleanup

* Switch to a DisposableMap
---
 src/vs/editor/common/diff/rangeMapping.ts     |  36 ++--
 .../api/browser/mainThreadEditors.ts          |  14 +-
 .../contrib/scm/browser/dirtydiffDecorator.ts | 202 ++++++++----------
 .../workbench/contrib/scm/common/quickDiff.ts |  13 +-
 4 files changed, 133 insertions(+), 132 deletions(-)

diff --git a/src/vs/editor/common/diff/rangeMapping.ts b/src/vs/editor/common/diff/rangeMapping.ts
index 09021d118b7..f6565bdc4e2 100644
--- a/src/vs/editor/common/diff/rangeMapping.ts
+++ b/src/vs/editor/common/diff/rangeMapping.ts
@@ -383,28 +383,22 @@ export function getLineRangeMapping(rangeMapping: RangeMapping, originalLines: A
 	return new DetailedLineRangeMapping(originalLineRange, modifiedLineRange, [rangeMapping]);
 }
 
-export function lineRangeMappingFromChanges(changes: IChange[]): LineRangeMapping[] {
-	const lineRangeMapping: LineRangeMapping[] = [];
-
-	for (const change of changes) {
-		let originalRange: LineRange;
-		if (change.originalEndLineNumber === 0) {
-			// Insertion
-			originalRange = new LineRange(change.originalStartLineNumber + 1, change.originalStartLineNumber + 1);
-		} else {
-			originalRange = new LineRange(change.originalStartLineNumber, change.originalEndLineNumber + 1);
-		}
-
-		let modifiedRange: LineRange;
-		if (change.modifiedEndLineNumber === 0) {
-			// Deletion
-			modifiedRange = new LineRange(change.modifiedStartLineNumber + 1, change.modifiedStartLineNumber + 1);
-		} else {
-			modifiedRange = new LineRange(change.modifiedStartLineNumber, change.modifiedEndLineNumber + 1);
-		}
+export function lineRangeMappingFromChange(change: IChange): LineRangeMapping {
+	let originalRange: LineRange;
+	if (change.originalEndLineNumber === 0) {
+		// Insertion
+		originalRange = new LineRange(change.originalStartLineNumber + 1, change.originalStartLineNumber + 1);
+	} else {
+		originalRange = new LineRange(change.originalStartLineNumber, change.originalEndLineNumber + 1);
+	}
 
-		lineRangeMapping.push(new LineRangeMapping(originalRange, modifiedRange));
+	let modifiedRange: LineRange;
+	if (change.modifiedEndLineNumber === 0) {
+		// Deletion
+		modifiedRange = new LineRange(change.modifiedStartLineNumber + 1, change.modifiedStartLineNumber + 1);
+	} else {
+		modifiedRange = new LineRange(change.modifiedStartLineNumber, change.modifiedEndLineNumber + 1);
 	}
 
-	return lineRangeMapping;
+	return new LineRangeMapping(originalRange, modifiedRange);
 }
diff --git a/src/vs/workbench/api/browser/mainThreadEditors.ts b/src/vs/workbench/api/browser/mainThreadEditors.ts
index 93af5bc077d..73d81e729cb 100644
--- a/src/vs/workbench/api/browser/mainThreadEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadEditors.ts
@@ -166,7 +166,12 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 				}
 
 				return observableFromEvent(this, dirtyDiffModel.onDidChange, () => {
-					return dirtyDiffModel.getQuickDiffResults();
+					return dirtyDiffModel.getQuickDiffResults()
+						.map(result => ({
+							original: result.original,
+							modified: result.modified,
+							changes: result.changes2
+						}));
 				});
 			}
 
@@ -180,7 +185,12 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 			}
 
 			return observableFromEvent(Event.any(dirtyDiffModel.onDidChange, diffEditor.onDidUpdateDiff), () => {
-				const dirtyDiffInformation = dirtyDiffModel.getQuickDiffResults();
+				const dirtyDiffInformation = dirtyDiffModel.getQuickDiffResults()
+					.map(result => ({
+						original: result.original,
+						modified: result.modified,
+						changes: result.changes2
+					}));
 
 				const diffChanges = diffEditor.getDiffComputationResult()?.changes2 ?? [];
 				const diffInformation = [{
diff --git a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
index 098df9c8c1b..7ca28f94265 100644
--- a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
+++ b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
@@ -7,7 +7,7 @@ import * as nls from '../../../../nls.js';
 
 import './media/dirtydiffDecorator.css';
 import { ThrottledDelayer } from '../../../../base/common/async.js';
-import { IDisposable, dispose, toDisposable, Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IDisposable, dispose, toDisposable, Disposable, DisposableStore, DisposableMap } from '../../../../base/common/lifecycle.js';
 import { Event, Emitter } from '../../../../base/common/event.js';
 import * as ext from '../../../common/contributions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -57,12 +57,13 @@ import { ResourceMap } from '../../../../base/common/map.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
-import { IQuickDiffService, QuickDiff, QuickDiffResult } from '../common/quickDiff.js';
+import { IQuickDiffService, QuickDiff, QuickDiffChange, QuickDiffResult } from '../common/quickDiff.js';
 import { IQuickDiffSelectItem, SwitchQuickDiffBaseAction, SwitchQuickDiffViewItem } from './dirtyDiffSwitcher.js';
 import { IChatEditingService, WorkingSetEntryState } from '../../chat/common/chatEditingService.js';
-import { lineRangeMappingFromChanges } from '../../../../editor/common/diff/rangeMapping.js';
+import { LineRangeMapping, lineRangeMappingFromChange } from '../../../../editor/common/diff/rangeMapping.js';
 import { DiffState } from '../../../../editor/browser/widget/diffEditor/diffEditorViewModel.js';
 import { toLineChanges } from '../../../../editor/browser/widget/diffEditor/diffEditorWidget.js';
+import { Iterable } from '../../../../base/common/iterator.js';
 
 class DiffActionRunner extends ActionRunner {
 
@@ -204,8 +205,10 @@ class DirtyDiffWidget extends PeekViewWidget {
 		this._disposables.add(themeService.onDidColorThemeChange(this._applyTheme, this));
 		this._applyTheme(themeService.getColorTheme());
 
-		if (this.model.original.length > 0) {
-			contextKeyService = contextKeyService.createOverlay([['originalResourceScheme', this.model.original[0].uri.scheme], ['originalResourceSchemes', this.model.original.map(original => original.uri.scheme)]]);
+		if (!Iterable.isEmpty(this.model.originalTextModels)) {
+			contextKeyService = contextKeyService.createOverlay([
+				['originalResourceScheme', Iterable.first(this.model.originalTextModels)?.uri.scheme],
+				['originalResourceSchemes', Iterable.map(this.model.originalTextModels, textModel => textModel.uri.scheme)]]);
 		}
 
 		this.create();
@@ -234,15 +237,13 @@ class DirtyDiffWidget extends PeekViewWidget {
 		const labeledChange = this.model.changes[index];
 		const change = labeledChange.change;
 		this._index = index;
-		this.contextKeyService.createKey('originalResourceScheme', this.model.changes[index].uri.scheme);
+		this.contextKeyService.createKey('originalResourceScheme', this.model.changes[index].original.scheme);
 		this.updateActions();
 
 		this._provider = labeledChange.label;
 		this.change = change;
 
-		const originalModel = this.model.original;
-
-		if (!originalModel) {
+		if (Iterable.isEmpty(this.model.originalTextModels)) {
 			return;
 		}
 
@@ -252,7 +253,7 @@ class DirtyDiffWidget extends PeekViewWidget {
 		// non-side-by-side diff still hasn't created the view zones
 		onFirstDiffUpdate(() => setTimeout(() => this.revealChange(change), 0));
 
-		const diffEditorModel = this.model.getDiffEditorModel(labeledChange.uri.toString());
+		const diffEditorModel = this.model.getDiffEditorModel(labeledChange.original);
 		if (!diffEditorModel) {
 			return;
 		}
@@ -291,7 +292,7 @@ class DirtyDiffWidget extends PeekViewWidget {
 	}
 
 	private renderTitle(label: string): void {
-		const providerChanges = this.model.mapChanges.get(label)!;
+		const providerChanges = this.model.quickDiffChanges.get(label)!;
 		const providerIndex = providerChanges.indexOf(this._index);
 
 		let detail: string;
@@ -336,16 +337,8 @@ class DirtyDiffWidget extends PeekViewWidget {
 	}
 
 	private shouldUseDropdown(): boolean {
-		let providersWithChangesCount = 0;
-		if (this.model.mapChanges.size > 1) {
-			const keys = Array.from(this.model.mapChanges.keys());
-			for (let i = 0; (i < keys.length) && (providersWithChangesCount <= 1); i++) {
-				if (this.model.mapChanges.get(keys[i])!.length > 0) {
-					providersWithChangesCount++;
-				}
-			}
-		}
-		return providersWithChangesCount >= 2;
+		return this.model.getQuickDiffResults()
+			.filter(quickDiff => quickDiff.changes.length > 0).length > 1;
 	}
 
 	private updateActions(): void {
@@ -787,7 +780,7 @@ export class DirtyDiffController extends Disposable implements DirtyDiffContribu
 		if (this.editor.hasModel() && (typeof lineNumber === 'number' || !this.widget.provider)) {
 			index = this.model.findNextClosestChange(typeof lineNumber === 'number' ? lineNumber : this.editor.getPosition().lineNumber, true, this.widget.provider);
 		} else {
-			const providerChanges: number[] = this.model.mapChanges.get(this.widget.provider) ?? this.model.mapChanges.values().next().value!;
+			const providerChanges: number[] = this.model.quickDiffChanges.get(this.widget.provider) ?? this.model.quickDiffChanges.values().next().value!;
 			const mapIndex = providerChanges.findIndex(value => value === this.widget!.index);
 			index = providerChanges[rot(mapIndex + 1, providerChanges.length)];
 		}
@@ -807,7 +800,7 @@ export class DirtyDiffController extends Disposable implements DirtyDiffContribu
 		if (this.editor.hasModel() && (typeof lineNumber === 'number')) {
 			index = this.model.findPreviousClosestChange(typeof lineNumber === 'number' ? lineNumber : this.editor.getPosition().lineNumber, true, this.widget.provider);
 		} else {
-			const providerChanges: number[] = this.model.mapChanges.get(this.widget.provider) ?? this.model.mapChanges.values().next().value!;
+			const providerChanges: number[] = this.model.quickDiffChanges.get(this.widget.provider) ?? this.model.quickDiffChanges.values().next().value!;
 			const mapIndex = providerChanges.findIndex(value => value === this.widget!.index);
 			index = providerChanges[rot(mapIndex - 1, providerChanges.length)];
 		}
@@ -879,7 +872,7 @@ export class DirtyDiffController extends Disposable implements DirtyDiffContribu
 		return true;
 	}
 
-	private onDidModelChange(splices: ISplice<LabeledChange>[]): void {
+	private onDidModelChange(splices: ISplice<QuickDiffChange>[]): void {
 		if (!this.model || !this.widget || this.widget.hasFocus()) {
 			return;
 		}
@@ -1210,29 +1203,34 @@ export async function getOriginalResource(quickDiffService: IQuickDiffService, u
 	return quickDiffs.length > 0 ? quickDiffs[0].originalResource : null;
 }
 
-type LabeledChange = { change: IChange; label: string; uri: URI };
-
 export class DirtyDiffModel extends Disposable {
 
-	private _quickDiffs: QuickDiff[] = [];
-	private _originalModels: Map<string, IResolvedTextEditorModel> = new Map(); // key is uri.toString()
-	private _originalTextModels: ITextModel[] = [];
 	private _model: ITextFileEditorModel;
-	get original(): ITextModel[] { return this._originalTextModels; }
 
-	private diffDelayer = new ThrottledDelayer<void>(200);
-	private _quickDiffsPromise?: Promise<QuickDiff[]>;
-	private repositoryDisposables = new Set<IDisposable>();
-	private readonly originalModelDisposables = this._register(new DisposableStore());
+	private readonly _originalEditorModels = new ResourceMap<IResolvedTextEditorModel>();
+	private readonly _originalEditorModelsDisposables = this._register(new DisposableStore());
+	get originalTextModels(): Iterable<ITextModel> {
+		return Iterable.map(this._originalEditorModels.values(), editorModel => editorModel.textEditorModel);
+	}
+
 	private _disposed = false;
+	private _quickDiffs: QuickDiff[] = [];
+	private _quickDiffsPromise?: Promise<QuickDiff[]>;
+	private _diffDelayer = new ThrottledDelayer<void>(200);
+
+	private readonly _onDidChange = new Emitter<{ changes: QuickDiffChange[]; diff: ISplice<QuickDiffChange>[] }>();
+	readonly onDidChange: Event<{ changes: QuickDiffChange[]; diff: ISplice<QuickDiffChange>[] }> = this._onDidChange.event;
 
-	private readonly _onDidChange = new Emitter<{ changes: LabeledChange[]; diff: ISplice<LabeledChange>[] }>();
-	readonly onDidChange: Event<{ changes: LabeledChange[]; diff: ISplice<LabeledChange>[] }> = this._onDidChange.event;
+	private _changes: QuickDiffChange[] = [];
+	get changes(): QuickDiffChange[] { return this._changes; }
 
-	private _changes: LabeledChange[] = [];
-	get changes(): LabeledChange[] { return this._changes; }
-	private _mapChanges: Map<string, number[]> = new Map(); // key is the quick diff name, value is the index of the change in this._changes
-	get mapChanges(): Map<string, number[]> { return this._mapChanges; }
+	/**
+	 * Map of quick diff name to the index of the change in `this.changes`
+	 */
+	private _quickDiffChanges: Map<string, number[]> = new Map();
+	get quickDiffChanges(): Map<string, number[]> { return this._quickDiffChanges; }
+
+	private readonly _repositoryDisposables = new DisposableMap<ISCMRepository>();
 
 	constructor(
 		textFileModel: IResolvedTextFileEditorModel,
@@ -1260,10 +1258,9 @@ export class DirtyDiffModel extends Disposable {
 		}
 
 		this._register(this._model.onDidChangeEncoding(() => {
-			this.diffDelayer.cancel();
+			this._diffDelayer.cancel();
 			this._quickDiffs = [];
-			this._originalModels.clear();
-			this._originalTextModels = [];
+			this._originalEditorModels.clear();
 			this._quickDiffsPromise = undefined;
 			this.setChanges([], new Map());
 			this.triggerDiff();
@@ -1280,65 +1277,56 @@ export class DirtyDiffModel extends Disposable {
 
 	public getQuickDiffResults(): QuickDiffResult[] {
 		return this._quickDiffs.map(quickDiff => {
-			const changes = this._changes
-				.filter(change => change.label === quickDiff.label)
-				.map(change => change.change);
+			const changes = this.changes
+				.filter(change => change.label === quickDiff.label);
 
-			// Convert IChange[] to LineRangeMapping[]
-			const lineRangeMappings = lineRangeMappingFromChanges(changes);
 			return {
+				label: quickDiff.label,
 				original: quickDiff.originalResource,
 				modified: this._model.resource,
-				changes: lineRangeMappings
+				changes: changes.map(change => change.change),
+				changes2: changes.map(change => change.change2)
 			};
 		});
 	}
 
-	public getDiffEditorModel(originalUri: string): IDiffEditorModel | undefined {
-		if (!this._originalModels.has(originalUri)) {
-			return;
-		}
-		const original = this._originalModels.get(originalUri)!;
-
-		return {
-			modified: this._model.textEditorModel!,
-			original: original.textEditorModel
-		};
+	public getDiffEditorModel(originalUri: URI): IDiffEditorModel | undefined {
+		const editorModel = this._originalEditorModels.get(originalUri);
+		return editorModel ?
+			{
+				modified: this._model.textEditorModel!,
+				original: editorModel.textEditorModel
+			} : undefined;
 	}
 
 	private onDidAddRepository(repository: ISCMRepository): void {
 		const disposables = new DisposableStore();
 
-		this.repositoryDisposables.add(disposables);
-		disposables.add(toDisposable(() => this.repositoryDisposables.delete(disposables)));
-
 		disposables.add(repository.provider.onDidChangeResources(this.triggerDiff, this));
 
-		const onDidRemoveThis = Event.filter(this.scmService.onDidRemoveRepository, r => r === repository);
-		disposables.add(onDidRemoveThis(() => dispose(disposables), null));
+		const onDidRemoveRepository = Event.filter(this.scmService.onDidRemoveRepository, r => r === repository);
+		disposables.add(onDidRemoveRepository(() => this._repositoryDisposables.deleteAndDispose(repository)));
+
+		this._repositoryDisposables.set(repository, disposables);
 
 		this.triggerDiff();
 	}
 
 	private triggerDiff(): void {
-		if (!this.diffDelayer) {
+		if (!this._diffDelayer) {
 			return;
 		}
 
-		this.diffDelayer
+		this._diffDelayer
 			.trigger(async () => {
-				const result: { changes: LabeledChange[]; mapChanges: Map<string, number[]> } | null = await this.diff();
+				const result: { changes: QuickDiffChange[]; mapChanges: Map<string, number[]> } | null = await this.diff();
 
-				const originalModels = Array.from(this._originalModels.values());
-				if (!result || this._disposed || this._model.isDisposed() || originalModels.some(originalModel => originalModel.isDisposed())) {
+				const editorModels = Array.from(this._originalEditorModels.values());
+				if (!result || this._disposed || this._model.isDisposed() || editorModels.some(editorModel => editorModel.isDisposed())) {
 					return; // disposed
 				}
 
-				if (originalModels.every(originalModel => originalModel.textEditorModel.getValueLength() === 0)) {
-					result.changes = [];
-				}
-
-				if (!result.changes) {
+				if (editorModels.every(editorModel => editorModel.textEditorModel.getValueLength() === 0)) {
 					result.changes = [];
 				}
 
@@ -1347,14 +1335,14 @@ export class DirtyDiffModel extends Disposable {
 			.catch(err => onUnexpectedError(err));
 	}
 
-	private setChanges(changes: LabeledChange[], mapChanges: Map<string, number[]>): void {
-		const diff = sortedDiff(this._changes, changes, (a, b) => compareChanges(a.change, b.change));
+	private setChanges(changes: QuickDiffChange[], mapChanges: Map<string, number[]>): void {
+		const diff = sortedDiff(this.changes, changes, (a, b) => compareChanges(a.change, b.change));
 		this._changes = changes;
-		this._mapChanges = mapChanges;
+		this._quickDiffChanges = mapChanges;
 		this._onDidChange.fire({ changes, diff });
 	}
 
-	private diff(): Promise<{ changes: LabeledChange[]; mapChanges: Map<string, number[]> } | null> {
+	private diff(): Promise<{ changes: QuickDiffChange[]; mapChanges: Map<string, number[]> } | null> {
 		return this.progressService.withProgress({ location: ProgressLocation.Scm, delay: 250 }, async () => {
 			const originalURIs = await this.getQuickDiffsPromise();
 			if (this._disposed || this._model.isDisposed() || (originalURIs.length === 0)) {
@@ -1371,14 +1359,18 @@ export class DirtyDiffModel extends Disposable {
 				? this.configurationService.getValue<boolean>('diffEditor.ignoreTrimWhitespace')
 				: ignoreTrimWhitespaceSetting !== 'false';
 
-			const allDiffs: LabeledChange[] = [];
+			const allDiffs: QuickDiffChange[] = [];
 			for (const quickDiff of filteredToDiffable) {
 				const dirtyDiff = await this._diff(quickDiff.originalResource, this._model.resource, ignoreTrimWhitespace);
-				if (dirtyDiff) {
-					for (const diff of dirtyDiff) {
-						if (diff) {
-							allDiffs.push({ change: diff, label: quickDiff.label, uri: quickDiff.originalResource });
-						}
+				if (dirtyDiff.changes && dirtyDiff.changes2 && dirtyDiff.changes.length === dirtyDiff.changes2.length) {
+					for (let index = 0; index < dirtyDiff.changes.length; index++) {
+						allDiffs.push({
+							label: quickDiff.label,
+							original: quickDiff.originalResource,
+							modified: this._model.resource,
+							change: dirtyDiff.changes[index],
+							change2: dirtyDiff.changes2[index]
+						});
 					}
 				}
 			}
@@ -1395,22 +1387,19 @@ export class DirtyDiffModel extends Disposable {
 		});
 	}
 
-	private async _diff(original: URI, modified: URI, ignoreTrimWhitespace: boolean): Promise<IChange[] | null> {
+	private async _diff(original: URI, modified: URI, ignoreTrimWhitespace: boolean): Promise<{ changes: readonly IChange[] | null; changes2: readonly LineRangeMapping[] | null }> {
 		if (this.algorithm === undefined) {
-			return this.editorWorkerService.computeDirtyDiff(original, modified, ignoreTrimWhitespace);
+			const changes = await this.editorWorkerService.computeDirtyDiff(original, modified, ignoreTrimWhitespace);
+			return { changes, changes2: changes?.map(change => lineRangeMappingFromChange(change)) ?? null };
 		}
 
-		const diffResult = await this.editorWorkerService.computeDiff(original, modified, {
+		const result = await this.editorWorkerService.computeDiff(original, modified, {
 			computeMoves: false,
 			ignoreTrimWhitespace,
 			maxComputationTimeMs: Number.MAX_SAFE_INTEGER
 		}, this.algorithm);
 
-		if (!diffResult) {
-			return null;
-		}
-
-		return toLineChanges(DiffState.fromDiffResult(diffResult));
+		return { changes: result ? toLineChanges(DiffState.fromDiffResult(result)) : null, changes2: result?.changes ?? null };
 	}
 
 	private getQuickDiffsPromise(): Promise<QuickDiff[]> {
@@ -1425,8 +1414,7 @@ export class DirtyDiffModel extends Disposable {
 
 			if (quickDiffs.length === 0) {
 				this._quickDiffs = [];
-				this._originalModels.clear();
-				this._originalTextModels = [];
+				this._originalEditorModels.clear();
 				return [];
 			}
 
@@ -1434,10 +1422,10 @@ export class DirtyDiffModel extends Disposable {
 				return quickDiffs;
 			}
 
-			this.originalModelDisposables.clear();
-			this._originalModels.clear();
-			this._originalTextModels = [];
 			this._quickDiffs = quickDiffs;
+
+			this._originalEditorModels.clear();
+			this._originalEditorModelsDisposables.clear();
 			return (await Promise.all(quickDiffs.map(async (quickDiff) => {
 				try {
 					const ref = await this.textModelResolverService.createModelReference(quickDiff.originalResource);
@@ -1446,8 +1434,7 @@ export class DirtyDiffModel extends Disposable {
 						return [];
 					}
 
-					this._originalModels.set(quickDiff.originalResource.toString(), ref.object);
-					this._originalTextModels.push(ref.object.textEditorModel);
+					this._originalEditorModels.set(quickDiff.originalResource, ref.object);
 
 					if (isTextFileEditorModel(ref.object)) {
 						const encoding = this._model.getEncoding();
@@ -1457,8 +1444,8 @@ export class DirtyDiffModel extends Disposable {
 						}
 					}
 
-					this.originalModelDisposables.add(ref);
-					this.originalModelDisposables.add(ref.object.textEditorModel.onDidChangeContent(() => this.triggerDiff()));
+					this._originalEditorModelsDisposables.add(ref);
+					this._originalEditorModelsDisposables.add(ref.object.textEditorModel.onDidChangeContent(() => this.triggerDiff()));
 
 					return quickDiff;
 				} catch (error) {
@@ -1553,15 +1540,14 @@ export class DirtyDiffModel extends Disposable {
 	}
 
 	override dispose(): void {
-		super.dispose();
-
 		this._disposed = true;
+
 		this._quickDiffs = [];
-		this._originalModels.clear();
-		this._originalTextModels = [];
-		this.diffDelayer.cancel();
-		this.repositoryDisposables.forEach(d => dispose(d));
-		this.repositoryDisposables.clear();
+		this._diffDelayer.cancel();
+		this._originalEditorModels.clear();
+		this._repositoryDisposables.dispose();
+
+		super.dispose();
 	}
 }
 
diff --git a/src/vs/workbench/contrib/scm/common/quickDiff.ts b/src/vs/workbench/contrib/scm/common/quickDiff.ts
index 0720dc9f5ff..3770f071c72 100644
--- a/src/vs/workbench/contrib/scm/common/quickDiff.ts
+++ b/src/vs/workbench/contrib/scm/common/quickDiff.ts
@@ -9,6 +9,7 @@ import { IDisposable } from '../../../../base/common/lifecycle.js';
 import { LanguageSelector } from '../../../../editor/common/languageSelector.js';
 import { Event } from '../../../../base/common/event.js';
 import { LineRangeMapping } from '../../../../editor/common/diff/rangeMapping.js';
+import { IChange } from '../../../../editor/common/diff/legacyLinesDiffComputer.js';
 
 export const IQuickDiffService = createDecorator<IQuickDiffService>('quickDiff');
 
@@ -28,10 +29,20 @@ export interface QuickDiff {
 	visible: boolean;
 }
 
+export interface QuickDiffChange {
+	readonly label: string;
+	readonly original: URI;
+	readonly modified: URI;
+	readonly change: IChange;
+	readonly change2: LineRangeMapping;
+}
+
 export interface QuickDiffResult {
+	readonly label: string;
 	readonly original: URI;
 	readonly modified: URI;
-	readonly changes: readonly LineRangeMapping[];
+	readonly changes: IChange[];
+	readonly changes2: LineRangeMapping[];
 }
 
 export interface IQuickDiffService {

From 7b991b48600f10508f35ca67e368c4584548eb3e Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Fri, 6 Dec 2024 14:16:04 +0100
Subject: [PATCH 016/479] Fix explorer find rerender error (#235488)

fix #234129
---
 .../workbench/contrib/files/browser/views/explorerViewer.ts   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
index 5951803d0ae..9f15f33a26b 100644
--- a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
+++ b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
@@ -562,7 +562,9 @@ export class ExplorerFindProvider implements IAsyncFindProvider<ExplorerItem> {
 
 		const tree = this.treeProvider();
 		for (const directory of highlightedDirectories) {
-			tree.rerender(directory);
+			if (tree.hasNode(directory)) {
+				tree.rerender(directory);
+			}
 		}
 	}
 

From 354482357af4ff091191b9fa5c607bd23c6430c0 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Fri, 6 Dec 2024 14:20:30 +0100
Subject: [PATCH 017/479] Await that decorations are added with definition
 hover preview before showing hover (#235489)

returning promise
---
 .../contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.ts b/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.ts
index 6f6f8323e02..70c093ee9d8 100644
--- a/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.ts
+++ b/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.ts
@@ -196,7 +196,7 @@ export class GotoDefinitionAtPositionEditorContribution implements IEditorContri
 				return;
 			}
 
-			this.textModelResolverService.createModelReference(result.uri).then(ref => {
+			return this.textModelResolverService.createModelReference(result.uri).then(ref => {
 
 				if (!ref.object || !ref.object.textEditorModel) {
 					ref.dispose();

From ad42640a78864e43008b8d5b750d04e96dd05218 Mon Sep 17 00:00:00 2001
From: Pankaj Khandelwal <44100113+pankajk07@users.noreply.github.com>
Date: Fri, 6 Dec 2024 19:30:53 +0530
Subject: [PATCH 018/479] fix: disabled PlzDedicatedWorker in Electron
 (#233175)

* fix: disabled PlzDedicatedWorker in Electron

* chore: cleanup

---------

Co-authored-by: deepak1556 <hop2deep@gmail.com>
---
 src/main.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main.ts b/src/main.ts
index 2d9c977a3bd..1504375283f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -288,8 +288,9 @@ function configureCommandlineSwitchesSync(cliArgs: NativeParsedArgs) {
 
 	// Following features are disabled from the runtime:
 	// `CalculateNativeWinOcclusion` - Disable native window occlusion tracker (https://groups.google.com/a/chromium.org/g/embedder-dev/c/ZF3uHHyWLKw/m/VDN2hDXMAAAJ)
+	// `PlzDedicatedWorker` - Refs https://github.com/microsoft/vscode/issues/233060#issuecomment-2523212427
 	const featuresToDisable =
-		`CalculateNativeWinOcclusion,${app.commandLine.getSwitchValue('disable-features')}`;
+		`CalculateNativeWinOcclusion,PlzDedicatedWorker,${app.commandLine.getSwitchValue('disable-features')}`;
 	app.commandLine.appendSwitch('disable-features', featuresToDisable);
 
 	// Blink features to configure.

From 5d8ea135391debc0ccabf6d6cb9c35e572ef469b Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 6 Dec 2024 15:48:28 +0100
Subject: [PATCH 019/479] Ben/active-ocelot (#235494)

* chat - make quota reset date explicitly `undefined` if neede

* chat - tweak status quota indication

* chat - tweak status indicator further
---
 .../contrib/chat/browser/chatQuotasService.ts | 50 +++++++++++++------
 .../contrib/chat/browser/chatSetup.ts         |  2 +-
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts b/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
index 11cb99aa8eb..efa9304c974 100644
--- a/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
@@ -36,9 +36,9 @@ export interface IChatQuotasService {
 }
 
 export interface IChatQuotas {
-	readonly chatQuotaExceeded: boolean;
-	readonly completionsQuotaExceeded: boolean;
-	readonly quotaResetDate: Date;
+	chatQuotaExceeded: boolean;
+	completionsQuotaExceeded: boolean;
+	quotaResetDate: Date | undefined;
 }
 
 export const OPEN_CHAT_QUOTA_EXCEEDED_DIALOG = 'workbench.action.chat.openQuotaExceededDialog';
@@ -50,7 +50,7 @@ export class ChatQuotasService extends Disposable implements IChatQuotasService
 	private readonly _onDidChangeQuotas = this._register(new Emitter<void>());
 	readonly onDidChangeQuotas: Event<void> = this._onDidChangeQuotas.event;
 
-	private _quotas = { chatQuotaExceeded: false, completionsQuotaExceeded: false, quotaResetDate: new Date(0) };
+	private _quotas: IChatQuotas = { chatQuotaExceeded: false, completionsQuotaExceeded: false, quotaResetDate: undefined };
 	get quotas(): IChatQuotas { return this._quotas; }
 
 	private readonly chatQuotaExceededContextKey = ChatContextKeys.chatQuotaExceeded.bindTo(this.contextKeyService);
@@ -227,7 +227,7 @@ export class ChatQuotasService extends Disposable implements IChatQuotasService
 
 	clearQuotas(): void {
 		if (this.quotas.chatQuotaExceeded || this.quotas.completionsQuotaExceeded) {
-			this.acceptQuotas({ chatQuotaExceeded: false, completionsQuotaExceeded: false, quotaResetDate: new Date(0) });
+			this.acceptQuotas({ chatQuotaExceeded: false, completionsQuotaExceeded: false, quotaResetDate: undefined });
 		}
 	}
 
@@ -241,6 +241,8 @@ export class ChatQuotasStatusBarEntry extends Disposable implements IWorkbenchCo
 
 	static readonly ID = 'chat.quotasStatusBarEntry';
 
+	private static readonly COPILOT_STATUS_ID = 'GitHub.copilot.status'; // TODO@bpasero unify into 1 core indicator
+
 	private readonly _entry = this._register(new MutableDisposable<IStatusbarEntryAccessor>());
 
 	constructor(
@@ -254,19 +256,39 @@ export class ChatQuotasStatusBarEntry extends Disposable implements IWorkbenchCo
 
 	private updateStatusbarEntry(): void {
 		const { chatQuotaExceeded, completionsQuotaExceeded } = this.chatQuotasService.quotas;
+
+		// Some quota exceeded, show indicator
 		if (chatQuotaExceeded || completionsQuotaExceeded) {
-			// Some quota exceeded, show indicator
+			let text: string;
+			if (chatQuotaExceeded && !completionsQuotaExceeded) {
+				text = localize('chatQuotaExceededStatus', "Chat limit reached");
+			} else if (completionsQuotaExceeded && !chatQuotaExceeded) {
+				text = localize('completionsQuotaExceededStatus', "Completions limit reached");
+			} else {
+				text = localize('chatAndCompletionsQuotaExceededStatus', "Copilot limit reached");
+			}
+
+			const isCopilotStatusVisible = this.statusbarService.isEntryVisible(ChatQuotasStatusBarEntry.COPILOT_STATUS_ID);
+			if (!isCopilotStatusVisible) {
+				text = `$(copilot-warning) ${text}`;
+			}
+
 			this._entry.value = this.statusbarService.addEntry({
-				name: localize('indicator', "Copilot Quota Indicator"),
-				text: localize('limitReached', "Copilot Limit Reached"),
-				ariaLabel: localize('copilotQuotaExceeded', "Copilot Limit Reached"),
+				name: localize('indicator', "Copilot Limit Indicator"),
+				text,
+				ariaLabel: text,
 				command: OPEN_CHAT_QUOTA_EXCEEDED_DIALOG,
-				kind: 'prominent',
 				showInAllWindows: true,
-				tooltip: quotaToButtonMessage({ chatQuotaExceeded, completionsQuotaExceeded }),
-			}, ChatQuotasStatusBarEntry.ID, StatusbarAlignment.RIGHT, { id: 'GitHub.copilot.status', alignment: StatusbarAlignment.RIGHT }); // TODO@bpasero unify into 1 core indicator
-		} else {
-			// No quota exceeded, remove indicator
+				tooltip: quotaToButtonMessage({ chatQuotaExceeded, completionsQuotaExceeded })
+			}, ChatQuotasStatusBarEntry.ID, StatusbarAlignment.RIGHT, {
+				id: ChatQuotasStatusBarEntry.COPILOT_STATUS_ID,
+				alignment: StatusbarAlignment.RIGHT,
+				compact: isCopilotStatusVisible
+			});
+		}
+
+		// No quota exceeded, remove indicator
+		else {
 			this._entry.clear();
 		}
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index b4eca48c3bb..27c17e06172 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -512,7 +512,7 @@ class ChatSetupRequests extends Disposable {
 			this.chatQuotasService.acceptQuotas({
 				chatQuotaExceeded: typeof state.quotas.chat === 'number' ? state.quotas.chat <= 0 : false,
 				completionsQuotaExceeded: typeof state.quotas.completions === 'number' ? state.quotas.completions <= 0 : false,
-				quotaResetDate: state.quotas.resetDate ? new Date(state.quotas.resetDate) : new Date(0)
+				quotaResetDate: state.quotas.resetDate ? new Date(state.quotas.resetDate) : undefined
 			});
 		}
 	}

From 33ba5efde7fd9fbd635acf4c2f3d605b4b871576 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 6 Dec 2024 16:13:56 +0100
Subject: [PATCH 020/479] Use AI features for free button does nothing in new
 profile (fix microsoft/vscode-copilot#11066) (#235495)

---
 src/vs/workbench/contrib/chat/browser/chat.contribution.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index 95062868665..2aa243649de 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -124,6 +124,7 @@ configurationRegistry.registerConfiguration({
 		'chat.experimental.offerSetup': {
 			type: 'boolean',
 			default: false,
+			scope: ConfigurationScope.APPLICATION,
 			markdownDescription: nls.localize('chat.experimental.offerSetup', "Controls whether setup is offered for Chat if not done already."),
 			tags: ['experimental', 'onExP']
 		},

From 96098190240692109dd0de866cdbf74090377823 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 6 Dec 2024 16:23:47 +0100
Subject: [PATCH 021/479] makes inline chat hint stable wrt blame decoration
 (#235497)

- change from injected text to after decoration
- use class name for awol attachedData

https://github.com/microsoft/vscode-copilot/issues/10943
---
 .../browser/inlineChatCurrentLine.ts          | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
index 5f48988ff06..8cf0f0891a6 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
@@ -16,7 +16,7 @@ import { Range } from '../../../../editor/common/core/range.js';
 import { IPosition, Position } from '../../../../editor/common/core/position.js';
 import { AbstractInlineChatAction } from './inlineChatActions.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
-import { InjectedTextCursorStops, IValidEditOperation, TrackedRangeStickiness } from '../../../../editor/common/model.js';
+import { IValidEditOperation, TrackedRangeStickiness } from '../../../../editor/common/model.js';
 import { URI } from '../../../../base/common/uri.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { StandardTokenType } from '../../../../editor/common/encodedTokenAttributes.js';
@@ -36,6 +36,8 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { Event } from '../../../../base/common/event.js';
 import { observableCodeEditor } from '../../../../editor/browser/observableCodeEditor.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
+import { createStyleSheet2 } from '../../../../base/browser/domStylesheets.js';
+import { stringValue } from '../../../../base/browser/cssValue.js';
 
 export const CTX_INLINE_CHAT_SHOWING_HINT = new RawContextKey<boolean>('inlineChatShowingHint', false, localize('inlineChatShowingHint', "Whether inline chat shows a contextual hint"));
 
@@ -149,12 +151,6 @@ export class ShowInlineChatHintAction extends EditorAction2 {
 	}
 }
 
-class HintData {
-	constructor(
-		readonly setting: string
-	) { }
-}
-
 export class InlineChatHintsController extends Disposable implements IEditorContribution {
 
 	public static readonly ID = 'editor.contrib.inlineChatHints';
@@ -193,8 +189,7 @@ export class InlineChatHintsController extends Disposable implements IEditorCont
 			if (e.target.type !== MouseTargetType.CONTENT_TEXT) {
 				return;
 			}
-			const attachedData = e.target.detail.injectedText?.options.attachedData;
-			if (!(attachedData instanceof HintData)) {
+			if (!e.target.element?.classList.contains('inline-chat-hint-text')) {
 				return;
 			}
 			if (e.event.leftButton) {
@@ -202,7 +197,10 @@ export class InlineChatHintsController extends Disposable implements IEditorCont
 				this.hide();
 			} else if (e.event.rightButton) {
 				e.event.preventDefault();
-				this._showContextMenu(e.event, attachedData.setting);
+				this._showContextMenu(e.event, e.target.element?.classList.contains('whitespace')
+					? InlineChatConfigKeys.LineEmptyHint
+					: InlineChatConfigKeys.LineNLHint
+				);
 			}
 		}));
 
@@ -251,6 +249,9 @@ export class InlineChatHintsController extends Disposable implements IEditorCont
 			return undefined;
 		});
 
+		const style = createStyleSheet2();
+		this._store.add(style);
+
 		this._store.add(autorun(r => {
 
 			const showData = showDataObs.read(r);
@@ -264,7 +265,7 @@ export class InlineChatHintsController extends Disposable implements IEditorCont
 			const agentName = chatAgentService.getDefaultAgent(ChatAgentLocation.Editor)?.name ?? localize('defaultTitle', "Chat");
 			const { position, isEol, isWhitespace, kb, model } = showData;
 
-			const inlineClassName: string[] = ['inline-chat-hint'];
+			const inlineClassName: string[] = ['a' /*HACK but sorts as we want*/, 'inline-chat-hint', 'inline-chat-hint-text'];
 			let content: string;
 			if (isWhitespace) {
 				content = '\u00a0' + localize('title2', "{0} to edit with {1}", kb, agentName);
@@ -275,6 +276,11 @@ export class InlineChatHintsController extends Disposable implements IEditorCont
 				inlineClassName.push('embedded');
 			}
 
+			style.setStyle(`.inline-chat-hint-text::after { content: ${stringValue(content)} }`);
+			if (isWhitespace) {
+				inlineClassName.push('whitespace');
+			}
+
 			this._ctxShowingHint.set(true);
 
 			decos.set([{
@@ -283,13 +289,7 @@ export class InlineChatHintsController extends Disposable implements IEditorCont
 					description: 'inline-chat-hint-line',
 					showIfCollapsed: true,
 					stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-					after: {
-						content,
-						inlineClassName: inlineClassName.join(' '),
-						inlineClassNameAffectsLetterSpacing: true,
-						cursorStops: InjectedTextCursorStops.None,
-						attachedData: new HintData(isWhitespace ? InlineChatConfigKeys.LineEmptyHint : InlineChatConfigKeys.LineNLHint)
-					}
+					afterContentClassName: inlineClassName.join(' '),
 				}
 			}]);
 

From f7069b2feada75d95faf3806e35e507cfa8b6fed Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Fri, 6 Dec 2024 16:41:46 +0100
Subject: [PATCH 022/479] Use `disregardIgnoreFiles` in file search queries
 (#235501)

Use `disregardIgnoreFiles` from file search
---
 .../workbench/contrib/files/browser/views/explorerViewer.ts  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
index 9f15f33a26b..4de8cc1c244 100644
--- a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
+++ b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
@@ -604,7 +604,10 @@ export class ExplorerFindProvider implements IAsyncFindProvider<ExplorerItem> {
 
 		const searchExcludePattern = getExcludes(this.configurationService.getValue<ISearchConfiguration>({ resource: root.resource })) || {};
 		const searchOptions: IFileQuery = {
-			folderQueries: [{ folder: root.resource }],
+			folderQueries: [{
+				folder: root.resource,
+				disregardIgnoreFiles: !this.configurationService.getValue<boolean>('explorer.excludeGitIgnore'),
+			}],
 			type: QueryType.File,
 			shouldGlobMatchFilePattern: true,
 			cacheKey: `explorerfindprovider:${root.name}:${rootIndex}:${this.sessionId}`,

From 8270a86019db7551da42b71d15c6080a414d8c81 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Fri, 6 Dec 2024 16:55:37 +0100
Subject: [PATCH 023/479] Update grammars (#235506)

---
 extensions/dart/cgmanifest.json               |   2 +-
 extensions/dart/syntaxes/dart.tmLanguage.json |  47 +++---
 extensions/docker/cgmanifest.json             |   4 +-
 .../docker/syntaxes/docker.tmLanguage.json    |  19 ++-
 extensions/go/cgmanifest.json                 |   4 +-
 extensions/go/syntaxes/go.tmLanguage.json     | 137 +++++++++++++++++-
 extensions/latex/cgmanifest.json              |   2 +-
 extensions/perl/cgmanifest.json               |   2 +-
 8 files changed, 178 insertions(+), 39 deletions(-)

diff --git a/extensions/dart/cgmanifest.json b/extensions/dart/cgmanifest.json
index da493cafa70..5558b78af1d 100644
--- a/extensions/dart/cgmanifest.json
+++ b/extensions/dart/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "dart-lang/dart-syntax-highlight",
 					"repositoryUrl": "https://github.com/dart-lang/dart-syntax-highlight",
-					"commitHash": "e8b053f9834cb44db0f49ac4a4567177bd943dbf"
+					"commitHash": "e1ac5c446c2531343393adbe8fff9d45d8a7c412"
 				}
 			},
 			"licenseDetail": [
diff --git a/extensions/dart/syntaxes/dart.tmLanguage.json b/extensions/dart/syntaxes/dart.tmLanguage.json
index 32ea3f5b0c3..b4f80b680bd 100644
--- a/extensions/dart/syntaxes/dart.tmLanguage.json
+++ b/extensions/dart/syntaxes/dart.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/dart-lang/dart-syntax-highlight/commit/e8b053f9834cb44db0f49ac4a4567177bd943dbf",
+	"version": "https://github.com/dart-lang/dart-syntax-highlight/commit/e1ac5c446c2531343393adbe8fff9d45d8a7c412",
 	"name": "Dart",
 	"scopeName": "source.dart",
 	"patterns": [
@@ -66,6 +66,16 @@
 		}
 	],
 	"repository": {
+		"dartdoc-codeblock-triple": {
+			"begin": "^\\s*///\\s*(?!\\s*```)",
+			"end": "\n",
+			"contentName": "variable.other.source.dart"
+		},
+		"dartdoc-codeblock-block": {
+			"begin": "^\\s*\\*\\s*(?!(\\s*```|/))",
+			"end": "\n",
+			"contentName": "variable.other.source.dart"
+		},
 		"dartdoc": {
 			"patterns": [
 				{
@@ -77,30 +87,31 @@
 					}
 				},
 				{
-					"match": "^ {4,}(?![ \\*]).*",
-					"captures": {
-						"0": {
-							"name": "variable.name.source.dart"
+					"begin": "^\\s*///\\s*(```)",
+					"end": "^\\s*///\\s*(```)|^(?!\\s*///)",
+					"patterns": [
+						{
+							"include": "#dartdoc-codeblock-triple"
 						}
-					}
+					]
 				},
 				{
-					"contentName": "variable.other.source.dart",
-					"begin": "```.*?$",
-					"end": "```"
+					"begin": "^\\s*\\*\\s*(```)",
+					"end": "^\\s*\\*\\s*(```)|^(?=\\s*\\*/)",
+					"patterns": [
+						{
+							"include": "#dartdoc-codeblock-block"
+						}
+					]
 				},
 				{
-					"match": "(`[^`]+?`)",
-					"captures": {
-						"0": {
-							"name": "variable.other.source.dart"
-						}
-					}
+					"match": "`[^`\n]+`",
+					"name": "variable.other.source.dart"
 				},
 				{
-					"match": "(\\* ((    ).*))$",
+					"match": "(?:\\*|\\/\\/)\\s{4,}(.*?)(?=($|\\*\\/))",
 					"captures": {
-						"2": {
+						"1": {
 							"name": "variable.other.source.dart"
 						}
 					}
@@ -154,7 +165,7 @@
 				{
 					"name": "comment.block.documentation.dart",
 					"begin": "///",
-					"while": "^\\s*///",
+					"end": "^(?!\\s*///)",
 					"patterns": [
 						{
 							"include": "#dartdoc"
diff --git a/extensions/docker/cgmanifest.json b/extensions/docker/cgmanifest.json
index 4f568542aed..8462de7dd72 100644
--- a/extensions/docker/cgmanifest.json
+++ b/extensions/docker/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "language-docker",
 					"repositoryUrl": "https://github.com/moby/moby",
-					"commitHash": "abd39744c6f3ed854500e423f5fabf952165161f"
+					"commitHash": "c2029cb2574647e4bc28ed58486b8e85883eedb9"
 				}
 			},
 			"license": "Apache-2.0",
@@ -15,4 +15,4 @@
 		}
 	],
 	"version": 1
-}
+}
\ No newline at end of file
diff --git a/extensions/docker/syntaxes/docker.tmLanguage.json b/extensions/docker/syntaxes/docker.tmLanguage.json
index f7f414636c4..aa5223a31ea 100644
--- a/extensions/docker/syntaxes/docker.tmLanguage.json
+++ b/extensions/docker/syntaxes/docker.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/moby/moby/commit/abd39744c6f3ed854500e423f5fabf952165161f",
+	"version": "https://github.com/moby/moby/commit/c2029cb2574647e4bc28ed58486b8e85883eedb9",
 	"name": "Dockerfile",
 	"scopeName": "source.dockerfile",
 	"patterns": [
@@ -41,6 +41,9 @@
 			},
 			"match": "^\\s*(?i:(ONBUILD)\\s+)?(?i:(CMD|ENTRYPOINT))\\s"
 		},
+		{
+			"include": "#string-character-escape"
+		},
 		{
 			"begin": "\"",
 			"beginCaptures": {
@@ -57,8 +60,7 @@
 			"name": "string.quoted.double.dockerfile",
 			"patterns": [
 				{
-					"match": "\\\\.",
-					"name": "constant.character.escaped.dockerfile"
+					"include": "#string-character-escape"
 				}
 			]
 		},
@@ -78,8 +80,7 @@
 			"name": "string.quoted.single.dockerfile",
 			"patterns": [
 				{
-					"match": "\\\\.",
-					"name": "constant.character.escaped.dockerfile"
+					"include": "#string-character-escape"
 				}
 			]
 		},
@@ -98,5 +99,11 @@
 			"comment": "comment.line",
 			"match": "^(\\s*)((#).*$\\n?)"
 		}
-	]
+	],
+	"repository": {
+		"string-character-escape": {
+			"name": "constant.character.escaped.dockerfile",
+			"match": "\\\\."
+		}
+	}
 }
\ No newline at end of file
diff --git a/extensions/go/cgmanifest.json b/extensions/go/cgmanifest.json
index 5276d2824a7..a6dbd5d1bf0 100644
--- a/extensions/go/cgmanifest.json
+++ b/extensions/go/cgmanifest.json
@@ -6,12 +6,12 @@
 				"git": {
 					"name": "go-syntax",
 					"repositoryUrl": "https://github.com/worlpaker/go-syntax",
-					"commitHash": "32bbaebcf218fa552e8f0397401e12f6e94fa3c5"
+					"commitHash": "fbdaec061157e98dda185c0ce771ce6a2c793045"
 				}
 			},
 			"license": "MIT",
 			"description": "The file syntaxes/go.tmLanguage.json is from https://github.com/worlpaker/go-syntax, which in turn was derived from https://github.com/jeff-hykin/better-go-syntax.",
-			"version": "0.7.8"
+			"version": "0.7.9"
 		}
 	],
 	"version": 1
diff --git a/extensions/go/syntaxes/go.tmLanguage.json b/extensions/go/syntaxes/go.tmLanguage.json
index ed6ead03480..db17cad3f91 100644
--- a/extensions/go/syntaxes/go.tmLanguage.json
+++ b/extensions/go/syntaxes/go.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/worlpaker/go-syntax/commit/32bbaebcf218fa552e8f0397401e12f6e94fa3c5",
+	"version": "https://github.com/worlpaker/go-syntax/commit/fbdaec061157e98dda185c0ce771ce6a2c793045",
 	"name": "Go",
 	"scopeName": "source.go",
 	"patterns": [
@@ -97,7 +97,10 @@
 			"comment": "all statements related to variables",
 			"patterns": [
 				{
-					"include": "#var_const_assignment"
+					"include": "#const_assignment"
+				},
+				{
+					"include": "#var_assignment"
 				},
 				{
 					"include": "#variable_assignment"
@@ -2645,12 +2648,12 @@
 				}
 			]
 		},
-		"var_const_assignment": {
-			"comment": "variable assignment with var and const keyword",
+		"var_assignment": {
+			"comment": "variable assignment with var keyword",
 			"patterns": [
 				{
-					"comment": "var and const with single type assignment",
-					"match": "(?:(?<=\\bvar\\b|\\bconst\\b)(?:\\s*)(\\b[\\w\\.]+(?:\\,\\s*[\\w\\.]+)*)(?:\\s*)((?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+(?:\\([^\\)]+\\))?)?(?!(?:[\\[\\]\\*]+)?\\b(?:struct|func|map)\\b)(?:[\\w\\.\\[\\]\\*]+(?:\\,\\s*[\\w\\.\\[\\]\\*]+)*)?(?:\\s*)(?:\\=)?)?)",
+					"comment": "single assignment",
+					"match": "(?:(?<=\\bvar\\b)(?:\\s*)(\\b[\\w\\.]+(?:\\,\\s*[\\w\\.]+)*)(?:\\s*)((?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+(?:\\([^\\)]+\\))?)?(?!(?:[\\[\\]\\*]+)?\\b(?:struct|func|map)\\b)(?:[\\w\\.\\[\\]\\*]+(?:\\,\\s*[\\w\\.\\[\\]\\*]+)*)?(?:\\s*)(?:\\=)?)?)",
 					"captures": {
 						"1": {
 							"patterns": [
@@ -2696,8 +2699,8 @@
 					}
 				},
 				{
-					"comment": "var and const with multi type assignment",
-					"begin": "(?:(?<=\\bvar\\b|\\bconst\\b)(?:\\s*)(\\())",
+					"comment": "multi assignment",
+					"begin": "(?:(?<=\\bvar\\b)(?:\\s*)(\\())",
 					"beginCaptures": {
 						"1": {
 							"name": "punctuation.definition.begin.bracket.round.go"
@@ -2763,6 +2766,124 @@
 				}
 			]
 		},
+		"const_assignment": {
+			"comment": "constant assignment with const keyword",
+			"patterns": [
+				{
+					"comment": "single assignment",
+					"match": "(?:(?<=\\bconst\\b)(?:\\s*)(\\b[\\w\\.]+(?:\\,\\s*[\\w\\.]+)*)(?:\\s*)((?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+(?:\\([^\\)]+\\))?)?(?!(?:[\\[\\]\\*]+)?\\b(?:struct|func|map)\\b)(?:[\\w\\.\\[\\]\\*]+(?:\\,\\s*[\\w\\.\\[\\]\\*]+)*)?(?:\\s*)(?:\\=)?)?)",
+					"captures": {
+						"1": {
+							"patterns": [
+								{
+									"include": "#delimiters"
+								},
+								{
+									"match": "\\w+",
+									"name": "variable.other.constant.go"
+								}
+							]
+						},
+						"2": {
+							"patterns": [
+								{
+									"include": "#type-declarations-without-brackets"
+								},
+								{
+									"include": "#generic_types"
+								},
+								{
+									"match": "\\(",
+									"name": "punctuation.definition.begin.bracket.round.go"
+								},
+								{
+									"match": "\\)",
+									"name": "punctuation.definition.end.bracket.round.go"
+								},
+								{
+									"match": "\\[",
+									"name": "punctuation.definition.begin.bracket.square.go"
+								},
+								{
+									"match": "\\]",
+									"name": "punctuation.definition.end.bracket.square.go"
+								},
+								{
+									"match": "\\w+",
+									"name": "entity.name.type.go"
+								}
+							]
+						}
+					}
+				},
+				{
+					"comment": "multi assignment",
+					"begin": "(?:(?<=\\bconst\\b)(?:\\s*)(\\())",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.begin.bracket.round.go"
+						}
+					},
+					"end": "\\)",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.end.bracket.round.go"
+						}
+					},
+					"patterns": [
+						{
+							"match": "(?:(?:^\\s*)(\\b[\\w\\.]+(?:\\,\\s*[\\w\\.]+)*)(?:\\s*)((?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+(?:\\([^\\)]+\\))?)?(?!(?:[\\[\\]\\*]+)?\\b(?:struct|func|map)\\b)(?:[\\w\\.\\[\\]\\*]+(?:\\,\\s*[\\w\\.\\[\\]\\*]+)*)?(?:\\s*)(?:\\=)?)?)",
+							"captures": {
+								"1": {
+									"patterns": [
+										{
+											"include": "#delimiters"
+										},
+										{
+											"match": "\\w+",
+											"name": "variable.other.constant.go"
+										}
+									]
+								},
+								"2": {
+									"patterns": [
+										{
+											"include": "#type-declarations-without-brackets"
+										},
+										{
+											"include": "#generic_types"
+										},
+										{
+											"match": "\\(",
+											"name": "punctuation.definition.begin.bracket.round.go"
+										},
+										{
+											"match": "\\)",
+											"name": "punctuation.definition.end.bracket.round.go"
+										},
+										{
+											"match": "\\[",
+											"name": "punctuation.definition.begin.bracket.square.go"
+										},
+										{
+											"match": "\\]",
+											"name": "punctuation.definition.end.bracket.square.go"
+										},
+										{
+											"match": "\\w+",
+											"name": "entity.name.type.go"
+										}
+									]
+								}
+							}
+						},
+						{
+							"include": "$self"
+						}
+					]
+				}
+			]
+		},
 		"variable_assignment": {
 			"comment": "variable assignment",
 			"patterns": [
diff --git a/extensions/latex/cgmanifest.json b/extensions/latex/cgmanifest.json
index d937ba4f430..25b52bf3787 100644
--- a/extensions/latex/cgmanifest.json
+++ b/extensions/latex/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "jlelong/vscode-latex-basics",
 					"repositoryUrl": "https://github.com/jlelong/vscode-latex-basics",
-					"commitHash": "df6ef817c932d24da5cc72927344a547e463cc65"
+					"commitHash": "59971565a7065dbb617576c04add9d891b056319"
 				}
 			},
 			"license": "MIT",
diff --git a/extensions/perl/cgmanifest.json b/extensions/perl/cgmanifest.json
index cd175abe37d..b7c850dd1aa 100644
--- a/extensions/perl/cgmanifest.json
+++ b/extensions/perl/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "textmate/perl.tmbundle",
 					"repositoryUrl": "https://github.com/textmate/perl.tmbundle",
-					"commitHash": "a85927a902d6e5d7805f56a653f324d34dfad53a"
+					"commitHash": "d9841a0878239fa43f88c640f8d458590f97e8f5"
 				}
 			},
 			"licenseDetail": [

From d6faa5b076c07a4a7ef25f74e21501bc145a06a4 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 6 Dec 2024 17:30:17 +0100
Subject: [PATCH 024/479] debt - use `observableConfigValue` (#235508)

---
 .../inlineChat/browser/inlineChatCurrentLine.ts     | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
index 8cf0f0891a6..43e73454efd 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
@@ -33,11 +33,11 @@ import { IContextMenuService } from '../../../../platform/contextview/browser/co
 import { toAction } from '../../../../base/common/actions.js';
 import { IMouseEvent } from '../../../../base/browser/mouseEvent.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { Event } from '../../../../base/common/event.js';
 import { observableCodeEditor } from '../../../../editor/browser/observableCodeEditor.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
 import { createStyleSheet2 } from '../../../../base/browser/domStylesheets.js';
 import { stringValue } from '../../../../base/browser/cssValue.js';
+import { observableConfigValue } from '../../../../platform/observable/common/platformObservableUtils.js';
 
 export const CTX_INLINE_CHAT_SHOWING_HINT = new RawContextKey<boolean>('inlineChatShowingHint', false, localize('inlineChatShowingHint', "Whether inline chat shows a contextual hint"));
 
@@ -208,10 +208,9 @@ export class InlineChatHintsController extends Disposable implements IEditorCont
 		const decos = this._editor.createDecorationsCollection();
 
 		const editorObs = observableCodeEditor(editor);
-
 		const keyObs = observableFromEvent(keybindingService.onDidUpdateKeybindings, _ => keybindingService.lookupKeybinding(ACTION_START)?.getLabel());
-
-		const configSignal = observableFromEvent(Event.filter(_configurationService.onDidChangeConfiguration, e => e.affectsConfiguration(InlineChatConfigKeys.LineEmptyHint) || e.affectsConfiguration(InlineChatConfigKeys.LineNLHint)), () => undefined);
+		const configHintEmpty = observableConfigValue(InlineChatConfigKeys.LineEmptyHint, false, this._configurationService);
+		const configHintNL = observableConfigValue(InlineChatConfigKeys.LineNLHint, false, this._configurationService);
 
 		const showDataObs = derived(r => {
 			const ghostState = ghostCtrl?.model.read(r)?.state.read(r);
@@ -222,8 +221,6 @@ export class InlineChatHintsController extends Disposable implements IEditorCont
 
 			const kb = keyObs.read(r);
 
-			configSignal.read(r);
-
 			if (ghostState !== undefined || !kb || !position || !model || !textFocus) {
 				return undefined;
 			}
@@ -237,12 +234,12 @@ export class InlineChatHintsController extends Disposable implements IEditorCont
 			const isWhitespace = model.getLineLastNonWhitespaceColumn(position.lineNumber) === 0 && model.getValueLength() > 0 && position.column > 1;
 
 			if (isWhitespace) {
-				return _configurationService.getValue(InlineChatConfigKeys.LineEmptyHint)
+				return configHintEmpty.read(r)
 					? { isEol, isWhitespace, kb, position, model }
 					: undefined;
 			}
 
-			if (visible && isEol && _configurationService.getValue(InlineChatConfigKeys.LineNLHint)) {
+			if (visible && isEol && configHintNL.read(r)) {
 				return { isEol, isWhitespace, kb, position, model };
 			}
 

From 0f695e4d81b4f89cb8e3833062994fe30c7160f8 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.rieken@gmail.com>
Date: Fri, 6 Dec 2024 17:37:47 +0100
Subject: [PATCH 025/479] chore - remove
 `IChatEditingService#onDidCreateEditingSession` in favor of
 `currentEditingSessionObs`

---
 .../chat/browser/actions/chatTitleActions.ts   |  6 ++----
 .../browser/chatEditing/chatEditingService.ts  |  6 ------
 .../contrib/chat/browser/chatWidget.ts         |  7 ++++++-
 .../contrib/chatInputRelatedFilesContrib.ts    | 18 +++++++++---------
 .../contrib/chat/common/chatEditingService.ts  |  1 -
 .../test/browser/inlineChatController.test.ts  |  3 ++-
 6 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
index 7d395f051d8..10dd97aff86 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Codicon } from '../../../../../base/common/codicons.js';
-import { Event } from '../../../../../base/common/event.js';
 import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { ResourceSet } from '../../../../../base/common/map.js';
 import { marked } from '../../../../../base/common/marked/marked.js';
+import { waitForState } from '../../../../../base/common/observable.js';
 import { basename } from '../../../../../base/common/resources.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
@@ -465,9 +465,7 @@ export function registerChatTitleActions() {
 
 			let editingSession = chatEditingService.currentEditingSessionObs.get();
 			if (!editingSession) {
-				await Event.toPromise(chatEditingService.onDidCreateEditingSession);
-				editingSession = chatEditingService.currentEditingSessionObs.get();
-				return;
+				editingSession = await waitForState(chatEditingService.currentEditingSessionObs);
 			}
 
 			if (!editingSession) {
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts
index f1204bd40ed..34b24c1dbb8 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts
@@ -61,11 +61,6 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 		return this._currentSessionObs;
 	}
 
-	private readonly _onDidCreateEditingSession = this._register(new Emitter<IChatEditingSession>());
-	get onDidCreateEditingSession() {
-		return this._onDidCreateEditingSession.event;
-	}
-
 	private readonly _onDidChangeEditingSession = this._register(new Emitter<void>());
 	public readonly onDidChangeEditingSession = this._onDidChangeEditingSession.event;
 
@@ -220,7 +215,6 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 		}));
 
 		this._currentSessionObs.set(session, undefined);
-		this._onDidCreateEditingSession.fire(session);
 		this._onDidChangeEditingSession.fire();
 		return session;
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index a8831878ddb..800e82d952e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -15,6 +15,7 @@ import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { Disposable, DisposableStore, IDisposable, MutableDisposable, combinedDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { ResourceSet } from '../../../../base/common/map.js';
 import { Schemas } from '../../../../base/common/network.js';
+import { autorun } from '../../../../base/common/observable.js';
 import { extUri, isEqual } from '../../../../base/common/resources.js';
 import { isDefined } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
@@ -250,7 +251,11 @@ export class ChatWidget extends Disposable implements IChatWidget {
 
 		const chatEditingSessionDisposables = this._register(new DisposableStore());
 
-		this._register(this.chatEditingService.onDidCreateEditingSession((session) => {
+		this._register(autorun(r => {
+			const session = this.chatEditingService.currentEditingSessionObs.read(r);
+			if (!session) {
+				return;
+			}
 			if (session.chatSessionId !== this.viewModel?.sessionId) {
 				// this chat editing session is for a different chat widget
 				return;
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputRelatedFilesContrib.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatInputRelatedFilesContrib.ts
index ff1938c5b7b..3f4045b9ce0 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputRelatedFilesContrib.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatInputRelatedFilesContrib.ts
@@ -7,10 +7,11 @@ import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { Event } from '../../../../../base/common/event.js';
 import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../../../base/common/map.js';
+import { autorun } from '../../../../../base/common/observable.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { localize } from '../../../../../nls.js';
 import { IWorkbenchContribution } from '../../../../common/contributions.js';
-import { ChatEditingSessionChangeType, IChatEditingService, WorkingSetEntryRemovalReason, WorkingSetEntryState } from '../../common/chatEditingService.js';
+import { ChatEditingSessionChangeType, IChatEditingService, IChatEditingSession, WorkingSetEntryRemovalReason, WorkingSetEntryState } from '../../common/chatEditingService.js';
 import { IChatWidgetService } from '../chat.js';
 
 export class ChatRelatedFilesContribution extends Disposable implements IWorkbenchContribution {
@@ -25,10 +26,12 @@ export class ChatRelatedFilesContribution extends Disposable implements IWorkben
 	) {
 		super();
 
-		this._handleNewEditingSession();
-		this._register(this.chatEditingService.onDidCreateEditingSession(() => {
+		this._register(autorun(r => {
 			this.chatEditingSessionDisposables.clear();
-			this._handleNewEditingSession();
+			const session = this.chatEditingService.currentEditingSessionObs.read(r);
+			if (session) {
+				this._handleNewEditingSession(session);
+			}
 		}));
 	}
 
@@ -95,11 +98,8 @@ export class ChatRelatedFilesContribution extends Disposable implements IWorkben
 
 	}
 
-	private _handleNewEditingSession() {
-		const currentEditingSession = this.chatEditingService.currentEditingSessionObs.get();
-		if (!currentEditingSession) {
-			return;
-		}
+	private _handleNewEditingSession(currentEditingSession: IChatEditingSession) {
+
 		const widget = this.chatWidgetService.getWidgetBySessionId(currentEditingSession.chatSessionId);
 		if (!widget || widget.viewModel?.sessionId !== currentEditingSession.chatSessionId) {
 			return;
diff --git a/src/vs/workbench/contrib/chat/common/chatEditingService.ts b/src/vs/workbench/contrib/chat/common/chatEditingService.ts
index e102d7525e9..c0598e39eba 100644
--- a/src/vs/workbench/contrib/chat/common/chatEditingService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatEditingService.ts
@@ -23,7 +23,6 @@ export interface IChatEditingService {
 
 	_serviceBrand: undefined;
 
-	readonly onDidCreateEditingSession: Event<IChatEditingSession>;
 	/**
 	 * emitted when a session is created, changed or disposed
 	 */
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 feaba4ca832..7d07547770e 100644
--- a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
+++ b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
@@ -70,6 +70,7 @@ import { IChatEditingService, IChatEditingSession } from '../../../chat/common/c
 import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
 import { TextModelResolverService } from '../../../../services/textmodelResolver/common/textModelResolverService.js';
 import { ChatInputBoxContentProvider } from '../../../chat/browser/chatEdinputInputContentProvider.js';
+import { IObservable, observableValue } from '../../../../../base/common/observable.js';
 
 suite('InlineChatController', function () {
 
@@ -162,7 +163,7 @@ suite('InlineChatController', function () {
 			[IInlineChatSessionService, new SyncDescriptor(InlineChatSessionServiceImpl)],
 			[ICommandService, new SyncDescriptor(TestCommandService)],
 			[IChatEditingService, new class extends mock<IChatEditingService>() {
-				override onDidCreateEditingSession: Event<IChatEditingSession> = Event.None;
+				override currentEditingSessionObs: IObservable<IChatEditingSession | null> = observableValue(this, null);
 			}],
 			[IInlineChatSavingService, new class extends mock<IInlineChatSavingService>() {
 				override markChanged(session: Session): void {

From d89fdcbfa8d0d9242b3fdb3528d792370380128a Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Fri, 6 Dec 2024 18:43:21 +0100
Subject: [PATCH 026/479] Removing bottom padding on editor hover  (#235507)

* almost there

* fixing padding, but now does not render correctly

* adding changes

* removing line

* renaming class

* taking into account borders
---
 .../hover/browser/contentHoverWidget.ts       | 29 +++++++++++--------
 src/vs/editor/contrib/hover/browser/hover.css | 10 +++----
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts b/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts
index ad27c1544d5..ffb8aaa9f11 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts
@@ -19,7 +19,6 @@ import { Emitter } from '../../../../base/common/event.js';
 import { RenderedContentHover } from './contentHoverRendered.js';
 
 const HORIZONTAL_SCROLLING_BY = 30;
-const CONTAINER_HEIGHT_PADDING = 6;
 
 export class ContentHoverWidget extends ResizableContentWidget {
 
@@ -68,6 +67,7 @@ export class ContentHoverWidget extends ResizableContentWidget {
 
 		dom.append(this._resizableNode.domNode, this._hover.containerDomNode);
 		this._resizableNode.domNode.style.zIndex = '50';
+		this._resizableNode.domNode.className = 'monaco-resizable-hover';
 
 		this._register(this._editor.onDidLayoutChange(() => {
 			if (this.isVisible) {
@@ -117,9 +117,15 @@ export class ContentHoverWidget extends ResizableContentWidget {
 		return ContentHoverWidget._applyDimensions(containerDomNode, width, height);
 	}
 
+	private _setScrollableElementDimensions(width: number | string, height: number | string): void {
+		const scrollbarDomElement = this._hover.scrollbar.getDomNode();
+		return ContentHoverWidget._applyDimensions(scrollbarDomElement, width, height);
+	}
+
 	private _setHoverWidgetDimensions(width: number | string, height: number | string): void {
-		this._setContentsDomNodeDimensions(width, height);
 		this._setContainerDomNodeDimensions(width, height);
+		this._setScrollableElementDimensions(width, height);
+		this._setContentsDomNodeDimensions(width, height);
 		this._layoutContentWidget();
 	}
 
@@ -176,12 +182,11 @@ export class ContentHoverWidget extends ResizableContentWidget {
 		if (!availableSpace) {
 			return;
 		}
-		// Padding needed in order to stop the resizing down to a smaller height
-		let maximumHeight = CONTAINER_HEIGHT_PADDING;
+		const children = this._hover.contentsDomNode.children;
+		let maximumHeight = children.length - 1;
 		Array.from(this._hover.contentsDomNode.children).forEach((hoverPart) => {
 			maximumHeight += hoverPart.clientHeight;
 		});
-
 		return Math.min(availableSpace, maximumHeight);
 	}
 
@@ -209,7 +214,7 @@ export class ContentHoverWidget extends ResizableContentWidget {
 		const initialWidth = (
 			typeof this._contentWidth === 'undefined'
 				? 0
-				: this._contentWidth - 2 // - 2 for the borders
+				: this._contentWidth
 		);
 
 		if (overflowing || this._hover.containerDomNode.clientWidth < initialWidth) {
@@ -217,7 +222,7 @@ export class ContentHoverWidget extends ResizableContentWidget {
 			const horizontalPadding = 14;
 			return bodyBoxWidth - horizontalPadding;
 		} else {
-			return this._hover.containerDomNode.clientWidth + 2;
+			return this._hover.containerDomNode.clientWidth;
 		}
 	}
 
@@ -389,16 +394,16 @@ export class ContentHoverWidget extends ResizableContentWidget {
 
 	public onContentsChanged(): void {
 		this._removeConstraintsRenderNormally();
-		const containerDomNode = this._hover.containerDomNode;
+		const contentsDomNode = this._hover.contentsDomNode;
 
-		let height = dom.getTotalHeight(containerDomNode);
-		let width = dom.getTotalWidth(containerDomNode);
+		let height = dom.getTotalHeight(contentsDomNode);
+		let width = dom.getTotalWidth(contentsDomNode) + 2;
 		this._resizableNode.layout(height, width);
 
 		this._setHoverWidgetDimensions(width, height);
 
-		height = dom.getTotalHeight(containerDomNode);
-		width = dom.getTotalWidth(containerDomNode);
+		height = dom.getTotalHeight(contentsDomNode);
+		width = dom.getTotalWidth(contentsDomNode);
 		this._contentWidth = width;
 		this._updateMinimumWidth();
 		this._resizableNode.layout(height, width);
diff --git a/src/vs/editor/contrib/hover/browser/hover.css b/src/vs/editor/contrib/hover/browser/hover.css
index 958f1ee9cf4..b9da587c918 100644
--- a/src/vs/editor/contrib/hover/browser/hover.css
+++ b/src/vs/editor/contrib/hover/browser/hover.css
@@ -7,17 +7,15 @@
 	background-color: var(--vscode-editor-hoverHighlightBackground);
 }
 
-.monaco-editor .monaco-hover-content {
-	padding-right: 2px;
-	padding-bottom: 2px;
-	box-sizing: border-box;
+.monaco-editor .monaco-resizable-hover {
+	border: 1px solid var(--vscode-editorHoverWidget-border);
+	border-radius: 3px;
+	box-sizing: content-box;
 }
 
 .monaco-editor .monaco-hover {
 	color: var(--vscode-editorHoverWidget-foreground);
 	background-color: var(--vscode-editorHoverWidget-background);
-	border: 1px solid var(--vscode-editorHoverWidget-border);
-	border-radius: 3px;
 }
 
 .monaco-editor .monaco-hover a {

From 17f6bcb7d2d89a03c53319f93b1e677053612d96 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 6 Dec 2024 18:53:29 +0100
Subject: [PATCH 027/479] chore - modernise test runner (#235511)

async/wait, remove AMD/ESM split, cleanup
---
 test/unit/electron/renderer.js | 222 ++++++++++++++++-----------------
 1 file changed, 107 insertions(+), 115 deletions(-)

diff --git a/test/unit/electron/renderer.js b/test/unit/electron/renderer.js
index 7c28a98930c..b93d91a78e9 100644
--- a/test/unit/electron/renderer.js
+++ b/test/unit/electron/renderer.js
@@ -5,6 +5,8 @@
 
 /*eslint-env mocha*/
 
+// @ts-check
+
 const fs = require('fs');
 
 (function () {
@@ -24,7 +26,7 @@ const fs = require('fs');
 	function createSpy(element, cnt) {
 		return function (...args) {
 			if (logging) {
-				console.log(`calling ${element}: ` + args.slice(0, cnt).join(',') + (withStacks ? (`\n` + new Error().stack.split('\n').slice(2).join('\n')) : ''));
+				console.log(`calling ${element}: ` + args.slice(0, cnt).join(',') + (withStacks ? (`\n` + new Error().stack?.split('\n').slice(2).join('\n')) : ''));
 			}
 			return originals[element].call(this, ...args);
 		};
@@ -88,9 +90,18 @@ Object.assign(globalThis, {
 
 const IS_CI = !!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY;
 const _tests_glob = '**/test/**/*.test.js';
-let loader;
+
+
+/**
+ * Loads one or N modules.
+ * @type {{
+ *   (module: string|string[]): Promise<any>|Promise<any[]>;
+ *   _out: string;
+ * }}
+ */
+let loadFn;
+
 const _loaderErrors = [];
-let _out;
 
 function initNls(opts) {
 	if (opts.build) {
@@ -101,20 +112,17 @@ function initNls(opts) {
 	}
 }
 
-function initLoader(opts) {
+function initLoadFn(opts) {
 	const outdir = opts.build ? 'out-build' : 'out';
-	_out = path.join(__dirname, `../../../${outdir}`);
+	const out = path.join(__dirname, `../../../${outdir}`);
 
 	const baseUrl = pathToFileURL(path.join(__dirname, `../../../${outdir}/`));
 	globalThis._VSCODE_FILE_ROOT = baseUrl.href;
 
 	// set loader
-	/**
-	 * @param {string[]} modules
-	 * @param {(...args:any[]) => void} callback
-	 */
-	function esmRequire(modules, callback, errorback) {
-		const tasks = modules.map(mod => {
+	function importModules(modules) {
+		const moduleArray = Array.isArray(modules) ? modules : [modules];
+		const tasks = moduleArray.map(mod => {
 			const url = new URL(`./${mod}.js`, baseUrl).href;
 			return import(url).catch(err => {
 				console.log(mod, url);
@@ -124,35 +132,33 @@ function initLoader(opts) {
 			});
 		});
 
-		Promise.all(tasks).then(modules => callback(...modules)).catch(errorback);
+		return Array.isArray(modules)
+			? Promise.all(tasks)
+			: tasks[0];
 	}
-
-	loader = { require: esmRequire };
+	importModules._out = out;
+	loadFn = importModules;
 }
 
-function createCoverageReport(opts) {
-	if (opts.coverage) {
-		return coverage.createReport(opts.run || opts.runGlob);
+async function createCoverageReport(opts) {
+	if (!opts.coverage) {
+		return undefined;
 	}
-	return Promise.resolve(undefined);
-}
-
-function loadWorkbenchTestingUtilsModule() {
-	return new Promise((resolve, reject) => {
-		loader.require(['vs/workbench/test/common/utils'], resolve, reject);
-	});
+	return coverage.createReport(opts.run || opts.runGlob);
 }
 
 async function loadModules(modules) {
 	for (const file of modules) {
 		mocha.suite.emit(Mocha.Suite.constants.EVENT_FILE_PRE_REQUIRE, globalThis, file, mocha);
-		const m = await new Promise((resolve, reject) => loader.require([file], resolve, reject));
+		const m = await loadFn(file);
 		mocha.suite.emit(Mocha.Suite.constants.EVENT_FILE_REQUIRE, m, file, mocha);
 		mocha.suite.emit(Mocha.Suite.constants.EVENT_FILE_POST_REQUIRE, globalThis, file, mocha);
 	}
 }
 
-function loadTestModules(opts) {
+const globAsync = util.promisify(glob);
+
+async function loadTestModules(opts) {
 
 	if (opts.run) {
 		const files = Array.isArray(opts.run) ? opts.run : [opts.run];
@@ -164,17 +170,9 @@ function loadTestModules(opts) {
 	}
 
 	const pattern = opts.runGlob || _tests_glob;
-
-	return new Promise((resolve, reject) => {
-		glob(pattern, { cwd: _out }, (err, files) => {
-			if (err) {
-				reject(err);
-				return;
-			}
-			const modules = files.map(file => file.replace(/\.js$/, ''));
-			resolve(modules);
-		});
-	}).then(loadModules);
+	const files = await globAsync(pattern, { cwd: loadFn._out });
+	const modules = files.map(file => file.replace(/\.js$/, ''));
+	return loadModules(modules);
 }
 
 /** @type Mocha.Test */
@@ -220,7 +218,7 @@ async function loadTests(opts) {
 		console[consoleFn.name] = function (msg) {
 			if (!currentTest) {
 				consoleFn.apply(console, arguments);
-			} else if (!_allowedTestOutput.some(a => a.test(msg)) && !_allowedTestsWithOutput.has(currentTest.title) && !_allowedSuitesWithOutput.has(currentTest.parent?.title)) {
+			} else if (!_allowedTestOutput.some(a => a.test(msg)) && !_allowedTestsWithOutput.has(currentTest.title) && !_allowedSuitesWithOutput.has(currentTest.parent?.title ?? '')) {
 				_testsWithUnexpectedOutput = true;
 				consoleFn.apply(console, arguments);
 			}
@@ -242,79 +240,74 @@ async function loadTests(opts) {
 		'Search Model: Search reports timed telemetry on search when error is called'
 	]);
 
-	loader.require(['vs/base/common/errors'], function (errors) {
-
-		const onUnexpectedError = function (err) {
-			if (err.name === 'Canceled') {
-				return; // ignore canceled errors that are common
-			}
-
-			let stack = (err ? err.stack : null);
-			if (!stack) {
-				stack = new Error().stack;
-			}
+	const errors = await loadFn('vs/base/common/errors');
+	const onUnexpectedError = function (err) {
+		if (err.name === 'Canceled') {
+			return; // ignore canceled errors that are common
+		}
 
-			_unexpectedErrors.push((err && err.message ? err.message : err) + '\n' + stack);
-		};
+		let stack = (err ? err.stack : null);
+		if (!stack) {
+			stack = new Error().stack;
+		}
 
-		process.on('uncaughtException', error => onUnexpectedError(error));
-		process.on('unhandledRejection', (reason, promise) => {
-			onUnexpectedError(reason);
-			promise.catch(() => { });
-		});
-		window.addEventListener('unhandledrejection', event => {
-			event.preventDefault(); // Do not log to test output, we show an error later when test ends
-			event.stopPropagation();
+		_unexpectedErrors.push((err && err.message ? err.message : err) + '\n' + stack);
+	};
 
-			if (!_allowedTestsWithUnhandledRejections.has(currentTest.title)) {
-				onUnexpectedError(event.reason);
-			}
-		});
+	process.on('uncaughtException', error => onUnexpectedError(error));
+	process.on('unhandledRejection', (reason, promise) => {
+		onUnexpectedError(reason);
+		promise.catch(() => { });
+	});
+	window.addEventListener('unhandledrejection', event => {
+		event.preventDefault(); // Do not log to test output, we show an error later when test ends
+		event.stopPropagation();
 
-		errors.setUnexpectedErrorHandler(onUnexpectedError);
+		if (!_allowedTestsWithUnhandledRejections.has(currentTest.title)) {
+			onUnexpectedError(event.reason);
+		}
 	});
 
+	errors.setUnexpectedErrorHandler(onUnexpectedError);
 	//#endregion
 
-	return loadWorkbenchTestingUtilsModule().then((workbenchTestingModule) => {
-		const assertCleanState = workbenchTestingModule.assertCleanState;
+	const { assertCleanState } = await loadFn('vs/workbench/test/common/utils');
 
-		suite('Tests are using suiteSetup and setup correctly', () => {
-			test('assertCleanState - check that registries are clean at the start of test running', () => {
-				assertCleanState();
-			});
+	suite('Tests are using suiteSetup and setup correctly', () => {
+		test('assertCleanState - check that registries are clean at the start of test running', () => {
+			assertCleanState();
 		});
+	});
 
-		setup(async () => {
-			await perTestCoverage?.startTest();
-		});
+	setup(async () => {
+		await perTestCoverage?.startTest();
+	});
 
-		teardown(async () => {
-			await perTestCoverage?.finishTest(currentTest.file, currentTest.fullTitle());
+	teardown(async () => {
+		await perTestCoverage?.finishTest(currentTest.file, currentTest.fullTitle());
 
-			// should not have unexpected output
-			if (_testsWithUnexpectedOutput && !opts.dev) {
-				assert.ok(false, 'Error: Unexpected console output in test run. Please ensure no console.[log|error|info|warn] usage in tests or runtime errors.');
-			}
+		// should not have unexpected output
+		if (_testsWithUnexpectedOutput && !opts.dev) {
+			assert.ok(false, 'Error: Unexpected console output in test run. Please ensure no console.[log|error|info|warn] usage in tests or runtime errors.');
+		}
 
-			// should not have unexpected errors
-			const errors = _unexpectedErrors.concat(_loaderErrors);
-			if (errors.length) {
-				for (const error of errors) {
-					console.error(`Error: Test run should not have unexpected errors:\n${error}`);
-				}
-				assert.ok(false, 'Error: Test run should not have unexpected errors.');
+		// should not have unexpected errors
+		const errors = _unexpectedErrors.concat(_loaderErrors);
+		if (errors.length) {
+			for (const error of errors) {
+				console.error(`Error: Test run should not have unexpected errors:\n${error}`);
 			}
-		});
-
-		suiteTeardown(() => { // intentionally not in teardown because some tests only cleanup in suiteTeardown
+			assert.ok(false, 'Error: Test run should not have unexpected errors.');
+		}
+	});
 
-			// should have cleaned up in registries
-			assertCleanState();
-		});
+	suiteTeardown(() => { // intentionally not in teardown because some tests only cleanup in suiteTeardown
 
-		return loadTestModules(opts);
+		// should have cleaned up in registries
+		assertCleanState();
 	});
+
+	return loadTestModules(opts);
 }
 
 function serializeSuite(suite) {
@@ -403,42 +396,41 @@ class IPCReporter {
 	}
 }
 
-function runTests(opts) {
+async function runTests(opts) {
 	// this *must* come before loadTests, or it doesn't work.
 	if (opts.timeout !== undefined) {
 		mocha.timeout(opts.timeout);
 	}
 
-	return loadTests(opts).then(() => {
+	await loadTests(opts);
 
-		if (opts.grep) {
-			mocha.grep(opts.grep);
-		}
+	if (opts.grep) {
+		mocha.grep(opts.grep);
+	}
 
-		if (!opts.dev) {
-			mocha.reporter(IPCReporter);
-		}
+	if (!opts.dev) {
+		// @ts-expect-error
+		mocha.reporter(IPCReporter);
+	}
 
-		const runner = mocha.run(() => {
-			createCoverageReport(opts).then(() => {
-				ipcRenderer.send('all done');
-			});
-		});
+	const runner = mocha.run(async () => {
+		await createCoverageReport(opts)
+		ipcRenderer.send('all done');
+	});
 
-		runner.on('test', test => currentTest = test);
+	runner.on('test', test => currentTest = test);
 
-		if (opts.dev) {
-			runner.on('fail', (test, err) => {
-				console.error(test.fullTitle());
-				console.error(err.stack);
-			});
-		}
-	});
+	if (opts.dev) {
+		runner.on('fail', (test, err) => {
+			console.error(test.fullTitle());
+			console.error(err.stack);
+		});
+	}
 }
 
 ipcRenderer.on('run', async (_e, opts) => {
 	initNls(opts);
-	initLoader(opts);
+	initLoadFn(opts);
 
 	await Promise.resolve(globalThis._VSCODE_TEST_INIT);
 

From eb92928b65f9a17b171d5c0e9a906504bcf07c61 Mon Sep 17 00:00:00 2001
From: Joyce Er <joyce.er@microsoft.com>
Date: Fri, 6 Dec 2024 12:28:32 -0800
Subject: [PATCH 028/479] fix: validate chat session ID before trying to create
 an editing session from it (#235520)

---
 .../contrib/chat/browser/chatEditing/chatEditingService.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts
index 34b24c1dbb8..458687df09a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts
@@ -157,7 +157,7 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 		void this._editingSessionFileLimitPromise;
 
 		const sessionIdToRestore = storageService.get(STORAGE_KEY_EDITING_SESSION, StorageScope.WORKSPACE);
-		if (isString(sessionIdToRestore)) {
+		if (isString(sessionIdToRestore) && this._chatService.getOrRestoreSession(sessionIdToRestore)) {
 			this._restoringEditingSession = this.startOrContinueEditingSession(sessionIdToRestore);
 			this._restoringEditingSession.finally(() => {
 				this._restoringEditingSession = undefined;

From db3873db37f6e1a2d4f3e139573c59c717c015b2 Mon Sep 17 00:00:00 2001
From: Michael Lively <milively@microsoft.com>
Date: Fri, 6 Dec 2024 13:03:57 -0800
Subject: [PATCH 029/479] NB multiselect undo/redo fix (#235521)

* fix undo/redo during multicursor session

* corrected fix -- was backwards initially
---
 .../multicursor/notebookMulticursor.ts        | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts b/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts
index 2871c2577b1..c8706e4aeb5 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookMulticursor.ts
@@ -385,6 +385,18 @@ export class NotebookMultiCursorController extends Disposable implements INotebo
 		}
 	}
 
+	private updateViewModelSelections() {
+		for (const cell of this.trackedCells) {
+			const controller = this.cursorsControllers.get(cell.cellViewModel.uri);
+			if (!controller) {
+				// should not happen
+				return;
+			}
+
+			cell.cellViewModel.setSelections(controller.getSelections());
+		}
+	}
+
 	private updateFinalUndoRedo() {
 		const anchorCellModel = this.anchorCell?.[1].getModel();
 		if (!anchorCellModel) {
@@ -775,16 +787,10 @@ export class NotebookMultiCursorController extends Disposable implements INotebo
 			if (model) {
 				models.push(model);
 			}
-
-			const controller = this.cursorsControllers.get(cell.cellViewModel.uri);
-			if (!controller) {
-				// should not happen
-				return;
-			}
-			controller.setSelections(new ViewModelEventsCollector(), undefined, cell.cellViewModel.getSelections(), CursorChangeReason.Explicit);
 		}
 
 		await Promise.all(models.map(model => model.undo()));
+		this.updateViewModelSelections();
 		this.updateLazyDecorations();
 	}
 
@@ -795,16 +801,10 @@ export class NotebookMultiCursorController extends Disposable implements INotebo
 			if (model) {
 				models.push(model);
 			}
-
-			const controller = this.cursorsControllers.get(cell.cellViewModel.uri);
-			if (!controller) {
-				// should not happen
-				return;
-			}
-			controller.setSelections(new ViewModelEventsCollector(), undefined, cell.cellViewModel.getSelections(), CursorChangeReason.Explicit);
 		}
 
 		await Promise.all(models.map(model => model.redo()));
+		this.updateViewModelSelections();
 		this.updateLazyDecorations();
 	}
 

From 62674c8b393ec9d28dd3c777c06f267217bc5a50 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Fri, 6 Dec 2024 23:36:11 +0000
Subject: [PATCH 030/479] Require offerSetup set to show CC icon for entitled
 user (#235530)

Require offerSetup set to show CC icon for entitled user (#235518)

Fix microsoft/vscode-copilot#11145
---
 .../workbench/contrib/chat/browser/actions/chatActions.ts   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index cca372c6103..2cbd539c3e4 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -534,9 +534,11 @@ MenuRegistry.appendMenuItem(MenuId.CommandCenter, {
 	when: ContextKeyExpr.and(
 		ContextKeyExpr.has('config.chat.commandCenter.enabled'),
 		ContextKeyExpr.or(
+			ContextKeyExpr.and(
+				ContextKeyExpr.has('config.chat.experimental.offerSetup'),
+				ChatContextKeys.Setup.entitled,
+			),
 			ChatContextKeys.Setup.installed,
-			ChatContextKeys.Setup.entitled,
-			ContextKeyExpr.has('config.chat.experimental.offerSetup'),
 			ChatContextKeys.panelParticipantRegistered
 		)
 	),

From 831c95988ebaf1f83e0459922e699072ce4249d3 Mon Sep 17 00:00:00 2001
From: adrianstephens <adrianstephens@msn.com>
Date: Fri, 6 Dec 2024 17:12:25 -0800
Subject: [PATCH 031/479] custom editor preview

---
 src/vs/workbench/browser/parts/editor/editorCommands.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts
index 1cecdaab32f..83f88bd7b74 100644
--- a/src/vs/workbench/browser/parts/editor/editorCommands.ts
+++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts
@@ -494,7 +494,7 @@ function registerOpenEditorAPICommands(): void {
 
 		const [columnArg, optionsArg] = columnAndOptions ?? [];
 
-		await editorService.openEditor({ resource: URI.from(resource, true), options: { ...optionsArg, pinned: true, override: id } }, columnToEditorGroup(editorGroupsService, configurationService, columnArg));
+		await editorService.openEditor({ resource: URI.from(resource, true), options: { pinned: true, ...optionsArg, override: id } }, columnToEditorGroup(editorGroupsService, configurationService, columnArg));
 	});
 
 	// partial, renderer-side API command to open diff editor

From bfa5930c7c0af0759d29e1a89a8f942e303fb870 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Sat, 7 Dec 2024 12:52:14 +0100
Subject: [PATCH 032/479] chat - assorted fixes (#235539)

* Copilot setup fails to focus chat input after setup (microsoft/vscode-copilot#11154)

* chat - removal of checkboxes

* chat - unbreak :robot: icon from appearing

* chat - tweak wording
---
 .../chat/browser/actions/chatActions.ts       |  1 +
 .../contrib/chat/browser/chatSetup.ts         | 87 ++++++-------------
 .../chat/browser/media/chatViewSetup.css      | 17 +---
 3 files changed, 30 insertions(+), 75 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index 2cbd539c3e4..fd1f3472c2d 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -538,6 +538,7 @@ MenuRegistry.appendMenuItem(MenuId.CommandCenter, {
 				ContextKeyExpr.has('config.chat.experimental.offerSetup'),
 				ChatContextKeys.Setup.entitled,
 			),
+			ContextKeyExpr.has('config.chat.experimental.offerSetup'),
 			ChatContextKeys.Setup.installed,
 			ChatContextKeys.panelParticipantRegistered
 		)
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 27c17e06172..43e433d8b66 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import './media/chatViewSetup.css';
-import { $, addDisposableListener, EventType, getActiveElement, setVisibility } from '../../../../base/browser/dom.js';
+import { $, getActiveElement, setVisibility } from '../../../../base/browser/dom.js';
 import { Button, ButtonWithDropdown } from '../../../../base/browser/ui/button/button.js';
 import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { IAction, toAction } from '../../../../base/common/actions.js';
@@ -37,7 +37,7 @@ import { Registry } from '../../../../platform/registry/common/platform.js';
 import { asText, IRequestService } from '../../../../platform/request/common/request.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { defaultButtonStyles, defaultCheckboxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IViewDescriptorService, ViewContainerLocation } from '../../../common/views.js';
@@ -55,7 +55,6 @@ import { ChatViewId, EditsViewId, ensureSideBarChatViewSize, IChatWidget, showCh
 import { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID } from './chatViewPane.js';
 import { ChatViewsWelcomeExtensions, IChatViewsWelcomeContributionRegistry } from './viewsWelcome/chatViewsWelcome.js';
 import { IChatQuotasService } from './chatQuotasService.js';
-import { Checkbox } from '../../../../base/browser/ui/toggle/toggle.js';
 import { mainWindow } from '../../../../base/browser/window.js';
 
 const defaultChat = {
@@ -65,7 +64,6 @@ const defaultChat = {
 	termsStatementUrl: product.defaultChatAgent?.termsStatementUrl ?? '',
 	privacyStatementUrl: product.defaultChatAgent?.privacyStatementUrl ?? '',
 	skusDocumentationUrl: product.defaultChatAgent?.skusDocumentationUrl ?? '',
-	publicCodeMatchesUrl: product.defaultChatAgent?.publicCodeMatchesUrl ?? '',
 	providerId: product.defaultChatAgent?.providerId ?? '',
 	providerName: product.defaultChatAgent?.providerName ?? '',
 	providerScopes: product.defaultChatAgent?.providerScopes ?? [[]],
@@ -88,8 +86,6 @@ enum ChatEntitlement {
 	Pro
 }
 
-const ASK_FOR_PUBLIC_CODE_MATCHES = false; // TODO@bpasero revisit this
-
 //#region Contribution
 
 const TRIGGER_SETUP_COMMAND_ID = 'workbench.action.chat.triggerSetup';
@@ -183,9 +179,9 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 				showCopilotView(viewsService, layoutService);
 				ensureSideBarChatViewSize(400, viewDescriptorService, layoutService);
 
-				if (startSetup === true && !ASK_FOR_PUBLIC_CODE_MATCHES) {
+				if (startSetup === true) {
 					const controller = that.controller.value;
-					controller.setup({ publicCodeSuggestions: true });
+					controller.setup();
 				}
 
 				configurationService.updateValue('chat.commandCenter.enabled', true);
@@ -521,10 +517,10 @@ class ChatSetupRequests extends Disposable {
 		return this.resolveEntitlement(session, CancellationToken.None);
 	}
 
-	async signUpLimited(session: AuthenticationSession, options: { publicCodeSuggestions: boolean }): Promise<boolean> {
+	async signUpLimited(session: AuthenticationSession): Promise<boolean> {
 		const body = {
 			restricted_telemetry: 'disabled',
-			public_code_suggestions: options.publicCodeSuggestions ? 'enabled' : 'disabled'
+			public_code_suggestions: 'enabled'
 		};
 
 		const response = await this.request(defaultChat.entitlementSignupLimitedUrl, 'POST', body, session, CancellationToken.None);
@@ -637,7 +633,7 @@ class ChatSetupController extends Disposable {
 		this._onDidChange.fire();
 	}
 
-	async setup(options: { publicCodeSuggestions: boolean }): Promise<void> {
+	async setup(): Promise<void> {
 		const title = localize('setupChatProgress', "Getting Copilot ready...");
 		const badge = this.activityService.showViewContainerActivity(isCopilotEditsViewActive(this.viewsService) ? CHAT_EDITING_SIDEBAR_PANEL_ID : CHAT_SIDEBAR_PANEL_ID, {
 			badge: new ProgressBadge(() => title),
@@ -649,14 +645,16 @@ class ChatSetupController extends Disposable {
 				location: ProgressLocation.Window,
 				command: TRIGGER_SETUP_COMMAND_ID,
 				title,
-			}, () => this.doSetup(options));
+			}, () => this.doSetup());
 		} finally {
 			badge.dispose();
 		}
 	}
 
-	private async doSetup(options: { publicCodeSuggestions: boolean }): Promise<void> {
+	private async doSetup(): Promise<void> {
 		this.context.suspend();  // reduces flicker
+
+		let focusChatInput = false;
 		try {
 			let session: AuthenticationSession | undefined;
 			let entitlement: ChatEntitlement | undefined;
@@ -680,13 +678,22 @@ class ChatSetupController extends Disposable {
 				}
 			}
 
+			const activeElement = getActiveElement();
+
 			// Install
 			this.setStep(ChatSetupStep.Installing);
-			await this.install(session, entitlement ?? this.context.state.entitlement, options);
+			await this.install(session, entitlement ?? this.context.state.entitlement);
+
+			const currentActiveElement = getActiveElement();
+			focusChatInput = activeElement === currentActiveElement || currentActiveElement === mainWindow.document.body;
 		} finally {
 			this.setStep(ChatSetupStep.Initial);
 			this.context.resume();
 		}
+
+		if (focusChatInput) {
+			(await showCopilotView(this.viewsService, this.layoutService))?.focusInput();
+		}
 	}
 
 	private async signIn(): Promise<{ session: AuthenticationSession | undefined; entitlement: ChatEntitlement | undefined }> {
@@ -694,6 +701,7 @@ class ChatSetupController extends Disposable {
 		let entitlement: ChatEntitlement | undefined;
 		try {
 			showCopilotView(this.viewsService, this.layoutService);
+
 			session = await this.authenticationService.createSession(defaultChat.providerId, defaultChat.providerScopes[0]);
 			entitlement = await this.requests.forceResolveEntitlement(session);
 		} catch (error) {
@@ -707,9 +715,8 @@ class ChatSetupController extends Disposable {
 		return { session, entitlement };
 	}
 
-	private async install(session: AuthenticationSession, entitlement: ChatEntitlement, options: { publicCodeSuggestions: boolean }): Promise<void> {
+	private async install(session: AuthenticationSession, entitlement: ChatEntitlement,): Promise<void> {
 		const signedIn = !!session;
-		const activeElement = getActiveElement();
 
 		let installResult: 'installed' | 'cancelled' | 'failedInstall' | undefined = undefined;
 		const wasInstalled = this.context.state.installed;
@@ -718,7 +725,7 @@ class ChatSetupController extends Disposable {
 			showCopilotView(this.viewsService, this.layoutService);
 
 			if (entitlement !== ChatEntitlement.Limited && entitlement !== ChatEntitlement.Pro && entitlement !== ChatEntitlement.Unavailable) {
-				didSignUp = await this.requests.signUpLimited(session, options);
+				didSignUp = await this.requests.signUpLimited(session);
 			}
 
 			await this.extensionsWorkbenchService.install(defaultChat.extensionId, {
@@ -747,11 +754,6 @@ class ChatSetupController extends Disposable {
 		}
 
 		this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult, signedIn });
-
-		const currentActiveElement = getActiveElement();
-		if (activeElement === currentActiveElement || currentActiveElement === mainWindow.document.body) {
-			(await showCopilotView(this.viewsService, this.layoutService))?.focusInput();
-		}
 	}
 }
 
@@ -802,18 +804,14 @@ class ChatSetupWelcomeContent extends Disposable {
 		}
 
 		// Limited SKU
-		const limitedSkuHeader = localize({ key: 'limitedSkuHeader', comment: ['{Locked="[]({0})"}'] }, "$(sparkle-filled) We now offer [Copilot for free]({0}).", defaultChat.skusDocumentationUrl);
+		const limitedSkuHeader = localize({ key: 'limitedSkuHeader', comment: ['{Locked="[]({0})"}'] }, "$(sparkle-filled) Get 50 chats + 2000 completions per month for free.", defaultChat.skusDocumentationUrl);
 		const limitedSkuHeaderContainer = this.element.appendChild($('p'));
 		limitedSkuHeaderContainer.appendChild(this._register(markdown.render(new MarkdownString(limitedSkuHeader, { isTrusted: true, supportThemeIcons: true }))).element);
 
-		const publicCodeSuggestionsLabel = localize('detectionLabel', "Allow code suggestions that [match public code]({0})", defaultChat.publicCodeMatchesUrl);
-		const { container: publicCodeSuggestionsContainer, checkbox: publicCodeSuggestionsCheckbox } = this.createCheckBox(publicCodeSuggestionsLabel, true, markdown);
-
 		// Terms
 		const terms = localize({ key: 'termsLabel', comment: ['{Locked="["}', '{Locked="]({0})"}', '{Locked="]({1})"}'] }, "By continuing, you agree to our [Terms]({0}) and [Privacy Policy]({1}).", defaultChat.termsStatementUrl, defaultChat.privacyStatementUrl);
 		const termsContainer = this.element.appendChild($('p'));
 		termsContainer.classList.add('terms-container');
-		termsContainer.classList.toggle('is-standalone', !ASK_FOR_PUBLIC_CODE_MATCHES);
 		termsContainer.appendChild(this._register(markdown.render(new MarkdownString(terms, { isTrusted: true }))).element);
 
 		// Setup Button
@@ -833,30 +831,13 @@ class ChatSetupWelcomeContent extends Disposable {
 			supportIcons: true,
 			...defaultButtonStyles
 		}));
-		this._register(button.onDidClick(() => this.controller.setup({ publicCodeSuggestions: ASK_FOR_PUBLIC_CODE_MATCHES ? publicCodeSuggestionsCheckbox.checked : true })));
+		this._register(button.onDidClick(() => this.controller.setup()));
 
 		// Update based on model state
-		this._register(Event.runAndSubscribe(this.controller.onDidChange, () => this.update(limitedSkuHeaderContainer, button, [publicCodeSuggestionsContainer], [publicCodeSuggestionsCheckbox])));
+		this._register(Event.runAndSubscribe(this.controller.onDidChange, () => this.update(limitedSkuHeaderContainer, button)));
 	}
 
-	private createCheckBox(label: string, checked: boolean, markdown: MarkdownRenderer): { container: HTMLElement; checkbox: Checkbox } {
-		const container = this.element.appendChild($('p.checkbox-container'));
-		const checkbox = this._register(new Checkbox(label, checked, defaultCheckboxStyles));
-		container.appendChild(checkbox.domNode);
-
-		const checkboxLabel = container.appendChild(this._register(markdown.render(new MarkdownString(label, { isTrusted: true, supportThemeIcons: true }), { inline: true, className: 'checkbox-label' })).element);
-		this._register(addDisposableListener(checkboxLabel, EventType.CLICK, e => {
-			if (checkbox?.enabled && (e.target as HTMLElement).tagName !== 'A') {
-				checkbox.checked = !checkbox.checked;
-				checkbox.focus();
-			}
-		}));
-
-		return { container, checkbox };
-	}
-
-	private update(limitedSkuHeaderContainer: HTMLElement, button: Button | ButtonWithDropdown, limitedCheckboxContainers: HTMLElement[], limitedCheckboxes: Checkbox[]): void {
-		const showLimitedCheckboxes = ASK_FOR_PUBLIC_CODE_MATCHES ? this.context.state.entitlement !== ChatEntitlement.Limited && this.context.state.entitlement !== ChatEntitlement.Pro && this.context.state.entitlement !== ChatEntitlement.Unavailable : false;
+	private update(limitedSkuHeaderContainer: HTMLElement, button: Button | ButtonWithDropdown): void {
 		let showLimitedSkuHeader: boolean;
 		let buttonLabel: string;
 
@@ -882,27 +863,15 @@ class ChatSetupWelcomeContent extends Disposable {
 		}
 
 		switch (this.controller.step) {
-			case ChatSetupStep.Initial:
-				for (const checkbox of limitedCheckboxes) {
-					checkbox.enable();
-				}
-				break;
 			case ChatSetupStep.SigningIn:
-				for (const checkbox of limitedCheckboxes) {
-					checkbox.disable();
-				}
 				buttonLabel = localize('setupChatSignIn', "$(loading~spin) Signing in to {0}...", defaultChat.providerName);
 				break;
 			case ChatSetupStep.Installing:
-				for (const checkbox of limitedCheckboxes) {
-					checkbox.disable();
-				}
 				buttonLabel = localize('setupChatInstalling', "$(loading~spin) Getting Copilot Ready...");
 				break;
 		}
 
 		setVisibility(showLimitedSkuHeader, limitedSkuHeaderContainer);
-		setVisibility(showLimitedCheckboxes, ...limitedCheckboxContainers);
 
 		button.label = buttonLabel;
 		button.enabled = this.controller.step === ChatSetupStep.Initial;
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatViewSetup.css b/src/vs/workbench/contrib/chat/browser/media/chatViewSetup.css
index 9fc75ee6c30..74e06915171 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatViewSetup.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatViewSetup.css
@@ -17,7 +17,7 @@
 		background-color: var(--vscode-chat-requestBackground);
 	}
 
-	.terms-container.is-standalone {
+	.terms-container {
 		padding-top: 5px;
 	}
 
@@ -54,19 +54,4 @@
 		width: 100%;
 		padding: 4px 7px;
 	}
-
-	/** Checkboxes */
-	.checkbox-container {
-		display: flex;
-		padding-top: 15px;
-	}
-
-	.checkbox-label {
-		flex-basis: fit-content;
-		cursor: pointer;
-	}
-
-	.checkbox-label p {
-		display: inline;
-	}
 }

From 2e52d7fc4957d3d96334df9bf487dded4fa3be61 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Sat, 7 Dec 2024 17:34:20 +0100
Subject: [PATCH 033/479] chat - setup/quota tweaks (#235543)

---
 .../contrib/chat/browser/actions/chatActions.ts    |  5 -----
 src/vs/workbench/contrib/chat/browser/chatSetup.ts | 14 +++-----------
 .../contrib/chat/browser/media/chatViewSetup.css   |  2 +-
 .../contrib/chat/common/chatContextKeys.ts         |  1 -
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index fd1f3472c2d..de160c8c263 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -534,10 +534,6 @@ MenuRegistry.appendMenuItem(MenuId.CommandCenter, {
 	when: ContextKeyExpr.and(
 		ContextKeyExpr.has('config.chat.commandCenter.enabled'),
 		ContextKeyExpr.or(
-			ContextKeyExpr.and(
-				ContextKeyExpr.has('config.chat.experimental.offerSetup'),
-				ChatContextKeys.Setup.entitled,
-			),
 			ContextKeyExpr.has('config.chat.experimental.offerSetup'),
 			ChatContextKeys.Setup.installed,
 			ChatContextKeys.panelParticipantRegistered
@@ -556,7 +552,6 @@ registerAction2(class ToggleCopilotControl extends ToggleTitleBarConfigAction {
 				ContextKeyExpr.has('config.window.commandCenter'),
 				ContextKeyExpr.or(
 					ChatContextKeys.Setup.installed,
-					ChatContextKeys.Setup.entitled,
 					ContextKeyExpr.has('config.chat.experimental.offerSetup'),
 					ChatContextKeys.panelParticipantRegistered
 				)
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 43e433d8b66..d31113c0d6b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -154,10 +154,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 					f1: true,
 					precondition: ContextKeyExpr.and(
 						ChatContextKeys.Setup.installed.negate(),
-						ContextKeyExpr.or(
-							ChatContextKeys.Setup.entitled,
-							ContextKeyExpr.has('config.chat.experimental.offerSetup')
-						)
+						ContextKeyExpr.has('config.chat.experimental.offerSetup')
 					),
 					menu: {
 						id: MenuId.ChatCommandCenter,
@@ -201,10 +198,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 					category: CHAT_CATEGORY,
 					precondition: ContextKeyExpr.and(
 						ChatContextKeys.Setup.installed.negate(),
-						ContextKeyExpr.or(
-							ChatContextKeys.Setup.entitled,
-							ContextKeyExpr.has('config.chat.experimental.offerSetup')
-						)
+						ContextKeyExpr.has('config.chat.experimental.offerSetup')
 					),
 					menu: {
 						id: MenuId.ChatCommandCenter,
@@ -804,7 +798,7 @@ class ChatSetupWelcomeContent extends Disposable {
 		}
 
 		// Limited SKU
-		const limitedSkuHeader = localize({ key: 'limitedSkuHeader', comment: ['{Locked="[]({0})"}'] }, "$(sparkle-filled) Get 50 chats + 2000 completions per month for free.", defaultChat.skusDocumentationUrl);
+		const limitedSkuHeader = localize({ key: 'limitedSkuHeader', comment: ['{Locked="[]({0})"}'] }, "$(sparkle-filled) We now offer [Copilot for free]({0}) with 50 chat messages and 2000 code completions per month.", defaultChat.skusDocumentationUrl);
 		const limitedSkuHeaderContainer = this.element.appendChild($('p'));
 		limitedSkuHeaderContainer.appendChild(this._register(markdown.render(new MarkdownString(limitedSkuHeader, { isTrusted: true, supportThemeIcons: true }))).element);
 
@@ -895,7 +889,6 @@ class ChatSetupContext extends Disposable {
 
 	private readonly canSignUpContextKey = ChatContextKeys.Setup.canSignUp.bindTo(this.contextKeyService);
 	private readonly signedOutContextKey = ChatContextKeys.Setup.signedOut.bindTo(this.contextKeyService);
-	private readonly entitledContextKey = ChatContextKeys.Setup.entitled.bindTo(this.contextKeyService);
 	private readonly limitedContextKey = ChatContextKeys.Setup.limited.bindTo(this.contextKeyService);
 	private readonly triggeredContext = ChatContextKeys.Setup.triggered.bindTo(this.contextKeyService);
 	private readonly installedContext = ChatContextKeys.Setup.installed.bindTo(this.contextKeyService);
@@ -1000,7 +993,6 @@ class ChatSetupContext extends Disposable {
 		changed = this.updateContextKey(this.signedOutContextKey, this._state.entitlement === ChatEntitlement.Unknown) || changed;
 		changed = this.updateContextKey(this.canSignUpContextKey, this._state.entitlement === ChatEntitlement.Available) || changed;
 		changed = this.updateContextKey(this.limitedContextKey, this._state.entitlement === ChatEntitlement.Limited) || changed;
-		changed = this.updateContextKey(this.entitledContextKey, this._state.entitlement === ChatEntitlement.Pro) || changed;
 		changed = this.updateContextKey(this.triggeredContext, !!this._state.triggered) || changed;
 		changed = this.updateContextKey(this.installedContext, !!this._state.installed) || changed;
 
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatViewSetup.css b/src/vs/workbench/contrib/chat/browser/media/chatViewSetup.css
index 74e06915171..97a06eac5be 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatViewSetup.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatViewSetup.css
@@ -29,7 +29,7 @@
 	}
 
 	.chat-feature-container .codicon[class*='codicon-'] {
-		font-size: 20px;
+		font-size: 16px;
 	}
 
 	.codicon[class*='codicon-'] {
diff --git a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
index 8e1f49e7fd3..de13af60b8b 100644
--- a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
+++ b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
@@ -45,7 +45,6 @@ export namespace ChatContextKeys {
 		canSignUp: new RawContextKey<boolean>('chatSetupCanSignUp', false, true), 	// True when user can sign up to be a chat limited user.
 
 		signedOut: new RawContextKey<boolean>('chatSetupSignedOut', false, true), 	// True when user is signed out.
-		entitled: new RawContextKey<boolean>('chatSetupEntitled', false, true), 	// True when user is a chat entitled user.
 		limited: new RawContextKey<boolean>('chatSetupLimited', false, true), 		// True when user is a chat limited user.
 
 		triggered: new RawContextKey<boolean>('chatSetupTriggered', false, true), 	// True when chat setup is triggered.

From 37f3474c44ac0a2cfc912c0760a24258cc08ebf0 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Sat, 7 Dec 2024 19:35:28 +0100
Subject: [PATCH 034/479] SCM - adopt IDirtyDiffModelService in various places
 (#235549)

* Use model service for $getDiffInformation()

* Use the dirty diff model for actions

* Move DirtyDiffModel to avoid cyclic import

* Skip quick diffs that are not visible when navigating

* Decorators share models

* Rename diff.ts to dirtyDiff.ts

* Rename dirtyDiff -> dirtyDiffModel

* Only send diff information from the SCM quick diff provider
---
 .../browser/mainThreadDocumentsAndEditors.ts  |   2 +-
 .../api/browser/mainThreadEditors.ts          |  15 +-
 .../mainThreadDocumentsAndEditors.test.ts     |   2 +-
 src/vs/workbench/contrib/scm/browser/diff.ts  | 130 ----
 .../contrib/scm/browser/dirtyDiffModel.ts     | 556 ++++++++++++++++
 .../contrib/scm/browser/dirtydiffDecorator.ts | 615 +++---------------
 .../contrib/scm/browser/scm.contribution.ts   |   2 +
 7 files changed, 641 insertions(+), 681 deletions(-)
 delete mode 100644 src/vs/workbench/contrib/scm/browser/diff.ts
 create mode 100644 src/vs/workbench/contrib/scm/browser/dirtyDiffModel.ts

diff --git a/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts b/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts
index 4f5e72a58f7..992229b91b7 100644
--- a/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts
@@ -32,7 +32,7 @@ import { diffSets, diffMaps } from '../../../base/common/collections.js';
 import { IPaneCompositePartService } from '../../services/panecomposite/browser/panecomposite.js';
 import { ViewContainerLocation } from '../../common/views.js';
 import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
-import { IDirtyDiffModelService } from '../../contrib/scm/browser/diff.js';
+import { IDirtyDiffModelService } from '../../contrib/scm/browser/dirtyDiffModel.js';
 
 
 class TextEditorSnapshot {
diff --git a/src/vs/workbench/api/browser/mainThreadEditors.ts b/src/vs/workbench/api/browser/mainThreadEditors.ts
index 73d81e729cb..deeecec96f2 100644
--- a/src/vs/workbench/api/browser/mainThreadEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadEditors.ts
@@ -28,8 +28,7 @@ import { IExtHostContext } from '../../services/extensions/common/extHostCustome
 import { IEditorControl } from '../../common/editor.js';
 import { getCodeEditor, ICodeEditor } from '../../../editor/browser/editorBrowser.js';
 import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
-import { DirtyDiffContribution } from '../../contrib/scm/browser/dirtydiffDecorator.js';
-import { IDirtyDiffModelService } from '../../contrib/scm/browser/diff.js';
+import { IDirtyDiffModelService } from '../../contrib/scm/browser/dirtyDiffModel.js';
 import { autorun, constObservable, derived, derivedOpts, IObservable, observableFromEvent } from '../../../base/common/observable.js';
 import { IUriIdentityService } from '../../../platform/uriIdentity/common/uriIdentity.js';
 import { isITextModel } from '../../../editor/common/model.js';
@@ -386,13 +385,15 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 			return Promise.resolve(diffEditor.getLineChanges() || []);
 		}
 
-		const dirtyDiffContribution = codeEditor.getContribution('editor.contrib.dirtydiff');
-
-		if (dirtyDiffContribution) {
-			return Promise.resolve((dirtyDiffContribution as DirtyDiffContribution).getChanges());
+		if (!codeEditor.hasModel()) {
+			return Promise.resolve([]);
 		}
 
-		return Promise.resolve([]);
+		const dirtyDiffModel = this._dirtyDiffModelService.getDirtyDiffModel(codeEditor.getModel().uri);
+		const scmQuickDiff = dirtyDiffModel?.quickDiffs.find(quickDiff => quickDiff.isSCM);
+		const scmQuickDiffChanges = dirtyDiffModel?.changes.filter(change => change.label === scmQuickDiff?.label);
+
+		return Promise.resolve(scmQuickDiffChanges?.map(change => change.change) ?? []);
 	}
 }
 
diff --git a/src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts b/src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts
index b654ddf0f7c..230fc9d2126 100644
--- a/src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts
@@ -36,7 +36,7 @@ import { LanguageService } from '../../../../editor/common/services/languageServ
 import { ILanguageConfigurationService } from '../../../../editor/common/languages/languageConfigurationRegistry.js';
 import { TestLanguageConfigurationService } from '../../../../editor/test/common/modes/testLanguageConfigurationService.js';
 import { IUndoRedoService } from '../../../../platform/undoRedo/common/undoRedo.js';
-import { IDirtyDiffModelService } from '../../../contrib/scm/browser/diff.js';
+import { IDirtyDiffModelService } from '../../../contrib/scm/browser/dirtyDiffModel.js';
 import { ITextEditorDiffInformation } from '../../../../platform/editor/common/editor.js';
 
 suite('MainThreadDocumentsAndEditors', () => {
diff --git a/src/vs/workbench/contrib/scm/browser/diff.ts b/src/vs/workbench/contrib/scm/browser/diff.ts
deleted file mode 100644
index 0248c6826bd..00000000000
--- a/src/vs/workbench/contrib/scm/browser/diff.ts
+++ /dev/null
@@ -1,130 +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 { ResourceMap } from '../../../../base/common/map.js';
-import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { DirtyDiffModel } from './dirtydiffDecorator.js';
-import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { IEditorService } from '../../../services/editor/common/editorService.js';
-import { autorun, observableFromEvent } from '../../../../base/common/observable.js';
-import { isCodeEditor, isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
-import { DiffAlgorithmName } from '../../../../editor/common/services/editorWorker.js';
-import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
-import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
-import { URI } from '../../../../base/common/uri.js';
-
-export const IDirtyDiffModelService = createDecorator<IDirtyDiffModelService>('IDirtyDiffModelService');
-
-export interface IDirtyDiffModelService {
-	_serviceBrand: undefined;
-
-	/**
-	 * Returns `undefined` if the editor model is not resolved
-	 * @param uri
-	 */
-	getDirtyDiffModel(uri: URI): DirtyDiffModel | undefined;
-
-	/**
-	 * Returns `undefined` if the editor model is not resolved
-	 * @param uri
-	 * @param algorithm
-	 */
-	getDiffModel(uri: URI, algorithm: DiffAlgorithmName): DirtyDiffModel | undefined;
-}
-
-export class DirtyDiffModelService extends Disposable implements IDirtyDiffModelService {
-	_serviceBrand: undefined;
-
-	private readonly _dirtyDiffModels = new ResourceMap<DirtyDiffModel>();
-	private readonly _diffModels = new ResourceMap<Map<DiffAlgorithmName, DirtyDiffModel>>();
-
-	private _visibleTextEditorControls = observableFromEvent(
-		this.editorService.onDidVisibleEditorsChange,
-		() => this.editorService.visibleTextEditorControls);
-
-	constructor(
-		@IEditorService private readonly editorService: IEditorService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@ITextFileService private readonly textFileService: ITextFileService,
-		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService
-	) {
-		super();
-
-		this._register(autorun(reader => {
-			const visibleTextEditorControls = this._visibleTextEditorControls.read(reader);
-
-			// Dispose dirty diff models for text editors that are not visible
-			for (const [uri, dirtyDiffModel] of this._dirtyDiffModels) {
-				const textEditorControl = visibleTextEditorControls
-					.find(editor => isCodeEditor(editor) &&
-						this.uriIdentityService.extUri.isEqual(editor.getModel()?.uri, uri));
-
-				if (textEditorControl) {
-					continue;
-				}
-
-				dirtyDiffModel.dispose();
-				this._dirtyDiffModels.delete(uri);
-			}
-
-			// Dispose diff models for diff editors that are not visible
-			for (const [uri, dirtyDiffModel] of this._diffModels) {
-				const diffEditorControl = visibleTextEditorControls
-					.find(editor => isDiffEditor(editor) &&
-						this.uriIdentityService.extUri.isEqual(editor.getModel()?.modified.uri, uri));
-
-				if (diffEditorControl) {
-					continue;
-				}
-
-				for (const algorithm of dirtyDiffModel.keys()) {
-					dirtyDiffModel.get(algorithm)?.dispose();
-					dirtyDiffModel.delete(algorithm);
-				}
-				this._diffModels.delete(uri);
-			}
-		}));
-	}
-
-	getDirtyDiffModel(uri: URI): DirtyDiffModel | undefined {
-		let model = this._dirtyDiffModels.get(uri);
-		if (model) {
-			return model;
-		}
-
-		const textFileModel = this.textFileService.files.get(uri);
-		if (!textFileModel?.isResolved()) {
-			return undefined;
-		}
-
-		model = this.instantiationService.createInstance(DirtyDiffModel, textFileModel, undefined);
-		this._dirtyDiffModels.set(uri, model);
-
-		return model;
-	}
-
-	getDiffModel(uri: URI, algorithm: DiffAlgorithmName): DirtyDiffModel | undefined {
-		let model = this._diffModels.get(uri)?.get(algorithm);
-		if (model) {
-			return model;
-		}
-
-		const textFileModel = this.textFileService.files.get(uri);
-		if (!textFileModel?.isResolved()) {
-			return undefined;
-		}
-
-		model = this.instantiationService.createInstance(DirtyDiffModel, textFileModel, algorithm);
-		if (!this._diffModels.has(uri)) {
-			this._diffModels.set(uri, new Map());
-		}
-		this._diffModels.get(uri)!.set(algorithm, model);
-
-		return model;
-	}
-}
-
-registerSingleton(IDirtyDiffModelService, DirtyDiffModelService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/scm/browser/dirtyDiffModel.ts b/src/vs/workbench/contrib/scm/browser/dirtyDiffModel.ts
new file mode 100644
index 00000000000..3b49650a294
--- /dev/null
+++ b/src/vs/workbench/contrib/scm/browser/dirtyDiffModel.ts
@@ -0,0 +1,556 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ResourceMap } from '../../../../base/common/map.js';
+import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { EncodingMode, IResolvedTextFileEditorModel, isTextFileEditorModel, ITextFileEditorModel, ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { Disposable, DisposableMap, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { autorun, observableFromEvent } from '../../../../base/common/observable.js';
+import { isCodeEditor, isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
+import { DiffAlgorithmName, IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IChange } from '../../../../editor/common/diff/legacyLinesDiffComputer.js';
+import { IResolvedTextEditorModel, ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { ITextModel, shouldSynchronizeModel } from '../../../../editor/common/model.js';
+import { IQuickDiffService, QuickDiff, QuickDiffChange, QuickDiffResult } from '../common/quickDiff.js';
+import { ThrottledDelayer } from '../../../../base/common/async.js';
+import { ISCMRepository, ISCMService } from '../common/scm.js';
+import { sortedDiff, equals } from '../../../../base/common/arrays.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Iterable } from '../../../../base/common/iterator.js';
+import { ISplice } from '../../../../base/common/sequence.js';
+import { DiffState } from '../../../../editor/browser/widget/diffEditor/diffEditorViewModel.js';
+import { toLineChanges } from '../../../../editor/browser/widget/diffEditor/diffEditorWidget.js';
+import { LineRangeMapping, lineRangeMappingFromChange } from '../../../../editor/common/diff/rangeMapping.js';
+import { IDiffEditorModel } from '../../../../editor/common/editorCommon.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { IChatEditingService, WorkingSetEntryState } from '../../chat/common/chatEditingService.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+
+export const IDirtyDiffModelService = createDecorator<IDirtyDiffModelService>('IDirtyDiffModelService');
+
+export interface IDirtyDiffModelService {
+	_serviceBrand: undefined;
+
+	/**
+	 * Returns `undefined` if the editor model is not resolved
+	 * @param uri
+	 */
+	getDirtyDiffModel(uri: URI): DirtyDiffModel | undefined;
+
+	/**
+	 * Returns `undefined` if the editor model is not resolved
+	 * @param uri
+	 * @param algorithm
+	 */
+	getDiffModel(uri: URI, algorithm: DiffAlgorithmName): DirtyDiffModel | undefined;
+}
+
+export class DirtyDiffModelService extends Disposable implements IDirtyDiffModelService {
+	_serviceBrand: undefined;
+
+	private readonly _dirtyDiffModels = new ResourceMap<DirtyDiffModel>();
+	private readonly _diffModels = new ResourceMap<Map<DiffAlgorithmName, DirtyDiffModel>>();
+
+	private _visibleTextEditorControls = observableFromEvent(
+		this.editorService.onDidVisibleEditorsChange,
+		() => this.editorService.visibleTextEditorControls);
+
+	constructor(
+		@IEditorService private readonly editorService: IEditorService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@ITextFileService private readonly textFileService: ITextFileService,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService
+	) {
+		super();
+
+		this._register(autorun(reader => {
+			const visibleTextEditorControls = this._visibleTextEditorControls.read(reader);
+
+			// Dispose dirty diff models for text editors that are not visible
+			for (const [uri, dirtyDiffModel] of this._dirtyDiffModels) {
+				const textEditorControl = visibleTextEditorControls
+					.find(editor => isCodeEditor(editor) &&
+						this.uriIdentityService.extUri.isEqual(editor.getModel()?.uri, uri));
+
+				if (textEditorControl) {
+					continue;
+				}
+
+				dirtyDiffModel.dispose();
+				this._dirtyDiffModels.delete(uri);
+			}
+
+			// Dispose diff models for diff editors that are not visible
+			for (const [uri, dirtyDiffModel] of this._diffModels) {
+				const diffEditorControl = visibleTextEditorControls
+					.find(editor => isDiffEditor(editor) &&
+						this.uriIdentityService.extUri.isEqual(editor.getModel()?.modified.uri, uri));
+
+				if (diffEditorControl) {
+					continue;
+				}
+
+				for (const algorithm of dirtyDiffModel.keys()) {
+					dirtyDiffModel.get(algorithm)?.dispose();
+					dirtyDiffModel.delete(algorithm);
+				}
+				this._diffModels.delete(uri);
+			}
+		}));
+	}
+
+	getDirtyDiffModel(uri: URI): DirtyDiffModel | undefined {
+		let model = this._dirtyDiffModels.get(uri);
+		if (model) {
+			return model;
+		}
+
+		const textFileModel = this.textFileService.files.get(uri);
+		if (!textFileModel?.isResolved()) {
+			return undefined;
+		}
+
+		model = this.instantiationService.createInstance(DirtyDiffModel, textFileModel, undefined);
+		this._dirtyDiffModels.set(uri, model);
+
+		return model;
+	}
+
+	getDiffModel(uri: URI, algorithm: DiffAlgorithmName): DirtyDiffModel | undefined {
+		let model = this._diffModels.get(uri)?.get(algorithm);
+		if (model) {
+			return model;
+		}
+
+		const textFileModel = this.textFileService.files.get(uri);
+		if (!textFileModel?.isResolved()) {
+			return undefined;
+		}
+
+		model = this.instantiationService.createInstance(DirtyDiffModel, textFileModel, algorithm);
+		if (!this._diffModels.has(uri)) {
+			this._diffModels.set(uri, new Map());
+		}
+		this._diffModels.get(uri)!.set(algorithm, model);
+
+		return model;
+	}
+}
+
+export class DirtyDiffModel extends Disposable {
+
+	private _model: ITextFileEditorModel;
+
+	private readonly _originalEditorModels = new ResourceMap<IResolvedTextEditorModel>();
+	private readonly _originalEditorModelsDisposables = this._register(new DisposableStore());
+	get originalTextModels(): Iterable<ITextModel> {
+		return Iterable.map(this._originalEditorModels.values(), editorModel => editorModel.textEditorModel);
+	}
+
+	private _disposed = false;
+	private _quickDiffs: QuickDiff[] = [];
+	private _quickDiffsPromise?: Promise<QuickDiff[]>;
+	private _diffDelayer = new ThrottledDelayer<void>(200);
+
+	private readonly _onDidChange = new Emitter<{ changes: QuickDiffChange[]; diff: ISplice<QuickDiffChange>[] }>();
+	readonly onDidChange: Event<{ changes: QuickDiffChange[]; diff: ISplice<QuickDiffChange>[] }> = this._onDidChange.event;
+
+	private _changes: QuickDiffChange[] = [];
+	get changes(): QuickDiffChange[] { return this._changes; }
+
+	/**
+	 * Map of quick diff name to the index of the change in `this.changes`
+	 */
+	private _quickDiffChanges: Map<string, number[]> = new Map();
+	get quickDiffChanges(): Map<string, number[]> { return this._quickDiffChanges; }
+
+	private readonly _repositoryDisposables = new DisposableMap<ISCMRepository>();
+
+	constructor(
+		textFileModel: IResolvedTextFileEditorModel,
+		private readonly algorithm: DiffAlgorithmName | undefined,
+		@ISCMService private readonly scmService: ISCMService,
+		@IQuickDiffService private readonly quickDiffService: IQuickDiffService,
+		@IEditorWorkerService private readonly editorWorkerService: IEditorWorkerService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@ITextModelService private readonly textModelResolverService: ITextModelService,
+		@IChatEditingService private readonly _chatEditingService: IChatEditingService,
+		@IProgressService private readonly progressService: IProgressService,
+	) {
+		super();
+		this._model = textFileModel;
+
+		this._register(textFileModel.textEditorModel.onDidChangeContent(() => this.triggerDiff()));
+		this._register(
+			Event.filter(configurationService.onDidChangeConfiguration,
+				e => e.affectsConfiguration('scm.diffDecorationsIgnoreTrimWhitespace') || e.affectsConfiguration('diffEditor.ignoreTrimWhitespace')
+			)(this.triggerDiff, this)
+		);
+		this._register(scmService.onDidAddRepository(this.onDidAddRepository, this));
+		for (const r of scmService.repositories) {
+			this.onDidAddRepository(r);
+		}
+
+		this._register(this._model.onDidChangeEncoding(() => {
+			this._diffDelayer.cancel();
+			this._quickDiffs = [];
+			this._originalEditorModels.clear();
+			this._quickDiffsPromise = undefined;
+			this.setChanges([], new Map());
+			this.triggerDiff();
+		}));
+
+		this._register(this.quickDiffService.onDidChangeQuickDiffProviders(() => this.triggerDiff()));
+		this._register(this._chatEditingService.onDidChangeEditingSession(() => this.triggerDiff()));
+		this.triggerDiff();
+	}
+
+	get quickDiffs(): readonly QuickDiff[] {
+		return this._quickDiffs;
+	}
+
+	public getQuickDiffResults(): QuickDiffResult[] {
+		return this._quickDiffs.map(quickDiff => {
+			const changes = this.changes
+				.filter(change => change.label === quickDiff.label);
+
+			return {
+				label: quickDiff.label,
+				original: quickDiff.originalResource,
+				modified: this._model.resource,
+				changes: changes.map(change => change.change),
+				changes2: changes.map(change => change.change2)
+			};
+		});
+	}
+
+	public getDiffEditorModel(originalUri: URI): IDiffEditorModel | undefined {
+		const editorModel = this._originalEditorModels.get(originalUri);
+		return editorModel ?
+			{
+				modified: this._model.textEditorModel!,
+				original: editorModel.textEditorModel
+			} : undefined;
+	}
+
+	private onDidAddRepository(repository: ISCMRepository): void {
+		const disposables = new DisposableStore();
+
+		disposables.add(repository.provider.onDidChangeResources(this.triggerDiff, this));
+
+		const onDidRemoveRepository = Event.filter(this.scmService.onDidRemoveRepository, r => r === repository);
+		disposables.add(onDidRemoveRepository(() => this._repositoryDisposables.deleteAndDispose(repository)));
+
+		this._repositoryDisposables.set(repository, disposables);
+
+		this.triggerDiff();
+	}
+
+	private triggerDiff(): void {
+		if (!this._diffDelayer) {
+			return;
+		}
+
+		this._diffDelayer
+			.trigger(async () => {
+				const result: { changes: QuickDiffChange[]; mapChanges: Map<string, number[]> } | null = await this.diff();
+
+				const editorModels = Array.from(this._originalEditorModels.values());
+				if (!result || this._disposed || this._model.isDisposed() || editorModels.some(editorModel => editorModel.isDisposed())) {
+					return; // disposed
+				}
+
+				if (editorModels.every(editorModel => editorModel.textEditorModel.getValueLength() === 0)) {
+					result.changes = [];
+				}
+
+				this.setChanges(result.changes, result.mapChanges);
+			})
+			.catch(err => onUnexpectedError(err));
+	}
+
+	private setChanges(changes: QuickDiffChange[], mapChanges: Map<string, number[]>): void {
+		const diff = sortedDiff(this.changes, changes, (a, b) => compareChanges(a.change, b.change));
+		this._changes = changes;
+		this._quickDiffChanges = mapChanges;
+		this._onDidChange.fire({ changes, diff });
+	}
+
+	private diff(): Promise<{ changes: QuickDiffChange[]; mapChanges: Map<string, number[]> } | null> {
+		return this.progressService.withProgress({ location: ProgressLocation.Scm, delay: 250 }, async () => {
+			const originalURIs = await this.getQuickDiffsPromise();
+			if (this._disposed || this._model.isDisposed() || (originalURIs.length === 0)) {
+				return Promise.resolve({ changes: [], mapChanges: new Map() }); // disposed
+			}
+
+			const filteredToDiffable = originalURIs.filter(quickDiff => this.editorWorkerService.canComputeDirtyDiff(quickDiff.originalResource, this._model.resource));
+			if (filteredToDiffable.length === 0) {
+				return Promise.resolve({ changes: [], mapChanges: new Map() }); // All files are too large
+			}
+
+			const ignoreTrimWhitespaceSetting = this.configurationService.getValue<'true' | 'false' | 'inherit'>('scm.diffDecorationsIgnoreTrimWhitespace');
+			const ignoreTrimWhitespace = ignoreTrimWhitespaceSetting === 'inherit'
+				? this.configurationService.getValue<boolean>('diffEditor.ignoreTrimWhitespace')
+				: ignoreTrimWhitespaceSetting !== 'false';
+
+			const allDiffs: QuickDiffChange[] = [];
+			for (const quickDiff of filteredToDiffable) {
+				const dirtyDiff = await this._diff(quickDiff.originalResource, this._model.resource, ignoreTrimWhitespace);
+				if (dirtyDiff.changes && dirtyDiff.changes2 && dirtyDiff.changes.length === dirtyDiff.changes2.length) {
+					for (let index = 0; index < dirtyDiff.changes.length; index++) {
+						allDiffs.push({
+							label: quickDiff.label,
+							original: quickDiff.originalResource,
+							modified: this._model.resource,
+							change: dirtyDiff.changes[index],
+							change2: dirtyDiff.changes2[index]
+						});
+					}
+				}
+			}
+			const sorted = allDiffs.sort((a, b) => compareChanges(a.change, b.change));
+			const map: Map<string, number[]> = new Map();
+			for (let i = 0; i < sorted.length; i++) {
+				const label = sorted[i].label;
+				if (!map.has(label)) {
+					map.set(label, []);
+				}
+				map.get(label)!.push(i);
+			}
+			return { changes: sorted, mapChanges: map };
+		});
+	}
+
+	private async _diff(original: URI, modified: URI, ignoreTrimWhitespace: boolean): Promise<{ changes: readonly IChange[] | null; changes2: readonly LineRangeMapping[] | null }> {
+		if (this.algorithm === undefined) {
+			const changes = await this.editorWorkerService.computeDirtyDiff(original, modified, ignoreTrimWhitespace);
+			return { changes, changes2: changes?.map(change => lineRangeMappingFromChange(change)) ?? null };
+		}
+
+		const result = await this.editorWorkerService.computeDiff(original, modified, {
+			computeMoves: false,
+			ignoreTrimWhitespace,
+			maxComputationTimeMs: Number.MAX_SAFE_INTEGER
+		}, this.algorithm);
+
+		return { changes: result ? toLineChanges(DiffState.fromDiffResult(result)) : null, changes2: result?.changes ?? null };
+	}
+
+	private getQuickDiffsPromise(): Promise<QuickDiff[]> {
+		if (this._quickDiffsPromise) {
+			return this._quickDiffsPromise;
+		}
+
+		this._quickDiffsPromise = this.getOriginalResource().then(async (quickDiffs) => {
+			if (this._disposed) { // disposed
+				return [];
+			}
+
+			if (quickDiffs.length === 0) {
+				this._quickDiffs = [];
+				this._originalEditorModels.clear();
+				return [];
+			}
+
+			if (equals(this._quickDiffs, quickDiffs, (a, b) => a.originalResource.toString() === b.originalResource.toString() && a.label === b.label)) {
+				return quickDiffs;
+			}
+
+			this._quickDiffs = quickDiffs;
+
+			this._originalEditorModels.clear();
+			this._originalEditorModelsDisposables.clear();
+			return (await Promise.all(quickDiffs.map(async (quickDiff) => {
+				try {
+					const ref = await this.textModelResolverService.createModelReference(quickDiff.originalResource);
+					if (this._disposed) { // disposed
+						ref.dispose();
+						return [];
+					}
+
+					this._originalEditorModels.set(quickDiff.originalResource, ref.object);
+
+					if (isTextFileEditorModel(ref.object)) {
+						const encoding = this._model.getEncoding();
+
+						if (encoding) {
+							ref.object.setEncoding(encoding, EncodingMode.Decode);
+						}
+					}
+
+					this._originalEditorModelsDisposables.add(ref);
+					this._originalEditorModelsDisposables.add(ref.object.textEditorModel.onDidChangeContent(() => this.triggerDiff()));
+
+					return quickDiff;
+				} catch (error) {
+					return []; // possibly invalid reference
+				}
+			}))).flat();
+		});
+
+		return this._quickDiffsPromise.finally(() => {
+			this._quickDiffsPromise = undefined;
+		});
+	}
+
+	private async getOriginalResource(): Promise<QuickDiff[]> {
+		if (this._disposed) {
+			return Promise.resolve([]);
+		}
+		const uri = this._model.resource;
+
+		const session = this._chatEditingService.currentEditingSession;
+		if (session && session.getEntry(uri)?.state.get() === WorkingSetEntryState.Modified) {
+			// disable dirty diff when doing chat edits
+			return Promise.resolve([]);
+		}
+
+		const isSynchronized = this._model.textEditorModel ? shouldSynchronizeModel(this._model.textEditorModel) : undefined;
+		const quickDiffs = await this.quickDiffService.getQuickDiffs(uri, this._model.getLanguageId(), isSynchronized);
+
+		// TODO@lszomoru - find a long term solution for this
+		// When the DirtyDiffModel is created for a diff editor, there is no
+		// need to compute the diff information for the `isSCM` quick diff
+		// provider as that information will be provided by the diff editor
+		return this.algorithm !== undefined
+			? quickDiffs.filter(quickDiff => !quickDiff.isSCM)
+			: quickDiffs;
+	}
+
+	findNextClosestChange(lineNumber: number, inclusive = true, provider?: string): number {
+		let preferredProvider: string | undefined;
+		if (!provider && inclusive) {
+			preferredProvider = this.quickDiffs.find(value => value.isSCM)?.label;
+		}
+
+		const possibleChanges: number[] = [];
+		for (let i = 0; i < this.changes.length; i++) {
+			if (provider && this.changes[i].label !== provider) {
+				continue;
+			}
+
+			// Skip quick diffs that are not visible
+			if (!this.quickDiffs.find(quickDiff => quickDiff.label === this.changes[i].label)?.visible) {
+				continue;
+			}
+
+			const change = this.changes[i];
+			const possibleChangesLength = possibleChanges.length;
+
+			if (inclusive) {
+				if (getModifiedEndLineNumber(change.change) >= lineNumber) {
+					if (preferredProvider && change.label !== preferredProvider) {
+						possibleChanges.push(i);
+					} else {
+						return i;
+					}
+				}
+			} else {
+				if (change.change.modifiedStartLineNumber > lineNumber) {
+					return i;
+				}
+			}
+			if ((possibleChanges.length > 0) && (possibleChanges.length === possibleChangesLength)) {
+				return possibleChanges[0];
+			}
+		}
+
+		return possibleChanges.length > 0 ? possibleChanges[0] : 0;
+	}
+
+	findPreviousClosestChange(lineNumber: number, inclusive = true, provider?: string): number {
+		for (let i = this.changes.length - 1; i >= 0; i--) {
+			if (provider && this.changes[i].label !== provider) {
+				continue;
+			}
+
+			// Skip quick diffs that are not visible
+			if (!this.quickDiffs.find(quickDiff => quickDiff.label === this.changes[i].label)?.visible) {
+				continue;
+			}
+
+			const change = this.changes[i].change;
+
+			if (inclusive) {
+				if (change.modifiedStartLineNumber <= lineNumber) {
+					return i;
+				}
+			} else {
+				if (getModifiedEndLineNumber(change) < lineNumber) {
+					return i;
+				}
+			}
+		}
+
+		return this.changes.length - 1;
+	}
+
+	override dispose(): void {
+		this._disposed = true;
+
+		this._quickDiffs = [];
+		this._diffDelayer.cancel();
+		this._originalEditorModels.clear();
+		this._repositoryDisposables.dispose();
+
+		super.dispose();
+	}
+}
+
+function compareChanges(a: IChange, b: IChange): number {
+	let result = a.modifiedStartLineNumber - b.modifiedStartLineNumber;
+
+	if (result !== 0) {
+		return result;
+	}
+
+	result = a.modifiedEndLineNumber - b.modifiedEndLineNumber;
+
+	if (result !== 0) {
+		return result;
+	}
+
+	result = a.originalStartLineNumber - b.originalStartLineNumber;
+
+	if (result !== 0) {
+		return result;
+	}
+
+	return a.originalEndLineNumber - b.originalEndLineNumber;
+}
+
+export function getChangeHeight(change: IChange): number {
+	const modified = change.modifiedEndLineNumber - change.modifiedStartLineNumber + 1;
+	const original = change.originalEndLineNumber - change.originalStartLineNumber + 1;
+
+	if (change.originalEndLineNumber === 0) {
+		return modified;
+	} else if (change.modifiedEndLineNumber === 0) {
+		return original;
+	} else {
+		return modified + original;
+	}
+}
+
+export function getModifiedEndLineNumber(change: IChange): number {
+	if (change.modifiedEndLineNumber === 0) {
+		return change.modifiedStartLineNumber === 0 ? 1 : change.modifiedStartLineNumber;
+	} else {
+		return change.modifiedEndLineNumber;
+	}
+}
+
+export function lineIntersectsChange(lineNumber: number, change: IChange): boolean {
+	// deletion at the beginning of the file
+	if (lineNumber === 1 && change.modifiedStartLineNumber === 0 && change.modifiedEndLineNumber === 0) {
+		return true;
+	}
+
+	return lineNumber >= change.modifiedStartLineNumber && lineNumber <= (change.modifiedEndLineNumber || change.modifiedStartLineNumber);
+}
diff --git a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
index 7ca28f94265..473c2f5d418 100644
--- a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
+++ b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
@@ -6,16 +6,11 @@
 import * as nls from '../../../../nls.js';
 
 import './media/dirtydiffDecorator.css';
-import { ThrottledDelayer } from '../../../../base/common/async.js';
-import { IDisposable, dispose, toDisposable, Disposable, DisposableStore, DisposableMap } from '../../../../base/common/lifecycle.js';
-import { Event, Emitter } from '../../../../base/common/event.js';
-import * as ext from '../../../common/contributions.js';
+import { IDisposable, toDisposable, Disposable, DisposableStore, DisposableMap } from '../../../../base/common/lifecycle.js';
+import { Event } from '../../../../base/common/event.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IResolvedTextEditorModel, ITextModelService } from '../../../../editor/common/services/resolverService.js';
-import { DiffAlgorithmName, IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { URI } from '../../../../base/common/uri.js';
-import { ISCMService, ISCMRepository } from '../common/scm.js';
 import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
 import { IColorTheme, themeColorFromId, IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { editorErrorForeground, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
@@ -37,33 +32,28 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 import { basename } from '../../../../base/common/resources.js';
 import { MenuId, IMenuService, IMenu, MenuItemAction, MenuRegistry } from '../../../../platform/actions/common/actions.js';
 import { getFlatActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
-import { ScrollType, IEditorContribution, IDiffEditorModel, IEditorModel, IEditorDecorationsCollection } from '../../../../editor/common/editorCommon.js';
-import { OverviewRulerLane, ITextModel, IModelDecorationOptions, MinimapPosition, shouldSynchronizeModel } from '../../../../editor/common/model.js';
-import { equals, sortedDiff } from '../../../../base/common/arrays.js';
+import { ScrollType, IEditorContribution, IEditorDecorationsCollection } from '../../../../editor/common/editorCommon.js';
+import { OverviewRulerLane, IModelDecorationOptions, MinimapPosition } from '../../../../editor/common/model.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { ISplice } from '../../../../base/common/sequence.js';
 import * as dom from '../../../../base/browser/dom.js';
 import * as domStylesheetsJs from '../../../../base/browser/domStylesheets.js';
-import { EncodingMode, ITextFileEditorModel, IResolvedTextFileEditorModel, ITextFileService, isTextFileEditorModel } from '../../../services/textfile/common/textfiles.js';
 import { gotoNextLocation, gotoPreviousLocation } from '../../../../platform/theme/common/iconRegistry.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
-import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { TextCompareEditorActiveContext } from '../../../common/contextkeys.js';
-import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
 import { IChange } from '../../../../editor/common/diff/legacyLinesDiffComputer.js';
 import { Color } from '../../../../base/common/color.js';
-import { ResourceMap } from '../../../../base/common/map.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
-import { IQuickDiffService, QuickDiff, QuickDiffChange, QuickDiffResult } from '../common/quickDiff.js';
+import { IQuickDiffService, QuickDiffChange } from '../common/quickDiff.js';
 import { IQuickDiffSelectItem, SwitchQuickDiffBaseAction, SwitchQuickDiffViewItem } from './dirtyDiffSwitcher.js';
-import { IChatEditingService, WorkingSetEntryState } from '../../chat/common/chatEditingService.js';
-import { LineRangeMapping, lineRangeMappingFromChange } from '../../../../editor/common/diff/rangeMapping.js';
-import { DiffState } from '../../../../editor/browser/widget/diffEditor/diffEditorViewModel.js';
-import { toLineChanges } from '../../../../editor/browser/widget/diffEditor/diffEditorWidget.js';
 import { Iterable } from '../../../../base/common/iterator.js';
+import { DirtyDiffModel, getChangeHeight, getModifiedEndLineNumber, IDirtyDiffModelService, lineIntersectsChange } from './dirtyDiffModel.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 
 class DiffActionRunner extends ActionRunner {
 
@@ -76,46 +66,8 @@ class DiffActionRunner extends ActionRunner {
 	}
 }
 
-export interface IModelRegistry {
-	getModel(editorModel: IEditorModel, codeEditor: ICodeEditor): DirtyDiffModel | undefined;
-}
-
-export interface DirtyDiffContribution extends IEditorContribution {
-	getChanges(): IChange[];
-}
-
 export const isDirtyDiffVisible = new RawContextKey<boolean>('dirtyDiffVisible', false);
 
-function getChangeHeight(change: IChange): number {
-	const modified = change.modifiedEndLineNumber - change.modifiedStartLineNumber + 1;
-	const original = change.originalEndLineNumber - change.originalStartLineNumber + 1;
-
-	if (change.originalEndLineNumber === 0) {
-		return modified;
-	} else if (change.modifiedEndLineNumber === 0) {
-		return original;
-	} else {
-		return modified + original;
-	}
-}
-
-function getModifiedEndLineNumber(change: IChange): number {
-	if (change.modifiedEndLineNumber === 0) {
-		return change.modifiedStartLineNumber === 0 ? 1 : change.modifiedStartLineNumber;
-	} else {
-		return change.modifiedEndLineNumber;
-	}
-}
-
-function lineIntersectsChange(lineNumber: number, change: IChange): boolean {
-	// deletion at the beginning of the file
-	if (lineNumber === 1 && change.modifiedStartLineNumber === 0 && change.modifiedEndLineNumber === 0) {
-		return true;
-	}
-
-	return lineNumber >= change.modifiedStartLineNumber && lineNumber <= (change.modifiedEndLineNumber || change.modifiedStartLineNumber);
-}
-
 class UIEditorAction extends Action {
 
 	private editor: ICodeEditor;
@@ -575,23 +527,18 @@ export class GotoPreviousChangeAction extends EditorAction {
 		const accessibilitySignalService = accessor.get(IAccessibilitySignalService);
 		const accessibilityService = accessor.get(IAccessibilityService);
 		const codeEditorService = accessor.get(ICodeEditorService);
+		const dirtyDiffModelService = accessor.get(IDirtyDiffModelService);
 
 		if (!outerEditor || !outerEditor.hasModel()) {
 			return;
 		}
 
-		const controller = DirtyDiffController.get(outerEditor);
-
-		if (!controller || !controller.modelRegistry) {
-			return;
-		}
-
-		const lineNumber = outerEditor.getPosition().lineNumber;
-		const model = controller.modelRegistry.getModel(outerEditor.getModel(), outerEditor);
+		const model = dirtyDiffModelService.getDirtyDiffModel(outerEditor.getModel().uri);
 		if (!model || model.changes.length === 0) {
 			return;
 		}
 
+		const lineNumber = outerEditor.getPosition().lineNumber;
 		const index = model.findPreviousClosestChange(lineNumber, false);
 		const change = model.changes[index];
 		await playAccessibilitySymbolForChange(change.change, accessibilitySignalService);
@@ -616,24 +563,19 @@ export class GotoNextChangeAction extends EditorAction {
 		const outerEditor = getOuterEditorFromDiffEditor(accessor);
 		const accessibilityService = accessor.get(IAccessibilityService);
 		const codeEditorService = accessor.get(ICodeEditorService);
+		const dirtyDiffModelService = accessor.get(IDirtyDiffModelService);
 
 		if (!outerEditor || !outerEditor.hasModel()) {
 			return;
 		}
 
-		const controller = DirtyDiffController.get(outerEditor);
-
-		if (!controller || !controller.modelRegistry) {
-			return;
-		}
-
-		const lineNumber = outerEditor.getPosition().lineNumber;
-		const model = controller.modelRegistry.getModel(outerEditor.getModel(), outerEditor);
+		const model = dirtyDiffModelService.getDirtyDiffModel(outerEditor.getModel().uri);
 
 		if (!model || model.changes.length === 0) {
 			return;
 		}
 
+		const lineNumber = outerEditor.getPosition().lineNumber;
 		const index = model.findNextClosestChange(lineNumber, false);
 		const change = model.changes[index].change;
 		await playAccessibilitySymbolForChange(change, accessibilitySignalService);
@@ -691,7 +633,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
-export class DirtyDiffController extends Disposable implements DirtyDiffContribution {
+export class DirtyDiffController extends Disposable implements IEditorContribution {
 
 	public static readonly ID = 'editor.contrib.dirtydiff';
 
@@ -699,8 +641,6 @@ export class DirtyDiffController extends Disposable implements DirtyDiffContribu
 		return editor.getContribution<DirtyDiffController>(DirtyDiffController.ID);
 	}
 
-	modelRegistry: IModelRegistry | null = null;
-
 	private model: DirtyDiffModel | null = null;
 	private widget: DirtyDiffWidget | null = null;
 	private readonly isDirtyDiffVisible!: IContextKey<boolean>;
@@ -714,6 +654,7 @@ export class DirtyDiffController extends Disposable implements DirtyDiffContribu
 		private editor: ICodeEditor,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IDirtyDiffModelService private readonly dirtyDiffModelService: IDirtyDiffModelService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) {
 		super();
@@ -827,17 +768,13 @@ export class DirtyDiffController extends Disposable implements DirtyDiffContribu
 			return true;
 		}
 
-		if (!this.modelRegistry) {
-			return false;
-		}
-
 		const editorModel = this.editor.getModel();
 
 		if (!editorModel) {
 			return false;
 		}
 
-		const model = this.modelRegistry.getModel(editorModel, this.editor);
+		const model = this.dirtyDiffModelService.getDirtyDiffModel(editorModel.uri);
 
 		if (!model) {
 			return false;
@@ -940,17 +877,13 @@ export class DirtyDiffController extends Disposable implements DirtyDiffContribu
 			return;
 		}
 
-		if (!this.modelRegistry) {
-			return;
-		}
-
 		const editorModel = this.editor.getModel();
 
 		if (!editorModel) {
 			return;
 		}
 
-		const model = this.modelRegistry.getModel(editorModel, this.editor);
+		const model = this.dirtyDiffModelService.getDirtyDiffModel(editorModel.uri);
 
 		if (!model) {
 			return;
@@ -969,23 +902,6 @@ export class DirtyDiffController extends Disposable implements DirtyDiffContribu
 		}
 	}
 
-	getChanges(): IChange[] {
-		if (!this.modelRegistry) {
-			return [];
-		}
-		if (!this.editor.hasModel()) {
-			return [];
-		}
-
-		const model = this.modelRegistry.getModel(this.editor.getModel(), this.editor);
-
-		if (!model) {
-			return [];
-		}
-
-		return model.changes.map(change => change.change);
-	}
-
 	override dispose(): void {
 		this.gutterActionDisposables.dispose();
 		super.dispose();
@@ -1054,16 +970,13 @@ class DirtyDiffDecorator extends Disposable {
 	private modifiedPatternOptions: ModelDecorationOptions;
 	private deletedOptions: ModelDecorationOptions;
 	private decorationsCollection: IEditorDecorationsCollection | undefined;
-	private editorModel: ITextModel | null;
 
 	constructor(
-		editorModel: ITextModel,
 		private readonly codeEditor: ICodeEditor,
-		private model: DirtyDiffModel,
+		private readonly dirtyDiffModel: DirtyDiffModel,
 		@IConfigurationService private readonly configurationService: IConfigurationService
 	) {
 		super();
-		this.editorModel = editorModel;
 
 		const decorations = configurationService.getValue<string>('scm.diffDecorations');
 		const gutter = decorations === 'all' || decorations === 'gutter';
@@ -1109,18 +1022,18 @@ class DirtyDiffDecorator extends Disposable {
 			}
 		}));
 
-		this._register(model.onDidChange(this.onDidChange, this));
+		this._register(Event.runAndSubscribe(dirtyDiffModel.onDidChange, () => this.onDidChange()));
 	}
 
 	private onDidChange(): void {
-		if (!this.editorModel) {
+		if (!this.codeEditor.hasModel()) {
 			return;
 		}
 
-		const visibleQuickDiffs = this.model.quickDiffs.filter(quickDiff => quickDiff.visible);
+		const visibleQuickDiffs = this.dirtyDiffModel.quickDiffs.filter(quickDiff => quickDiff.visible);
 		const pattern = this.configurationService.getValue<{ added: boolean; modified: boolean }>('scm.diffDecorationsGutterPattern');
 
-		const decorations = this.model.changes
+		const decorations = this.dirtyDiffModel.changes
 			.filter(labeledChange => visibleQuickDiffs.some(quickDiff => quickDiff.label === labeledChange.label))
 			.map((labeledChange) => {
 				const change = labeledChange.change;
@@ -1164,424 +1077,40 @@ class DirtyDiffDecorator extends Disposable {
 	}
 
 	override dispose(): void {
-		super.dispose();
-
 		if (this.decorationsCollection) {
 			this.decorationsCollection?.clear();
 		}
 
-		this.editorModel = null;
 		this.decorationsCollection = undefined;
+		super.dispose();
 	}
 }
 
-function compareChanges(a: IChange, b: IChange): number {
-	let result = a.modifiedStartLineNumber - b.modifiedStartLineNumber;
-
-	if (result !== 0) {
-		return result;
-	}
-
-	result = a.modifiedEndLineNumber - b.modifiedEndLineNumber;
-
-	if (result !== 0) {
-		return result;
-	}
-
-	result = a.originalStartLineNumber - b.originalStartLineNumber;
-
-	if (result !== 0) {
-		return result;
-	}
-
-	return a.originalEndLineNumber - b.originalEndLineNumber;
-}
-
-
 export async function getOriginalResource(quickDiffService: IQuickDiffService, uri: URI, language: string | undefined, isSynchronized: boolean | undefined): Promise<URI | null> {
 	const quickDiffs = await quickDiffService.getQuickDiffs(uri, language, isSynchronized);
 	return quickDiffs.length > 0 ? quickDiffs[0].originalResource : null;
 }
 
-export class DirtyDiffModel extends Disposable {
-
-	private _model: ITextFileEditorModel;
-
-	private readonly _originalEditorModels = new ResourceMap<IResolvedTextEditorModel>();
-	private readonly _originalEditorModelsDisposables = this._register(new DisposableStore());
-	get originalTextModels(): Iterable<ITextModel> {
-		return Iterable.map(this._originalEditorModels.values(), editorModel => editorModel.textEditorModel);
-	}
-
-	private _disposed = false;
-	private _quickDiffs: QuickDiff[] = [];
-	private _quickDiffsPromise?: Promise<QuickDiff[]>;
-	private _diffDelayer = new ThrottledDelayer<void>(200);
-
-	private readonly _onDidChange = new Emitter<{ changes: QuickDiffChange[]; diff: ISplice<QuickDiffChange>[] }>();
-	readonly onDidChange: Event<{ changes: QuickDiffChange[]; diff: ISplice<QuickDiffChange>[] }> = this._onDidChange.event;
-
-	private _changes: QuickDiffChange[] = [];
-	get changes(): QuickDiffChange[] { return this._changes; }
-
-	/**
-	 * Map of quick diff name to the index of the change in `this.changes`
-	 */
-	private _quickDiffChanges: Map<string, number[]> = new Map();
-	get quickDiffChanges(): Map<string, number[]> { return this._quickDiffChanges; }
-
-	private readonly _repositoryDisposables = new DisposableMap<ISCMRepository>();
-
-	constructor(
-		textFileModel: IResolvedTextFileEditorModel,
-		private readonly algorithm: DiffAlgorithmName | undefined,
-		@ISCMService private readonly scmService: ISCMService,
-		@IQuickDiffService private readonly quickDiffService: IQuickDiffService,
-		@IEditorWorkerService private readonly editorWorkerService: IEditorWorkerService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@ITextModelService private readonly textModelResolverService: ITextModelService,
-		@IChatEditingService private readonly _chatEditingService: IChatEditingService,
-		@IProgressService private readonly progressService: IProgressService,
-	) {
-		super();
-		this._model = textFileModel;
-
-		this._register(textFileModel.textEditorModel.onDidChangeContent(() => this.triggerDiff()));
-		this._register(
-			Event.filter(configurationService.onDidChangeConfiguration,
-				e => e.affectsConfiguration('scm.diffDecorationsIgnoreTrimWhitespace') || e.affectsConfiguration('diffEditor.ignoreTrimWhitespace')
-			)(this.triggerDiff, this)
-		);
-		this._register(scmService.onDidAddRepository(this.onDidAddRepository, this));
-		for (const r of scmService.repositories) {
-			this.onDidAddRepository(r);
-		}
-
-		this._register(this._model.onDidChangeEncoding(() => {
-			this._diffDelayer.cancel();
-			this._quickDiffs = [];
-			this._originalEditorModels.clear();
-			this._quickDiffsPromise = undefined;
-			this.setChanges([], new Map());
-			this.triggerDiff();
-		}));
-
-		this._register(this.quickDiffService.onDidChangeQuickDiffProviders(() => this.triggerDiff()));
-		this._register(this._chatEditingService.onDidChangeEditingSession(() => this.triggerDiff()));
-		this.triggerDiff();
-	}
-
-	get quickDiffs(): readonly QuickDiff[] {
-		return this._quickDiffs;
-	}
-
-	public getQuickDiffResults(): QuickDiffResult[] {
-		return this._quickDiffs.map(quickDiff => {
-			const changes = this.changes
-				.filter(change => change.label === quickDiff.label);
-
-			return {
-				label: quickDiff.label,
-				original: quickDiff.originalResource,
-				modified: this._model.resource,
-				changes: changes.map(change => change.change),
-				changes2: changes.map(change => change.change2)
-			};
-		});
-	}
-
-	public getDiffEditorModel(originalUri: URI): IDiffEditorModel | undefined {
-		const editorModel = this._originalEditorModels.get(originalUri);
-		return editorModel ?
-			{
-				modified: this._model.textEditorModel!,
-				original: editorModel.textEditorModel
-			} : undefined;
-	}
-
-	private onDidAddRepository(repository: ISCMRepository): void {
-		const disposables = new DisposableStore();
-
-		disposables.add(repository.provider.onDidChangeResources(this.triggerDiff, this));
-
-		const onDidRemoveRepository = Event.filter(this.scmService.onDidRemoveRepository, r => r === repository);
-		disposables.add(onDidRemoveRepository(() => this._repositoryDisposables.deleteAndDispose(repository)));
-
-		this._repositoryDisposables.set(repository, disposables);
-
-		this.triggerDiff();
-	}
-
-	private triggerDiff(): void {
-		if (!this._diffDelayer) {
-			return;
-		}
-
-		this._diffDelayer
-			.trigger(async () => {
-				const result: { changes: QuickDiffChange[]; mapChanges: Map<string, number[]> } | null = await this.diff();
-
-				const editorModels = Array.from(this._originalEditorModels.values());
-				if (!result || this._disposed || this._model.isDisposed() || editorModels.some(editorModel => editorModel.isDisposed())) {
-					return; // disposed
-				}
-
-				if (editorModels.every(editorModel => editorModel.textEditorModel.getValueLength() === 0)) {
-					result.changes = [];
-				}
-
-				this.setChanges(result.changes, result.mapChanges);
-			})
-			.catch(err => onUnexpectedError(err));
-	}
-
-	private setChanges(changes: QuickDiffChange[], mapChanges: Map<string, number[]>): void {
-		const diff = sortedDiff(this.changes, changes, (a, b) => compareChanges(a.change, b.change));
-		this._changes = changes;
-		this._quickDiffChanges = mapChanges;
-		this._onDidChange.fire({ changes, diff });
-	}
-
-	private diff(): Promise<{ changes: QuickDiffChange[]; mapChanges: Map<string, number[]> } | null> {
-		return this.progressService.withProgress({ location: ProgressLocation.Scm, delay: 250 }, async () => {
-			const originalURIs = await this.getQuickDiffsPromise();
-			if (this._disposed || this._model.isDisposed() || (originalURIs.length === 0)) {
-				return Promise.resolve({ changes: [], mapChanges: new Map() }); // disposed
-			}
-
-			const filteredToDiffable = originalURIs.filter(quickDiff => this.editorWorkerService.canComputeDirtyDiff(quickDiff.originalResource, this._model.resource));
-			if (filteredToDiffable.length === 0) {
-				return Promise.resolve({ changes: [], mapChanges: new Map() }); // All files are too large
-			}
-
-			const ignoreTrimWhitespaceSetting = this.configurationService.getValue<'true' | 'false' | 'inherit'>('scm.diffDecorationsIgnoreTrimWhitespace');
-			const ignoreTrimWhitespace = ignoreTrimWhitespaceSetting === 'inherit'
-				? this.configurationService.getValue<boolean>('diffEditor.ignoreTrimWhitespace')
-				: ignoreTrimWhitespaceSetting !== 'false';
-
-			const allDiffs: QuickDiffChange[] = [];
-			for (const quickDiff of filteredToDiffable) {
-				const dirtyDiff = await this._diff(quickDiff.originalResource, this._model.resource, ignoreTrimWhitespace);
-				if (dirtyDiff.changes && dirtyDiff.changes2 && dirtyDiff.changes.length === dirtyDiff.changes2.length) {
-					for (let index = 0; index < dirtyDiff.changes.length; index++) {
-						allDiffs.push({
-							label: quickDiff.label,
-							original: quickDiff.originalResource,
-							modified: this._model.resource,
-							change: dirtyDiff.changes[index],
-							change2: dirtyDiff.changes2[index]
-						});
-					}
-				}
-			}
-			const sorted = allDiffs.sort((a, b) => compareChanges(a.change, b.change));
-			const map: Map<string, number[]> = new Map();
-			for (let i = 0; i < sorted.length; i++) {
-				const label = sorted[i].label;
-				if (!map.has(label)) {
-					map.set(label, []);
-				}
-				map.get(label)!.push(i);
-			}
-			return { changes: sorted, mapChanges: map };
-		});
-	}
-
-	private async _diff(original: URI, modified: URI, ignoreTrimWhitespace: boolean): Promise<{ changes: readonly IChange[] | null; changes2: readonly LineRangeMapping[] | null }> {
-		if (this.algorithm === undefined) {
-			const changes = await this.editorWorkerService.computeDirtyDiff(original, modified, ignoreTrimWhitespace);
-			return { changes, changes2: changes?.map(change => lineRangeMappingFromChange(change)) ?? null };
-		}
-
-		const result = await this.editorWorkerService.computeDiff(original, modified, {
-			computeMoves: false,
-			ignoreTrimWhitespace,
-			maxComputationTimeMs: Number.MAX_SAFE_INTEGER
-		}, this.algorithm);
-
-		return { changes: result ? toLineChanges(DiffState.fromDiffResult(result)) : null, changes2: result?.changes ?? null };
-	}
-
-	private getQuickDiffsPromise(): Promise<QuickDiff[]> {
-		if (this._quickDiffsPromise) {
-			return this._quickDiffsPromise;
-		}
-
-		this._quickDiffsPromise = this.getOriginalResource().then(async (quickDiffs) => {
-			if (this._disposed) { // disposed
-				return [];
-			}
-
-			if (quickDiffs.length === 0) {
-				this._quickDiffs = [];
-				this._originalEditorModels.clear();
-				return [];
-			}
-
-			if (equals(this._quickDiffs, quickDiffs, (a, b) => a.originalResource.toString() === b.originalResource.toString() && a.label === b.label)) {
-				return quickDiffs;
-			}
-
-			this._quickDiffs = quickDiffs;
-
-			this._originalEditorModels.clear();
-			this._originalEditorModelsDisposables.clear();
-			return (await Promise.all(quickDiffs.map(async (quickDiff) => {
-				try {
-					const ref = await this.textModelResolverService.createModelReference(quickDiff.originalResource);
-					if (this._disposed) { // disposed
-						ref.dispose();
-						return [];
-					}
-
-					this._originalEditorModels.set(quickDiff.originalResource, ref.object);
-
-					if (isTextFileEditorModel(ref.object)) {
-						const encoding = this._model.getEncoding();
-
-						if (encoding) {
-							ref.object.setEncoding(encoding, EncodingMode.Decode);
-						}
-					}
-
-					this._originalEditorModelsDisposables.add(ref);
-					this._originalEditorModelsDisposables.add(ref.object.textEditorModel.onDidChangeContent(() => this.triggerDiff()));
-
-					return quickDiff;
-				} catch (error) {
-					return []; // possibly invalid reference
-				}
-			}))).flat();
-		});
-
-		return this._quickDiffsPromise.finally(() => {
-			this._quickDiffsPromise = undefined;
-		});
-	}
-
-	private async getOriginalResource(): Promise<QuickDiff[]> {
-		if (this._disposed) {
-			return Promise.resolve([]);
-		}
-		const uri = this._model.resource;
-
-		const session = this._chatEditingService.currentEditingSession;
-		if (session && session.getEntry(uri)?.state.get() === WorkingSetEntryState.Modified) {
-			// disable dirty diff when doing chat edits
-			return Promise.resolve([]);
-		}
-
-		const isSynchronized = this._model.textEditorModel ? shouldSynchronizeModel(this._model.textEditorModel) : undefined;
-		const quickDiffs = await this.quickDiffService.getQuickDiffs(uri, this._model.getLanguageId(), isSynchronized);
-
-		// TODO@lszomoru - find a long term solution for this
-		// When the DirtyDiffModel is created for a diff editor, there is no
-		// need to compute the diff information for the `isSCM` quick diff
-		// provider as that information will be provided by the diff editor
-		return this.algorithm !== undefined
-			? quickDiffs.filter(quickDiff => !quickDiff.isSCM)
-			: quickDiffs;
-	}
-
-	findNextClosestChange(lineNumber: number, inclusive = true, provider?: string): number {
-		let preferredProvider: string | undefined;
-		if (!provider && inclusive) {
-			preferredProvider = this.quickDiffs.find(value => value.isSCM)?.label;
-		}
-
-		const possibleChanges: number[] = [];
-		for (let i = 0; i < this.changes.length; i++) {
-			if (provider && this.changes[i].label !== provider) {
-				continue;
-			}
-			const change = this.changes[i];
-			const possibleChangesLength = possibleChanges.length;
-
-			if (inclusive) {
-				if (getModifiedEndLineNumber(change.change) >= lineNumber) {
-					if (preferredProvider && change.label !== preferredProvider) {
-						possibleChanges.push(i);
-					} else {
-						return i;
-					}
-				}
-			} else {
-				if (change.change.modifiedStartLineNumber > lineNumber) {
-					return i;
-				}
-			}
-			if ((possibleChanges.length > 0) && (possibleChanges.length === possibleChangesLength)) {
-				return possibleChanges[0];
-			}
-		}
-
-		return possibleChanges.length > 0 ? possibleChanges[0] : 0;
-	}
-
-	findPreviousClosestChange(lineNumber: number, inclusive = true, provider?: string): number {
-		for (let i = this.changes.length - 1; i >= 0; i--) {
-			if (provider && this.changes[i].label !== provider) {
-				continue;
-			}
-			const change = this.changes[i].change;
-
-			if (inclusive) {
-				if (change.modifiedStartLineNumber <= lineNumber) {
-					return i;
-				}
-			} else {
-				if (getModifiedEndLineNumber(change) < lineNumber) {
-					return i;
-				}
-			}
-		}
-
-		return this.changes.length - 1;
-	}
-
-	override dispose(): void {
-		this._disposed = true;
-
-		this._quickDiffs = [];
-		this._diffDelayer.cancel();
-		this._originalEditorModels.clear();
-		this._repositoryDisposables.dispose();
-
-		super.dispose();
-	}
-}
-
-class DirtyDiffItem {
-
-	constructor(
-		readonly model: DirtyDiffModel,
-		readonly decorator: DirtyDiffDecorator
-	) { }
-
-	dispose(): void {
-		this.decorator.dispose();
-		this.model.dispose();
-	}
-}
-
-interface IViewState {
+interface DirtyDiffWorkbenchControllerViewState {
 	readonly width: number;
 	readonly visibility: 'always' | 'hover';
 }
 
-export class DirtyDiffWorkbenchController extends Disposable implements ext.IWorkbenchContribution, IModelRegistry {
+export class DirtyDiffWorkbenchController extends Disposable implements IWorkbenchContribution {
 
 	private enabled = false;
-	private viewState: IViewState = { width: 3, visibility: 'always' };
-	private items = new ResourceMap<Map<string, DirtyDiffItem>>(); // resource -> editor id -> DirtyDiffItem
+
+	// Resource URI -> Code Editor Id -> Decoration (Disposable)
+	private readonly decorators = new ResourceMap<DisposableMap<string>>();
+	private viewState: DirtyDiffWorkbenchControllerViewState = { width: 3, visibility: 'always' };
 	private readonly transientDisposables = this._register(new DisposableStore());
-	private stylesheet: HTMLStyleElement;
+	private readonly stylesheet: HTMLStyleElement;
 
 	constructor(
 		@IEditorService private readonly editorService: IEditorService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@ITextFileService private readonly textFileService: ITextFileService
+		@IDirtyDiffModelService private readonly dirtyDiffModelService: IDirtyDiffModelService,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 	) {
 		super();
 		this.stylesheet = domStylesheetsJs.createStyleSheet(undefined, undefined, this._store);
@@ -1624,7 +1153,7 @@ export class DirtyDiffWorkbenchController extends Disposable implements ext.IWor
 		this.setViewState({ ...this.viewState, visibility });
 	}
 
-	private setViewState(state: IViewState): void {
+	private setViewState(state: DirtyDiffWorkbenchControllerViewState): void {
 		this.viewState = state;
 		this.stylesheet.textContent = `
 			.monaco-editor .dirty-diff-added,
@@ -1664,57 +1193,59 @@ export class DirtyDiffWorkbenchController extends Disposable implements ext.IWor
 
 		this.transientDisposables.clear();
 
-		for (const [, dirtyDiff] of this.items) {
-			dispose(dirtyDiff.values());
+		for (const [uri, decoratorMap] of this.decorators.entries()) {
+			decoratorMap.dispose();
+			this.decorators.delete(uri);
 		}
 
-		this.items.clear();
 		this.enabled = false;
 	}
 
 	private onEditorsChanged(): void {
 		for (const editor of this.editorService.visibleTextEditorControls) {
-			if (isCodeEditor(editor)) {
-				const textModel = editor.getModel();
-				const controller = DirtyDiffController.get(editor);
+			if (!isCodeEditor(editor)) {
+				continue;
+			}
 
-				if (controller) {
-					controller.modelRegistry = this;
-				}
+			const textModel = editor.getModel();
+			if (!textModel) {
+				continue;
+			}
 
-				if (textModel && (!this.items.has(textModel.uri) || !this.items.get(textModel.uri)!.has(editor.getId()))) {
-					const textFileModel = this.textFileService.files.get(textModel.uri);
-
-					if (textFileModel?.isResolved()) {
-						const dirtyDiffModel = this.instantiationService.createInstance(DirtyDiffModel, textFileModel, undefined);
-						const decorator = new DirtyDiffDecorator(textFileModel.textEditorModel, editor, dirtyDiffModel, this.configurationService);
-						if (!this.items.has(textModel.uri)) {
-							this.items.set(textModel.uri, new Map());
-						}
-						this.items.get(textModel.uri)?.set(editor.getId(), new DirtyDiffItem(dirtyDiffModel, decorator));
-					}
-				}
+			const editorId = editor.getId();
+			if (this.decorators.get(textModel.uri)?.has(editorId)) {
+				continue;
+			}
+
+			const dirtyDiffModel = this.dirtyDiffModelService.getDirtyDiffModel(textModel.uri);
+			if (!dirtyDiffModel) {
+				continue;
+			}
+
+			if (!this.decorators.has(textModel.uri)) {
+				this.decorators.set(textModel.uri, new DisposableMap<string>());
 			}
+
+			this.decorators.get(textModel.uri)!.set(editorId, new DirtyDiffDecorator(editor, dirtyDiffModel, this.configurationService));
 		}
 
-		for (const [uri, item] of this.items) {
-			for (const editorId of item.keys()) {
-				if (!this.editorService.visibleTextEditorControls.find(editor => isCodeEditor(editor) && editor.getModel()?.uri.toString() === uri.toString() && editor.getId() === editorId)) {
-					if (item.has(editorId)) {
-						const dirtyDiffItem = item.get(editorId);
-						dirtyDiffItem?.dispose();
-						item.delete(editorId);
-						if (item.size === 0) {
-							this.items.delete(uri);
-						}
-					}
+		// Dispose decorators for editors that are no longer visible
+		for (const [uri, decoratorMap] of this.decorators.entries()) {
+			for (const editorId of decoratorMap.keys()) {
+				const codeEditor = this.editorService.visibleTextEditorControls
+					.find(editor => isCodeEditor(editor) && editor.getId() === editorId &&
+						this.uriIdentityService.extUri.isEqual(editor.getModel()?.uri, uri));
+
+				if (!codeEditor) {
+					decoratorMap.deleteAndDispose(editorId);
 				}
 			}
-		}
-	}
 
-	getModel(editorModel: ITextModel, codeEditor: ICodeEditor): DirtyDiffModel | undefined {
-		return this.items.get(editorModel.uri)?.get(codeEditor.getId())?.model;
+			if (decoratorMap.size === 0) {
+				decoratorMap.dispose();
+				this.decorators.delete(uri);
+			}
+		}
 	}
 
 	override dispose(): void {
diff --git a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
index 152b8f2ad0e..d7e997d29ff 100644
--- a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
+++ b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
@@ -40,6 +40,7 @@ import { isSCMRepository } from './util.js';
 import { SCMHistoryViewPane } from './scmHistoryViewPane.js';
 import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
 import { RemoteNameContext } from '../../../common/contextkeys.js';
+import { DirtyDiffModelService, IDirtyDiffModelService } from './dirtyDiffModel.js';
 
 ModesRegistry.registerLanguage({
 	id: 'scminput',
@@ -596,3 +597,4 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 registerSingleton(ISCMService, SCMService, InstantiationType.Delayed);
 registerSingleton(ISCMViewService, SCMViewService, InstantiationType.Delayed);
 registerSingleton(IQuickDiffService, QuickDiffService, InstantiationType.Delayed);
+registerSingleton(IDirtyDiffModelService, DirtyDiffModelService, InstantiationType.Delayed);

From acc7cf2c73361360267890d99b4818f7cba47131 Mon Sep 17 00:00:00 2001
From: Alen Ajam <alen.ajam4@gmail.com>
Date: Mon, 9 Dec 2024 00:27:08 +0900
Subject: [PATCH 035/479] fix: set _lastFocusedWidget as undefined on widget
 blur (#234610)

---
 src/vs/platform/list/browser/listService.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/vs/platform/list/browser/listService.ts b/src/vs/platform/list/browser/listService.ts
index f93947e26bd..4bedb6c7de0 100644
--- a/src/vs/platform/list/browser/listService.ts
+++ b/src/vs/platform/list/browser/listService.ts
@@ -90,6 +90,11 @@ export class ListService implements IListService {
 
 		return combinedDisposable(
 			widget.onDidFocus(() => this.setLastFocusedList(widget)),
+			widget.onDidBlur(() => {
+				if (this._lastFocusedWidget === widget) {
+					this.setLastFocusedList(undefined);
+				}
+			}),
 			toDisposable(() => this.lists.splice(this.lists.indexOf(registeredList), 1)),
 			widget.onDidDispose(() => {
 				this.lists = this.lists.filter(l => l !== registeredList);

From 6d8bd758ef998677395cffc45a3bea3752ef001c Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Sun, 8 Dec 2024 07:52:26 -0800
Subject: [PATCH 036/479] Clarify tests by using existing folders (#235209)

The old src/ case was removed as it was actually wrong when the folder
exists, and that's covered below.
---
 .../terminal-suggest/src/test/terminalSuggestMain.test.ts  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts b/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts
index 031c27dafda..c1979b251e2 100644
--- a/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts
+++ b/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts
@@ -105,12 +105,11 @@ const testSpecs2: ISuiteSpec[] = [
 			{ input: 'cd ~|', expectedCompletions: ['~'], expectedResourceRequests: { type: 'folders', cwd: testCwd } },
 
 			// Relative paths
-			{ input: 'cd s|', expectedResourceRequests: { type: 'folders', cwd: testCwd } },
-			{ input: 'cd src|', expectedResourceRequests: { type: 'folders', cwd: testCwd } },
-			{ input: 'cd src/|', expectedResourceRequests: { type: 'folders', cwd: testCwd } },
+			{ input: 'cd c|', expectedResourceRequests: { type: 'folders', cwd: testCwd } },
+			{ input: 'cd child|', expectedResourceRequests: { type: 'folders', cwd: testCwd } },
 			{ input: 'cd .|', expectedResourceRequests: { type: 'folders', cwd: testCwd } },
 			{ input: 'cd ./|', expectedResourceRequests: { type: 'folders', cwd: testCwd } },
-			{ input: 'cd ./src|', expectedResourceRequests: { type: 'folders', cwd: testCwd } },
+			{ input: 'cd ./child|', expectedResourceRequests: { type: 'folders', cwd: testCwd } },
 			{ input: 'cd ..|', expectedResourceRequests: { type: 'folders', cwd: testCwd } },
 
 			// Relative directories (changes cwd due to /)

From fc90ee9b9237ee6368fe9fde3a6e23f530e9cd26 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Sun, 8 Dec 2024 20:41:43 +0100
Subject: [PATCH 037/479] chat - resolve entitlements after potential upgrade
 (#235580)

---
 .../chatContentParts/chatQuotaExceededPart.ts |  8 +-
 .../contrib/chat/browser/chatQuotasService.ts | 41 ++--------
 .../contrib/chat/browser/chatSetup.ts         | 75 ++++++++++++++++++-
 3 files changed, 78 insertions(+), 46 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatQuotaExceededPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatQuotaExceededPart.ts
index bd584402ca0..e3e06c9b05a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatQuotaExceededPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatQuotaExceededPart.ts
@@ -11,11 +11,9 @@ import { MarkdownString } from '../../../../../base/common/htmlContent.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { assertType } from '../../../../../base/common/types.js';
-import { URI } from '../../../../../base/common/uri.js';
 import { MarkdownRenderer } from '../../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
 import { localize } from '../../../../../nls.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
-import { IProductService } from '../../../../../platform/product/common/productService.js';
 import { defaultButtonStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
 import { asCssVariable, textLinkForeground } from '../../../../../platform/theme/common/colorRegistry.js';
 import { IChatResponseViewModel } from '../../common/chatViewModel.js';
@@ -34,8 +32,7 @@ export class ChatQuotaExceededPart extends Disposable implements IChatContentPar
 		element: IChatResponseViewModel,
 		renderer: MarkdownRenderer,
 		@IChatWidgetService chatWidgetService: IChatWidgetService,
-		@ICommandService commandService: ICommandService,
-		@IProductService productService: IProductService,
+		@ICommandService commandService: ICommandService
 	) {
 		super();
 
@@ -56,8 +53,7 @@ export class ChatQuotaExceededPart extends Disposable implements IChatContentPar
 
 		let didAddSecondary = false;
 		this._register(button1.onDidClick(async () => {
-			const url = productService.defaultChatAgent?.upgradePlanUrl;
-			await commandService.executeCommand('vscode.open', url ? URI.parse(url) : undefined);
+			await commandService.executeCommand('workbench.action.chat.upgradePlan');
 
 			if (!didAddSecondary) {
 				didAddSecondary = true;
diff --git a/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts b/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
index efa9304c974..467affc7899 100644
--- a/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
@@ -11,17 +11,16 @@ import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { localize, localize2 } from '../../../../nls.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
-import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
-import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { createDecorator, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
-import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import product from '../../../../platform/product/common/product.js';
-import { URI } from '../../../../base/common/uri.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
 
 export const IChatQuotasService = createDecorator<IChatQuotasService>('chatQuotasService');
 
@@ -102,35 +101,6 @@ export class ChatQuotasService extends Disposable implements IChatQuotasService
 	private registerActions(): void {
 		const that = this;
 
-		class UpgradePlanAction extends Action2 {
-			constructor() {
-				super({
-					id: 'workbench.action.chat.upgradePlan',
-					title: localize2('managePlan', "Upgrade to Copilot Pro"),
-					category: localize2('chat.category', 'Chat'),
-					f1: true,
-					precondition: ChatContextKeys.enabled,
-					menu: {
-						id: MenuId.ChatCommandCenter,
-						group: 'a_first',
-						order: 1,
-						when: ContextKeyExpr.and(
-							ChatContextKeys.Setup.installed,
-							ContextKeyExpr.or(
-								ChatContextKeys.chatQuotaExceeded,
-								ChatContextKeys.completionsQuotaExceeded
-							)
-						)
-					}
-				});
-			}
-
-			override async run(accessor: ServicesAccessor): Promise<void> {
-				const openerService = accessor.get(IOpenerService);
-				openerService.open(URI.parse(product.defaultChatAgent?.upgradePlanUrl ?? ''));
-			}
-		}
-
 		class ShowLimitReachedDialogAction extends Action2 {
 
 			constructor() {
@@ -141,7 +111,7 @@ export class ChatQuotasService extends Disposable implements IChatQuotasService
 			}
 
 			override async run(accessor: ServicesAccessor) {
-				const openerService = accessor.get(IOpenerService);
+				const commandService = accessor.get(ICommandService);
 				const dialogService = accessor.get(IDialogService);
 
 				const dateFormatter = safeIntl.DateTimeFormat(language, { year: 'numeric', month: 'long', day: 'numeric' });
@@ -168,7 +138,7 @@ export class ChatQuotasService extends Disposable implements IChatQuotasService
 					buttons: [
 						{
 							label: localize('managePlan', "Upgrade to Copilot Pro"),
-							run: () => { openerService.open(URI.parse(product.defaultChatAgent?.upgradePlanUrl ?? '')); }
+							run: () => commandService.executeCommand('workbench.action.chat.upgradePlan')
 						},
 					],
 					custom: {
@@ -211,7 +181,6 @@ export class ChatQuotasService extends Disposable implements IChatQuotasService
 			}
 		}
 
-		registerAction2(UpgradePlanAction);
 		registerAction2(ShowLimitReachedDialogAction);
 		if (product.quality !== 'stable') {
 			registerAction2(SimulateCopilotQuotaExceeded);
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index d31113c0d6b..6d5104baddf 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -7,7 +7,7 @@ import './media/chatViewSetup.css';
 import { $, getActiveElement, setVisibility } from '../../../../base/browser/dom.js';
 import { Button, ButtonWithDropdown } from '../../../../base/browser/ui/button/button.js';
 import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
-import { IAction, toAction } from '../../../../base/common/actions.js';
+import { IAction, toAction, WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../../base/common/actions.js';
 import { Barrier, timeout } from '../../../../base/common/async.js';
 import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../base/common/codicons.js';
@@ -15,7 +15,7 @@ import { isCancellationError } from '../../../../base/common/errors.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { Lazy } from '../../../../base/common/lazy.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { IRequestContext } from '../../../../base/parts/request/common/request.js';
 import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
 import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
@@ -56,6 +56,9 @@ import { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID } from './chatView
 import { ChatViewsWelcomeExtensions, IChatViewsWelcomeContributionRegistry } from './viewsWelcome/chatViewsWelcome.js';
 import { IChatQuotasService } from './chatQuotasService.js';
 import { mainWindow } from '../../../../base/browser/window.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { URI } from '../../../../base/common/uri.js';
+import { IHostService } from '../../../services/host/browser/host.js';
 
 const defaultChat = {
 	extensionId: product.defaultChatAgent?.extensionId ?? '',
@@ -231,6 +234,61 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 			}
 		}
 
+		const windowFocusListener = this._register(new MutableDisposable());
+		class UpgradePlanAction extends Action2 {
+			constructor() {
+				super({
+					id: 'workbench.action.chat.upgradePlan',
+					title: localize2('managePlan', "Upgrade to Copilot Pro"),
+					category: localize2('chat.category', 'Chat'),
+					f1: true,
+					precondition: ChatContextKeys.enabled,
+					menu: {
+						id: MenuId.ChatCommandCenter,
+						group: 'a_first',
+						order: 1,
+						when: ContextKeyExpr.and(
+							ChatContextKeys.Setup.installed,
+							ContextKeyExpr.or(
+								ChatContextKeys.chatQuotaExceeded,
+								ChatContextKeys.completionsQuotaExceeded
+							)
+						)
+					}
+				});
+			}
+
+			override async run(accessor: ServicesAccessor): Promise<void> {
+				const openerService = accessor.get(IOpenerService);
+				const productService = accessor.get(IProductService);
+				const telemetryService = accessor.get(ITelemetryService);
+				const hostService = accessor.get(IHostService);
+				const commandService = accessor.get(ICommandService);
+
+				telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: this.desc.id, from: 'chat' });
+
+				openerService.open(URI.parse(productService.defaultChatAgent?.upgradePlanUrl ?? ''));
+
+				const entitlement = that.context.state.entitlement;
+				if (entitlement !== ChatEntitlement.Pro) {
+					// If the user is not yet Pro, we listen to window focus to refresh the token
+					// when the user has come back to the window assuming the user signed up.
+					windowFocusListener.value = hostService.onDidChangeFocus(focus => this.onWindowFocus(focus, commandService));
+				}
+			}
+
+			private async onWindowFocus(focus: boolean, commandService: ICommandService): Promise<void> {
+				if (focus) {
+					windowFocusListener.clear();
+
+					const entitlement = await that.requests.forceResolveEntitlement(undefined);
+					if (entitlement === ChatEntitlement.Pro) {
+						commandService.executeCommand('github.copilot.refreshToken'); // ugly, but we need to signal to the extension that entitlements changed
+					}
+				}
+			}
+		}
+
 		async function hideSetupView(viewsDescriptorService: IViewDescriptorService, layoutService: IWorkbenchLayoutService): Promise<void> {
 			const location = viewsDescriptorService.getViewLocationById(ChatViewId);
 
@@ -246,6 +304,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 
 		registerAction2(ChatSetupTriggerAction);
 		registerAction2(ChatSetupHideAction);
+		registerAction2(UpgradePlanAction);
 	}
 }
 
@@ -507,7 +566,15 @@ class ChatSetupRequests extends Disposable {
 		}
 	}
 
-	async forceResolveEntitlement(session: AuthenticationSession): Promise<ChatEntitlement | undefined> {
+	async forceResolveEntitlement(session: AuthenticationSession | undefined): Promise<ChatEntitlement | undefined> {
+		if (!session) {
+			session = await this.findMatchingProviderSession(CancellationToken.None);
+		}
+
+		if (!session) {
+			return undefined;
+		}
+
 		return this.resolveEntitlement(session, CancellationToken.None);
 	}
 
@@ -798,7 +865,7 @@ class ChatSetupWelcomeContent extends Disposable {
 		}
 
 		// Limited SKU
-		const limitedSkuHeader = localize({ key: 'limitedSkuHeader', comment: ['{Locked="[]({0})"}'] }, "$(sparkle-filled) We now offer [Copilot for free]({0}) with 50 chat messages and 2000 code completions per month.", defaultChat.skusDocumentationUrl);
+		const limitedSkuHeader = localize({ key: 'limitedSkuHeader', comment: ['{Locked="[]({0})"}'] }, "$(sparkle-filled) We now offer [Copilot for free]({0}) with 2,000 code completions and 50 chat messages per month.", defaultChat.skusDocumentationUrl);
 		const limitedSkuHeaderContainer = this.element.appendChild($('p'));
 		limitedSkuHeaderContainer.appendChild(this._register(markdown.render(new MarkdownString(limitedSkuHeader, { isTrusted: true, supportThemeIcons: true }))).element);
 

From c61b174d4b33904ab8520430ae7b12749d423ae5 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Mon, 9 Dec 2024 06:11:45 +0000
Subject: [PATCH 038/479] Fix missing responses when transferring messages into
 chat panel (#235583)

* Fix missing responses when transferring messages into chat panel
Fix #235531

* Add test
---
 src/vs/workbench/contrib/chat/common/chatModel.ts |  2 +-
 .../contrib/chat/test/common/chatModel.test.ts    | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/common/chatModel.ts b/src/vs/workbench/contrib/chat/common/chatModel.ts
index ee0c9c98053..14fa03dffa0 100644
--- a/src/vs/workbench/contrib/chat/common/chatModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatModel.ts
@@ -1152,7 +1152,7 @@ export class ChatModel extends Disposable implements IChatModel {
 
 	addRequest(message: IParsedChatRequest, variableData: IChatRequestVariableData, attempt: number, chatAgent?: IChatAgentData, slashCommand?: IChatAgentCommand, confirmation?: string, locationData?: IChatLocationData, attachments?: IChatRequestVariableEntry[], workingSet?: URI[], isCompleteAddedRequest?: boolean): ChatRequestModel {
 		const request = new ChatRequestModel(this, message, variableData, Date.now(), attempt, confirmation, locationData, attachments, workingSet, isCompleteAddedRequest);
-		request.response = new ChatResponseModel([], this, chatAgent, slashCommand, request.id, undefined, undefined, undefined, undefined, undefined, undefined, undefined, isCompleteAddedRequest);
+		request.response = new ChatResponseModel([], this, chatAgent, slashCommand, request.id, undefined, undefined, undefined, undefined, undefined, undefined, isCompleteAddedRequest);
 
 		this._requests.push(request);
 		this._lastMessageDate = Date.now();
diff --git a/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts b/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts
index 1beb12e6ade..be40ba599bd 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts
@@ -151,6 +151,21 @@ suite('ChatModel', () => {
 
 		assert.strictEqual(request1.response.response.toString(), 'Hello');
 	});
+
+	test('addCompleteRequest', async function () {
+		const model1 = testDisposables.add(instantiationService.createInstance(ChatModel, undefined, ChatAgentLocation.Panel));
+
+		model1.startInitialize();
+		model1.initialize(undefined);
+
+		const text = 'hello';
+		const request1 = model1.addRequest({ text, parts: [new ChatRequestTextPart(new OffsetRange(0, text.length), new Range(1, text.length, 1, text.length), text)] }, { variables: [] }, 0, undefined, undefined, undefined, undefined, undefined, undefined, true);
+
+		assert.strictEqual(request1.isCompleteAddedRequest, true);
+		assert.strictEqual(request1.response!.isCompleteAddedRequest, true);
+		assert.strictEqual(request1.isHidden, false);
+		assert.strictEqual(request1.response!.isHidden, false);
+	});
 });
 
 suite('Response', () => {

From f10bb2140999946ed845db28da29f65a75373ae7 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 9 Dec 2024 08:00:27 +0100
Subject: [PATCH 039/479] SCM - switch to using ReferenceCollection in the
 IdirtyDiffModelService (#235579)

Initial implementation
---
 .../api/browser/mainThreadEditors.ts          |  46 ++++---
 .../mainThreadDocumentsAndEditors.test.ts     |   4 +-
 .../contrib/scm/browser/dirtyDiffModel.ts     | 120 ++++++------------
 .../contrib/scm/browser/dirtydiffDecorator.ts | 102 ++++++++-------
 4 files changed, 129 insertions(+), 143 deletions(-)

diff --git a/src/vs/workbench/api/browser/mainThreadEditors.ts b/src/vs/workbench/api/browser/mainThreadEditors.ts
index deeecec96f2..024a09f283a 100644
--- a/src/vs/workbench/api/browser/mainThreadEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadEditors.ts
@@ -96,7 +96,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 			this._proxy.$acceptEditorPropertiesChanged(id, data);
 		}));
 
-		const diffInformationObs = this._getTextEditorDiffInformation(textEditor);
+		const diffInformationObs = this._getTextEditorDiffInformation(textEditor, toDispose);
 		toDispose.push(autorun(reader => {
 			const diffInformation = diffInformationObs.read(reader);
 			this._proxy.$acceptEditorDiffInformation(id, diffInformation);
@@ -131,17 +131,17 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		return result;
 	}
 
-	private _getTextEditorDiffInformation(textEditor: MainThreadTextEditor): IObservable<ITextEditorDiffInformation[] | undefined> {
+	private _getTextEditorDiffInformation(textEditor: MainThreadTextEditor, toDispose: IDisposable[]): IObservable<ITextEditorDiffInformation[] | undefined> {
 		const codeEditor = textEditor.getCodeEditor();
 		if (!codeEditor) {
 			return constObservable(undefined);
 		}
 
 		// Check if the TextModel belongs to a DiffEditor
-		const diffEditors = this._codeEditorService.listDiffEditors();
-		const [diffEditor] = diffEditors.filter(d =>
-			d.getOriginalEditor().getId() === codeEditor.getId() ||
-			d.getModifiedEditor().getId() === codeEditor.getId());
+		const [diffEditor] = this._codeEditorService.listDiffEditors()
+			.filter(d =>
+				d.getOriginalEditor().getId() === codeEditor.getId() ||
+				d.getModifiedEditor().getId() === codeEditor.getId());
 
 		const editorModelObs = diffEditor
 			? observableFromEvent(this, diffEditor.onDidChangeModel, () => diffEditor.getModel())
@@ -159,13 +159,14 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 
 			// TextEditor
 			if (isITextModel(editorModel)) {
-				const dirtyDiffModel = this._dirtyDiffModelService.getDirtyDiffModel(editorModelUri);
-				if (!dirtyDiffModel) {
+				const dirtyDiffModelRef = this._dirtyDiffModelService.createDirtyDiffModelReference(editorModelUri);
+				if (!dirtyDiffModelRef) {
 					return constObservable(undefined);
 				}
 
-				return observableFromEvent(this, dirtyDiffModel.onDidChange, () => {
-					return dirtyDiffModel.getQuickDiffResults()
+				toDispose.push(dirtyDiffModelRef);
+				return observableFromEvent(this, dirtyDiffModelRef.object.onDidChange, () => {
+					return dirtyDiffModelRef.object.getQuickDiffResults()
 						.map(result => ({
 							original: result.original,
 							modified: result.modified,
@@ -178,13 +179,14 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 			// we can provide multiple "original resources" to diff with the modified
 			// resource.
 			const diffAlgorithm = this._configurationService.getValue<DiffAlgorithmName>('diffEditor.diffAlgorithm');
-			const dirtyDiffModel = this._dirtyDiffModelService.getDiffModel(editorModelUri, diffAlgorithm);
-			if (!dirtyDiffModel) {
+			const dirtyDiffModelRef = this._dirtyDiffModelService.createDiffModelReference(editorModelUri, diffAlgorithm);
+			if (!dirtyDiffModelRef) {
 				return constObservable(undefined);
 			}
 
-			return observableFromEvent(Event.any(dirtyDiffModel.onDidChange, diffEditor.onDidUpdateDiff), () => {
-				const dirtyDiffInformation = dirtyDiffModel.getQuickDiffResults()
+			toDispose.push(dirtyDiffModelRef);
+			return observableFromEvent(Event.any(dirtyDiffModelRef.object.onDidChange, diffEditor.onDidUpdateDiff), () => {
+				const dirtyDiffInformation = dirtyDiffModelRef.object.getQuickDiffResults()
 					.map(result => ({
 						original: result.original,
 						modified: result.modified,
@@ -389,11 +391,19 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 			return Promise.resolve([]);
 		}
 
-		const dirtyDiffModel = this._dirtyDiffModelService.getDirtyDiffModel(codeEditor.getModel().uri);
-		const scmQuickDiff = dirtyDiffModel?.quickDiffs.find(quickDiff => quickDiff.isSCM);
-		const scmQuickDiffChanges = dirtyDiffModel?.changes.filter(change => change.label === scmQuickDiff?.label);
+		const dirtyDiffModelRef = this._dirtyDiffModelService.createDirtyDiffModelReference(codeEditor.getModel().uri);
+		if (!dirtyDiffModelRef) {
+			return Promise.resolve([]);
+		}
 
-		return Promise.resolve(scmQuickDiffChanges?.map(change => change.change) ?? []);
+		try {
+			const scmQuickDiff = dirtyDiffModelRef.object.quickDiffs.find(quickDiff => quickDiff.isSCM);
+			const scmQuickDiffChanges = dirtyDiffModelRef.object.changes.filter(change => change.label === scmQuickDiff?.label);
+
+			return Promise.resolve(scmQuickDiffChanges.map(change => change.change) ?? []);
+		} finally {
+			dirtyDiffModelRef.dispose();
+		}
 	}
 }
 
diff --git a/src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts b/src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts
index 230fc9d2126..015cad1161c 100644
--- a/src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts
@@ -125,10 +125,10 @@ suite('MainThreadDocumentsAndEditors', () => {
 			new TestPathService(),
 			new TestConfigurationService(),
 			new class extends mock<IDirtyDiffModelService>() {
-				override getDirtyDiffModel() {
+				override createDiffModelReference() {
 					return undefined;
 				}
-				override getDiffModel() {
+				override createDirtyDiffModelReference() {
 					return undefined;
 				}
 			}
diff --git a/src/vs/workbench/contrib/scm/browser/dirtyDiffModel.ts b/src/vs/workbench/contrib/scm/browser/dirtyDiffModel.ts
index 3b49650a294..9d9c1d395aa 100644
--- a/src/vs/workbench/contrib/scm/browser/dirtyDiffModel.ts
+++ b/src/vs/workbench/contrib/scm/browser/dirtyDiffModel.ts
@@ -6,10 +6,7 @@
 import { ResourceMap } from '../../../../base/common/map.js';
 import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { EncodingMode, IResolvedTextFileEditorModel, isTextFileEditorModel, ITextFileEditorModel, ITextFileService } from '../../../services/textfile/common/textfiles.js';
-import { Disposable, DisposableMap, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { IEditorService } from '../../../services/editor/common/editorService.js';
-import { autorun, observableFromEvent } from '../../../../base/common/observable.js';
-import { isCodeEditor, isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
+import { Disposable, DisposableMap, DisposableStore, IReference, ReferenceCollection } from '../../../../base/common/lifecycle.js';
 import { DiffAlgorithmName, IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { URI } from '../../../../base/common/uri.js';
@@ -38,108 +35,73 @@ export interface IDirtyDiffModelService {
 	_serviceBrand: undefined;
 
 	/**
-	 * Returns `undefined` if the editor model is not resolved
-	 * @param uri
+	 * Returns `undefined` if the editor model is not resolved.
+	 * Model refrence has to be disposed once not needed anymore.
+	 * @param resource
+	 * @param algorithm
 	 */
-	getDirtyDiffModel(uri: URI): DirtyDiffModel | undefined;
+	createDiffModelReference(resource: URI, algorithm: DiffAlgorithmName): IReference<DirtyDiffModel> | undefined;
 
 	/**
-	 * Returns `undefined` if the editor model is not resolved
-	 * @param uri
-	 * @param algorithm
+	 * Returns `undefined` if the editor model is not resolved.
+	 * Model refrence has to be disposed once not needed anymore.
+	 * @param resource
 	 */
-	getDiffModel(uri: URI, algorithm: DiffAlgorithmName): DirtyDiffModel | undefined;
+	createDirtyDiffModelReference(resource: URI): IReference<DirtyDiffModel> | undefined;
 }
 
-export class DirtyDiffModelService extends Disposable implements IDirtyDiffModelService {
-	_serviceBrand: undefined;
+class DirtyDiffModelReferenceCollection extends ReferenceCollection<DirtyDiffModel> {
+	constructor(@IInstantiationService private readonly _instantiationService: IInstantiationService) {
+		super();
+	}
 
-	private readonly _dirtyDiffModels = new ResourceMap<DirtyDiffModel>();
-	private readonly _diffModels = new ResourceMap<Map<DiffAlgorithmName, DirtyDiffModel>>();
+	protected override createReferencedObject(_key: string, textFileModel: IResolvedTextFileEditorModel, algorithm: DiffAlgorithmName | undefined): DirtyDiffModel {
+		return this._instantiationService.createInstance(DirtyDiffModel, textFileModel, algorithm);
+	}
 
-	private _visibleTextEditorControls = observableFromEvent(
-		this.editorService.onDidVisibleEditorsChange,
-		() => this.editorService.visibleTextEditorControls);
+	protected override destroyReferencedObject(_key: string, object: DirtyDiffModel): void {
+		object.dispose();
+	}
+}
+
+export class DirtyDiffModelService implements IDirtyDiffModelService {
+	_serviceBrand: undefined;
+
+	private readonly _references: DirtyDiffModelReferenceCollection;
 
 	constructor(
-		@IEditorService private readonly editorService: IEditorService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@ITextFileService private readonly textFileService: ITextFileService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService
 	) {
-		super();
-
-		this._register(autorun(reader => {
-			const visibleTextEditorControls = this._visibleTextEditorControls.read(reader);
-
-			// Dispose dirty diff models for text editors that are not visible
-			for (const [uri, dirtyDiffModel] of this._dirtyDiffModels) {
-				const textEditorControl = visibleTextEditorControls
-					.find(editor => isCodeEditor(editor) &&
-						this.uriIdentityService.extUri.isEqual(editor.getModel()?.uri, uri));
-
-				if (textEditorControl) {
-					continue;
-				}
-
-				dirtyDiffModel.dispose();
-				this._dirtyDiffModels.delete(uri);
-			}
-
-			// Dispose diff models for diff editors that are not visible
-			for (const [uri, dirtyDiffModel] of this._diffModels) {
-				const diffEditorControl = visibleTextEditorControls
-					.find(editor => isDiffEditor(editor) &&
-						this.uriIdentityService.extUri.isEqual(editor.getModel()?.modified.uri, uri));
-
-				if (diffEditorControl) {
-					continue;
-				}
-
-				for (const algorithm of dirtyDiffModel.keys()) {
-					dirtyDiffModel.get(algorithm)?.dispose();
-					dirtyDiffModel.delete(algorithm);
-				}
-				this._diffModels.delete(uri);
-			}
-		}));
+		this._references = this.instantiationService.createInstance(DirtyDiffModelReferenceCollection);
 	}
 
-	getDirtyDiffModel(uri: URI): DirtyDiffModel | undefined {
-		let model = this._dirtyDiffModels.get(uri);
-		if (model) {
-			return model;
-		}
-
-		const textFileModel = this.textFileService.files.get(uri);
+	createDiffModelReference(resource: URI, algorithm: DiffAlgorithmName): IReference<DirtyDiffModel> | undefined {
+		const textFileModel = this.textFileService.files.get(resource);
 		if (!textFileModel?.isResolved()) {
 			return undefined;
 		}
 
-		model = this.instantiationService.createInstance(DirtyDiffModel, textFileModel, undefined);
-		this._dirtyDiffModels.set(uri, model);
-
-		return model;
+		return this._createModelReference(resource, textFileModel, algorithm);
 	}
 
-	getDiffModel(uri: URI, algorithm: DiffAlgorithmName): DirtyDiffModel | undefined {
-		let model = this._diffModels.get(uri)?.get(algorithm);
-		if (model) {
-			return model;
-		}
-
-		const textFileModel = this.textFileService.files.get(uri);
+	createDirtyDiffModelReference(resource: URI): IReference<DirtyDiffModel> | undefined {
+		const textFileModel = this.textFileService.files.get(resource);
 		if (!textFileModel?.isResolved()) {
 			return undefined;
 		}
 
-		model = this.instantiationService.createInstance(DirtyDiffModel, textFileModel, algorithm);
-		if (!this._diffModels.has(uri)) {
-			this._diffModels.set(uri, new Map());
-		}
-		this._diffModels.get(uri)!.set(algorithm, model);
+		return this._createModelReference(resource, textFileModel, undefined);
+	}
+
+	private _createModelReference(resource: URI, textFileModel: IResolvedTextFileEditorModel, algorithm: DiffAlgorithmName | undefined): IReference<DirtyDiffModel> {
+		resource = algorithm === undefined
+			? this.uriIdentityService.asCanonicalUri(resource)
+			: this.uriIdentityService.asCanonicalUri(resource)
+				.with({ query: `algorithm=${algorithm}` });
 
-		return model;
+		return this._references.acquire(resource.toString(), textFileModel, algorithm);
 	}
 }
 
diff --git a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
index 473c2f5d418..f14fd38555f 100644
--- a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
+++ b/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
@@ -6,7 +6,7 @@
 import * as nls from '../../../../nls.js';
 
 import './media/dirtydiffDecorator.css';
-import { IDisposable, toDisposable, Disposable, DisposableStore, DisposableMap } from '../../../../base/common/lifecycle.js';
+import { IDisposable, toDisposable, Disposable, DisposableStore, DisposableMap, IReference } from '../../../../base/common/lifecycle.js';
 import { Event } from '../../../../base/common/event.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
@@ -533,16 +533,20 @@ export class GotoPreviousChangeAction extends EditorAction {
 			return;
 		}
 
-		const model = dirtyDiffModelService.getDirtyDiffModel(outerEditor.getModel().uri);
-		if (!model || model.changes.length === 0) {
-			return;
-		}
+		const modelRef = dirtyDiffModelService.createDirtyDiffModelReference(outerEditor.getModel().uri);
+		try {
+			if (!modelRef || modelRef.object.changes.length === 0) {
+				return;
+			}
 
-		const lineNumber = outerEditor.getPosition().lineNumber;
-		const index = model.findPreviousClosestChange(lineNumber, false);
-		const change = model.changes[index];
-		await playAccessibilitySymbolForChange(change.change, accessibilitySignalService);
-		setPositionAndSelection(change.change, outerEditor, accessibilityService, codeEditorService);
+			const lineNumber = outerEditor.getPosition().lineNumber;
+			const index = modelRef.object.findPreviousClosestChange(lineNumber, false);
+			const change = modelRef.object.changes[index];
+			await playAccessibilitySymbolForChange(change.change, accessibilitySignalService);
+			setPositionAndSelection(change.change, outerEditor, accessibilityService, codeEditorService);
+		} finally {
+			modelRef?.dispose();
+		}
 	}
 }
 registerEditorAction(GotoPreviousChangeAction);
@@ -569,17 +573,20 @@ export class GotoNextChangeAction extends EditorAction {
 			return;
 		}
 
-		const model = dirtyDiffModelService.getDirtyDiffModel(outerEditor.getModel().uri);
+		const modelRef = dirtyDiffModelService.createDirtyDiffModelReference(outerEditor.getModel().uri);
+		try {
+			if (!modelRef || modelRef.object.changes.length === 0) {
+				return;
+			}
 
-		if (!model || model.changes.length === 0) {
-			return;
+			const lineNumber = outerEditor.getPosition().lineNumber;
+			const index = modelRef.object.findNextClosestChange(lineNumber, false);
+			const change = modelRef.object.changes[index].change;
+			await playAccessibilitySymbolForChange(change, accessibilitySignalService);
+			setPositionAndSelection(change, outerEditor, accessibilityService, codeEditorService);
+		} finally {
+			modelRef?.dispose();
 		}
-
-		const lineNumber = outerEditor.getPosition().lineNumber;
-		const index = model.findNextClosestChange(lineNumber, false);
-		const change = model.changes[index].change;
-		await playAccessibilitySymbolForChange(change, accessibilitySignalService);
-		setPositionAndSelection(change, outerEditor, accessibilityService, codeEditorService);
 	}
 }
 
@@ -774,29 +781,31 @@ export class DirtyDiffController extends Disposable implements IEditorContributi
 			return false;
 		}
 
-		const model = this.dirtyDiffModelService.getDirtyDiffModel(editorModel.uri);
+		const modelRef = this.dirtyDiffModelService.createDirtyDiffModelReference(editorModel.uri);
 
-		if (!model) {
+		if (!modelRef) {
 			return false;
 		}
 
-		if (model.changes.length === 0) {
+		if (modelRef.object.changes.length === 0) {
+			modelRef.dispose();
 			return false;
 		}
 
-		this.model = model;
-		this.widget = this.instantiationService.createInstance(DirtyDiffWidget, this.editor, model);
+		this.model = modelRef.object;
+		this.widget = this.instantiationService.createInstance(DirtyDiffWidget, this.editor, this.model);
 		this.isDirtyDiffVisible.set(true);
 
 		const disposables = new DisposableStore();
 		disposables.add(Event.once(this.widget.onDidClose)(this.close, this));
-		const onDidModelChange = Event.chain(model.onDidChange, $ =>
+		const onDidModelChange = Event.chain(this.model.onDidChange, $ =>
 			$.filter(e => e.diff.length > 0)
 				.map(e => e.diff)
 		);
 
 		onDidModelChange(this.onDidModelChange, this, disposables);
 
+		disposables.add(modelRef);
 		disposables.add(this.widget);
 		disposables.add(toDisposable(() => {
 			this.model = null;
@@ -883,22 +892,27 @@ export class DirtyDiffController extends Disposable implements IEditorContributi
 			return;
 		}
 
-		const model = this.dirtyDiffModelService.getDirtyDiffModel(editorModel.uri);
+		const modelRef = this.dirtyDiffModelService.createDirtyDiffModelReference(editorModel.uri);
 
-		if (!model) {
+		if (!modelRef) {
 			return;
 		}
 
-		const index = model.changes.findIndex(change => lineIntersectsChange(lineNumber, change.change));
+		try {
+			const index = modelRef.object.changes
+				.findIndex(change => lineIntersectsChange(lineNumber, change.change));
 
-		if (index < 0) {
-			return;
-		}
+			if (index < 0) {
+				return;
+			}
 
-		if (index === this.widget?.index) {
-			this.close();
-		} else {
-			this.next(lineNumber);
+			if (index === this.widget?.index) {
+				this.close();
+			} else {
+				this.next(lineNumber);
+			}
+		} finally {
+			modelRef.dispose();
 		}
 	}
 
@@ -973,7 +987,7 @@ class DirtyDiffDecorator extends Disposable {
 
 	constructor(
 		private readonly codeEditor: ICodeEditor,
-		private readonly dirtyDiffModel: DirtyDiffModel,
+		private readonly dirtyDiffModelRef: IReference<DirtyDiffModel>,
 		@IConfigurationService private readonly configurationService: IConfigurationService
 	) {
 		super();
@@ -1022,7 +1036,7 @@ class DirtyDiffDecorator extends Disposable {
 			}
 		}));
 
-		this._register(Event.runAndSubscribe(dirtyDiffModel.onDidChange, () => this.onDidChange()));
+		this._register(Event.runAndSubscribe(this.dirtyDiffModelRef.object.onDidChange, () => this.onDidChange()));
 	}
 
 	private onDidChange(): void {
@@ -1030,10 +1044,10 @@ class DirtyDiffDecorator extends Disposable {
 			return;
 		}
 
-		const visibleQuickDiffs = this.dirtyDiffModel.quickDiffs.filter(quickDiff => quickDiff.visible);
+		const visibleQuickDiffs = this.dirtyDiffModelRef.object.quickDiffs.filter(quickDiff => quickDiff.visible);
 		const pattern = this.configurationService.getValue<{ added: boolean; modified: boolean }>('scm.diffDecorationsGutterPattern');
 
-		const decorations = this.dirtyDiffModel.changes
+		const decorations = this.dirtyDiffModelRef.object.changes
 			.filter(labeledChange => visibleQuickDiffs.some(quickDiff => quickDiff.label === labeledChange.label))
 			.map((labeledChange) => {
 				const change = labeledChange.change;
@@ -1080,8 +1094,8 @@ class DirtyDiffDecorator extends Disposable {
 		if (this.decorationsCollection) {
 			this.decorationsCollection?.clear();
 		}
-
 		this.decorationsCollection = undefined;
+		this.dirtyDiffModelRef.dispose();
 		super.dispose();
 	}
 }
@@ -1217,8 +1231,8 @@ export class DirtyDiffWorkbenchController extends Disposable implements IWorkben
 				continue;
 			}
 
-			const dirtyDiffModel = this.dirtyDiffModelService.getDirtyDiffModel(textModel.uri);
-			if (!dirtyDiffModel) {
+			const dirtyDiffModelRef = this.dirtyDiffModelService.createDirtyDiffModelReference(textModel.uri);
+			if (!dirtyDiffModelRef) {
 				continue;
 			}
 
@@ -1226,10 +1240,10 @@ export class DirtyDiffWorkbenchController extends Disposable implements IWorkben
 				this.decorators.set(textModel.uri, new DisposableMap<string>());
 			}
 
-			this.decorators.get(textModel.uri)!.set(editorId, new DirtyDiffDecorator(editor, dirtyDiffModel, this.configurationService));
+			this.decorators.get(textModel.uri)!.set(editorId, new DirtyDiffDecorator(editor, dirtyDiffModelRef, this.configurationService));
 		}
 
-		// Dispose decorators for editors that are no longer visible
+		// Dispose decorators for editors that are no longer visible.
 		for (const [uri, decoratorMap] of this.decorators.entries()) {
 			for (const editorId of decoratorMap.keys()) {
 				const codeEditor = this.editorService.visibleTextEditorControls

From 291a57a4c7e00fa33a39257b24bf1002a6ea70f6 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Mon, 9 Dec 2024 10:16:36 +0100
Subject: [PATCH 040/479] add docs/desc for atEnd context key (#235595)

https://github.com/microsoft/vscode/issues/205415
---
 src/vs/editor/contrib/suggest/browser/wordContextKey.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/editor/contrib/suggest/browser/wordContextKey.ts b/src/vs/editor/contrib/suggest/browser/wordContextKey.ts
index 901b440d8a5..65820c8dda4 100644
--- a/src/vs/editor/contrib/suggest/browser/wordContextKey.ts
+++ b/src/vs/editor/contrib/suggest/browser/wordContextKey.ts
@@ -7,10 +7,11 @@ import { IDisposable } from '../../../../base/common/lifecycle.js';
 import { ICodeEditor } from '../../../browser/editorBrowser.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
 import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { localize } from '../../../../nls.js';
 
 export class WordContextKey {
 
-	static readonly AtEnd = new RawContextKey<boolean>('atEndOfWord', false);
+	static readonly AtEnd = new RawContextKey<boolean>('atEndOfWord', false, { type: 'boolean', description: localize('desc', "A context key that is true when at the end of a word. Note that this is only defined when tab-completions are enabled") });
 
 	private readonly _ckAtEnd: IContextKey<boolean>;
 	private readonly _configListener: IDisposable;

From 18bd4c58c7566a8bd68c3891ec1870cb653e867c Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Mon, 9 Dec 2024 10:26:42 +0100
Subject: [PATCH 041/479] Add more detail to expandable-hover setting
 description (#235596)

* adding more detail to hover

* polish
---
 extensions/typescript-language-features/package.nls.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json
index 1e5ca174b55..6a7dc26a24d 100644
--- a/extensions/typescript-language-features/package.nls.json
+++ b/extensions/typescript-language-features/package.nls.json
@@ -225,7 +225,7 @@
 	"configuration.tsserver.web.typeAcquisition.enabled": "Enable/disable package acquisition on the web. This enables IntelliSense for imported packages. Requires `#typescript.tsserver.web.projectWideIntellisense.enabled#`. Currently not supported for Safari.",
 	"configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want VS Code to detect a Node installation.",
 	"configuration.updateImportsOnPaste": "Enable updating imports when pasting code. Requires TypeScript 5.7+.\n\nBy default this shows a option to update imports after pasting. You can use the `#editor.pasteAs.preferences#` setting to update imports automatically when pasting: `\"editor.pasteAs.preferences\": [ \"text.updateImports.jsts\" ]`.",
-	"configuration.expandableHover": "Enable/disable expanding on hover.",
+	"configuration.expandableHover": "Enable expanding/contracting the hover to reveal more/less information from the TS server.",
 	"walkthroughs.nodejsWelcome.title": "Get started with JavaScript and Node.js",
 	"walkthroughs.nodejsWelcome.description": "Make the most of Visual Studio Code's first-class JavaScript experience.",
 	"walkthroughs.nodejsWelcome.downloadNode.forMacOrWindows.title": "Install Node.js",

From 36cd80a3a3f9a2b5af47d50d8ac0edc4fd8cb502 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Mon, 9 Dec 2024 10:49:52 +0100
Subject: [PATCH 042/479] editor sticky scroll: only collapse outermost region
 with folding icon (#235597)

only collapse the given region
---
 .../contrib/stickyScroll/browser/stickyScrollController.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
index 3387930fcd2..4f94c670552 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
@@ -394,7 +394,7 @@ export class StickyScrollController extends Disposable implements IEditorContrib
 		if (!foldingIcon) {
 			return;
 		}
-		toggleCollapseState(this._foldingModel, Number.MAX_VALUE, [line]);
+		toggleCollapseState(this._foldingModel, 1, [line]);
 		foldingIcon.isCollapsed = !foldingIcon.isCollapsed;
 		const scrollTop = (foldingIcon.isCollapsed ?
 			this._editor.getTopForLineNumber(foldingIcon.foldingEndLine)

From 5410686643f746d444c3379690113a84351ec9e5 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Mon, 9 Dec 2024 11:09:09 +0100
Subject: [PATCH 043/479] know and honour `TextEditorSelectionSource` (#235599)

fixes https://github.com/microsoft/vscode/issues/230928
---
 src/vs/workbench/api/common/extHostTypes.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
index 6cdb305f07c..90f82a69ce0 100644
--- a/src/vs/workbench/api/common/extHostTypes.ts
+++ b/src/vs/workbench/api/common/extHostTypes.ts
@@ -22,6 +22,7 @@ import { FileSystemProviderErrorCode, markAsFileSystemProviderError } from '../.
 import { RemoteAuthorityResolverErrorCode } from '../../../platform/remote/common/remoteAuthorityResolver.js';
 import { CellEditType, ICellMetadataEdit, IDocumentMetadataEdit, isTextStreamMime } from '../../contrib/notebook/common/notebookCommon.js';
 import { IRelativePatternDto } from './extHost.protocol.js';
+import { TextEditorSelectionSource } from '../../../platform/editor/common/editor.js';
 
 /**
  * @deprecated
@@ -1943,11 +1944,15 @@ export enum DecorationRangeBehavior {
 }
 
 export namespace TextEditorSelectionChangeKind {
-	export function fromValue(s: string | undefined) {
+	export function fromValue(s: TextEditorSelectionSource | string | undefined) {
 		switch (s) {
 			case 'keyboard': return TextEditorSelectionChangeKind.Keyboard;
 			case 'mouse': return TextEditorSelectionChangeKind.Mouse;
-			case 'api': return TextEditorSelectionChangeKind.Command;
+			case 'api':
+			case TextEditorSelectionSource.PROGRAMMATIC:
+			case TextEditorSelectionSource.JUMP:
+			case TextEditorSelectionSource.NAVIGATION:
+				return TextEditorSelectionChangeKind.Command;
 		}
 		return undefined;
 	}

From 5ae456f7f1149a933742968ec7c00904f0e5a069 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Mon, 9 Dec 2024 11:31:45 +0100
Subject: [PATCH 044/479] chat - setup tweaks (#235600)

---
 .../contrib/chat/browser/chatSetup.ts         | 39 +++++++------------
 .../chat/browser/media/chatViewSetup.css      |  8 ++--
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 6d5104baddf..485d1489dfd 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -23,7 +23,7 @@ import { localize, localize2 } from '../../../../nls.js';
 import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { ContextKeyExpr, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
@@ -67,6 +67,7 @@ const defaultChat = {
 	termsStatementUrl: product.defaultChatAgent?.termsStatementUrl ?? '',
 	privacyStatementUrl: product.defaultChatAgent?.privacyStatementUrl ?? '',
 	skusDocumentationUrl: product.defaultChatAgent?.skusDocumentationUrl ?? '',
+	upgradePlanUrl: product.defaultChatAgent?.upgradePlanUrl ?? '',
 	providerId: product.defaultChatAgent?.providerId ?? '',
 	providerName: product.defaultChatAgent?.providerName ?? '',
 	providerScopes: product.defaultChatAgent?.providerScopes ?? [[]],
@@ -260,14 +261,13 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 
 			override async run(accessor: ServicesAccessor): Promise<void> {
 				const openerService = accessor.get(IOpenerService);
-				const productService = accessor.get(IProductService);
 				const telemetryService = accessor.get(ITelemetryService);
 				const hostService = accessor.get(IHostService);
 				const commandService = accessor.get(ICommandService);
 
 				telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: this.desc.id, from: 'chat' });
 
-				openerService.open(URI.parse(productService.defaultChatAgent?.upgradePlanUrl ?? ''));
+				openerService.open(URI.parse(defaultChat.upgradePlanUrl));
 
 				const entitlement = that.context.state.entitlement;
 				if (entitlement !== ChatEntitlement.Pro) {
@@ -869,12 +869,6 @@ class ChatSetupWelcomeContent extends Disposable {
 		const limitedSkuHeaderContainer = this.element.appendChild($('p'));
 		limitedSkuHeaderContainer.appendChild(this._register(markdown.render(new MarkdownString(limitedSkuHeader, { isTrusted: true, supportThemeIcons: true }))).element);
 
-		// Terms
-		const terms = localize({ key: 'termsLabel', comment: ['{Locked="["}', '{Locked="]({0})"}', '{Locked="]({1})"}'] }, "By continuing, you agree to our [Terms]({0}) and [Privacy Policy]({1}).", defaultChat.termsStatementUrl, defaultChat.privacyStatementUrl);
-		const termsContainer = this.element.appendChild($('p'));
-		termsContainer.classList.add('terms-container');
-		termsContainer.appendChild(this._register(markdown.render(new MarkdownString(terms, { isTrusted: true }))).element);
-
 		// Setup Button
 		const actions: IAction[] = [];
 		if (this.context.state.installed) {
@@ -882,6 +876,7 @@ class ChatSetupWelcomeContent extends Disposable {
 			actions.push(toAction({ id: 'chatSetup.signInGhe', label: localize('signInGhe', "Sign in with a GHE.com Account"), run: () => this.commandService.executeCommand('github.copilotChat.signInGHE') }));
 		}
 		const buttonContainer = this.element.appendChild($('p'));
+		buttonContainer.classList.add('button-container');
 		const button = this._register(actions.length === 0 ? new Button(buttonContainer, {
 			supportIcons: true,
 			...defaultButtonStyles
@@ -894,6 +889,10 @@ class ChatSetupWelcomeContent extends Disposable {
 		}));
 		this._register(button.onDidClick(() => this.controller.setup()));
 
+		// Terms
+		const terms = localize({ key: 'termsLabel', comment: ['{Locked="["}', '{Locked="]({0})"}', '{Locked="]({1})"}'] }, "By continuing, you agree to the [Terms]({0}) and [Privacy Policy]({1}).", defaultChat.termsStatementUrl, defaultChat.privacyStatementUrl);
+		this.element.appendChild($('p')).appendChild(this._register(markdown.render(new MarkdownString(terms, { isTrusted: true }))).element);
+
 		// Update based on model state
 		this._register(Event.runAndSubscribe(this.controller.onDidChange, () => this.update(limitedSkuHeaderContainer, button)));
 	}
@@ -1056,23 +1055,13 @@ class ChatSetupContext extends Disposable {
 			this.storageService.remove('interactive.sessions', this.workspaceContextService.getWorkspace().folders.length ? StorageScope.WORKSPACE : StorageScope.APPLICATION);
 		}
 
-		let changed = false;
-		changed = this.updateContextKey(this.signedOutContextKey, this._state.entitlement === ChatEntitlement.Unknown) || changed;
-		changed = this.updateContextKey(this.canSignUpContextKey, this._state.entitlement === ChatEntitlement.Available) || changed;
-		changed = this.updateContextKey(this.limitedContextKey, this._state.entitlement === ChatEntitlement.Limited) || changed;
-		changed = this.updateContextKey(this.triggeredContext, !!this._state.triggered) || changed;
-		changed = this.updateContextKey(this.installedContext, !!this._state.installed) || changed;
+		this.signedOutContextKey.set(this._state.entitlement === ChatEntitlement.Unknown);
+		this.canSignUpContextKey.set(this._state.entitlement === ChatEntitlement.Available);
+		this.limitedContextKey.set(this._state.entitlement === ChatEntitlement.Limited);
+		this.triggeredContext.set(!!this._state.triggered);
+		this.installedContext.set(!!this._state.installed);
 
-		if (changed) {
-			this._onDidChange.fire();
-		}
-	}
-
-	private updateContextKey(contextKey: IContextKey<boolean>, value: boolean): boolean {
-		const current = contextKey.get();
-		contextKey.set(value);
-
-		return current !== value;
+		this._onDidChange.fire();
 	}
 
 	suspend(): void {
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatViewSetup.css b/src/vs/workbench/contrib/chat/browser/media/chatViewSetup.css
index 97a06eac5be..8b3a81f428e 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatViewSetup.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatViewSetup.css
@@ -17,10 +17,6 @@
 		background-color: var(--vscode-chat-requestBackground);
 	}
 
-	.terms-container {
-		padding-top: 5px;
-	}
-
 	.chat-feature-container {
 		display: flex;
 		align-items: center;
@@ -38,6 +34,10 @@
 		vertical-align: bottom;
 	}
 
+	.button-container {
+		padding-top: 20px;
+	}
+
 	/** Dropdown Button */
 	.monaco-button-dropdown {
 		width: 100%;

From 0e9de87e69958bd3fd59a68374fb8b65bb04038c Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 9 Dec 2024 11:35:20 +0100
Subject: [PATCH 045/479] SCM - rename dirtyDiff to quickDiff for consistency
 (#235601)

* Rename dirtyDiff -> quickDiff for consistency

* More renames

* Extract quick diff widget into separate file
---
 .../browser/mainThreadDocumentsAndEditors.ts  |   6 +-
 .../api/browser/mainThreadEditors.ts          |  36 +-
 .../mainThreadDocumentsAndEditors.test.ts     |   9 +-
 .../chat/browser/chatEditorController.ts      |   2 +-
 .../contrib/format/browser/formatModified.ts  |   3 +-
 .../chatEdit/notebookCellDecorators.ts        |   2 +-
 .../contrib/scm/browser/dirtyDiffSwitcher.ts  |  72 --
 .../contrib/scm/browser/quickDiffDecorator.ts | 338 +++++++
 .../{dirtyDiffModel.ts => quickDiffModel.ts}  | 131 +--
 ...rtydiffDecorator.ts => quickDiffWidget.ts} | 888 ++++++------------
 .../contrib/scm/browser/scm.contribution.ts   |  13 +-
 .../workbench/contrib/scm/common/quickDiff.ts | 108 +++
 .../contrib/scm/common/quickDiffService.ts    |   5 +
 13 files changed, 801 insertions(+), 812 deletions(-)
 delete mode 100644 src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.ts
 create mode 100644 src/vs/workbench/contrib/scm/browser/quickDiffDecorator.ts
 rename src/vs/workbench/contrib/scm/browser/{dirtyDiffModel.ts => quickDiffModel.ts} (79%)
 rename src/vs/workbench/contrib/scm/browser/{dirtydiffDecorator.ts => quickDiffWidget.ts} (58%)

diff --git a/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts b/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts
index 992229b91b7..66ae21fb2f8 100644
--- a/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts
@@ -32,7 +32,7 @@ import { diffSets, diffMaps } from '../../../base/common/collections.js';
 import { IPaneCompositePartService } from '../../services/panecomposite/browser/panecomposite.js';
 import { ViewContainerLocation } from '../../common/views.js';
 import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
-import { IDirtyDiffModelService } from '../../contrib/scm/browser/dirtyDiffModel.js';
+import { IQuickDiffModelService } from '../../contrib/scm/browser/quickDiffModel.js';
 
 
 class TextEditorSnapshot {
@@ -298,14 +298,14 @@ export class MainThreadDocumentsAndEditors {
 		@IClipboardService private readonly _clipboardService: IClipboardService,
 		@IPathService pathService: IPathService,
 		@IConfigurationService configurationService: IConfigurationService,
-		@IDirtyDiffModelService dirtyDiffModelService: IDirtyDiffModelService
+		@IQuickDiffModelService quickDiffModelService: IQuickDiffModelService
 	) {
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostDocumentsAndEditors);
 
 		this._mainThreadDocuments = this._toDispose.add(new MainThreadDocuments(extHostContext, this._modelService, this._textFileService, fileService, textModelResolverService, environmentService, uriIdentityService, workingCopyFileService, pathService));
 		extHostContext.set(MainContext.MainThreadDocuments, this._mainThreadDocuments);
 
-		this._mainThreadEditors = this._toDispose.add(new MainThreadTextEditors(this, extHostContext, codeEditorService, this._editorService, this._editorGroupService, configurationService, dirtyDiffModelService, uriIdentityService));
+		this._mainThreadEditors = this._toDispose.add(new MainThreadTextEditors(this, extHostContext, codeEditorService, this._editorService, this._editorGroupService, configurationService, quickDiffModelService, uriIdentityService));
 		extHostContext.set(MainContext.MainThreadTextEditors, this._mainThreadEditors);
 
 		// It is expected that the ctor of the state computer calls our `_onDelta`.
diff --git a/src/vs/workbench/api/browser/mainThreadEditors.ts b/src/vs/workbench/api/browser/mainThreadEditors.ts
index 024a09f283a..a61ba3c7801 100644
--- a/src/vs/workbench/api/browser/mainThreadEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadEditors.ts
@@ -28,7 +28,7 @@ import { IExtHostContext } from '../../services/extensions/common/extHostCustome
 import { IEditorControl } from '../../common/editor.js';
 import { getCodeEditor, ICodeEditor } from '../../../editor/browser/editorBrowser.js';
 import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
-import { IDirtyDiffModelService } from '../../contrib/scm/browser/dirtyDiffModel.js';
+import { IQuickDiffModelService } from '../../contrib/scm/browser/quickDiffModel.js';
 import { autorun, constObservable, derived, derivedOpts, IObservable, observableFromEvent } from '../../../base/common/observable.js';
 import { IUriIdentityService } from '../../../platform/uriIdentity/common/uriIdentity.js';
 import { isITextModel } from '../../../editor/common/model.js';
@@ -61,7 +61,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 		@IEditorService private readonly _editorService: IEditorService,
 		@IEditorGroupsService private readonly _editorGroupService: IEditorGroupsService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
-		@IDirtyDiffModelService private readonly _dirtyDiffModelService: IDirtyDiffModelService,
+		@IQuickDiffModelService private readonly _quickDiffModelService: IQuickDiffModelService,
 		@IUriIdentityService private readonly _uriIdentityService: IUriIdentityService
 	) {
 		this._instanceId = String(++MainThreadTextEditors.INSTANCE_COUNT);
@@ -159,14 +159,14 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 
 			// TextEditor
 			if (isITextModel(editorModel)) {
-				const dirtyDiffModelRef = this._dirtyDiffModelService.createDirtyDiffModelReference(editorModelUri);
-				if (!dirtyDiffModelRef) {
+				const quickDiffModelRef = this._quickDiffModelService.createQuickDiffModelReference(editorModelUri);
+				if (!quickDiffModelRef) {
 					return constObservable(undefined);
 				}
 
-				toDispose.push(dirtyDiffModelRef);
-				return observableFromEvent(this, dirtyDiffModelRef.object.onDidChange, () => {
-					return dirtyDiffModelRef.object.getQuickDiffResults()
+				toDispose.push(quickDiffModelRef);
+				return observableFromEvent(this, quickDiffModelRef.object.onDidChange, () => {
+					return quickDiffModelRef.object.getQuickDiffResults()
 						.map(result => ({
 							original: result.original,
 							modified: result.modified,
@@ -179,14 +179,14 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 			// we can provide multiple "original resources" to diff with the modified
 			// resource.
 			const diffAlgorithm = this._configurationService.getValue<DiffAlgorithmName>('diffEditor.diffAlgorithm');
-			const dirtyDiffModelRef = this._dirtyDiffModelService.createDiffModelReference(editorModelUri, diffAlgorithm);
-			if (!dirtyDiffModelRef) {
+			const quickDiffModelRef = this._quickDiffModelService.createQuickDiffModelReference(editorModelUri, { algorithm: diffAlgorithm });
+			if (!quickDiffModelRef) {
 				return constObservable(undefined);
 			}
 
-			toDispose.push(dirtyDiffModelRef);
-			return observableFromEvent(Event.any(dirtyDiffModelRef.object.onDidChange, diffEditor.onDidUpdateDiff), () => {
-				const dirtyDiffInformation = dirtyDiffModelRef.object.getQuickDiffResults()
+			toDispose.push(quickDiffModelRef);
+			return observableFromEvent(Event.any(quickDiffModelRef.object.onDidChange, diffEditor.onDidUpdateDiff), () => {
+				const quickDiffInformation = quickDiffModelRef.object.getQuickDiffResults()
 					.map(result => ({
 						original: result.original,
 						modified: result.modified,
@@ -200,7 +200,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 					changes: diffChanges.map(change => change as LineRangeMapping)
 				}];
 
-				return [...dirtyDiffInformation, ...diffInformation];
+				return [...quickDiffInformation, ...diffInformation];
 			});
 		});
 
@@ -391,18 +391,18 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape {
 			return Promise.resolve([]);
 		}
 
-		const dirtyDiffModelRef = this._dirtyDiffModelService.createDirtyDiffModelReference(codeEditor.getModel().uri);
-		if (!dirtyDiffModelRef) {
+		const quickDiffModelRef = this._quickDiffModelService.createQuickDiffModelReference(codeEditor.getModel().uri);
+		if (!quickDiffModelRef) {
 			return Promise.resolve([]);
 		}
 
 		try {
-			const scmQuickDiff = dirtyDiffModelRef.object.quickDiffs.find(quickDiff => quickDiff.isSCM);
-			const scmQuickDiffChanges = dirtyDiffModelRef.object.changes.filter(change => change.label === scmQuickDiff?.label);
+			const scmQuickDiff = quickDiffModelRef.object.quickDiffs.find(quickDiff => quickDiff.isSCM);
+			const scmQuickDiffChanges = quickDiffModelRef.object.changes.filter(change => change.label === scmQuickDiff?.label);
 
 			return Promise.resolve(scmQuickDiffChanges.map(change => change.change) ?? []);
 		} finally {
-			dirtyDiffModelRef.dispose();
+			quickDiffModelRef.dispose();
 		}
 	}
 }
diff --git a/src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts b/src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts
index 015cad1161c..e077dfc7ac7 100644
--- a/src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts
+++ b/src/vs/workbench/api/test/browser/mainThreadDocumentsAndEditors.test.ts
@@ -36,7 +36,7 @@ import { LanguageService } from '../../../../editor/common/services/languageServ
 import { ILanguageConfigurationService } from '../../../../editor/common/languages/languageConfigurationRegistry.js';
 import { TestLanguageConfigurationService } from '../../../../editor/test/common/modes/testLanguageConfigurationService.js';
 import { IUndoRedoService } from '../../../../platform/undoRedo/common/undoRedo.js';
-import { IDirtyDiffModelService } from '../../../contrib/scm/browser/dirtyDiffModel.js';
+import { IQuickDiffModelService } from '../../../contrib/scm/browser/quickDiffModel.js';
 import { ITextEditorDiffInformation } from '../../../../platform/editor/common/editor.js';
 
 suite('MainThreadDocumentsAndEditors', () => {
@@ -124,11 +124,8 @@ suite('MainThreadDocumentsAndEditors', () => {
 			},
 			new TestPathService(),
 			new TestConfigurationService(),
-			new class extends mock<IDirtyDiffModelService>() {
-				override createDiffModelReference() {
-					return undefined;
-				}
-				override createDirtyDiffModelReference() {
+			new class extends mock<IQuickDiffModelService>() {
+				override createQuickDiffModelReference() {
 					return undefined;
 				}
 			}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditorController.ts b/src/vs/workbench/contrib/chat/browser/chatEditorController.ts
index c4a60c82cc8..0cca055ece2 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditorController.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditorController.ts
@@ -21,7 +21,6 @@ import { ModelDecorationOptions } from '../../../../editor/common/model/textMode
 import { InlineDecoration, InlineDecorationType } from '../../../../editor/common/viewModel.js';
 import { localize } from '../../../../nls.js';
 import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-import { minimapGutterAddedBackground, minimapGutterDeletedBackground, minimapGutterModifiedBackground, overviewRulerAddedForeground, overviewRulerDeletedForeground, overviewRulerModifiedForeground } from '../../scm/browser/dirtydiffDecorator.js';
 import { ChatEditingSessionState, IChatEditingService, IModifiedFileEntry, WorkingSetEntryState } from '../common/chatEditingService.js';
 import { Event } from '../../../../base/common/event.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -31,6 +30,7 @@ import { Position } from '../../../../editor/common/core/position.js';
 import { Selection } from '../../../../editor/common/core/selection.js';
 import { HiddenItemStrategy, MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
 import { observableCodeEditor } from '../../../../editor/browser/observableCodeEditor.js';
+import { minimapGutterAddedBackground, minimapGutterDeletedBackground, minimapGutterModifiedBackground, overviewRulerAddedForeground, overviewRulerDeletedForeground, overviewRulerModifiedForeground } from '../../scm/common/quickDiff.js';
 
 export const ctxHasEditorModification = new RawContextKey<boolean>('chat.hasEditorModifications', undefined, localize('chat.hasEditorModifications', "The current editor contains chat modifications"));
 export const ctxHasRequestInProgress = new RawContextKey<boolean>('chat.ctxHasRequestInProgress', false, localize('chat.ctxHasRequestInProgress', "The current editor shows a file from an edit session which is still in progress"));
diff --git a/src/vs/workbench/contrib/format/browser/formatModified.ts b/src/vs/workbench/contrib/format/browser/formatModified.ts
index bddd514e821..d0fce02f1c4 100644
--- a/src/vs/workbench/contrib/format/browser/formatModified.ts
+++ b/src/vs/workbench/contrib/format/browser/formatModified.ts
@@ -17,8 +17,8 @@ import * as nls from '../../../../nls.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { Progress } from '../../../../platform/progress/common/progress.js';
-import { getOriginalResource } from '../../scm/browser/dirtydiffDecorator.js';
 import { IQuickDiffService } from '../../scm/common/quickDiff.js';
+import { getOriginalResource } from '../../scm/common/quickDiffService.js';
 
 registerEditorAction(class FormatModifiedAction extends EditorAction {
 
@@ -48,7 +48,6 @@ registerEditorAction(class FormatModifiedAction extends EditorAction {
 	}
 });
 
-
 export async function getModifiedRanges(accessor: ServicesAccessor, modified: ITextModel): Promise<Range[] | undefined | null> {
 	const quickDiffService = accessor.get(IQuickDiffService);
 	const workerService = accessor.get(IEditorWorkerService);
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookCellDecorators.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookCellDecorators.ts
index 17517c36bff..81a5b3776ac 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookCellDecorators.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookCellDecorators.ts
@@ -21,7 +21,6 @@ import { IDocumentDiff } from '../../../../../../editor/common/diff/documentDiff
 import { ITextModel, TrackedRangeStickiness, MinimapPosition, IModelDeltaDecoration, OverviewRulerLane } from '../../../../../../editor/common/model.js';
 import { ModelDecorationOptions } from '../../../../../../editor/common/model/textModel.js';
 import { InlineDecoration, InlineDecorationType } from '../../../../../../editor/common/viewModel.js';
-import { overviewRulerModifiedForeground, minimapGutterModifiedBackground, overviewRulerAddedForeground, minimapGutterAddedBackground, overviewRulerDeletedForeground, minimapGutterDeletedBackground } from '../../../../scm/browser/dirtydiffDecorator.js';
 import { Range } from '../../../../../../editor/common/core/range.js';
 import { NotebookCellTextModel } from '../../../common/model/notebookCellTextModel.js';
 import { tokenizeToString } from '../../../../../../editor/common/languages/textToHtmlTokenizer.js';
@@ -32,6 +31,7 @@ import { DefaultLineHeight } from '../../diff/diffElementViewModel.js';
 import { INotebookOriginalCellModelFactory } from './notebookOriginalCellModelFactory.js';
 import { DetailedLineRangeMapping } from '../../../../../../editor/common/diff/rangeMapping.js';
 import { isEqual } from '../../../../../../base/common/resources.js';
+import { minimapGutterAddedBackground, minimapGutterDeletedBackground, minimapGutterModifiedBackground, overviewRulerAddedForeground, overviewRulerDeletedForeground, overviewRulerModifiedForeground } from '../../../../scm/common/quickDiff.js';
 
 
 export class NotebookCellDiffDecorator extends DisposableStore {
diff --git a/src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.ts b/src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.ts
deleted file mode 100644
index cf2d4469049..00000000000
--- a/src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.ts
+++ /dev/null
@@ -1,72 +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 nls from '../../../../nls.js';
-import { Action, IAction } from '../../../../base/common/actions.js';
-import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
-import { ISelectOptionItem } from '../../../../base/browser/ui/selectBox/selectBox.js';
-import { SelectActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
-import { defaultSelectBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
-import { IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { peekViewTitleBackground } from '../../../../editor/contrib/peekView/browser/peekView.js';
-import { editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
-
-export interface IQuickDiffSelectItem extends ISelectOptionItem {
-	provider: string;
-}
-
-export class SwitchQuickDiffViewItem extends SelectActionViewItem<IQuickDiffSelectItem> {
-	private readonly optionsItems: IQuickDiffSelectItem[];
-
-	constructor(
-		action: IAction,
-		providers: string[],
-		selected: string,
-		@IContextViewService contextViewService: IContextViewService,
-		@IThemeService themeService: IThemeService
-	) {
-		const items = providers.map(provider => ({ provider, text: provider }));
-		let startingSelection = providers.indexOf(selected);
-		if (startingSelection === -1) {
-			startingSelection = 0;
-		}
-		const styles = { ...defaultSelectBoxStyles };
-		const theme = themeService.getColorTheme();
-		const editorBackgroundColor = theme.getColor(editorBackground);
-		const peekTitleColor = theme.getColor(peekViewTitleBackground);
-		const opaqueTitleColor = peekTitleColor?.makeOpaque(editorBackgroundColor!) ?? editorBackgroundColor!;
-		styles.selectBackground = opaqueTitleColor.lighten(.6).toString();
-		super(null, action, items, startingSelection, contextViewService, styles, { ariaLabel: nls.localize('remotes', 'Switch quick diff base') });
-		this.optionsItems = items;
-	}
-
-	public setSelection(provider: string) {
-		const index = this.optionsItems.findIndex(item => item.provider === provider);
-		this.select(index);
-	}
-
-	protected override getActionContext(_: string, index: number): IQuickDiffSelectItem {
-		return this.optionsItems[index];
-	}
-
-	override render(container: HTMLElement): void {
-		super.render(container);
-		this.setFocusable(true);
-	}
-}
-
-export class SwitchQuickDiffBaseAction extends Action {
-
-	public static readonly ID = 'quickDiff.base.switch';
-	public static readonly LABEL = nls.localize('quickDiff.base.switch', "Switch Quick Diff Base");
-
-	constructor(private readonly callback: (event?: IQuickDiffSelectItem) => void) {
-		super(SwitchQuickDiffBaseAction.ID, SwitchQuickDiffBaseAction.LABEL, undefined, undefined);
-	}
-
-	override async run(event?: IQuickDiffSelectItem): Promise<void> {
-		return this.callback(event);
-	}
-}
diff --git a/src/vs/workbench/contrib/scm/browser/quickDiffDecorator.ts b/src/vs/workbench/contrib/scm/browser/quickDiffDecorator.ts
new file mode 100644
index 00000000000..8e701d3d92c
--- /dev/null
+++ b/src/vs/workbench/contrib/scm/browser/quickDiffDecorator.ts
@@ -0,0 +1,338 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as nls from '../../../../nls.js';
+
+import './media/dirtydiffDecorator.css';
+import { Disposable, DisposableStore, DisposableMap, IReference } from '../../../../base/common/lifecycle.js';
+import { Event } from '../../../../base/common/event.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
+import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
+import { ICodeEditor, isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { IEditorDecorationsCollection } from '../../../../editor/common/editorCommon.js';
+import { OverviewRulerLane, IModelDecorationOptions, MinimapPosition } from '../../../../editor/common/model.js';
+import * as domStylesheetsJs from '../../../../base/browser/domStylesheets.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { ChangeType, getChangeType, minimapGutterAddedBackground, minimapGutterDeletedBackground, minimapGutterModifiedBackground, overviewRulerAddedForeground, overviewRulerDeletedForeground, overviewRulerModifiedForeground } from '../common/quickDiff.js';
+import { QuickDiffModel, IQuickDiffModelService } from './quickDiffModel.js';
+import { IWorkbenchContribution } from '../../../common/contributions.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+
+class QuickDiffDecorator extends Disposable {
+
+	static createDecoration(className: string, tooltip: string | null, options: { gutter: boolean; overview: { active: boolean; color: string }; minimap: { active: boolean; color: string }; isWholeLine: boolean }): ModelDecorationOptions {
+		const decorationOptions: IModelDecorationOptions = {
+			description: 'dirty-diff-decoration',
+			isWholeLine: options.isWholeLine,
+		};
+
+		if (options.gutter) {
+			decorationOptions.linesDecorationsClassName = `dirty-diff-glyph ${className}`;
+			decorationOptions.linesDecorationsTooltip = tooltip;
+		}
+
+		if (options.overview.active) {
+			decorationOptions.overviewRuler = {
+				color: themeColorFromId(options.overview.color),
+				position: OverviewRulerLane.Left
+			};
+		}
+
+		if (options.minimap.active) {
+			decorationOptions.minimap = {
+				color: themeColorFromId(options.minimap.color),
+				position: MinimapPosition.Gutter
+			};
+		}
+
+		return ModelDecorationOptions.createDynamic(decorationOptions);
+	}
+
+	private addedOptions: ModelDecorationOptions;
+	private addedPatternOptions: ModelDecorationOptions;
+	private modifiedOptions: ModelDecorationOptions;
+	private modifiedPatternOptions: ModelDecorationOptions;
+	private deletedOptions: ModelDecorationOptions;
+	private decorationsCollection: IEditorDecorationsCollection | undefined;
+
+	constructor(
+		private readonly codeEditor: ICodeEditor,
+		private readonly quickDiffModelRef: IReference<QuickDiffModel>,
+		@IConfigurationService private readonly configurationService: IConfigurationService
+	) {
+		super();
+
+		const decorations = configurationService.getValue<string>('scm.diffDecorations');
+		const gutter = decorations === 'all' || decorations === 'gutter';
+		const overview = decorations === 'all' || decorations === 'overview';
+		const minimap = decorations === 'all' || decorations === 'minimap';
+
+		const diffAdded = nls.localize('diffAdded', 'Added lines');
+		this.addedOptions = QuickDiffDecorator.createDecoration('dirty-diff-added', diffAdded, {
+			gutter,
+			overview: { active: overview, color: overviewRulerAddedForeground },
+			minimap: { active: minimap, color: minimapGutterAddedBackground },
+			isWholeLine: true
+		});
+		this.addedPatternOptions = QuickDiffDecorator.createDecoration('dirty-diff-added-pattern', diffAdded, {
+			gutter,
+			overview: { active: overview, color: overviewRulerAddedForeground },
+			minimap: { active: minimap, color: minimapGutterAddedBackground },
+			isWholeLine: true
+		});
+		const diffModified = nls.localize('diffModified', 'Changed lines');
+		this.modifiedOptions = QuickDiffDecorator.createDecoration('dirty-diff-modified', diffModified, {
+			gutter,
+			overview: { active: overview, color: overviewRulerModifiedForeground },
+			minimap: { active: minimap, color: minimapGutterModifiedBackground },
+			isWholeLine: true
+		});
+		this.modifiedPatternOptions = QuickDiffDecorator.createDecoration('dirty-diff-modified-pattern', diffModified, {
+			gutter,
+			overview: { active: overview, color: overviewRulerModifiedForeground },
+			minimap: { active: minimap, color: minimapGutterModifiedBackground },
+			isWholeLine: true
+		});
+		this.deletedOptions = QuickDiffDecorator.createDecoration('dirty-diff-deleted', nls.localize('diffDeleted', 'Removed lines'), {
+			gutter,
+			overview: { active: overview, color: overviewRulerDeletedForeground },
+			minimap: { active: minimap, color: minimapGutterDeletedBackground },
+			isWholeLine: false
+		});
+
+		this._register(configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('scm.diffDecorationsGutterPattern')) {
+				this.onDidChange();
+			}
+		}));
+
+		this._register(Event.runAndSubscribe(this.quickDiffModelRef.object.onDidChange, () => this.onDidChange()));
+	}
+
+	private onDidChange(): void {
+		if (!this.codeEditor.hasModel()) {
+			return;
+		}
+
+		const visibleQuickDiffs = this.quickDiffModelRef.object.quickDiffs.filter(quickDiff => quickDiff.visible);
+		const pattern = this.configurationService.getValue<{ added: boolean; modified: boolean }>('scm.diffDecorationsGutterPattern');
+
+		const decorations = this.quickDiffModelRef.object.changes
+			.filter(labeledChange => visibleQuickDiffs.some(quickDiff => quickDiff.label === labeledChange.label))
+			.map((labeledChange) => {
+				const change = labeledChange.change;
+				const changeType = getChangeType(change);
+				const startLineNumber = change.modifiedStartLineNumber;
+				const endLineNumber = change.modifiedEndLineNumber || startLineNumber;
+
+				switch (changeType) {
+					case ChangeType.Add:
+						return {
+							range: {
+								startLineNumber: startLineNumber, startColumn: 1,
+								endLineNumber: endLineNumber, endColumn: 1
+							},
+							options: pattern.added ? this.addedPatternOptions : this.addedOptions
+						};
+					case ChangeType.Delete:
+						return {
+							range: {
+								startLineNumber: startLineNumber, startColumn: Number.MAX_VALUE,
+								endLineNumber: startLineNumber, endColumn: Number.MAX_VALUE
+							},
+							options: this.deletedOptions
+						};
+					case ChangeType.Modify:
+						return {
+							range: {
+								startLineNumber: startLineNumber, startColumn: 1,
+								endLineNumber: endLineNumber, endColumn: 1
+							},
+							options: pattern.modified ? this.modifiedPatternOptions : this.modifiedOptions
+						};
+				}
+			});
+
+		if (!this.decorationsCollection) {
+			this.decorationsCollection = this.codeEditor.createDecorationsCollection(decorations);
+		} else {
+			this.decorationsCollection.set(decorations);
+		}
+	}
+
+	override dispose(): void {
+		if (this.decorationsCollection) {
+			this.decorationsCollection?.clear();
+		}
+		this.decorationsCollection = undefined;
+		this.quickDiffModelRef.dispose();
+		super.dispose();
+	}
+}
+
+interface QuickDiffWorkbenchControllerViewState {
+	readonly width: number;
+	readonly visibility: 'always' | 'hover';
+}
+
+export class QuickDiffWorkbenchController extends Disposable implements IWorkbenchContribution {
+
+	private enabled = false;
+
+	// Resource URI -> Code Editor Id -> Decoration (Disposable)
+	private readonly decorators = new ResourceMap<DisposableMap<string>>();
+	private viewState: QuickDiffWorkbenchControllerViewState = { width: 3, visibility: 'always' };
+	private readonly transientDisposables = this._register(new DisposableStore());
+	private readonly stylesheet: HTMLStyleElement;
+
+	constructor(
+		@IEditorService private readonly editorService: IEditorService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IQuickDiffModelService private readonly quickDiffModelService: IQuickDiffModelService,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
+	) {
+		super();
+		this.stylesheet = domStylesheetsJs.createStyleSheet(undefined, undefined, this._store);
+
+		const onDidChangeConfiguration = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.diffDecorations'));
+		this._register(onDidChangeConfiguration(this.onDidChangeConfiguration, this));
+		this.onDidChangeConfiguration();
+
+		const onDidChangeDiffWidthConfiguration = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.diffDecorationsGutterWidth'));
+		this._register(onDidChangeDiffWidthConfiguration(this.onDidChangeDiffWidthConfiguration, this));
+		this.onDidChangeDiffWidthConfiguration();
+
+		const onDidChangeDiffVisibilityConfiguration = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.diffDecorationsGutterVisibility'));
+		this._register(onDidChangeDiffVisibilityConfiguration(this.onDidChangeDiffVisibilityConfiguration, this));
+		this.onDidChangeDiffVisibilityConfiguration();
+	}
+
+	private onDidChangeConfiguration(): void {
+		const enabled = this.configurationService.getValue<string>('scm.diffDecorations') !== 'none';
+
+		if (enabled) {
+			this.enable();
+		} else {
+			this.disable();
+		}
+	}
+
+	private onDidChangeDiffWidthConfiguration(): void {
+		let width = this.configurationService.getValue<number>('scm.diffDecorationsGutterWidth');
+
+		if (isNaN(width) || width <= 0 || width > 5) {
+			width = 3;
+		}
+
+		this.setViewState({ ...this.viewState, width });
+	}
+
+	private onDidChangeDiffVisibilityConfiguration(): void {
+		const visibility = this.configurationService.getValue<'always' | 'hover'>('scm.diffDecorationsGutterVisibility');
+		this.setViewState({ ...this.viewState, visibility });
+	}
+
+	private setViewState(state: QuickDiffWorkbenchControllerViewState): void {
+		this.viewState = state;
+		this.stylesheet.textContent = `
+			.monaco-editor .dirty-diff-added,
+			.monaco-editor .dirty-diff-modified {
+				border-left-width:${state.width}px;
+			}
+			.monaco-editor .dirty-diff-added-pattern,
+			.monaco-editor .dirty-diff-added-pattern:before,
+			.monaco-editor .dirty-diff-modified-pattern,
+			.monaco-editor .dirty-diff-modified-pattern:before {
+				background-size: ${state.width}px ${state.width}px;
+			}
+			.monaco-editor .dirty-diff-added,
+			.monaco-editor .dirty-diff-added-pattern,
+			.monaco-editor .dirty-diff-modified,
+			.monaco-editor .dirty-diff-modified-pattern,
+			.monaco-editor .dirty-diff-deleted {
+				opacity: ${state.visibility === 'always' ? 1 : 0};
+			}
+		`;
+	}
+
+	private enable(): void {
+		if (this.enabled) {
+			this.disable();
+		}
+
+		this.transientDisposables.add(Event.any(this.editorService.onDidCloseEditor, this.editorService.onDidVisibleEditorsChange)(() => this.onEditorsChanged()));
+		this.onEditorsChanged();
+		this.enabled = true;
+	}
+
+	private disable(): void {
+		if (!this.enabled) {
+			return;
+		}
+
+		this.transientDisposables.clear();
+
+		for (const [uri, decoratorMap] of this.decorators.entries()) {
+			decoratorMap.dispose();
+			this.decorators.delete(uri);
+		}
+
+		this.enabled = false;
+	}
+
+	private onEditorsChanged(): void {
+		for (const editor of this.editorService.visibleTextEditorControls) {
+			if (!isCodeEditor(editor)) {
+				continue;
+			}
+
+			const textModel = editor.getModel();
+			if (!textModel) {
+				continue;
+			}
+
+			const editorId = editor.getId();
+			if (this.decorators.get(textModel.uri)?.has(editorId)) {
+				continue;
+			}
+
+			const quickDiffModelRef = this.quickDiffModelService.createQuickDiffModelReference(textModel.uri);
+			if (!quickDiffModelRef) {
+				continue;
+			}
+
+			if (!this.decorators.has(textModel.uri)) {
+				this.decorators.set(textModel.uri, new DisposableMap<string>());
+			}
+
+			this.decorators.get(textModel.uri)!.set(editorId, new QuickDiffDecorator(editor, quickDiffModelRef, this.configurationService));
+		}
+
+		// Dispose decorators for editors that are no longer visible.
+		for (const [uri, decoratorMap] of this.decorators.entries()) {
+			for (const editorId of decoratorMap.keys()) {
+				const codeEditor = this.editorService.visibleTextEditorControls
+					.find(editor => isCodeEditor(editor) && editor.getId() === editorId &&
+						this.uriIdentityService.extUri.isEqual(editor.getModel()?.uri, uri));
+
+				if (!codeEditor) {
+					decoratorMap.deleteAndDispose(editorId);
+				}
+			}
+
+			if (decoratorMap.size === 0) {
+				decoratorMap.dispose();
+				this.decorators.delete(uri);
+			}
+		}
+	}
+
+	override dispose(): void {
+		this.disable();
+		super.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/scm/browser/dirtyDiffModel.ts b/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts
similarity index 79%
rename from src/vs/workbench/contrib/scm/browser/dirtyDiffModel.ts
rename to src/vs/workbench/contrib/scm/browser/quickDiffModel.ts
index 9d9c1d395aa..e7f97e04082 100644
--- a/src/vs/workbench/contrib/scm/browser/dirtyDiffModel.ts
+++ b/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts
@@ -13,7 +13,7 @@ import { URI } from '../../../../base/common/uri.js';
 import { IChange } from '../../../../editor/common/diff/legacyLinesDiffComputer.js';
 import { IResolvedTextEditorModel, ITextModelService } from '../../../../editor/common/services/resolverService.js';
 import { ITextModel, shouldSynchronizeModel } from '../../../../editor/common/model.js';
-import { IQuickDiffService, QuickDiff, QuickDiffChange, QuickDiffResult } from '../common/quickDiff.js';
+import { compareChanges, getModifiedEndLineNumber, IQuickDiffService, QuickDiff, QuickDiffChange, QuickDiffResult } from '../common/quickDiff.js';
 import { ThrottledDelayer } from '../../../../base/common/async.js';
 import { ISCMRepository, ISCMService } from '../common/scm.js';
 import { sortedDiff, equals } from '../../../../base/common/arrays.js';
@@ -29,83 +29,66 @@ import { IProgressService, ProgressLocation } from '../../../../platform/progres
 import { IChatEditingService, WorkingSetEntryState } from '../../chat/common/chatEditingService.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 
-export const IDirtyDiffModelService = createDecorator<IDirtyDiffModelService>('IDirtyDiffModelService');
+export const IQuickDiffModelService = createDecorator<IQuickDiffModelService>('IQuickDiffModelService');
 
-export interface IDirtyDiffModelService {
-	_serviceBrand: undefined;
+export interface QuickDiffModelOptions {
+	readonly algorithm: DiffAlgorithmName;
+}
 
-	/**
-	 * Returns `undefined` if the editor model is not resolved.
-	 * Model refrence has to be disposed once not needed anymore.
-	 * @param resource
-	 * @param algorithm
-	 */
-	createDiffModelReference(resource: URI, algorithm: DiffAlgorithmName): IReference<DirtyDiffModel> | undefined;
+export interface IQuickDiffModelService {
+	_serviceBrand: undefined;
 
 	/**
 	 * Returns `undefined` if the editor model is not resolved.
 	 * Model refrence has to be disposed once not needed anymore.
 	 * @param resource
+	 * @param options
 	 */
-	createDirtyDiffModelReference(resource: URI): IReference<DirtyDiffModel> | undefined;
+	createQuickDiffModelReference(resource: URI, options?: QuickDiffModelOptions): IReference<QuickDiffModel> | undefined;
 }
 
-class DirtyDiffModelReferenceCollection extends ReferenceCollection<DirtyDiffModel> {
+class QuickDiffModelReferenceCollection extends ReferenceCollection<QuickDiffModel> {
 	constructor(@IInstantiationService private readonly _instantiationService: IInstantiationService) {
 		super();
 	}
 
-	protected override createReferencedObject(_key: string, textFileModel: IResolvedTextFileEditorModel, algorithm: DiffAlgorithmName | undefined): DirtyDiffModel {
-		return this._instantiationService.createInstance(DirtyDiffModel, textFileModel, algorithm);
+	protected override createReferencedObject(_key: string, textFileModel: IResolvedTextFileEditorModel, options?: QuickDiffModelOptions): QuickDiffModel {
+		return this._instantiationService.createInstance(QuickDiffModel, textFileModel, options);
 	}
 
-	protected override destroyReferencedObject(_key: string, object: DirtyDiffModel): void {
+	protected override destroyReferencedObject(_key: string, object: QuickDiffModel): void {
 		object.dispose();
 	}
 }
 
-export class DirtyDiffModelService implements IDirtyDiffModelService {
+export class QuickDiffModelService implements IQuickDiffModelService {
 	_serviceBrand: undefined;
 
-	private readonly _references: DirtyDiffModelReferenceCollection;
+	private readonly _references: QuickDiffModelReferenceCollection;
 
 	constructor(
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@ITextFileService private readonly textFileService: ITextFileService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService
 	) {
-		this._references = this.instantiationService.createInstance(DirtyDiffModelReferenceCollection);
-	}
-
-	createDiffModelReference(resource: URI, algorithm: DiffAlgorithmName): IReference<DirtyDiffModel> | undefined {
-		const textFileModel = this.textFileService.files.get(resource);
-		if (!textFileModel?.isResolved()) {
-			return undefined;
-		}
-
-		return this._createModelReference(resource, textFileModel, algorithm);
+		this._references = this.instantiationService.createInstance(QuickDiffModelReferenceCollection);
 	}
 
-	createDirtyDiffModelReference(resource: URI): IReference<DirtyDiffModel> | undefined {
+	createQuickDiffModelReference(resource: URI, options?: QuickDiffModelOptions): IReference<QuickDiffModel> | undefined {
 		const textFileModel = this.textFileService.files.get(resource);
 		if (!textFileModel?.isResolved()) {
 			return undefined;
 		}
 
-		return this._createModelReference(resource, textFileModel, undefined);
-	}
-
-	private _createModelReference(resource: URI, textFileModel: IResolvedTextFileEditorModel, algorithm: DiffAlgorithmName | undefined): IReference<DirtyDiffModel> {
-		resource = algorithm === undefined
+		resource = options === undefined
 			? this.uriIdentityService.asCanonicalUri(resource)
-			: this.uriIdentityService.asCanonicalUri(resource)
-				.with({ query: `algorithm=${algorithm}` });
+			: this.uriIdentityService.asCanonicalUri(resource).with({ query: JSON.stringify(options) });
 
-		return this._references.acquire(resource.toString(), textFileModel, algorithm);
+		return this._references.acquire(resource.toString(), textFileModel, options);
 	}
 }
 
-export class DirtyDiffModel extends Disposable {
+export class QuickDiffModel extends Disposable {
 
 	private _model: ITextFileEditorModel;
 
@@ -136,7 +119,7 @@ export class DirtyDiffModel extends Disposable {
 
 	constructor(
 		textFileModel: IResolvedTextFileEditorModel,
-		private readonly algorithm: DiffAlgorithmName | undefined,
+		private readonly options: QuickDiffModelOptions | undefined,
 		@ISCMService private readonly scmService: ISCMService,
 		@IQuickDiffService private readonly quickDiffService: IQuickDiffService,
 		@IEditorWorkerService private readonly editorWorkerService: IEditorWorkerService,
@@ -263,15 +246,15 @@ export class DirtyDiffModel extends Disposable {
 
 			const allDiffs: QuickDiffChange[] = [];
 			for (const quickDiff of filteredToDiffable) {
-				const dirtyDiff = await this._diff(quickDiff.originalResource, this._model.resource, ignoreTrimWhitespace);
-				if (dirtyDiff.changes && dirtyDiff.changes2 && dirtyDiff.changes.length === dirtyDiff.changes2.length) {
-					for (let index = 0; index < dirtyDiff.changes.length; index++) {
+				const diff = await this._diff(quickDiff.originalResource, this._model.resource, ignoreTrimWhitespace);
+				if (diff.changes && diff.changes2 && diff.changes.length === diff.changes2.length) {
+					for (let index = 0; index < diff.changes.length; index++) {
 						allDiffs.push({
 							label: quickDiff.label,
 							original: quickDiff.originalResource,
 							modified: this._model.resource,
-							change: dirtyDiff.changes[index],
-							change2: dirtyDiff.changes2[index]
+							change: diff.changes[index],
+							change2: diff.changes2[index]
 						});
 					}
 				}
@@ -290,7 +273,7 @@ export class DirtyDiffModel extends Disposable {
 	}
 
 	private async _diff(original: URI, modified: URI, ignoreTrimWhitespace: boolean): Promise<{ changes: readonly IChange[] | null; changes2: readonly LineRangeMapping[] | null }> {
-		if (this.algorithm === undefined) {
+		if (this.options?.algorithm === undefined) {
 			const changes = await this.editorWorkerService.computeDirtyDiff(original, modified, ignoreTrimWhitespace);
 			return { changes, changes2: changes?.map(change => lineRangeMappingFromChange(change)) ?? null };
 		}
@@ -299,7 +282,7 @@ export class DirtyDiffModel extends Disposable {
 			computeMoves: false,
 			ignoreTrimWhitespace,
 			maxComputationTimeMs: Number.MAX_SAFE_INTEGER
-		}, this.algorithm);
+		}, this.options.algorithm);
 
 		return { changes: result ? toLineChanges(DiffState.fromDiffResult(result)) : null, changes2: result?.changes ?? null };
 	}
@@ -377,10 +360,10 @@ export class DirtyDiffModel extends Disposable {
 		const quickDiffs = await this.quickDiffService.getQuickDiffs(uri, this._model.getLanguageId(), isSynchronized);
 
 		// TODO@lszomoru - find a long term solution for this
-		// When the DirtyDiffModel is created for a diff editor, there is no
+		// When the QuickDiffModel is created for a diff editor, there is no
 		// need to compute the diff information for the `isSCM` quick diff
 		// provider as that information will be provided by the diff editor
-		return this.algorithm !== undefined
+		return this.options?.algorithm !== undefined
 			? quickDiffs.filter(quickDiff => !quickDiff.isSCM)
 			: quickDiffs;
 	}
@@ -464,55 +447,3 @@ export class DirtyDiffModel extends Disposable {
 		super.dispose();
 	}
 }
-
-function compareChanges(a: IChange, b: IChange): number {
-	let result = a.modifiedStartLineNumber - b.modifiedStartLineNumber;
-
-	if (result !== 0) {
-		return result;
-	}
-
-	result = a.modifiedEndLineNumber - b.modifiedEndLineNumber;
-
-	if (result !== 0) {
-		return result;
-	}
-
-	result = a.originalStartLineNumber - b.originalStartLineNumber;
-
-	if (result !== 0) {
-		return result;
-	}
-
-	return a.originalEndLineNumber - b.originalEndLineNumber;
-}
-
-export function getChangeHeight(change: IChange): number {
-	const modified = change.modifiedEndLineNumber - change.modifiedStartLineNumber + 1;
-	const original = change.originalEndLineNumber - change.originalStartLineNumber + 1;
-
-	if (change.originalEndLineNumber === 0) {
-		return modified;
-	} else if (change.modifiedEndLineNumber === 0) {
-		return original;
-	} else {
-		return modified + original;
-	}
-}
-
-export function getModifiedEndLineNumber(change: IChange): number {
-	if (change.modifiedEndLineNumber === 0) {
-		return change.modifiedStartLineNumber === 0 ? 1 : change.modifiedStartLineNumber;
-	} else {
-		return change.modifiedEndLineNumber;
-	}
-}
-
-export function lineIntersectsChange(lineNumber: number, change: IChange): boolean {
-	// deletion at the beginning of the file
-	if (lineNumber === 1 && change.modifiedStartLineNumber === 0 && change.modifiedEndLineNumber === 0) {
-		return true;
-	}
-
-	return lineNumber >= change.modifiedStartLineNumber && lineNumber <= (change.modifiedEndLineNumber || change.modifiedStartLineNumber);
-}
diff --git a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts b/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts
similarity index 58%
rename from src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
rename to src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts
index f14fd38555f..35771008fe6 100644
--- a/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.ts
+++ b/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts
@@ -4,58 +4,112 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as nls from '../../../../nls.js';
-
-import './media/dirtydiffDecorator.css';
-import { IDisposable, toDisposable, Disposable, DisposableStore, DisposableMap, IReference } from '../../../../base/common/lifecycle.js';
+import * as dom from '../../../../base/browser/dom.js';
+import * as domStylesheetsJs from '../../../../base/browser/domStylesheets.js';
+import { Action, ActionRunner, IAction } from '../../../../base/common/actions.js';
 import { Event } from '../../../../base/common/event.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { ISelectOptionItem } from '../../../../base/browser/ui/selectBox/selectBox.js';
+import { SelectActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { defaultSelectBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { IColorTheme, IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { getOuterEditor, peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground, PeekViewWidget } from '../../../../editor/contrib/peekView/browser/peekView.js';
+import { editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import { IMenu, IMenuService, MenuId, MenuItemAction, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from '../../../../editor/browser/editorBrowser.js';
+import { EditorAction, registerEditorAction } from '../../../../editor/browser/editorExtensions.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { EmbeddedDiffEditorWidget } from '../../../../editor/browser/widget/diffEditor/embeddedDiffEditorWidget.js';
+import { IEditorContribution, ScrollType } from '../../../../editor/common/editorCommon.js';
+import { IQuickDiffModelService, QuickDiffModel } from './quickDiffModel.js';
+import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { URI } from '../../../../base/common/uri.js';
-import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
-import { IColorTheme, themeColorFromId, IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { editorErrorForeground, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
-import { ICodeEditor, IEditorMouseEvent, isCodeEditor, MouseTargetType } from '../../../../editor/browser/editorBrowser.js';
-import { registerEditorAction, registerEditorContribution, ServicesAccessor, EditorAction, EditorContributionInstantiation } from '../../../../editor/browser/editorExtensions.js';
-import { PeekViewWidget, getOuterEditor, peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground } from '../../../../editor/contrib/peekView/browser/peekView.js';
-import { IContextKeyService, IContextKey, ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
-import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
-import { Position } from '../../../../editor/common/core/position.js';
-import { Range } from '../../../../editor/common/core/range.js';
 import { rot } from '../../../../base/common/numbers.js';
-import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
-import { EmbeddedDiffEditorWidget } from '../../../../editor/browser/widget/diffEditor/embeddedDiffEditorWidget.js';
-import { IDiffEditorOptions, EditorOption } from '../../../../editor/common/config/editorOptions.js';
-import { Action, IAction, ActionRunner } from '../../../../base/common/actions.js';
-import { IActionBarOptions } from '../../../../base/browser/ui/actionbar/actionbar.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
-import { basename } from '../../../../base/common/resources.js';
-import { MenuId, IMenuService, IMenu, MenuItemAction, MenuRegistry } from '../../../../platform/actions/common/actions.js';
-import { getFlatActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
-import { ScrollType, IEditorContribution, IEditorDecorationsCollection } from '../../../../editor/common/editorCommon.js';
-import { OverviewRulerLane, IModelDecorationOptions, MinimapPosition } from '../../../../editor/common/model.js';
-import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { ISplice } from '../../../../base/common/sequence.js';
-import * as dom from '../../../../base/browser/dom.js';
-import * as domStylesheetsJs from '../../../../base/browser/domStylesheets.js';
-import { gotoNextLocation, gotoPreviousLocation } from '../../../../platform/theme/common/iconRegistry.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
+import { ChangeType, getChangeHeight, getChangeType, getChangeTypeColor, getModifiedEndLineNumber, lineIntersectsChange, QuickDiffChange } from '../common/quickDiff.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { TextCompareEditorActiveContext } from '../../../common/contextkeys.js';
+import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IChange } from '../../../../editor/common/diff/legacyLinesDiffComputer.js';
-import { Color } from '../../../../base/common/color.js';
-import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
-import { IQuickDiffService, QuickDiffChange } from '../common/quickDiff.js';
-import { IQuickDiffSelectItem, SwitchQuickDiffBaseAction, SwitchQuickDiffViewItem } from './dirtyDiffSwitcher.js';
 import { Iterable } from '../../../../base/common/iterator.js';
-import { DirtyDiffModel, getChangeHeight, getModifiedEndLineNumber, IDirtyDiffModelService, lineIntersectsChange } from './dirtyDiffModel.js';
-import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { ResourceMap } from '../../../../base/common/map.js';
-import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { basename } from '../../../../base/common/resources.js';
+import { EditorOption, IDiffEditorOptions } from '../../../../editor/common/config/editorOptions.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { getFlatActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { IActionBarOptions } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { gotoNextLocation, gotoPreviousLocation } from '../../../../platform/theme/common/iconRegistry.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Color } from '../../../../base/common/color.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+
+export const isQuickDiffVisible = new RawContextKey<boolean>('dirtyDiffVisible', false);
+
+export interface IQuickDiffSelectItem extends ISelectOptionItem {
+	provider: string;
+}
+
+export class QuickDiffPickerViewItem extends SelectActionViewItem<IQuickDiffSelectItem> {
+	private readonly optionsItems: IQuickDiffSelectItem[];
+
+	constructor(
+		action: IAction,
+		providers: string[],
+		selected: string,
+		@IContextViewService contextViewService: IContextViewService,
+		@IThemeService themeService: IThemeService
+	) {
+		const items = providers.map(provider => ({ provider, text: provider }));
+		let startingSelection = providers.indexOf(selected);
+		if (startingSelection === -1) {
+			startingSelection = 0;
+		}
+		const styles = { ...defaultSelectBoxStyles };
+		const theme = themeService.getColorTheme();
+		const editorBackgroundColor = theme.getColor(editorBackground);
+		const peekTitleColor = theme.getColor(peekViewTitleBackground);
+		const opaqueTitleColor = peekTitleColor?.makeOpaque(editorBackgroundColor!) ?? editorBackgroundColor!;
+		styles.selectBackground = opaqueTitleColor.lighten(.6).toString();
+		super(null, action, items, startingSelection, contextViewService, styles, { ariaLabel: nls.localize('remotes', 'Switch quick diff base') });
+		this.optionsItems = items;
+	}
 
-class DiffActionRunner extends ActionRunner {
+	public setSelection(provider: string) {
+		const index = this.optionsItems.findIndex(item => item.provider === provider);
+		this.select(index);
+	}
+
+	protected override getActionContext(_: string, index: number): IQuickDiffSelectItem {
+		return this.optionsItems[index];
+	}
+
+	override render(container: HTMLElement): void {
+		super.render(container);
+		this.setFocusable(true);
+	}
+}
+
+export class QuickDiffPickerBaseAction extends Action {
+
+	public static readonly ID = 'quickDiff.base.switch';
+	public static readonly LABEL = nls.localize('quickDiff.base.switch', "Switch Quick Diff Base");
+
+	constructor(private readonly callback: (event?: IQuickDiffSelectItem) => void) {
+		super(QuickDiffPickerBaseAction.ID, QuickDiffPickerBaseAction.LABEL, undefined, undefined);
+	}
+
+	override async run(event?: IQuickDiffSelectItem): Promise<void> {
+		return this.callback(event);
+	}
+}
+
+class QuickDiffWidgetActionRunner extends ActionRunner {
 
 	protected override runAction(action: IAction, context: any): Promise<any> {
 		if (action instanceof MenuItemAction) {
@@ -66,9 +120,7 @@ class DiffActionRunner extends ActionRunner {
 	}
 }
 
-export const isDirtyDiffVisible = new RawContextKey<boolean>('dirtyDiffVisible', false);
-
-class UIEditorAction extends Action {
+class QuickDiffWidgetEditorAction extends Action {
 
 	private editor: ICodeEditor;
 	private action: EditorAction;
@@ -96,43 +148,7 @@ class UIEditorAction extends Action {
 	}
 }
 
-enum ChangeType {
-	Modify,
-	Add,
-	Delete
-}
-
-function getChangeType(change: IChange): ChangeType {
-	if (change.originalEndLineNumber === 0) {
-		return ChangeType.Add;
-	} else if (change.modifiedEndLineNumber === 0) {
-		return ChangeType.Delete;
-	} else {
-		return ChangeType.Modify;
-	}
-}
-
-function getChangeTypeColor(theme: IColorTheme, changeType: ChangeType): Color | undefined {
-	switch (changeType) {
-		case ChangeType.Modify: return theme.getColor(editorGutterModifiedBackground);
-		case ChangeType.Add: return theme.getColor(editorGutterAddedBackground);
-		case ChangeType.Delete: return theme.getColor(editorGutterDeletedBackground);
-	}
-}
-
-function getOuterEditorFromDiffEditor(accessor: ServicesAccessor): ICodeEditor | null {
-	const diffEditors = accessor.get(ICodeEditorService).listDiffEditors();
-
-	for (const diffEditor of diffEditors) {
-		if (diffEditor.hasTextFocus() && diffEditor instanceof EmbeddedDiffEditorWidget) {
-			return diffEditor.getParentEditor();
-		}
-	}
-
-	return getOuterEditor(accessor);
-}
-
-class DirtyDiffWidget extends PeekViewWidget {
+class QuickDiffWidget extends PeekViewWidget {
 
 	private diffEditor!: EmbeddedDiffEditorWidget;
 	private title: string;
@@ -141,12 +157,12 @@ class DirtyDiffWidget extends PeekViewWidget {
 	private _provider: string = '';
 	private change: IChange | undefined;
 	private height: number | undefined = undefined;
-	private dropdown: SwitchQuickDiffViewItem | undefined;
+	private dropdown: QuickDiffPickerViewItem | undefined;
 	private dropdownContainer: HTMLElement | undefined;
 
 	constructor(
 		editor: ICodeEditor,
-		private model: DirtyDiffModel,
+		private model: QuickDiffModel,
 		@IThemeService private readonly themeService: IThemeService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IMenuService private readonly menuService: IMenuService,
@@ -297,8 +313,8 @@ class DirtyDiffWidget extends PeekViewWidget {
 		if (!this._actionbarWidget) {
 			return;
 		}
-		const previous = this.instantiationService.createInstance(UIEditorAction, this.editor, new ShowPreviousChangeAction(this.editor), ThemeIcon.asClassName(gotoPreviousLocation));
-		const next = this.instantiationService.createInstance(UIEditorAction, this.editor, new ShowNextChangeAction(this.editor), ThemeIcon.asClassName(gotoNextLocation));
+		const previous = this.instantiationService.createInstance(QuickDiffWidgetEditorAction, this.editor, new ShowPreviousChangeAction(this.editor), ThemeIcon.asClassName(gotoPreviousLocation));
+		const next = this.instantiationService.createInstance(QuickDiffWidgetEditorAction, this.editor, new ShowNextChangeAction(this.editor), ThemeIcon.asClassName(gotoNextLocation));
 
 		this._disposables.add(previous);
 		this._disposables.add(next);
@@ -318,18 +334,18 @@ class DirtyDiffWidget extends PeekViewWidget {
 		super._fillHead(container, true);
 
 		this.dropdownContainer = dom.prepend(this._titleElement!, dom.$('.dropdown'));
-		this.dropdown = this.instantiationService.createInstance(SwitchQuickDiffViewItem, new SwitchQuickDiffBaseAction((event?: IQuickDiffSelectItem) => this.switchQuickDiff(event)),
+		this.dropdown = this.instantiationService.createInstance(QuickDiffPickerViewItem, new QuickDiffPickerBaseAction((event?: IQuickDiffSelectItem) => this.switchQuickDiff(event)),
 			this.model.quickDiffs.map(quickDiffer => quickDiffer.label), this.model.changes[this._index].label);
 		this.dropdown.render(this.dropdownContainer);
 		this.updateActions();
 	}
 
 	protected override _getActionBarOptions(): IActionBarOptions {
-		const actionRunner = new DiffActionRunner();
+		const actionRunner = new QuickDiffWidgetActionRunner();
 
 		// close widget on successful action
 		actionRunner.onDidRun(e => {
-			if (!(e.action instanceof UIEditorAction) && !e.error) {
+			if (!(e.action instanceof QuickDiffWidgetEditorAction) && !e.error) {
 				this.dispose();
 			}
 		});
@@ -426,231 +442,17 @@ class DirtyDiffWidget extends PeekViewWidget {
 	}
 }
 
-export class ShowPreviousChangeAction extends EditorAction {
-
-	constructor(private readonly outerEditor?: ICodeEditor) {
-		super({
-			id: 'editor.action.dirtydiff.previous',
-			label: nls.localize2('show previous change', "Show Previous Change"),
-			precondition: TextCompareEditorActiveContext.toNegated(),
-			kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
-		});
-	}
-
-	run(accessor: ServicesAccessor): void {
-		const outerEditor = this.outerEditor ?? getOuterEditorFromDiffEditor(accessor);
-
-		if (!outerEditor) {
-			return;
-		}
-
-		const controller = DirtyDiffController.get(outerEditor);
-
-		if (!controller) {
-			return;
-		}
+export class QuickDiffEditorController extends Disposable implements IEditorContribution {
 
-		if (!controller.canNavigate()) {
-			return;
-		}
+	public static readonly ID = 'editor.contrib.quickdiff';
 
-		controller.previous();
+	static get(editor: ICodeEditor): QuickDiffEditorController | null {
+		return editor.getContribution<QuickDiffEditorController>(QuickDiffEditorController.ID);
 	}
-}
-registerEditorAction(ShowPreviousChangeAction);
-
-export class ShowNextChangeAction extends EditorAction {
 
-	constructor(private readonly outerEditor?: ICodeEditor) {
-		super({
-			id: 'editor.action.dirtydiff.next',
-			label: nls.localize2('show next change', "Show Next Change"),
-			precondition: TextCompareEditorActiveContext.toNegated(),
-			kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
-		});
-	}
-
-	run(accessor: ServicesAccessor): void {
-		const outerEditor = this.outerEditor ?? getOuterEditorFromDiffEditor(accessor);
-
-		if (!outerEditor) {
-			return;
-		}
-
-		const controller = DirtyDiffController.get(outerEditor);
-
-		if (!controller) {
-			return;
-		}
-
-		if (!controller.canNavigate()) {
-			return;
-		}
-
-		controller.next();
-	}
-}
-registerEditorAction(ShowNextChangeAction);
-
-// Go to menu
-MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
-	group: '7_change_nav',
-	command: {
-		id: 'editor.action.dirtydiff.next',
-		title: nls.localize({ key: 'miGotoNextChange', comment: ['&& denotes a mnemonic'] }, "Next &&Change")
-	},
-	order: 1
-});
-
-MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
-	group: '7_change_nav',
-	command: {
-		id: 'editor.action.dirtydiff.previous',
-		title: nls.localize({ key: 'miGotoPreviousChange', comment: ['&& denotes a mnemonic'] }, "Previous &&Change")
-	},
-	order: 2
-});
-
-export class GotoPreviousChangeAction extends EditorAction {
-
-	constructor() {
-		super({
-			id: 'workbench.action.editor.previousChange',
-			label: nls.localize2('move to previous change', "Go to Previous Change"),
-			precondition: TextCompareEditorActiveContext.toNegated(),
-			kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
-		});
-	}
-
-	async run(accessor: ServicesAccessor): Promise<void> {
-		const outerEditor = getOuterEditorFromDiffEditor(accessor);
-		const accessibilitySignalService = accessor.get(IAccessibilitySignalService);
-		const accessibilityService = accessor.get(IAccessibilityService);
-		const codeEditorService = accessor.get(ICodeEditorService);
-		const dirtyDiffModelService = accessor.get(IDirtyDiffModelService);
-
-		if (!outerEditor || !outerEditor.hasModel()) {
-			return;
-		}
-
-		const modelRef = dirtyDiffModelService.createDirtyDiffModelReference(outerEditor.getModel().uri);
-		try {
-			if (!modelRef || modelRef.object.changes.length === 0) {
-				return;
-			}
-
-			const lineNumber = outerEditor.getPosition().lineNumber;
-			const index = modelRef.object.findPreviousClosestChange(lineNumber, false);
-			const change = modelRef.object.changes[index];
-			await playAccessibilitySymbolForChange(change.change, accessibilitySignalService);
-			setPositionAndSelection(change.change, outerEditor, accessibilityService, codeEditorService);
-		} finally {
-			modelRef?.dispose();
-		}
-	}
-}
-registerEditorAction(GotoPreviousChangeAction);
-
-export class GotoNextChangeAction extends EditorAction {
-
-	constructor() {
-		super({
-			id: 'workbench.action.editor.nextChange',
-			label: nls.localize2('move to next change', "Go to Next Change"),
-			precondition: TextCompareEditorActiveContext.toNegated(),
-			kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
-		});
-	}
-
-	async run(accessor: ServicesAccessor): Promise<void> {
-		const accessibilitySignalService = accessor.get(IAccessibilitySignalService);
-		const outerEditor = getOuterEditorFromDiffEditor(accessor);
-		const accessibilityService = accessor.get(IAccessibilityService);
-		const codeEditorService = accessor.get(ICodeEditorService);
-		const dirtyDiffModelService = accessor.get(IDirtyDiffModelService);
-
-		if (!outerEditor || !outerEditor.hasModel()) {
-			return;
-		}
-
-		const modelRef = dirtyDiffModelService.createDirtyDiffModelReference(outerEditor.getModel().uri);
-		try {
-			if (!modelRef || modelRef.object.changes.length === 0) {
-				return;
-			}
-
-			const lineNumber = outerEditor.getPosition().lineNumber;
-			const index = modelRef.object.findNextClosestChange(lineNumber, false);
-			const change = modelRef.object.changes[index].change;
-			await playAccessibilitySymbolForChange(change, accessibilitySignalService);
-			setPositionAndSelection(change, outerEditor, accessibilityService, codeEditorService);
-		} finally {
-			modelRef?.dispose();
-		}
-	}
-}
-
-function setPositionAndSelection(change: IChange, editor: ICodeEditor, accessibilityService: IAccessibilityService, codeEditorService: ICodeEditorService) {
-	const position = new Position(change.modifiedStartLineNumber, 1);
-	editor.setPosition(position);
-	editor.revealPositionInCenter(position);
-	if (accessibilityService.isScreenReaderOptimized()) {
-		editor.setSelection({ startLineNumber: change.modifiedStartLineNumber, startColumn: 0, endLineNumber: change.modifiedStartLineNumber, endColumn: Number.MAX_VALUE });
-		codeEditorService.getActiveCodeEditor()?.writeScreenReaderContent('diff-navigation');
-	}
-}
-
-async function playAccessibilitySymbolForChange(change: IChange, accessibilitySignalService: IAccessibilitySignalService) {
-	const changeType = getChangeType(change);
-	switch (changeType) {
-		case ChangeType.Add:
-			accessibilitySignalService.playSignal(AccessibilitySignal.diffLineInserted, { allowManyInParallel: true, source: 'dirtyDiffDecoration' });
-			break;
-		case ChangeType.Delete:
-			accessibilitySignalService.playSignal(AccessibilitySignal.diffLineDeleted, { allowManyInParallel: true, source: 'dirtyDiffDecoration' });
-			break;
-		case ChangeType.Modify:
-			accessibilitySignalService.playSignal(AccessibilitySignal.diffLineModified, { allowManyInParallel: true, source: 'dirtyDiffDecoration' });
-			break;
-	}
-}
-
-registerEditorAction(GotoNextChangeAction);
-
-KeybindingsRegistry.registerCommandAndKeybindingRule({
-	id: 'closeDirtyDiff',
-	weight: KeybindingWeight.EditorContrib + 50,
-	primary: KeyCode.Escape,
-	secondary: [KeyMod.Shift | KeyCode.Escape],
-	when: ContextKeyExpr.and(isDirtyDiffVisible),
-	handler: (accessor: ServicesAccessor) => {
-		const outerEditor = getOuterEditorFromDiffEditor(accessor);
-
-		if (!outerEditor) {
-			return;
-		}
-
-		const controller = DirtyDiffController.get(outerEditor);
-
-		if (!controller) {
-			return;
-		}
-
-		controller.close();
-	}
-});
-
-export class DirtyDiffController extends Disposable implements IEditorContribution {
-
-	public static readonly ID = 'editor.contrib.dirtydiff';
-
-	static get(editor: ICodeEditor): DirtyDiffController | null {
-		return editor.getContribution<DirtyDiffController>(DirtyDiffController.ID);
-	}
-
-	private model: DirtyDiffModel | null = null;
-	private widget: DirtyDiffWidget | null = null;
-	private readonly isDirtyDiffVisible!: IContextKey<boolean>;
+	private model: QuickDiffModel | null = null;
+	private widget: QuickDiffWidget | null = null;
+	private readonly isQuickDiffVisible!: IContextKey<boolean>;
 	private session: IDisposable = Disposable.None;
 	private mouseDownInfo: { lineNumber: number } | null = null;
 	private enabled = false;
@@ -661,7 +463,7 @@ export class DirtyDiffController extends Disposable implements IEditorContributi
 		private editor: ICodeEditor,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IDirtyDiffModelService private readonly dirtyDiffModelService: IDirtyDiffModelService,
+		@IQuickDiffModelService private readonly quickDiffModelService: IQuickDiffModelService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) {
 		super();
@@ -669,7 +471,7 @@ export class DirtyDiffController extends Disposable implements IEditorContributi
 		this.stylesheet = domStylesheetsJs.createStyleSheet(undefined, undefined, this._store);
 
 		if (this.enabled) {
-			this.isDirtyDiffVisible = isDirtyDiffVisible.bindTo(contextKeyService);
+			this.isQuickDiffVisible = isQuickDiffVisible.bindTo(contextKeyService);
 			this._register(editor.onDidChangeModel(() => this.close()));
 
 			const onDidChangeGutterAction = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.diffDecorationsGutterAction'));
@@ -781,7 +583,7 @@ export class DirtyDiffController extends Disposable implements IEditorContributi
 			return false;
 		}
 
-		const modelRef = this.dirtyDiffModelService.createDirtyDiffModelReference(editorModel.uri);
+		const modelRef = this.quickDiffModelService.createQuickDiffModelReference(editorModel.uri);
 
 		if (!modelRef) {
 			return false;
@@ -793,8 +595,8 @@ export class DirtyDiffController extends Disposable implements IEditorContributi
 		}
 
 		this.model = modelRef.object;
-		this.widget = this.instantiationService.createInstance(DirtyDiffWidget, this.editor, this.model);
-		this.isDirtyDiffVisible.set(true);
+		this.widget = this.instantiationService.createInstance(QuickDiffWidget, this.editor, this.model);
+		this.isQuickDiffVisible.set(true);
 
 		const disposables = new DisposableStore();
 		disposables.add(Event.once(this.widget.onDidClose)(this.close, this));
@@ -810,7 +612,7 @@ export class DirtyDiffController extends Disposable implements IEditorContributi
 		disposables.add(toDisposable(() => {
 			this.model = null;
 			this.widget = null;
-			this.isDirtyDiffVisible.set(false);
+			this.isQuickDiffVisible.set(false);
 			this.editor.focus();
 		}));
 
@@ -892,7 +694,7 @@ export class DirtyDiffController extends Disposable implements IEditorContributi
 			return;
 		}
 
-		const modelRef = this.dirtyDiffModelService.createDirtyDiffModelReference(editorModel.uri);
+		const modelRef = this.quickDiffModelService.createQuickDiffModelReference(editorModel.uri);
 
 		if (!modelRef) {
 			return;
@@ -922,350 +724,226 @@ export class DirtyDiffController extends Disposable implements IEditorContributi
 	}
 }
 
-const editorGutterModifiedBackground = registerColor('editorGutter.modifiedBackground', {
-	dark: '#1B81A8',
-	light: '#2090D3',
-	hcDark: '#1B81A8',
-	hcLight: '#2090D3'
-}, nls.localize('editorGutterModifiedBackground', "Editor gutter background color for lines that are modified."));
-
-const editorGutterAddedBackground = registerColor('editorGutter.addedBackground', {
-	dark: '#487E02',
-	light: '#48985D',
-	hcDark: '#487E02',
-	hcLight: '#48985D'
-}, nls.localize('editorGutterAddedBackground', "Editor gutter background color for lines that are added."));
-
-const editorGutterDeletedBackground = registerColor('editorGutter.deletedBackground', editorErrorForeground, nls.localize('editorGutterDeletedBackground', "Editor gutter background color for lines that are deleted."));
-
-export const minimapGutterModifiedBackground = registerColor('minimapGutter.modifiedBackground', editorGutterModifiedBackground, nls.localize('minimapGutterModifiedBackground', "Minimap gutter background color for lines that are modified."));
-
-export const minimapGutterAddedBackground = registerColor('minimapGutter.addedBackground', editorGutterAddedBackground, nls.localize('minimapGutterAddedBackground', "Minimap gutter background color for lines that are added."));
-
-export const minimapGutterDeletedBackground = registerColor('minimapGutter.deletedBackground', editorGutterDeletedBackground, nls.localize('minimapGutterDeletedBackground', "Minimap gutter background color for lines that are deleted."));
-
-export const overviewRulerModifiedForeground = registerColor('editorOverviewRuler.modifiedForeground', transparent(editorGutterModifiedBackground, 0.6), nls.localize('overviewRulerModifiedForeground', 'Overview ruler marker color for modified content.'));
-export const overviewRulerAddedForeground = registerColor('editorOverviewRuler.addedForeground', transparent(editorGutterAddedBackground, 0.6), nls.localize('overviewRulerAddedForeground', 'Overview ruler marker color for added content.'));
-export const overviewRulerDeletedForeground = registerColor('editorOverviewRuler.deletedForeground', transparent(editorGutterDeletedBackground, 0.6), nls.localize('overviewRulerDeletedForeground', 'Overview ruler marker color for deleted content.'));
+export class ShowPreviousChangeAction extends EditorAction {
 
-class DirtyDiffDecorator extends Disposable {
+	constructor(private readonly outerEditor?: ICodeEditor) {
+		super({
+			id: 'editor.action.dirtydiff.previous',
+			label: nls.localize2('show previous change', "Show Previous Change"),
+			precondition: TextCompareEditorActiveContext.toNegated(),
+			kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
+		});
+	}
 
-	static createDecoration(className: string, tooltip: string | null, options: { gutter: boolean; overview: { active: boolean; color: string }; minimap: { active: boolean; color: string }; isWholeLine: boolean }): ModelDecorationOptions {
-		const decorationOptions: IModelDecorationOptions = {
-			description: 'dirty-diff-decoration',
-			isWholeLine: options.isWholeLine,
-		};
+	run(accessor: ServicesAccessor): void {
+		const outerEditor = this.outerEditor ?? getOuterEditorFromDiffEditor(accessor);
 
-		if (options.gutter) {
-			decorationOptions.linesDecorationsClassName = `dirty-diff-glyph ${className}`;
-			decorationOptions.linesDecorationsTooltip = tooltip;
+		if (!outerEditor) {
+			return;
 		}
 
-		if (options.overview.active) {
-			decorationOptions.overviewRuler = {
-				color: themeColorFromId(options.overview.color),
-				position: OverviewRulerLane.Left
-			};
+		const controller = QuickDiffEditorController.get(outerEditor);
+
+		if (!controller) {
+			return;
 		}
 
-		if (options.minimap.active) {
-			decorationOptions.minimap = {
-				color: themeColorFromId(options.minimap.color),
-				position: MinimapPosition.Gutter
-			};
+		if (!controller.canNavigate()) {
+			return;
 		}
 
-		return ModelDecorationOptions.createDynamic(decorationOptions);
+		controller.previous();
 	}
+}
+registerEditorAction(ShowPreviousChangeAction);
 
-	private addedOptions: ModelDecorationOptions;
-	private addedPatternOptions: ModelDecorationOptions;
-	private modifiedOptions: ModelDecorationOptions;
-	private modifiedPatternOptions: ModelDecorationOptions;
-	private deletedOptions: ModelDecorationOptions;
-	private decorationsCollection: IEditorDecorationsCollection | undefined;
-
-	constructor(
-		private readonly codeEditor: ICodeEditor,
-		private readonly dirtyDiffModelRef: IReference<DirtyDiffModel>,
-		@IConfigurationService private readonly configurationService: IConfigurationService
-	) {
-		super();
+export class ShowNextChangeAction extends EditorAction {
 
-		const decorations = configurationService.getValue<string>('scm.diffDecorations');
-		const gutter = decorations === 'all' || decorations === 'gutter';
-		const overview = decorations === 'all' || decorations === 'overview';
-		const minimap = decorations === 'all' || decorations === 'minimap';
-
-		const diffAdded = nls.localize('diffAdded', 'Added lines');
-		this.addedOptions = DirtyDiffDecorator.createDecoration('dirty-diff-added', diffAdded, {
-			gutter,
-			overview: { active: overview, color: overviewRulerAddedForeground },
-			minimap: { active: minimap, color: minimapGutterAddedBackground },
-			isWholeLine: true
-		});
-		this.addedPatternOptions = DirtyDiffDecorator.createDecoration('dirty-diff-added-pattern', diffAdded, {
-			gutter,
-			overview: { active: overview, color: overviewRulerAddedForeground },
-			minimap: { active: minimap, color: minimapGutterAddedBackground },
-			isWholeLine: true
-		});
-		const diffModified = nls.localize('diffModified', 'Changed lines');
-		this.modifiedOptions = DirtyDiffDecorator.createDecoration('dirty-diff-modified', diffModified, {
-			gutter,
-			overview: { active: overview, color: overviewRulerModifiedForeground },
-			minimap: { active: minimap, color: minimapGutterModifiedBackground },
-			isWholeLine: true
-		});
-		this.modifiedPatternOptions = DirtyDiffDecorator.createDecoration('dirty-diff-modified-pattern', diffModified, {
-			gutter,
-			overview: { active: overview, color: overviewRulerModifiedForeground },
-			minimap: { active: minimap, color: minimapGutterModifiedBackground },
-			isWholeLine: true
-		});
-		this.deletedOptions = DirtyDiffDecorator.createDecoration('dirty-diff-deleted', nls.localize('diffDeleted', 'Removed lines'), {
-			gutter,
-			overview: { active: overview, color: overviewRulerDeletedForeground },
-			minimap: { active: minimap, color: minimapGutterDeletedBackground },
-			isWholeLine: false
+	constructor(private readonly outerEditor?: ICodeEditor) {
+		super({
+			id: 'editor.action.dirtydiff.next',
+			label: nls.localize2('show next change', "Show Next Change"),
+			precondition: TextCompareEditorActiveContext.toNegated(),
+			kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
 		});
-
-		this._register(configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration('scm.diffDecorationsGutterPattern')) {
-				this.onDidChange();
-			}
-		}));
-
-		this._register(Event.runAndSubscribe(this.dirtyDiffModelRef.object.onDidChange, () => this.onDidChange()));
 	}
 
-	private onDidChange(): void {
-		if (!this.codeEditor.hasModel()) {
+	run(accessor: ServicesAccessor): void {
+		const outerEditor = this.outerEditor ?? getOuterEditorFromDiffEditor(accessor);
+
+		if (!outerEditor) {
 			return;
 		}
 
-		const visibleQuickDiffs = this.dirtyDiffModelRef.object.quickDiffs.filter(quickDiff => quickDiff.visible);
-		const pattern = this.configurationService.getValue<{ added: boolean; modified: boolean }>('scm.diffDecorationsGutterPattern');
-
-		const decorations = this.dirtyDiffModelRef.object.changes
-			.filter(labeledChange => visibleQuickDiffs.some(quickDiff => quickDiff.label === labeledChange.label))
-			.map((labeledChange) => {
-				const change = labeledChange.change;
-				const changeType = getChangeType(change);
-				const startLineNumber = change.modifiedStartLineNumber;
-				const endLineNumber = change.modifiedEndLineNumber || startLineNumber;
-
-				switch (changeType) {
-					case ChangeType.Add:
-						return {
-							range: {
-								startLineNumber: startLineNumber, startColumn: 1,
-								endLineNumber: endLineNumber, endColumn: 1
-							},
-							options: pattern.added ? this.addedPatternOptions : this.addedOptions
-						};
-					case ChangeType.Delete:
-						return {
-							range: {
-								startLineNumber: startLineNumber, startColumn: Number.MAX_VALUE,
-								endLineNumber: startLineNumber, endColumn: Number.MAX_VALUE
-							},
-							options: this.deletedOptions
-						};
-					case ChangeType.Modify:
-						return {
-							range: {
-								startLineNumber: startLineNumber, startColumn: 1,
-								endLineNumber: endLineNumber, endColumn: 1
-							},
-							options: pattern.modified ? this.modifiedPatternOptions : this.modifiedOptions
-						};
-				}
-			});
+		const controller = QuickDiffEditorController.get(outerEditor);
 
-		if (!this.decorationsCollection) {
-			this.decorationsCollection = this.codeEditor.createDecorationsCollection(decorations);
-		} else {
-			this.decorationsCollection.set(decorations);
+		if (!controller) {
+			return;
 		}
-	}
 
-	override dispose(): void {
-		if (this.decorationsCollection) {
-			this.decorationsCollection?.clear();
+		if (!controller.canNavigate()) {
+			return;
 		}
-		this.decorationsCollection = undefined;
-		this.dirtyDiffModelRef.dispose();
-		super.dispose();
-	}
-}
-
-export async function getOriginalResource(quickDiffService: IQuickDiffService, uri: URI, language: string | undefined, isSynchronized: boolean | undefined): Promise<URI | null> {
-	const quickDiffs = await quickDiffService.getQuickDiffs(uri, language, isSynchronized);
-	return quickDiffs.length > 0 ? quickDiffs[0].originalResource : null;
-}
 
-interface DirtyDiffWorkbenchControllerViewState {
-	readonly width: number;
-	readonly visibility: 'always' | 'hover';
+		controller.next();
+	}
 }
+registerEditorAction(ShowNextChangeAction);
 
-export class DirtyDiffWorkbenchController extends Disposable implements IWorkbenchContribution {
-
-	private enabled = false;
-
-	// Resource URI -> Code Editor Id -> Decoration (Disposable)
-	private readonly decorators = new ResourceMap<DisposableMap<string>>();
-	private viewState: DirtyDiffWorkbenchControllerViewState = { width: 3, visibility: 'always' };
-	private readonly transientDisposables = this._register(new DisposableStore());
-	private readonly stylesheet: HTMLStyleElement;
-
-	constructor(
-		@IEditorService private readonly editorService: IEditorService,
-		@IConfigurationService private readonly configurationService: IConfigurationService,
-		@IDirtyDiffModelService private readonly dirtyDiffModelService: IDirtyDiffModelService,
-		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
-	) {
-		super();
-		this.stylesheet = domStylesheetsJs.createStyleSheet(undefined, undefined, this._store);
-
-		const onDidChangeConfiguration = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.diffDecorations'));
-		this._register(onDidChangeConfiguration(this.onDidChangeConfiguration, this));
-		this.onDidChangeConfiguration();
-
-		const onDidChangeDiffWidthConfiguration = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.diffDecorationsGutterWidth'));
-		this._register(onDidChangeDiffWidthConfiguration(this.onDidChangeDiffWidthConfiguration, this));
-		this.onDidChangeDiffWidthConfiguration();
+export class GotoPreviousChangeAction extends EditorAction {
 
-		const onDidChangeDiffVisibilityConfiguration = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.diffDecorationsGutterVisibility'));
-		this._register(onDidChangeDiffVisibilityConfiguration(this.onDidChangeDiffVisibilityConfiguration, this));
-		this.onDidChangeDiffVisibilityConfiguration();
+	constructor() {
+		super({
+			id: 'workbench.action.editor.previousChange',
+			label: nls.localize2('move to previous change', "Go to Previous Change"),
+			precondition: TextCompareEditorActiveContext.toNegated(),
+			kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
+		});
 	}
 
-	private onDidChangeConfiguration(): void {
-		const enabled = this.configurationService.getValue<string>('scm.diffDecorations') !== 'none';
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const outerEditor = getOuterEditorFromDiffEditor(accessor);
+		const accessibilitySignalService = accessor.get(IAccessibilitySignalService);
+		const accessibilityService = accessor.get(IAccessibilityService);
+		const codeEditorService = accessor.get(ICodeEditorService);
+		const quickDiffModelService = accessor.get(IQuickDiffModelService);
 
-		if (enabled) {
-			this.enable();
-		} else {
-			this.disable();
+		if (!outerEditor || !outerEditor.hasModel()) {
+			return;
 		}
-	}
 
-	private onDidChangeDiffWidthConfiguration(): void {
-		let width = this.configurationService.getValue<number>('scm.diffDecorationsGutterWidth');
+		const modelRef = quickDiffModelService.createQuickDiffModelReference(outerEditor.getModel().uri);
+		try {
+			if (!modelRef || modelRef.object.changes.length === 0) {
+				return;
+			}
 
-		if (isNaN(width) || width <= 0 || width > 5) {
-			width = 3;
+			const lineNumber = outerEditor.getPosition().lineNumber;
+			const index = modelRef.object.findPreviousClosestChange(lineNumber, false);
+			const change = modelRef.object.changes[index];
+			await playAccessibilitySymbolForChange(change.change, accessibilitySignalService);
+			setPositionAndSelection(change.change, outerEditor, accessibilityService, codeEditorService);
+		} finally {
+			modelRef?.dispose();
 		}
-
-		this.setViewState({ ...this.viewState, width });
 	}
+}
+registerEditorAction(GotoPreviousChangeAction);
 
-	private onDidChangeDiffVisibilityConfiguration(): void {
-		const visibility = this.configurationService.getValue<'always' | 'hover'>('scm.diffDecorationsGutterVisibility');
-		this.setViewState({ ...this.viewState, visibility });
-	}
+export class GotoNextChangeAction extends EditorAction {
 
-	private setViewState(state: DirtyDiffWorkbenchControllerViewState): void {
-		this.viewState = state;
-		this.stylesheet.textContent = `
-			.monaco-editor .dirty-diff-added,
-			.monaco-editor .dirty-diff-modified {
-				border-left-width:${state.width}px;
-			}
-			.monaco-editor .dirty-diff-added-pattern,
-			.monaco-editor .dirty-diff-added-pattern:before,
-			.monaco-editor .dirty-diff-modified-pattern,
-			.monaco-editor .dirty-diff-modified-pattern:before {
-				background-size: ${state.width}px ${state.width}px;
-			}
-			.monaco-editor .dirty-diff-added,
-			.monaco-editor .dirty-diff-added-pattern,
-			.monaco-editor .dirty-diff-modified,
-			.monaco-editor .dirty-diff-modified-pattern,
-			.monaco-editor .dirty-diff-deleted {
-				opacity: ${state.visibility === 'always' ? 1 : 0};
-			}
-		`;
+	constructor() {
+		super({
+			id: 'workbench.action.editor.nextChange',
+			label: nls.localize2('move to next change', "Go to Next Change"),
+			precondition: TextCompareEditorActiveContext.toNegated(),
+			kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
+		});
 	}
 
-	private enable(): void {
-		if (this.enabled) {
-			this.disable();
-		}
-
-		this.transientDisposables.add(Event.any(this.editorService.onDidCloseEditor, this.editorService.onDidVisibleEditorsChange)(() => this.onEditorsChanged()));
-		this.onEditorsChanged();
-		this.enabled = true;
-	}
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const accessibilitySignalService = accessor.get(IAccessibilitySignalService);
+		const outerEditor = getOuterEditorFromDiffEditor(accessor);
+		const accessibilityService = accessor.get(IAccessibilityService);
+		const codeEditorService = accessor.get(ICodeEditorService);
+		const quickDiffModelService = accessor.get(IQuickDiffModelService);
 
-	private disable(): void {
-		if (!this.enabled) {
+		if (!outerEditor || !outerEditor.hasModel()) {
 			return;
 		}
 
-		this.transientDisposables.clear();
+		const modelRef = quickDiffModelService.createQuickDiffModelReference(outerEditor.getModel().uri);
+		try {
+			if (!modelRef || modelRef.object.changes.length === 0) {
+				return;
+			}
 
-		for (const [uri, decoratorMap] of this.decorators.entries()) {
-			decoratorMap.dispose();
-			this.decorators.delete(uri);
+			const lineNumber = outerEditor.getPosition().lineNumber;
+			const index = modelRef.object.findNextClosestChange(lineNumber, false);
+			const change = modelRef.object.changes[index].change;
+			await playAccessibilitySymbolForChange(change, accessibilitySignalService);
+			setPositionAndSelection(change, outerEditor, accessibilityService, codeEditorService);
+		} finally {
+			modelRef?.dispose();
 		}
-
-		this.enabled = false;
 	}
+}
+registerEditorAction(GotoNextChangeAction);
 
-	private onEditorsChanged(): void {
-		for (const editor of this.editorService.visibleTextEditorControls) {
-			if (!isCodeEditor(editor)) {
-				continue;
-			}
+MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
+	group: '7_change_nav',
+	command: {
+		id: 'editor.action.dirtydiff.next',
+		title: nls.localize({ key: 'miGotoNextChange', comment: ['&& denotes a mnemonic'] }, "Next &&Change")
+	},
+	order: 1
+});
 
-			const textModel = editor.getModel();
-			if (!textModel) {
-				continue;
-			}
+MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
+	group: '7_change_nav',
+	command: {
+		id: 'editor.action.dirtydiff.previous',
+		title: nls.localize({ key: 'miGotoPreviousChange', comment: ['&& denotes a mnemonic'] }, "Previous &&Change")
+	},
+	order: 2
+});
 
-			const editorId = editor.getId();
-			if (this.decorators.get(textModel.uri)?.has(editorId)) {
-				continue;
-			}
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'closeQuickDiff',
+	weight: KeybindingWeight.EditorContrib + 50,
+	primary: KeyCode.Escape,
+	secondary: [KeyMod.Shift | KeyCode.Escape],
+	when: ContextKeyExpr.and(isQuickDiffVisible),
+	handler: (accessor: ServicesAccessor) => {
+		const outerEditor = getOuterEditorFromDiffEditor(accessor);
 
-			const dirtyDiffModelRef = this.dirtyDiffModelService.createDirtyDiffModelReference(textModel.uri);
-			if (!dirtyDiffModelRef) {
-				continue;
-			}
+		if (!outerEditor) {
+			return;
+		}
 
-			if (!this.decorators.has(textModel.uri)) {
-				this.decorators.set(textModel.uri, new DisposableMap<string>());
-			}
+		const controller = QuickDiffEditorController.get(outerEditor);
 
-			this.decorators.get(textModel.uri)!.set(editorId, new DirtyDiffDecorator(editor, dirtyDiffModelRef, this.configurationService));
+		if (!controller) {
+			return;
 		}
 
-		// Dispose decorators for editors that are no longer visible.
-		for (const [uri, decoratorMap] of this.decorators.entries()) {
-			for (const editorId of decoratorMap.keys()) {
-				const codeEditor = this.editorService.visibleTextEditorControls
-					.find(editor => isCodeEditor(editor) && editor.getId() === editorId &&
-						this.uriIdentityService.extUri.isEqual(editor.getModel()?.uri, uri));
-
-				if (!codeEditor) {
-					decoratorMap.deleteAndDispose(editorId);
-				}
-			}
+		controller.close();
+	}
+});
 
-			if (decoratorMap.size === 0) {
-				decoratorMap.dispose();
-				this.decorators.delete(uri);
-			}
-		}
+function setPositionAndSelection(change: IChange, editor: ICodeEditor, accessibilityService: IAccessibilityService, codeEditorService: ICodeEditorService) {
+	const position = new Position(change.modifiedStartLineNumber, 1);
+	editor.setPosition(position);
+	editor.revealPositionInCenter(position);
+	if (accessibilityService.isScreenReaderOptimized()) {
+		editor.setSelection({ startLineNumber: change.modifiedStartLineNumber, startColumn: 0, endLineNumber: change.modifiedStartLineNumber, endColumn: Number.MAX_VALUE });
+		codeEditorService.getActiveCodeEditor()?.writeScreenReaderContent('diff-navigation');
 	}
+}
 
-	override dispose(): void {
-		this.disable();
-		super.dispose();
+async function playAccessibilitySymbolForChange(change: IChange, accessibilitySignalService: IAccessibilitySignalService) {
+	const changeType = getChangeType(change);
+	switch (changeType) {
+		case ChangeType.Add:
+			accessibilitySignalService.playSignal(AccessibilitySignal.diffLineInserted, { allowManyInParallel: true, source: 'quickDiffDecoration' });
+			break;
+		case ChangeType.Delete:
+			accessibilitySignalService.playSignal(AccessibilitySignal.diffLineDeleted, { allowManyInParallel: true, source: 'quickDiffDecoration' });
+			break;
+		case ChangeType.Modify:
+			accessibilitySignalService.playSignal(AccessibilitySignal.diffLineModified, { allowManyInParallel: true, source: 'quickDiffDecoration' });
+			break;
 	}
 }
 
-registerEditorContribution(DirtyDiffController.ID, DirtyDiffController, EditorContributionInstantiation.AfterFirstRender);
+function getOuterEditorFromDiffEditor(accessor: ServicesAccessor): ICodeEditor | null {
+	const diffEditors = accessor.get(ICodeEditorService).listDiffEditors();
+
+	for (const diffEditor of diffEditors) {
+		if (diffEditor.hasTextFocus() && diffEditor instanceof EmbeddedDiffEditorWidget) {
+			return diffEditor.getParentEditor();
+		}
+	}
+
+	return getOuterEditor(accessor);
+}
diff --git a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
index d7e997d29ff..0c2d7c1af5f 100644
--- a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
+++ b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
@@ -6,7 +6,7 @@
 import { localize, localize2 } from '../../../../nls.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { IWorkbenchContributionsRegistry, registerWorkbenchContribution2, Extensions as WorkbenchExtensions, WorkbenchPhase } from '../../../common/contributions.js';
-import { DirtyDiffWorkbenchController } from './dirtydiffDecorator.js';
+import { QuickDiffWorkbenchController } from './quickDiffDecorator.js';
 import { VIEWLET_ID, ISCMService, VIEW_PANE_ID, ISCMProvider, ISCMViewService, REPOSITORIES_VIEW_PANE_ID, HISTORY_VIEW_PANE_ID } from '../common/scm.js';
 import { KeyMod, KeyCode } from '../../../../base/common/keyCodes.js';
 import { MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
@@ -40,7 +40,9 @@ import { isSCMRepository } from './util.js';
 import { SCMHistoryViewPane } from './scmHistoryViewPane.js';
 import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
 import { RemoteNameContext } from '../../../common/contextkeys.js';
-import { DirtyDiffModelService, IDirtyDiffModelService } from './dirtyDiffModel.js';
+import { QuickDiffModelService, IQuickDiffModelService } from './quickDiffModel.js';
+import { QuickDiffEditorController } from './quickDiffWidget.js';
+import { EditorContributionInstantiation, registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
 
 ModesRegistry.registerLanguage({
 	id: 'scminput',
@@ -50,7 +52,10 @@ ModesRegistry.registerLanguage({
 });
 
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
-	.registerWorkbenchContribution(DirtyDiffWorkbenchController, LifecyclePhase.Restored);
+	.registerWorkbenchContribution(QuickDiffWorkbenchController, LifecyclePhase.Restored);
+
+registerEditorContribution(QuickDiffEditorController.ID,
+	QuickDiffEditorController, EditorContributionInstantiation.AfterFirstRender);
 
 const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, localize('sourceControlViewIcon', 'View icon of the Source Control view.'));
 
@@ -597,4 +602,4 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 registerSingleton(ISCMService, SCMService, InstantiationType.Delayed);
 registerSingleton(ISCMViewService, SCMViewService, InstantiationType.Delayed);
 registerSingleton(IQuickDiffService, QuickDiffService, InstantiationType.Delayed);
-registerSingleton(IDirtyDiffModelService, DirtyDiffModelService, InstantiationType.Delayed);
+registerSingleton(IQuickDiffModelService, QuickDiffModelService, InstantiationType.Delayed);
diff --git a/src/vs/workbench/contrib/scm/common/quickDiff.ts b/src/vs/workbench/contrib/scm/common/quickDiff.ts
index 3770f071c72..55cd69561f0 100644
--- a/src/vs/workbench/contrib/scm/common/quickDiff.ts
+++ b/src/vs/workbench/contrib/scm/common/quickDiff.ts
@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as nls from '../../../../nls.js';
+
 import { URI } from '../../../../base/common/uri.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { IDisposable } from '../../../../base/common/lifecycle.js';
@@ -10,9 +12,39 @@ import { LanguageSelector } from '../../../../editor/common/languageSelector.js'
 import { Event } from '../../../../base/common/event.js';
 import { LineRangeMapping } from '../../../../editor/common/diff/rangeMapping.js';
 import { IChange } from '../../../../editor/common/diff/legacyLinesDiffComputer.js';
+import { IColorTheme } from '../../../../platform/theme/common/themeService.js';
+import { Color } from '../../../../base/common/color.js';
+import { editorErrorForeground, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
 
 export const IQuickDiffService = createDecorator<IQuickDiffService>('quickDiff');
 
+const editorGutterModifiedBackground = registerColor('editorGutter.modifiedBackground', {
+	dark: '#1B81A8', light: '#2090D3', hcDark: '#1B81A8', hcLight: '#2090D3'
+}, nls.localize('editorGutterModifiedBackground', "Editor gutter background color for lines that are modified."));
+
+const editorGutterAddedBackground = registerColor('editorGutter.addedBackground', {
+	dark: '#487E02', light: '#48985D', hcDark: '#487E02', hcLight: '#48985D'
+}, nls.localize('editorGutterAddedBackground', "Editor gutter background color for lines that are added."));
+
+const editorGutterDeletedBackground = registerColor('editorGutter.deletedBackground',
+	editorErrorForeground, nls.localize('editorGutterDeletedBackground', "Editor gutter background color for lines that are deleted."));
+
+export const minimapGutterModifiedBackground = registerColor('minimapGutter.modifiedBackground',
+	editorGutterModifiedBackground, nls.localize('minimapGutterModifiedBackground', "Minimap gutter background color for lines that are modified."));
+
+export const minimapGutterAddedBackground = registerColor('minimapGutter.addedBackground',
+	editorGutterAddedBackground, nls.localize('minimapGutterAddedBackground', "Minimap gutter background color for lines that are added."));
+
+export const minimapGutterDeletedBackground = registerColor('minimapGutter.deletedBackground',
+	editorGutterDeletedBackground, nls.localize('minimapGutterDeletedBackground', "Minimap gutter background color for lines that are deleted."));
+
+export const overviewRulerModifiedForeground = registerColor('editorOverviewRuler.modifiedForeground',
+	transparent(editorGutterModifiedBackground, 0.6), nls.localize('overviewRulerModifiedForeground', 'Overview ruler marker color for modified content.'));
+export const overviewRulerAddedForeground = registerColor('editorOverviewRuler.addedForeground',
+	transparent(editorGutterAddedBackground, 0.6), nls.localize('overviewRulerAddedForeground', 'Overview ruler marker color for added content.'));
+export const overviewRulerDeletedForeground = registerColor('editorOverviewRuler.deletedForeground',
+	transparent(editorGutterDeletedBackground, 0.6), nls.localize('overviewRulerDeletedForeground', 'Overview ruler marker color for deleted content.'));
+
 export interface QuickDiffProvider {
 	label: string;
 	rootUri: URI | undefined;
@@ -52,3 +84,79 @@ export interface IQuickDiffService {
 	addQuickDiffProvider(quickDiff: QuickDiffProvider): IDisposable;
 	getQuickDiffs(uri: URI, language?: string, isSynchronized?: boolean): Promise<QuickDiff[]>;
 }
+
+export enum ChangeType {
+	Modify,
+	Add,
+	Delete
+}
+
+export function getChangeType(change: IChange): ChangeType {
+	if (change.originalEndLineNumber === 0) {
+		return ChangeType.Add;
+	} else if (change.modifiedEndLineNumber === 0) {
+		return ChangeType.Delete;
+	} else {
+		return ChangeType.Modify;
+	}
+}
+
+export function getChangeTypeColor(theme: IColorTheme, changeType: ChangeType): Color | undefined {
+	switch (changeType) {
+		case ChangeType.Modify: return theme.getColor(editorGutterModifiedBackground);
+		case ChangeType.Add: return theme.getColor(editorGutterAddedBackground);
+		case ChangeType.Delete: return theme.getColor(editorGutterDeletedBackground);
+	}
+}
+
+export function compareChanges(a: IChange, b: IChange): number {
+	let result = a.modifiedStartLineNumber - b.modifiedStartLineNumber;
+
+	if (result !== 0) {
+		return result;
+	}
+
+	result = a.modifiedEndLineNumber - b.modifiedEndLineNumber;
+
+	if (result !== 0) {
+		return result;
+	}
+
+	result = a.originalStartLineNumber - b.originalStartLineNumber;
+
+	if (result !== 0) {
+		return result;
+	}
+
+	return a.originalEndLineNumber - b.originalEndLineNumber;
+}
+
+export function getChangeHeight(change: IChange): number {
+	const modified = change.modifiedEndLineNumber - change.modifiedStartLineNumber + 1;
+	const original = change.originalEndLineNumber - change.originalStartLineNumber + 1;
+
+	if (change.originalEndLineNumber === 0) {
+		return modified;
+	} else if (change.modifiedEndLineNumber === 0) {
+		return original;
+	} else {
+		return modified + original;
+	}
+}
+
+export function getModifiedEndLineNumber(change: IChange): number {
+	if (change.modifiedEndLineNumber === 0) {
+		return change.modifiedStartLineNumber === 0 ? 1 : change.modifiedStartLineNumber;
+	} else {
+		return change.modifiedEndLineNumber;
+	}
+}
+
+export function lineIntersectsChange(lineNumber: number, change: IChange): boolean {
+	// deletion at the beginning of the file
+	if (lineNumber === 1 && change.modifiedStartLineNumber === 0 && change.modifiedEndLineNumber === 0) {
+		return true;
+	}
+
+	return lineNumber >= change.modifiedStartLineNumber && lineNumber <= (change.modifiedEndLineNumber || change.modifiedStartLineNumber);
+}
diff --git a/src/vs/workbench/contrib/scm/common/quickDiffService.ts b/src/vs/workbench/contrib/scm/common/quickDiffService.ts
index 38a9d67a555..5b872ae5722 100644
--- a/src/vs/workbench/contrib/scm/common/quickDiffService.ts
+++ b/src/vs/workbench/contrib/scm/common/quickDiffService.ts
@@ -80,3 +80,8 @@ export class QuickDiffService extends Disposable implements IQuickDiffService {
 		return diffs.filter<QuickDiff>(this.isQuickDiff);
 	}
 }
+
+export async function getOriginalResource(quickDiffService: IQuickDiffService, uri: URI, language: string | undefined, isSynchronized: boolean | undefined): Promise<URI | null> {
+	const quickDiffs = await quickDiffService.getQuickDiffs(uri, language, isSynchronized);
+	return quickDiffs.length > 0 ? quickDiffs[0].originalResource : null;
+}

From d66eb6b82f4fd73db17a4b7cc0799f90a09207bc Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Mon, 9 Dec 2024 11:37:50 +0100
Subject: [PATCH 046/479] fixes
 https://github.com/microsoft/vscode/issues/210254 (#235603)

* fixes https://github.com/microsoft/vscode/issues/213148

* fixes https://github.com/microsoft/vscode/issues/210254
---
 src/vs/base/common/filters.ts                          | 2 +-
 src/vs/editor/contrib/suggest/browser/suggestWidget.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/base/common/filters.ts b/src/vs/base/common/filters.ts
index 2ab6c40126d..aa0b036ac76 100644
--- a/src/vs/base/common/filters.ts
+++ b/src/vs/base/common/filters.ts
@@ -675,7 +675,7 @@ export function fuzzyScore(pattern: string, patternLow: string, patternStart: nu
 			}
 
 			let diagScore = 0;
-			if (score !== Number.MAX_SAFE_INTEGER) {
+			if (score !== Number.MIN_SAFE_INTEGER) {
 				canComeDiag = true;
 				diagScore = score + _table[row - 1][column - 1];
 			}
diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
index 7b728a6e171..048572143b1 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
@@ -928,7 +928,7 @@ export class SuggestWidget implements IDisposable {
 			typicalHalfwidthCharacterWidth: fontInfo.typicalHalfwidthCharacterWidth,
 			verticalPadding: 22,
 			horizontalPadding: 14,
-			defaultSize: new dom.Dimension(430, statusBarHeight + 12 * itemHeight + borderHeight)
+			defaultSize: new dom.Dimension(430, statusBarHeight + 12 * itemHeight)
 		};
 	}
 

From 2299470205bc79ed6a35526384056ed6a90fee8c Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Mon, 9 Dec 2024 12:19:51 +0100
Subject: [PATCH 047/479] Fix separator overlay issue in settings editor
 (#235608)

fixes #203353
---
 .../contrib/preferences/browser/media/settingsEditor2.css     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css b/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css
index 18b04188fc6..aa1fb1c0536 100644
--- a/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css
+++ b/src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css
@@ -151,6 +151,10 @@
 	margin-top: 14px;
 }
 
+.settings-editor > .settings-body > .monaco-split-view2.separator-border .split-view-view:not(:first-child):before {
+	z-index: 16; /* Above sticky scroll */
+}
+
 .settings-editor > .settings-body .settings-toc-container,
 .settings-editor > .settings-body .settings-tree-container {
 	height: 100%;

From abe1f677d0c149a6789c6464ed78c4b362f6b3c8 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Mon, 9 Dec 2024 13:04:01 +0100
Subject: [PATCH 048/479] Fix focus handling during outline control changes
 (#234905)

* fix setting focus when outline is changing control

* :lipstik:
---
 .../workbench/contrib/outline/browser/outlinePane.ts  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/outline/browser/outlinePane.ts b/src/vs/workbench/contrib/outline/browser/outlinePane.ts
index 6149cd6de17..aa34cef4e64 100644
--- a/src/vs/workbench/contrib/outline/browser/outlinePane.ts
+++ b/src/vs/workbench/contrib/outline/browser/outlinePane.ts
@@ -126,8 +126,10 @@ export class OutlinePane extends ViewPane implements IOutlinePane {
 	}
 
 	override focus(): void {
-		super.focus();
-		this._tree?.domFocus();
+		this._editorControlChangePromise.then(() => {
+			super.focus();
+			this._tree?.domFocus();
+		});
 	}
 
 	protected override renderBody(container: HTMLElement): void {
@@ -197,17 +199,18 @@ export class OutlinePane extends ViewPane implements IOutlinePane {
 		return false;
 	}
 
+	private _editorControlChangePromise: Promise<void> = Promise.resolve();
 	private _handleEditorChanged(pane: IEditorPane | undefined): void {
 		this._editorPaneDisposables.clear();
 
 		if (pane) {
 			// react to control changes from within pane (https://github.com/microsoft/vscode/issues/134008)
 			this._editorPaneDisposables.add(pane.onDidChangeControl(() => {
-				this._handleEditorControlChanged(pane);
+				this._editorControlChangePromise = this._handleEditorControlChanged(pane);
 			}));
 		}
 
-		this._handleEditorControlChanged(pane);
+		this._editorControlChangePromise = this._handleEditorControlChanged(pane);
 	}
 
 	private async _handleEditorControlChanged(pane: IEditorPane | undefined): Promise<void> {

From d5746c5593f6afe15e44a9f7877a064df6605d11 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Mon, 9 Dec 2024 14:12:56 +0100
Subject: [PATCH 049/479] Fix inconsistent focus behavior when toggling
 views/panels (#235622)

fix #232790
---
 src/vs/workbench/browser/layout.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index eb8657fba82..782d0f48f38 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -1754,9 +1754,9 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		else if (!hidden && !this.paneCompositeService.getActivePaneComposite(ViewContainerLocation.Sidebar)) {
 			const viewletToOpen = this.paneCompositeService.getLastActivePaneCompositeId(ViewContainerLocation.Sidebar);
 			if (viewletToOpen) {
-				const viewlet = this.paneCompositeService.openPaneComposite(viewletToOpen, ViewContainerLocation.Sidebar, true);
+				const viewlet = this.paneCompositeService.openPaneComposite(viewletToOpen, ViewContainerLocation.Sidebar);
 				if (!viewlet) {
-					this.paneCompositeService.openPaneComposite(this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.Sidebar)?.id, ViewContainerLocation.Sidebar, true);
+					this.paneCompositeService.openPaneComposite(this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.Sidebar)?.id, ViewContainerLocation.Sidebar);
 				}
 			}
 		}
@@ -1895,8 +1895,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			}
 
 			if (panelToOpen) {
-				const focus = !skipLayout;
-				this.paneCompositeService.openPaneComposite(panelToOpen, ViewContainerLocation.Panel, focus);
+				this.paneCompositeService.openPaneComposite(panelToOpen, ViewContainerLocation.Panel);
 			}
 		}
 
@@ -1995,8 +1994,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			}
 
 			if (panelToOpen) {
-				const focus = !skipLayout;
-				this.paneCompositeService.openPaneComposite(panelToOpen, ViewContainerLocation.AuxiliaryBar, focus);
+				this.paneCompositeService.openPaneComposite(panelToOpen, ViewContainerLocation.AuxiliaryBar);
 			}
 		}
 

From 07a9dc6328ea308487036d555553bffe914735f2 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Mon, 9 Dec 2024 15:01:44 +0100
Subject: [PATCH 050/479] IPC transform error cause (#235632)

---
 src/vs/base/common/errors.ts           |  9 ++++-
 src/vs/base/test/common/errors.test.ts | 51 ++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/src/vs/base/common/errors.ts b/src/vs/base/common/errors.ts
index fb18cb9b2e5..a6930ef51cf 100644
--- a/src/vs/base/common/errors.ts
+++ b/src/vs/base/common/errors.ts
@@ -126,20 +126,22 @@ export interface SerializedError {
 	readonly message: string;
 	readonly stack: string;
 	readonly noTelemetry: boolean;
+	readonly cause?: SerializedError;
 }
 
 export function transformErrorForSerialization(error: Error): SerializedError;
 export function transformErrorForSerialization(error: any): any;
 export function transformErrorForSerialization(error: any): any {
 	if (error instanceof Error) {
-		const { name, message } = error;
+		const { name, message, cause } = error;
 		const stack: string = (<any>error).stacktrace || (<any>error).stack;
 		return {
 			$isError: true,
 			name,
 			message,
 			stack,
-			noTelemetry: ErrorNoTelemetry.isErrorNoTelemetry(error)
+			noTelemetry: ErrorNoTelemetry.isErrorNoTelemetry(error),
+			cause: cause ? transformErrorForSerialization(cause) : undefined
 		};
 	}
 
@@ -157,6 +159,9 @@ export function transformErrorFromSerialization(data: SerializedError): Error {
 	}
 	error.message = data.message;
 	error.stack = data.stack;
+	if (data.cause) {
+		error.cause = transformErrorFromSerialization(data.cause);
+	}
 	return error;
 }
 
diff --git a/src/vs/base/test/common/errors.test.ts b/src/vs/base/test/common/errors.test.ts
index 9e33ed81868..9dec9b4d26a 100644
--- a/src/vs/base/test/common/errors.test.ts
+++ b/src/vs/base/test/common/errors.test.ts
@@ -6,6 +6,8 @@
 import assert from 'assert';
 import { toErrorMessage } from '../../common/errorMessage.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
+import { transformErrorForSerialization, transformErrorFromSerialization } from '../../common/errors.js';
+import { assertType } from '../../common/types.js';
 
 suite('Errors', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
@@ -33,4 +35,53 @@ suite('Errors', () => {
 			assert.ok(toErrorMessage(error, true).length > 'An unknown error occurred. Please consult the log for more details.'.length);
 		}
 	});
+
+	test('Transform Error for Serialization', function () {
+		const error = new Error('Test error');
+		const serializedError = transformErrorForSerialization(error);
+		assert.strictEqual(serializedError.name, 'Error');
+		assert.strictEqual(serializedError.message, 'Test error');
+		assert.strictEqual(serializedError.stack, error.stack);
+		assert.strictEqual(serializedError.noTelemetry, false);
+		assert.strictEqual(serializedError.cause, undefined);
+	});
+
+	test('Transform Error with Cause for Serialization', function () {
+		const cause = new Error('Cause error');
+		const error = new Error('Test error', { cause });
+		const serializedError = transformErrorForSerialization(error);
+		assert.strictEqual(serializedError.name, 'Error');
+		assert.strictEqual(serializedError.message, 'Test error');
+		assert.strictEqual(serializedError.stack, error.stack);
+		assert.strictEqual(serializedError.noTelemetry, false);
+		assert.ok(serializedError.cause);
+		assert.strictEqual(serializedError.cause?.name, 'Error');
+		assert.strictEqual(serializedError.cause?.message, 'Cause error');
+		assert.strictEqual(serializedError.cause?.stack, cause.stack);
+	});
+
+	test('Transform Error from Serialization', function () {
+		const serializedError = transformErrorForSerialization(new Error('Test error'));
+		const error = transformErrorFromSerialization(serializedError);
+		assert.strictEqual(error.name, 'Error');
+		assert.strictEqual(error.message, 'Test error');
+		assert.strictEqual(error.stack, serializedError.stack);
+		assert.strictEqual(error.cause, undefined);
+	});
+
+	test('Transform Error with Cause from Serialization', function () {
+		const cause = new Error('Cause error');
+		const serializedCause = transformErrorForSerialization(cause);
+		const error = new Error('Test error', { cause });
+		const serializedError = transformErrorForSerialization(error);
+		const deserializedError = transformErrorFromSerialization(serializedError);
+		assert.strictEqual(deserializedError.name, 'Error');
+		assert.strictEqual(deserializedError.message, 'Test error');
+		assert.strictEqual(deserializedError.stack, serializedError.stack);
+		assert.ok(deserializedError.cause);
+		assertType(deserializedError.cause instanceof Error);
+		assert.strictEqual(deserializedError.cause?.name, 'Error');
+		assert.strictEqual(deserializedError.cause?.message, 'Cause error');
+		assert.strictEqual(deserializedError.cause?.stack, serializedCause.stack);
+	});
 });

From 4cbf59e5dbeff7a177aae4e2a038ee9ee825e81e Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Mon, 9 Dec 2024 15:28:48 +0100
Subject: [PATCH 051/479] fix #235462 (#235636)

---
 src/vs/platform/userDataSync/common/extensionsSync.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/platform/userDataSync/common/extensionsSync.ts b/src/vs/platform/userDataSync/common/extensionsSync.ts
index 1715f8cbbe9..4054babf6f0 100644
--- a/src/vs/platform/userDataSync/common/extensionsSync.ts
+++ b/src/vs/platform/userDataSync/common/extensionsSync.ts
@@ -485,6 +485,7 @@ export class LocalExtensionsProvider {
 											installGivenVersion: e.pinned && !!e.version,
 											pinned: e.pinned,
 											installPreReleaseVersion: e.preRelease,
+											preRelease: e.preRelease,
 											profileLocation: profile.extensionsResource,
 											isApplicationScoped: e.isApplicationScoped,
 											context: { [EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT]: true, [EXTENSION_INSTALL_SOURCE_CONTEXT]: ExtensionInstallSource.SETTINGS_SYNC }

From f3a02f3d14117b7db8824237f71da3c61908e25a Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Mon, 9 Dec 2024 15:30:25 +0100
Subject: [PATCH 052/479] chat - indicate quota hit in `prominent` status
 (#235637)

---
 .../parts/statusbar/media/statusbarpart.css   | 12 +++-
 .../browser/parts/statusbar/statusbarPart.ts  | 70 +++++++++++++++++--
 .../contrib/chat/browser/chatQuotasService.ts | 25 ++++---
 .../services/statusbar/browser/statusbar.ts   | 12 ++++
 4 files changed, 101 insertions(+), 18 deletions(-)

diff --git a/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css b/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
index b30d2bee088..b7b1bd7dd7c 100644
--- a/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
+++ b/src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
@@ -205,7 +205,17 @@
 	background-color: var(--vscode-statusBarItem-prominentBackground);
 }
 
-.monaco-workbench .part.statusbar > .items-container > .statusbar-item.prominent-kind a:hover:not(.disabled) {
+/**
+ * Using :not(.compact-right):not(.compact-left) here to improve the visual appearance
+ * when a prominent item uses `compact: true` with other items. The presence of the
+ * !important directive for `background-color` otherwise blocks our special hover handling
+ * code here:
+ * https://github.com/microsoft/vscode/blob/c2037f152b2bb3119ce1d87f52987776540dd57f/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts#L483-L505
+ *
+ * Note: this is currently only done for the prominent kind, but needs to be expanded if
+ * other kinds use compact feature.
+ */
+.monaco-workbench .part.statusbar > .items-container > .statusbar-item.prominent-kind:not(.compact-right):not(.compact-left) a:hover:not(.disabled) {
 	color: var(--vscode-statusBarItem-prominentHoverForeground);
 	background-color: var(--vscode-statusBarItem-prominentHoverBackground) !important;
 }
diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
index fddbd06e307..7454d382d0c 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -5,11 +5,11 @@
 
 import './media/statusbarpart.css';
 import { localize } from '../../../../nls.js';
-import { Disposable, DisposableStore, dispose, disposeIfDisposable, IDisposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, disposeIfDisposable, IDisposable, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { MultiWindowParts, Part } from '../../part.js';
 import { EventType as TouchEventType, Gesture, GestureEvent } from '../../../../base/browser/touch.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { StatusbarAlignment, IStatusbarService, IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarStyleOverride, isStatusbarEntryLocation, IStatusbarEntryLocation, isStatusbarEntryPriority, IStatusbarEntryPriority } from '../../../services/statusbar/browser/statusbar.js';
+import { StatusbarAlignment, IStatusbarService, IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarStyleOverride, isStatusbarEntryLocation, IStatusbarEntryLocation, isStatusbarEntryPriority, IStatusbarEntryPriority, IStatusbarEntryOverride } from '../../../services/statusbar/browser/statusbar.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { IAction, Separator, toAction } from '../../../../base/common/actions.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
@@ -75,6 +75,12 @@ export interface IStatusbarEntryContainer extends IDisposable {
 	 */
 	updateEntryVisibility(id: string, visible: boolean): void;
 
+	/**
+	 * Allows to override the appearance of an entry with the provided ID. Only a subset
+	 * of properties is allowed to be overridden.
+	 */
+	overrideEntry(id: string, override: IStatusbarEntryOverride): IDisposable;
+
 	/**
 	 * Focused the status bar. If one of the status bar entries was focused, focuses it directly.
 	 */
@@ -134,6 +140,9 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
 	private readonly _onWillDispose = this._register(new Emitter<void>());
 	readonly onWillDispose = this._onWillDispose.event;
 
+	private readonly onDidOverrideEntry = this._register(new Emitter<string>());
+	private readonly entryOverrides = new Map<string, IStatusbarEntryOverride>();
+
 	private leftItemsContainer: HTMLElement | undefined;
 	private rightItemsContainer: HTMLElement | undefined;
 
@@ -173,6 +182,28 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
 		this._register(this.contextService.onDidChangeWorkbenchState(() => this.updateStyles()));
 	}
 
+	overrideEntry(id: string, override: IStatusbarEntryOverride): IDisposable {
+		this.entryOverrides.set(id, override);
+		this.onDidOverrideEntry.fire(id);
+
+		return toDisposable(() => {
+			const currentOverride = this.entryOverrides.get(id);
+			if (currentOverride === override) {
+				this.entryOverrides.delete(id);
+				this.onDidOverrideEntry.fire(id);
+			}
+		});
+	}
+
+	private withEntryOverride(entry: IStatusbarEntry, id: string): IStatusbarEntry {
+		const override = this.entryOverrides.get(id);
+		if (override) {
+			entry = { ...entry, ...override };
+		}
+
+		return entry;
+	}
+
 	addEntry(entry: IStatusbarEntry, id: string, alignment: StatusbarAlignment, priorityOrLocation: number | IStatusbarEntryLocation | IStatusbarEntryPriority = 0): IStatusbarEntryAccessor {
 		let priority: IStatusbarEntryPriority;
 		if (isStatusbarEntryPriority(priorityOrLocation)) {
@@ -220,10 +251,11 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
 	}
 
 	private doAddEntry(entry: IStatusbarEntry, id: string, alignment: StatusbarAlignment, priority: IStatusbarEntryPriority): IStatusbarEntryAccessor {
+		const disposables = new DisposableStore();
 
 		// View model item
 		const itemContainer = this.doCreateStatusItem(id, alignment);
-		const item = this.instantiationService.createInstance(StatusbarEntryItem, itemContainer, entry, this.hoverDelegate);
+		const item = disposables.add(this.instantiationService.createInstance(StatusbarEntryItem, itemContainer, this.withEntryOverride(entry, id), this.hoverDelegate));
 
 		// View model entry
 		const viewModelEntry: IStatusbarViewModelEntry = new class implements IStatusbarViewModelEntry {
@@ -245,9 +277,11 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
 			this.appendStatusbarEntry(viewModelEntry);
 		}
 
-		return {
+		let lastEntry = entry;
+		const accessor: IStatusbarEntryAccessor = {
 			update: entry => {
-				item.update(entry);
+				lastEntry = entry;
+				item.update(this.withEntryOverride(entry, id));
 			},
 			dispose: () => {
 				const { needsFullRefresh } = this.doAddOrRemoveModelEntry(viewModelEntry, false);
@@ -255,10 +289,20 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
 					this.appendStatusbarEntries();
 				} else {
 					itemContainer.remove();
+					this.updateCompactEntries();
 				}
-				dispose(item);
+				disposables.dispose();
 			}
 		};
+
+		// React to overrides
+		disposables.add(this.onDidOverrideEntry.event(overrideEntryId => {
+			if (overrideEntryId === id) {
+				accessor.update(lastEntry);
+			}
+		}));
+
+		return accessor;
 	}
 
 	private doCreateStatusItem(id: string, alignment: StatusbarAlignment, ...extraClasses: string[]): HTMLElement {
@@ -790,6 +834,16 @@ export class StatusbarService extends MultiWindowParts<StatusbarPart> implements
 		}
 	}
 
+	overrideEntry(id: string, override: IStatusbarEntryOverride): IDisposable {
+		const disposables = new DisposableStore();
+
+		for (const part of this.parts) {
+			disposables.add(part.overrideEntry(id, override));
+		}
+
+		return disposables;
+	}
+
 	focus(preserveEntryFocus?: boolean): void {
 		this.activePart.focus(preserveEntryFocus);
 	}
@@ -856,6 +910,10 @@ export class ScopedStatusbarService extends Disposable implements IStatusbarServ
 		this.statusbarEntryContainer.updateEntryVisibility(id, visible);
 	}
 
+	overrideEntry(id: string, override: IStatusbarEntryOverride): IDisposable {
+		return this.statusbarEntryContainer.overrideEntry(id, override);
+	}
+
 	focus(preserveEntryFocus?: boolean): void {
 		this.statusbarEntryContainer.focus(preserveEntryFocus);
 	}
diff --git a/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts b/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
index 467affc7899..7b82ddbb330 100644
--- a/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
@@ -8,7 +8,7 @@ import { safeIntl } from '../../../../base/common/date.js';
 import { language } from '../../../../base/common/platform.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { localize, localize2 } from '../../../../nls.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
@@ -18,7 +18,7 @@ import { createDecorator, ServicesAccessor } from '../../../../platform/instanti
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
 import product from '../../../../platform/product/common/product.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
+import { IStatusbarService, StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 
@@ -212,7 +212,7 @@ export class ChatQuotasStatusBarEntry extends Disposable implements IWorkbenchCo
 
 	private static readonly COPILOT_STATUS_ID = 'GitHub.copilot.status'; // TODO@bpasero unify into 1 core indicator
 
-	private readonly _entry = this._register(new MutableDisposable<IStatusbarEntryAccessor>());
+	private readonly entry = this._register(new DisposableStore());
 
 	constructor(
 		@IStatusbarService private readonly statusbarService: IStatusbarService,
@@ -221,12 +221,17 @@ export class ChatQuotasStatusBarEntry extends Disposable implements IWorkbenchCo
 		super();
 
 		this._register(Event.runAndSubscribe(this.chatQuotasService.onDidChangeQuotas, () => this.updateStatusbarEntry()));
+		this._register(this.statusbarService.onDidChangeEntryVisibility(e => {
+			if (e.id === ChatQuotasStatusBarEntry.COPILOT_STATUS_ID) {
+				this.updateStatusbarEntry();
+			}
+		}));
 	}
 
 	private updateStatusbarEntry(): void {
-		const { chatQuotaExceeded, completionsQuotaExceeded } = this.chatQuotasService.quotas;
+		this.entry.clear();
 
-		// Some quota exceeded, show indicator
+		const { chatQuotaExceeded, completionsQuotaExceeded } = this.chatQuotasService.quotas;
 		if (chatQuotaExceeded || completionsQuotaExceeded) {
 			let text: string;
 			if (chatQuotaExceeded && !completionsQuotaExceeded) {
@@ -242,23 +247,21 @@ export class ChatQuotasStatusBarEntry extends Disposable implements IWorkbenchCo
 				text = `$(copilot-warning) ${text}`;
 			}
 
-			this._entry.value = this.statusbarService.addEntry({
+			this.entry.add(this.statusbarService.addEntry({
 				name: localize('indicator', "Copilot Limit Indicator"),
 				text,
 				ariaLabel: text,
 				command: OPEN_CHAT_QUOTA_EXCEEDED_DIALOG,
 				showInAllWindows: true,
+				kind: 'prominent',
 				tooltip: quotaToButtonMessage({ chatQuotaExceeded, completionsQuotaExceeded })
 			}, ChatQuotasStatusBarEntry.ID, StatusbarAlignment.RIGHT, {
 				id: ChatQuotasStatusBarEntry.COPILOT_STATUS_ID,
 				alignment: StatusbarAlignment.RIGHT,
 				compact: isCopilotStatusVisible
-			});
-		}
+			}));
 
-		// No quota exceeded, remove indicator
-		else {
-			this._entry.clear();
+			this.entry.add(this.statusbarService.overrideEntry(ChatQuotasStatusBarEntry.COPILOT_STATUS_ID, { kind: 'prominent' }));
 		}
 	}
 }
diff --git a/src/vs/workbench/services/statusbar/browser/statusbar.ts b/src/vs/workbench/services/statusbar/browser/statusbar.ts
index 3b3f1f1fe17..1c589dc4f66 100644
--- a/src/vs/workbench/services/statusbar/browser/statusbar.ts
+++ b/src/vs/workbench/services/statusbar/browser/statusbar.ts
@@ -197,3 +197,15 @@ export interface IStatusbarEntryAccessor extends IDisposable {
 	 */
 	update(properties: IStatusbarEntry): void;
 }
+
+/**
+ * A way to override a status bar entry appearance. Only a subset of
+ * properties are currently allowed to override.
+ */
+export interface IStatusbarEntryOverride {
+
+	/**
+	 * The kind of status bar entry. This applies different colors to the entry.
+	 */
+	readonly kind?: StatusbarEntryKind;
+}

From 5fff871b240a64708aa5083b36907fc859049df1 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Mon, 9 Dec 2024 15:47:47 +0100
Subject: [PATCH 053/479] fix #233160 (#235638)

---
 src/vs/platform/configuration/common/configuration.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vs/platform/configuration/common/configuration.ts b/src/vs/platform/configuration/common/configuration.ts
index a93872f4cd7..e9a9143fa22 100644
--- a/src/vs/platform/configuration/common/configuration.ts
+++ b/src/vs/platform/configuration/common/configuration.ts
@@ -258,6 +258,10 @@ export function removeFromValueTree(valueTree: any, key: string): void {
 }
 
 function doRemoveFromValueTree(valueTree: any, segments: string[]): void {
+	if (!valueTree) {
+		return;
+	}
+
 	const first = segments.shift()!;
 	if (segments.length === 0) {
 		// Reached last segment

From 869a6422160a8716f09ae54f3ba6a767dc30bb05 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Mon, 9 Dec 2024 17:23:26 +0100
Subject: [PATCH 054/479] fix falsy error (#235651)

---
 src/vs/editor/common/languages/defaultDocumentColorsComputer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/common/languages/defaultDocumentColorsComputer.ts b/src/vs/editor/common/languages/defaultDocumentColorsComputer.ts
index 3c8acf2c7cd..74bb0757905 100644
--- a/src/vs/editor/common/languages/defaultDocumentColorsComputer.ts
+++ b/src/vs/editor/common/languages/defaultDocumentColorsComputer.ts
@@ -36,7 +36,7 @@ function _toIColor(r: number, g: number, b: number, a: number): IColor {
 function _findRange(model: IDocumentColorComputerTarget, match: RegExpMatchArray): IRange | undefined {
 	const index = match.index;
 	const length = match[0].length;
-	if (!index) {
+	if (index === undefined) {
 		return;
 	}
 	const startPosition = model.positionAt(index);

From 686c08b1529ba857b3dcd3cb8de298efca43454e Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Mon, 9 Dec 2024 18:01:01 +0100
Subject: [PATCH 055/479] Fix focus outline cropping issue in tabs (#235655)

fix #227552
---
 .../browser/parts/editor/media/multieditortabscontrol.css     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css b/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
index 93559402aa5..d0bb1d3d186 100644
--- a/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
@@ -50,7 +50,7 @@
 	display: none;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .title > .tabs-and-actions-container.tabs-border-bottom::after {
+.monaco-workbench .part.editor > .content .editor-group-container > .title .tab:not([tabIndex="0"]) .tabs-and-actions-container.tabs-border-bottom::after {
 	content: '';
 	position: absolute;
 	bottom: 0;
@@ -293,7 +293,7 @@
 	background-color: var(--tab-border-top-color);
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active.tab-border-bottom > .tab-border-bottom-container {
+.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active.tab-border-bottom:not([tabIndex="0"]) > .tab-border-bottom-container {
 	z-index: 10;
 	bottom: 0;
 	height: 1px;

From d0507ca130176a0e89f56858bbee058bf7f2daf0 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Mon, 9 Dec 2024 18:20:38 +0100
Subject: [PATCH 056/479] add logging for non-existing chat session restoration
 (#235661)

---
 .../browser/chatEditing/chatEditingService.ts   | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts
index 458687df09a..912b37c6624 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts
@@ -22,6 +22,7 @@ import { localize, localize2 } from '../../../../../nls.js';
 import { IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
 import { bindContextKey } from '../../../../../platform/observable/common/platformObservableUtils.js';
 import { IProgressService, ProgressLocation } from '../../../../../platform/progress/common/progress.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
@@ -89,6 +90,7 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 		@ILifecycleService private readonly lifecycleService: ILifecycleService,
 		@IWorkbenchAssignmentService private readonly _workbenchAssignmentService: IWorkbenchAssignmentService,
 		@IStorageService storageService: IStorageService,
+		@ILogService logService: ILogService,
 	) {
 		super();
 		this._applyingChatEditsFailedContextKey = applyingChatEditsFailedContextKey.bindTo(contextKeyService);
@@ -157,11 +159,16 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 		void this._editingSessionFileLimitPromise;
 
 		const sessionIdToRestore = storageService.get(STORAGE_KEY_EDITING_SESSION, StorageScope.WORKSPACE);
-		if (isString(sessionIdToRestore) && this._chatService.getOrRestoreSession(sessionIdToRestore)) {
-			this._restoringEditingSession = this.startOrContinueEditingSession(sessionIdToRestore);
-			this._restoringEditingSession.finally(() => {
-				this._restoringEditingSession = undefined;
-			});
+		if (isString(sessionIdToRestore)) {
+			if (this._chatService.getOrRestoreSession(sessionIdToRestore)) {
+				this._restoringEditingSession = this.startOrContinueEditingSession(sessionIdToRestore);
+				this._restoringEditingSession.finally(() => {
+					this._restoringEditingSession = undefined;
+				});
+			} else {
+				logService.error(`Edit session session to restore is a non-existing chat session: ${sessionIdToRestore}`);
+			}
+			storageService.remove(STORAGE_KEY_EDITING_SESSION, StorageScope.WORKSPACE);
 		}
 	}
 

From 8a0ad0168e90a6715905943a04fdabc8cf7f423c Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Mon, 9 Dec 2024 18:20:43 +0100
Subject: [PATCH 057/479] [themes] 'Generate Color Scheme From Current
 Settings' produces deprecated settings

---
 src/vs/workbench/contrib/themes/browser/themes.contribution.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
index 9a7b33449cf..8549b93b80c 100644
--- a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
+++ b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
@@ -661,7 +661,7 @@ registerAction2(class extends Action2 {
 
 		const theme = themeService.getColorTheme();
 		const colors = Registry.as<IColorRegistry>(ColorRegistryExtensions.ColorContribution).getColors();
-		const colorIds = colors.map(c => c.id).sort();
+		const colorIds = colors.filter(c => !c.deprecationMessage).map(c => c.id).sort();
 		const resultingColors: { [key: string]: string | null } = {};
 		const inherited: string[] = [];
 		for (const colorId of colorIds) {

From 94d106df7f5577ef27b5c40bee0a3c3fd22d9b04 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Mon, 9 Dec 2024 21:04:56 +0100
Subject: [PATCH 058/479] chat - disable cache for requests (#235673)

---
 src/vs/base/parts/request/common/request.ts        |  5 +++++
 src/vs/base/parts/request/common/requestImpl.ts    | 10 +++++++---
 src/vs/workbench/contrib/chat/browser/chatSetup.ts |  1 +
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/vs/base/parts/request/common/request.ts b/src/vs/base/parts/request/common/request.ts
index 773021faacb..b9e03ca4d7f 100644
--- a/src/vs/base/parts/request/common/request.ts
+++ b/src/vs/base/parts/request/common/request.ts
@@ -45,6 +45,11 @@ export interface IRequestOptions {
 	data?: string;
 	followRedirects?: number;
 	proxyAuthorization?: string;
+	/**
+	 * A signal to not cache the response. This may not
+	 * be supported in all implementations.
+	 */
+	disableCache?: boolean;
 }
 
 export interface IRequestContext {
diff --git a/src/vs/base/parts/request/common/requestImpl.ts b/src/vs/base/parts/request/common/requestImpl.ts
index 11aac6bd6f0..17f80575ef5 100644
--- a/src/vs/base/parts/request/common/requestImpl.ts
+++ b/src/vs/base/parts/request/common/requestImpl.ts
@@ -21,12 +21,16 @@ export async function request(options: IRequestOptions, token: CancellationToken
 	]) : cancellation.signal;
 
 	try {
-		const res = await fetch(options.url || '', {
+		const fetchInit: RequestInit = {
 			method: options.type || 'GET',
 			headers: getRequestHeaders(options),
 			body: options.data,
-			signal,
-		});
+			signal
+		};
+		if (options.disableCache) {
+			fetchInit.cache = 'no-store';
+		}
+		const res = await fetch(options.url || '', fetchInit);
 		return {
 			res: {
 				statusCode: res.status,
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 485d1489dfd..3e43f4428ec 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -541,6 +541,7 @@ class ChatSetupRequests extends Disposable {
 				type,
 				url,
 				data: type === 'POST' ? JSON.stringify(body) : undefined,
+				disableCache: true,
 				headers: {
 					'Authorization': `Bearer ${session.accessToken}`
 				}

From 4170a3f55ac9682b9ba7584450f4d6a86c4a2fac Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Mon, 9 Dec 2024 15:13:56 -0500
Subject: [PATCH 059/479] fix terminal suggest folder/file completions bugs
 (#235165)

---
 .../browser/terminalCompletionService.ts      |  38 +++---
 .../browser/terminalCompletionService.test.ts | 117 ++++++++++--------
 .../test/common/workbenchTestServices.ts      |   8 +-
 3 files changed, 93 insertions(+), 70 deletions(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
index 19ac7672bd9..ea3b6cf16bf 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
@@ -5,6 +5,7 @@
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { Disposable, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../../base/common/network.js';
+import { basename } from '../../../../../base/common/path.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
@@ -208,13 +209,9 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 		}
 
 		const resourceCompletions: ITerminalCompletion[] = [];
-		const endsWithSpace = promptValue.substring(0, cursorPosition).endsWith(' ');
-		let lastWord;
-		if (endsWithSpace) {
-			lastWord = '';
-		} else {
-			lastWord = promptValue.substring(0, cursorPosition).trim().split(' ').at(-1) ?? '';
-		}
+		const cursorPrefix = promptValue.substring(0, cursorPosition);
+		const endsWithSpace = cursorPrefix.endsWith(' ');
+		const lastWord = endsWithSpace ? '' : cursorPrefix.split(' ').at(-1) ?? '';
 
 		for (const stat of fileStat.children) {
 			let kind: TerminalCompletionItemKind | undefined;
@@ -228,26 +225,35 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 				continue;
 			}
 			const isDirectory = kind === TerminalCompletionItemKind.Folder;
-			const pathToResource = stat.resource.fsPath.replace(cwd.fsPath, '');
-			let label = pathToResource;
+			const fileName = basename(stat.resource.fsPath);
+
+			let label;
+			if (!lastWord.startsWith('.' + resourceRequestConfig.pathSeparator) && !lastWord.startsWith('..' + resourceRequestConfig.pathSeparator)) {
+				// add a dot to the beginning of the label if it doesn't already have one
+				label = `.${resourceRequestConfig.pathSeparator}${fileName}`;
+			} else {
+				if (lastWord.endsWith(resourceRequestConfig.pathSeparator)) {
+					label = `${lastWord}${fileName}`;
+				} else {
+					label = `${lastWord}${resourceRequestConfig.pathSeparator}${fileName}`;
+				}
+				if (lastWord.length && lastWord.at(-1) !== resourceRequestConfig.pathSeparator && lastWord.at(-1) !== '.') {
+					label = `.${resourceRequestConfig.pathSeparator}${fileName}`;
+				}
+			}
 			if (isDirectory && !label.endsWith(resourceRequestConfig.pathSeparator)) {
 				label = label + resourceRequestConfig.pathSeparator;
 			}
-			const startsWithDot = lastWord && lastWord.startsWith('.');
-			if (!startsWithDot) {
-				label = '.' + label;
-			}
 			resourceCompletions.push({
 				label,
 				kind,
 				isDirectory,
 				isFile: kind === TerminalCompletionItemKind.File,
-				replacementIndex: promptValue[cursorPosition - 1] === ' ' ? cursorPosition : cursorPosition - 1,
-				replacementLength: label.length - lastWord.length > 0 ? label.length - lastWord.length : label.length,
+				replacementIndex: cursorPosition - lastWord.length > 0 ? cursorPosition - lastWord.length : cursorPosition,
+				replacementLength: lastWord.length > 0 ? lastWord.length : label.length
 			});
 		}
 
 		return resourceCompletions.length ? resourceCompletions : undefined;
 	}
 }
-
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionService.test.ts b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionService.test.ts
index d9e217ee398..b3611df7444 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionService.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionService.test.ts
@@ -4,45 +4,44 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { URI } from '../../../../../../base/common/uri.js';
-import { IFileStat, IFileStatWithMetadata, IResolveFileOptions, IResolveMetadataFileOptions } from '../../../../../../platform/files/common/files.js';
+import { IFileService, IFileStatWithMetadata, IResolveMetadataFileOptions } from '../../../../../../platform/files/common/files.js';
 import { TerminalCompletionService, TerminalCompletionItemKind, TerminalResourceRequestConfig } from '../../browser/terminalCompletionService.js';
-import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 import sinon from 'sinon';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
-import { TestFileService } from '../../../../../test/browser/workbenchTestServices.js';
-import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
 import assert from 'assert';
 import { isWindows } from '../../../../../../base/common/platform.js';
-
-class TestFileService2 extends TestFileService {
-	private _children: IFileStat[] = [];
-	constructor() {
-		super();
-	}
-	setChildren(children: IFileStat[]) {
-		this._children = children;
-	}
-	override async resolve(resource: URI, _options: IResolveMetadataFileOptions): Promise<IFileStatWithMetadata>;
-	override async resolve(resource: URI, _options?: IResolveFileOptions): Promise<IFileStat>;
-	override async resolve(resource: URI, _options?: IResolveFileOptions): Promise<IFileStat> {
-		const result = await super.resolve(resource, _options);
-		result.children = this._children;
-		return result;
-	}
-}
+import { TestInstantiationService } from '../../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+import { createFileStat } from '../../../../../test/common/workbenchTestServices.js';
+import { TestConfigurationService } from '../../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
 
 suite('TerminalCompletionService', () => {
+	const store = ensureNoDisposablesAreLeakedInTestSuite();
+	let instantiationService: TestInstantiationService;
+	let configurationService: TestConfigurationService;
+	let validResources: URI[];
+	let childResources: { resource: URI; isFile?: boolean; isDirectory?: boolean }[];
 	const pathSeparator = isWindows ? '\\' : '/';
-	let fileService: TestFileService2;
-	let configurationService: IConfigurationService;
 	let terminalCompletionService: TerminalCompletionService;
-	const store = ensureNoDisposablesAreLeakedInTestSuite();
+
 	setup(() => {
-		fileService = new TestFileService2();
+		instantiationService = store.add(new TestInstantiationService());
 		configurationService = new TestConfigurationService();
-		terminalCompletionService = new TerminalCompletionService(configurationService, fileService);
-		store.add(terminalCompletionService);
-		store.add(fileService);
+		instantiationService.stub(IConfigurationService, configurationService);
+		instantiationService.stub(IFileService, {
+			async stat(resource) {
+				if (!validResources.map(e => e.path).includes(resource.path)) {
+					throw new Error('Doesn\'t exist');
+				}
+				return createFileStat(resource);
+			},
+			async resolve(resource: URI, options: IResolveMetadataFileOptions): Promise<IFileStatWithMetadata> {
+				return createFileStat(resource, undefined, undefined, undefined, childResources);
+			}
+		});
+		terminalCompletionService = store.add(instantiationService.createInstance(TerminalCompletionService));
+		validResources = [];
+		childResources = [];
 	});
 
 	teardown(() => {
@@ -63,6 +62,7 @@ suite('TerminalCompletionService', () => {
 				cwd: URI.parse('file:///test'),
 				pathSeparator
 			};
+			validResources = [URI.parse('file:///test')];
 			const result = await terminalCompletionService.resolveResources(resourceRequestConfig, 'cd ', 3);
 			assert(!result);
 		});
@@ -75,21 +75,20 @@ suite('TerminalCompletionService', () => {
 				foldersRequested: true,
 				pathSeparator
 			};
-			await fileService.createFolder(URI.parse('file:///test/'));
-			const childFolder = { resource: URI.parse('file:///test/folder1/'), name: 'folder1', isDirectory: true, isFile: false, isSymbolicLink: false, mtime: 0, size: 0, children: [] };
-			const childFile = { resource: URI.parse('file:///test/file1.txt'), name: 'file1.txt', isDirectory: false, isFile: true, isSymbolicLink: true, mtime: 0, size: 0, children: [] };
-			fileService.setChildren([childFolder, childFile]);
+			validResources = [URI.parse('file:///test')];
+			const childFolder = { resource: URI.parse('file:///test/folder1/'), name: 'folder1', isDirectory: true, isFile: false };
+			const childFile = { resource: URI.parse('file:///test/file1.txt'), name: 'file1.txt', isDirectory: false, isFile: true };
+			childResources = [childFolder, childFile];
 			const result = await terminalCompletionService.resolveResources(resourceRequestConfig, 'cd ', 3);
 			assert(!!result);
 			assert(result.length === 1);
-			const label = `.${pathSeparator}folder1${pathSeparator}`;
 			assert.deepEqual(result![0], {
-				label,
+				label: `.${pathSeparator}folder1${pathSeparator}`,
 				kind: TerminalCompletionItemKind.Folder,
 				isDirectory: true,
 				isFile: false,
 				replacementIndex: 3,
-				replacementLength: label.length
+				replacementLength: 10
 			});
 		});
 		test('cd .', async () => {
@@ -98,21 +97,20 @@ suite('TerminalCompletionService', () => {
 				foldersRequested: true,
 				pathSeparator
 			};
-			await fileService.createFolder(URI.parse('file:///test/'));
-			const childFolder = { resource: URI.parse('file:///test/folder1/'), name: 'folder1', isDirectory: true, isFile: false, isSymbolicLink: false, mtime: 0, size: 0, children: [] };
-			const childFile = { resource: URI.parse('file:///test/file1.txt'), name: 'file1.txt', isDirectory: false, isFile: true, isSymbolicLink: true, mtime: 0, size: 0, children: [] };
-			fileService.setChildren([childFolder, childFile]);
+			validResources = [URI.parse('file:///test/')];
+			const childFolder = { resource: URI.parse('file:///test/folder1/'), name: 'folder1', isDirectory: true, isFile: false };
+			const childFile = { resource: URI.parse('file:///test/file1.txt'), name: 'file1.txt', isDirectory: false, isFile: true };
+			childResources = [childFolder, childFile];
 			const result = await terminalCompletionService.resolveResources(resourceRequestConfig, 'cd .', 4);
 			assert(!!result);
 			assert(result.length === 1);
-			const label = `${pathSeparator}folder1${pathSeparator}`;
 			assert.deepEqual(result![0], {
-				label,
+				label: `.${pathSeparator}folder1${pathSeparator}`,
 				kind: TerminalCompletionItemKind.Folder,
 				isDirectory: true,
 				isFile: false,
 				replacementIndex: 3,
-				replacementLength: label.length - 1
+				replacementLength: 1 // replacing .
 			});
 		});
 		test('cd ./', async () => {
@@ -121,21 +119,40 @@ suite('TerminalCompletionService', () => {
 				foldersRequested: true,
 				pathSeparator
 			};
-			await fileService.createFolder(URI.parse('file:///test/'));
-			const childFolder = { resource: URI.parse('file:///test/folder1/'), name: 'folder1', isDirectory: true, isFile: false, isSymbolicLink: false, mtime: 0, size: 0, children: [] };
-			const childFile = { resource: URI.parse('file:///test/file1.txt'), name: 'file1.txt', isDirectory: false, isFile: true, isSymbolicLink: true, mtime: 0, size: 0, children: [] };
-			fileService.setChildren([childFolder, childFile]);
+			const childFolder = { resource: URI.parse('file:///test/folder1/'), name: 'folder1', isDirectory: true, isFile: false };
+			const childFile = { resource: URI.parse('file:///test/file1.txt'), name: 'file1.txt', isDirectory: false, isFile: true };
+			childResources = [childFolder, childFile];
 			const result = await terminalCompletionService.resolveResources(resourceRequestConfig, 'cd ./', 5);
 			assert(!!result);
 			assert(result.length === 1);
-			const label = `${pathSeparator}folder1${pathSeparator}`;
 			assert.deepEqual(result![0], {
-				label,
+				label: `.${pathSeparator}folder1${pathSeparator}`,
+				kind: TerminalCompletionItemKind.Folder,
+				isDirectory: true,
+				isFile: false,
+				replacementIndex: 3,
+				replacementLength: 2 // replacing ./
+			});
+		});
+		test('cd ./f', async () => {
+			const resourceRequestConfig: TerminalResourceRequestConfig = {
+				cwd: URI.parse('file:///test'),
+				foldersRequested: true,
+				pathSeparator
+			};
+			const childFolder = { resource: URI.parse('file:///test/folder1/'), name: 'folder1', isDirectory: true, isFile: false };
+			const childFile = { resource: URI.parse('file:///test/file1.txt'), name: 'file1.txt', isDirectory: false, isFile: true };
+			childResources = [childFolder, childFile];
+			const result = await terminalCompletionService.resolveResources(resourceRequestConfig, 'cd ./f', 6);
+			assert(!!result);
+			assert(result.length === 1);
+			assert.deepEqual(result![0], {
+				label: `.${pathSeparator}folder1${pathSeparator}`,
 				kind: TerminalCompletionItemKind.Folder,
 				isDirectory: true,
 				isFile: false,
-				replacementIndex: 4,
-				replacementLength: label.length - 2
+				replacementIndex: 3,
+				replacementLength: 3 // replacing ./f
 			});
 		});
 	});
diff --git a/src/vs/workbench/test/common/workbenchTestServices.ts b/src/vs/workbench/test/common/workbenchTestServices.ts
index cd6e844b2cb..ef7fce72b1e 100644
--- a/src/vs/workbench/test/common/workbenchTestServices.ts
+++ b/src/vs/workbench/test/common/workbenchTestServices.ts
@@ -225,20 +225,20 @@ export class TestWorkingCopy extends Disposable implements IWorkingCopy {
 	}
 }
 
-export function createFileStat(resource: URI, readonly = false): IFileStatWithMetadata {
+export function createFileStat(resource: URI, readonly = false, isFile?: boolean, isDirectory?: boolean, children?: { resource: URI; isFile?: boolean; isDirectory?: boolean }[] | undefined): IFileStatWithMetadata {
 	return {
 		resource,
 		etag: Date.now().toString(),
 		mtime: Date.now(),
 		ctime: Date.now(),
 		size: 42,
-		isFile: true,
-		isDirectory: false,
+		isFile: isFile ?? true,
+		isDirectory: isDirectory ?? false,
 		isSymbolicLink: false,
 		readonly,
 		locked: false,
 		name: basename(resource),
-		children: undefined
+		children: children?.map(c => createFileStat(c.resource, false, c.isFile, c.isDirectory))
 	};
 }
 

From 8e1f20cbead806bf3e77908fbaf20ada2cc2d982 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 9 Dec 2024 21:54:30 +0100
Subject: [PATCH 060/479] Workspace trust - remove unused code (#235676)

---
 .../src/extensionsProposals.ts                | 26 -------------------
 1 file changed, 26 deletions(-)

diff --git a/extensions/configuration-editing/src/extensionsProposals.ts b/extensions/configuration-editing/src/extensionsProposals.ts
index 6438281dc0b..ba1c33e7845 100644
--- a/extensions/configuration-editing/src/extensionsProposals.ts
+++ b/extensions/configuration-editing/src/extensionsProposals.ts
@@ -30,29 +30,3 @@ export async function provideInstalledExtensionProposals(existing: string[], add
 	}
 	return [];
 }
-
-export async function provideWorkspaceTrustExtensionProposals(existing: string[], range: vscode.Range): Promise<vscode.CompletionItem[] | vscode.CompletionList> {
-	if (Array.isArray(existing)) {
-		const extensions = vscode.extensions.all.filter(e => e.packageJSON.main);
-		const extensionProposals = extensions.filter(e => existing.indexOf(e.id) === -1);
-		if (extensionProposals.length) {
-			return extensionProposals.map(e => {
-				const item = new vscode.CompletionItem(e.id);
-				const insertText = `"${e.id}": {\n\t"supported": false,\n\t"version": "${e.packageJSON.version}"\n}`;
-				item.kind = vscode.CompletionItemKind.Value;
-				item.insertText = insertText;
-				item.range = range;
-				item.filterText = insertText;
-				return item;
-			});
-		} else {
-			const example = new vscode.CompletionItem(vscode.l10n.t("Example"));
-			example.insertText = '"vscode.csharp: {\n\t"supported": false,\n\t"version": "0.0.0"\n}`;"';
-			example.kind = vscode.CompletionItemKind.Value;
-			example.range = range;
-			return [example];
-		}
-	}
-
-	return [];
-}

From d0e9b3a84e4e2cb1ab0c7cc1c90acf75097d4f82 Mon Sep 17 00:00:00 2001
From: SteVen Batten <sbatten@microsoft.com>
Date: Mon, 9 Dec 2024 13:59:32 -0800
Subject: [PATCH 061/479] update wording, add svg (#235668)

* update wording add placeholder svg

* small tweaks

* moar tweaks

* fix typo

* match casing

* Theme multi-file-edits

* remove from multi-file-edits.svg

* update multi-file-edits theme for improved consistency

* update multi-file-edits.svg to use editor widget background color

---------

Co-authored-by: bhavyaus <bhavyau@microsoft.com>
---
 .../common/gettingStartedContent.ts           |  11 +-
 .../common/media/multi-file-edits.svg         | 513 ++++++++++++++++++
 2 files changed, 518 insertions(+), 6 deletions(-)
 create mode 100644 src/vs/workbench/contrib/welcomeGettingStarted/common/media/multi-file-edits.svg

diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
index 02350e77258..50e0e26bab2 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
@@ -211,10 +211,10 @@ export const startEntries: GettingStartedStartEntryContent = [
 const Button = (title: string, href: string) => `[${title}](${href})`;
 
 const CopilotStepTitle = localize('gettingStarted.copilotSetup.title', "Use AI features with Copilot for free");
-const CopilotDescription = localize({ key: 'gettingStarted.copilotSetup.description', comment: ['{Locked="["}', '{Locked="]({0})"}'] }, "Write code faster and smarter with [Copilot]({0}) for free with your GitHub account.", product.defaultChatAgent?.documentationUrl ?? '');
+const CopilotDescription = localize({ key: 'gettingStarted.copilotSetup.description', comment: ['{Locked="["}', '{Locked="]({0})"}'] }, "Write code faster and smarter using [Copilot]({0}). With your GitHub account, get 2,000 code completions and 50 chat messages per month for free.", product.defaultChatAgent?.documentationUrl ?? '');
 const CopilotTermsString = localize({ key: 'copilotTerms', comment: ['{Locked="["}', '{Locked="]({0})"}', '{Locked="]({1})"}'] }, "By continuing, you agree to Copilot [Terms]({0}) and [Privacy Policy]({1}).", product.defaultChatAgent?.termsStatementUrl ?? '', product.defaultChatAgent?.privacyStatementUrl ?? '');
-const CopilotSignedOutButton = Button(localize('setupCopilotButton.signIn', "Sign in to use Copilot"), `command:workbench.action.chat.triggerSetup?${encodeURIComponent(JSON.stringify([true]))}`);
-const CopilotSignedInButton = Button(localize('setupCopilotButton.setup', "Setup Copilot"), `command:workbench.action.chat.triggerSetup?${encodeURIComponent(JSON.stringify([true]))}`);
+const CopilotSignedOutButton = Button(localize('setupCopilotButton.signIn', "Sign in to Use Copilot"), `command:workbench.action.chat.triggerSetup?${encodeURIComponent(JSON.stringify([true]))}`);
+const CopilotSignedInButton = Button(localize('setupCopilotButton.setup', "Set Up Copilot"), `command:workbench.action.chat.triggerSetup?${encodeURIComponent(JSON.stringify([true]))}`);
 const CopilotCompleteButton = Button(localize('setupCopilotButton.chatWithCopilot', "Chat with Copilot"), 'command:workbench.action.chat.open');
 
 function createCopilotSetupStep(id: string, button: string, when: string, includeTerms: boolean): BuiltinGettingStartedStep {
@@ -228,9 +228,8 @@ function createCopilotSetupStep(id: string, button: string, when: string, includ
 		description,
 		when,
 		media: {
-			type: 'markdown',
-			path: 'empty'
-		}
+			type: 'svg', altText: 'VS Code Copilot multi file edits', path: 'multi-file-edits.svg'
+		},
 	};
 }
 
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/media/multi-file-edits.svg b/src/vs/workbench/contrib/welcomeGettingStarted/common/media/multi-file-edits.svg
new file mode 100644
index 00000000000..e151a4b95f2
--- /dev/null
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/media/multi-file-edits.svg
@@ -0,0 +1,513 @@
+<svg width="631" height="531" viewBox="0 0 631 531" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <g>
+    <g>
+      <g clip-path="url(#clip0_304_6548)">
+        <g>
+          <mask fill="#FFFFFF">
+            <path d="M0 21.5254C0 18.4738 2.4738 16 5.5254 16H590.475C593.526 16 596 18.4738 596 21.5254V41.259H0V21.5254Z" />
+          </mask>
+          <path d="M0 21.5254C0 18.4738 2.4738 16 5.5254 16H590.475C593.526 16 596 18.4738 596 21.5254V41.259H0V21.5254Z" fill="var(--vscode-editor-background, #181818)" />
+          <path d="M0 16H596H0ZM596 42.0483H0V40.4696H596V42.0483ZM0 41.259V16V41.259ZM596 16V41.259V16Z" fill="var(--vscode-activityBar-activeBorder, #FFFFFF)" fill-opacity="0.0901961" mask="url(#path-3-inside-1_304_6548)" />
+        </g>
+        <g>
+          <g>
+            <g>
+              <rect width="596" height="35" transform="translate(0 41.2589)" fill="var(--vscode-editorGroupHeader-tabsBackground, #181818)" />
+              <g>
+                <mask maskUnits="userSpaceOnUse" x="0" y="40.2589" width="136" height="36" fill="var(--vscode-editor-background, #000000)">
+                  <rect fill="#FFFFFF" y="40.2589" width="136" height="36" />
+                  <path d="M0 41.2589H136V76.2589H0V41.2589Z" />
+                </mask>
+                <path d="M0 41.2589H136V76.2589H0V41.2589Z" fill="var(--vscode-editor-background, #1F1F1F)" />
+                <path d="M0 42.2589H136V40.2589H0V42.2589Z" fill="var(--vscode-interactive-activeCodeBorder, #0078D4)" mask="url(#path-5-outside-2_304_6548)" />
+                <g>
+                  <path d="M23.76 60.8789C23.76 60.9189 23.76 60.9722 23.76 61.0389C23.84 61.8522 23.88 62.4656 23.88 62.8789C23.88 63.2789 23.78 63.6122 23.58 63.8789C23.38 64.1456 23.1267 64.2922 22.82 64.3189C22.5133 64.3856 22.18 64.3456 21.82 64.1989C21.5533 64.0656 21.18 63.8389 20.7 63.5189C20.3933 63.3189 20.16 63.1722 20 63.0789C19.5867 63.4122 19.2533 63.6589 19 63.8189C18.7867 63.9656 18.58 64.0722 18.38 64.1389C18.0067 64.2989 17.66 64.3522 17.34 64.2989C17.02 64.2322 16.76 64.0722 16.56 63.8189C16.3733 63.5656 16.2733 63.2322 16.26 62.8189C16.26 62.4056 16.3 61.7389 16.38 60.8189C15.8733 60.6589 15.4933 60.4922 15.24 60.3189C14.9067 60.1589 14.5733 59.9122 14.24 59.5789C13.9733 59.2989 13.8467 58.9989 13.86 58.6789C13.8733 58.3456 14.0267 58.0389 14.32 57.7589C14.5333 57.5056 14.82 57.2922 15.18 57.1189C15.3933 56.9989 15.7267 56.8589 16.18 56.6989C16.2067 56.6989 16.2467 56.6922 16.3 56.6789C16.3667 56.6522 16.4133 56.6389 16.44 56.6389L16.26 55.2589C16.2467 54.9656 16.2867 54.5722 16.38 54.0789C16.4733 53.7322 16.66 53.4856 16.94 53.3389C17.2333 53.1922 17.5667 53.1656 17.94 53.2589C18.2733 53.3389 18.6067 53.4856 18.94 53.6989C19.18 53.8456 19.4533 54.0522 19.76 54.3189C19.8133 54.3456 19.8733 54.4056 19.94 54.4989L20 54.5789C20.6667 54.0722 21.1867 53.7122 21.56 53.4989C21.9867 53.2189 22.4067 53.1389 22.82 53.2589C23.1267 53.3256 23.3667 53.4922 23.54 53.7589C23.7267 54.0122 23.84 54.3456 23.88 54.7589V55.7589C23.88 55.8922 23.8467 56.0922 23.78 56.3589C23.74 56.5322 23.7067 56.6656 23.68 56.7589C24.0533 56.8789 24.4067 57.0256 24.74 57.1989C25.0867 57.3589 25.3333 57.4922 25.48 57.5989C25.7333 57.7722 25.9333 57.9722 26.08 58.1989C26.2267 58.4122 26.3 58.6389 26.3 58.8789C26.3 59.1189 26.2267 59.3522 26.08 59.5789C25.9333 59.7922 25.7333 59.9856 25.48 60.1589C25.32 60.2656 25.0733 60.4056 24.74 60.5789C24.5 60.6189 24.1667 60.7189 23.74 60.8789H23.76ZM20.12 60.8189C20.1867 60.8189 20.2933 60.8122 20.44 60.7989C20.64 60.7722 20.7867 60.7589 20.88 60.7589C21.0533 60.7589 21.2 60.6722 21.32 60.4989C21.7333 59.8322 22.02 59.3122 22.18 58.9389C22.22 58.8856 22.24 58.8189 22.24 58.7389C22.24 58.6589 22.22 58.6056 22.18 58.5789C21.98 58.1922 21.6667 57.6722 21.24 57.0189C21.1867 56.8856 21.0867 56.8189 20.94 56.8189C20.2333 56.8189 19.6933 56.7989 19.32 56.7589C18.9867 56.7589 18.7333 56.9056 18.56 57.1989C18.4 57.4522 18.2733 57.6589 18.18 57.8189L17.9 58.3389C17.78 58.5122 17.7067 58.6389 17.68 58.7189C17.6667 58.7856 17.6667 58.8589 17.68 58.9389C17.7067 59.0056 17.78 59.1322 17.9 59.3189L18.18 59.8189L18.42 60.2189C18.5533 60.4322 18.6467 60.5656 18.7 60.6189C18.78 60.7122 18.8733 60.7656 18.98 60.7789C19.06 60.7922 19.2267 60.7989 19.48 60.7989L20.12 60.8189ZM16.5 60.3189C16.7533 59.6522 16.94 59.1722 17.06 58.8789V58.6389L16.5 57.1989C15.7533 57.4256 15.1733 57.6922 14.76 57.9989C14.4667 58.2256 14.32 58.4722 14.32 58.7389C14.32 58.9922 14.4667 59.2256 14.76 59.4389C14.9733 59.6656 15.2467 59.8522 15.58 59.9989C15.78 60.0922 16.0867 60.1989 16.5 60.3189ZM23.56 57.1389C23.4 57.5122 23.1933 58.0322 22.94 58.6989L22.92 58.7589C22.9067 58.7989 22.9133 58.8189 22.94 58.8189C23.1933 59.4856 23.4 60.0256 23.56 60.4389C23.72 60.3589 23.9667 60.2322 24.3 60.0589C24.74 59.8589 25.0533 59.6989 25.24 59.5789C25.5867 59.3522 25.76 59.0989 25.76 58.8189C25.76 58.5389 25.5933 58.2922 25.26 58.0789C25.0333 57.8789 24.6667 57.6589 24.16 57.4189C23.88 57.2989 23.68 57.2056 23.56 57.1389ZM16.88 56.4989C17.5467 56.4322 18.0667 56.3522 18.44 56.2589C18.4667 56.2589 18.4933 56.2456 18.52 56.2189L18.56 56.1989C18.8 55.8656 19.1333 55.4456 19.56 54.9389C19.2267 54.6589 18.9733 54.4522 18.8 54.3189C18.5067 54.0922 18.22 53.9256 17.94 53.8189C17.5933 53.6989 17.3133 53.7056 17.1 53.8389C16.8867 53.9589 16.7467 54.2056 16.68 54.5789C16.6533 54.8322 16.66 55.1256 16.7 55.4589C16.7267 55.6589 16.78 55.9722 16.86 56.3989L16.88 56.4989ZM23.12 56.4989C23.12 56.4856 23.1267 56.4522 23.14 56.3989C23.1667 56.3322 23.18 56.2856 23.18 56.2589C23.2733 55.8456 23.32 55.5256 23.32 55.2989C23.3467 54.9256 23.3 54.5989 23.18 54.3189C23.1267 54.1056 23.0267 53.9522 22.88 53.8589C22.7333 53.7656 22.5667 53.7322 22.38 53.7589C22.0467 53.8122 21.72 53.9456 21.4 54.1589C21.2 54.2789 20.9267 54.4989 20.58 54.8189L20.44 54.9389C20.6533 55.2322 20.9667 55.6322 21.38 56.1389L21.56 56.3189L23.12 56.5189V56.4989ZM16.88 60.9989C16.8667 61.0789 16.8467 61.1922 16.82 61.3389C16.74 61.7122 16.6933 61.9856 16.68 62.1589C16.6533 62.4656 16.68 62.7522 16.76 63.0189C16.8133 63.3256 16.94 63.5389 17.14 63.6589C17.3533 63.7789 17.62 63.7922 17.94 63.6989C18.2067 63.6189 18.48 63.4856 18.76 63.2989C18.92 63.1789 19.1533 62.9856 19.46 62.7189L19.62 62.5789C19.38 62.2456 19.0467 61.8256 18.62 61.3189C18.54 61.2389 18.48 61.1989 18.44 61.1989C17.96 61.1989 17.44 61.1322 16.88 60.9989ZM20.38 62.5789C20.5533 62.8056 20.8067 63.0389 21.14 63.2789C21.4467 63.5056 21.7333 63.6656 22 63.7589C22.6667 63.9589 23.06 63.7322 23.18 63.0789C23.2333 62.7856 23.2467 62.4656 23.22 62.1189C23.2067 61.9056 23.16 61.5856 23.08 61.1589L23.06 61.0789L22.66 61.1189C22.1 61.1589 21.6933 61.2256 21.44 61.3189C21.32 61.3856 21.2067 61.4789 21.1 61.5989C21.0333 61.6789 20.9467 61.7989 20.84 61.9589C20.7467 62.0922 20.6733 62.1989 20.62 62.2789C20.58 62.3456 20.5 62.4456 20.38 62.5789ZM20.76 56.1989C20.6667 56.0922 20.5333 55.9456 20.36 55.7589C20.2 55.5722 20.08 55.4256 20 55.3189L19.9 55.4589C19.6467 55.7789 19.4333 56.0256 19.26 56.1989H20.76ZM20.76 61.3189H19.32C19.4 61.4256 19.52 61.5722 19.68 61.7589C19.8533 61.9456 19.98 62.0922 20.06 62.1989C20.1533 62.0522 20.3067 61.8522 20.52 61.5989L20.76 61.3189ZM18.18 60.6989C18.1267 60.6056 18.0467 60.4656 17.94 60.2789C17.7133 59.9056 17.5467 59.6056 17.44 59.3789L17.06 60.4389C17.2867 60.5322 17.66 60.6189 18.18 60.6989ZM22.56 59.3789L21.82 60.6989L22.94 60.4989C22.8867 60.2322 22.76 59.8589 22.56 59.3789ZM17.44 58.1389L18.18 56.8189L17.06 56.9989L17.14 57.2589C17.2333 57.6456 17.3333 57.9389 17.44 58.1389ZM21.82 56.8189C21.9 56.9922 22.02 57.2056 22.18 57.4589C22.3533 57.6989 22.48 57.9056 22.56 58.0789C22.7333 57.5722 22.86 57.2189 22.94 57.0189C22.62 57.0056 22.2467 56.9389 21.82 56.8189Z" fill="#519ABA" />
+                </g>
+                <path d="M36.3608 56.7955C38.1064 56.7955 39.2363 58.1857 39.2363 60.3375C39.2363 62.4767 38.1001 63.8795 36.3608 63.8795C35.3833 63.8795 34.5962 63.4542 34.2217 62.7306H34.1201V66.0441H33.0283V56.9161H34.0693V58.0587H34.1709C34.6089 57.2716 35.4277 56.7955 36.3608 56.7955ZM36.1006 62.8956C37.3574 62.8956 38.1064 61.9371 38.1064 60.3375C38.1064 58.7379 37.3574 57.7794 36.1069 57.7794C34.8691 57.7794 34.0884 58.7633 34.0884 60.3375C34.0884 61.9054 34.8691 62.8956 36.1006 62.8956ZM40.9502 63.7589V56.9161H41.9912V57.9318H42.0928C42.2959 57.2653 43.083 56.7955 43.9907 56.7955C44.1685 56.7955 44.397 56.8082 44.5366 56.8273V57.9191C44.4478 57.8937 44.0542 57.8556 43.8384 57.8556C42.7974 57.8556 42.042 58.5538 42.042 59.5187V63.7589H40.9502ZM48.5229 63.8795C46.5742 63.8795 45.3682 62.5338 45.3682 60.3375C45.3682 58.1349 46.5742 56.7955 48.5229 56.7955C50.4717 56.7955 51.6777 58.1349 51.6777 60.3375C51.6777 62.5338 50.4717 63.8795 48.5229 63.8795ZM48.5229 62.8956C49.8179 62.8956 50.5479 61.9562 50.5479 60.3375C50.5479 58.7125 49.8179 57.7794 48.5229 57.7794C47.228 57.7794 46.498 58.7125 46.498 60.3375C46.498 61.9562 47.228 62.8956 48.5229 62.8956ZM53.9756 55.5958C53.5566 55.5958 53.2139 55.2531 53.2139 54.8341C53.2139 54.4152 53.5566 54.0724 53.9756 54.0724C54.3945 54.0724 54.7373 54.4152 54.7373 54.8341C54.7373 55.2531 54.3945 55.5958 53.9756 55.5958ZM54.5088 56.9161V64.0953C54.5088 65.5045 53.8486 66.1075 52.4141 66.1075H52.2236V65.1744H52.3887C53.1631 65.1744 53.417 64.8698 53.417 64.1144V56.9161H54.5088ZM61.123 61.9879H62.2148C61.8975 63.1559 60.8311 63.8795 59.333 63.8795C57.4351 63.8795 56.248 62.5084 56.248 60.3439C56.248 58.192 57.4541 56.7955 59.333 56.7955C61.1802 56.7955 62.3037 58.1095 62.3037 60.236V60.6549H57.3843V60.7057C57.4414 62.0577 58.1968 62.9147 59.3584 62.9147C60.2407 62.9147 60.8374 62.5909 61.123 61.9879ZM59.3203 57.7604C58.2285 57.7604 57.4668 58.5602 57.3843 59.7726H61.1548C61.1294 58.5602 60.4058 57.7604 59.3203 57.7604ZM69.6797 59.0109H68.5752C68.3975 58.3317 67.7944 57.7794 66.8105 57.7794C65.5791 57.7794 64.8047 58.7633 64.8047 60.3121C64.8047 61.8927 65.5918 62.8956 66.8105 62.8956C67.731 62.8956 68.3721 62.4703 68.5752 61.6959H69.6797C69.4829 62.9528 68.4609 63.8795 66.8169 63.8795C64.8999 63.8795 63.6748 62.4894 63.6748 60.3121C63.6748 58.1793 64.8936 56.7955 66.8105 56.7955C68.4736 56.7955 69.4893 57.7921 69.6797 59.0109ZM71.876 55.1451H72.9678V56.9161H74.4912V57.8302H72.9678V61.7023C72.9678 62.5084 73.2725 62.8512 73.9834 62.8512C74.1802 62.8512 74.2881 62.8448 74.4912 62.8258V63.7462C74.2754 63.7843 74.0659 63.8097 73.8501 63.8097C72.4409 63.8097 71.876 63.2892 71.876 61.9816V57.8302H70.7715V56.9161H71.876V55.1451ZM75.856 58.7887C75.856 57.6525 76.9541 56.7955 78.4077 56.7955C79.8423 56.7955 80.8389 57.5065 80.9849 58.63H79.9058C79.7598 58.0841 79.2266 57.7223 78.4014 57.7223C77.5889 57.7223 76.9541 58.1349 76.9541 58.7443C76.9541 59.214 77.335 59.506 78.1411 59.7028L79.1948 59.9567C80.4834 60.2677 81.1055 60.8263 81.1055 61.8102C81.1055 63.0353 79.9185 63.8795 78.3633 63.8795C76.8398 63.8795 75.7925 63.1495 75.6719 62.0133H76.7954C76.9795 62.5909 77.5254 62.9591 78.4014 62.9591C79.3218 62.9591 79.9819 62.5211 79.9819 61.8927C79.9819 61.423 79.6265 61.1056 78.8965 60.9279L77.7222 60.6422C76.4399 60.3312 75.856 59.7789 75.856 58.7887ZM83.7207 63.8224C83.27 63.8224 82.8955 63.4479 82.8955 62.9972C82.8955 62.5402 83.27 62.172 83.7207 62.172C84.1777 62.172 84.5459 62.5402 84.5459 62.9972C84.5459 63.4479 84.1777 63.8224 83.7207 63.8224ZM86.8818 55.1451H87.9736V56.9161H89.4971V57.8302H87.9736V61.7023C87.9736 62.5084 88.2783 62.8512 88.9893 62.8512C89.186 62.8512 89.2939 62.8448 89.4971 62.8258V63.7462C89.2812 63.7843 89.0718 63.8097 88.856 63.8097C87.4468 63.8097 86.8818 63.2892 86.8818 61.9816V57.8302H85.7773V56.9161H86.8818V55.1451ZM90.8618 58.7887C90.8618 57.6525 91.96 56.7955 93.4136 56.7955C94.8481 56.7955 95.8447 57.5065 95.9907 58.63H94.9116C94.7656 58.0841 94.2324 57.7223 93.4072 57.7223C92.5947 57.7223 91.96 58.1349 91.96 58.7443C91.96 59.214 92.3408 59.506 93.147 59.7028L94.2007 59.9567C95.4893 60.2677 96.1113 60.8263 96.1113 61.8102C96.1113 63.0353 94.9243 63.8795 93.3691 63.8795C91.8457 63.8795 90.7983 63.1495 90.6777 62.0133H91.8013C91.9854 62.5909 92.5312 62.9591 93.4072 62.9591C94.3276 62.9591 94.9878 62.5211 94.9878 61.8927C94.9878 61.423 94.6323 61.1056 93.9023 60.9279L92.728 60.6422C91.4458 60.3312 90.8618 59.7789 90.8618 58.7887ZM100.117 61.1945H100.015L98.3901 63.778H97.1523L99.4946 60.3566L97.127 56.9352H98.4282L100.053 59.4806H100.155L101.761 56.9352H102.999L100.675 60.3121L103.03 63.778H101.735L100.117 61.1945Z" fill="var(--vscode-gitDecoration-stageModifiedResourceForeground, #E2C08D)" />
+                <path d="M116 54.7589C116.356 54.7589 116.711 54.8122 117.067 54.9189C117.742 55.0967 118.329 55.4345 118.827 55.9322C119.324 56.43 119.662 57.0167 119.84 57.6922C119.947 58.0478 120 58.4034 120 58.7589C120 59.1145 119.947 59.47 119.84 59.8256C119.662 60.5011 119.324 61.0878 118.827 61.5856C118.329 62.0834 117.742 62.4211 117.067 62.5989C116.711 62.7056 116.356 62.7589 116 62.7589C115.644 62.7589 115.289 62.7056 114.933 62.5989C114.258 62.4211 113.671 62.0834 113.173 61.5856C112.676 61.0878 112.338 60.5011 112.16 59.8256C112.053 59.47 112 59.1145 112 58.7589C112 58.4034 112.036 58.0656 112.107 57.7456C112.213 57.39 112.356 57.0522 112.533 56.7322C112.889 56.1278 113.369 55.6478 113.973 55.2922C114.293 55.1145 114.613 54.99 114.933 54.9189C115.289 54.8122 115.644 54.7589 116 54.7589Z" fill="var(--vscode-titleBar-activeForeground, #CCCCCC)" />
+              </g>
+              <g>
+                <g>
+                  <rect width="122" height="35" transform="translate(136 41.2589)" fill="var(--vscode-editorWidget-background, #181818)" />
+                  <g>
+                    <path d="M159.76 60.8789C159.76 60.9189 159.76 60.9722 159.76 61.0389C159.84 61.8522 159.88 62.4656 159.88 62.8789C159.88 63.2789 159.78 63.6122 159.58 63.8789C159.38 64.1456 159.127 64.2922 158.82 64.3189C158.513 64.3856 158.18 64.3456 157.82 64.1989C157.553 64.0656 157.18 63.8389 156.7 63.5189C156.393 63.3189 156.16 63.1722 156 63.0789C155.587 63.4122 155.253 63.6589 155 63.8189C154.787 63.9656 154.58 64.0722 154.38 64.1389C154.007 64.2989 153.66 64.3522 153.34 64.2989C153.02 64.2322 152.76 64.0722 152.56 63.8189C152.373 63.5656 152.273 63.2322 152.26 62.8189C152.26 62.4056 152.3 61.7389 152.38 60.8189C151.873 60.6589 151.493 60.4922 151.24 60.3189C150.907 60.1589 150.573 59.9122 150.24 59.5789C149.973 59.2989 149.847 58.9989 149.86 58.6789C149.873 58.3456 150.027 58.0389 150.32 57.7589C150.533 57.5056 150.82 57.2922 151.18 57.1189C151.393 56.9989 151.727 56.8589 152.18 56.6989C152.207 56.6989 152.247 56.6922 152.3 56.6789C152.367 56.6522 152.413 56.6389 152.44 56.6389L152.26 55.2589C152.247 54.9656 152.287 54.5722 152.38 54.0789C152.473 53.7322 152.66 53.4856 152.94 53.3389C153.233 53.1922 153.567 53.1656 153.94 53.2589C154.273 53.3389 154.607 53.4856 154.94 53.6989C155.18 53.8456 155.453 54.0522 155.76 54.3189C155.813 54.3456 155.873 54.4056 155.94 54.4989L156 54.5789C156.667 54.0722 157.187 53.7122 157.56 53.4989C157.987 53.2189 158.407 53.1389 158.82 53.2589C159.127 53.3256 159.367 53.4922 159.54 53.7589C159.727 54.0122 159.84 54.3456 159.88 54.7589V55.7589C159.88 55.8922 159.847 56.0922 159.78 56.3589C159.74 56.5322 159.707 56.6656 159.68 56.7589C160.053 56.8789 160.407 57.0256 160.74 57.1989C161.087 57.3589 161.333 57.4922 161.48 57.5989C161.733 57.7722 161.933 57.9722 162.08 58.1989C162.227 58.4122 162.3 58.6389 162.3 58.8789C162.3 59.1189 162.227 59.3522 162.08 59.5789C161.933 59.7922 161.733 59.9856 161.48 60.1589C161.32 60.2656 161.073 60.4056 160.74 60.5789C160.5 60.6189 160.167 60.7189 159.74 60.8789H159.76ZM156.12 60.8189C156.187 60.8189 156.293 60.8122 156.44 60.7989C156.64 60.7722 156.787 60.7589 156.88 60.7589C157.053 60.7589 157.2 60.6722 157.32 60.4989C157.733 59.8322 158.02 59.3122 158.18 58.9389C158.22 58.8856 158.24 58.8189 158.24 58.7389C158.24 58.6589 158.22 58.6056 158.18 58.5789C157.98 58.1922 157.667 57.6722 157.24 57.0189C157.187 56.8856 157.087 56.8189 156.94 56.8189C156.233 56.8189 155.693 56.7989 155.32 56.7589C154.987 56.7589 154.733 56.9056 154.56 57.1989C154.4 57.4522 154.273 57.6589 154.18 57.8189L153.9 58.3389C153.78 58.5122 153.707 58.6389 153.68 58.7189C153.667 58.7856 153.667 58.8589 153.68 58.9389C153.707 59.0056 153.78 59.1322 153.9 59.3189L154.18 59.8189L154.42 60.2189C154.553 60.4322 154.647 60.5656 154.7 60.6189C154.78 60.7122 154.873 60.7656 154.98 60.7789C155.06 60.7922 155.227 60.7989 155.48 60.7989L156.12 60.8189ZM152.5 60.3189C152.753 59.6522 152.94 59.1722 153.06 58.8789V58.6389L152.5 57.1989C151.753 57.4256 151.173 57.6922 150.76 57.9989C150.467 58.2256 150.32 58.4722 150.32 58.7389C150.32 58.9922 150.467 59.2256 150.76 59.4389C150.973 59.6656 151.247 59.8522 151.58 59.9989C151.78 60.0922 152.087 60.1989 152.5 60.3189ZM159.56 57.1389C159.4 57.5122 159.193 58.0322 158.94 58.6989L158.92 58.7589C158.907 58.7989 158.913 58.8189 158.94 58.8189C159.193 59.4856 159.4 60.0256 159.56 60.4389C159.72 60.3589 159.967 60.2322 160.3 60.0589C160.74 59.8589 161.053 59.6989 161.24 59.5789C161.587 59.3522 161.76 59.0989 161.76 58.8189C161.76 58.5389 161.593 58.2922 161.26 58.0789C161.033 57.8789 160.667 57.6589 160.16 57.4189C159.88 57.2989 159.68 57.2056 159.56 57.1389ZM152.88 56.4989C153.547 56.4322 154.067 56.3522 154.44 56.2589C154.467 56.2589 154.493 56.2456 154.52 56.2189L154.56 56.1989C154.8 55.8656 155.133 55.4456 155.56 54.9389C155.227 54.6589 154.973 54.4522 154.8 54.3189C154.507 54.0922 154.22 53.9256 153.94 53.8189C153.593 53.6989 153.313 53.7056 153.1 53.8389C152.887 53.9589 152.747 54.2056 152.68 54.5789C152.653 54.8322 152.66 55.1256 152.7 55.4589C152.727 55.6589 152.78 55.9722 152.86 56.3989L152.88 56.4989ZM159.12 56.4989C159.12 56.4856 159.127 56.4522 159.14 56.3989C159.167 56.3322 159.18 56.2856 159.18 56.2589C159.273 55.8456 159.32 55.5256 159.32 55.2989C159.347 54.9256 159.3 54.5989 159.18 54.3189C159.127 54.1056 159.027 53.9522 158.88 53.8589C158.733 53.7656 158.567 53.7322 158.38 53.7589C158.047 53.8122 157.72 53.9456 157.4 54.1589C157.2 54.2789 156.927 54.4989 156.58 54.8189L156.44 54.9389C156.653 55.2322 156.967 55.6322 157.38 56.1389L157.56 56.3189L159.12 56.5189V56.4989ZM152.88 60.9989C152.867 61.0789 152.847 61.1922 152.82 61.3389C152.74 61.7122 152.693 61.9856 152.68 62.1589C152.653 62.4656 152.68 62.7522 152.76 63.0189C152.813 63.3256 152.94 63.5389 153.14 63.6589C153.353 63.7789 153.62 63.7922 153.94 63.6989C154.207 63.6189 154.48 63.4856 154.76 63.2989C154.92 63.1789 155.153 62.9856 155.46 62.7189L155.62 62.5789C155.38 62.2456 155.047 61.8256 154.62 61.3189C154.54 61.2389 154.48 61.1989 154.44 61.1989C153.96 61.1989 153.44 61.1322 152.88 60.9989ZM156.38 62.5789C156.553 62.8056 156.807 63.0389 157.14 63.2789C157.447 63.5056 157.733 63.6656 158 63.7589C158.667 63.9589 159.06 63.7322 159.18 63.0789C159.233 62.7856 159.247 62.4656 159.22 62.1189C159.207 61.9056 159.16 61.5856 159.08 61.1589L159.06 61.0789L158.66 61.1189C158.1 61.1589 157.693 61.2256 157.44 61.3189C157.32 61.3856 157.207 61.4789 157.1 61.5989C157.033 61.6789 156.947 61.7989 156.84 61.9589C156.747 62.0922 156.673 62.1989 156.62 62.2789C156.58 62.3456 156.5 62.4456 156.38 62.5789ZM156.76 56.1989C156.667 56.0922 156.533 55.9456 156.36 55.7589C156.2 55.5722 156.08 55.4256 156 55.3189L155.9 55.4589C155.647 55.7789 155.433 56.0256 155.26 56.1989H156.76ZM156.76 61.3189H155.32C155.4 61.4256 155.52 61.5722 155.68 61.7589C155.853 61.9456 155.98 62.0922 156.06 62.1989C156.153 62.0522 156.307 61.8522 156.52 61.5989L156.76 61.3189ZM154.18 60.6989C154.127 60.6056 154.047 60.4656 153.94 60.2789C153.713 59.9056 153.547 59.6056 153.44 59.3789L153.06 60.4389C153.287 60.5322 153.66 60.6189 154.18 60.6989ZM158.56 59.3789L157.82 60.6989L158.94 60.4989C158.887 60.2322 158.76 59.8589 158.56 59.3789ZM153.44 58.1389L154.18 56.8189L153.06 56.9989L153.14 57.2589C153.233 57.6456 153.333 57.9389 153.44 58.1389ZM157.82 56.8189C157.9 56.9922 158.02 57.2056 158.18 57.4589C158.353 57.6989 158.48 57.9056 158.56 58.0789C158.733 57.5722 158.86 57.2189 158.94 57.0189C158.62 57.0056 158.247 56.9389 157.82 56.8189Z" fill="#519ABA" />
+                  </g>
+                  <path d="M169.701 54.1993H172.456V55.0626H170.768V64.8444H172.456V65.7076H169.701V54.1993ZM173.833 58.7887C173.833 57.6525 174.932 56.7955 176.385 56.7955C177.82 56.7955 178.816 57.5065 178.962 58.63H177.883C177.737 58.0841 177.204 57.7223 176.379 57.7223C175.566 57.7223 174.932 58.1349 174.932 58.7443C174.932 59.214 175.312 59.506 176.119 59.7028L177.172 59.9567C178.461 60.2677 179.083 60.8263 179.083 61.8102C179.083 63.0353 177.896 63.8795 176.341 63.8795C174.817 63.8795 173.77 63.1495 173.649 62.0133H174.773C174.957 62.5909 175.503 62.9591 176.379 62.9591C177.299 62.9591 177.959 62.5211 177.959 61.8927C177.959 61.423 177.604 61.1056 176.874 60.9279L175.7 60.6422C174.417 60.3312 173.833 59.7789 173.833 58.7887ZM180.86 63.7589V54.1993H181.952V63.7589H180.86ZM189.607 56.9161V63.7589H188.566V62.6862H188.465C188.122 63.4479 187.392 63.8795 186.345 63.8795C184.809 63.8795 184.009 62.9655 184.009 61.3468V56.9161H185.101V61.0802C185.101 62.3116 185.558 62.8829 186.649 62.8829C187.855 62.8829 188.516 62.1656 188.516 60.9659V56.9161H189.607ZM194.482 66.3868C192.832 66.3868 191.778 65.6442 191.613 64.5143H192.769C192.889 65.0729 193.499 65.4347 194.482 65.4347C195.708 65.4347 196.438 64.8317 196.438 63.8224V62.4767H196.336C195.904 63.2321 195.13 63.6573 194.19 63.6573C192.419 63.6573 191.321 62.2863 191.321 60.236C191.321 58.1857 192.432 56.7955 194.19 56.7955C195.149 56.7955 195.993 57.2653 196.387 58.0016H196.488V56.9161H197.529V63.8795C197.529 65.4093 196.349 66.3868 194.482 66.3868ZM194.432 62.6925C195.701 62.6925 196.463 61.7277 196.463 60.236C196.463 58.7443 195.695 57.7794 194.432 57.7794C193.162 57.7794 192.451 58.7443 192.451 60.236C192.451 61.7277 193.162 62.6925 194.432 62.6925ZM201.82 65.7076H199.065V64.8444H200.754V55.0626H199.065V54.1993H201.82V65.7076ZM205.451 63.8224C205 63.8224 204.626 63.4479 204.626 62.9972C204.626 62.5402 205 62.172 205.451 62.172C205.908 62.172 206.276 62.5402 206.276 62.9972C206.276 63.4479 205.908 63.8224 205.451 63.8224ZM208.612 55.1451H209.704V56.9161H211.228V57.8302H209.704V61.7023C209.704 62.5084 210.009 62.8512 210.72 62.8512C210.917 62.8512 211.024 62.8448 211.228 62.8258V63.7462C211.012 63.7843 210.802 63.8097 210.586 63.8097C209.177 63.8097 208.612 63.2892 208.612 61.9816V57.8302H207.508V56.9161H208.612V55.1451ZM212.592 58.7887C212.592 57.6525 213.69 56.7955 215.144 56.7955C216.579 56.7955 217.575 57.5065 217.721 58.63H216.642C216.496 58.0841 215.963 57.7223 215.138 57.7223C214.325 57.7223 213.69 58.1349 213.69 58.7443C213.69 59.214 214.071 59.506 214.877 59.7028L215.931 59.9567C217.22 60.2677 217.842 60.8263 217.842 61.8102C217.842 63.0353 216.655 63.8795 215.1 63.8795C213.576 63.8795 212.529 63.1495 212.408 62.0133H213.532C213.716 62.5909 214.262 62.9591 215.138 62.9591C216.058 62.9591 216.718 62.5211 216.718 61.8927C216.718 61.423 216.363 61.1056 215.633 60.9279L214.458 60.6422C213.176 60.3312 212.592 59.7789 212.592 58.7887ZM221.847 61.1945H221.746L220.121 63.778H218.883L221.225 60.3566L218.857 56.9352H220.159L221.784 59.4806H221.885L223.491 56.9352H224.729L222.406 60.3121L224.761 63.778H223.466L221.847 61.1945Z" fill="var(--vscode-gitDecoration-addedResourceForeground, #81B88B)" />
+                </g>
+              </g>
+            </g>
+            <g>
+              <g clip-path="url(#clip1_304_6548)">
+                <mask fill="var(--vscode-activityBar-activeBorder, #FFFFFF)">
+                  <path d="M0 76.2589H596V472.259H0V76.2589Z" />
+                </mask>
+                <path d="M0 76.2589H596V472.259H0V76.2589Z" fill="var(--vscode-editor-background, #1F1F1F)" />
+                <g>
+                  <g clip-path="url(#clip2_304_6548)">
+                    <path d="M33.3516 100.269H35.1914V93.6593L32.9883 94.7198V93.5831L35.1797 92.5402H36.3633V100.269H38.1797V101.259H33.3516V100.269ZM33.9551 118.263H37.9746V119.259H32.6602V118.263C33.3906 117.493 34.0293 116.814 34.5762 116.224C35.123 115.634 35.5 115.218 35.707 114.976C36.0977 114.499 36.3613 114.114 36.498 113.821C36.6348 113.525 36.7031 113.222 36.7031 112.913C36.7031 112.425 36.5586 112.042 36.2695 111.765C35.9844 111.487 35.5918 111.349 35.0918 111.349C34.7363 111.349 34.3633 111.413 33.9727 111.542C33.582 111.671 33.168 111.866 32.7305 112.128V110.933C33.1328 110.741 33.5273 110.597 33.9141 110.499C34.3047 110.401 34.6895 110.353 35.0684 110.353C35.9238 110.353 36.6113 110.581 37.1309 111.038C37.6543 111.491 37.916 112.087 37.916 112.825C37.916 113.2 37.8281 113.575 37.6523 113.95C37.4805 114.325 37.1992 114.739 36.8086 115.193C36.5898 115.446 36.2715 115.798 35.8535 116.247C35.4395 116.696 34.8066 117.368 33.9551 118.263ZM36.3164 132.577C36.8906 132.73 37.3301 133.001 37.6348 133.392C37.9395 133.778 38.0918 134.263 38.0918 134.845C38.0918 135.65 37.8203 136.282 37.2773 136.743C36.7383 137.2 35.9902 137.429 35.0332 137.429C34.6309 137.429 34.2207 137.392 33.8027 137.318C33.3848 137.243 32.9746 137.136 32.5723 136.995V135.818C32.9707 136.025 33.3633 136.179 33.75 136.28C34.1367 136.382 34.5215 136.433 34.9043 136.433C35.5527 136.433 36.0508 136.286 36.3984 135.993C36.7461 135.7 36.9199 135.278 36.9199 134.728C36.9199 134.22 36.7461 133.818 36.3984 133.521C36.0508 133.22 35.5801 133.069 34.9863 133.069H34.084V132.097H34.9863C35.5293 132.097 35.9531 131.978 36.2578 131.739C36.5625 131.501 36.7148 131.169 36.7148 130.743C36.7148 130.294 36.5723 129.95 36.2871 129.712C36.0059 129.47 35.6035 129.349 35.0801 129.349C34.7324 129.349 34.373 129.388 34.002 129.466C33.6309 129.544 33.2422 129.661 32.8359 129.818V128.728C33.3086 128.603 33.7285 128.509 34.0957 128.446C34.4668 128.384 34.7949 128.353 35.0801 128.353C35.9316 128.353 36.6113 128.568 37.1191 128.997C37.6309 129.423 37.8867 129.989 37.8867 130.696C37.8867 131.177 37.752 131.577 37.4824 131.898C37.2168 132.218 36.8281 132.444 36.3164 132.577ZM36.0762 147.589L33.3164 152.212H36.0762V147.589ZM35.8828 146.511H37.2539V152.212H38.4199V153.173H37.2539V155.259H36.0762V153.173H32.3672V152.054L35.8828 146.511ZM32.9824 164.511H37.4121V165.507H34.0605V167.657C34.2285 167.595 34.3965 167.55 34.5645 167.523C34.7363 167.491 34.9082 167.476 35.0801 167.476C35.9863 167.476 36.7051 167.743 37.2363 168.278C37.7676 168.814 38.0332 169.538 38.0332 170.452C38.0332 171.374 37.7539 172.101 37.1953 172.632C36.6406 173.163 35.8809 173.429 34.916 173.429C34.4512 173.429 34.0254 173.398 33.6387 173.335C33.2559 173.273 32.9121 173.179 32.6074 173.054V171.853C32.9668 172.048 33.3281 172.194 33.6914 172.292C34.0547 172.386 34.4258 172.433 34.8047 172.433C35.457 172.433 35.959 172.261 36.3105 171.917C36.666 171.573 36.8438 171.085 36.8438 170.452C36.8438 169.827 36.6602 169.341 36.293 168.993C35.9297 168.646 35.4219 168.472 34.7695 168.472C34.4531 168.472 34.1445 168.509 33.8438 168.583C33.543 168.653 33.2559 168.761 32.9824 168.905V164.511ZM37.5762 182.704V183.794C37.3301 183.65 37.0684 183.54 36.791 183.466C36.5137 183.388 36.2246 183.349 35.9238 183.349C35.1738 183.349 34.6055 183.632 34.2188 184.198C33.832 184.761 33.6387 185.591 33.6387 186.689C33.8262 186.298 34.0859 185.999 34.418 185.792C34.75 185.581 35.1309 185.476 35.5605 185.476C36.4043 185.476 37.0566 185.735 37.5176 186.255C37.9824 186.771 38.2148 187.503 38.2148 188.452C38.2148 189.398 37.9766 190.13 37.5 190.65C37.0234 191.169 36.3535 191.429 35.4902 191.429C34.4746 191.429 33.7305 191.066 33.2578 190.339C32.7852 189.609 32.5488 188.46 32.5488 186.894C32.5488 185.417 32.832 184.292 33.3984 183.519C33.9688 182.741 34.793 182.353 35.8711 182.353C36.1602 182.353 36.4492 182.384 36.7383 182.446C37.0273 182.505 37.3066 182.591 37.5762 182.704ZM35.4668 186.401C34.9629 186.401 34.5664 186.583 34.2773 186.946C33.9883 187.31 33.8438 187.812 33.8438 188.452C33.8438 189.093 33.9883 189.595 34.2773 189.958C34.5664 190.321 34.9629 190.503 35.4668 190.503C35.9902 190.503 36.3848 190.331 36.6504 189.987C36.916 189.64 37.0488 189.128 37.0488 188.452C37.0488 187.773 36.916 187.261 36.6504 186.917C36.3848 186.573 35.9902 186.401 35.4668 186.401ZM32.584 200.511H38.0918V201.015L34.9629 209.259H33.7266L36.7734 201.507H32.584V200.511ZM35.3789 223.105C34.8516 223.105 34.4434 223.253 34.1543 223.55C33.8691 223.843 33.7266 224.259 33.7266 224.798C33.7266 225.337 33.8711 225.757 34.1602 226.058C34.4531 226.355 34.8594 226.503 35.3789 226.503C35.9102 226.503 36.3184 226.357 36.6035 226.064C36.8926 225.767 37.0371 225.345 37.0371 224.798C37.0371 224.263 36.8906 223.847 36.5977 223.55C36.3086 223.253 35.9023 223.105 35.3789 223.105ZM34.3477 222.612C33.8438 222.484 33.4492 222.243 33.1641 221.892C32.8828 221.54 32.7422 221.116 32.7422 220.62C32.7422 219.925 32.9785 219.374 33.4512 218.968C33.9238 218.558 34.5664 218.353 35.3789 218.353C36.1953 218.353 36.8398 218.558 37.3125 218.968C37.7852 219.374 38.0215 219.925 38.0215 220.62C38.0215 221.116 37.8789 221.54 37.5938 221.892C37.3125 222.243 36.9199 222.484 36.416 222.612C37.002 222.741 37.4492 223.001 37.7578 223.392C38.0703 223.782 38.2266 224.288 38.2266 224.909C38.2266 225.698 37.9746 226.316 37.4707 226.761C36.9668 227.206 36.2695 227.429 35.3789 227.429C34.4883 227.429 33.791 227.208 33.2871 226.767C32.7871 226.321 32.5371 225.706 32.5371 224.921C32.5371 224.296 32.6914 223.788 33 223.398C33.3125 223.003 33.7617 222.741 34.3477 222.612ZM33.9199 220.732C33.9199 221.2 34.0449 221.558 34.2949 221.804C34.5449 222.05 34.9062 222.173 35.3789 222.173C35.8555 222.173 36.2188 222.05 36.4688 221.804C36.7188 221.558 36.8438 221.2 36.8438 220.732C36.8438 220.255 36.7188 219.892 36.4688 219.642C36.2227 219.392 35.8594 219.267 35.3789 219.267C34.9062 219.267 34.5449 219.394 34.2949 219.648C34.0449 219.898 33.9199 220.259 33.9199 220.732ZM35.2617 241.38C35.7656 241.38 36.1602 241.198 36.4453 240.835C36.7344 240.472 36.8789 239.97 36.8789 239.329C36.8789 238.689 36.7344 238.187 36.4453 237.823C36.1602 237.46 35.7656 237.278 35.2617 237.278C34.7383 237.278 34.3438 237.452 34.0781 237.8C33.8125 238.144 33.6797 238.653 33.6797 239.329C33.6797 240.009 33.8105 240.521 34.0723 240.864C34.3379 241.208 34.7344 241.38 35.2617 241.38ZM33.1523 245.077V243.987C33.3984 244.132 33.6602 244.243 33.9375 244.321C34.2148 244.396 34.5039 244.433 34.8047 244.433C35.5547 244.433 36.1211 244.151 36.5039 243.589C36.8906 243.023 37.084 242.191 37.084 241.093C36.9004 241.484 36.6426 241.784 36.3105 241.995C35.9785 242.202 35.5977 242.306 35.168 242.306C34.3242 242.306 33.6699 242.046 33.2051 241.526C32.7441 241.007 32.5137 240.271 32.5137 239.318C32.5137 238.376 32.75 237.648 33.2227 237.132C33.6992 236.612 34.3711 236.353 35.2383 236.353C36.2539 236.353 36.998 236.718 37.4707 237.448C37.9434 238.179 38.1797 239.327 38.1797 240.894C38.1797 242.366 37.8945 243.491 37.3242 244.269C36.7578 245.042 35.9336 245.429 34.8516 245.429C34.5664 245.429 34.2793 245.398 33.9902 245.335C33.7012 245.276 33.4219 245.191 33.1523 245.077ZM26.1211 262.269H27.9609V255.659L25.7578 256.72V255.583L27.9492 254.54H29.1328V262.269H30.9492V263.259H26.1211V262.269ZM35.3789 254.382C36.3125 254.382 37.0176 254.763 37.4941 255.525C37.9746 256.286 38.2148 257.413 38.2148 258.905C38.2148 260.398 37.9746 261.525 37.4941 262.286C37.0176 263.048 36.3125 263.429 35.3789 263.429C34.4453 263.429 33.7402 263.048 33.2637 262.286C32.7871 261.525 32.5488 260.398 32.5488 258.905C32.5488 257.413 32.7871 256.286 33.2637 255.525C33.7402 254.763 34.4453 254.382 35.3789 254.382ZM35.3789 262.491C35.9336 262.491 36.3457 262.196 36.6152 261.607C36.8887 261.017 37.0254 260.116 37.0254 258.905C37.0254 258.261 36.9863 257.679 36.9082 257.159L34.1191 261.525C34.4121 262.169 34.832 262.491 35.3789 262.491ZM35.3789 255.319C34.8281 255.319 34.416 255.614 34.1426 256.204C33.873 256.794 33.7383 257.694 33.7383 258.905C33.7383 259.456 33.7754 259.972 33.8496 260.452L36.5801 256.099C36.2832 255.579 35.8828 255.319 35.3789 255.319ZM26.1211 280.269H27.9609V273.659L25.7578 274.72V273.583L27.9492 272.54H29.1328V280.269H30.9492V281.259H26.1211V280.269ZM33.3516 280.269H35.1914V273.659L32.9883 274.72V273.583L35.1797 272.54H36.3633V280.269H38.1797V281.259H33.3516V280.269ZM26.1211 298.269H27.9609V291.659L25.7578 292.72V291.583L27.9492 290.54H29.1328V298.269H30.9492V299.259H26.1211V298.269ZM33.9551 298.263H37.9746V299.259H32.6602V298.263C33.3906 297.493 34.0293 296.814 34.5762 296.224C35.123 295.634 35.5 295.218 35.707 294.976C36.0977 294.499 36.3613 294.114 36.498 293.821C36.6348 293.525 36.7031 293.222 36.7031 292.913C36.7031 292.425 36.5586 292.042 36.2695 291.765C35.9844 291.487 35.5918 291.349 35.0918 291.349C34.7363 291.349 34.3633 291.413 33.9727 291.542C33.582 291.671 33.168 291.866 32.7305 292.128V290.933C33.1328 290.741 33.5273 290.597 33.9141 290.499C34.3047 290.401 34.6895 290.353 35.0684 290.353C35.9238 290.353 36.6113 290.581 37.1309 291.038C37.6543 291.491 37.916 292.087 37.916 292.825C37.916 293.2 37.8281 293.575 37.6523 293.95C37.4805 294.325 37.1992 294.739 36.8086 295.193C36.5898 295.446 36.2715 295.798 35.8535 296.247C35.4395 296.696 34.8066 297.368 33.9551 298.263ZM26.1211 316.269H27.9609V309.659L25.7578 310.72V309.583L27.9492 308.54H29.1328V316.269H30.9492V317.259H26.1211V316.269ZM36.3164 312.577C36.8906 312.73 37.3301 313.001 37.6348 313.392C37.9395 313.778 38.0918 314.263 38.0918 314.845C38.0918 315.65 37.8203 316.282 37.2773 316.743C36.7383 317.2 35.9902 317.429 35.0332 317.429C34.6309 317.429 34.2207 317.392 33.8027 317.318C33.3848 317.243 32.9746 317.136 32.5723 316.995V315.818C32.9707 316.025 33.3633 316.179 33.75 316.28C34.1367 316.382 34.5215 316.433 34.9043 316.433C35.5527 316.433 36.0508 316.286 36.3984 315.993C36.7461 315.7 36.9199 315.278 36.9199 314.728C36.9199 314.22 36.7461 313.818 36.3984 313.521C36.0508 313.22 35.5801 313.069 34.9863 313.069H34.084V312.097H34.9863C35.5293 312.097 35.9531 311.978 36.2578 311.739C36.5625 311.501 36.7148 311.169 36.7148 310.743C36.7148 310.294 36.5723 309.95 36.2871 309.712C36.0059 309.47 35.6035 309.349 35.0801 309.349C34.7324 309.349 34.373 309.388 34.002 309.466C33.6309 309.544 33.2422 309.661 32.8359 309.818V308.728C33.3086 308.603 33.7285 308.509 34.0957 308.446C34.4668 308.384 34.7949 308.353 35.0801 308.353C35.9316 308.353 36.6113 308.568 37.1191 308.997C37.6309 309.423 37.8867 309.989 37.8867 310.696C37.8867 311.177 37.752 311.577 37.4824 311.898C37.2168 312.218 36.8281 312.444 36.3164 312.577ZM26.1211 334.269H27.9609V327.659L25.7578 328.72V327.583L27.9492 326.54H29.1328V334.269H30.9492V335.259H26.1211V334.269ZM36.0762 327.589L33.3164 332.212H36.0762V327.589ZM35.8828 326.511H37.2539V332.212H38.4199V333.173H37.2539V335.259H36.0762V333.173H32.3672V332.054L35.8828 326.511ZM26.1211 352.269H27.9609V345.659L25.7578 346.72V345.583L27.9492 344.54H29.1328V352.269H30.9492V353.259H26.1211V352.269ZM32.9824 344.511H37.4121V345.507H34.0605V347.657C34.2285 347.595 34.3965 347.55 34.5645 347.523C34.7363 347.491 34.9082 347.476 35.0801 347.476C35.9863 347.476 36.7051 347.743 37.2363 348.278C37.7676 348.814 38.0332 349.538 38.0332 350.452C38.0332 351.374 37.7539 352.101 37.1953 352.632C36.6406 353.163 35.8809 353.429 34.916 353.429C34.4512 353.429 34.0254 353.398 33.6387 353.335C33.2559 353.273 32.9121 353.179 32.6074 353.054V351.853C32.9668 352.048 33.3281 352.194 33.6914 352.292C34.0547 352.386 34.4258 352.433 34.8047 352.433C35.457 352.433 35.959 352.261 36.3105 351.917C36.666 351.573 36.8438 351.085 36.8438 350.452C36.8438 349.827 36.6602 349.341 36.293 348.993C35.9297 348.646 35.4219 348.472 34.7695 348.472C34.4531 348.472 34.1445 348.509 33.8438 348.583C33.543 348.653 33.2559 348.761 32.9824 348.905V344.511ZM26.1211 370.269H27.9609V363.659L25.7578 364.72V363.583L27.9492 362.54H29.1328V370.269H30.9492V371.259H26.1211V370.269ZM37.5762 362.704V363.794C37.3301 363.65 37.0684 363.54 36.791 363.466C36.5137 363.388 36.2246 363.349 35.9238 363.349C35.1738 363.349 34.6055 363.632 34.2188 364.198C33.832 364.761 33.6387 365.591 33.6387 366.689C33.8262 366.298 34.0859 365.999 34.418 365.792C34.75 365.581 35.1309 365.476 35.5605 365.476C36.4043 365.476 37.0566 365.735 37.5176 366.255C37.9824 366.771 38.2148 367.503 38.2148 368.452C38.2148 369.398 37.9766 370.13 37.5 370.65C37.0234 371.169 36.3535 371.429 35.4902 371.429C34.4746 371.429 33.7305 371.066 33.2578 370.339C32.7852 369.609 32.5488 368.46 32.5488 366.894C32.5488 365.417 32.832 364.292 33.3984 363.519C33.9688 362.741 34.793 362.353 35.8711 362.353C36.1602 362.353 36.4492 362.384 36.7383 362.446C37.0273 362.505 37.3066 362.591 37.5762 362.704ZM35.4668 366.401C34.9629 366.401 34.5664 366.583 34.2773 366.946C33.9883 367.31 33.8438 367.812 33.8438 368.452C33.8438 369.093 33.9883 369.595 34.2773 369.958C34.5664 370.321 34.9629 370.503 35.4668 370.503C35.9902 370.503 36.3848 370.331 36.6504 369.987C36.916 369.64 37.0488 369.128 37.0488 368.452C37.0488 367.773 36.916 367.261 36.6504 366.917C36.3848 366.573 35.9902 366.401 35.4668 366.401ZM26.1211 388.269H27.9609V381.659L25.7578 382.72V381.583L27.9492 380.54H29.1328V388.269H30.9492V389.259H26.1211V388.269ZM32.584 380.511H38.0918V381.015L34.9629 389.259H33.7266L36.7734 381.507H32.584V380.511ZM26.1211 406.269H27.9609V399.659L25.7578 400.72V399.583L27.9492 398.54H29.1328V406.269H30.9492V407.259H26.1211V406.269ZM35.3789 403.105C34.8516 403.105 34.4434 403.253 34.1543 403.55C33.8691 403.843 33.7266 404.259 33.7266 404.798C33.7266 405.337 33.8711 405.757 34.1602 406.058C34.4531 406.355 34.8594 406.503 35.3789 406.503C35.9102 406.503 36.3184 406.357 36.6035 406.064C36.8926 405.767 37.0371 405.345 37.0371 404.798C37.0371 404.263 36.8906 403.847 36.5977 403.55C36.3086 403.253 35.9023 403.105 35.3789 403.105ZM34.3477 402.612C33.8438 402.484 33.4492 402.243 33.1641 401.892C32.8828 401.54 32.7422 401.116 32.7422 400.62C32.7422 399.925 32.9785 399.374 33.4512 398.968C33.9238 398.558 34.5664 398.353 35.3789 398.353C36.1953 398.353 36.8398 398.558 37.3125 398.968C37.7852 399.374 38.0215 399.925 38.0215 400.62C38.0215 401.116 37.8789 401.54 37.5938 401.892C37.3125 402.243 36.9199 402.484 36.416 402.612C37.002 402.741 37.4492 403.001 37.7578 403.392C38.0703 403.782 38.2266 404.288 38.2266 404.909C38.2266 405.698 37.9746 406.316 37.4707 406.761C36.9668 407.206 36.2695 407.429 35.3789 407.429C34.4883 407.429 33.791 407.208 33.2871 406.767C32.7871 406.321 32.5371 405.706 32.5371 404.921C32.5371 404.296 32.6914 403.788 33 403.398C33.3125 403.003 33.7617 402.741 34.3477 402.612ZM33.9199 400.732C33.9199 401.2 34.0449 401.558 34.2949 401.804C34.5449 402.05 34.9062 402.173 35.3789 402.173C35.8555 402.173 36.2188 402.05 36.4688 401.804C36.7188 401.558 36.8438 401.2 36.8438 400.732C36.8438 400.255 36.7188 399.892 36.4688 399.642C36.2227 399.392 35.8594 399.267 35.3789 399.267C34.9062 399.267 34.5449 399.394 34.2949 399.648C34.0449 399.898 33.9199 400.259 33.9199 400.732ZM26.1211 424.269H27.9609V417.659L25.7578 418.72V417.583L27.9492 416.54H29.1328V424.269H30.9492V425.259H26.1211V424.269ZM35.2617 421.38C35.7656 421.38 36.1602 421.198 36.4453 420.835C36.7344 420.472 36.8789 419.97 36.8789 419.329C36.8789 418.689 36.7344 418.187 36.4453 417.823C36.1602 417.46 35.7656 417.278 35.2617 417.278C34.7383 417.278 34.3438 417.452 34.0781 417.8C33.8125 418.144 33.6797 418.653 33.6797 419.329C33.6797 420.009 33.8105 420.521 34.0723 420.864C34.3379 421.208 34.7344 421.38 35.2617 421.38ZM33.1523 425.077V423.987C33.3984 424.132 33.6602 424.243 33.9375 424.321C34.2148 424.396 34.5039 424.433 34.8047 424.433C35.5547 424.433 36.1211 424.151 36.5039 423.589C36.8906 423.023 37.084 422.191 37.084 421.093C36.9004 421.484 36.6426 421.784 36.3105 421.995C35.9785 422.202 35.5977 422.306 35.168 422.306C34.3242 422.306 33.6699 422.046 33.2051 421.526C32.7441 421.007 32.5137 420.271 32.5137 419.318C32.5137 418.376 32.75 417.648 33.2227 417.132C33.6992 416.612 34.3711 416.353 35.2383 416.353C36.2539 416.353 36.998 416.718 37.4707 417.448C37.9434 418.179 38.1797 419.327 38.1797 420.894C38.1797 422.366 37.8945 423.491 37.3242 424.269C36.7578 425.042 35.9336 425.429 34.8516 425.429C34.5664 425.429 34.2793 425.398 33.9902 425.335C33.7012 425.276 33.4219 425.191 33.1523 425.077ZM26.7246 442.263H30.7441V443.259H25.4297V442.263C26.1602 441.493 26.7988 440.814 27.3457 440.224C27.8926 439.634 28.2695 439.218 28.4766 438.976C28.8672 438.499 29.1309 438.114 29.2676 437.821C29.4043 437.525 29.4727 437.222 29.4727 436.913C29.4727 436.425 29.3281 436.042 29.0391 435.765C28.7539 435.487 28.3613 435.349 27.8613 435.349C27.5059 435.349 27.1328 435.413 26.7422 435.542C26.3516 435.671 25.9375 435.866 25.5 436.128V434.933C25.9023 434.741 26.2969 434.597 26.6836 434.499C27.0742 434.401 27.459 434.353 27.8379 434.353C28.6934 434.353 29.3809 434.581 29.9004 435.038C30.4238 435.491 30.6855 436.087 30.6855 436.825C30.6855 437.2 30.5977 437.575 30.4219 437.95C30.25 438.325 29.9688 438.739 29.5781 439.193C29.3594 439.446 29.041 439.798 28.623 440.247C28.209 440.696 27.5762 441.368 26.7246 442.263ZM35.3789 434.382C36.3125 434.382 37.0176 434.763 37.4941 435.525C37.9746 436.286 38.2148 437.413 38.2148 438.905C38.2148 440.398 37.9746 441.525 37.4941 442.286C37.0176 443.048 36.3125 443.429 35.3789 443.429C34.4453 443.429 33.7402 443.048 33.2637 442.286C32.7871 441.525 32.5488 440.398 32.5488 438.905C32.5488 437.413 32.7871 436.286 33.2637 435.525C33.7402 434.763 34.4453 434.382 35.3789 434.382ZM35.3789 442.491C35.9336 442.491 36.3457 442.196 36.6152 441.607C36.8887 441.017 37.0254 440.116 37.0254 438.905C37.0254 438.261 36.9863 437.679 36.9082 437.159L34.1191 441.525C34.4121 442.169 34.832 442.491 35.3789 442.491ZM35.3789 435.319C34.8281 435.319 34.416 435.614 34.1426 436.204C33.873 436.794 33.7383 437.694 33.7383 438.905C33.7383 439.456 33.7754 439.972 33.8496 440.452L36.5801 436.099C36.2832 435.579 35.8828 435.319 35.3789 435.319ZM26.7246 460.263H30.7441V461.259H25.4297V460.263C26.1602 459.493 26.7988 458.814 27.3457 458.224C27.8926 457.634 28.2695 457.218 28.4766 456.976C28.8672 456.499 29.1309 456.114 29.2676 455.821C29.4043 455.525 29.4727 455.222 29.4727 454.913C29.4727 454.425 29.3281 454.042 29.0391 453.765C28.7539 453.487 28.3613 453.349 27.8613 453.349C27.5059 453.349 27.1328 453.413 26.7422 453.542C26.3516 453.671 25.9375 453.866 25.5 454.128V452.933C25.9023 452.741 26.2969 452.597 26.6836 452.499C27.0742 452.401 27.459 452.353 27.8379 452.353C28.6934 452.353 29.3809 452.581 29.9004 453.038C30.4238 453.491 30.6855 454.087 30.6855 454.825C30.6855 455.2 30.5977 455.575 30.4219 455.95C30.25 456.325 29.9688 456.739 29.5781 457.193C29.3594 457.446 29.041 457.798 28.623 458.247C28.209 458.696 27.5762 459.368 26.7246 460.263ZM36.3164 456.577C36.8906 456.73 37.3301 457.001 37.6348 457.392C37.9395 457.778 38.0918 458.263 38.0918 458.845C38.0918 459.65 37.8203 460.282 37.2773 460.743C36.7383 461.2 35.9902 461.429 35.0332 461.429C34.6309 461.429 34.2207 461.392 33.8027 461.318C33.3848 461.243 32.9746 461.136 32.5723 460.995V459.818C32.9707 460.025 33.3633 460.179 33.75 460.28C34.1367 460.382 34.5215 460.433 34.9043 460.433C35.5527 460.433 36.0508 460.286 36.3984 459.993C36.7461 459.7 36.9199 459.278 36.9199 458.728C36.9199 458.22 36.7461 457.818 36.3984 457.521C36.0508 457.22 35.5801 457.069 34.9863 457.069H34.084V456.097H34.9863C35.5293 456.097 35.9531 455.978 36.2578 455.739C36.5625 455.501 36.7148 455.169 36.7148 454.743C36.7148 454.294 36.5723 453.95 36.2871 453.712C36.0059 453.47 35.6035 453.349 35.0801 453.349C34.7324 453.349 34.373 453.388 34.002 453.466C33.6309 453.544 33.2422 453.661 32.8359 453.818V452.728C33.3086 452.603 33.7285 452.509 34.0957 452.446C34.4668 452.384 34.7949 452.353 35.0801 452.353C35.9316 452.353 36.6113 452.568 37.1191 452.997C37.6309 453.423 37.8867 453.989 37.8867 454.696C37.8867 455.177 37.752 455.577 37.4824 455.898C37.2168 456.218 36.8281 456.444 36.3164 456.577ZM26.7246 478.263H30.7441V479.259H25.4297V478.263C26.1602 477.493 26.7988 476.814 27.3457 476.224C27.8926 475.634 28.2695 475.218 28.4766 474.976C28.8672 474.499 29.1309 474.114 29.2676 473.821C29.4043 473.525 29.4727 473.222 29.4727 472.913C29.4727 472.425 29.3281 472.042 29.0391 471.765C28.7539 471.487 28.3613 471.349 27.8613 471.349C27.5059 471.349 27.1328 471.413 26.7422 471.542C26.3516 471.671 25.9375 471.866 25.5 472.128V470.933C25.9023 470.741 26.2969 470.597 26.6836 470.499C27.0742 470.401 27.459 470.353 27.8379 470.353C28.6934 470.353 29.3809 470.581 29.9004 471.038C30.4238 471.491 30.6855 472.087 30.6855 472.825C30.6855 473.2 30.5977 473.575 30.4219 473.95C30.25 474.325 29.9688 474.739 29.5781 475.193C29.3594 475.446 29.041 475.798 28.623 476.247C28.209 476.696 27.5762 477.368 26.7246 478.263ZM36.0762 471.589L33.3164 476.212H36.0762V471.589ZM35.8828 470.511H37.2539V476.212H38.4199V477.173H37.2539V479.259H36.0762V477.173H32.3672V476.054L35.8828 470.511Z" fill="var(--vscode-editorLineNumber-foreground, #6E7681)" />
+                  </g>
+                  <g>
+                    <g>
+                      <rect width="916" height="18" transform="translate(64 88.2589)" fill="var(--vscode-editor-background, #1F1F1F)" />
+                    </g>
+                    <g>
+                      <rect width="916" height="18" transform="translate(64 106.259)" fill="#347D39" fill-opacity="0.3" />
+                    </g>
+                    <g>
+                      <rect width="916" height="18" transform="translate(64 124.259)" fill="var(--vscode-editor-background, #1F1F1F)" />
+                    </g>
+                    <g>
+                      <rect width="916" height="18" transform="translate(64 142.259)" fill="var(--vscode-editor-background, #1F1F1F)" />
+                    </g>
+                    <g>
+                      <rect width="916" height="18" transform="translate(64 160.259)" fill="var(--vscode-editor-background, #1F1F1F)" />
+                    </g>
+                    <g>
+                      <rect width="916" height="18" transform="translate(64 178.259)" fill="var(--vscode-editor-background, #1F1F1F)" />
+                    </g>
+                    <g>
+                      <rect width="916" height="18" transform="translate(64 196.259)" fill="var(--vscode-editor-background, #1F1F1F)" />
+                    </g>
+                    <g>
+                      <rect width="916" height="18" transform="translate(64 214.259)" fill="var(--vscode-editor-background, #1F1F1F)" />
+                    </g>
+                    <g>
+                      <rect width="916" height="18" transform="translate(64 232.259)" fill="#347D39" fill-opacity="0.3" />
+                    </g>
+                    <g>
+                      <rect width="916" height="18" transform="translate(64 250.259)" fill="var(--vscode-editor-background, #1F1F1F)" />
+                    </g>
+                    <g>
+                      <rect width="916" height="18" transform="translate(64 268.259)" fill="var(--vscode-editor-background, #1F1F1F)" />
+                    </g>
+                    <g>
+                      <rect width="916" height="18" transform="translate(64 286.259)" fill="var(--vscode-editor-background, #1F1F1F)" />
+                    </g>
+                    <g>
+                      <rect width="916" height="18" transform="translate(64 304.259)" fill="var(--vscode-editor-background, #1F1F1F)" />
+                    </g>
+                    <g>
+                      <rect width="916" height="18" transform="translate(64 322.259)" fill="var(--vscode-editor-background, #1F1F1F)" />
+                    </g>
+                    <g>
+                      <rect width="916" height="18" transform="translate(64 340.259)" fill="var(--vscode-editor-background, #1F1F1F)" />
+                    </g>
+                    <g>
+                      <rect width="916" height="18" transform="translate(64 358.259)" fill="var(--vscode-editor-background, #1F1F1F)" />
+                    </g>
+                    <g>
+                      <rect width="916" height="18" transform="translate(64 376.259)" fill="var(--vscode-editor-background, #1F1F1F)" />
+                    </g>
+                    <g>
+                      <rect width="916" height="18" transform="translate(64 394.259)" fill="var(--vscode-editor-background, #1F1F1F)" />
+                    </g>
+                    <g>
+                      <rect width="916" height="18" transform="translate(64 412.259)" fill="#C93C37" fill-opacity="0.3" />
+                    </g>
+                    <g>
+                      <rect width="916" height="18" transform="translate(64 430.259)" fill="#C93C37" fill-opacity="0.3" />
+                    </g>
+                    <g>
+                      <rect width="916" height="18" transform="translate(64 448.259)" fill="#C93C37" fill-opacity="0.3" />
+                    </g>
+                    <g>
+                      <rect width="916" height="18" transform="translate(64 466.259)" fill="#C93C37" fill-opacity="0.3" />
+                    </g>
+                  </g>
+                  <g clip-path="url(#clip3_304_6548)">
+                    <g>
+                      <path d="M68.8516 94.7198H71.6113V100.421H73.75V101.259H68.3945V100.421H70.5332V95.5577H68.8516V94.7198ZM70.5332 92.171H71.6113V93.5304H70.5332V92.171ZM78.1914 95.3644C78.3242 95.0831 78.4922 94.8761 78.6953 94.7433C78.9023 94.6066 79.1504 94.5382 79.4395 94.5382C79.9668 94.5382 80.3379 94.7433 80.5527 95.1534C80.7715 95.5597 80.8809 96.3273 80.8809 97.4562V101.259H79.8965V97.5031C79.8965 96.5773 79.8438 96.0031 79.7383 95.7804C79.6367 95.5538 79.4492 95.4406 79.1758 95.4406C78.8633 95.4406 78.6484 95.5616 78.5312 95.8038C78.418 96.0421 78.3613 96.6085 78.3613 97.5031V101.259H77.377V97.5031C77.377 96.5656 77.3203 95.9874 77.207 95.7687C77.0977 95.5499 76.8984 95.4406 76.6094 95.4406C76.3242 95.4406 76.125 95.5616 76.0117 95.8038C75.9023 96.0421 75.8477 96.6085 75.8477 97.5031V101.259H74.8691V94.6964H75.8477V95.2589C75.9766 95.0245 76.1367 94.8468 76.3281 94.7257C76.5234 94.6007 76.7441 94.5382 76.9902 94.5382C77.2871 94.5382 77.5332 94.6066 77.7285 94.7433C77.9277 94.88 78.082 95.087 78.1914 95.3644ZM83.6582 100.433V103.755H82.5742V94.6964H83.6582V95.5343C83.8379 95.2101 84.0762 94.964 84.373 94.796C84.6738 94.6241 85.0195 94.5382 85.4102 94.5382C86.2031 94.5382 86.8242 94.8448 87.2734 95.4581C87.7266 96.0714 87.9531 96.921 87.9531 98.007C87.9531 99.0734 87.7266 99.9113 87.2734 100.521C86.8203 101.126 86.1992 101.429 85.4102 101.429C85.0117 101.429 84.6621 101.345 84.3613 101.177C84.0645 101.005 83.8301 100.757 83.6582 100.433ZM86.8223 97.9835C86.8223 97.1476 86.6895 96.5167 86.4238 96.0909C86.1621 95.6652 85.7715 95.4523 85.252 95.4523C84.7285 95.4523 84.332 95.6671 84.0625 96.0968C83.793 96.5226 83.6582 97.1515 83.6582 97.9835C83.6582 98.8116 83.793 99.4406 84.0625 99.8702C84.332 100.3 84.7285 100.515 85.252 100.515C85.7715 100.515 86.1621 100.302 86.4238 99.8761C86.6895 99.4503 86.8223 98.8195 86.8223 97.9835ZM92.3008 95.4523C91.7539 95.4523 91.3398 95.6652 91.0586 96.0909C90.7773 96.5167 90.6367 97.1476 90.6367 97.9835C90.6367 98.8156 90.7773 99.4464 91.0586 99.8761C91.3398 100.302 91.7539 100.515 92.3008 100.515C92.8516 100.515 93.2676 100.302 93.5488 99.8761C93.8301 99.4464 93.9707 98.8156 93.9707 97.9835C93.9707 97.1476 93.8301 96.5167 93.5488 96.0909C93.2676 95.6652 92.8516 95.4523 92.3008 95.4523ZM92.3008 94.5382C93.2109 94.5382 93.9062 94.8331 94.3867 95.423C94.8711 96.0128 95.1133 96.8663 95.1133 97.9835C95.1133 99.1046 94.873 99.9601 94.3926 100.55C93.9121 101.136 93.2148 101.429 92.3008 101.429C91.3906 101.429 90.6953 101.136 90.2148 100.55C89.7344 99.9601 89.4941 99.1046 89.4941 97.9835C89.4941 96.8663 89.7344 96.0128 90.2148 95.423C90.6953 94.8331 91.3906 94.5382 92.3008 94.5382ZM102.689 96.0499C102.459 95.8702 102.225 95.7394 101.986 95.6573C101.748 95.5753 101.486 95.5343 101.201 95.5343C100.529 95.5343 100.016 95.7452 99.6602 96.1671C99.3047 96.589 99.127 97.1984 99.127 97.9952V101.259H98.043V94.6964H99.127V95.9796C99.3066 95.5148 99.582 95.1593 99.9531 94.9132C100.328 94.6632 100.771 94.5382 101.283 94.5382C101.549 94.5382 101.797 94.5714 102.027 94.6378C102.258 94.7042 102.479 94.8077 102.689 94.9484V96.0499ZM106.75 92.8331V94.6964H109.199V95.5343H106.75V99.0968C106.75 99.5812 106.842 99.9191 107.025 100.11C107.209 100.302 107.529 100.398 107.986 100.398H109.199V101.259H107.881C107.072 101.259 106.502 101.097 106.17 100.773C105.838 100.448 105.672 99.8898 105.672 99.0968V95.5343H103.92V94.6964H105.672V92.8331H106.75ZM167.225 92.1417V93.0382H166C165.613 93.0382 165.344 93.1183 165.191 93.2784C165.043 93.4347 164.969 93.714 164.969 94.1163V94.6964H167.225V95.5343H164.969V101.259H163.891V95.5343H162.139V94.6964H163.891V94.2394C163.891 93.5206 164.055 92.9913 164.383 92.6515C164.715 92.3116 165.23 92.1417 165.93 92.1417H167.225ZM174.994 96.0499C174.764 95.8702 174.529 95.7394 174.291 95.6573C174.053 95.5753 173.791 95.5343 173.506 95.5343C172.834 95.5343 172.32 95.7452 171.965 96.1671C171.609 96.589 171.432 97.1984 171.432 97.9952V101.259H170.348V94.6964H171.432V95.9796C171.611 95.5148 171.887 95.1593 172.258 94.9132C172.633 94.6632 173.076 94.5382 173.588 94.5382C173.854 94.5382 174.102 94.5714 174.332 94.6378C174.562 94.7042 174.783 94.8077 174.994 94.9484V96.0499ZM179.066 95.4523C178.52 95.4523 178.105 95.6652 177.824 96.0909C177.543 96.5167 177.402 97.1476 177.402 97.9835C177.402 98.8156 177.543 99.4464 177.824 99.8761C178.105 100.302 178.52 100.515 179.066 100.515C179.617 100.515 180.033 100.302 180.314 99.8761C180.596 99.4464 180.736 98.8156 180.736 97.9835C180.736 97.1476 180.596 96.5167 180.314 96.0909C180.033 95.6652 179.617 95.4523 179.066 95.4523ZM179.066 94.5382C179.977 94.5382 180.672 94.8331 181.152 95.423C181.637 96.0128 181.879 96.8663 181.879 97.9835C181.879 99.1046 181.639 99.9601 181.158 100.55C180.678 101.136 179.98 101.429 179.066 101.429C178.156 101.429 177.461 101.136 176.98 100.55C176.5 99.9601 176.26 99.1046 176.26 97.9835C176.26 96.8663 176.5 96.0128 176.98 95.423C177.461 94.8331 178.156 94.5382 179.066 94.5382ZM186.648 95.3644C186.781 95.0831 186.949 94.8761 187.152 94.7433C187.359 94.6066 187.607 94.5382 187.896 94.5382C188.424 94.5382 188.795 94.7433 189.01 95.1534C189.229 95.5597 189.338 96.3273 189.338 97.4562V101.259H188.354V97.5031C188.354 96.5773 188.301 96.0031 188.195 95.7804C188.094 95.5538 187.906 95.4406 187.633 95.4406C187.32 95.4406 187.105 95.5616 186.988 95.8038C186.875 96.0421 186.818 96.6085 186.818 97.5031V101.259H185.834V97.5031C185.834 96.5656 185.777 95.9874 185.664 95.7687C185.555 95.5499 185.355 95.4406 185.066 95.4406C184.781 95.4406 184.582 95.5616 184.469 95.8038C184.359 96.0421 184.305 96.6085 184.305 97.5031V101.259H183.326V94.6964H184.305V95.2589C184.434 95.0245 184.594 94.8468 184.785 94.7257C184.98 94.6007 185.201 94.5382 185.447 94.5382C185.744 94.5382 185.99 94.6066 186.186 94.7433C186.385 94.88 186.539 95.087 186.648 95.3644ZM68.8516 112.72H71.6113V118.421H73.75V119.259H68.3945V118.421H70.5332V113.558H68.8516V112.72ZM70.5332 110.171H71.6113V111.53H70.5332V110.171ZM78.1914 113.364C78.3242 113.083 78.4922 112.876 78.6953 112.743C78.9023 112.607 79.1504 112.538 79.4395 112.538C79.9668 112.538 80.3379 112.743 80.5527 113.153C80.7715 113.56 80.8809 114.327 80.8809 115.456V119.259H79.8965V115.503C79.8965 114.577 79.8438 114.003 79.7383 113.78C79.6367 113.554 79.4492 113.441 79.1758 113.441C78.8633 113.441 78.6484 113.562 78.5312 113.804C78.418 114.042 78.3613 114.609 78.3613 115.503V119.259H77.377V115.503C77.377 114.566 77.3203 113.987 77.207 113.769C77.0977 113.55 76.8984 113.441 76.6094 113.441C76.3242 113.441 76.125 113.562 76.0117 113.804C75.9023 114.042 75.8477 114.609 75.8477 115.503V119.259H74.8691V112.696H75.8477V113.259C75.9766 113.025 76.1367 112.847 76.3281 112.726C76.5234 112.601 76.7441 112.538 76.9902 112.538C77.2871 112.538 77.5332 112.607 77.7285 112.743C77.9277 112.88 78.082 113.087 78.1914 113.364ZM83.6582 118.433V121.755H82.5742V112.696H83.6582V113.534C83.8379 113.21 84.0762 112.964 84.373 112.796C84.6738 112.624 85.0195 112.538 85.4102 112.538C86.2031 112.538 86.8242 112.845 87.2734 113.458C87.7266 114.071 87.9531 114.921 87.9531 116.007C87.9531 117.073 87.7266 117.911 87.2734 118.521C86.8203 119.126 86.1992 119.429 85.4102 119.429C85.0117 119.429 84.6621 119.345 84.3613 119.177C84.0645 119.005 83.8301 118.757 83.6582 118.433ZM86.8223 115.984C86.8223 115.148 86.6895 114.517 86.4238 114.091C86.1621 113.665 85.7715 113.452 85.252 113.452C84.7285 113.452 84.332 113.667 84.0625 114.097C83.793 114.523 83.6582 115.151 83.6582 115.984C83.6582 116.812 83.793 117.441 84.0625 117.87C84.332 118.3 84.7285 118.515 85.252 118.515C85.7715 118.515 86.1621 118.302 86.4238 117.876C86.6895 117.45 86.8223 116.819 86.8223 115.984ZM92.3008 113.452C91.7539 113.452 91.3398 113.665 91.0586 114.091C90.7773 114.517 90.6367 115.148 90.6367 115.984C90.6367 116.816 90.7773 117.446 91.0586 117.876C91.3398 118.302 91.7539 118.515 92.3008 118.515C92.8516 118.515 93.2676 118.302 93.5488 117.876C93.8301 117.446 93.9707 116.816 93.9707 115.984C93.9707 115.148 93.8301 114.517 93.5488 114.091C93.2676 113.665 92.8516 113.452 92.3008 113.452ZM92.3008 112.538C93.2109 112.538 93.9062 112.833 94.3867 113.423C94.8711 114.013 95.1133 114.866 95.1133 115.984C95.1133 117.105 94.873 117.96 94.3926 118.55C93.9121 119.136 93.2148 119.429 92.3008 119.429C91.3906 119.429 90.6953 119.136 90.2148 118.55C89.7344 117.96 89.4941 117.105 89.4941 115.984C89.4941 114.866 89.7344 114.013 90.2148 113.423C90.6953 112.833 91.3906 112.538 92.3008 112.538ZM102.689 114.05C102.459 113.87 102.225 113.739 101.986 113.657C101.748 113.575 101.486 113.534 101.201 113.534C100.529 113.534 100.016 113.745 99.6602 114.167C99.3047 114.589 99.127 115.198 99.127 115.995V119.259H98.043V112.696H99.127V113.98C99.3066 113.515 99.582 113.159 99.9531 112.913C100.328 112.663 100.771 112.538 101.283 112.538C101.549 112.538 101.797 112.571 102.027 112.638C102.258 112.704 102.479 112.808 102.689 112.948V114.05ZM106.75 110.833V112.696H109.199V113.534H106.75V117.097C106.75 117.581 106.842 117.919 107.025 118.11C107.209 118.302 107.529 118.398 107.986 118.398H109.199V119.259H107.881C107.072 119.259 106.502 119.097 106.17 118.773C105.838 118.448 105.672 117.89 105.672 117.097V113.534H103.92V112.696H105.672V110.833H106.75ZM159.994 110.142V111.038H158.77C158.383 111.038 158.113 111.118 157.961 111.278C157.812 111.435 157.738 111.714 157.738 112.116V112.696H159.994V113.534H157.738V119.259H156.66V113.534H154.908V112.696H156.66V112.239C156.66 111.521 156.824 110.991 157.152 110.651C157.484 110.312 158 110.142 158.699 110.142H159.994ZM167.764 114.05C167.533 113.87 167.299 113.739 167.061 113.657C166.822 113.575 166.561 113.534 166.275 113.534C165.604 113.534 165.09 113.745 164.734 114.167C164.379 114.589 164.201 115.198 164.201 115.995V119.259H163.117V112.696H164.201V113.98C164.381 113.515 164.656 113.159 165.027 112.913C165.402 112.663 165.846 112.538 166.357 112.538C166.623 112.538 166.871 112.571 167.102 112.638C167.332 112.704 167.553 112.808 167.764 112.948V114.05ZM171.836 113.452C171.289 113.452 170.875 113.665 170.594 114.091C170.312 114.517 170.172 115.148 170.172 115.984C170.172 116.816 170.312 117.446 170.594 117.876C170.875 118.302 171.289 118.515 171.836 118.515C172.387 118.515 172.803 118.302 173.084 117.876C173.365 117.446 173.506 116.816 173.506 115.984C173.506 115.148 173.365 114.517 173.084 114.091C172.803 113.665 172.387 113.452 171.836 113.452ZM171.836 112.538C172.746 112.538 173.441 112.833 173.922 113.423C174.406 114.013 174.648 114.866 174.648 115.984C174.648 117.105 174.408 117.96 173.928 118.55C173.447 119.136 172.75 119.429 171.836 119.429C170.926 119.429 170.23 119.136 169.75 118.55C169.27 117.96 169.029 117.105 169.029 115.984C169.029 114.866 169.27 114.013 169.75 113.423C170.23 112.833 170.926 112.538 171.836 112.538ZM179.418 113.364C179.551 113.083 179.719 112.876 179.922 112.743C180.129 112.607 180.377 112.538 180.666 112.538C181.193 112.538 181.564 112.743 181.779 113.153C181.998 113.56 182.107 114.327 182.107 115.456V119.259H181.123V115.503C181.123 114.577 181.07 114.003 180.965 113.78C180.863 113.554 180.676 113.441 180.402 113.441C180.09 113.441 179.875 113.562 179.758 113.804C179.645 114.042 179.588 114.609 179.588 115.503V119.259H178.604V115.503C178.604 114.566 178.547 113.987 178.434 113.769C178.324 113.55 178.125 113.441 177.836 113.441C177.551 113.441 177.352 113.562 177.238 113.804C177.129 114.042 177.074 114.609 177.074 115.503V119.259H176.096V112.696H177.074V113.259C177.203 113.025 177.363 112.847 177.555 112.726C177.75 112.601 177.971 112.538 178.217 112.538C178.514 112.538 178.76 112.607 178.955 112.743C179.154 112.88 179.309 113.087 179.418 113.364ZM68.8516 130.72H71.6113V136.421H73.75V137.259H68.3945V136.421H70.5332V131.558H68.8516V130.72ZM70.5332 128.171H71.6113V129.53H70.5332V128.171ZM78.1914 131.364C78.3242 131.083 78.4922 130.876 78.6953 130.743C78.9023 130.607 79.1504 130.538 79.4395 130.538C79.9668 130.538 80.3379 130.743 80.5527 131.153C80.7715 131.56 80.8809 132.327 80.8809 133.456V137.259H79.8965V133.503C79.8965 132.577 79.8438 132.003 79.7383 131.78C79.6367 131.554 79.4492 131.441 79.1758 131.441C78.8633 131.441 78.6484 131.562 78.5312 131.804C78.418 132.042 78.3613 132.609 78.3613 133.503V137.259H77.377V133.503C77.377 132.566 77.3203 131.987 77.207 131.769C77.0977 131.55 76.8984 131.441 76.6094 131.441C76.3242 131.441 76.125 131.562 76.0117 131.804C75.9023 132.042 75.8477 132.609 75.8477 133.503V137.259H74.8691V130.696H75.8477V131.259C75.9766 131.025 76.1367 130.847 76.3281 130.726C76.5234 130.601 76.7441 130.538 76.9902 130.538C77.2871 130.538 77.5332 130.607 77.7285 130.743C77.9277 130.88 78.082 131.087 78.1914 131.364ZM83.6582 136.433V139.755H82.5742V130.696H83.6582V131.534C83.8379 131.21 84.0762 130.964 84.373 130.796C84.6738 130.624 85.0195 130.538 85.4102 130.538C86.2031 130.538 86.8242 130.845 87.2734 131.458C87.7266 132.071 87.9531 132.921 87.9531 134.007C87.9531 135.073 87.7266 135.911 87.2734 136.521C86.8203 137.126 86.1992 137.429 85.4102 137.429C85.0117 137.429 84.6621 137.345 84.3613 137.177C84.0645 137.005 83.8301 136.757 83.6582 136.433ZM86.8223 133.984C86.8223 133.148 86.6895 132.517 86.4238 132.091C86.1621 131.665 85.7715 131.452 85.252 131.452C84.7285 131.452 84.332 131.667 84.0625 132.097C83.793 132.523 83.6582 133.151 83.6582 133.984C83.6582 134.812 83.793 135.441 84.0625 135.87C84.332 136.3 84.7285 136.515 85.252 136.515C85.7715 136.515 86.1621 136.302 86.4238 135.876C86.6895 135.45 86.8223 134.819 86.8223 133.984ZM92.3008 131.452C91.7539 131.452 91.3398 131.665 91.0586 132.091C90.7773 132.517 90.6367 133.148 90.6367 133.984C90.6367 134.816 90.7773 135.446 91.0586 135.876C91.3398 136.302 91.7539 136.515 92.3008 136.515C92.8516 136.515 93.2676 136.302 93.5488 135.876C93.8301 135.446 93.9707 134.816 93.9707 133.984C93.9707 133.148 93.8301 132.517 93.5488 132.091C93.2676 131.665 92.8516 131.452 92.3008 131.452ZM92.3008 130.538C93.2109 130.538 93.9062 130.833 94.3867 131.423C94.8711 132.013 95.1133 132.866 95.1133 133.984C95.1133 135.105 94.873 135.96 94.3926 136.55C93.9121 137.136 93.2148 137.429 92.3008 137.429C91.3906 137.429 90.6953 137.136 90.2148 136.55C89.7344 135.96 89.4941 135.105 89.4941 133.984C89.4941 132.866 89.7344 132.013 90.2148 131.423C90.6953 130.833 91.3906 130.538 92.3008 130.538ZM102.689 132.05C102.459 131.87 102.225 131.739 101.986 131.657C101.748 131.575 101.486 131.534 101.201 131.534C100.529 131.534 100.016 131.745 99.6602 132.167C99.3047 132.589 99.127 133.198 99.127 133.995V137.259H98.043V130.696H99.127V131.98C99.3066 131.515 99.582 131.159 99.9531 130.913C100.328 130.663 100.771 130.538 101.283 130.538C101.549 130.538 101.797 130.571 102.027 130.638C102.258 130.704 102.479 130.808 102.689 130.948V132.05ZM106.75 128.833V130.696H109.199V131.534H106.75V135.097C106.75 135.581 106.842 135.919 107.025 136.11C107.209 136.302 107.529 136.398 107.986 136.398H109.199V137.259H107.881C107.072 137.259 106.502 137.097 106.17 136.773C105.838 136.448 105.672 135.89 105.672 135.097V131.534H103.92V130.696H105.672V128.833H106.75ZM261.221 128.142V129.038H259.996C259.609 129.038 259.34 129.118 259.188 129.278C259.039 129.435 258.965 129.714 258.965 130.116V130.696H261.221V131.534H258.965V137.259H257.887V131.534H256.135V130.696H257.887V130.239C257.887 129.521 258.051 128.991 258.379 128.651C258.711 128.312 259.227 128.142 259.926 128.142H261.221ZM268.99 132.05C268.76 131.87 268.525 131.739 268.287 131.657C268.049 131.575 267.787 131.534 267.502 131.534C266.83 131.534 266.316 131.745 265.961 132.167C265.605 132.589 265.428 133.198 265.428 133.995V137.259H264.344V130.696H265.428V131.98C265.607 131.515 265.883 131.159 266.254 130.913C266.629 130.663 267.072 130.538 267.584 130.538C267.85 130.538 268.098 130.571 268.328 130.638C268.559 130.704 268.779 130.808 268.99 130.948V132.05ZM273.062 131.452C272.516 131.452 272.102 131.665 271.82 132.091C271.539 132.517 271.398 133.148 271.398 133.984C271.398 134.816 271.539 135.446 271.82 135.876C272.102 136.302 272.516 136.515 273.062 136.515C273.613 136.515 274.029 136.302 274.311 135.876C274.592 135.446 274.732 134.816 274.732 133.984C274.732 133.148 274.592 132.517 274.311 132.091C274.029 131.665 273.613 131.452 273.062 131.452ZM273.062 130.538C273.973 130.538 274.668 130.833 275.148 131.423C275.633 132.013 275.875 132.866 275.875 133.984C275.875 135.105 275.635 135.96 275.154 136.55C274.674 137.136 273.977 137.429 273.062 137.429C272.152 137.429 271.457 137.136 270.977 136.55C270.496 135.96 270.256 135.105 270.256 133.984C270.256 132.866 270.496 132.013 270.977 131.423C271.457 130.833 272.152 130.538 273.062 130.538ZM280.645 131.364C280.777 131.083 280.945 130.876 281.148 130.743C281.355 130.607 281.604 130.538 281.893 130.538C282.42 130.538 282.791 130.743 283.006 131.153C283.225 131.56 283.334 132.327 283.334 133.456V137.259H282.35V133.503C282.35 132.577 282.297 132.003 282.191 131.78C282.09 131.554 281.902 131.441 281.629 131.441C281.316 131.441 281.102 131.562 280.984 131.804C280.871 132.042 280.814 132.609 280.814 133.503V137.259H279.83V133.503C279.83 132.566 279.773 131.987 279.66 131.769C279.551 131.55 279.352 131.441 279.062 131.441C278.777 131.441 278.578 131.562 278.465 131.804C278.355 132.042 278.301 132.609 278.301 133.503V137.259H277.322V130.696H278.301V131.259C278.43 131.025 278.59 130.847 278.781 130.726C278.977 130.601 279.197 130.538 279.443 130.538C279.74 130.538 279.986 130.607 280.182 130.743C280.381 130.88 280.535 131.087 280.645 131.364ZM88.2285 402.05C87.998 401.87 87.7637 401.739 87.5254 401.657C87.2871 401.575 87.0254 401.534 86.7402 401.534C86.0684 401.534 85.5547 401.745 85.1992 402.167C84.8438 402.589 84.666 403.198 84.666 403.995V407.259H83.582V400.696H84.666V401.98C84.8457 401.515 85.1211 401.159 85.4922 400.913C85.8672 400.663 86.3105 400.538 86.8223 400.538C87.0879 400.538 87.3359 400.571 87.5664 400.638C87.7969 400.704 88.0176 400.808 88.2285 400.948V402.05ZM95.2539 403.439V403.966H90.584V404.001C90.5527 404.896 90.7227 405.538 91.0938 405.929C91.4688 406.319 91.9961 406.515 92.6758 406.515C93.0195 406.515 93.3789 406.46 93.7539 406.351C94.1289 406.241 94.5293 406.075 94.9551 405.853V406.925C94.5449 407.093 94.1484 407.218 93.7656 407.3C93.3867 407.386 93.0195 407.429 92.6641 407.429C91.6445 407.429 90.8477 407.124 90.2734 406.515C89.6992 405.901 89.4121 405.058 89.4121 403.984C89.4121 402.937 89.6934 402.101 90.2559 401.476C90.8184 400.851 91.5684 400.538 92.5059 400.538C93.3418 400.538 94 400.821 94.4805 401.388C94.9648 401.954 95.2227 402.638 95.2539 403.439ZM94.1758 403.122C94.1289 402.669 93.9629 402.278 93.6777 401.95C93.3965 401.618 92.9902 401.452 92.459 401.452C91.9395 401.452 91.5117 401.624 91.1758 401.968C90.8398 402.312 90.6562 402.698 90.625 403.128L94.1758 403.122ZM99.5195 398.833V400.696H101.969V401.534H99.5195V405.097C99.5195 405.581 99.6113 405.919 99.7949 406.11C99.9785 406.302 100.299 406.398 100.756 406.398H101.969V407.259H100.65C99.8418 407.259 99.2715 407.097 98.9395 406.773C98.6074 406.448 98.4414 405.89 98.4414 405.097V401.534H96.6895V400.696H98.4414V398.833H99.5195ZM104.295 404.775V400.708H105.373V404.775C105.373 405.364 105.477 405.798 105.684 406.075C105.895 406.353 106.219 406.491 106.656 406.491C107.164 406.491 107.553 406.314 107.822 405.958C108.092 405.599 108.227 405.085 108.227 404.417V400.708H109.311V407.259H108.227V406.275C108.035 406.653 107.773 406.941 107.441 407.136C107.113 407.331 106.729 407.429 106.287 407.429C105.615 407.429 105.115 407.21 104.787 406.773C104.459 406.331 104.295 405.665 104.295 404.775ZM117.15 402.05C116.92 401.87 116.686 401.739 116.447 401.657C116.209 401.575 115.947 401.534 115.662 401.534C114.99 401.534 114.477 401.745 114.121 402.167C113.766 402.589 113.588 403.198 113.588 403.995V407.259H112.504V400.696H113.588V401.98C113.768 401.515 114.043 401.159 114.414 400.913C114.789 400.663 115.232 400.538 115.744 400.538C116.01 400.538 116.258 400.571 116.488 400.638C116.719 400.704 116.939 400.808 117.15 400.948V402.05ZM123.771 403.193V407.259H122.688V403.193C122.688 402.603 122.584 402.169 122.377 401.892C122.17 401.614 121.846 401.476 121.404 401.476C120.9 401.476 120.512 401.655 120.238 402.015C119.969 402.37 119.834 402.882 119.834 403.55V407.259H118.756V400.696H119.834V401.681C120.025 401.306 120.285 401.023 120.613 400.831C120.941 400.636 121.33 400.538 121.779 400.538C122.447 400.538 122.945 400.759 123.273 401.2C123.605 401.638 123.771 402.302 123.771 403.193ZM73.5625 979.439V979.966H68.8926V980.001C68.8613 980.896 69.0312 981.538 69.4023 981.929C69.7773 982.319 70.3047 982.515 70.9844 982.515C71.3281 982.515 71.6875 982.46 72.0625 982.351C72.4375 982.241 72.8379 982.075 73.2637 981.853V982.925C72.8535 983.093 72.457 983.218 72.0742 983.3C71.6953 983.386 71.3281 983.429 70.9727 983.429C69.9531 983.429 69.1562 983.124 68.582 982.515C68.0078 981.901 67.7207 981.058 67.7207 979.984C67.7207 978.937 68.002 978.101 68.5645 977.476C69.127 976.851 69.877 976.538 70.8145 976.538C71.6504 976.538 72.3086 976.821 72.7891 977.388C73.2734 977.954 73.5312 978.638 73.5625 979.439ZM72.4844 979.122C72.4375 978.669 72.2715 978.278 71.9863 977.95C71.7051 977.618 71.2988 977.452 70.7676 977.452C70.248 977.452 69.8203 977.624 69.4844 977.968C69.1484 978.312 68.9648 978.698 68.9336 979.128L72.4844 979.122ZM80.7812 976.696L78.4316 979.837L81.0098 983.259H79.7617L77.8398 980.628L75.9238 983.259H74.6758L77.2539 979.837L74.9043 976.696H76.0996L77.8398 979.069L79.5684 976.696H80.7812ZM83.6582 982.433V985.755H82.5742V976.696H83.6582V977.534C83.8379 977.21 84.0762 976.964 84.373 976.796C84.6738 976.624 85.0195 976.538 85.4102 976.538C86.2031 976.538 86.8242 976.845 87.2734 977.458C87.7266 978.071 87.9531 978.921 87.9531 980.007C87.9531 981.073 87.7266 981.911 87.2734 982.521C86.8203 983.126 86.1992 983.429 85.4102 983.429C85.0117 983.429 84.6621 983.345 84.3613 983.177C84.0645 983.005 83.8301 982.757 83.6582 982.433ZM86.8223 979.984C86.8223 979.148 86.6895 978.517 86.4238 978.091C86.1621 977.665 85.7715 977.452 85.252 977.452C84.7285 977.452 84.332 977.667 84.0625 978.097C83.793 978.523 83.6582 979.151 83.6582 979.984C83.6582 980.812 83.793 981.441 84.0625 981.87C84.332 982.3 84.7285 982.515 85.252 982.515C85.7715 982.515 86.1621 982.302 86.4238 981.876C86.6895 981.45 86.8223 980.819 86.8223 979.984ZM92.3008 977.452C91.7539 977.452 91.3398 977.665 91.0586 978.091C90.7773 978.517 90.6367 979.148 90.6367 979.984C90.6367 980.816 90.7773 981.446 91.0586 981.876C91.3398 982.302 91.7539 982.515 92.3008 982.515C92.8516 982.515 93.2676 982.302 93.5488 981.876C93.8301 981.446 93.9707 980.816 93.9707 979.984C93.9707 979.148 93.8301 978.517 93.5488 978.091C93.2676 977.665 92.8516 977.452 92.3008 977.452ZM92.3008 976.538C93.2109 976.538 93.9062 976.833 94.3867 977.423C94.8711 978.013 95.1133 978.866 95.1133 979.984C95.1133 981.105 94.873 981.96 94.3926 982.55C93.9121 983.136 93.2148 983.429 92.3008 983.429C91.3906 983.429 90.6953 983.136 90.2148 982.55C89.7344 981.96 89.4941 981.105 89.4941 979.984C89.4941 978.866 89.7344 978.013 90.2148 977.423C90.6953 976.833 91.3906 976.538 92.3008 976.538ZM102.689 978.05C102.459 977.87 102.225 977.739 101.986 977.657C101.748 977.575 101.486 977.534 101.201 977.534C100.529 977.534 100.016 977.745 99.6602 978.167C99.3047 978.589 99.127 979.198 99.127 979.995V983.259H98.043V976.696H99.127V977.98C99.3066 977.515 99.582 977.159 99.9531 976.913C100.328 976.663 100.771 976.538 101.283 976.538C101.549 976.538 101.797 976.571 102.027 976.638C102.258 976.704 102.479 976.808 102.689 976.948V978.05ZM106.75 974.833V976.696H109.199V977.534H106.75V981.097C106.75 981.581 106.842 981.919 107.025 982.11C107.209 982.302 107.529 982.398 107.986 982.398H109.199V983.259H107.881C107.072 983.259 106.502 983.097 106.17 982.773C105.838 982.448 105.672 981.89 105.672 981.097V977.534H103.92V976.696H105.672V974.833H106.75ZM88.2285 996.05C87.998 995.87 87.7637 995.739 87.5254 995.657C87.2871 995.575 87.0254 995.534 86.7402 995.534C86.0684 995.534 85.5547 995.745 85.1992 996.167C84.8438 996.589 84.666 997.198 84.666 997.995V1001.26H83.582V994.696H84.666V995.98C84.8457 995.515 85.1211 995.159 85.4922 994.913C85.8672 994.663 86.3105 994.538 86.8223 994.538C87.0879 994.538 87.3359 994.571 87.5664 994.638C87.7969 994.704 88.0176 994.808 88.2285 994.948V996.05ZM95.2539 997.439V997.966H90.584V998.001C90.5527 998.896 90.7227 999.538 91.0938 999.929C91.4688 1000.32 91.9961 1000.51 92.6758 1000.51C93.0195 1000.51 93.3789 1000.46 93.7539 1000.35C94.1289 1000.24 94.5293 1000.08 94.9551 999.853V1000.92C94.5449 1001.09 94.1484 1001.22 93.7656 1001.3C93.3867 1001.39 93.0195 1001.43 92.6641 1001.43C91.6445 1001.43 90.8477 1001.12 90.2734 1000.51C89.6992 999.901 89.4121 999.058 89.4121 997.984C89.4121 996.937 89.6934 996.101 90.2559 995.476C90.8184 994.851 91.5684 994.538 92.5059 994.538C93.3418 994.538 94 994.821 94.4805 995.388C94.9648 995.954 95.2227 996.638 95.2539 997.439ZM94.1758 997.122C94.1289 996.669 93.9629 996.278 93.6777 995.95C93.3965 995.618 92.9902 995.452 92.459 995.452C91.9395 995.452 91.5117 995.624 91.1758 995.968C90.8398 996.312 90.6562 996.698 90.625 997.128L94.1758 997.122ZM99.5195 992.833V994.696H101.969V995.534H99.5195V999.097C99.5195 999.581 99.6113 999.919 99.7949 1000.11C99.9785 1000.3 100.299 1000.4 100.756 1000.4H101.969V1001.26H100.65C99.8418 1001.26 99.2715 1001.1 98.9395 1000.77C98.6074 1000.45 98.4414 999.89 98.4414 999.097V995.534H96.6895V994.696H98.4414V992.833H99.5195ZM104.295 998.775V994.708H105.373V998.775C105.373 999.364 105.477 999.798 105.684 1000.08C105.895 1000.35 106.219 1000.49 106.656 1000.49C107.164 1000.49 107.553 1000.31 107.822 999.958C108.092 999.599 108.227 999.085 108.227 998.417V994.708H109.311V1001.26H108.227V1000.27C108.035 1000.65 107.773 1000.94 107.441 1001.14C107.113 1001.33 106.729 1001.43 106.287 1001.43C105.615 1001.43 105.115 1001.21 104.787 1000.77C104.459 1000.33 104.295 999.665 104.295 998.775ZM117.15 996.05C116.92 995.87 116.686 995.739 116.447 995.657C116.209 995.575 115.947 995.534 115.662 995.534C114.99 995.534 114.477 995.745 114.121 996.167C113.766 996.589 113.588 997.198 113.588 997.995V1001.26H112.504V994.696H113.588V995.98C113.768 995.515 114.043 995.159 114.414 994.913C114.789 994.663 115.232 994.538 115.744 994.538C116.01 994.538 116.258 994.571 116.488 994.638C116.719 994.704 116.939 994.808 117.15 994.948V996.05ZM123.771 997.193V1001.26H122.688V997.193C122.688 996.603 122.584 996.169 122.377 995.892C122.17 995.614 121.846 995.476 121.404 995.476C120.9 995.476 120.512 995.655 120.238 996.015C119.969 996.37 119.834 996.882 119.834 997.55V1001.26H118.756V994.696H119.834V995.681C120.025 995.306 120.285 995.023 120.613 994.831C120.941 994.636 121.33 994.538 121.779 994.538C122.447 994.538 122.945 994.759 123.273 995.2C123.605 995.638 123.771 996.302 123.771 997.193Z" fill="#C586C0" />
+                      <path d="M286.504 99.1437H288.332V100.696L287.178 102.935H285.924L286.504 100.696V99.1437ZM286.428 94.7023H288.256V96.8175H286.428V94.7023ZM272.043 117.144H273.871V118.696L272.717 120.935H271.463L272.043 118.696V117.144ZM271.967 112.702H273.795V114.818H271.967V112.702ZM123.66 137.558V138.401H123.285C122.312 138.401 121.66 138.257 121.328 137.968C121 137.679 120.836 137.103 120.836 136.239V135.068C120.836 134.642 120.715 134.275 120.473 133.966C120.234 133.657 119.863 133.503 119.359 133.503H118.645V132.665H119.359C119.91 132.665 120.293 132.534 120.508 132.273C120.727 132.011 120.836 131.626 120.836 131.118V129.595C120.836 128.732 121 128.157 121.328 127.872C121.66 127.583 122.312 127.439 123.285 127.439H123.66V128.276H123.25C122.703 128.276 122.346 128.362 122.178 128.534C122.014 128.702 121.932 129.064 121.932 129.618V131.189C121.932 131.876 121.797 132.339 121.527 132.577C121.258 132.812 120.732 132.982 119.951 133.087C120.709 133.177 121.229 133.351 121.51 133.609C121.791 133.862 121.932 134.323 121.932 134.991V136.216C121.932 136.775 122.014 137.138 122.178 137.306C122.346 137.474 122.703 137.558 123.25 137.558H123.66ZM242.225 137.558C242.771 137.558 243.127 137.474 243.291 137.306C243.459 137.138 243.543 136.775 243.543 136.216V134.991C243.543 134.323 243.684 133.862 243.965 133.609C244.246 133.351 244.766 133.177 245.523 133.087C244.742 132.982 244.217 132.812 243.947 132.577C243.678 132.339 243.543 131.876 243.543 131.189V129.618C243.543 129.064 243.459 128.702 243.291 128.534C243.127 128.362 242.771 128.276 242.225 128.276H241.814V127.439H242.189C243.162 127.439 243.812 127.583 244.141 127.872C244.473 128.157 244.639 128.732 244.639 129.595V131.118C244.639 131.626 244.746 132.011 244.961 132.273C245.18 132.534 245.564 132.665 246.115 132.665H246.83V133.503H246.115C245.611 133.503 245.238 133.657 244.996 133.966C244.758 134.275 244.639 134.642 244.639 135.068V136.239C244.639 137.103 244.473 137.679 244.141 137.968C243.812 138.257 243.162 138.401 242.189 138.401H241.814V137.558H242.225ZM431.113 135.144H432.941V136.696L431.787 138.935H430.533L431.113 136.696V135.144ZM431.037 130.702H432.865V132.818H431.037V130.702ZM239.348 173.558V174.401H238.973C238 174.401 237.348 174.257 237.016 173.968C236.688 173.679 236.523 173.103 236.523 172.239V171.068C236.523 170.642 236.402 170.275 236.16 169.966C235.922 169.657 235.551 169.503 235.047 169.503H234.332V168.665H235.047C235.598 168.665 235.98 168.534 236.195 168.273C236.414 168.011 236.523 167.626 236.523 167.118V165.595C236.523 164.732 236.688 164.157 237.016 163.872C237.348 163.583 238 163.439 238.973 163.439H239.348V164.276H238.938C238.391 164.276 238.033 164.362 237.865 164.534C237.701 164.702 237.619 165.064 237.619 165.618V167.189C237.619 167.876 237.484 168.339 237.215 168.577C236.945 168.812 236.42 168.982 235.639 169.087C236.396 169.177 236.916 169.351 237.197 169.609C237.479 169.862 237.619 170.323 237.619 170.991V172.216C237.619 172.775 237.701 173.138 237.865 173.306C238.033 173.474 238.391 173.558 238.938 173.558H239.348ZM120.127 184.702H121.955V186.818H120.127V184.702ZM120.127 189.126H121.955V191.259H120.127V189.126ZM178.047 189.144H179.875V190.696L178.721 192.935H177.467L178.047 190.696V189.144ZM177.971 184.702H179.799V186.818H177.971V184.702ZM163.51 202.702H165.338V204.818H163.51V202.702ZM163.51 207.126H165.338V209.259H163.51V207.126ZM221.43 207.144H223.258V208.696L222.104 210.935H220.85L221.43 208.696V207.144ZM221.354 202.702H223.182V204.818H221.354V202.702ZM127.357 220.702H129.186V222.818H127.357V220.702ZM127.357 225.126H129.186V227.259H127.357V225.126ZM185.986 217.556H188.471V218.394H187.064V227.417H188.471V228.255H185.986V217.556ZM194.137 217.556V228.255H191.652V227.417H193.059V218.394H191.652V217.556H194.137ZM199.738 225.144H201.566V226.696L200.412 228.935H199.158L199.738 226.696V225.144ZM199.662 220.702H201.49V222.818H199.662V220.702ZM112.896 238.702H114.725V240.818H112.896V238.702ZM112.896 243.126H114.725V245.259H112.896V243.126ZM170.816 243.144H172.645V244.696L171.49 246.935H170.236L170.816 244.696V243.144ZM170.74 238.702H172.568V240.818H170.74V238.702ZM68.6934 263.558C69.2402 263.558 69.5957 263.474 69.7598 263.306C69.9277 263.138 70.0117 262.775 70.0117 262.216V260.991C70.0117 260.323 70.1523 259.862 70.4336 259.609C70.7148 259.351 71.2344 259.177 71.9922 259.087C71.2109 258.982 70.6855 258.812 70.416 258.577C70.1465 258.339 70.0117 257.876 70.0117 257.189V255.618C70.0117 255.064 69.9277 254.702 69.7598 254.534C69.5957 254.362 69.2402 254.276 68.6934 254.276H68.2832V253.439H68.6582C69.6309 253.439 70.2812 253.583 70.6094 253.872C70.9414 254.157 71.1074 254.732 71.1074 255.595V257.118C71.1074 257.626 71.2148 258.011 71.4297 258.273C71.6484 258.534 72.0332 258.665 72.584 258.665H73.2988V259.503H72.584C72.0801 259.503 71.707 259.657 71.4648 259.966C71.2266 260.275 71.1074 260.642 71.1074 261.068V262.239C71.1074 263.103 70.9414 263.679 70.6094 263.968C70.2812 264.257 69.6309 264.401 68.6582 264.401H68.2832V263.558H68.6934ZM163.51 292.702H165.338V294.818H163.51V292.702ZM163.51 297.126H165.338V299.259H163.51V297.126ZM213.889 296.892H215.951V299.259H213.889V296.892ZM240.01 293.628L235.029 295.503L240.01 297.36V298.433L233.816 295.984V295.011L240.01 292.562V293.628ZM327.812 293.628V292.562L334.006 295.011V295.984L327.812 298.433V297.36L332.793 295.503L327.812 293.628ZM342.273 296.329H348.467V297.319H342.273V296.329ZM342.273 293.569H348.467V294.56H342.273V293.569ZM361.229 289.568C360.709 290.458 360.32 291.347 360.062 292.234C359.809 293.116 359.682 294.007 359.682 294.905C359.682 295.8 359.809 296.691 360.062 297.577C360.32 298.464 360.709 299.357 361.229 300.255H360.291C359.701 299.325 359.262 298.421 358.973 297.542C358.684 296.659 358.539 295.78 358.539 294.905C358.539 294.034 358.684 293.157 358.973 292.275C359.262 291.392 359.701 290.489 360.291 289.568H361.229ZM369.496 299.558V300.401H369.121C368.148 300.401 367.496 300.257 367.164 299.968C366.836 299.679 366.672 299.103 366.672 298.239V297.068C366.672 296.642 366.551 296.275 366.309 295.966C366.07 295.657 365.699 295.503 365.195 295.503H364.48V294.665H365.195C365.746 294.665 366.129 294.534 366.344 294.273C366.562 294.011 366.672 293.626 366.672 293.118V291.595C366.672 290.732 366.836 290.157 367.164 289.872C367.496 289.583 368.148 289.439 369.121 289.439H369.496V290.276H369.086C368.539 290.276 368.182 290.362 368.014 290.534C367.85 290.702 367.768 291.064 367.768 291.618V293.189C367.768 293.876 367.633 294.339 367.363 294.577C367.094 294.812 366.568 294.982 365.787 295.087C366.545 295.177 367.064 295.351 367.346 295.609C367.627 295.862 367.768 296.323 367.768 296.991V298.216C367.768 298.775 367.85 299.138 368.014 299.306C368.182 299.474 368.539 299.558 369.086 299.558H369.496ZM120.203 315.144H122.031V316.696L120.73 319.222L119.559 319.228L120.203 316.696V315.144ZM163.586 333.144H165.414V334.696L164.113 337.222L162.941 337.228L163.586 334.696V333.144ZM127.434 351.144H129.262V352.696L127.961 355.222L126.789 355.228L127.434 352.696V351.144ZM112.973 369.144H114.801V370.696L113.5 373.222L112.328 373.228L112.973 370.696V369.144ZM68.6934 389.558C69.2402 389.558 69.5957 389.474 69.7598 389.306C69.9277 389.138 70.0117 388.775 70.0117 388.216V386.991C70.0117 386.323 70.1523 385.862 70.4336 385.609C70.7148 385.351 71.2344 385.177 71.9922 385.087C71.2109 384.982 70.6855 384.812 70.416 384.577C70.1465 384.339 70.0117 383.876 70.0117 383.189V381.618C70.0117 381.064 69.9277 380.702 69.7598 380.534C69.5957 380.362 69.2402 380.276 68.6934 380.276H68.2832V379.439H68.6582C69.6309 379.439 70.2812 379.583 70.6094 379.872C70.9414 380.157 71.1074 380.732 71.1074 381.595V383.118C71.1074 383.626 71.2148 384.011 71.4297 384.273C71.6484 384.534 72.0332 384.665 72.584 384.665H73.2988V385.503H72.584C72.0801 385.503 71.707 385.657 71.4648 385.966C71.2266 386.275 71.1074 386.642 71.1074 387.068V388.239C71.1074 389.103 70.9414 389.679 70.6094 389.968C70.2812 390.257 69.6309 390.401 68.6582 390.401H68.2832V389.558H68.6934ZM76.2695 379.568H77.207C77.7969 380.489 78.2363 381.392 78.5254 382.275C78.8145 383.157 78.959 384.034 78.959 384.905C78.959 385.784 78.8145 386.665 78.5254 387.548C78.2363 388.431 77.7969 389.333 77.207 390.255H76.2695C76.7891 389.349 77.1758 388.452 77.4297 387.566C77.6875 386.679 77.8164 385.792 77.8164 384.905C77.8164 384.015 77.6875 383.126 77.4297 382.239C77.1758 381.353 76.7891 380.462 76.2695 379.568ZM116.43 389.558V390.401H116.055C115.082 390.401 114.43 390.257 114.098 389.968C113.77 389.679 113.605 389.103 113.605 388.239V387.068C113.605 386.642 113.484 386.275 113.242 385.966C113.004 385.657 112.633 385.503 112.129 385.503H111.414V384.665H112.129C112.68 384.665 113.062 384.534 113.277 384.273C113.496 384.011 113.605 383.626 113.605 383.118V381.595C113.605 380.732 113.77 380.157 114.098 379.872C114.43 379.583 115.082 379.439 116.055 379.439H116.43V380.276H116.02C115.473 380.276 115.115 380.362 114.947 380.534C114.783 380.702 114.701 381.064 114.701 381.618V383.189C114.701 383.876 114.566 384.339 114.297 384.577C114.027 384.812 113.502 384.982 112.721 385.087C113.479 385.177 113.998 385.351 114.279 385.609C114.561 385.862 114.701 386.323 114.701 386.991V388.216C114.701 388.775 114.783 389.138 114.947 389.306C115.115 389.474 115.473 389.558 116.02 389.558H116.43ZM137.084 397.568C136.564 398.458 136.176 399.347 135.918 400.234C135.664 401.116 135.537 402.007 135.537 402.905C135.537 403.8 135.664 404.691 135.918 405.577C136.176 406.464 136.564 407.357 137.084 408.255H136.146C135.557 407.325 135.117 406.421 134.828 405.542C134.539 404.659 134.395 403.78 134.395 402.905C134.395 402.034 134.539 401.157 134.828 400.275C135.117 399.392 135.557 398.489 136.146 397.568H137.084ZM197.664 422.329H203.857V423.319H197.664V422.329ZM197.664 419.569H203.857V420.56H197.664V419.569ZM262.738 440.329H268.932V441.319H262.738V440.329ZM262.738 437.569H268.932V438.56H262.738V437.569ZM457.961 440.329H464.154V441.319H457.961V440.329ZM457.961 437.569H464.154V438.56H457.961V437.569ZM163.275 458.892H165.338V461.259H163.275V458.892ZM194.928 451.568C194.408 452.458 194.02 453.347 193.762 454.234C193.508 455.116 193.381 456.007 193.381 456.905C193.381 457.8 193.508 458.691 193.762 459.577C194.02 460.464 194.408 461.357 194.928 462.255H193.99C193.4 461.325 192.961 460.421 192.672 459.542C192.383 458.659 192.238 457.78 192.238 456.905C192.238 456.034 192.383 455.157 192.672 454.275C192.961 453.392 193.4 452.489 193.99 451.568H194.928ZM202.158 451.568C201.639 452.458 201.25 453.347 200.992 454.234C200.738 455.116 200.611 456.007 200.611 456.905C200.611 457.8 200.738 458.691 200.992 459.577C201.25 460.464 201.639 461.357 202.158 462.255H201.221C200.631 461.325 200.191 460.421 199.902 459.542C199.613 458.659 199.469 457.78 199.469 456.905C199.469 456.034 199.613 455.157 199.902 454.275C200.191 453.392 200.631 452.489 201.221 451.568H202.158ZM243.121 459.144H244.949V460.696L243.648 463.222L242.477 463.228L243.121 460.696V459.144ZM293.184 451.568H294.121C294.711 452.489 295.15 453.392 295.439 454.275C295.729 455.157 295.873 456.034 295.873 456.905C295.873 457.784 295.729 458.665 295.439 459.548C295.15 460.431 294.711 461.333 294.121 462.255H293.184C293.703 461.349 294.09 460.452 294.344 459.566C294.602 458.679 294.73 457.792 294.73 456.905C294.73 456.015 294.602 455.126 294.344 454.239C294.09 453.353 293.703 452.462 293.184 451.568ZM332.307 451.568C331.787 452.458 331.398 453.347 331.141 454.234C330.887 455.116 330.76 456.007 330.76 456.905C330.76 457.8 330.887 458.691 331.141 459.577C331.398 460.464 331.787 461.357 332.307 462.255H331.369C330.779 461.325 330.34 460.421 330.051 459.542C329.762 458.659 329.617 457.78 329.617 456.905C329.617 456.034 329.762 455.157 330.051 454.275C330.34 453.392 330.779 452.489 331.369 451.568H332.307ZM161.512 494.329H167.705V495.319H161.512V494.329ZM161.512 491.569H167.705V492.56H161.512V491.569ZM161.512 512.329H167.705V513.319H161.512V512.329ZM161.512 509.569H167.705V510.56H161.512V509.569ZM161.512 530.329H167.705V531.319H161.512V530.329ZM161.512 527.569H167.705V528.56H161.512V527.569ZM175.973 548.329H182.166V549.319H175.973V548.329ZM175.973 545.569H182.166V546.56H175.973V545.569ZM183.203 566.329H189.396V567.319H183.203V566.329ZM183.203 563.569H189.396V564.56H183.203V563.569ZM204.895 584.329H211.088V585.319H204.895V584.329ZM204.895 581.569H211.088V582.56H204.895V581.569ZM112.422 613.568H113.359C113.949 614.489 114.389 615.392 114.678 616.275C114.967 617.157 115.111 618.034 115.111 618.905C115.111 619.784 114.967 620.665 114.678 621.548C114.389 622.431 113.949 623.333 113.359 624.255H112.422C112.941 623.349 113.328 622.452 113.582 621.566C113.84 620.679 113.969 619.792 113.969 618.905C113.969 618.015 113.84 617.126 113.582 616.239C113.328 615.353 112.941 614.462 112.422 613.568ZM119.652 613.568H120.59C121.18 614.489 121.619 615.392 121.908 616.275C122.197 617.157 122.342 618.034 122.342 618.905C122.342 619.784 122.197 620.665 121.908 621.548C121.619 622.431 121.18 623.333 120.59 624.255H119.652C120.172 623.349 120.559 622.452 120.812 621.566C121.07 620.679 121.199 619.792 121.199 618.905C121.199 618.015 121.07 617.126 120.812 616.239C120.559 615.353 120.172 614.462 119.652 613.568ZM168.742 656.329H174.936V657.319H168.742V656.329ZM168.742 653.569H174.936V654.56H168.742V653.569ZM291.66 656.329H297.854V657.319H291.66V656.329ZM291.66 653.569H297.854V654.56H291.66V653.569ZM212.125 674.329H218.318V675.319H212.125V674.329ZM212.125 671.569H218.318V672.56H212.125V671.569ZM277.199 692.329H283.393V693.319H277.199V692.329ZM277.199 689.569H283.393V690.56H277.199V689.569ZM472.422 692.329H478.615V693.319H472.422V692.329ZM472.422 689.569H478.615V690.56H472.422V689.569ZM177.736 710.892H179.799V713.259H177.736V710.892ZM209.389 703.568C208.869 704.458 208.48 705.347 208.223 706.234C207.969 707.116 207.842 708.007 207.842 708.905C207.842 709.8 207.969 710.691 208.223 711.577C208.48 712.464 208.869 713.357 209.389 714.255H208.451C207.861 713.325 207.422 712.421 207.133 711.542C206.844 710.659 206.699 709.78 206.699 708.905C206.699 708.034 206.844 707.157 207.133 706.275C207.422 705.392 207.861 704.489 208.451 703.568H209.389ZM216.619 703.568C216.1 704.458 215.711 705.347 215.453 706.234C215.199 707.116 215.072 708.007 215.072 708.905C215.072 709.8 215.199 710.691 215.453 711.577C215.711 712.464 216.1 713.357 216.619 714.255H215.682C215.092 713.325 214.652 712.421 214.363 711.542C214.074 710.659 213.93 709.78 213.93 708.905C213.93 708.034 214.074 707.157 214.363 706.275C214.652 705.392 215.092 704.489 215.682 703.568H216.619ZM257.582 711.144H259.41V712.696L258.109 715.222L256.938 715.228L257.582 712.696V711.144ZM307.645 703.568H308.582C309.172 704.489 309.611 705.392 309.9 706.275C310.189 707.157 310.334 708.034 310.334 708.905C310.334 709.784 310.189 710.665 309.9 711.548C309.611 712.431 309.172 713.333 308.582 714.255H307.645C308.164 713.349 308.551 712.452 308.805 711.566C309.062 710.679 309.191 709.792 309.191 708.905C309.191 708.015 309.062 707.126 308.805 706.239C308.551 705.353 308.164 704.462 307.645 703.568ZM346.768 703.568C346.248 704.458 345.859 705.347 345.602 706.234C345.348 707.116 345.221 708.007 345.221 708.905C345.221 709.8 345.348 710.691 345.602 711.577C345.859 712.464 346.248 713.357 346.768 714.255H345.83C345.24 713.325 344.801 712.421 344.512 711.542C344.223 710.659 344.078 709.78 344.078 708.905C344.078 708.034 344.223 707.157 344.512 706.275C344.801 705.392 345.24 704.489 345.83 703.568H346.768ZM175.973 746.329H182.166V747.319H175.973V746.329ZM175.973 743.569H182.166V744.56H175.973V743.569ZM175.973 764.329H182.166V765.319H175.973V764.329ZM175.973 761.569H182.166V762.56H175.973V761.569ZM175.973 782.329H182.166V783.319H175.973V782.329ZM175.973 779.569H182.166V780.56H175.973V779.569ZM190.434 800.329H196.627V801.319H190.434V800.329ZM190.434 797.569H196.627V798.56H190.434V797.569ZM197.664 818.329H203.857V819.319H197.664V818.329ZM197.664 815.569H203.857V816.56H197.664V815.569ZM219.355 836.329H225.549V837.319H219.355V836.329ZM219.355 833.569H225.549V834.56H219.355V833.569ZM126.883 865.568H127.82C128.41 866.489 128.85 867.392 129.139 868.275C129.428 869.157 129.572 870.034 129.572 870.905C129.572 871.784 129.428 872.665 129.139 873.548C128.85 874.431 128.41 875.333 127.82 876.255H126.883C127.402 875.349 127.789 874.452 128.043 873.566C128.301 872.679 128.43 871.792 128.43 870.905C128.43 870.015 128.301 869.126 128.043 868.239C127.789 867.353 127.402 866.462 126.883 865.568ZM134.113 865.568H135.051C135.641 866.489 136.08 867.392 136.369 868.275C136.658 869.157 136.803 870.034 136.803 870.905C136.803 871.784 136.658 872.665 136.369 873.548C136.08 874.431 135.641 875.333 135.051 876.255H134.113C134.633 875.349 135.02 874.452 135.273 873.566C135.531 872.679 135.66 871.792 135.66 870.905C135.66 870.015 135.531 869.126 135.273 868.239C135.02 867.353 134.633 866.462 134.113 865.568ZM83.5 919.568H84.4375C85.0273 920.489 85.4668 921.392 85.7559 922.275C86.0449 923.157 86.1895 924.034 86.1895 924.905C86.1895 925.784 86.0449 926.665 85.7559 927.548C85.4668 928.431 85.0273 929.333 84.4375 930.255H83.5C84.0195 929.349 84.4062 928.452 84.6602 927.566C84.918 926.679 85.0469 925.792 85.0469 924.905C85.0469 924.015 84.918 923.126 84.6602 922.239C84.4062 921.353 84.0195 920.462 83.5 919.568ZM91.2812 927.144H93.1094V928.696L91.9551 930.935H90.7012L91.2812 928.696V927.144ZM91.2051 922.702H93.0332V924.818H91.2051V922.702ZM68.6934 947.558C69.2402 947.558 69.5957 947.474 69.7598 947.306C69.9277 947.138 70.0117 946.775 70.0117 946.216V944.991C70.0117 944.323 70.1523 943.862 70.4336 943.609C70.7148 943.351 71.2344 943.177 71.9922 943.087C71.2109 942.982 70.6855 942.812 70.416 942.577C70.1465 942.339 70.0117 941.876 70.0117 941.189V939.618C70.0117 939.064 69.9277 938.702 69.7598 938.534C69.5957 938.362 69.2402 938.276 68.6934 938.276H68.2832V937.439H68.6582C69.6309 937.439 70.2812 937.583 70.6094 937.872C70.9414 938.157 71.1074 938.732 71.1074 939.595V941.118C71.1074 941.626 71.2148 942.011 71.4297 942.273C71.6484 942.534 72.0332 942.665 72.584 942.665H73.2988V943.503H72.584C72.0801 943.503 71.707 943.657 71.4648 943.966C71.2266 944.275 71.1074 944.642 71.1074 945.068V946.239C71.1074 947.103 70.9414 947.679 70.6094 947.968C70.2812 948.257 69.6309 948.401 68.6582 948.401H68.2832V947.558H68.6934ZM76.8203 945.144H78.6484V946.696L77.4941 948.935H76.2402L76.8203 946.696V945.144ZM76.7441 940.702H78.5723V942.818H76.7441V940.702ZM221.354 976.702H223.182V978.818H221.354V976.702ZM221.354 981.126H223.182V983.259H221.354V981.126ZM271.732 980.892H273.795V983.259H271.732V980.892ZM298.891 980.329H305.084V981.319H298.891V980.329ZM298.891 977.569H305.084V978.56H298.891V977.569ZM317.846 973.568C317.326 974.458 316.938 975.347 316.68 976.234C316.426 977.116 316.299 978.007 316.299 978.905C316.299 979.8 316.426 980.691 316.68 981.577C316.938 982.464 317.326 983.357 317.846 984.255H316.908C316.318 983.325 315.879 982.421 315.59 981.542C315.301 980.659 315.156 979.78 315.156 978.905C315.156 978.034 315.301 977.157 315.59 976.275C315.879 975.392 316.318 974.489 316.908 973.568H317.846ZM322.105 973.568H323.043C323.633 974.489 324.072 975.392 324.361 976.275C324.65 977.157 324.795 978.034 324.795 978.905C324.795 979.784 324.65 980.665 324.361 981.548C324.072 982.431 323.633 983.333 323.043 984.255H322.105C322.625 983.349 323.012 982.452 323.266 981.566C323.523 980.679 323.652 979.792 323.652 978.905C323.652 978.015 323.523 977.126 323.266 976.239C323.012 975.353 322.625 974.462 322.105 973.568ZM362.266 983.558V984.401H361.891C360.918 984.401 360.266 984.257 359.934 983.968C359.605 983.679 359.441 983.103 359.441 982.239V981.068C359.441 980.642 359.32 980.275 359.078 979.966C358.84 979.657 358.469 979.503 357.965 979.503H357.25V978.665H357.965C358.516 978.665 358.898 978.534 359.113 978.273C359.332 978.011 359.441 977.626 359.441 977.118V975.595C359.441 974.732 359.605 974.157 359.934 973.872C360.266 973.583 360.918 973.439 361.891 973.439H362.266V974.276H361.855C361.309 974.276 360.951 974.362 360.783 974.534C360.619 974.702 360.537 975.064 360.537 975.618V977.189C360.537 977.876 360.402 978.339 360.133 978.577C359.863 978.812 359.338 978.982 358.557 979.087C359.314 979.177 359.834 979.351 360.115 979.609C360.396 979.862 360.537 980.323 360.537 980.991V982.216C360.537 982.775 360.619 983.138 360.783 983.306C360.951 983.474 361.309 983.558 361.855 983.558H362.266ZM137.084 991.568C136.564 992.458 136.176 993.347 135.918 994.234C135.664 995.116 135.537 996.007 135.537 996.905C135.537 997.8 135.664 998.691 135.918 999.577C136.176 1000.46 136.564 1001.36 137.084 1002.26H136.146C135.557 1001.33 135.117 1000.42 134.828 999.542C134.539 998.659 134.395 997.78 134.395 996.905C134.395 996.034 134.539 995.157 134.828 994.275C135.117 993.392 135.557 992.489 136.146 991.568H137.084ZM197.664 1016.33H203.857V1017.32H197.664V1016.33ZM197.664 1013.57H203.857V1014.56H197.664V1013.57ZM204.895 1034.33H211.088V1035.32H204.895V1034.33ZM204.895 1031.57H211.088V1032.56H204.895V1031.57ZM129.297 1051.13C129.602 1051.21 129.861 1051.35 130.076 1051.57C130.291 1051.79 130.559 1052.22 130.879 1052.87L132.068 1055.26H130.797L129.754 1053.05C129.453 1052.42 129.182 1052.02 128.939 1051.84C128.701 1051.65 128.389 1051.56 128.002 1051.56H126.871V1055.26H125.682V1046.51H128.119C129.08 1046.51 129.816 1046.73 130.328 1047.16C130.84 1047.59 131.096 1048.22 131.096 1049.04C131.096 1049.62 130.938 1050.09 130.621 1050.46C130.309 1050.82 129.867 1051.05 129.297 1051.13ZM126.871 1047.48V1050.59H128.166C128.732 1050.59 129.154 1050.46 129.432 1050.21C129.709 1049.95 129.848 1049.57 129.848 1049.04C129.848 1048.54 129.699 1048.15 129.402 1047.89C129.109 1047.62 128.682 1047.48 128.119 1047.48H126.871ZM138.637 1051.44V1051.97H133.967V1052C133.936 1052.9 134.105 1053.54 134.477 1053.93C134.852 1054.32 135.379 1054.51 136.059 1054.51C136.402 1054.51 136.762 1054.46 137.137 1054.35C137.512 1054.24 137.912 1054.08 138.338 1053.85V1054.92C137.928 1055.09 137.531 1055.22 137.148 1055.3C136.77 1055.39 136.402 1055.43 136.047 1055.43C135.027 1055.43 134.23 1055.12 133.656 1054.51C133.082 1053.9 132.795 1053.06 132.795 1051.98C132.795 1050.94 133.076 1050.1 133.639 1049.48C134.201 1048.85 134.951 1048.54 135.889 1048.54C136.725 1048.54 137.383 1048.82 137.863 1049.39C138.348 1049.95 138.605 1050.64 138.637 1051.44ZM137.559 1051.12C137.512 1050.67 137.346 1050.28 137.061 1049.95C136.779 1049.62 136.373 1049.45 135.842 1049.45C135.322 1049.45 134.895 1049.62 134.559 1049.97C134.223 1050.31 134.039 1050.7 134.008 1051.13L137.559 1051.12ZM145.521 1054.92C145.232 1055.09 144.934 1055.22 144.625 1055.3C144.32 1055.39 144.008 1055.43 143.688 1055.43C142.672 1055.43 141.877 1055.12 141.303 1054.51C140.732 1053.91 140.447 1053.06 140.447 1051.98C140.447 1050.91 140.732 1050.06 141.303 1049.45C141.877 1048.84 142.672 1048.54 143.688 1048.54C144.004 1048.54 144.312 1048.58 144.613 1048.66C144.914 1048.74 145.217 1048.87 145.521 1049.04V1050.17C145.236 1049.92 144.949 1049.74 144.66 1049.62C144.375 1049.51 144.051 1049.45 143.688 1049.45C143.012 1049.45 142.492 1049.67 142.129 1050.11C141.766 1050.55 141.584 1051.17 141.584 1051.98C141.584 1052.79 141.766 1053.42 142.129 1053.86C142.496 1054.3 143.016 1054.51 143.688 1054.51C144.062 1054.51 144.398 1054.46 144.695 1054.34C144.992 1054.23 145.268 1054.05 145.521 1053.81V1054.92ZM153.098 1051.44V1051.97H148.428V1052C148.396 1052.9 148.566 1053.54 148.938 1053.93C149.312 1054.32 149.84 1054.51 150.52 1054.51C150.863 1054.51 151.223 1054.46 151.598 1054.35C151.973 1054.24 152.373 1054.08 152.799 1053.85V1054.92C152.389 1055.09 151.992 1055.22 151.609 1055.3C151.23 1055.39 150.863 1055.43 150.508 1055.43C149.488 1055.43 148.691 1055.12 148.117 1054.51C147.543 1053.9 147.256 1053.06 147.256 1051.98C147.256 1050.94 147.537 1050.1 148.1 1049.48C148.662 1048.85 149.412 1048.54 150.35 1048.54C151.186 1048.54 151.844 1048.82 152.324 1049.39C152.809 1049.95 153.066 1050.64 153.098 1051.44ZM152.02 1051.12C151.973 1050.67 151.807 1050.28 151.521 1049.95C151.24 1049.62 150.834 1049.45 150.303 1049.45C149.783 1049.45 149.355 1049.62 149.02 1049.97C148.684 1050.31 148.5 1050.7 148.469 1051.13L152.02 1051.12ZM159.924 1051.19V1055.26H158.84V1051.19C158.84 1050.6 158.736 1050.17 158.529 1049.89C158.322 1049.61 157.998 1049.48 157.557 1049.48C157.053 1049.48 156.664 1049.66 156.391 1050.01C156.121 1050.37 155.986 1050.88 155.986 1051.55V1055.26H154.908V1048.7H155.986V1049.68C156.178 1049.31 156.438 1049.02 156.766 1048.83C157.094 1048.64 157.482 1048.54 157.932 1048.54C158.6 1048.54 159.098 1048.76 159.426 1049.2C159.758 1049.64 159.924 1050.3 159.924 1051.19ZM164.594 1046.83V1048.7H167.043V1049.53H164.594V1053.1C164.594 1053.58 164.686 1053.92 164.869 1054.11C165.053 1054.3 165.373 1054.4 165.83 1054.4H167.043V1055.26H165.725C164.916 1055.26 164.346 1055.1 164.014 1054.77C163.682 1054.45 163.516 1053.89 163.516 1053.1V1049.53H161.764V1048.7H163.516V1046.83H164.594ZM177.795 1047.48V1050.77H179.166C179.713 1050.77 180.139 1050.63 180.443 1050.34C180.752 1050.05 180.906 1049.64 180.906 1049.12C180.906 1048.6 180.754 1048.2 180.449 1047.92C180.145 1047.63 179.717 1047.48 179.166 1047.48H177.795ZM176.611 1046.51H179.166C180.143 1046.51 180.883 1046.73 181.387 1047.18C181.891 1047.62 182.143 1048.27 182.143 1049.12C182.143 1049.99 181.891 1050.64 181.387 1051.08C180.887 1051.52 180.146 1051.74 179.166 1051.74H177.795V1055.26H176.611V1046.51ZM189.455 1050.05C189.225 1049.87 188.99 1049.74 188.752 1049.66C188.514 1049.58 188.252 1049.53 187.967 1049.53C187.295 1049.53 186.781 1049.75 186.426 1050.17C186.07 1050.59 185.893 1051.2 185.893 1052V1055.26H184.809V1048.7H185.893V1049.98C186.072 1049.51 186.348 1049.16 186.719 1048.91C187.094 1048.66 187.537 1048.54 188.049 1048.54C188.314 1048.54 188.562 1048.57 188.793 1048.64C189.023 1048.7 189.244 1048.81 189.455 1048.95V1050.05ZM193.527 1049.45C192.98 1049.45 192.566 1049.67 192.285 1050.09C192.004 1050.52 191.863 1051.15 191.863 1051.98C191.863 1052.82 192.004 1053.45 192.285 1053.88C192.566 1054.3 192.98 1054.51 193.527 1054.51C194.078 1054.51 194.494 1054.3 194.775 1053.88C195.057 1053.45 195.197 1052.82 195.197 1051.98C195.197 1051.15 195.057 1050.52 194.775 1050.09C194.494 1049.67 194.078 1049.45 193.527 1049.45ZM193.527 1048.54C194.438 1048.54 195.133 1048.83 195.613 1049.42C196.098 1050.01 196.34 1050.87 196.34 1051.98C196.34 1053.1 196.1 1053.96 195.619 1054.55C195.139 1055.14 194.441 1055.43 193.527 1055.43C192.617 1055.43 191.922 1055.14 191.441 1054.55C190.961 1053.96 190.721 1053.1 190.721 1051.98C190.721 1050.87 190.961 1050.01 191.441 1049.42C191.922 1048.83 192.617 1048.54 193.527 1048.54ZM200.664 1055.38V1049.53H198.807V1048.7H201.742V1055.38C201.742 1056.14 201.566 1056.72 201.215 1057.13C200.867 1057.55 200.371 1057.76 199.727 1057.76H198.238V1056.84H199.609C199.961 1056.84 200.225 1056.72 200.4 1056.47C200.576 1056.23 200.664 1055.86 200.664 1055.38ZM200.664 1046.14H201.742V1047.51H200.664V1046.14ZM210.941 1051.44V1051.97H206.271V1052C206.24 1052.9 206.41 1053.54 206.781 1053.93C207.156 1054.32 207.684 1054.51 208.363 1054.51C208.707 1054.51 209.066 1054.46 209.441 1054.35C209.816 1054.24 210.217 1054.08 210.643 1053.85V1054.92C210.232 1055.09 209.836 1055.22 209.453 1055.3C209.074 1055.39 208.707 1055.43 208.352 1055.43C207.332 1055.43 206.535 1055.12 205.961 1054.51C205.387 1053.9 205.1 1053.06 205.1 1051.98C205.1 1050.94 205.381 1050.1 205.943 1049.48C206.506 1048.85 207.256 1048.54 208.193 1048.54C209.029 1048.54 209.688 1048.82 210.168 1049.39C210.652 1049.95 210.91 1050.64 210.941 1051.44ZM209.863 1051.12C209.816 1050.67 209.65 1050.28 209.365 1049.95C209.084 1049.62 208.678 1049.45 208.146 1049.45C207.627 1049.45 207.199 1049.62 206.863 1049.97C206.527 1050.31 206.344 1050.7 206.312 1051.13L209.863 1051.12ZM217.826 1054.92C217.537 1055.09 217.238 1055.22 216.93 1055.3C216.625 1055.39 216.312 1055.43 215.992 1055.43C214.977 1055.43 214.182 1055.12 213.607 1054.51C213.037 1053.91 212.752 1053.06 212.752 1051.98C212.752 1050.91 213.037 1050.06 213.607 1049.45C214.182 1048.84 214.977 1048.54 215.992 1048.54C216.309 1048.54 216.617 1048.58 216.918 1048.66C217.219 1048.74 217.521 1048.87 217.826 1049.04V1050.17C217.541 1049.92 217.254 1049.74 216.965 1049.62C216.68 1049.51 216.355 1049.45 215.992 1049.45C215.316 1049.45 214.797 1049.67 214.434 1050.11C214.07 1050.55 213.889 1051.17 213.889 1051.98C213.889 1052.79 214.07 1053.42 214.434 1053.86C214.801 1054.3 215.32 1054.51 215.992 1054.51C216.367 1054.51 216.703 1054.46 217 1054.34C217.297 1054.23 217.572 1054.05 217.826 1053.81V1054.92ZM222.438 1046.83V1048.7H224.887V1049.53H222.438V1053.1C222.438 1053.58 222.529 1053.92 222.713 1054.11C222.896 1054.3 223.217 1054.4 223.674 1054.4H224.887V1055.26H223.568C222.76 1055.26 222.189 1055.1 221.857 1054.77C221.525 1054.45 221.359 1053.89 221.359 1053.1V1049.53H219.607V1048.7H221.359V1046.83H222.438ZM231.771 1048.92V1049.98C231.463 1049.8 231.152 1049.67 230.84 1049.58C230.527 1049.49 230.209 1049.44 229.885 1049.44C229.396 1049.44 229.031 1049.52 228.789 1049.68C228.551 1049.84 228.432 1050.08 228.432 1050.4C228.432 1050.69 228.521 1050.91 228.701 1051.06C228.881 1051.2 229.328 1051.34 230.043 1051.48L230.477 1051.56C231.012 1051.66 231.416 1051.87 231.689 1052.17C231.967 1052.48 232.105 1052.87 232.105 1053.36C232.105 1054.01 231.875 1054.52 231.414 1054.88C230.953 1055.25 230.312 1055.43 229.492 1055.43C229.168 1055.43 228.828 1055.39 228.473 1055.32C228.117 1055.26 227.732 1055.16 227.318 1055.02V1053.91C227.721 1054.11 228.105 1054.27 228.473 1054.37C228.84 1054.48 229.188 1054.53 229.516 1054.53C229.992 1054.53 230.361 1054.43 230.623 1054.24C230.885 1054.04 231.016 1053.77 231.016 1053.42C231.016 1052.92 230.537 1052.58 229.58 1052.39L229.533 1052.38L229.129 1052.29C228.508 1052.17 228.055 1051.97 227.77 1051.68C227.484 1051.4 227.342 1051 227.342 1050.51C227.342 1049.88 227.555 1049.39 227.98 1049.05C228.406 1048.71 229.014 1048.54 229.803 1048.54C230.154 1048.54 230.492 1048.57 230.816 1048.64C231.141 1048.7 231.459 1048.8 231.771 1048.92ZM212.125 1088.33H218.318V1089.32H212.125V1088.33ZM212.125 1085.57H218.318V1086.56H212.125V1085.57ZM175.973 1124.33H182.166V1125.32H175.973V1124.33ZM175.973 1121.57H182.166V1122.56H175.973V1121.57ZM219.355 1142.33H225.549V1143.32H219.355V1142.33ZM219.355 1139.57H225.549V1140.56H219.355V1139.57ZM183.203 1160.33H189.396V1161.32H183.203V1160.33ZM183.203 1157.57H189.396V1158.56H183.203V1157.57ZM200.447 1153.56H202.932V1154.39H201.525V1163.42H202.932V1164.26H200.447V1153.56ZM396.59 1153.56V1164.26H394.105V1163.42H395.512V1154.39H394.105V1153.56H396.59ZM168.742 1178.33H174.936V1179.32H168.742V1178.33ZM168.742 1175.57H174.936V1176.56H168.742V1175.57ZM175.973 1232.33H182.166V1233.32H175.973V1232.33ZM175.973 1229.57H182.166V1230.56H175.973V1229.57ZM219.355 1250.33H225.549V1251.32H219.355V1250.33ZM219.355 1247.57H225.549V1248.56H219.355V1247.57ZM183.203 1268.33H189.396V1269.32H183.203V1268.33ZM183.203 1265.57H189.396V1266.56H183.203V1265.57ZM200.447 1261.56H202.932V1262.39H201.525V1271.42H202.932V1272.26H200.447V1261.56ZM447.203 1261.56V1272.26H444.719V1271.42H446.125V1262.39H444.719V1261.56H447.203ZM168.742 1286.33H174.936V1287.32H168.742V1286.33ZM168.742 1283.57H174.936V1284.56H168.742V1283.57ZM175.973 1340.33H182.166V1341.32H175.973V1340.33ZM175.973 1337.57H182.166V1338.56H175.973V1337.57ZM219.355 1358.33H225.549V1359.32H219.355V1358.33ZM219.355 1355.57H225.549V1356.56H219.355V1355.57ZM183.203 1376.33H189.396V1377.32H183.203V1376.33ZM183.203 1373.57H189.396V1374.56H183.203V1373.57ZM200.447 1369.56H202.932V1370.39H201.525V1379.42H202.932V1380.26H200.447V1369.56ZM461.664 1369.56V1380.26H459.18V1379.42H460.586V1370.39H459.18V1369.56H461.664ZM175.973 1430.33H182.166V1431.32H175.973V1430.33ZM175.973 1427.57H182.166V1428.56H175.973V1427.57ZM219.355 1448.33H225.549V1449.32H219.355V1448.33ZM219.355 1445.57H225.549V1446.56H219.355V1445.57ZM183.203 1466.33H189.396V1467.32H183.203V1466.33ZM183.203 1463.57H189.396V1464.56H183.203V1463.57ZM200.447 1459.56H202.932V1460.39H201.525V1469.42H202.932V1470.26H200.447V1459.56ZM418.281 1459.56V1470.26H415.797V1469.42H417.203V1460.39H415.797V1459.56H418.281ZM175.973 1520.33H182.166V1521.32H175.973V1520.33ZM175.973 1517.57H182.166V1518.56H175.973V1517.57ZM219.355 1538.33H225.549V1539.32H219.355V1538.33ZM219.355 1535.57H225.549V1536.56H219.355V1535.57ZM183.203 1556.33H189.396V1557.32H183.203V1556.33ZM183.203 1553.57H189.396V1554.56H183.203V1553.57ZM200.447 1549.56H202.932V1550.39H201.525V1559.42H202.932V1560.26H200.447V1549.56ZM411.051 1549.56V1560.26H408.566V1559.42H409.973V1550.39H408.566V1549.56H411.051ZM175.973 1610.33H182.166V1611.32H175.973V1610.33ZM175.973 1607.57H182.166V1608.56H175.973V1607.57ZM219.355 1628.33H225.549V1629.32H219.355V1628.33ZM219.355 1625.57H225.549V1626.56H219.355V1625.57ZM183.203 1646.33H189.396V1647.32H183.203V1646.33ZM183.203 1643.57H189.396V1644.56H183.203V1643.57ZM200.447 1639.56H202.932V1640.39H201.525V1649.42H202.932V1650.26H200.447V1639.56ZM431.113 1647.14H432.941V1648.7L431.641 1651.22L430.469 1651.23L431.113 1648.7V1647.14ZM676.949 1647.14H678.777V1648.7L677.477 1651.22L676.305 1651.23L676.949 1648.7V1647.14ZM946.105 1639.56V1650.26H943.621V1649.42H945.027V1640.39H943.621V1639.56H946.105ZM175.973 1700.33H182.166V1701.32H175.973V1700.33ZM175.973 1697.57H182.166V1698.56H175.973V1697.57ZM219.355 1718.33H225.549V1719.32H219.355V1718.33ZM219.355 1715.57H225.549V1716.56H219.355V1715.57ZM183.203 1736.33H189.396V1737.32H183.203V1736.33ZM183.203 1733.57H189.396V1734.56H183.203V1733.57ZM200.447 1729.56H202.932V1730.39H201.525V1739.42H202.932V1740.26H200.447V1729.56ZM396.59 1729.56V1740.26H394.105V1739.42H395.512V1730.39H394.105V1729.56H396.59ZM175.973 1790.33H182.166V1791.32H175.973V1790.33ZM175.973 1787.57H182.166V1788.56H175.973V1787.57ZM219.355 1808.33H225.549V1809.32H219.355V1808.33ZM219.355 1805.57H225.549V1806.56H219.355V1805.57ZM183.203 1826.33H189.396V1827.32H183.203V1826.33ZM183.203 1823.57H189.396V1824.56H183.203V1823.57ZM200.447 1819.56H202.932V1820.39H201.525V1829.42H202.932V1830.26H200.447V1819.56ZM468.895 1819.56V1830.26H466.41V1829.42H467.816V1820.39H466.41V1819.56H468.895ZM175.973 1880.33H182.166V1881.32H175.973V1880.33ZM175.973 1877.57H182.166V1878.56H175.973V1877.57ZM219.355 1898.33H225.549V1899.32H219.355V1898.33ZM219.355 1895.57H225.549V1896.56H219.355V1895.57ZM183.203 1916.33H189.396V1917.32H183.203V1916.33ZM183.203 1913.57H189.396V1914.56H183.203V1913.57ZM200.447 1909.56H202.932V1910.39H201.525V1919.42H202.932V1920.26H200.447V1909.56ZM425.512 1909.56V1920.26H423.027V1919.42H424.434V1910.39H423.027V1909.56H425.512ZM175.973 1970.33H182.166V1971.32H175.973V1970.33ZM175.973 1967.57H182.166V1968.56H175.973V1967.57ZM219.355 1988.33H225.549V1989.32H219.355V1988.33ZM219.355 1985.57H225.549V1986.56H219.355V1985.57ZM183.203 2006.33H189.396V2007.32H183.203V2006.33ZM183.203 2003.57H189.396V2004.56H183.203V2003.57ZM200.447 1999.56H202.932V2000.39H201.525V2009.42H202.932V2010.26H200.447V1999.56ZM418.281 1999.56V2010.26H415.797V2009.42H417.203V2000.39H415.797V1999.56H418.281ZM83.5 2071.57H84.4375C85.0273 2072.49 85.4668 2073.39 85.7559 2074.27C86.0449 2075.16 86.1895 2076.03 86.1895 2076.91C86.1895 2077.78 86.0449 2078.67 85.7559 2079.55C85.4668 2080.43 85.0273 2081.33 84.4375 2082.26H83.5C84.0195 2081.35 84.4062 2080.45 84.6602 2079.57C84.918 2078.68 85.0469 2077.79 85.0469 2076.91C85.0469 2076.01 84.918 2075.13 84.6602 2074.24C84.4062 2073.35 84.0195 2072.46 83.5 2071.57ZM91.2812 2079.14H93.1094V2080.7L91.9551 2082.93H90.7012L91.2812 2080.7V2079.14ZM91.2051 2074.7H93.0332V2076.82H91.2051V2074.7ZM68.6934 2099.56C69.2402 2099.56 69.5957 2099.47 69.7598 2099.31C69.9277 2099.14 70.0117 2098.77 70.0117 2098.22V2096.99C70.0117 2096.32 70.1523 2095.86 70.4336 2095.61C70.7148 2095.35 71.2344 2095.18 71.9922 2095.09C71.2109 2094.98 70.6855 2094.81 70.416 2094.58C70.1465 2094.34 70.0117 2093.88 70.0117 2093.19V2091.62C70.0117 2091.06 69.9277 2090.7 69.7598 2090.53C69.5957 2090.36 69.2402 2090.28 68.6934 2090.28H68.2832V2089.44H68.6582C69.6309 2089.44 70.2812 2089.58 70.6094 2089.87C70.9414 2090.16 71.1074 2090.73 71.1074 2091.59V2093.12C71.1074 2093.63 71.2148 2094.01 71.4297 2094.27C71.6484 2094.53 72.0332 2094.67 72.584 2094.67H73.2988V2095.5H72.584C72.0801 2095.5 71.707 2095.66 71.4648 2095.97C71.2266 2096.27 71.1074 2096.64 71.1074 2097.07V2098.24C71.1074 2099.1 70.9414 2099.68 70.6094 2099.97C70.2812 2100.26 69.6309 2100.4 68.6582 2100.4H68.2832V2099.56H68.6934ZM76.8203 2097.14H78.6484V2098.7L77.4941 2100.93H76.2402L76.8203 2098.7V2097.14ZM76.7441 2092.7H78.5723V2094.82H76.7441V2092.7Z" fill="var(--vscode-editorOverviewRuler-bracketMatchForeground, #D4D4D4)" />
+                      <path d="M118.791 92.5109H123.648V93.507H121.814V100.263H123.648V101.259H118.791V100.263H120.625V93.507H118.791V92.5109ZM128.805 95.3644C128.938 95.0831 129.105 94.8761 129.309 94.7433C129.516 94.6066 129.764 94.5382 130.053 94.5382C130.58 94.5382 130.951 94.7433 131.166 95.1534C131.385 95.5597 131.494 96.3273 131.494 97.4562V101.259H130.51V97.5031C130.51 96.5773 130.457 96.0031 130.352 95.7804C130.25 95.5538 130.062 95.4406 129.789 95.4406C129.477 95.4406 129.262 95.5616 129.145 95.8038C129.031 96.0421 128.975 96.6085 128.975 97.5031V101.259H127.99V97.5031C127.99 96.5656 127.934 95.9874 127.82 95.7687C127.711 95.5499 127.512 95.4406 127.223 95.4406C126.938 95.4406 126.738 95.5616 126.625 95.8038C126.516 96.0421 126.461 96.6085 126.461 97.5031V101.259H125.482V94.6964H126.461V95.2589C126.59 95.0245 126.75 94.8468 126.941 94.7257C127.137 94.6007 127.357 94.5382 127.604 94.5382C127.9 94.5382 128.146 94.6066 128.342 94.7433C128.541 94.88 128.695 95.087 128.805 95.3644ZM136.188 97.9601H135.83C135.201 97.9601 134.727 98.0714 134.406 98.2941C134.09 98.5128 133.932 98.8409 133.932 99.2784C133.932 99.673 134.051 99.9796 134.289 100.198C134.527 100.417 134.857 100.526 135.279 100.526C135.873 100.526 136.34 100.321 136.68 99.9113C137.02 99.4972 137.191 98.9269 137.195 98.2003V97.9601H136.188ZM138.279 97.5148V101.259H137.195V100.286C136.965 100.677 136.674 100.966 136.322 101.153C135.975 101.337 135.551 101.429 135.051 101.429C134.383 101.429 133.85 101.241 133.451 100.866C133.053 100.487 132.854 99.9816 132.854 99.3488C132.854 98.6183 133.098 98.0636 133.586 97.6847C134.078 97.3058 134.799 97.1163 135.748 97.1163H137.195V96.9464C137.191 96.423 137.059 96.0441 136.797 95.8097C136.535 95.5714 136.117 95.4523 135.543 95.4523C135.176 95.4523 134.805 95.505 134.43 95.6105C134.055 95.7159 133.689 95.8702 133.334 96.0734V94.9952C133.732 94.8429 134.113 94.7296 134.477 94.6554C134.844 94.5773 135.199 94.5382 135.543 94.5382C136.086 94.5382 136.549 94.6183 136.932 94.7784C137.318 94.9386 137.631 95.1788 137.869 95.4991C138.018 95.6945 138.123 95.9366 138.186 96.2257C138.248 96.5109 138.279 96.9406 138.279 97.5148ZM144.332 97.9249C144.332 97.1163 144.199 96.5031 143.934 96.0851C143.672 95.6632 143.289 95.4523 142.785 95.4523C142.258 95.4523 141.855 95.6632 141.578 96.0851C141.301 96.5031 141.162 97.1163 141.162 97.9249C141.162 98.7335 141.301 99.3507 141.578 99.7765C141.859 100.198 142.266 100.409 142.797 100.409C143.293 100.409 143.672 100.196 143.934 99.7706C144.199 99.3448 144.332 98.7296 144.332 97.9249ZM145.41 100.837C145.41 101.821 145.178 102.568 144.713 103.075C144.248 103.583 143.564 103.837 142.662 103.837C142.365 103.837 142.055 103.81 141.73 103.755C141.406 103.7 141.082 103.62 140.758 103.515V102.448C141.141 102.628 141.488 102.761 141.801 102.847C142.113 102.933 142.4 102.976 142.662 102.976C143.244 102.976 143.668 102.818 143.934 102.501C144.199 102.185 144.332 101.683 144.332 100.995V100.948V100.216C144.16 100.583 143.926 100.857 143.629 101.036C143.332 101.216 142.971 101.306 142.545 101.306C141.779 101.306 141.168 100.999 140.711 100.386C140.254 99.7726 140.025 98.9523 140.025 97.9249C140.025 96.8937 140.254 96.0714 140.711 95.4581C141.168 94.8448 141.779 94.5382 142.545 94.5382C142.967 94.5382 143.324 94.6222 143.617 94.7902C143.91 94.9581 144.148 95.2179 144.332 95.5695V94.7198H145.41V100.837ZM153.098 97.4386V97.9659H148.428V98.0011C148.396 98.8956 148.566 99.5382 148.938 99.9288C149.312 100.319 149.84 100.515 150.52 100.515C150.863 100.515 151.223 100.46 151.598 100.351C151.973 100.241 152.373 100.075 152.799 99.8527V100.925C152.389 101.093 151.992 101.218 151.609 101.3C151.23 101.386 150.863 101.429 150.508 101.429C149.488 101.429 148.691 101.124 148.117 100.515C147.543 99.9015 147.256 99.0577 147.256 97.9835C147.256 96.9366 147.537 96.1007 148.1 95.4757C148.662 94.8507 149.412 94.5382 150.35 94.5382C151.186 94.5382 151.844 94.8214 152.324 95.3878C152.809 95.9542 153.066 96.6378 153.098 97.4386ZM152.02 97.1222C151.973 96.6691 151.807 96.2784 151.521 95.9503C151.24 95.6183 150.834 95.4523 150.303 95.4523C149.783 95.4523 149.355 95.6241 149.02 95.9679C148.684 96.3116 148.5 96.6984 148.469 97.1281L152.02 97.1222ZM118.873 110.511H120.062V118.263H124.287V119.259H118.873V110.511ZM126.695 112.72H129.455V118.421H131.594V119.259H126.238V118.421H128.377V113.558H126.695V112.72ZM128.377 110.171H129.455V111.53H128.377V110.171ZM138.232 115.193V119.259H137.148V115.193C137.148 114.603 137.045 114.169 136.838 113.892C136.631 113.614 136.307 113.476 135.865 113.476C135.361 113.476 134.973 113.655 134.699 114.015C134.43 114.37 134.295 114.882 134.295 115.55V119.259H133.217V112.696H134.295V113.681C134.486 113.306 134.746 113.023 135.074 112.831C135.402 112.636 135.791 112.538 136.24 112.538C136.908 112.538 137.406 112.759 137.734 113.2C138.066 113.638 138.232 114.302 138.232 115.193ZM140.688 110.142H141.801V115.421L144.631 112.696H145.943L143.359 115.169L146.348 119.259H145.029L142.604 115.872L141.801 116.628V119.259H140.688V110.142ZM134.629 136.286C135.625 136.286 136.32 136.042 136.715 135.554C137.109 135.062 137.307 134.175 137.307 132.894C137.307 131.601 137.109 130.71 136.715 130.222C136.324 129.73 135.629 129.484 134.629 129.484H134.066V136.286H134.629ZM134.652 128.511C135.988 128.511 136.973 128.866 137.605 129.577C138.238 130.288 138.555 131.394 138.555 132.894C138.555 134.386 138.238 135.487 137.605 136.198C136.973 136.905 135.988 137.259 134.652 137.259H132.877V128.511H134.652ZM145.867 133.439V133.966H141.197V134.001C141.166 134.896 141.336 135.538 141.707 135.929C142.082 136.319 142.609 136.515 143.289 136.515C143.633 136.515 143.992 136.46 144.367 136.351C144.742 136.241 145.143 136.075 145.568 135.853V136.925C145.158 137.093 144.762 137.218 144.379 137.3C144 137.386 143.633 137.429 143.277 137.429C142.258 137.429 141.461 137.124 140.887 136.515C140.312 135.901 140.025 135.058 140.025 133.984C140.025 132.937 140.307 132.101 140.869 131.476C141.432 130.851 142.182 130.538 143.119 130.538C143.955 130.538 144.613 130.821 145.094 131.388C145.578 131.954 145.836 132.638 145.867 133.439ZM144.789 133.122C144.742 132.669 144.576 132.278 144.291 131.95C144.01 131.618 143.604 131.452 143.072 131.452C142.553 131.452 142.125 131.624 141.789 131.968C141.453 132.312 141.27 132.698 141.238 133.128L144.789 133.122ZM152.236 130.925V131.98C151.928 131.8 151.617 131.665 151.305 131.575C150.992 131.485 150.674 131.441 150.35 131.441C149.861 131.441 149.496 131.521 149.254 131.681C149.016 131.837 148.896 132.077 148.896 132.401C148.896 132.694 148.986 132.913 149.166 133.058C149.346 133.202 149.793 133.343 150.508 133.48L150.941 133.562C151.477 133.663 151.881 133.866 152.154 134.171C152.432 134.476 152.57 134.872 152.57 135.36C152.57 136.009 152.34 136.517 151.879 136.884C151.418 137.247 150.777 137.429 149.957 137.429C149.633 137.429 149.293 137.394 148.938 137.323C148.582 137.257 148.197 137.155 147.783 137.019V135.905C148.186 136.112 148.57 136.269 148.938 136.374C149.305 136.476 149.652 136.526 149.98 136.526C150.457 136.526 150.826 136.431 151.088 136.239C151.35 136.044 151.48 135.773 151.48 135.425C151.48 134.925 151.002 134.579 150.045 134.388L149.998 134.376L149.594 134.294C148.973 134.173 148.52 133.97 148.234 133.685C147.949 133.396 147.807 133.003 147.807 132.507C147.807 131.878 148.02 131.394 148.445 131.054C148.871 130.71 149.479 130.538 150.268 130.538C150.619 130.538 150.957 130.571 151.281 130.638C151.605 130.7 151.924 130.796 152.236 130.925ZM159.982 136.925C159.693 137.093 159.395 137.218 159.086 137.3C158.781 137.386 158.469 137.429 158.148 137.429C157.133 137.429 156.338 137.124 155.764 136.515C155.193 135.905 154.908 135.062 154.908 133.984C154.908 132.905 155.193 132.062 155.764 131.452C156.338 130.843 157.133 130.538 158.148 130.538C158.465 130.538 158.773 130.579 159.074 130.661C159.375 130.743 159.678 130.87 159.982 131.042V132.173C159.697 131.919 159.41 131.735 159.121 131.622C158.836 131.509 158.512 131.452 158.148 131.452C157.473 131.452 156.953 131.671 156.59 132.109C156.227 132.546 156.045 133.171 156.045 133.984C156.045 134.792 156.227 135.417 156.59 135.859C156.957 136.296 157.477 136.515 158.148 136.515C158.523 136.515 158.859 136.458 159.156 136.345C159.453 136.228 159.729 136.048 159.982 135.806V136.925ZM167.764 132.05C167.533 131.87 167.299 131.739 167.061 131.657C166.822 131.575 166.561 131.534 166.275 131.534C165.604 131.534 165.09 131.745 164.734 132.167C164.379 132.589 164.201 133.198 164.201 133.995V137.259H163.117V130.696H164.201V131.98C164.381 131.515 164.656 131.159 165.027 130.913C165.402 130.663 165.846 130.538 166.357 130.538C166.623 130.538 166.871 130.571 167.102 130.638C167.332 130.704 167.553 130.808 167.764 130.948V132.05ZM170.078 130.72H172.838V136.421H174.977V137.259H169.621V136.421H171.76V131.558H170.078V130.72ZM171.76 128.171H172.838V129.53H171.76V128.171ZM177.654 136.433V139.755H176.57V130.696H177.654V131.534C177.834 131.21 178.072 130.964 178.369 130.796C178.67 130.624 179.016 130.538 179.406 130.538C180.199 130.538 180.82 130.845 181.27 131.458C181.723 132.071 181.949 132.921 181.949 134.007C181.949 135.073 181.723 135.911 181.27 136.521C180.816 137.126 180.195 137.429 179.406 137.429C179.008 137.429 178.658 137.345 178.357 137.177C178.061 137.005 177.826 136.757 177.654 136.433ZM180.818 133.984C180.818 133.148 180.686 132.517 180.42 132.091C180.158 131.665 179.768 131.452 179.248 131.452C178.725 131.452 178.328 131.667 178.059 132.097C177.789 132.523 177.654 133.151 177.654 133.984C177.654 134.812 177.789 135.441 178.059 135.87C178.328 136.3 178.725 136.515 179.248 136.515C179.768 136.515 180.158 136.302 180.42 135.876C180.686 135.45 180.818 134.819 180.818 133.984ZM186.285 128.833V130.696H188.734V131.534H186.285V135.097C186.285 135.581 186.377 135.919 186.561 136.11C186.744 136.302 187.064 136.398 187.521 136.398H188.734V137.259H187.416C186.607 137.259 186.037 137.097 185.705 136.773C185.373 136.448 185.207 135.89 185.207 135.097V131.534H183.455V130.696H185.207V128.833H186.285ZM191.77 130.72H194.529V136.421H196.668V137.259H191.312V136.421H193.451V131.558H191.77V130.72ZM193.451 128.171H194.529V129.53H193.451V128.171ZM200.758 131.452C200.211 131.452 199.797 131.665 199.516 132.091C199.234 132.517 199.094 133.148 199.094 133.984C199.094 134.816 199.234 135.446 199.516 135.876C199.797 136.302 200.211 136.515 200.758 136.515C201.309 136.515 201.725 136.302 202.006 135.876C202.287 135.446 202.428 134.816 202.428 133.984C202.428 133.148 202.287 132.517 202.006 132.091C201.725 131.665 201.309 131.452 200.758 131.452ZM200.758 130.538C201.668 130.538 202.363 130.833 202.844 131.423C203.328 132.013 203.57 132.866 203.57 133.984C203.57 135.105 203.33 135.96 202.85 136.55C202.369 137.136 201.672 137.429 200.758 137.429C199.848 137.429 199.152 137.136 198.672 136.55C198.191 135.96 197.951 135.105 197.951 133.984C197.951 132.866 198.191 132.013 198.672 131.423C199.152 130.833 199.848 130.538 200.758 130.538ZM210.537 133.193V137.259H209.453V133.193C209.453 132.603 209.35 132.169 209.143 131.892C208.936 131.614 208.611 131.476 208.17 131.476C207.666 131.476 207.277 131.655 207.004 132.015C206.734 132.37 206.6 132.882 206.6 133.55V137.259H205.521V130.696H206.6V131.681C206.791 131.306 207.051 131.023 207.379 130.831C207.707 130.636 208.096 130.538 208.545 130.538C209.213 130.538 209.711 130.759 210.039 131.2C210.371 131.638 210.537 132.302 210.537 133.193ZM216.062 133.128C216.367 133.206 216.627 133.355 216.842 133.573C217.057 133.788 217.324 134.22 217.645 134.868L218.834 137.259H217.562L216.52 135.05C216.219 134.421 215.947 134.017 215.705 133.837C215.467 133.653 215.154 133.562 214.768 133.562H213.637V137.259H212.447V128.511H214.885C215.846 128.511 216.582 128.728 217.094 129.161C217.605 129.595 217.861 130.222 217.861 131.042C217.861 131.62 217.703 132.093 217.387 132.46C217.074 132.823 216.633 133.046 216.062 133.128ZM213.637 129.484V132.589H214.932C215.498 132.589 215.92 132.462 216.197 132.208C216.475 131.954 216.613 131.566 216.613 131.042C216.613 130.538 216.465 130.153 216.168 129.888C215.875 129.618 215.447 129.484 214.885 129.484H213.637ZM222.449 131.452C221.902 131.452 221.488 131.665 221.207 132.091C220.926 132.517 220.785 133.148 220.785 133.984C220.785 134.816 220.926 135.446 221.207 135.876C221.488 136.302 221.902 136.515 222.449 136.515C223 136.515 223.416 136.302 223.697 135.876C223.979 135.446 224.119 134.816 224.119 133.984C224.119 133.148 223.979 132.517 223.697 132.091C223.416 131.665 223 131.452 222.449 131.452ZM222.449 130.538C223.359 130.538 224.055 130.833 224.535 131.423C225.02 132.013 225.262 132.866 225.262 133.984C225.262 135.105 225.021 135.96 224.541 136.55C224.061 137.136 223.363 137.429 222.449 137.429C221.539 137.429 220.844 137.136 220.363 136.55C219.883 135.96 219.643 135.105 219.643 133.984C219.643 132.866 219.883 132.013 220.363 131.423C220.844 130.833 221.539 130.538 222.449 130.538ZM226.07 130.696H227.137L228.279 135.999L229.217 132.612H230.137L231.086 135.999L232.229 130.696H233.295L231.76 137.259H230.729L229.68 133.661L228.637 137.259H227.605L226.07 130.696ZM85.0586 182.833V184.696H87.5078V185.534H85.0586V189.097C85.0586 189.581 85.1504 189.919 85.334 190.11C85.5176 190.302 85.8379 190.398 86.2949 190.398H87.5078V191.259H86.1895C85.3809 191.259 84.8105 191.097 84.4785 190.773C84.1465 190.448 83.9805 189.89 83.9805 189.097V185.534H82.2285V184.696H83.9805V182.833H85.0586ZM90.543 184.72H93.3027V190.421H95.4414V191.259H90.0859V190.421H92.2246V185.558H90.543V184.72ZM92.2246 182.171H93.3027V183.53H92.2246V182.171ZM99.5195 182.833V184.696H101.969V185.534H99.5195V189.097C99.5195 189.581 99.6113 189.919 99.7949 190.11C99.9785 190.302 100.299 190.398 100.756 190.398H101.969V191.259H100.65C99.8418 191.259 99.2715 191.097 98.9395 190.773C98.6074 190.448 98.4414 189.89 98.4414 189.097V185.534H96.6895V184.696H98.4414V182.833H99.5195ZM107.365 188.886C107.365 189.37 107.453 189.735 107.629 189.982C107.809 190.228 108.072 190.351 108.42 190.351H109.68V191.259H108.314C107.67 191.259 107.17 191.054 106.814 190.644C106.463 190.23 106.287 189.644 106.287 188.886V182.95H104.559V182.107H107.365V188.886ZM116.945 187.439V187.966H112.275V188.001C112.244 188.896 112.414 189.538 112.785 189.929C113.16 190.319 113.688 190.515 114.367 190.515C114.711 190.515 115.07 190.46 115.445 190.351C115.82 190.241 116.221 190.075 116.646 189.853V190.925C116.236 191.093 115.84 191.218 115.457 191.3C115.078 191.386 114.711 191.429 114.355 191.429C113.336 191.429 112.539 191.124 111.965 190.515C111.391 189.901 111.104 189.058 111.104 187.984C111.104 186.937 111.385 186.101 111.947 185.476C112.51 184.851 113.26 184.538 114.197 184.538C115.033 184.538 115.691 184.821 116.172 185.388C116.656 185.954 116.914 186.638 116.945 187.439ZM115.867 187.122C115.82 186.669 115.654 186.278 115.369 185.95C115.088 185.618 114.682 185.452 114.15 185.452C113.631 185.452 113.203 185.624 112.867 185.968C112.531 186.312 112.348 186.698 112.316 187.128L115.867 187.122ZM86.4883 203.534V200.142H87.5664V209.259H86.4883V208.433C86.3086 208.757 86.0684 209.005 85.7676 209.177C85.4707 209.345 85.127 209.429 84.7363 209.429C83.9434 209.429 83.3184 209.122 82.8613 208.509C82.4082 207.892 82.1816 207.042 82.1816 205.96C82.1816 204.894 82.4102 204.058 82.8672 203.452C83.3242 202.843 83.9473 202.538 84.7363 202.538C85.1309 202.538 85.4785 202.624 85.7793 202.796C86.0801 202.964 86.3164 203.21 86.4883 203.534ZM83.3184 205.984C83.3184 206.819 83.4512 207.45 83.7168 207.876C83.9824 208.302 84.375 208.515 84.8945 208.515C85.4141 208.515 85.8086 208.3 86.0781 207.87C86.3516 207.441 86.4883 206.812 86.4883 205.984C86.4883 205.151 86.3516 204.523 86.0781 204.097C85.8086 203.667 85.4141 203.452 84.8945 203.452C84.375 203.452 83.9824 203.665 83.7168 204.091C83.4512 204.517 83.3184 205.148 83.3184 205.984ZM95.2539 205.439V205.966H90.584V206.001C90.5527 206.896 90.7227 207.538 91.0938 207.929C91.4688 208.319 91.9961 208.515 92.6758 208.515C93.0195 208.515 93.3789 208.46 93.7539 208.351C94.1289 208.241 94.5293 208.075 94.9551 207.853V208.925C94.5449 209.093 94.1484 209.218 93.7656 209.3C93.3867 209.386 93.0195 209.429 92.6641 209.429C91.6445 209.429 90.8477 209.124 90.2734 208.515C89.6992 207.901 89.4121 207.058 89.4121 205.984C89.4121 204.937 89.6934 204.101 90.2559 203.476C90.8184 202.851 91.5684 202.538 92.5059 202.538C93.3418 202.538 94 202.821 94.4805 203.388C94.9648 203.954 95.2227 204.638 95.2539 205.439ZM94.1758 205.122C94.1289 204.669 93.9629 204.278 93.6777 203.95C93.3965 203.618 92.9902 203.452 92.459 203.452C91.9395 203.452 91.5117 203.624 91.1758 203.968C90.8398 204.312 90.6562 204.698 90.625 205.128L94.1758 205.122ZM101.623 202.925V203.98C101.314 203.8 101.004 203.665 100.691 203.575C100.379 203.485 100.061 203.441 99.7363 203.441C99.248 203.441 98.8828 203.521 98.6406 203.681C98.4023 203.837 98.2832 204.077 98.2832 204.401C98.2832 204.694 98.373 204.913 98.5527 205.058C98.7324 205.202 99.1797 205.343 99.8945 205.48L100.328 205.562C100.863 205.663 101.268 205.866 101.541 206.171C101.818 206.476 101.957 206.872 101.957 207.36C101.957 208.009 101.727 208.517 101.266 208.884C100.805 209.247 100.164 209.429 99.3438 209.429C99.0195 209.429 98.6797 209.394 98.3242 209.323C97.9688 209.257 97.584 209.155 97.1699 209.019V207.905C97.5723 208.112 97.957 208.269 98.3242 208.374C98.6914 208.476 99.0391 208.526 99.3672 208.526C99.8438 208.526 100.213 208.431 100.475 208.239C100.736 208.044 100.867 207.773 100.867 207.425C100.867 206.925 100.389 206.579 99.4316 206.388L99.3848 206.376L98.9805 206.294C98.3594 206.173 97.9062 205.97 97.6211 205.685C97.3359 205.396 97.1934 205.003 97.1934 204.507C97.1934 203.878 97.4062 203.394 97.832 203.054C98.2578 202.71 98.8652 202.538 99.6543 202.538C100.006 202.538 100.344 202.571 100.668 202.638C100.992 202.7 101.311 202.796 101.623 202.925ZM109.369 208.925C109.08 209.093 108.781 209.218 108.473 209.3C108.168 209.386 107.855 209.429 107.535 209.429C106.52 209.429 105.725 209.124 105.15 208.515C104.58 207.905 104.295 207.062 104.295 205.984C104.295 204.905 104.58 204.062 105.15 203.452C105.725 202.843 106.52 202.538 107.535 202.538C107.852 202.538 108.16 202.579 108.461 202.661C108.762 202.743 109.064 202.87 109.369 203.042V204.173C109.084 203.919 108.797 203.735 108.508 203.622C108.223 203.509 107.898 203.452 107.535 203.452C106.859 203.452 106.34 203.671 105.977 204.109C105.613 204.546 105.432 205.171 105.432 205.984C105.432 206.792 105.613 207.417 105.977 207.859C106.344 208.296 106.863 208.515 107.535 208.515C107.91 208.515 108.246 208.458 108.543 208.345C108.84 208.228 109.115 208.048 109.369 207.806V208.925ZM117.15 204.05C116.92 203.87 116.686 203.739 116.447 203.657C116.209 203.575 115.947 203.534 115.662 203.534C114.99 203.534 114.477 203.745 114.121 204.167C113.766 204.589 113.588 205.198 113.588 205.995V209.259H112.504V202.696H113.588V203.98C113.768 203.515 114.043 203.159 114.414 202.913C114.789 202.663 115.232 202.538 115.744 202.538C116.01 202.538 116.258 202.571 116.488 202.638C116.719 202.704 116.939 202.808 117.15 202.948V204.05ZM119.465 202.72H122.225V208.421H124.363V209.259H119.008V208.421H121.146V203.558H119.465V202.72ZM121.146 200.171H122.225V201.53H121.146V200.171ZM127.041 208.433V211.755H125.957V202.696H127.041V203.534C127.221 203.21 127.459 202.964 127.756 202.796C128.057 202.624 128.402 202.538 128.793 202.538C129.586 202.538 130.207 202.845 130.656 203.458C131.109 204.071 131.336 204.921 131.336 206.007C131.336 207.073 131.109 207.911 130.656 208.521C130.203 209.126 129.582 209.429 128.793 209.429C128.395 209.429 128.045 209.345 127.744 209.177C127.447 209.005 127.213 208.757 127.041 208.433ZM130.205 205.984C130.205 205.148 130.072 204.517 129.807 204.091C129.545 203.665 129.154 203.452 128.635 203.452C128.111 203.452 127.715 203.667 127.445 204.097C127.176 204.523 127.041 205.151 127.041 205.984C127.041 206.812 127.176 207.441 127.445 207.87C127.715 208.3 128.111 208.515 128.635 208.515C129.154 208.515 129.545 208.302 129.807 207.876C130.072 207.45 130.205 206.819 130.205 205.984ZM135.672 200.833V202.696H138.121V203.534H135.672V207.097C135.672 207.581 135.764 207.919 135.947 208.11C136.131 208.302 136.451 208.398 136.908 208.398H138.121V209.259H136.803C135.994 209.259 135.424 209.097 135.092 208.773C134.76 208.448 134.594 207.89 134.594 207.097V203.534H132.842V202.696H134.594V200.833H135.672ZM141.156 202.72H143.916V208.421H146.055V209.259H140.699V208.421H142.838V203.558H141.156V202.72ZM142.838 200.171H143.916V201.53H142.838V200.171ZM150.145 203.452C149.598 203.452 149.184 203.665 148.902 204.091C148.621 204.517 148.48 205.148 148.48 205.984C148.48 206.816 148.621 207.446 148.902 207.876C149.184 208.302 149.598 208.515 150.145 208.515C150.695 208.515 151.111 208.302 151.393 207.876C151.674 207.446 151.814 206.816 151.814 205.984C151.814 205.148 151.674 204.517 151.393 204.091C151.111 203.665 150.695 203.452 150.145 203.452ZM150.145 202.538C151.055 202.538 151.75 202.833 152.23 203.423C152.715 204.013 152.957 204.866 152.957 205.984C152.957 207.105 152.717 207.96 152.236 208.55C151.756 209.136 151.059 209.429 150.145 209.429C149.234 209.429 148.539 209.136 148.059 208.55C147.578 207.96 147.338 207.105 147.338 205.984C147.338 204.866 147.578 204.013 148.059 203.423C148.539 202.833 149.234 202.538 150.145 202.538ZM159.924 205.193V209.259H158.84V205.193C158.84 204.603 158.736 204.169 158.529 203.892C158.322 203.614 157.998 203.476 157.557 203.476C157.053 203.476 156.664 203.655 156.391 204.015C156.121 204.37 155.986 204.882 155.986 205.55V209.259H154.908V202.696H155.986V203.681C156.178 203.306 156.438 203.023 156.766 202.831C157.094 202.636 157.482 202.538 157.932 202.538C158.6 202.538 159.098 202.759 159.426 203.2C159.758 203.638 159.924 204.302 159.924 205.193ZM83.3125 220.72H86.0723V226.421H88.2109V227.259H82.8555V226.421H84.9941V221.558H83.3125V220.72ZM84.9941 218.171H86.0723V219.53H84.9941V218.171ZM92.6523 221.364C92.7852 221.083 92.9531 220.876 93.1562 220.743C93.3633 220.607 93.6113 220.538 93.9004 220.538C94.4277 220.538 94.7988 220.743 95.0137 221.153C95.2324 221.56 95.3418 222.327 95.3418 223.456V227.259H94.3574V223.503C94.3574 222.577 94.3047 222.003 94.1992 221.78C94.0977 221.554 93.9102 221.441 93.6367 221.441C93.3242 221.441 93.1094 221.562 92.9922 221.804C92.8789 222.042 92.8223 222.609 92.8223 223.503V227.259H91.8379V223.503C91.8379 222.566 91.7812 221.987 91.668 221.769C91.5586 221.55 91.3594 221.441 91.0703 221.441C90.7852 221.441 90.5859 221.562 90.4727 221.804C90.3633 222.042 90.3086 222.609 90.3086 223.503V227.259H89.3301V220.696H90.3086V221.259C90.4375 221.025 90.5977 220.847 90.7891 220.726C90.9844 220.601 91.2051 220.538 91.4512 220.538C91.748 220.538 91.9941 220.607 92.1895 220.743C92.3887 220.88 92.543 221.087 92.6523 221.364ZM100.035 223.96H99.6777C99.0488 223.96 98.5742 224.071 98.2539 224.294C97.9375 224.513 97.7793 224.841 97.7793 225.278C97.7793 225.673 97.8984 225.98 98.1367 226.198C98.375 226.417 98.7051 226.526 99.127 226.526C99.7207 226.526 100.188 226.321 100.527 225.911C100.867 225.497 101.039 224.927 101.043 224.2V223.96H100.035ZM102.127 223.515V227.259H101.043V226.286C100.812 226.677 100.521 226.966 100.17 227.153C99.8223 227.337 99.3984 227.429 98.8984 227.429C98.2305 227.429 97.6973 227.241 97.2988 226.866C96.9004 226.487 96.7012 225.982 96.7012 225.349C96.7012 224.618 96.9453 224.064 97.4336 223.685C97.9258 223.306 98.6465 223.116 99.5957 223.116H101.043V222.946C101.039 222.423 100.906 222.044 100.645 221.81C100.383 221.571 99.9648 221.452 99.3906 221.452C99.0234 221.452 98.6523 221.505 98.2773 221.61C97.9023 221.716 97.5371 221.87 97.1816 222.073V220.995C97.5801 220.843 97.9609 220.73 98.3242 220.655C98.6914 220.577 99.0469 220.538 99.3906 220.538C99.9336 220.538 100.396 220.618 100.779 220.778C101.166 220.939 101.479 221.179 101.717 221.499C101.865 221.694 101.971 221.937 102.033 222.226C102.096 222.511 102.127 222.941 102.127 223.515ZM108.18 223.925C108.18 223.116 108.047 222.503 107.781 222.085C107.52 221.663 107.137 221.452 106.633 221.452C106.105 221.452 105.703 221.663 105.426 222.085C105.148 222.503 105.01 223.116 105.01 223.925C105.01 224.734 105.148 225.351 105.426 225.776C105.707 226.198 106.113 226.409 106.645 226.409C107.141 226.409 107.52 226.196 107.781 225.771C108.047 225.345 108.18 224.73 108.18 223.925ZM109.258 226.837C109.258 227.821 109.025 228.568 108.561 229.075C108.096 229.583 107.412 229.837 106.51 229.837C106.213 229.837 105.902 229.81 105.578 229.755C105.254 229.7 104.93 229.62 104.605 229.515V228.448C104.988 228.628 105.336 228.761 105.648 228.847C105.961 228.933 106.248 228.976 106.51 228.976C107.092 228.976 107.516 228.818 107.781 228.501C108.047 228.185 108.18 227.683 108.18 226.995V226.948V226.216C108.008 226.583 107.773 226.857 107.477 227.036C107.18 227.216 106.818 227.306 106.393 227.306C105.627 227.306 105.016 226.999 104.559 226.386C104.102 225.773 103.873 224.952 103.873 223.925C103.873 222.894 104.102 222.071 104.559 221.458C105.016 220.845 105.627 220.538 106.393 220.538C106.814 220.538 107.172 220.622 107.465 220.79C107.758 220.958 107.996 221.218 108.18 221.569V220.72H109.258V226.837ZM116.945 223.439V223.966H112.275V224.001C112.244 224.896 112.414 225.538 112.785 225.929C113.16 226.319 113.688 226.515 114.367 226.515C114.711 226.515 115.07 226.46 115.445 226.351C115.82 226.241 116.221 226.075 116.646 225.853V226.925C116.236 227.093 115.84 227.218 115.457 227.3C115.078 227.386 114.711 227.429 114.355 227.429C113.336 227.429 112.539 227.124 111.965 226.515C111.391 225.901 111.104 225.058 111.104 223.984C111.104 222.937 111.385 222.101 111.947 221.476C112.51 220.851 113.26 220.538 114.197 220.538C115.033 220.538 115.691 220.821 116.172 221.388C116.656 221.954 116.914 222.638 116.945 223.439ZM115.867 223.122C115.82 222.669 115.654 222.278 115.369 221.95C115.088 221.618 114.682 221.452 114.15 221.452C113.631 221.452 113.203 221.624 112.867 221.968C112.531 222.312 112.348 222.698 112.316 223.128L115.867 223.122ZM123.314 220.925V221.98C123.006 221.8 122.695 221.665 122.383 221.575C122.07 221.485 121.752 221.441 121.428 221.441C120.939 221.441 120.574 221.521 120.332 221.681C120.094 221.837 119.975 222.077 119.975 222.401C119.975 222.694 120.064 222.913 120.244 223.058C120.424 223.202 120.871 223.343 121.586 223.48L122.02 223.562C122.555 223.663 122.959 223.866 123.232 224.171C123.51 224.476 123.648 224.872 123.648 225.36C123.648 226.009 123.418 226.517 122.957 226.884C122.496 227.247 121.855 227.429 121.035 227.429C120.711 227.429 120.371 227.394 120.016 227.323C119.66 227.257 119.275 227.155 118.861 227.019V225.905C119.264 226.112 119.648 226.269 120.016 226.374C120.383 226.476 120.73 226.526 121.059 226.526C121.535 226.526 121.904 226.431 122.166 226.239C122.428 226.044 122.559 225.773 122.559 225.425C122.559 224.925 122.08 224.579 121.123 224.388L121.076 224.376L120.672 224.294C120.051 224.173 119.598 223.97 119.312 223.685C119.027 223.396 118.885 223.003 118.885 222.507C118.885 221.878 119.098 221.394 119.523 221.054C119.949 220.71 120.557 220.538 121.346 220.538C121.697 220.538 122.035 220.571 122.359 220.638C122.684 220.7 123.002 220.796 123.314 220.925ZM85.6738 242.886C85.6738 243.37 85.7617 243.735 85.9375 243.982C86.1172 244.228 86.3809 244.351 86.7285 244.351H87.9883V245.259H86.623C85.9785 245.259 85.4785 245.054 85.123 244.644C84.7715 244.23 84.5957 243.644 84.5957 242.886V236.95H82.8672V236.107H85.6738V242.886ZM90.543 238.72H93.3027V244.421H95.4414V245.259H90.0859V244.421H92.2246V239.558H90.543V238.72ZM92.2246 236.171H93.3027V237.53H92.2246V236.171ZM102.08 241.193V245.259H100.996V241.193C100.996 240.603 100.893 240.169 100.686 239.892C100.479 239.614 100.154 239.476 99.7129 239.476C99.209 239.476 98.8203 239.655 98.5469 240.015C98.2773 240.37 98.1426 240.882 98.1426 241.55V245.259H97.0645V238.696H98.1426V239.681C98.334 239.306 98.5938 239.023 98.9219 238.831C99.25 238.636 99.6387 238.538 100.088 238.538C100.756 238.538 101.254 238.759 101.582 239.2C101.914 239.638 102.08 240.302 102.08 241.193ZM104.535 236.142H105.648V241.421L108.479 238.696H109.791L107.207 241.169L110.195 245.259H108.877L106.451 241.872L105.648 242.628V245.259H104.535V236.142ZM85.0586 308.833V310.696H87.5078V311.534H85.0586V315.097C85.0586 315.581 85.1504 315.919 85.334 316.11C85.5176 316.302 85.8379 316.398 86.2949 316.398H87.5078V317.259H86.1895C85.3809 317.259 84.8105 317.097 84.4785 316.773C84.1465 316.448 83.9805 315.89 83.9805 315.097V311.534H82.2285V310.696H83.9805V308.833H85.0586ZM90.543 310.72H93.3027V316.421H95.4414V317.259H90.0859V316.421H92.2246V311.558H90.543V310.72ZM92.2246 308.171H93.3027V309.53H92.2246V308.171ZM99.5195 308.833V310.696H101.969V311.534H99.5195V315.097C99.5195 315.581 99.6113 315.919 99.7949 316.11C99.9785 316.302 100.299 316.398 100.756 316.398H101.969V317.259H100.65C99.8418 317.259 99.2715 317.097 98.9395 316.773C98.6074 316.448 98.4414 315.89 98.4414 315.097V311.534H96.6895V310.696H98.4414V308.833H99.5195ZM107.365 314.886C107.365 315.37 107.453 315.735 107.629 315.982C107.809 316.228 108.072 316.351 108.42 316.351H109.68V317.259H108.314C107.67 317.259 107.17 317.054 106.814 316.644C106.463 316.23 106.287 315.644 106.287 314.886V308.95H104.559V308.107H107.365V314.886ZM116.945 313.439V313.966H112.275V314.001C112.244 314.896 112.414 315.538 112.785 315.929C113.16 316.319 113.688 316.515 114.367 316.515C114.711 316.515 115.07 316.46 115.445 316.351C115.82 316.241 116.221 316.075 116.646 315.853V316.925C116.236 317.093 115.84 317.218 115.457 317.3C115.078 317.386 114.711 317.429 114.355 317.429C113.336 317.429 112.539 317.124 111.965 316.515C111.391 315.901 111.104 315.058 111.104 313.984C111.104 312.937 111.385 312.101 111.947 311.476C112.51 310.851 113.26 310.538 114.197 310.538C115.033 310.538 115.691 310.821 116.172 311.388C116.656 311.954 116.914 312.638 116.945 313.439ZM115.867 313.122C115.82 312.669 115.654 312.278 115.369 311.95C115.088 311.618 114.682 311.452 114.15 311.452C113.631 311.452 113.203 311.624 112.867 311.968C112.531 312.312 112.348 312.698 112.316 313.128L115.867 313.122ZM86.4883 329.534V326.142H87.5664V335.259H86.4883V334.433C86.3086 334.757 86.0684 335.005 85.7676 335.177C85.4707 335.345 85.127 335.429 84.7363 335.429C83.9434 335.429 83.3184 335.122 82.8613 334.509C82.4082 333.892 82.1816 333.042 82.1816 331.96C82.1816 330.894 82.4102 330.058 82.8672 329.452C83.3242 328.843 83.9473 328.538 84.7363 328.538C85.1309 328.538 85.4785 328.624 85.7793 328.796C86.0801 328.964 86.3164 329.21 86.4883 329.534ZM83.3184 331.984C83.3184 332.819 83.4512 333.45 83.7168 333.876C83.9824 334.302 84.375 334.515 84.8945 334.515C85.4141 334.515 85.8086 334.3 86.0781 333.87C86.3516 333.441 86.4883 332.812 86.4883 331.984C86.4883 331.151 86.3516 330.523 86.0781 330.097C85.8086 329.667 85.4141 329.452 84.8945 329.452C84.375 329.452 83.9824 329.665 83.7168 330.091C83.4512 330.517 83.3184 331.148 83.3184 331.984ZM95.2539 331.439V331.966H90.584V332.001C90.5527 332.896 90.7227 333.538 91.0938 333.929C91.4688 334.319 91.9961 334.515 92.6758 334.515C93.0195 334.515 93.3789 334.46 93.7539 334.351C94.1289 334.241 94.5293 334.075 94.9551 333.853V334.925C94.5449 335.093 94.1484 335.218 93.7656 335.3C93.3867 335.386 93.0195 335.429 92.6641 335.429C91.6445 335.429 90.8477 335.124 90.2734 334.515C89.6992 333.901 89.4121 333.058 89.4121 331.984C89.4121 330.937 89.6934 330.101 90.2559 329.476C90.8184 328.851 91.5684 328.538 92.5059 328.538C93.3418 328.538 94 328.821 94.4805 329.388C94.9648 329.954 95.2227 330.638 95.2539 331.439ZM94.1758 331.122C94.1289 330.669 93.9629 330.278 93.6777 329.95C93.3965 329.618 92.9902 329.452 92.459 329.452C91.9395 329.452 91.5117 329.624 91.1758 329.968C90.8398 330.312 90.6562 330.698 90.625 331.128L94.1758 331.122ZM101.623 328.925V329.98C101.314 329.8 101.004 329.665 100.691 329.575C100.379 329.485 100.061 329.441 99.7363 329.441C99.248 329.441 98.8828 329.521 98.6406 329.681C98.4023 329.837 98.2832 330.077 98.2832 330.401C98.2832 330.694 98.373 330.913 98.5527 331.058C98.7324 331.202 99.1797 331.343 99.8945 331.48L100.328 331.562C100.863 331.663 101.268 331.866 101.541 332.171C101.818 332.476 101.957 332.872 101.957 333.36C101.957 334.009 101.727 334.517 101.266 334.884C100.805 335.247 100.164 335.429 99.3438 335.429C99.0195 335.429 98.6797 335.394 98.3242 335.323C97.9688 335.257 97.584 335.155 97.1699 335.019V333.905C97.5723 334.112 97.957 334.269 98.3242 334.374C98.6914 334.476 99.0391 334.526 99.3672 334.526C99.8438 334.526 100.213 334.431 100.475 334.239C100.736 334.044 100.867 333.773 100.867 333.425C100.867 332.925 100.389 332.579 99.4316 332.388L99.3848 332.376L98.9805 332.294C98.3594 332.173 97.9062 331.97 97.6211 331.685C97.3359 331.396 97.1934 331.003 97.1934 330.507C97.1934 329.878 97.4062 329.394 97.832 329.054C98.2578 328.71 98.8652 328.538 99.6543 328.538C100.006 328.538 100.344 328.571 100.668 328.638C100.992 328.7 101.311 328.796 101.623 328.925ZM109.369 334.925C109.08 335.093 108.781 335.218 108.473 335.3C108.168 335.386 107.855 335.429 107.535 335.429C106.52 335.429 105.725 335.124 105.15 334.515C104.58 333.905 104.295 333.062 104.295 331.984C104.295 330.905 104.58 330.062 105.15 329.452C105.725 328.843 106.52 328.538 107.535 328.538C107.852 328.538 108.16 328.579 108.461 328.661C108.762 328.743 109.064 328.87 109.369 329.042V330.173C109.084 329.919 108.797 329.735 108.508 329.622C108.223 329.509 107.898 329.452 107.535 329.452C106.859 329.452 106.34 329.671 105.977 330.109C105.613 330.546 105.432 331.171 105.432 331.984C105.432 332.792 105.613 333.417 105.977 333.859C106.344 334.296 106.863 334.515 107.535 334.515C107.91 334.515 108.246 334.458 108.543 334.345C108.84 334.228 109.115 334.048 109.369 333.806V334.925ZM117.15 330.05C116.92 329.87 116.686 329.739 116.447 329.657C116.209 329.575 115.947 329.534 115.662 329.534C114.99 329.534 114.477 329.745 114.121 330.167C113.766 330.589 113.588 331.198 113.588 331.995V335.259H112.504V328.696H113.588V329.98C113.768 329.515 114.043 329.159 114.414 328.913C114.789 328.663 115.232 328.538 115.744 328.538C116.01 328.538 116.258 328.571 116.488 328.638C116.719 328.704 116.939 328.808 117.15 328.948V330.05ZM119.465 328.72H122.225V334.421H124.363V335.259H119.008V334.421H121.146V329.558H119.465V328.72ZM121.146 326.171H122.225V327.53H121.146V326.171ZM127.041 334.433V337.755H125.957V328.696H127.041V329.534C127.221 329.21 127.459 328.964 127.756 328.796C128.057 328.624 128.402 328.538 128.793 328.538C129.586 328.538 130.207 328.845 130.656 329.458C131.109 330.071 131.336 330.921 131.336 332.007C131.336 333.073 131.109 333.911 130.656 334.521C130.203 335.126 129.582 335.429 128.793 335.429C128.395 335.429 128.045 335.345 127.744 335.177C127.447 335.005 127.213 334.757 127.041 334.433ZM130.205 331.984C130.205 331.148 130.072 330.517 129.807 330.091C129.545 329.665 129.154 329.452 128.635 329.452C128.111 329.452 127.715 329.667 127.445 330.097C127.176 330.523 127.041 331.151 127.041 331.984C127.041 332.812 127.176 333.441 127.445 333.87C127.715 334.3 128.111 334.515 128.635 334.515C129.154 334.515 129.545 334.302 129.807 333.876C130.072 333.45 130.205 332.819 130.205 331.984ZM135.672 326.833V328.696H138.121V329.534H135.672V333.097C135.672 333.581 135.764 333.919 135.947 334.11C136.131 334.302 136.451 334.398 136.908 334.398H138.121V335.259H136.803C135.994 335.259 135.424 335.097 135.092 334.773C134.76 334.448 134.594 333.89 134.594 333.097V329.534H132.842V328.696H134.594V326.833H135.672ZM141.156 328.72H143.916V334.421H146.055V335.259H140.699V334.421H142.838V329.558H141.156V328.72ZM142.838 326.171H143.916V327.53H142.838V326.171ZM150.145 329.452C149.598 329.452 149.184 329.665 148.902 330.091C148.621 330.517 148.48 331.148 148.48 331.984C148.48 332.816 148.621 333.446 148.902 333.876C149.184 334.302 149.598 334.515 150.145 334.515C150.695 334.515 151.111 334.302 151.393 333.876C151.674 333.446 151.814 332.816 151.814 331.984C151.814 331.148 151.674 330.517 151.393 330.091C151.111 329.665 150.695 329.452 150.145 329.452ZM150.145 328.538C151.055 328.538 151.75 328.833 152.23 329.423C152.715 330.013 152.957 330.866 152.957 331.984C152.957 333.105 152.717 333.96 152.236 334.55C151.756 335.136 151.059 335.429 150.145 335.429C149.234 335.429 148.539 335.136 148.059 334.55C147.578 333.96 147.338 333.105 147.338 331.984C147.338 330.866 147.578 330.013 148.059 329.423C148.539 328.833 149.234 328.538 150.145 328.538ZM159.924 331.193V335.259H158.84V331.193C158.84 330.603 158.736 330.169 158.529 329.892C158.322 329.614 157.998 329.476 157.557 329.476C157.053 329.476 156.664 329.655 156.391 330.015C156.121 330.37 155.986 330.882 155.986 331.55V335.259H154.908V328.696H155.986V329.681C156.178 329.306 156.438 329.023 156.766 328.831C157.094 328.636 157.482 328.538 157.932 328.538C158.6 328.538 159.098 328.759 159.426 329.2C159.758 329.638 159.924 330.302 159.924 331.193ZM83.3125 346.72H86.0723V352.421H88.2109V353.259H82.8555V352.421H84.9941V347.558H83.3125V346.72ZM84.9941 344.171H86.0723V345.53H84.9941V344.171ZM92.6523 347.364C92.7852 347.083 92.9531 346.876 93.1562 346.743C93.3633 346.607 93.6113 346.538 93.9004 346.538C94.4277 346.538 94.7988 346.743 95.0137 347.153C95.2324 347.56 95.3418 348.327 95.3418 349.456V353.259H94.3574V349.503C94.3574 348.577 94.3047 348.003 94.1992 347.78C94.0977 347.554 93.9102 347.441 93.6367 347.441C93.3242 347.441 93.1094 347.562 92.9922 347.804C92.8789 348.042 92.8223 348.609 92.8223 349.503V353.259H91.8379V349.503C91.8379 348.566 91.7812 347.987 91.668 347.769C91.5586 347.55 91.3594 347.441 91.0703 347.441C90.7852 347.441 90.5859 347.562 90.4727 347.804C90.3633 348.042 90.3086 348.609 90.3086 349.503V353.259H89.3301V346.696H90.3086V347.259C90.4375 347.025 90.5977 346.847 90.7891 346.726C90.9844 346.601 91.2051 346.538 91.4512 346.538C91.748 346.538 91.9941 346.607 92.1895 346.743C92.3887 346.88 92.543 347.087 92.6523 347.364ZM100.035 349.96H99.6777C99.0488 349.96 98.5742 350.071 98.2539 350.294C97.9375 350.513 97.7793 350.841 97.7793 351.278C97.7793 351.673 97.8984 351.98 98.1367 352.198C98.375 352.417 98.7051 352.526 99.127 352.526C99.7207 352.526 100.188 352.321 100.527 351.911C100.867 351.497 101.039 350.927 101.043 350.2V349.96H100.035ZM102.127 349.515V353.259H101.043V352.286C100.812 352.677 100.521 352.966 100.17 353.153C99.8223 353.337 99.3984 353.429 98.8984 353.429C98.2305 353.429 97.6973 353.241 97.2988 352.866C96.9004 352.487 96.7012 351.982 96.7012 351.349C96.7012 350.618 96.9453 350.064 97.4336 349.685C97.9258 349.306 98.6465 349.116 99.5957 349.116H101.043V348.946C101.039 348.423 100.906 348.044 100.645 347.81C100.383 347.571 99.9648 347.452 99.3906 347.452C99.0234 347.452 98.6523 347.505 98.2773 347.61C97.9023 347.716 97.5371 347.87 97.1816 348.073V346.995C97.5801 346.843 97.9609 346.73 98.3242 346.655C98.6914 346.577 99.0469 346.538 99.3906 346.538C99.9336 346.538 100.396 346.618 100.779 346.778C101.166 346.939 101.479 347.179 101.717 347.499C101.865 347.694 101.971 347.937 102.033 348.226C102.096 348.511 102.127 348.941 102.127 349.515ZM108.18 349.925C108.18 349.116 108.047 348.503 107.781 348.085C107.52 347.663 107.137 347.452 106.633 347.452C106.105 347.452 105.703 347.663 105.426 348.085C105.148 348.503 105.01 349.116 105.01 349.925C105.01 350.734 105.148 351.351 105.426 351.776C105.707 352.198 106.113 352.409 106.645 352.409C107.141 352.409 107.52 352.196 107.781 351.771C108.047 351.345 108.18 350.73 108.18 349.925ZM109.258 352.837C109.258 353.821 109.025 354.568 108.561 355.075C108.096 355.583 107.412 355.837 106.51 355.837C106.213 355.837 105.902 355.81 105.578 355.755C105.254 355.7 104.93 355.62 104.605 355.515V354.448C104.988 354.628 105.336 354.761 105.648 354.847C105.961 354.933 106.248 354.976 106.51 354.976C107.092 354.976 107.516 354.818 107.781 354.501C108.047 354.185 108.18 353.683 108.18 352.995V352.948V352.216C108.008 352.583 107.773 352.857 107.477 353.036C107.18 353.216 106.818 353.306 106.393 353.306C105.627 353.306 105.016 352.999 104.559 352.386C104.102 351.773 103.873 350.952 103.873 349.925C103.873 348.894 104.102 348.071 104.559 347.458C105.016 346.845 105.627 346.538 106.393 346.538C106.814 346.538 107.172 346.622 107.465 346.79C107.758 346.958 107.996 347.218 108.18 347.569V346.72H109.258V352.837ZM116.945 349.439V349.966H112.275V350.001C112.244 350.896 112.414 351.538 112.785 351.929C113.16 352.319 113.688 352.515 114.367 352.515C114.711 352.515 115.07 352.46 115.445 352.351C115.82 352.241 116.221 352.075 116.646 351.853V352.925C116.236 353.093 115.84 353.218 115.457 353.3C115.078 353.386 114.711 353.429 114.355 353.429C113.336 353.429 112.539 353.124 111.965 352.515C111.391 351.901 111.104 351.058 111.104 349.984C111.104 348.937 111.385 348.101 111.947 347.476C112.51 346.851 113.26 346.538 114.197 346.538C115.033 346.538 115.691 346.821 116.172 347.388C116.656 347.954 116.914 348.638 116.945 349.439ZM115.867 349.122C115.82 348.669 115.654 348.278 115.369 347.95C115.088 347.618 114.682 347.452 114.15 347.452C113.631 347.452 113.203 347.624 112.867 347.968C112.531 348.312 112.348 348.698 112.316 349.128L115.867 349.122ZM123.314 346.925V347.98C123.006 347.8 122.695 347.665 122.383 347.575C122.07 347.485 121.752 347.441 121.428 347.441C120.939 347.441 120.574 347.521 120.332 347.681C120.094 347.837 119.975 348.077 119.975 348.401C119.975 348.694 120.064 348.913 120.244 349.058C120.424 349.202 120.871 349.343 121.586 349.48L122.02 349.562C122.555 349.663 122.959 349.866 123.232 350.171C123.51 350.476 123.648 350.872 123.648 351.36C123.648 352.009 123.418 352.517 122.957 352.884C122.496 353.247 121.855 353.429 121.035 353.429C120.711 353.429 120.371 353.394 120.016 353.323C119.66 353.257 119.275 353.155 118.861 353.019V351.905C119.264 352.112 119.648 352.269 120.016 352.374C120.383 352.476 120.73 352.526 121.059 352.526C121.535 352.526 121.904 352.431 122.166 352.239C122.428 352.044 122.559 351.773 122.559 351.425C122.559 350.925 122.08 350.579 121.123 350.388L121.076 350.376L120.672 350.294C120.051 350.173 119.598 349.97 119.312 349.685C119.027 349.396 118.885 349.003 118.885 348.507C118.885 347.878 119.098 347.394 119.523 347.054C119.949 346.71 120.557 346.538 121.346 346.538C121.697 346.538 122.035 346.571 122.359 346.638C122.684 346.7 123.002 346.796 123.314 346.925ZM85.6738 368.886C85.6738 369.37 85.7617 369.735 85.9375 369.982C86.1172 370.228 86.3809 370.351 86.7285 370.351H87.9883V371.259H86.623C85.9785 371.259 85.4785 371.054 85.123 370.644C84.7715 370.23 84.5957 369.644 84.5957 368.886V362.95H82.8672V362.107H85.6738V368.886ZM90.543 364.72H93.3027V370.421H95.4414V371.259H90.0859V370.421H92.2246V365.558H90.543V364.72ZM92.2246 362.171H93.3027V363.53H92.2246V362.171ZM102.08 367.193V371.259H100.996V367.193C100.996 366.603 100.893 366.169 100.686 365.892C100.479 365.614 100.154 365.476 99.7129 365.476C99.209 365.476 98.8203 365.655 98.5469 366.015C98.2773 366.37 98.1426 366.882 98.1426 367.55V371.259H97.0645V364.696H98.1426V365.681C98.334 365.306 98.5938 365.023 98.9219 364.831C99.25 364.636 99.6387 364.538 100.088 364.538C100.756 364.538 101.254 364.759 101.582 365.2C101.914 365.638 102.08 366.302 102.08 367.193ZM104.535 362.142H105.648V367.421L108.479 364.696H109.791L107.207 367.169L110.195 371.259H108.877L106.451 367.872L105.648 368.628V371.259H104.535V362.142ZM138.291 424.925C138.002 425.093 137.703 425.218 137.395 425.3C137.09 425.386 136.777 425.429 136.457 425.429C135.441 425.429 134.646 425.124 134.072 424.515C133.502 423.905 133.217 423.062 133.217 421.984C133.217 420.905 133.502 420.062 134.072 419.452C134.646 418.843 135.441 418.538 136.457 418.538C136.773 418.538 137.082 418.579 137.383 418.661C137.684 418.743 137.986 418.87 138.291 419.042V420.173C138.006 419.919 137.719 419.735 137.43 419.622C137.145 419.509 136.82 419.452 136.457 419.452C135.781 419.452 135.262 419.671 134.898 420.109C134.535 420.546 134.354 421.171 134.354 421.984C134.354 422.792 134.535 423.417 134.898 423.859C135.266 424.296 135.785 424.515 136.457 424.515C136.832 424.515 137.168 424.458 137.465 424.345C137.762 424.228 138.037 424.048 138.291 423.806V424.925ZM143.518 422.886C143.518 423.37 143.605 423.735 143.781 423.982C143.961 424.228 144.225 424.351 144.572 424.351H145.832V425.259H144.467C143.822 425.259 143.322 425.054 142.967 424.644C142.615 424.23 142.439 423.644 142.439 422.886V416.95H140.711V416.107H143.518V422.886ZM150.648 421.96H150.291C149.662 421.96 149.188 422.071 148.867 422.294C148.551 422.513 148.393 422.841 148.393 423.278C148.393 423.673 148.512 423.98 148.75 424.198C148.988 424.417 149.318 424.526 149.74 424.526C150.334 424.526 150.801 424.321 151.141 423.911C151.48 423.497 151.652 422.927 151.656 422.2V421.96H150.648ZM152.74 421.515V425.259H151.656V424.286C151.426 424.677 151.135 424.966 150.783 425.153C150.436 425.337 150.012 425.429 149.512 425.429C148.844 425.429 148.311 425.241 147.912 424.866C147.514 424.487 147.314 423.982 147.314 423.349C147.314 422.618 147.559 422.064 148.047 421.685C148.539 421.306 149.26 421.116 150.209 421.116H151.656V420.946C151.652 420.423 151.52 420.044 151.258 419.81C150.996 419.571 150.578 419.452 150.004 419.452C149.637 419.452 149.266 419.505 148.891 419.61C148.516 419.716 148.15 419.87 147.795 420.073V418.995C148.193 418.843 148.574 418.73 148.938 418.655C149.305 418.577 149.66 418.538 150.004 418.538C150.547 418.538 151.01 418.618 151.393 418.778C151.779 418.939 152.092 419.179 152.33 419.499C152.479 419.694 152.584 419.937 152.646 420.226C152.709 420.511 152.74 420.941 152.74 421.515ZM159.467 418.925V419.98C159.158 419.8 158.848 419.665 158.535 419.575C158.223 419.485 157.904 419.441 157.58 419.441C157.092 419.441 156.727 419.521 156.484 419.681C156.246 419.837 156.127 420.077 156.127 420.401C156.127 420.694 156.217 420.913 156.396 421.058C156.576 421.202 157.023 421.343 157.738 421.48L158.172 421.562C158.707 421.663 159.111 421.866 159.385 422.171C159.662 422.476 159.801 422.872 159.801 423.36C159.801 424.009 159.57 424.517 159.109 424.884C158.648 425.247 158.008 425.429 157.188 425.429C156.863 425.429 156.523 425.394 156.168 425.323C155.812 425.257 155.428 425.155 155.014 425.019V423.905C155.416 424.112 155.801 424.269 156.168 424.374C156.535 424.476 156.883 424.526 157.211 424.526C157.688 424.526 158.057 424.431 158.318 424.239C158.58 424.044 158.711 423.773 158.711 423.425C158.711 422.925 158.232 422.579 157.275 422.388L157.229 422.376L156.824 422.294C156.203 422.173 155.75 421.97 155.465 421.685C155.18 421.396 155.037 421.003 155.037 420.507C155.037 419.878 155.25 419.394 155.676 419.054C156.102 418.71 156.709 418.538 157.498 418.538C157.85 418.538 158.188 418.571 158.512 418.638C158.836 418.7 159.154 418.796 159.467 418.925ZM166.697 418.925V419.98C166.389 419.8 166.078 419.665 165.766 419.575C165.453 419.485 165.135 419.441 164.811 419.441C164.322 419.441 163.957 419.521 163.715 419.681C163.477 419.837 163.357 420.077 163.357 420.401C163.357 420.694 163.447 420.913 163.627 421.058C163.807 421.202 164.254 421.343 164.969 421.48L165.402 421.562C165.938 421.663 166.342 421.866 166.615 422.171C166.893 422.476 167.031 422.872 167.031 423.36C167.031 424.009 166.801 424.517 166.34 424.884C165.879 425.247 165.238 425.429 164.418 425.429C164.094 425.429 163.754 425.394 163.398 425.323C163.043 425.257 162.658 425.155 162.244 425.019V423.905C162.646 424.112 163.031 424.269 163.398 424.374C163.766 424.476 164.113 424.526 164.441 424.526C164.918 424.526 165.287 424.431 165.549 424.239C165.811 424.044 165.941 423.773 165.941 423.425C165.941 422.925 165.463 422.579 164.506 422.388L164.459 422.376L164.055 422.294C163.434 422.173 162.98 421.97 162.695 421.685C162.41 421.396 162.268 421.003 162.268 420.507C162.268 419.878 162.48 419.394 162.906 419.054C163.332 418.71 163.939 418.538 164.729 418.538C165.08 418.538 165.418 418.571 165.742 418.638C166.066 418.7 166.385 418.796 166.697 418.925ZM168.338 416.54H169.955L173.377 423.718V416.54H174.637V425.259H173.02L169.598 418.081V425.259H168.338V416.54ZM179.57 421.96H179.213C178.584 421.96 178.109 422.071 177.789 422.294C177.473 422.513 177.314 422.841 177.314 423.278C177.314 423.673 177.434 423.98 177.672 424.198C177.91 424.417 178.24 424.526 178.662 424.526C179.256 424.526 179.723 424.321 180.062 423.911C180.402 423.497 180.574 422.927 180.578 422.2V421.96H179.57ZM181.662 421.515V425.259H180.578V424.286C180.348 424.677 180.057 424.966 179.705 425.153C179.357 425.337 178.934 425.429 178.434 425.429C177.766 425.429 177.232 425.241 176.834 424.866C176.436 424.487 176.236 423.982 176.236 423.349C176.236 422.618 176.48 422.064 176.969 421.685C177.461 421.306 178.182 421.116 179.131 421.116H180.578V420.946C180.574 420.423 180.441 420.044 180.18 419.81C179.918 419.571 179.5 419.452 178.926 419.452C178.559 419.452 178.188 419.505 177.812 419.61C177.438 419.716 177.072 419.87 176.717 420.073V418.995C177.115 418.843 177.496 418.73 177.859 418.655C178.227 418.577 178.582 418.538 178.926 418.538C179.469 418.538 179.932 418.618 180.314 418.778C180.701 418.939 181.014 419.179 181.252 419.499C181.4 419.694 181.506 419.937 181.568 420.226C181.631 420.511 181.662 420.941 181.662 421.515ZM186.648 419.364C186.781 419.083 186.949 418.876 187.152 418.743C187.359 418.607 187.607 418.538 187.896 418.538C188.424 418.538 188.795 418.743 189.01 419.153C189.229 419.56 189.338 420.327 189.338 421.456V425.259H188.354V421.503C188.354 420.577 188.301 420.003 188.195 419.78C188.094 419.554 187.906 419.441 187.633 419.441C187.32 419.441 187.105 419.562 186.988 419.804C186.875 420.042 186.818 420.609 186.818 421.503V425.259H185.834V421.503C185.834 420.566 185.777 419.987 185.664 419.769C185.555 419.55 185.355 419.441 185.066 419.441C184.781 419.441 184.582 419.562 184.469 419.804C184.359 420.042 184.305 420.609 184.305 421.503V425.259H183.326V418.696H184.305V419.259C184.434 419.025 184.594 418.847 184.785 418.726C184.98 418.601 185.201 418.538 185.447 418.538C185.744 418.538 185.99 418.607 186.186 418.743C186.385 418.88 186.539 419.087 186.648 419.364ZM196.48 421.439V421.966H191.811V422.001C191.779 422.896 191.949 423.538 192.32 423.929C192.695 424.319 193.223 424.515 193.902 424.515C194.246 424.515 194.605 424.46 194.98 424.351C195.355 424.241 195.756 424.075 196.182 423.853V424.925C195.771 425.093 195.375 425.218 194.992 425.3C194.613 425.386 194.246 425.429 193.891 425.429C192.871 425.429 192.074 425.124 191.5 424.515C190.926 423.901 190.639 423.058 190.639 421.984C190.639 420.937 190.92 420.101 191.482 419.476C192.045 418.851 192.795 418.538 193.732 418.538C194.568 418.538 195.227 418.821 195.707 419.388C196.191 419.954 196.449 420.638 196.48 421.439ZM195.402 421.122C195.355 420.669 195.189 420.278 194.904 419.95C194.623 419.618 194.217 419.452 193.686 419.452C193.166 419.452 192.738 419.624 192.402 419.968C192.066 420.312 191.883 420.698 191.852 421.128L195.402 421.122ZM229.668 434.833V436.696H232.117V437.534H229.668V441.097C229.668 441.581 229.76 441.919 229.943 442.11C230.127 442.302 230.447 442.398 230.904 442.398H232.117V443.259H230.799C229.99 443.259 229.42 443.097 229.088 442.773C228.756 442.448 228.59 441.89 228.59 441.097V437.534H226.838V436.696H228.59V434.833H229.668ZM235.152 436.72H237.912V442.421H240.051V443.259H234.695V442.421H236.834V437.558H235.152V436.72ZM236.834 434.171H237.912V435.53H236.834V434.171ZM244.129 434.833V436.696H246.578V437.534H244.129V441.097C244.129 441.581 244.221 441.919 244.404 442.11C244.588 442.302 244.908 442.398 245.365 442.398H246.578V443.259H245.26C244.451 443.259 243.881 443.097 243.549 442.773C243.217 442.448 243.051 441.89 243.051 441.097V437.534H241.299V436.696H243.051V434.833H244.129ZM251.975 440.886C251.975 441.37 252.062 441.735 252.238 441.982C252.418 442.228 252.682 442.351 253.029 442.351H254.289V443.259H252.924C252.279 443.259 251.779 443.054 251.424 442.644C251.072 442.23 250.896 441.644 250.896 440.886V434.95H249.168V434.107H251.975V440.886ZM261.555 439.439V439.966H256.885V440.001C256.854 440.896 257.023 441.538 257.395 441.929C257.77 442.319 258.297 442.515 258.977 442.515C259.32 442.515 259.68 442.46 260.055 442.351C260.43 442.241 260.83 442.075 261.256 441.853V442.925C260.846 443.093 260.449 443.218 260.066 443.3C259.688 443.386 259.32 443.429 258.965 443.429C257.945 443.429 257.148 443.124 256.574 442.515C256 441.901 255.713 441.058 255.713 439.984C255.713 438.937 255.994 438.101 256.557 437.476C257.119 436.851 257.869 436.538 258.807 436.538C259.643 436.538 260.301 436.821 260.781 437.388C261.266 437.954 261.523 438.638 261.555 439.439ZM260.477 439.122C260.43 438.669 260.264 438.278 259.979 437.95C259.697 437.618 259.291 437.452 258.76 437.452C258.24 437.452 257.812 437.624 257.477 437.968C257.141 438.312 256.957 438.698 256.926 439.128L260.477 439.122ZM280.281 434.833V436.696H282.73V437.534H280.281V441.097C280.281 441.581 280.373 441.919 280.557 442.11C280.74 442.302 281.061 442.398 281.518 442.398H282.73V443.259H281.412C280.604 443.259 280.033 443.097 279.701 442.773C279.369 442.448 279.203 441.89 279.203 441.097V437.534H277.451V436.696H279.203V434.833H280.281ZM285.766 436.72H288.525V442.421H290.664V443.259H285.309V442.421H287.447V437.558H285.766V436.72ZM287.447 434.171H288.525V435.53H287.447V434.171ZM294.742 434.833V436.696H297.191V437.534H294.742V441.097C294.742 441.581 294.834 441.919 295.018 442.11C295.201 442.302 295.521 442.398 295.979 442.398H297.191V443.259H295.873C295.064 443.259 294.494 443.097 294.162 442.773C293.83 442.448 293.664 441.89 293.664 441.097V437.534H291.912V436.696H293.664V434.833H294.742ZM302.588 440.886C302.588 441.37 302.676 441.735 302.852 441.982C303.031 442.228 303.295 442.351 303.643 442.351H304.902V443.259H303.537C302.893 443.259 302.393 443.054 302.037 442.644C301.686 442.23 301.51 441.644 301.51 440.886V434.95H299.781V434.107H302.588V440.886ZM312.168 439.439V439.966H307.498V440.001C307.467 440.896 307.637 441.538 308.008 441.929C308.383 442.319 308.91 442.515 309.59 442.515C309.934 442.515 310.293 442.46 310.668 442.351C311.043 442.241 311.443 442.075 311.869 441.853V442.925C311.459 443.093 311.062 443.218 310.68 443.3C310.301 443.386 309.934 443.429 309.578 443.429C308.559 443.429 307.762 443.124 307.188 442.515C306.613 441.901 306.326 441.058 306.326 439.984C306.326 438.937 306.607 438.101 307.17 437.476C307.732 436.851 308.482 436.538 309.42 436.538C310.256 436.538 310.914 436.821 311.395 437.388C311.879 437.954 312.137 438.638 312.168 439.439ZM311.09 439.122C311.043 438.669 310.877 438.278 310.592 437.95C310.311 437.618 309.904 437.452 309.373 437.452C308.854 437.452 308.426 437.624 308.09 437.968C307.754 438.312 307.57 438.698 307.539 439.128L311.09 439.122ZM332.324 437.534V434.142H333.402V443.259H332.324V442.433C332.145 442.757 331.904 443.005 331.604 443.177C331.307 443.345 330.963 443.429 330.572 443.429C329.779 443.429 329.154 443.122 328.697 442.509C328.244 441.892 328.018 441.042 328.018 439.96C328.018 438.894 328.246 438.058 328.703 437.452C329.16 436.843 329.783 436.538 330.572 436.538C330.967 436.538 331.314 436.624 331.615 436.796C331.916 436.964 332.152 437.21 332.324 437.534ZM329.154 439.984C329.154 440.819 329.287 441.45 329.553 441.876C329.818 442.302 330.211 442.515 330.73 442.515C331.25 442.515 331.645 442.3 331.914 441.87C332.188 441.441 332.324 440.812 332.324 439.984C332.324 439.151 332.188 438.523 331.914 438.097C331.645 437.667 331.25 437.452 330.73 437.452C330.211 437.452 329.818 437.665 329.553 438.091C329.287 438.517 329.154 439.148 329.154 439.984ZM341.09 439.439V439.966H336.42V440.001C336.389 440.896 336.559 441.538 336.93 441.929C337.305 442.319 337.832 442.515 338.512 442.515C338.855 442.515 339.215 442.46 339.59 442.351C339.965 442.241 340.365 442.075 340.791 441.853V442.925C340.381 443.093 339.984 443.218 339.602 443.3C339.223 443.386 338.855 443.429 338.5 443.429C337.48 443.429 336.684 443.124 336.109 442.515C335.535 441.901 335.248 441.058 335.248 439.984C335.248 438.937 335.529 438.101 336.092 437.476C336.654 436.851 337.404 436.538 338.342 436.538C339.178 436.538 339.836 436.821 340.316 437.388C340.801 437.954 341.059 438.638 341.09 439.439ZM340.012 439.122C339.965 438.669 339.799 438.278 339.514 437.95C339.232 437.618 338.826 437.452 338.295 437.452C337.775 437.452 337.348 437.624 337.012 437.968C336.676 438.312 336.492 438.698 336.461 439.128L340.012 439.122ZM347.459 436.925V437.98C347.15 437.8 346.84 437.665 346.527 437.575C346.215 437.485 345.896 437.441 345.572 437.441C345.084 437.441 344.719 437.521 344.477 437.681C344.238 437.837 344.119 438.077 344.119 438.401C344.119 438.694 344.209 438.913 344.389 439.058C344.568 439.202 345.016 439.343 345.73 439.48L346.164 439.562C346.699 439.663 347.104 439.866 347.377 440.171C347.654 440.476 347.793 440.872 347.793 441.36C347.793 442.009 347.562 442.517 347.102 442.884C346.641 443.247 346 443.429 345.18 443.429C344.855 443.429 344.516 443.394 344.16 443.323C343.805 443.257 343.42 443.155 343.006 443.019V441.905C343.408 442.112 343.793 442.269 344.16 442.374C344.527 442.476 344.875 442.526 345.203 442.526C345.68 442.526 346.049 442.431 346.311 442.239C346.572 442.044 346.703 441.773 346.703 441.425C346.703 440.925 346.225 440.579 345.268 440.388L345.221 440.376L344.816 440.294C344.195 440.173 343.742 439.97 343.457 439.685C343.172 439.396 343.029 439.003 343.029 438.507C343.029 437.878 343.242 437.394 343.668 437.054C344.094 436.71 344.701 436.538 345.49 436.538C345.842 436.538 346.18 436.571 346.504 436.638C346.828 436.7 347.146 436.796 347.459 436.925ZM355.205 442.925C354.916 443.093 354.617 443.218 354.309 443.3C354.004 443.386 353.691 443.429 353.371 443.429C352.355 443.429 351.561 443.124 350.986 442.515C350.416 441.905 350.131 441.062 350.131 439.984C350.131 438.905 350.416 438.062 350.986 437.452C351.561 436.843 352.355 436.538 353.371 436.538C353.688 436.538 353.996 436.579 354.297 436.661C354.598 436.743 354.9 436.87 355.205 437.042V438.173C354.92 437.919 354.633 437.735 354.344 437.622C354.059 437.509 353.734 437.452 353.371 437.452C352.695 437.452 352.176 437.671 351.812 438.109C351.449 438.546 351.268 439.171 351.268 439.984C351.268 440.792 351.449 441.417 351.812 441.859C352.18 442.296 352.699 442.515 353.371 442.515C353.746 442.515 354.082 442.458 354.379 442.345C354.676 442.228 354.951 442.048 355.205 441.806V442.925ZM362.986 438.05C362.756 437.87 362.521 437.739 362.283 437.657C362.045 437.575 361.783 437.534 361.498 437.534C360.826 437.534 360.312 437.745 359.957 438.167C359.602 438.589 359.424 439.198 359.424 439.995V443.259H358.34V436.696H359.424V437.98C359.604 437.515 359.879 437.159 360.25 436.913C360.625 436.663 361.068 436.538 361.58 436.538C361.846 436.538 362.094 436.571 362.324 436.638C362.555 436.704 362.775 436.808 362.986 436.948V438.05ZM365.301 436.72H368.061V442.421H370.199V443.259H364.844V442.421H366.982V437.558H365.301V436.72ZM366.982 434.171H368.061V435.53H366.982V434.171ZM372.877 442.433V445.755H371.793V436.696H372.877V437.534C373.057 437.21 373.295 436.964 373.592 436.796C373.893 436.624 374.238 436.538 374.629 436.538C375.422 436.538 376.043 436.845 376.492 437.458C376.945 438.071 377.172 438.921 377.172 440.007C377.172 441.073 376.945 441.911 376.492 442.521C376.039 443.126 375.418 443.429 374.629 443.429C374.23 443.429 373.881 443.345 373.58 443.177C373.283 443.005 373.049 442.757 372.877 442.433ZM376.041 439.984C376.041 439.148 375.908 438.517 375.643 438.091C375.381 437.665 374.99 437.452 374.471 437.452C373.947 437.452 373.551 437.667 373.281 438.097C373.012 438.523 372.877 439.151 372.877 439.984C372.877 440.812 373.012 441.441 373.281 441.87C373.551 442.3 373.947 442.515 374.471 442.515C374.99 442.515 375.381 442.302 375.643 441.876C375.908 441.45 376.041 440.819 376.041 439.984ZM381.508 434.833V436.696H383.957V437.534H381.508V441.097C381.508 441.581 381.6 441.919 381.783 442.11C381.967 442.302 382.287 442.398 382.744 442.398H383.957V443.259H382.639C381.83 443.259 381.26 443.097 380.928 442.773C380.596 442.448 380.43 441.89 380.43 441.097V437.534H378.678V436.696H380.43V434.833H381.508ZM386.992 436.72H389.752V442.421H391.891V443.259H386.535V442.421H388.674V437.558H386.992V436.72ZM388.674 434.171H389.752V435.53H388.674V434.171ZM395.98 437.452C395.434 437.452 395.02 437.665 394.738 438.091C394.457 438.517 394.316 439.148 394.316 439.984C394.316 440.816 394.457 441.446 394.738 441.876C395.02 442.302 395.434 442.515 395.98 442.515C396.531 442.515 396.947 442.302 397.229 441.876C397.51 441.446 397.65 440.816 397.65 439.984C397.65 439.148 397.51 438.517 397.229 438.091C396.947 437.665 396.531 437.452 395.98 437.452ZM395.98 436.538C396.891 436.538 397.586 436.833 398.066 437.423C398.551 438.013 398.793 438.866 398.793 439.984C398.793 441.105 398.553 441.96 398.072 442.55C397.592 443.136 396.895 443.429 395.98 443.429C395.07 443.429 394.375 443.136 393.895 442.55C393.414 441.96 393.174 441.105 393.174 439.984C393.174 438.866 393.414 438.013 393.895 437.423C394.375 436.833 395.07 436.538 395.98 436.538ZM405.76 439.193V443.259H404.676V439.193C404.676 438.603 404.572 438.169 404.365 437.892C404.158 437.614 403.834 437.476 403.393 437.476C402.889 437.476 402.5 437.655 402.227 438.015C401.957 438.37 401.822 438.882 401.822 439.55V443.259H400.744V436.696H401.822V437.681C402.014 437.306 402.273 437.023 402.602 436.831C402.93 436.636 403.318 436.538 403.768 436.538C404.436 436.538 404.934 436.759 405.262 437.2C405.594 437.638 405.76 438.302 405.76 439.193ZM409.17 435.484V438.771H410.541C411.088 438.771 411.514 438.626 411.818 438.337C412.127 438.048 412.281 437.644 412.281 437.124C412.281 436.605 412.129 436.202 411.824 435.917C411.52 435.628 411.092 435.484 410.541 435.484H409.17ZM407.986 434.511H410.541C411.518 434.511 412.258 434.734 412.762 435.179C413.266 435.62 413.518 436.269 413.518 437.124C413.518 437.987 413.266 438.64 412.762 439.081C412.262 439.523 411.521 439.743 410.541 439.743H409.17V443.259H407.986V434.511ZM420.83 438.05C420.6 437.87 420.365 437.739 420.127 437.657C419.889 437.575 419.627 437.534 419.342 437.534C418.67 437.534 418.156 437.745 417.801 438.167C417.445 438.589 417.268 439.198 417.268 439.995V443.259H416.184V436.696H417.268V437.98C417.447 437.515 417.723 437.159 418.094 436.913C418.469 436.663 418.912 436.538 419.424 436.538C419.689 436.538 419.938 436.571 420.168 436.638C420.398 436.704 420.619 436.808 420.83 436.948V438.05ZM423.145 436.72H425.904V442.421H428.043V443.259H422.688V442.421H424.826V437.558H423.145V436.72ZM424.826 434.171H425.904V435.53H424.826V434.171ZM432.484 437.364C432.617 437.083 432.785 436.876 432.988 436.743C433.195 436.607 433.443 436.538 433.732 436.538C434.26 436.538 434.631 436.743 434.846 437.153C435.064 437.56 435.174 438.327 435.174 439.456V443.259H434.189V439.503C434.189 438.577 434.137 438.003 434.031 437.78C433.93 437.554 433.742 437.441 433.469 437.441C433.156 437.441 432.941 437.562 432.824 437.804C432.711 438.042 432.654 438.609 432.654 439.503V443.259H431.67V439.503C431.67 438.566 431.613 437.987 431.5 437.769C431.391 437.55 431.191 437.441 430.902 437.441C430.617 437.441 430.418 437.562 430.305 437.804C430.195 438.042 430.141 438.609 430.141 439.503V443.259H429.162V436.696H430.141V437.259C430.27 437.025 430.43 436.847 430.621 436.726C430.816 436.601 431.037 436.538 431.283 436.538C431.58 436.538 431.826 436.607 432.021 436.743C432.221 436.88 432.375 437.087 432.484 437.364ZM439.867 439.96H439.51C438.881 439.96 438.406 440.071 438.086 440.294C437.77 440.513 437.611 440.841 437.611 441.278C437.611 441.673 437.73 441.98 437.969 442.198C438.207 442.417 438.537 442.526 438.959 442.526C439.553 442.526 440.02 442.321 440.359 441.911C440.699 441.497 440.871 440.927 440.875 440.2V439.96H439.867ZM441.959 439.515V443.259H440.875V442.286C440.645 442.677 440.354 442.966 440.002 443.153C439.654 443.337 439.23 443.429 438.73 443.429C438.062 443.429 437.529 443.241 437.131 442.866C436.732 442.487 436.533 441.982 436.533 441.349C436.533 440.618 436.777 440.064 437.266 439.685C437.758 439.306 438.479 439.116 439.428 439.116H440.875V438.946C440.871 438.423 440.738 438.044 440.477 437.81C440.215 437.571 439.797 437.452 439.223 437.452C438.855 437.452 438.484 437.505 438.109 437.61C437.734 437.716 437.369 437.87 437.014 438.073V436.995C437.412 436.843 437.793 436.73 438.156 436.655C438.523 436.577 438.879 436.538 439.223 436.538C439.766 436.538 440.229 436.618 440.611 436.778C440.998 436.939 441.311 437.179 441.549 437.499C441.697 437.694 441.803 437.937 441.865 438.226C441.928 438.511 441.959 438.941 441.959 439.515ZM449.752 438.05C449.521 437.87 449.287 437.739 449.049 437.657C448.811 437.575 448.549 437.534 448.264 437.534C447.592 437.534 447.078 437.745 446.723 438.167C446.367 438.589 446.189 439.198 446.189 439.995V443.259H445.105V436.696H446.189V437.98C446.369 437.515 446.645 437.159 447.016 436.913C447.391 436.663 447.834 436.538 448.346 436.538C448.611 436.538 448.859 436.571 449.09 436.638C449.32 436.704 449.541 436.808 449.752 436.948V438.05ZM455.242 441.15C455.062 441.607 454.834 442.208 454.557 442.954C454.17 443.985 453.91 444.614 453.777 444.841C453.598 445.146 453.373 445.374 453.104 445.526C452.834 445.679 452.52 445.755 452.16 445.755H451.293V444.853H451.932C452.248 444.853 452.496 444.761 452.676 444.577C452.855 444.394 453.084 443.919 453.361 443.153L450.824 436.696H451.967L453.912 441.829L455.828 436.696H456.971L455.242 441.15ZM476.934 437.534V434.142H478.012V443.259H476.934V442.433C476.754 442.757 476.514 443.005 476.213 443.177C475.916 443.345 475.572 443.429 475.182 443.429C474.389 443.429 473.764 443.122 473.307 442.509C472.854 441.892 472.627 441.042 472.627 439.96C472.627 438.894 472.855 438.058 473.312 437.452C473.77 436.843 474.393 436.538 475.182 436.538C475.576 436.538 475.924 436.624 476.225 436.796C476.525 436.964 476.762 437.21 476.934 437.534ZM473.764 439.984C473.764 440.819 473.896 441.45 474.162 441.876C474.428 442.302 474.82 442.515 475.34 442.515C475.859 442.515 476.254 442.3 476.523 441.87C476.797 441.441 476.934 440.812 476.934 439.984C476.934 439.151 476.797 438.523 476.523 438.097C476.254 437.667 475.859 437.452 475.34 437.452C474.82 437.452 474.428 437.665 474.162 438.091C473.896 438.517 473.764 439.148 473.764 439.984ZM485.699 439.439V439.966H481.029V440.001C480.998 440.896 481.168 441.538 481.539 441.929C481.914 442.319 482.441 442.515 483.121 442.515C483.465 442.515 483.824 442.46 484.199 442.351C484.574 442.241 484.975 442.075 485.4 441.853V442.925C484.99 443.093 484.594 443.218 484.211 443.3C483.832 443.386 483.465 443.429 483.109 443.429C482.09 443.429 481.293 443.124 480.719 442.515C480.145 441.901 479.857 441.058 479.857 439.984C479.857 438.937 480.139 438.101 480.701 437.476C481.264 436.851 482.014 436.538 482.951 436.538C483.787 436.538 484.445 436.821 484.926 437.388C485.41 437.954 485.668 438.638 485.699 439.439ZM484.621 439.122C484.574 438.669 484.408 438.278 484.123 437.95C483.842 437.618 483.436 437.452 482.904 437.452C482.385 437.452 481.957 437.624 481.621 437.968C481.285 438.312 481.102 438.698 481.07 439.128L484.621 439.122ZM492.068 436.925V437.98C491.76 437.8 491.449 437.665 491.137 437.575C490.824 437.485 490.506 437.441 490.182 437.441C489.693 437.441 489.328 437.521 489.086 437.681C488.848 437.837 488.729 438.077 488.729 438.401C488.729 438.694 488.818 438.913 488.998 439.058C489.178 439.202 489.625 439.343 490.34 439.48L490.773 439.562C491.309 439.663 491.713 439.866 491.986 440.171C492.264 440.476 492.402 440.872 492.402 441.36C492.402 442.009 492.172 442.517 491.711 442.884C491.25 443.247 490.609 443.429 489.789 443.429C489.465 443.429 489.125 443.394 488.77 443.323C488.414 443.257 488.029 443.155 487.615 443.019V441.905C488.018 442.112 488.402 442.269 488.77 442.374C489.137 442.476 489.484 442.526 489.812 442.526C490.289 442.526 490.658 442.431 490.92 442.239C491.182 442.044 491.312 441.773 491.312 441.425C491.312 440.925 490.834 440.579 489.877 440.388L489.83 440.376L489.426 440.294C488.805 440.173 488.352 439.97 488.066 439.685C487.781 439.396 487.639 439.003 487.639 438.507C487.639 437.878 487.852 437.394 488.277 437.054C488.703 436.71 489.311 436.538 490.1 436.538C490.451 436.538 490.789 436.571 491.113 436.638C491.438 436.7 491.756 436.796 492.068 436.925ZM499.814 442.925C499.525 443.093 499.227 443.218 498.918 443.3C498.613 443.386 498.301 443.429 497.98 443.429C496.965 443.429 496.17 443.124 495.596 442.515C495.025 441.905 494.74 441.062 494.74 439.984C494.74 438.905 495.025 438.062 495.596 437.452C496.17 436.843 496.965 436.538 497.98 436.538C498.297 436.538 498.605 436.579 498.906 436.661C499.207 436.743 499.51 436.87 499.814 437.042V438.173C499.529 437.919 499.242 437.735 498.953 437.622C498.668 437.509 498.344 437.452 497.98 437.452C497.305 437.452 496.785 437.671 496.422 438.109C496.059 438.546 495.877 439.171 495.877 439.984C495.877 440.792 496.059 441.417 496.422 441.859C496.789 442.296 497.309 442.515 497.98 442.515C498.355 442.515 498.691 442.458 498.988 442.345C499.285 442.228 499.561 442.048 499.814 441.806V442.925ZM507.596 438.05C507.365 437.87 507.131 437.739 506.893 437.657C506.654 437.575 506.393 437.534 506.107 437.534C505.436 437.534 504.922 437.745 504.566 438.167C504.211 438.589 504.033 439.198 504.033 439.995V443.259H502.949V436.696H504.033V437.98C504.213 437.515 504.488 437.159 504.859 436.913C505.234 436.663 505.678 436.538 506.189 436.538C506.455 436.538 506.703 436.571 506.934 436.638C507.164 436.704 507.385 436.808 507.596 436.948V438.05ZM509.91 436.72H512.67V442.421H514.809V443.259H509.453V442.421H511.592V437.558H509.91V436.72ZM511.592 434.171H512.67V435.53H511.592V434.171ZM517.486 442.433V445.755H516.402V436.696H517.486V437.534C517.666 437.21 517.904 436.964 518.201 436.796C518.502 436.624 518.848 436.538 519.238 436.538C520.031 436.538 520.652 436.845 521.102 437.458C521.555 438.071 521.781 438.921 521.781 440.007C521.781 441.073 521.555 441.911 521.102 442.521C520.648 443.126 520.027 443.429 519.238 443.429C518.84 443.429 518.49 443.345 518.189 443.177C517.893 443.005 517.658 442.757 517.486 442.433ZM520.65 439.984C520.65 439.148 520.518 438.517 520.252 438.091C519.99 437.665 519.6 437.452 519.08 437.452C518.557 437.452 518.16 437.667 517.891 438.097C517.621 438.523 517.486 439.151 517.486 439.984C517.486 440.812 517.621 441.441 517.891 441.87C518.16 442.3 518.557 442.515 519.08 442.515C519.6 442.515 519.99 442.302 520.252 441.876C520.518 441.45 520.65 440.819 520.65 439.984ZM526.117 434.833V436.696H528.566V437.534H526.117V441.097C526.117 441.581 526.209 441.919 526.393 442.11C526.576 442.302 526.896 442.398 527.354 442.398H528.566V443.259H527.248C526.439 443.259 525.869 443.097 525.537 442.773C525.205 442.448 525.039 441.89 525.039 441.097V437.534H523.287V436.696H525.039V434.833H526.117ZM531.602 436.72H534.361V442.421H536.5V443.259H531.145V442.421H533.283V437.558H531.602V436.72ZM533.283 434.171H534.361V435.53H533.283V434.171ZM540.59 437.452C540.043 437.452 539.629 437.665 539.348 438.091C539.066 438.517 538.926 439.148 538.926 439.984C538.926 440.816 539.066 441.446 539.348 441.876C539.629 442.302 540.043 442.515 540.59 442.515C541.141 442.515 541.557 442.302 541.838 441.876C542.119 441.446 542.26 440.816 542.26 439.984C542.26 439.148 542.119 438.517 541.838 438.091C541.557 437.665 541.141 437.452 540.59 437.452ZM540.59 436.538C541.5 436.538 542.195 436.833 542.676 437.423C543.16 438.013 543.402 438.866 543.402 439.984C543.402 441.105 543.162 441.96 542.682 442.55C542.201 443.136 541.504 443.429 540.59 443.429C539.68 443.429 538.984 443.136 538.504 442.55C538.023 441.96 537.783 441.105 537.783 439.984C537.783 438.866 538.023 438.013 538.504 437.423C538.984 436.833 539.68 436.538 540.59 436.538ZM550.369 439.193V443.259H549.285V439.193C549.285 438.603 549.182 438.169 548.975 437.892C548.768 437.614 548.443 437.476 548.002 437.476C547.498 437.476 547.109 437.655 546.836 438.015C546.566 438.37 546.432 438.882 546.432 439.55V443.259H545.354V436.696H546.432V437.681C546.623 437.306 546.883 437.023 547.211 436.831C547.539 436.636 547.928 436.538 548.377 436.538C549.045 436.538 549.543 436.759 549.871 437.2C550.203 437.638 550.369 438.302 550.369 439.193ZM119.465 454.72H122.225V460.421H124.363V461.259H119.008V460.421H121.146V455.558H119.465V454.72ZM121.146 452.171H122.225V453.53H121.146V452.171ZM128.805 455.364C128.938 455.083 129.105 454.876 129.309 454.743C129.516 454.607 129.764 454.538 130.053 454.538C130.58 454.538 130.951 454.743 131.166 455.153C131.385 455.56 131.494 456.327 131.494 457.456V461.259H130.51V457.503C130.51 456.577 130.457 456.003 130.352 455.78C130.25 455.554 130.062 455.441 129.789 455.441C129.477 455.441 129.262 455.562 129.145 455.804C129.031 456.042 128.975 456.609 128.975 457.503V461.259H127.99V457.503C127.99 456.566 127.934 455.987 127.82 455.769C127.711 455.55 127.512 455.441 127.223 455.441C126.938 455.441 126.738 455.562 126.625 455.804C126.516 456.042 126.461 456.609 126.461 457.503V461.259H125.482V454.696H126.461V455.259C126.59 455.025 126.75 454.847 126.941 454.726C127.137 454.601 127.357 454.538 127.604 454.538C127.9 454.538 128.146 454.607 128.342 454.743C128.541 454.88 128.695 455.087 128.805 455.364ZM136.188 457.96H135.83C135.201 457.96 134.727 458.071 134.406 458.294C134.09 458.513 133.932 458.841 133.932 459.278C133.932 459.673 134.051 459.98 134.289 460.198C134.527 460.417 134.857 460.526 135.279 460.526C135.873 460.526 136.34 460.321 136.68 459.911C137.02 459.497 137.191 458.927 137.195 458.2V457.96H136.188ZM138.279 457.515V461.259H137.195V460.286C136.965 460.677 136.674 460.966 136.322 461.153C135.975 461.337 135.551 461.429 135.051 461.429C134.383 461.429 133.85 461.241 133.451 460.866C133.053 460.487 132.854 459.982 132.854 459.349C132.854 458.618 133.098 458.064 133.586 457.685C134.078 457.306 134.799 457.116 135.748 457.116H137.195V456.946C137.191 456.423 137.059 456.044 136.797 455.81C136.535 455.571 136.117 455.452 135.543 455.452C135.176 455.452 134.805 455.505 134.43 455.61C134.055 455.716 133.689 455.87 133.334 456.073V454.995C133.732 454.843 134.113 454.73 134.477 454.655C134.844 454.577 135.199 454.538 135.543 454.538C136.086 454.538 136.549 454.618 136.932 454.778C137.318 454.939 137.631 455.179 137.869 455.499C138.018 455.694 138.123 455.937 138.186 456.226C138.248 456.511 138.279 456.941 138.279 457.515ZM144.332 457.925C144.332 457.116 144.199 456.503 143.934 456.085C143.672 455.663 143.289 455.452 142.785 455.452C142.258 455.452 141.855 455.663 141.578 456.085C141.301 456.503 141.162 457.116 141.162 457.925C141.162 458.734 141.301 459.351 141.578 459.776C141.859 460.198 142.266 460.409 142.797 460.409C143.293 460.409 143.672 460.196 143.934 459.771C144.199 459.345 144.332 458.73 144.332 457.925ZM145.41 460.837C145.41 461.821 145.178 462.568 144.713 463.075C144.248 463.583 143.564 463.837 142.662 463.837C142.365 463.837 142.055 463.81 141.73 463.755C141.406 463.7 141.082 463.62 140.758 463.515V462.448C141.141 462.628 141.488 462.761 141.801 462.847C142.113 462.933 142.4 462.976 142.662 462.976C143.244 462.976 143.668 462.818 143.934 462.501C144.199 462.185 144.332 461.683 144.332 460.995V460.948V460.216C144.16 460.583 143.926 460.857 143.629 461.036C143.332 461.216 142.971 461.306 142.545 461.306C141.779 461.306 141.168 460.999 140.711 460.386C140.254 459.773 140.025 458.952 140.025 457.925C140.025 456.894 140.254 456.071 140.711 455.458C141.168 454.845 141.779 454.538 142.545 454.538C142.967 454.538 143.324 454.622 143.617 454.79C143.91 454.958 144.148 455.218 144.332 455.569V454.72H145.41V460.837ZM153.098 457.439V457.966H148.428V458.001C148.396 458.896 148.566 459.538 148.938 459.929C149.312 460.319 149.84 460.515 150.52 460.515C150.863 460.515 151.223 460.46 151.598 460.351C151.973 460.241 152.373 460.075 152.799 459.853V460.925C152.389 461.093 151.992 461.218 151.609 461.3C151.23 461.386 150.863 461.429 150.508 461.429C149.488 461.429 148.691 461.124 148.117 460.515C147.543 459.901 147.256 459.058 147.256 457.984C147.256 456.937 147.537 456.101 148.1 455.476C148.662 454.851 149.412 454.538 150.35 454.538C151.186 454.538 151.844 454.821 152.324 455.388C152.809 455.954 153.066 456.638 153.098 457.439ZM152.02 457.122C151.973 456.669 151.807 456.278 151.521 455.95C151.24 455.618 150.834 455.452 150.303 455.452C149.783 455.452 149.355 455.624 149.02 455.968C148.684 456.312 148.5 456.698 148.469 457.128L152.02 457.122ZM159.467 454.925V455.98C159.158 455.8 158.848 455.665 158.535 455.575C158.223 455.485 157.904 455.441 157.58 455.441C157.092 455.441 156.727 455.521 156.484 455.681C156.246 455.837 156.127 456.077 156.127 456.401C156.127 456.694 156.217 456.913 156.396 457.058C156.576 457.202 157.023 457.343 157.738 457.48L158.172 457.562C158.707 457.663 159.111 457.866 159.385 458.171C159.662 458.476 159.801 458.872 159.801 459.36C159.801 460.009 159.57 460.517 159.109 460.884C158.648 461.247 158.008 461.429 157.188 461.429C156.863 461.429 156.523 461.394 156.168 461.323C155.812 461.257 155.428 461.155 155.014 461.019V459.905C155.416 460.112 155.801 460.269 156.168 460.374C156.535 460.476 156.883 460.526 157.211 460.526C157.688 460.526 158.057 460.431 158.318 460.239C158.58 460.044 158.711 459.773 158.711 459.425C158.711 458.925 158.232 458.579 157.275 458.388L157.229 458.376L156.824 458.294C156.203 458.173 155.75 457.97 155.465 457.685C155.18 457.396 155.037 457.003 155.037 456.507C155.037 455.878 155.25 455.394 155.676 455.054C156.102 454.71 156.709 454.538 157.498 454.538C157.85 454.538 158.188 454.571 158.512 454.638C158.836 454.7 159.154 454.796 159.467 454.925ZM206.23 454.72H208.99V460.421H211.129V461.259H205.773V460.421H207.912V455.558H206.23V454.72ZM207.912 452.171H208.99V453.53H207.912V452.171ZM215.57 455.364C215.703 455.083 215.871 454.876 216.074 454.743C216.281 454.607 216.529 454.538 216.818 454.538C217.346 454.538 217.717 454.743 217.932 455.153C218.15 455.56 218.26 456.327 218.26 457.456V461.259H217.275V457.503C217.275 456.577 217.223 456.003 217.117 455.78C217.016 455.554 216.828 455.441 216.555 455.441C216.242 455.441 216.027 455.562 215.91 455.804C215.797 456.042 215.74 456.609 215.74 457.503V461.259H214.756V457.503C214.756 456.566 214.699 455.987 214.586 455.769C214.477 455.55 214.277 455.441 213.988 455.441C213.703 455.441 213.504 455.562 213.391 455.804C213.281 456.042 213.227 456.609 213.227 457.503V461.259H212.248V454.696H213.227V455.259C213.355 455.025 213.516 454.847 213.707 454.726C213.902 454.601 214.123 454.538 214.369 454.538C214.666 454.538 214.912 454.607 215.107 454.743C215.307 454.88 215.461 455.087 215.57 455.364ZM222.953 457.96H222.596C221.967 457.96 221.492 458.071 221.172 458.294C220.855 458.513 220.697 458.841 220.697 459.278C220.697 459.673 220.816 459.98 221.055 460.198C221.293 460.417 221.623 460.526 222.045 460.526C222.639 460.526 223.105 460.321 223.445 459.911C223.785 459.497 223.957 458.927 223.961 458.2V457.96H222.953ZM225.045 457.515V461.259H223.961V460.286C223.73 460.677 223.439 460.966 223.088 461.153C222.74 461.337 222.316 461.429 221.816 461.429C221.148 461.429 220.615 461.241 220.217 460.866C219.818 460.487 219.619 459.982 219.619 459.349C219.619 458.618 219.863 458.064 220.352 457.685C220.844 457.306 221.564 457.116 222.514 457.116H223.961V456.946C223.957 456.423 223.824 456.044 223.562 455.81C223.301 455.571 222.883 455.452 222.309 455.452C221.941 455.452 221.57 455.505 221.195 455.61C220.82 455.716 220.455 455.87 220.1 456.073V454.995C220.498 454.843 220.879 454.73 221.242 454.655C221.609 454.577 221.965 454.538 222.309 454.538C222.852 454.538 223.314 454.618 223.697 454.778C224.084 454.939 224.396 455.179 224.635 455.499C224.783 455.694 224.889 455.937 224.951 456.226C225.014 456.511 225.045 456.941 225.045 457.515ZM231.098 457.925C231.098 457.116 230.965 456.503 230.699 456.085C230.438 455.663 230.055 455.452 229.551 455.452C229.023 455.452 228.621 455.663 228.344 456.085C228.066 456.503 227.928 457.116 227.928 457.925C227.928 458.734 228.066 459.351 228.344 459.776C228.625 460.198 229.031 460.409 229.562 460.409C230.059 460.409 230.438 460.196 230.699 459.771C230.965 459.345 231.098 458.73 231.098 457.925ZM232.176 460.837C232.176 461.821 231.943 462.568 231.479 463.075C231.014 463.583 230.33 463.837 229.428 463.837C229.131 463.837 228.82 463.81 228.496 463.755C228.172 463.7 227.848 463.62 227.523 463.515V462.448C227.906 462.628 228.254 462.761 228.566 462.847C228.879 462.933 229.166 462.976 229.428 462.976C230.01 462.976 230.434 462.818 230.699 462.501C230.965 462.185 231.098 461.683 231.098 460.995V460.948V460.216C230.926 460.583 230.691 460.857 230.395 461.036C230.098 461.216 229.736 461.306 229.311 461.306C228.545 461.306 227.934 460.999 227.477 460.386C227.02 459.773 226.791 458.952 226.791 457.925C226.791 456.894 227.02 456.071 227.477 455.458C227.934 454.845 228.545 454.538 229.311 454.538C229.732 454.538 230.09 454.622 230.383 454.79C230.676 454.958 230.914 455.218 231.098 455.569V454.72H232.176V460.837ZM239.863 457.439V457.966H235.193V458.001C235.162 458.896 235.332 459.538 235.703 459.929C236.078 460.319 236.605 460.515 237.285 460.515C237.629 460.515 237.988 460.46 238.363 460.351C238.738 460.241 239.139 460.075 239.564 459.853V460.925C239.154 461.093 238.758 461.218 238.375 461.3C237.996 461.386 237.629 461.429 237.273 461.429C236.254 461.429 235.457 461.124 234.883 460.515C234.309 459.901 234.021 459.058 234.021 457.984C234.021 456.937 234.303 456.101 234.865 455.476C235.428 454.851 236.178 454.538 237.115 454.538C237.951 454.538 238.609 454.821 239.09 455.388C239.574 455.954 239.832 456.638 239.863 457.439ZM238.785 457.122C238.738 456.669 238.572 456.278 238.287 455.95C238.006 455.618 237.6 455.452 237.068 455.452C236.549 455.452 236.121 455.624 235.785 455.968C235.449 456.312 235.266 456.698 235.234 457.128L238.785 457.122ZM256.844 454.72H259.604V460.421H261.742V461.259H256.387V460.421H258.525V455.558H256.844V454.72ZM258.525 452.171H259.604V453.53H258.525V452.171ZM268.381 457.193V461.259H267.297V457.193C267.297 456.603 267.193 456.169 266.986 455.892C266.779 455.614 266.455 455.476 266.014 455.476C265.51 455.476 265.121 455.655 264.848 456.015C264.578 456.37 264.443 456.882 264.443 457.55V461.259H263.365V454.696H264.443V455.681C264.635 455.306 264.895 455.023 265.223 454.831C265.551 454.636 265.939 454.538 266.389 454.538C267.057 454.538 267.555 454.759 267.883 455.2C268.215 455.638 268.381 456.302 268.381 457.193ZM274.48 455.534V452.142H275.559V461.259H274.48V460.433C274.301 460.757 274.061 461.005 273.76 461.177C273.463 461.345 273.119 461.429 272.729 461.429C271.936 461.429 271.311 461.122 270.854 460.509C270.4 459.892 270.174 459.042 270.174 457.96C270.174 456.894 270.402 456.058 270.859 455.452C271.316 454.843 271.939 454.538 272.729 454.538C273.123 454.538 273.471 454.624 273.771 454.796C274.072 454.964 274.309 455.21 274.48 455.534ZM271.311 457.984C271.311 458.819 271.443 459.45 271.709 459.876C271.975 460.302 272.367 460.515 272.887 460.515C273.406 460.515 273.801 460.3 274.07 459.87C274.344 459.441 274.48 458.812 274.48 457.984C274.48 457.151 274.344 456.523 274.07 456.097C273.801 455.667 273.406 455.452 272.887 455.452C272.367 455.452 271.975 455.665 271.709 456.091C271.443 456.517 271.311 457.148 271.311 457.984ZM283.246 457.439V457.966H278.576V458.001C278.545 458.896 278.715 459.538 279.086 459.929C279.461 460.319 279.988 460.515 280.668 460.515C281.012 460.515 281.371 460.46 281.746 460.351C282.121 460.241 282.521 460.075 282.947 459.853V460.925C282.537 461.093 282.141 461.218 281.758 461.3C281.379 461.386 281.012 461.429 280.656 461.429C279.637 461.429 278.84 461.124 278.266 460.515C277.691 459.901 277.404 459.058 277.404 457.984C277.404 456.937 277.686 456.101 278.248 455.476C278.811 454.851 279.561 454.538 280.498 454.538C281.334 454.538 281.992 454.821 282.473 455.388C282.957 455.954 283.215 456.638 283.246 457.439ZM282.168 457.122C282.121 456.669 281.955 456.278 281.67 455.95C281.389 455.618 280.982 455.452 280.451 455.452C279.932 455.452 279.504 455.624 279.168 455.968C278.832 456.312 278.648 456.698 278.617 457.128L282.168 457.122ZM290.465 454.696L288.115 457.837L290.693 461.259H289.445L287.523 458.628L285.607 461.259H284.359L286.938 457.837L284.588 454.696H285.783L287.523 457.069L289.252 454.696H290.465ZM140.688 488.142H141.801V493.421L144.631 490.696H145.943L143.359 493.169L146.348 497.259H145.029L142.604 493.872L141.801 494.628V497.259H140.688V488.142ZM153.098 493.439V493.966H148.428V494.001C148.396 494.896 148.566 495.538 148.938 495.929C149.312 496.319 149.84 496.515 150.52 496.515C150.863 496.515 151.223 496.46 151.598 496.351C151.973 496.241 152.373 496.075 152.799 495.853V496.925C152.389 497.093 151.992 497.218 151.609 497.3C151.23 497.386 150.863 497.429 150.508 497.429C149.488 497.429 148.691 497.124 148.117 496.515C147.543 495.901 147.256 495.058 147.256 493.984C147.256 492.937 147.537 492.101 148.1 491.476C148.662 490.851 149.412 490.538 150.35 490.538C151.186 490.538 151.844 490.821 152.324 491.388C152.809 491.954 153.066 492.638 153.098 493.439ZM152.02 493.122C151.973 492.669 151.807 492.278 151.521 491.95C151.24 491.618 150.834 491.452 150.303 491.452C149.783 491.452 149.355 491.624 149.02 491.968C148.684 492.312 148.5 492.698 148.469 493.128L152.02 493.122ZM158.793 495.15C158.613 495.607 158.385 496.208 158.107 496.954C157.721 497.985 157.461 498.614 157.328 498.841C157.148 499.146 156.924 499.374 156.654 499.526C156.385 499.679 156.07 499.755 155.711 499.755H154.844V498.853H155.482C155.799 498.853 156.047 498.761 156.227 498.577C156.406 498.394 156.635 497.919 156.912 497.153L154.375 490.696H155.518L157.463 495.829L159.379 490.696H160.521L158.793 495.15ZM177.309 490.72H180.068V496.421H182.207V497.259H176.852V496.421H178.99V491.558H177.309V490.72ZM178.99 488.171H180.068V489.53H178.99V488.171ZM188.846 493.193V497.259H187.762V493.193C187.762 492.603 187.658 492.169 187.451 491.892C187.244 491.614 186.92 491.476 186.479 491.476C185.975 491.476 185.586 491.655 185.312 492.015C185.043 492.37 184.908 492.882 184.908 493.55V497.259H183.83V490.696H184.908V491.681C185.1 491.306 185.359 491.023 185.688 490.831C186.016 490.636 186.404 490.538 186.854 490.538C187.521 490.538 188.02 490.759 188.348 491.2C188.68 491.638 188.846 492.302 188.846 493.193ZM194.945 491.534V488.142H196.023V497.259H194.945V496.433C194.766 496.757 194.525 497.005 194.225 497.177C193.928 497.345 193.584 497.429 193.193 497.429C192.4 497.429 191.775 497.122 191.318 496.509C190.865 495.892 190.639 495.042 190.639 493.96C190.639 492.894 190.867 492.058 191.324 491.452C191.781 490.843 192.404 490.538 193.193 490.538C193.588 490.538 193.936 490.624 194.236 490.796C194.537 490.964 194.773 491.21 194.945 491.534ZM191.775 493.984C191.775 494.819 191.908 495.45 192.174 495.876C192.439 496.302 192.832 496.515 193.352 496.515C193.871 496.515 194.266 496.3 194.535 495.87C194.809 495.441 194.945 494.812 194.945 493.984C194.945 493.151 194.809 492.523 194.535 492.097C194.266 491.667 193.871 491.452 193.352 491.452C192.832 491.452 192.439 491.665 192.174 492.091C191.908 492.517 191.775 493.148 191.775 493.984ZM203.711 493.439V493.966H199.041V494.001C199.01 494.896 199.18 495.538 199.551 495.929C199.926 496.319 200.453 496.515 201.133 496.515C201.477 496.515 201.836 496.46 202.211 496.351C202.586 496.241 202.986 496.075 203.412 495.853V496.925C203.002 497.093 202.605 497.218 202.223 497.3C201.844 497.386 201.477 497.429 201.121 497.429C200.102 497.429 199.305 497.124 198.73 496.515C198.156 495.901 197.869 495.058 197.869 493.984C197.869 492.937 198.15 492.101 198.713 491.476C199.275 490.851 200.025 490.538 200.963 490.538C201.799 490.538 202.457 490.821 202.938 491.388C203.422 491.954 203.68 492.638 203.711 493.439ZM202.633 493.122C202.586 492.669 202.42 492.278 202.135 491.95C201.854 491.618 201.447 491.452 200.916 491.452C200.396 491.452 199.969 491.624 199.633 491.968C199.297 492.312 199.113 492.698 199.082 493.128L202.633 493.122ZM210.93 490.696L208.58 493.837L211.158 497.259H209.91L207.988 494.628L206.072 497.259H204.824L207.402 493.837L205.053 490.696H206.248L207.988 493.069L209.717 490.696H210.93ZM145.006 508.925V509.98C144.697 509.8 144.387 509.665 144.074 509.575C143.762 509.485 143.443 509.441 143.119 509.441C142.631 509.441 142.266 509.521 142.023 509.681C141.785 509.837 141.666 510.077 141.666 510.401C141.666 510.694 141.756 510.913 141.936 511.058C142.115 511.202 142.562 511.343 143.277 511.48L143.711 511.562C144.246 511.663 144.65 511.866 144.924 512.171C145.201 512.476 145.34 512.872 145.34 513.36C145.34 514.009 145.109 514.517 144.648 514.884C144.188 515.247 143.547 515.429 142.727 515.429C142.402 515.429 142.062 515.394 141.707 515.323C141.352 515.257 140.967 515.155 140.553 515.019V513.905C140.955 514.112 141.34 514.269 141.707 514.374C142.074 514.476 142.422 514.526 142.75 514.526C143.227 514.526 143.596 514.431 143.857 514.239C144.119 514.044 144.25 513.773 144.25 513.425C144.25 512.925 143.771 512.579 142.814 512.388L142.768 512.376L142.363 512.294C141.742 512.173 141.289 511.97 141.004 511.685C140.719 511.396 140.576 511.003 140.576 510.507C140.576 509.878 140.789 509.394 141.215 509.054C141.641 508.71 142.248 508.538 143.037 508.538C143.389 508.538 143.727 508.571 144.051 508.638C144.375 508.7 144.693 508.796 145.006 508.925ZM153.303 510.05C153.072 509.87 152.838 509.739 152.6 509.657C152.361 509.575 152.1 509.534 151.814 509.534C151.143 509.534 150.629 509.745 150.273 510.167C149.918 510.589 149.74 511.198 149.74 511.995V515.259H148.656V508.696H149.74V509.98C149.92 509.515 150.195 509.159 150.566 508.913C150.941 508.663 151.385 508.538 151.896 508.538C152.162 508.538 152.41 508.571 152.641 508.638C152.871 508.704 153.092 508.808 153.303 508.948V510.05ZM159.982 514.925C159.693 515.093 159.395 515.218 159.086 515.3C158.781 515.386 158.469 515.429 158.148 515.429C157.133 515.429 156.338 515.124 155.764 514.515C155.193 513.905 154.908 513.062 154.908 511.984C154.908 510.905 155.193 510.062 155.764 509.452C156.338 508.843 157.133 508.538 158.148 508.538C158.465 508.538 158.773 508.579 159.074 508.661C159.375 508.743 159.678 508.87 159.982 509.042V510.173C159.697 509.919 159.41 509.735 159.121 509.622C158.836 509.509 158.512 509.452 158.148 509.452C157.473 509.452 156.953 509.671 156.59 510.109C156.227 510.546 156.045 511.171 156.045 511.984C156.045 512.792 156.227 513.417 156.59 513.859C156.957 514.296 157.477 514.515 158.148 514.515C158.523 514.515 158.859 514.458 159.156 514.345C159.453 514.228 159.729 514.048 159.982 513.806V514.925ZM177.309 508.72H180.068V514.421H182.207V515.259H176.852V514.421H178.99V509.558H177.309V508.72ZM178.99 506.171H180.068V507.53H178.99V506.171ZM186.648 509.364C186.781 509.083 186.949 508.876 187.152 508.743C187.359 508.607 187.607 508.538 187.896 508.538C188.424 508.538 188.795 508.743 189.01 509.153C189.229 509.56 189.338 510.327 189.338 511.456V515.259H188.354V511.503C188.354 510.577 188.301 510.003 188.195 509.78C188.094 509.554 187.906 509.441 187.633 509.441C187.32 509.441 187.105 509.562 186.988 509.804C186.875 510.042 186.818 510.609 186.818 511.503V515.259H185.834V511.503C185.834 510.566 185.777 509.987 185.664 509.769C185.555 509.55 185.355 509.441 185.066 509.441C184.781 509.441 184.582 509.562 184.469 509.804C184.359 510.042 184.305 510.609 184.305 511.503V515.259H183.326V508.696H184.305V509.259C184.434 509.025 184.594 508.847 184.785 508.726C184.98 508.601 185.201 508.538 185.447 508.538C185.744 508.538 185.99 508.607 186.186 508.743C186.385 508.88 186.539 509.087 186.648 509.364ZM194.031 511.96H193.674C193.045 511.96 192.57 512.071 192.25 512.294C191.934 512.513 191.775 512.841 191.775 513.278C191.775 513.673 191.895 513.98 192.133 514.198C192.371 514.417 192.701 514.526 193.123 514.526C193.717 514.526 194.184 514.321 194.523 513.911C194.863 513.497 195.035 512.927 195.039 512.2V511.96H194.031ZM196.123 511.515V515.259H195.039V514.286C194.809 514.677 194.518 514.966 194.166 515.153C193.818 515.337 193.395 515.429 192.895 515.429C192.227 515.429 191.693 515.241 191.295 514.866C190.896 514.487 190.697 513.982 190.697 513.349C190.697 512.618 190.941 512.064 191.43 511.685C191.922 511.306 192.643 511.116 193.592 511.116H195.039V510.946C195.035 510.423 194.902 510.044 194.641 509.81C194.379 509.571 193.961 509.452 193.387 509.452C193.02 509.452 192.648 509.505 192.273 509.61C191.898 509.716 191.533 509.87 191.178 510.073V508.995C191.576 508.843 191.957 508.73 192.32 508.655C192.688 508.577 193.043 508.538 193.387 508.538C193.93 508.538 194.393 508.618 194.775 508.778C195.162 508.939 195.475 509.179 195.713 509.499C195.861 509.694 195.967 509.937 196.029 510.226C196.092 510.511 196.123 510.941 196.123 511.515ZM202.176 511.925C202.176 511.116 202.043 510.503 201.777 510.085C201.516 509.663 201.133 509.452 200.629 509.452C200.102 509.452 199.699 509.663 199.422 510.085C199.145 510.503 199.006 511.116 199.006 511.925C199.006 512.734 199.145 513.351 199.422 513.776C199.703 514.198 200.109 514.409 200.641 514.409C201.137 514.409 201.516 514.196 201.777 513.771C202.043 513.345 202.176 512.73 202.176 511.925ZM203.254 514.837C203.254 515.821 203.021 516.568 202.557 517.075C202.092 517.583 201.408 517.837 200.506 517.837C200.209 517.837 199.898 517.81 199.574 517.755C199.25 517.7 198.926 517.62 198.602 517.515V516.448C198.984 516.628 199.332 516.761 199.645 516.847C199.957 516.933 200.244 516.976 200.506 516.976C201.088 516.976 201.512 516.818 201.777 516.501C202.043 516.185 202.176 515.683 202.176 514.995V514.948V514.216C202.004 514.583 201.77 514.857 201.473 515.036C201.176 515.216 200.814 515.306 200.389 515.306C199.623 515.306 199.012 514.999 198.555 514.386C198.098 513.773 197.869 512.952 197.869 511.925C197.869 510.894 198.098 510.071 198.555 509.458C199.012 508.845 199.623 508.538 200.389 508.538C200.811 508.538 201.168 508.622 201.461 508.79C201.754 508.958 201.992 509.218 202.176 509.569V508.72H203.254V514.837ZM210.941 511.439V511.966H206.271V512.001C206.24 512.896 206.41 513.538 206.781 513.929C207.156 514.319 207.684 514.515 208.363 514.515C208.707 514.515 209.066 514.46 209.441 514.351C209.816 514.241 210.217 514.075 210.643 513.853V514.925C210.232 515.093 209.836 515.218 209.453 515.3C209.074 515.386 208.707 515.429 208.352 515.429C207.332 515.429 206.535 515.124 205.961 514.515C205.387 513.901 205.1 513.058 205.1 511.984C205.1 510.937 205.381 510.101 205.943 509.476C206.506 508.851 207.256 508.538 208.193 508.538C209.029 508.538 209.688 508.821 210.168 509.388C210.652 509.954 210.91 510.638 210.941 511.439ZM209.863 511.122C209.816 510.669 209.65 510.278 209.365 509.95C209.084 509.618 208.678 509.452 208.146 509.452C207.627 509.452 207.199 509.624 206.863 509.968C206.527 510.312 206.344 510.698 206.312 511.128L209.863 511.122ZM143.418 529.96H143.061C142.432 529.96 141.957 530.071 141.637 530.294C141.32 530.513 141.162 530.841 141.162 531.278C141.162 531.673 141.281 531.98 141.52 532.198C141.758 532.417 142.088 532.526 142.51 532.526C143.104 532.526 143.57 532.321 143.91 531.911C144.25 531.497 144.422 530.927 144.426 530.2V529.96H143.418ZM145.51 529.515V533.259H144.426V532.286C144.195 532.677 143.904 532.966 143.553 533.153C143.205 533.337 142.781 533.429 142.281 533.429C141.613 533.429 141.08 533.241 140.682 532.866C140.283 532.487 140.084 531.982 140.084 531.349C140.084 530.618 140.328 530.064 140.816 529.685C141.309 529.306 142.029 529.116 142.979 529.116H144.426V528.946C144.422 528.423 144.289 528.044 144.027 527.81C143.766 527.571 143.348 527.452 142.773 527.452C142.406 527.452 142.035 527.505 141.66 527.61C141.285 527.716 140.92 527.87 140.564 528.073V526.995C140.963 526.843 141.344 526.73 141.707 526.655C142.074 526.577 142.43 526.538 142.773 526.538C143.316 526.538 143.779 526.618 144.162 526.778C144.549 526.939 144.861 527.179 145.1 527.499C145.248 527.694 145.354 527.937 145.416 528.226C145.479 528.511 145.51 528.941 145.51 529.515ZM150.748 530.886C150.748 531.37 150.836 531.735 151.012 531.982C151.191 532.228 151.455 532.351 151.803 532.351H153.062V533.259H151.697C151.053 533.259 150.553 533.054 150.197 532.644C149.846 532.23 149.67 531.644 149.67 530.886V524.95H147.941V524.107H150.748V530.886ZM157.363 524.833V526.696H159.812V527.534H157.363V531.097C157.363 531.581 157.455 531.919 157.639 532.11C157.822 532.302 158.143 532.398 158.6 532.398H159.812V533.259H158.494C157.686 533.259 157.115 533.097 156.783 532.773C156.451 532.448 156.285 531.89 156.285 531.097V527.534H154.533V526.696H156.285V524.833H157.363ZM179.055 524.833V526.696H181.504V527.534H179.055V531.097C179.055 531.581 179.146 531.919 179.33 532.11C179.514 532.302 179.834 532.398 180.291 532.398H181.504V533.259H180.186C179.377 533.259 178.807 533.097 178.475 532.773C178.143 532.448 177.977 531.89 177.977 531.097V527.534H176.225V526.696H177.977V524.833H179.055ZM184.539 526.72H187.299V532.421H189.438V533.259H184.082V532.421H186.221V527.558H184.539V526.72ZM186.221 524.171H187.299V525.53H186.221V524.171ZM193.516 524.833V526.696H195.965V527.534H193.516V531.097C193.516 531.581 193.607 531.919 193.791 532.11C193.975 532.302 194.295 532.398 194.752 532.398H195.965V533.259H194.646C193.838 533.259 193.268 533.097 192.936 532.773C192.604 532.448 192.438 531.89 192.438 531.097V527.534H190.686V526.696H192.438V524.833H193.516ZM201.361 530.886C201.361 531.37 201.449 531.735 201.625 531.982C201.805 532.228 202.068 532.351 202.416 532.351H203.676V533.259H202.311C201.666 533.259 201.166 533.054 200.811 532.644C200.459 532.23 200.283 531.644 200.283 530.886V524.95H198.555V524.107H201.361V530.886ZM210.941 529.439V529.966H206.271V530.001C206.24 530.896 206.41 531.538 206.781 531.929C207.156 532.319 207.684 532.515 208.363 532.515C208.707 532.515 209.066 532.46 209.441 532.351C209.816 532.241 210.217 532.075 210.643 531.853V532.925C210.232 533.093 209.836 533.218 209.453 533.3C209.074 533.386 208.707 533.429 208.352 533.429C207.332 533.429 206.535 533.124 205.961 532.515C205.387 531.901 205.1 531.058 205.1 529.984C205.1 528.937 205.381 528.101 205.943 527.476C206.506 526.851 207.256 526.538 208.193 526.538C209.029 526.538 209.688 526.821 210.168 527.388C210.652 527.954 210.91 528.638 210.941 529.439ZM209.863 529.122C209.816 528.669 209.65 528.278 209.365 527.95C209.084 527.618 208.678 527.452 208.146 527.452C207.627 527.452 207.199 527.624 206.863 527.968C206.527 528.312 206.344 528.698 206.312 529.128L209.863 529.122ZM139.305 544.696H140.371L141.514 549.999L142.451 546.612H143.371L144.32 549.999L145.463 544.696H146.529L144.994 551.259H143.963L142.914 547.661L141.871 551.259H140.84L139.305 544.696ZM148.387 544.72H151.146V550.421H153.285V551.259H147.93V550.421H150.068V545.558H148.387V544.72ZM150.068 542.171H151.146V543.53H150.068V542.171ZM158.793 545.534V542.142H159.871V551.259H158.793V550.433C158.613 550.757 158.373 551.005 158.072 551.177C157.775 551.345 157.432 551.429 157.041 551.429C156.248 551.429 155.623 551.122 155.166 550.509C154.713 549.892 154.486 549.042 154.486 547.96C154.486 546.894 154.715 546.058 155.172 545.452C155.629 544.843 156.252 544.538 157.041 544.538C157.436 544.538 157.783 544.624 158.084 544.796C158.385 544.964 158.621 545.21 158.793 545.534ZM155.623 547.984C155.623 548.819 155.756 549.45 156.021 549.876C156.287 550.302 156.68 550.515 157.199 550.515C157.719 550.515 158.113 550.3 158.383 549.87C158.656 549.441 158.793 548.812 158.793 547.984C158.793 547.151 158.656 546.523 158.383 546.097C158.113 545.667 157.719 545.452 157.199 545.452C156.68 545.452 156.287 545.665 156.021 546.091C155.756 546.517 155.623 547.148 155.623 547.984ZM164.594 542.833V544.696H167.043V545.534H164.594V549.097C164.594 549.581 164.686 549.919 164.869 550.11C165.053 550.302 165.373 550.398 165.83 550.398H167.043V551.259H165.725C164.916 551.259 164.346 551.097 164.014 550.773C163.682 550.448 163.516 549.89 163.516 549.097V545.534H161.764V544.696H163.516V542.833H164.594ZM174.385 547.193V551.259H173.301V547.193C173.301 546.603 173.197 546.169 172.99 545.892C172.783 545.614 172.459 545.476 172.018 545.476C171.514 545.476 171.125 545.655 170.852 546.015C170.582 546.37 170.447 546.882 170.447 547.55V551.259H169.369V542.142H170.447V545.681C170.639 545.306 170.898 545.023 171.227 544.831C171.555 544.636 171.943 544.538 172.393 544.538C173.061 544.538 173.559 544.759 173.887 545.2C174.219 545.638 174.385 546.302 174.385 547.193ZM145.463 565.193V569.259H144.379V565.193C144.379 564.603 144.275 564.169 144.068 563.892C143.861 563.614 143.537 563.476 143.096 563.476C142.592 563.476 142.203 563.655 141.93 564.015C141.66 564.37 141.525 564.882 141.525 565.55V569.259H140.447V560.142H141.525V563.681C141.717 563.306 141.977 563.023 142.305 562.831C142.633 562.636 143.021 562.538 143.471 562.538C144.139 562.538 144.637 562.759 144.965 563.2C145.297 563.638 145.463 564.302 145.463 565.193ZM153.098 565.439V565.966H148.428V566.001C148.396 566.896 148.566 567.538 148.938 567.929C149.312 568.319 149.84 568.515 150.52 568.515C150.863 568.515 151.223 568.46 151.598 568.351C151.973 568.241 152.373 568.075 152.799 567.853V568.925C152.389 569.093 151.992 569.218 151.609 569.3C151.23 569.386 150.863 569.429 150.508 569.429C149.488 569.429 148.691 569.124 148.117 568.515C147.543 567.901 147.256 567.058 147.256 565.984C147.256 564.937 147.537 564.101 148.1 563.476C148.662 562.851 149.412 562.538 150.35 562.538C151.186 562.538 151.844 562.821 152.324 563.388C152.809 563.954 153.066 564.638 153.098 565.439ZM152.02 565.122C151.973 564.669 151.807 564.278 151.521 563.95C151.24 563.618 150.834 563.452 150.303 563.452C149.783 563.452 149.355 563.624 149.02 563.968C148.684 564.312 148.5 564.698 148.469 565.128L152.02 565.122ZM155.617 562.72H158.377V568.421H160.516V569.259H155.16V568.421H157.299V563.558H155.617V562.72ZM157.299 560.171H158.377V561.53H157.299V560.171ZM166.023 565.925C166.023 565.116 165.891 564.503 165.625 564.085C165.363 563.663 164.98 563.452 164.477 563.452C163.949 563.452 163.547 563.663 163.27 564.085C162.992 564.503 162.854 565.116 162.854 565.925C162.854 566.734 162.992 567.351 163.27 567.776C163.551 568.198 163.957 568.409 164.488 568.409C164.984 568.409 165.363 568.196 165.625 567.771C165.891 567.345 166.023 566.73 166.023 565.925ZM167.102 568.837C167.102 569.821 166.869 570.568 166.404 571.075C165.939 571.583 165.256 571.837 164.354 571.837C164.057 571.837 163.746 571.81 163.422 571.755C163.098 571.7 162.773 571.62 162.449 571.515V570.448C162.832 570.628 163.18 570.761 163.492 570.847C163.805 570.933 164.092 570.976 164.354 570.976C164.936 570.976 165.359 570.818 165.625 570.501C165.891 570.185 166.023 569.683 166.023 568.995V568.948V568.216C165.852 568.583 165.617 568.857 165.32 569.036C165.023 569.216 164.662 569.306 164.236 569.306C163.471 569.306 162.859 568.999 162.402 568.386C161.945 567.773 161.717 566.952 161.717 565.925C161.717 564.894 161.945 564.071 162.402 563.458C162.859 562.845 163.471 562.538 164.236 562.538C164.658 562.538 165.016 562.622 165.309 562.79C165.602 562.958 165.84 563.218 166.023 563.569V562.72H167.102V568.837ZM174.385 565.193V569.259H173.301V565.193C173.301 564.603 173.197 564.169 172.99 563.892C172.783 563.614 172.459 563.476 172.018 563.476C171.514 563.476 171.125 563.655 170.852 564.015C170.582 564.37 170.447 564.882 170.447 565.55V569.259H169.369V560.142H170.447V563.681C170.639 563.306 170.898 563.023 171.227 562.831C171.555 562.636 171.943 562.538 172.393 562.538C173.061 562.538 173.559 562.759 173.887 563.2C174.219 563.638 174.385 564.302 174.385 565.193ZM179.055 560.833V562.696H181.504V563.534H179.055V567.097C179.055 567.581 179.146 567.919 179.33 568.11C179.514 568.302 179.834 568.398 180.291 568.398H181.504V569.259H180.186C179.377 569.259 178.807 569.097 178.475 568.773C178.143 568.448 177.977 567.89 177.977 567.097V563.534H176.225V562.696H177.977V560.833H179.055ZM145.521 586.925C145.232 587.093 144.934 587.218 144.625 587.3C144.32 587.386 144.008 587.429 143.688 587.429C142.672 587.429 141.877 587.124 141.303 586.515C140.732 585.905 140.447 585.062 140.447 583.984C140.447 582.905 140.732 582.062 141.303 581.452C141.877 580.843 142.672 580.538 143.688 580.538C144.004 580.538 144.312 580.579 144.613 580.661C144.914 580.743 145.217 580.87 145.521 581.042V582.173C145.236 581.919 144.949 581.735 144.66 581.622C144.375 581.509 144.051 581.452 143.688 581.452C143.012 581.452 142.492 581.671 142.129 582.109C141.766 582.546 141.584 583.171 141.584 583.984C141.584 584.792 141.766 585.417 142.129 585.859C142.496 586.296 143.016 586.515 143.688 586.515C144.062 586.515 144.398 586.458 144.695 586.345C144.992 586.228 145.268 586.048 145.521 585.806V586.925ZM150.748 584.886C150.748 585.37 150.836 585.735 151.012 585.982C151.191 586.228 151.455 586.351 151.803 586.351H153.062V587.259H151.697C151.053 587.259 150.553 587.054 150.197 586.644C149.846 586.23 149.67 585.644 149.67 584.886V578.95H147.941V578.107H150.748V584.886ZM157.879 583.96H157.521C156.893 583.96 156.418 584.071 156.098 584.294C155.781 584.513 155.623 584.841 155.623 585.278C155.623 585.673 155.742 585.98 155.98 586.198C156.219 586.417 156.549 586.526 156.971 586.526C157.564 586.526 158.031 586.321 158.371 585.911C158.711 585.497 158.883 584.927 158.887 584.2V583.96H157.879ZM159.971 583.515V587.259H158.887V586.286C158.656 586.677 158.365 586.966 158.014 587.153C157.666 587.337 157.242 587.429 156.742 587.429C156.074 587.429 155.541 587.241 155.143 586.866C154.744 586.487 154.545 585.982 154.545 585.349C154.545 584.618 154.789 584.064 155.277 583.685C155.77 583.306 156.49 583.116 157.439 583.116H158.887V582.946C158.883 582.423 158.75 582.044 158.488 581.81C158.227 581.571 157.809 581.452 157.234 581.452C156.867 581.452 156.496 581.505 156.121 581.61C155.746 581.716 155.381 581.87 155.025 582.073V580.995C155.424 580.843 155.805 580.73 156.168 580.655C156.535 580.577 156.891 580.538 157.234 580.538C157.777 580.538 158.24 580.618 158.623 580.778C159.01 580.939 159.322 581.179 159.561 581.499C159.709 581.694 159.814 581.937 159.877 582.226C159.939 582.511 159.971 582.941 159.971 583.515ZM166.697 580.925V581.98C166.389 581.8 166.078 581.665 165.766 581.575C165.453 581.485 165.135 581.441 164.811 581.441C164.322 581.441 163.957 581.521 163.715 581.681C163.477 581.837 163.357 582.077 163.357 582.401C163.357 582.694 163.447 582.913 163.627 583.058C163.807 583.202 164.254 583.343 164.969 583.48L165.402 583.562C165.938 583.663 166.342 583.866 166.615 584.171C166.893 584.476 167.031 584.872 167.031 585.36C167.031 586.009 166.801 586.517 166.34 586.884C165.879 587.247 165.238 587.429 164.418 587.429C164.094 587.429 163.754 587.394 163.398 587.323C163.043 587.257 162.658 587.155 162.244 587.019V585.905C162.646 586.112 163.031 586.269 163.398 586.374C163.766 586.476 164.113 586.526 164.441 586.526C164.918 586.526 165.287 586.431 165.549 586.239C165.811 586.044 165.941 585.773 165.941 585.425C165.941 584.925 165.463 584.579 164.506 584.388L164.459 584.376L164.055 584.294C163.434 584.173 162.98 583.97 162.695 583.685C162.41 583.396 162.268 583.003 162.268 582.507C162.268 581.878 162.48 581.394 162.906 581.054C163.332 580.71 163.939 580.538 164.729 580.538C165.08 580.538 165.418 580.571 165.742 580.638C166.066 580.7 166.385 580.796 166.697 580.925ZM173.928 580.925V581.98C173.619 581.8 173.309 581.665 172.996 581.575C172.684 581.485 172.365 581.441 172.041 581.441C171.553 581.441 171.188 581.521 170.945 581.681C170.707 581.837 170.588 582.077 170.588 582.401C170.588 582.694 170.678 582.913 170.857 583.058C171.037 583.202 171.484 583.343 172.199 583.48L172.633 583.562C173.168 583.663 173.572 583.866 173.846 584.171C174.123 584.476 174.262 584.872 174.262 585.36C174.262 586.009 174.031 586.517 173.57 586.884C173.109 587.247 172.469 587.429 171.648 587.429C171.324 587.429 170.984 587.394 170.629 587.323C170.273 587.257 169.889 587.155 169.475 587.019V585.905C169.877 586.112 170.262 586.269 170.629 586.374C170.996 586.476 171.344 586.526 171.672 586.526C172.148 586.526 172.518 586.431 172.779 586.239C173.041 586.044 173.172 585.773 173.172 585.425C173.172 584.925 172.693 584.579 171.736 584.388L171.689 584.376L171.285 584.294C170.664 584.173 170.211 583.97 169.926 583.685C169.641 583.396 169.498 583.003 169.498 582.507C169.498 581.878 169.711 581.394 170.137 581.054C170.562 580.71 171.17 580.538 171.959 580.538C172.311 580.538 172.648 580.571 172.973 580.638C173.297 580.7 173.615 580.796 173.928 580.925ZM175.568 578.54H177.186L180.607 585.718V578.54H181.867V587.259H180.25L176.828 580.081V587.259H175.568V578.54ZM186.801 583.96H186.443C185.814 583.96 185.34 584.071 185.02 584.294C184.703 584.513 184.545 584.841 184.545 585.278C184.545 585.673 184.664 585.98 184.902 586.198C185.141 586.417 185.471 586.526 185.893 586.526C186.486 586.526 186.953 586.321 187.293 585.911C187.633 585.497 187.805 584.927 187.809 584.2V583.96H186.801ZM188.893 583.515V587.259H187.809V586.286C187.578 586.677 187.287 586.966 186.936 587.153C186.588 587.337 186.164 587.429 185.664 587.429C184.996 587.429 184.463 587.241 184.064 586.866C183.666 586.487 183.467 585.982 183.467 585.349C183.467 584.618 183.711 584.064 184.199 583.685C184.691 583.306 185.412 583.116 186.361 583.116H187.809V582.946C187.805 582.423 187.672 582.044 187.41 581.81C187.148 581.571 186.73 581.452 186.156 581.452C185.789 581.452 185.418 581.505 185.043 581.61C184.668 581.716 184.303 581.87 183.947 582.073V580.995C184.346 580.843 184.727 580.73 185.09 580.655C185.457 580.577 185.812 580.538 186.156 580.538C186.699 580.538 187.162 580.618 187.545 580.778C187.932 580.939 188.244 581.179 188.482 581.499C188.631 581.694 188.736 581.937 188.799 582.226C188.861 582.511 188.893 582.941 188.893 583.515ZM193.879 581.364C194.012 581.083 194.18 580.876 194.383 580.743C194.59 580.607 194.838 580.538 195.127 580.538C195.654 580.538 196.025 580.743 196.24 581.153C196.459 581.56 196.568 582.327 196.568 583.456V587.259H195.584V583.503C195.584 582.577 195.531 582.003 195.426 581.78C195.324 581.554 195.137 581.441 194.863 581.441C194.551 581.441 194.336 581.562 194.219 581.804C194.105 582.042 194.049 582.609 194.049 583.503V587.259H193.064V583.503C193.064 582.566 193.008 581.987 192.895 581.769C192.785 581.55 192.586 581.441 192.297 581.441C192.012 581.441 191.812 581.562 191.699 581.804C191.59 582.042 191.535 582.609 191.535 583.503V587.259H190.557V580.696H191.535V581.259C191.664 581.025 191.824 580.847 192.016 580.726C192.211 580.601 192.432 580.538 192.678 580.538C192.975 580.538 193.221 580.607 193.416 580.743C193.615 580.88 193.77 581.087 193.879 581.364ZM203.711 583.439V583.966H199.041V584.001C199.01 584.896 199.18 585.538 199.551 585.929C199.926 586.319 200.453 586.515 201.133 586.515C201.477 586.515 201.836 586.46 202.211 586.351C202.586 586.241 202.986 586.075 203.412 585.853V586.925C203.002 587.093 202.605 587.218 202.223 587.3C201.844 587.386 201.477 587.429 201.121 587.429C200.102 587.429 199.305 587.124 198.73 586.515C198.156 585.901 197.869 585.058 197.869 583.984C197.869 582.937 198.15 582.101 198.713 581.476C199.275 580.851 200.025 580.538 200.963 580.538C201.799 580.538 202.457 580.821 202.938 581.388C203.422 581.954 203.68 582.638 203.711 583.439ZM202.633 583.122C202.586 582.669 202.42 582.278 202.135 581.95C201.854 581.618 201.447 581.452 200.916 581.452C200.396 581.452 199.969 581.624 199.633 581.968C199.297 582.312 199.113 582.698 199.082 583.128L202.633 583.122ZM145.463 655.193V659.259H144.379V655.193C144.379 654.603 144.275 654.169 144.068 653.892C143.861 653.614 143.537 653.476 143.096 653.476C142.592 653.476 142.203 653.655 141.93 654.015C141.66 654.37 141.525 654.882 141.525 655.55V659.259H140.447V650.142H141.525V653.681C141.717 653.306 141.977 653.023 142.305 652.831C142.633 652.636 143.021 652.538 143.471 652.538C144.139 652.538 144.637 652.759 144.965 653.2C145.297 653.638 145.463 654.302 145.463 655.193ZM153.303 654.05C153.072 653.87 152.838 653.739 152.6 653.657C152.361 653.575 152.1 653.534 151.814 653.534C151.143 653.534 150.629 653.745 150.273 654.167C149.918 654.589 149.74 655.198 149.74 655.995V659.259H148.656V652.696H149.74V653.98C149.92 653.515 150.195 653.159 150.566 652.913C150.941 652.663 151.385 652.538 151.896 652.538C152.162 652.538 152.41 652.571 152.641 652.638C152.871 652.704 153.092 652.808 153.303 652.948V654.05ZM160.328 655.439V655.966H155.658V656.001C155.627 656.896 155.797 657.538 156.168 657.929C156.543 658.319 157.07 658.515 157.75 658.515C158.094 658.515 158.453 658.46 158.828 658.351C159.203 658.241 159.604 658.075 160.029 657.853V658.925C159.619 659.093 159.223 659.218 158.84 659.3C158.461 659.386 158.094 659.429 157.738 659.429C156.719 659.429 155.922 659.124 155.348 658.515C154.773 657.901 154.486 657.058 154.486 655.984C154.486 654.937 154.768 654.101 155.33 653.476C155.893 652.851 156.643 652.538 157.58 652.538C158.416 652.538 159.074 652.821 159.555 653.388C160.039 653.954 160.297 654.638 160.328 655.439ZM159.25 655.122C159.203 654.669 159.037 654.278 158.752 653.95C158.471 653.618 158.064 653.452 157.533 653.452C157.014 653.452 156.586 653.624 156.25 653.968C155.914 654.312 155.73 654.698 155.699 655.128L159.25 655.122ZM167.225 650.142V651.038H166C165.613 651.038 165.344 651.118 165.191 651.278C165.043 651.435 164.969 651.714 164.969 652.116V652.696H167.225V653.534H164.969V659.259H163.891V653.534H162.139V652.696H163.891V652.239C163.891 651.521 164.055 650.991 164.383 650.651C164.715 650.312 165.23 650.142 165.93 650.142H167.225ZM186.9 656.886C186.9 657.37 186.988 657.735 187.164 657.982C187.344 658.228 187.607 658.351 187.955 658.351H189.215V659.259H187.85C187.205 659.259 186.705 659.054 186.35 658.644C185.998 658.23 185.822 657.644 185.822 656.886V650.95H184.094V650.107H186.9V656.886ZM191.77 652.72H194.529V658.421H196.668V659.259H191.312V658.421H193.451V653.558H191.77V652.72ZM193.451 650.171H194.529V651.53H193.451V650.171ZM203.307 655.193V659.259H202.223V655.193C202.223 654.603 202.119 654.169 201.912 653.892C201.705 653.614 201.381 653.476 200.939 653.476C200.436 653.476 200.047 653.655 199.773 654.015C199.504 654.37 199.369 654.882 199.369 655.55V659.259H198.291V652.696H199.369V653.681C199.561 653.306 199.82 653.023 200.148 652.831C200.477 652.636 200.865 652.538 201.314 652.538C201.982 652.538 202.48 652.759 202.809 653.2C203.141 653.638 203.307 654.302 203.307 655.193ZM205.762 650.142H206.875V655.421L209.705 652.696H211.018L208.434 655.169L211.422 659.259H210.104L207.678 655.872L206.875 656.628V659.259H205.762V650.142ZM232.287 658.925C231.998 659.093 231.699 659.218 231.391 659.3C231.086 659.386 230.773 659.429 230.453 659.429C229.438 659.429 228.643 659.124 228.068 658.515C227.498 657.905 227.213 657.062 227.213 655.984C227.213 654.905 227.498 654.062 228.068 653.452C228.643 652.843 229.438 652.538 230.453 652.538C230.77 652.538 231.078 652.579 231.379 652.661C231.68 652.743 231.982 652.87 232.287 653.042V654.173C232.002 653.919 231.715 653.735 231.426 653.622C231.141 653.509 230.816 653.452 230.453 653.452C229.777 653.452 229.258 653.671 228.895 654.109C228.531 654.546 228.35 655.171 228.35 655.984C228.35 656.792 228.531 657.417 228.895 657.859C229.262 658.296 229.781 658.515 230.453 658.515C230.828 658.515 231.164 658.458 231.461 658.345C231.758 658.228 232.033 658.048 232.287 657.806V658.925ZM237.514 656.886C237.514 657.37 237.602 657.735 237.777 657.982C237.957 658.228 238.221 658.351 238.568 658.351H239.828V659.259H238.463C237.818 659.259 237.318 659.054 236.963 658.644C236.611 658.23 236.436 657.644 236.436 656.886V650.95H234.707V650.107H237.514V656.886ZM244.645 655.96H244.287C243.658 655.96 243.184 656.071 242.863 656.294C242.547 656.513 242.389 656.841 242.389 657.278C242.389 657.673 242.508 657.98 242.746 658.198C242.984 658.417 243.314 658.526 243.736 658.526C244.33 658.526 244.797 658.321 245.137 657.911C245.477 657.497 245.648 656.927 245.652 656.2V655.96H244.645ZM246.736 655.515V659.259H245.652V658.286C245.422 658.677 245.131 658.966 244.779 659.153C244.432 659.337 244.008 659.429 243.508 659.429C242.84 659.429 242.307 659.241 241.908 658.866C241.51 658.487 241.311 657.982 241.311 657.349C241.311 656.618 241.555 656.064 242.043 655.685C242.535 655.306 243.256 655.116 244.205 655.116H245.652V654.946C245.648 654.423 245.516 654.044 245.254 653.81C244.992 653.571 244.574 653.452 244 653.452C243.633 653.452 243.262 653.505 242.887 653.61C242.512 653.716 242.146 653.87 241.791 654.073V652.995C242.189 652.843 242.57 652.73 242.934 652.655C243.301 652.577 243.656 652.538 244 652.538C244.543 652.538 245.006 652.618 245.389 652.778C245.775 652.939 246.088 653.179 246.326 653.499C246.475 653.694 246.58 653.937 246.643 654.226C246.705 654.511 246.736 654.941 246.736 655.515ZM253.463 652.925V653.98C253.154 653.8 252.844 653.665 252.531 653.575C252.219 653.485 251.9 653.441 251.576 653.441C251.088 653.441 250.723 653.521 250.48 653.681C250.242 653.837 250.123 654.077 250.123 654.401C250.123 654.694 250.213 654.913 250.393 655.058C250.572 655.202 251.02 655.343 251.734 655.48L252.168 655.562C252.703 655.663 253.107 655.866 253.381 656.171C253.658 656.476 253.797 656.872 253.797 657.36C253.797 658.009 253.566 658.517 253.105 658.884C252.645 659.247 252.004 659.429 251.184 659.429C250.859 659.429 250.52 659.394 250.164 659.323C249.809 659.257 249.424 659.155 249.01 659.019V657.905C249.412 658.112 249.797 658.269 250.164 658.374C250.531 658.476 250.879 658.526 251.207 658.526C251.684 658.526 252.053 658.431 252.314 658.239C252.576 658.044 252.707 657.773 252.707 657.425C252.707 656.925 252.229 656.579 251.271 656.388L251.225 656.376L250.82 656.294C250.199 656.173 249.746 655.97 249.461 655.685C249.176 655.396 249.033 655.003 249.033 654.507C249.033 653.878 249.246 653.394 249.672 653.054C250.098 652.71 250.705 652.538 251.494 652.538C251.846 652.538 252.184 652.571 252.508 652.638C252.832 652.7 253.15 652.796 253.463 652.925ZM260.693 652.925V653.98C260.385 653.8 260.074 653.665 259.762 653.575C259.449 653.485 259.131 653.441 258.807 653.441C258.318 653.441 257.953 653.521 257.711 653.681C257.473 653.837 257.354 654.077 257.354 654.401C257.354 654.694 257.443 654.913 257.623 655.058C257.803 655.202 258.25 655.343 258.965 655.48L259.398 655.562C259.934 655.663 260.338 655.866 260.611 656.171C260.889 656.476 261.027 656.872 261.027 657.36C261.027 658.009 260.797 658.517 260.336 658.884C259.875 659.247 259.234 659.429 258.414 659.429C258.09 659.429 257.75 659.394 257.395 659.323C257.039 659.257 256.654 659.155 256.24 659.019V657.905C256.643 658.112 257.027 658.269 257.395 658.374C257.762 658.476 258.109 658.526 258.438 658.526C258.914 658.526 259.283 658.431 259.545 658.239C259.807 658.044 259.938 657.773 259.938 657.425C259.938 656.925 259.459 656.579 258.502 656.388L258.455 656.376L258.051 656.294C257.43 656.173 256.977 655.97 256.691 655.685C256.406 655.396 256.264 655.003 256.264 654.507C256.264 653.878 256.477 653.394 256.902 653.054C257.328 652.71 257.936 652.538 258.725 652.538C259.076 652.538 259.414 652.571 259.738 652.638C260.062 652.7 260.381 652.796 260.693 652.925ZM262.334 650.54H263.951L267.373 657.718V650.54H268.633V659.259H267.016L263.594 652.081V659.259H262.334V650.54ZM273.566 655.96H273.209C272.58 655.96 272.105 656.071 271.785 656.294C271.469 656.513 271.311 656.841 271.311 657.278C271.311 657.673 271.43 657.98 271.668 658.198C271.906 658.417 272.236 658.526 272.658 658.526C273.252 658.526 273.719 658.321 274.059 657.911C274.398 657.497 274.57 656.927 274.574 656.2V655.96H273.566ZM275.658 655.515V659.259H274.574V658.286C274.344 658.677 274.053 658.966 273.701 659.153C273.354 659.337 272.93 659.429 272.43 659.429C271.762 659.429 271.229 659.241 270.83 658.866C270.432 658.487 270.232 657.982 270.232 657.349C270.232 656.618 270.477 656.064 270.965 655.685C271.457 655.306 272.178 655.116 273.127 655.116H274.574V654.946C274.57 654.423 274.438 654.044 274.176 653.81C273.914 653.571 273.496 653.452 272.922 653.452C272.555 653.452 272.184 653.505 271.809 653.61C271.434 653.716 271.068 653.87 270.713 654.073V652.995C271.111 652.843 271.492 652.73 271.855 652.655C272.223 652.577 272.578 652.538 272.922 652.538C273.465 652.538 273.928 652.618 274.311 652.778C274.697 652.939 275.01 653.179 275.248 653.499C275.396 653.694 275.502 653.937 275.564 654.226C275.627 654.511 275.658 654.941 275.658 655.515ZM280.645 653.364C280.777 653.083 280.945 652.876 281.148 652.743C281.355 652.607 281.604 652.538 281.893 652.538C282.42 652.538 282.791 652.743 283.006 653.153C283.225 653.56 283.334 654.327 283.334 655.456V659.259H282.35V655.503C282.35 654.577 282.297 654.003 282.191 653.78C282.09 653.554 281.902 653.441 281.629 653.441C281.316 653.441 281.102 653.562 280.984 653.804C280.871 654.042 280.814 654.609 280.814 655.503V659.259H279.83V655.503C279.83 654.566 279.773 653.987 279.66 653.769C279.551 653.55 279.352 653.441 279.062 653.441C278.777 653.441 278.578 653.562 278.465 653.804C278.355 654.042 278.301 654.609 278.301 655.503V659.259H277.322V652.696H278.301V653.259C278.43 653.025 278.59 652.847 278.781 652.726C278.977 652.601 279.197 652.538 279.443 652.538C279.74 652.538 279.986 652.607 280.182 652.743C280.381 652.88 280.535 653.087 280.645 653.364ZM290.477 655.439V655.966H285.807V656.001C285.775 656.896 285.945 657.538 286.316 657.929C286.691 658.319 287.219 658.515 287.898 658.515C288.242 658.515 288.602 658.46 288.977 658.351C289.352 658.241 289.752 658.075 290.178 657.853V658.925C289.768 659.093 289.371 659.218 288.988 659.3C288.609 659.386 288.242 659.429 287.887 659.429C286.867 659.429 286.07 659.124 285.496 658.515C284.922 657.901 284.635 657.058 284.635 655.984C284.635 654.937 284.916 654.101 285.479 653.476C286.041 652.851 286.791 652.538 287.729 652.538C288.564 652.538 289.223 652.821 289.703 653.388C290.188 653.954 290.445 654.638 290.477 655.439ZM289.398 655.122C289.352 654.669 289.186 654.278 288.9 653.95C288.619 653.618 288.213 653.452 287.682 653.452C287.162 653.452 286.734 653.624 286.398 653.968C286.062 654.312 285.879 654.698 285.848 655.128L289.398 655.122ZM152.752 676.925C152.463 677.093 152.164 677.218 151.855 677.3C151.551 677.386 151.238 677.429 150.918 677.429C149.902 677.429 149.107 677.124 148.533 676.515C147.963 675.905 147.678 675.062 147.678 673.984C147.678 672.905 147.963 672.062 148.533 671.452C149.107 670.843 149.902 670.538 150.918 670.538C151.234 670.538 151.543 670.579 151.844 670.661C152.145 670.743 152.447 670.87 152.752 671.042V672.173C152.467 671.919 152.18 671.735 151.891 671.622C151.605 671.509 151.281 671.452 150.918 671.452C150.242 671.452 149.723 671.671 149.359 672.109C148.996 672.546 148.814 673.171 148.814 673.984C148.814 674.792 148.996 675.417 149.359 675.859C149.727 676.296 150.246 676.515 150.918 676.515C151.293 676.515 151.629 676.458 151.926 676.345C152.223 676.228 152.498 676.048 152.752 675.806V676.925ZM157.979 674.886C157.979 675.37 158.066 675.735 158.242 675.982C158.422 676.228 158.686 676.351 159.033 676.351H160.293V677.259H158.928C158.283 677.259 157.783 677.054 157.428 676.644C157.076 676.23 156.9 675.644 156.9 674.886V668.95H155.172V668.107H157.979V674.886ZM165.109 673.96H164.752C164.123 673.96 163.648 674.071 163.328 674.294C163.012 674.513 162.854 674.841 162.854 675.278C162.854 675.673 162.973 675.98 163.211 676.198C163.449 676.417 163.779 676.526 164.201 676.526C164.795 676.526 165.262 676.321 165.602 675.911C165.941 675.497 166.113 674.927 166.117 674.2V673.96H165.109ZM167.201 673.515V677.259H166.117V676.286C165.887 676.677 165.596 676.966 165.244 677.153C164.896 677.337 164.473 677.429 163.973 677.429C163.305 677.429 162.771 677.241 162.373 676.866C161.975 676.487 161.775 675.982 161.775 675.349C161.775 674.618 162.02 674.064 162.508 673.685C163 673.306 163.721 673.116 164.67 673.116H166.117V672.946C166.113 672.423 165.98 672.044 165.719 671.81C165.457 671.571 165.039 671.452 164.465 671.452C164.098 671.452 163.727 671.505 163.352 671.61C162.977 671.716 162.611 671.87 162.256 672.073V670.995C162.654 670.843 163.035 670.73 163.398 670.655C163.766 670.577 164.121 670.538 164.465 670.538C165.008 670.538 165.471 670.618 165.854 670.778C166.24 670.939 166.553 671.179 166.791 671.499C166.939 671.694 167.045 671.937 167.107 672.226C167.17 672.511 167.201 672.941 167.201 673.515ZM173.928 670.925V671.98C173.619 671.8 173.309 671.665 172.996 671.575C172.684 671.485 172.365 671.441 172.041 671.441C171.553 671.441 171.188 671.521 170.945 671.681C170.707 671.837 170.588 672.077 170.588 672.401C170.588 672.694 170.678 672.913 170.857 673.058C171.037 673.202 171.484 673.343 172.199 673.48L172.633 673.562C173.168 673.663 173.572 673.866 173.846 674.171C174.123 674.476 174.262 674.872 174.262 675.36C174.262 676.009 174.031 676.517 173.57 676.884C173.109 677.247 172.469 677.429 171.648 677.429C171.324 677.429 170.984 677.394 170.629 677.323C170.273 677.257 169.889 677.155 169.475 677.019V675.905C169.877 676.112 170.262 676.269 170.629 676.374C170.996 676.476 171.344 676.526 171.672 676.526C172.148 676.526 172.518 676.431 172.779 676.239C173.041 676.044 173.172 675.773 173.172 675.425C173.172 674.925 172.693 674.579 171.736 674.388L171.689 674.376L171.285 674.294C170.664 674.173 170.211 673.97 169.926 673.685C169.641 673.396 169.498 673.003 169.498 672.507C169.498 671.878 169.711 671.394 170.137 671.054C170.562 670.71 171.17 670.538 171.959 670.538C172.311 670.538 172.648 670.571 172.973 670.638C173.297 670.7 173.615 670.796 173.928 670.925ZM181.158 670.925V671.98C180.85 671.8 180.539 671.665 180.227 671.575C179.914 671.485 179.596 671.441 179.271 671.441C178.783 671.441 178.418 671.521 178.176 671.681C177.938 671.837 177.818 672.077 177.818 672.401C177.818 672.694 177.908 672.913 178.088 673.058C178.268 673.202 178.715 673.343 179.43 673.48L179.863 673.562C180.398 673.663 180.803 673.866 181.076 674.171C181.354 674.476 181.492 674.872 181.492 675.36C181.492 676.009 181.262 676.517 180.801 676.884C180.34 677.247 179.699 677.429 178.879 677.429C178.555 677.429 178.215 677.394 177.859 677.323C177.504 677.257 177.119 677.155 176.705 677.019V675.905C177.107 676.112 177.492 676.269 177.859 676.374C178.227 676.476 178.574 676.526 178.902 676.526C179.379 676.526 179.748 676.431 180.01 676.239C180.271 676.044 180.402 675.773 180.402 675.425C180.402 674.925 179.924 674.579 178.967 674.388L178.92 674.376L178.516 674.294C177.895 674.173 177.441 673.97 177.156 673.685C176.871 673.396 176.729 673.003 176.729 672.507C176.729 671.878 176.941 671.394 177.367 671.054C177.793 670.71 178.4 670.538 179.189 670.538C179.541 670.538 179.879 670.571 180.203 670.638C180.527 670.7 180.846 670.796 181.158 670.925ZM182.799 668.54H184.416L187.838 675.718V668.54H189.098V677.259H187.48L184.059 670.081V677.259H182.799V668.54ZM194.031 673.96H193.674C193.045 673.96 192.57 674.071 192.25 674.294C191.934 674.513 191.775 674.841 191.775 675.278C191.775 675.673 191.895 675.98 192.133 676.198C192.371 676.417 192.701 676.526 193.123 676.526C193.717 676.526 194.184 676.321 194.523 675.911C194.863 675.497 195.035 674.927 195.039 674.2V673.96H194.031ZM196.123 673.515V677.259H195.039V676.286C194.809 676.677 194.518 676.966 194.166 677.153C193.818 677.337 193.395 677.429 192.895 677.429C192.227 677.429 191.693 677.241 191.295 676.866C190.896 676.487 190.697 675.982 190.697 675.349C190.697 674.618 190.941 674.064 191.43 673.685C191.922 673.306 192.643 673.116 193.592 673.116H195.039V672.946C195.035 672.423 194.902 672.044 194.641 671.81C194.379 671.571 193.961 671.452 193.387 671.452C193.02 671.452 192.648 671.505 192.273 671.61C191.898 671.716 191.533 671.87 191.178 672.073V670.995C191.576 670.843 191.957 670.73 192.32 670.655C192.688 670.577 193.043 670.538 193.387 670.538C193.93 670.538 194.393 670.618 194.775 670.778C195.162 670.939 195.475 671.179 195.713 671.499C195.861 671.694 195.967 671.937 196.029 672.226C196.092 672.511 196.123 672.941 196.123 673.515ZM201.109 671.364C201.242 671.083 201.41 670.876 201.613 670.743C201.82 670.607 202.068 670.538 202.357 670.538C202.885 670.538 203.256 670.743 203.471 671.153C203.689 671.56 203.799 672.327 203.799 673.456V677.259H202.814V673.503C202.814 672.577 202.762 672.003 202.656 671.78C202.555 671.554 202.367 671.441 202.094 671.441C201.781 671.441 201.566 671.562 201.449 671.804C201.336 672.042 201.279 672.609 201.279 673.503V677.259H200.295V673.503C200.295 672.566 200.238 671.987 200.125 671.769C200.016 671.55 199.816 671.441 199.527 671.441C199.242 671.441 199.043 671.562 198.93 671.804C198.82 672.042 198.766 672.609 198.766 673.503V677.259H197.787V670.696H198.766V671.259C198.895 671.025 199.055 670.847 199.246 670.726C199.441 670.601 199.662 670.538 199.908 670.538C200.205 670.538 200.451 670.607 200.646 670.743C200.846 670.88 201 671.087 201.109 671.364ZM210.941 673.439V673.966H206.271V674.001C206.24 674.896 206.41 675.538 206.781 675.929C207.156 676.319 207.684 676.515 208.363 676.515C208.707 676.515 209.066 676.46 209.441 676.351C209.816 676.241 210.217 676.075 210.643 675.853V676.925C210.232 677.093 209.836 677.218 209.453 677.3C209.074 677.386 208.707 677.429 208.352 677.429C207.332 677.429 206.535 677.124 205.961 676.515C205.387 675.901 205.1 675.058 205.1 673.984C205.1 672.937 205.381 672.101 205.943 671.476C206.506 670.851 207.256 670.538 208.193 670.538C209.029 670.538 209.688 670.821 210.168 671.388C210.652 671.954 210.91 672.638 210.941 673.439ZM209.863 673.122C209.816 672.669 209.65 672.278 209.365 671.95C209.084 671.618 208.678 671.452 208.146 671.452C207.627 671.452 207.199 671.624 206.863 671.968C206.527 672.312 206.344 672.698 206.312 673.128L209.863 673.122ZM244.129 686.833V688.696H246.578V689.534H244.129V693.097C244.129 693.581 244.221 693.919 244.404 694.11C244.588 694.302 244.908 694.398 245.365 694.398H246.578V695.259H245.26C244.451 695.259 243.881 695.097 243.549 694.773C243.217 694.448 243.051 693.89 243.051 693.097V689.534H241.299V688.696H243.051V686.833H244.129ZM249.613 688.72H252.373V694.421H254.512V695.259H249.156V694.421H251.295V689.558H249.613V688.72ZM251.295 686.171H252.373V687.53H251.295V686.171ZM258.59 686.833V688.696H261.039V689.534H258.59V693.097C258.59 693.581 258.682 693.919 258.865 694.11C259.049 694.302 259.369 694.398 259.826 694.398H261.039V695.259H259.721C258.912 695.259 258.342 695.097 258.01 694.773C257.678 694.448 257.512 693.89 257.512 693.097V689.534H255.76V688.696H257.512V686.833H258.59ZM266.436 692.886C266.436 693.37 266.523 693.735 266.699 693.982C266.879 694.228 267.143 694.351 267.49 694.351H268.75V695.259H267.385C266.74 695.259 266.24 695.054 265.885 694.644C265.533 694.23 265.357 693.644 265.357 692.886V686.95H263.629V686.107H266.436V692.886ZM276.016 691.439V691.966H271.346V692.001C271.314 692.896 271.484 693.538 271.855 693.929C272.23 694.319 272.758 694.515 273.438 694.515C273.781 694.515 274.141 694.46 274.516 694.351C274.891 694.241 275.291 694.075 275.717 693.853V694.925C275.307 695.093 274.91 695.218 274.527 695.3C274.148 695.386 273.781 695.429 273.426 695.429C272.406 695.429 271.609 695.124 271.035 694.515C270.461 693.901 270.174 693.058 270.174 691.984C270.174 690.937 270.455 690.101 271.018 689.476C271.58 688.851 272.33 688.538 273.268 688.538C274.104 688.538 274.762 688.821 275.242 689.388C275.727 689.954 275.984 690.638 276.016 691.439ZM274.938 691.122C274.891 690.669 274.725 690.278 274.439 689.95C274.158 689.618 273.752 689.452 273.221 689.452C272.701 689.452 272.273 689.624 271.938 689.968C271.602 690.312 271.418 690.698 271.387 691.128L274.938 691.122ZM294.742 686.833V688.696H297.191V689.534H294.742V693.097C294.742 693.581 294.834 693.919 295.018 694.11C295.201 694.302 295.521 694.398 295.979 694.398H297.191V695.259H295.873C295.064 695.259 294.494 695.097 294.162 694.773C293.83 694.448 293.664 693.89 293.664 693.097V689.534H291.912V688.696H293.664V686.833H294.742ZM300.227 688.72H302.986V694.421H305.125V695.259H299.77V694.421H301.908V689.558H300.227V688.72ZM301.908 686.171H302.986V687.53H301.908V686.171ZM309.203 686.833V688.696H311.652V689.534H309.203V693.097C309.203 693.581 309.295 693.919 309.479 694.11C309.662 694.302 309.982 694.398 310.439 694.398H311.652V695.259H310.334C309.525 695.259 308.955 695.097 308.623 694.773C308.291 694.448 308.125 693.89 308.125 693.097V689.534H306.373V688.696H308.125V686.833H309.203ZM317.049 692.886C317.049 693.37 317.137 693.735 317.312 693.982C317.492 694.228 317.756 694.351 318.104 694.351H319.363V695.259H317.998C317.354 695.259 316.854 695.054 316.498 694.644C316.146 694.23 315.971 693.644 315.971 692.886V686.95H314.242V686.107H317.049V692.886ZM326.629 691.439V691.966H321.959V692.001C321.928 692.896 322.098 693.538 322.469 693.929C322.844 694.319 323.371 694.515 324.051 694.515C324.395 694.515 324.754 694.46 325.129 694.351C325.504 694.241 325.904 694.075 326.33 693.853V694.925C325.92 695.093 325.523 695.218 325.141 695.3C324.762 695.386 324.395 695.429 324.039 695.429C323.02 695.429 322.223 695.124 321.648 694.515C321.074 693.901 320.787 693.058 320.787 691.984C320.787 690.937 321.068 690.101 321.631 689.476C322.193 688.851 322.943 688.538 323.881 688.538C324.717 688.538 325.375 688.821 325.855 689.388C326.34 689.954 326.598 690.638 326.629 691.439ZM325.551 691.122C325.504 690.669 325.338 690.278 325.053 689.95C324.771 689.618 324.365 689.452 323.834 689.452C323.314 689.452 322.887 689.624 322.551 689.968C322.215 690.312 322.031 690.698 322 691.128L325.551 691.122ZM346.785 689.534V686.142H347.863V695.259H346.785V694.433C346.605 694.757 346.365 695.005 346.064 695.177C345.768 695.345 345.424 695.429 345.033 695.429C344.24 695.429 343.615 695.122 343.158 694.509C342.705 693.892 342.479 693.042 342.479 691.96C342.479 690.894 342.707 690.058 343.164 689.452C343.621 688.843 344.244 688.538 345.033 688.538C345.428 688.538 345.775 688.624 346.076 688.796C346.377 688.964 346.613 689.21 346.785 689.534ZM343.615 691.984C343.615 692.819 343.748 693.45 344.014 693.876C344.279 694.302 344.672 694.515 345.191 694.515C345.711 694.515 346.105 694.3 346.375 693.87C346.648 693.441 346.785 692.812 346.785 691.984C346.785 691.151 346.648 690.523 346.375 690.097C346.105 689.667 345.711 689.452 345.191 689.452C344.672 689.452 344.279 689.665 344.014 690.091C343.748 690.517 343.615 691.148 343.615 691.984ZM355.551 691.439V691.966H350.881V692.001C350.85 692.896 351.02 693.538 351.391 693.929C351.766 694.319 352.293 694.515 352.973 694.515C353.316 694.515 353.676 694.46 354.051 694.351C354.426 694.241 354.826 694.075 355.252 693.853V694.925C354.842 695.093 354.445 695.218 354.062 695.3C353.684 695.386 353.316 695.429 352.961 695.429C351.941 695.429 351.145 695.124 350.57 694.515C349.996 693.901 349.709 693.058 349.709 691.984C349.709 690.937 349.99 690.101 350.553 689.476C351.115 688.851 351.865 688.538 352.803 688.538C353.639 688.538 354.297 688.821 354.777 689.388C355.262 689.954 355.52 690.638 355.551 691.439ZM354.473 691.122C354.426 690.669 354.26 690.278 353.975 689.95C353.693 689.618 353.287 689.452 352.756 689.452C352.236 689.452 351.809 689.624 351.473 689.968C351.137 690.312 350.953 690.698 350.922 691.128L354.473 691.122ZM361.92 688.925V689.98C361.611 689.8 361.301 689.665 360.988 689.575C360.676 689.485 360.357 689.441 360.033 689.441C359.545 689.441 359.18 689.521 358.938 689.681C358.699 689.837 358.58 690.077 358.58 690.401C358.58 690.694 358.67 690.913 358.85 691.058C359.029 691.202 359.477 691.343 360.191 691.48L360.625 691.562C361.16 691.663 361.564 691.866 361.838 692.171C362.115 692.476 362.254 692.872 362.254 693.36C362.254 694.009 362.023 694.517 361.562 694.884C361.102 695.247 360.461 695.429 359.641 695.429C359.316 695.429 358.977 695.394 358.621 695.323C358.266 695.257 357.881 695.155 357.467 695.019V693.905C357.869 694.112 358.254 694.269 358.621 694.374C358.988 694.476 359.336 694.526 359.664 694.526C360.141 694.526 360.51 694.431 360.771 694.239C361.033 694.044 361.164 693.773 361.164 693.425C361.164 692.925 360.686 692.579 359.729 692.388L359.682 692.376L359.277 692.294C358.656 692.173 358.203 691.97 357.918 691.685C357.633 691.396 357.49 691.003 357.49 690.507C357.49 689.878 357.703 689.394 358.129 689.054C358.555 688.71 359.162 688.538 359.951 688.538C360.303 688.538 360.641 688.571 360.965 688.638C361.289 688.7 361.607 688.796 361.92 688.925ZM369.666 694.925C369.377 695.093 369.078 695.218 368.77 695.3C368.465 695.386 368.152 695.429 367.832 695.429C366.816 695.429 366.021 695.124 365.447 694.515C364.877 693.905 364.592 693.062 364.592 691.984C364.592 690.905 364.877 690.062 365.447 689.452C366.021 688.843 366.816 688.538 367.832 688.538C368.148 688.538 368.457 688.579 368.758 688.661C369.059 688.743 369.361 688.87 369.666 689.042V690.173C369.381 689.919 369.094 689.735 368.805 689.622C368.52 689.509 368.195 689.452 367.832 689.452C367.156 689.452 366.637 689.671 366.273 690.109C365.91 690.546 365.729 691.171 365.729 691.984C365.729 692.792 365.91 693.417 366.273 693.859C366.641 694.296 367.16 694.515 367.832 694.515C368.207 694.515 368.543 694.458 368.84 694.345C369.137 694.228 369.412 694.048 369.666 693.806V694.925ZM377.447 690.05C377.217 689.87 376.982 689.739 376.744 689.657C376.506 689.575 376.244 689.534 375.959 689.534C375.287 689.534 374.773 689.745 374.418 690.167C374.062 690.589 373.885 691.198 373.885 691.995V695.259H372.801V688.696H373.885V689.98C374.064 689.515 374.34 689.159 374.711 688.913C375.086 688.663 375.529 688.538 376.041 688.538C376.307 688.538 376.555 688.571 376.785 688.638C377.016 688.704 377.236 688.808 377.447 688.948V690.05ZM379.762 688.72H382.521V694.421H384.66V695.259H379.305V694.421H381.443V689.558H379.762V688.72ZM381.443 686.171H382.521V687.53H381.443V686.171ZM387.338 694.433V697.755H386.254V688.696H387.338V689.534C387.518 689.21 387.756 688.964 388.053 688.796C388.354 688.624 388.699 688.538 389.09 688.538C389.883 688.538 390.504 688.845 390.953 689.458C391.406 690.071 391.633 690.921 391.633 692.007C391.633 693.073 391.406 693.911 390.953 694.521C390.5 695.126 389.879 695.429 389.09 695.429C388.691 695.429 388.342 695.345 388.041 695.177C387.744 695.005 387.51 694.757 387.338 694.433ZM390.502 691.984C390.502 691.148 390.369 690.517 390.104 690.091C389.842 689.665 389.451 689.452 388.932 689.452C388.408 689.452 388.012 689.667 387.742 690.097C387.473 690.523 387.338 691.151 387.338 691.984C387.338 692.812 387.473 693.441 387.742 693.87C388.012 694.3 388.408 694.515 388.932 694.515C389.451 694.515 389.842 694.302 390.104 693.876C390.369 693.45 390.502 692.819 390.502 691.984ZM395.969 686.833V688.696H398.418V689.534H395.969V693.097C395.969 693.581 396.061 693.919 396.244 694.11C396.428 694.302 396.748 694.398 397.205 694.398H398.418V695.259H397.1C396.291 695.259 395.721 695.097 395.389 694.773C395.057 694.448 394.891 693.89 394.891 693.097V689.534H393.139V688.696H394.891V686.833H395.969ZM401.453 688.72H404.213V694.421H406.352V695.259H400.996V694.421H403.135V689.558H401.453V688.72ZM403.135 686.171H404.213V687.53H403.135V686.171ZM410.441 689.452C409.895 689.452 409.48 689.665 409.199 690.091C408.918 690.517 408.777 691.148 408.777 691.984C408.777 692.816 408.918 693.446 409.199 693.876C409.48 694.302 409.895 694.515 410.441 694.515C410.992 694.515 411.408 694.302 411.689 693.876C411.971 693.446 412.111 692.816 412.111 691.984C412.111 691.148 411.971 690.517 411.689 690.091C411.408 689.665 410.992 689.452 410.441 689.452ZM410.441 688.538C411.352 688.538 412.047 688.833 412.527 689.423C413.012 690.013 413.254 690.866 413.254 691.984C413.254 693.105 413.014 693.96 412.533 694.55C412.053 695.136 411.355 695.429 410.441 695.429C409.531 695.429 408.836 695.136 408.355 694.55C407.875 693.96 407.635 693.105 407.635 691.984C407.635 690.866 407.875 690.013 408.355 689.423C408.836 688.833 409.531 688.538 410.441 688.538ZM420.221 691.193V695.259H419.137V691.193C419.137 690.603 419.033 690.169 418.826 689.892C418.619 689.614 418.295 689.476 417.854 689.476C417.35 689.476 416.961 689.655 416.688 690.015C416.418 690.37 416.283 690.882 416.283 691.55V695.259H415.205V688.696H416.283V689.681C416.475 689.306 416.734 689.023 417.062 688.831C417.391 688.636 417.779 688.538 418.229 688.538C418.896 688.538 419.395 688.759 419.723 689.2C420.055 689.638 420.221 690.302 420.221 691.193ZM423.631 687.484V690.771H425.002C425.549 690.771 425.975 690.626 426.279 690.337C426.588 690.048 426.742 689.644 426.742 689.124C426.742 688.605 426.59 688.202 426.285 687.917C425.98 687.628 425.553 687.484 425.002 687.484H423.631ZM422.447 686.511H425.002C425.979 686.511 426.719 686.734 427.223 687.179C427.727 687.62 427.979 688.269 427.979 689.124C427.979 689.987 427.727 690.64 427.223 691.081C426.723 691.523 425.982 691.743 425.002 691.743H423.631V695.259H422.447V686.511ZM435.291 690.05C435.061 689.87 434.826 689.739 434.588 689.657C434.35 689.575 434.088 689.534 433.803 689.534C433.131 689.534 432.617 689.745 432.262 690.167C431.906 690.589 431.729 691.198 431.729 691.995V695.259H430.645V688.696H431.729V689.98C431.908 689.515 432.184 689.159 432.555 688.913C432.93 688.663 433.373 688.538 433.885 688.538C434.15 688.538 434.398 688.571 434.629 688.638C434.859 688.704 435.08 688.808 435.291 688.948V690.05ZM437.605 688.72H440.365V694.421H442.504V695.259H437.148V694.421H439.287V689.558H437.605V688.72ZM439.287 686.171H440.365V687.53H439.287V686.171ZM446.945 689.364C447.078 689.083 447.246 688.876 447.449 688.743C447.656 688.607 447.904 688.538 448.193 688.538C448.721 688.538 449.092 688.743 449.307 689.153C449.525 689.56 449.635 690.327 449.635 691.456V695.259H448.65V691.503C448.65 690.577 448.598 690.003 448.492 689.78C448.391 689.554 448.203 689.441 447.93 689.441C447.617 689.441 447.402 689.562 447.285 689.804C447.172 690.042 447.115 690.609 447.115 691.503V695.259H446.131V691.503C446.131 690.566 446.074 689.987 445.961 689.769C445.852 689.55 445.652 689.441 445.363 689.441C445.078 689.441 444.879 689.562 444.766 689.804C444.656 690.042 444.602 690.609 444.602 691.503V695.259H443.623V688.696H444.602V689.259C444.73 689.025 444.891 688.847 445.082 688.726C445.277 688.601 445.498 688.538 445.744 688.538C446.041 688.538 446.287 688.607 446.482 688.743C446.682 688.88 446.836 689.087 446.945 689.364ZM454.328 691.96H453.971C453.342 691.96 452.867 692.071 452.547 692.294C452.23 692.513 452.072 692.841 452.072 693.278C452.072 693.673 452.191 693.98 452.43 694.198C452.668 694.417 452.998 694.526 453.42 694.526C454.014 694.526 454.48 694.321 454.82 693.911C455.16 693.497 455.332 692.927 455.336 692.2V691.96H454.328ZM456.42 691.515V695.259H455.336V694.286C455.105 694.677 454.814 694.966 454.463 695.153C454.115 695.337 453.691 695.429 453.191 695.429C452.523 695.429 451.99 695.241 451.592 694.866C451.193 694.487 450.994 693.982 450.994 693.349C450.994 692.618 451.238 692.064 451.727 691.685C452.219 691.306 452.939 691.116 453.889 691.116H455.336V690.946C455.332 690.423 455.199 690.044 454.938 689.81C454.676 689.571 454.258 689.452 453.684 689.452C453.316 689.452 452.945 689.505 452.57 689.61C452.195 689.716 451.83 689.87 451.475 690.073V688.995C451.873 688.843 452.254 688.73 452.617 688.655C452.984 688.577 453.34 688.538 453.684 688.538C454.227 688.538 454.689 688.618 455.072 688.778C455.459 688.939 455.771 689.179 456.01 689.499C456.158 689.694 456.264 689.937 456.326 690.226C456.389 690.511 456.42 690.941 456.42 691.515ZM464.213 690.05C463.982 689.87 463.748 689.739 463.51 689.657C463.271 689.575 463.01 689.534 462.725 689.534C462.053 689.534 461.539 689.745 461.184 690.167C460.828 690.589 460.65 691.198 460.65 691.995V695.259H459.566V688.696H460.65V689.98C460.83 689.515 461.105 689.159 461.477 688.913C461.852 688.663 462.295 688.538 462.807 688.538C463.072 688.538 463.32 688.571 463.551 688.638C463.781 688.704 464.002 688.808 464.213 688.948V690.05ZM469.703 693.15C469.523 693.607 469.295 694.208 469.018 694.954C468.631 695.985 468.371 696.614 468.238 696.841C468.059 697.146 467.834 697.374 467.564 697.526C467.295 697.679 466.98 697.755 466.621 697.755H465.754V696.853H466.393C466.709 696.853 466.957 696.761 467.137 696.577C467.316 696.394 467.545 695.919 467.822 695.153L465.285 688.696H466.428L468.373 693.829L470.289 688.696H471.432L469.703 693.15ZM491.395 689.534V686.142H492.473V695.259H491.395V694.433C491.215 694.757 490.975 695.005 490.674 695.177C490.377 695.345 490.033 695.429 489.643 695.429C488.85 695.429 488.225 695.122 487.768 694.509C487.314 693.892 487.088 693.042 487.088 691.96C487.088 690.894 487.316 690.058 487.773 689.452C488.23 688.843 488.854 688.538 489.643 688.538C490.037 688.538 490.385 688.624 490.686 688.796C490.986 688.964 491.223 689.21 491.395 689.534ZM488.225 691.984C488.225 692.819 488.357 693.45 488.623 693.876C488.889 694.302 489.281 694.515 489.801 694.515C490.32 694.515 490.715 694.3 490.984 693.87C491.258 693.441 491.395 692.812 491.395 691.984C491.395 691.151 491.258 690.523 490.984 690.097C490.715 689.667 490.32 689.452 489.801 689.452C489.281 689.452 488.889 689.665 488.623 690.091C488.357 690.517 488.225 691.148 488.225 691.984ZM500.16 691.439V691.966H495.49V692.001C495.459 692.896 495.629 693.538 496 693.929C496.375 694.319 496.902 694.515 497.582 694.515C497.926 694.515 498.285 694.46 498.66 694.351C499.035 694.241 499.436 694.075 499.861 693.853V694.925C499.451 695.093 499.055 695.218 498.672 695.3C498.293 695.386 497.926 695.429 497.57 695.429C496.551 695.429 495.754 695.124 495.18 694.515C494.605 693.901 494.318 693.058 494.318 691.984C494.318 690.937 494.6 690.101 495.162 689.476C495.725 688.851 496.475 688.538 497.412 688.538C498.248 688.538 498.906 688.821 499.387 689.388C499.871 689.954 500.129 690.638 500.16 691.439ZM499.082 691.122C499.035 690.669 498.869 690.278 498.584 689.95C498.303 689.618 497.896 689.452 497.365 689.452C496.846 689.452 496.418 689.624 496.082 689.968C495.746 690.312 495.562 690.698 495.531 691.128L499.082 691.122ZM506.529 688.925V689.98C506.221 689.8 505.91 689.665 505.598 689.575C505.285 689.485 504.967 689.441 504.643 689.441C504.154 689.441 503.789 689.521 503.547 689.681C503.309 689.837 503.189 690.077 503.189 690.401C503.189 690.694 503.279 690.913 503.459 691.058C503.639 691.202 504.086 691.343 504.801 691.48L505.234 691.562C505.77 691.663 506.174 691.866 506.447 692.171C506.725 692.476 506.863 692.872 506.863 693.36C506.863 694.009 506.633 694.517 506.172 694.884C505.711 695.247 505.07 695.429 504.25 695.429C503.926 695.429 503.586 695.394 503.23 695.323C502.875 695.257 502.49 695.155 502.076 695.019V693.905C502.479 694.112 502.863 694.269 503.23 694.374C503.598 694.476 503.945 694.526 504.273 694.526C504.75 694.526 505.119 694.431 505.381 694.239C505.643 694.044 505.773 693.773 505.773 693.425C505.773 692.925 505.295 692.579 504.338 692.388L504.291 692.376L503.887 692.294C503.266 692.173 502.812 691.97 502.527 691.685C502.242 691.396 502.1 691.003 502.1 690.507C502.1 689.878 502.312 689.394 502.738 689.054C503.164 688.71 503.771 688.538 504.561 688.538C504.912 688.538 505.25 688.571 505.574 688.638C505.898 688.7 506.217 688.796 506.529 688.925ZM514.275 694.925C513.986 695.093 513.688 695.218 513.379 695.3C513.074 695.386 512.762 695.429 512.441 695.429C511.426 695.429 510.631 695.124 510.057 694.515C509.486 693.905 509.201 693.062 509.201 691.984C509.201 690.905 509.486 690.062 510.057 689.452C510.631 688.843 511.426 688.538 512.441 688.538C512.758 688.538 513.066 688.579 513.367 688.661C513.668 688.743 513.971 688.87 514.275 689.042V690.173C513.99 689.919 513.703 689.735 513.414 689.622C513.129 689.509 512.805 689.452 512.441 689.452C511.766 689.452 511.246 689.671 510.883 690.109C510.52 690.546 510.338 691.171 510.338 691.984C510.338 692.792 510.52 693.417 510.883 693.859C511.25 694.296 511.77 694.515 512.441 694.515C512.816 694.515 513.152 694.458 513.449 694.345C513.746 694.228 514.021 694.048 514.275 693.806V694.925ZM522.057 690.05C521.826 689.87 521.592 689.739 521.354 689.657C521.115 689.575 520.854 689.534 520.568 689.534C519.896 689.534 519.383 689.745 519.027 690.167C518.672 690.589 518.494 691.198 518.494 691.995V695.259H517.41V688.696H518.494V689.98C518.674 689.515 518.949 689.159 519.32 688.913C519.695 688.663 520.139 688.538 520.65 688.538C520.916 688.538 521.164 688.571 521.395 688.638C521.625 688.704 521.846 688.808 522.057 688.948V690.05ZM524.371 688.72H527.131V694.421H529.27V695.259H523.914V694.421H526.053V689.558H524.371V688.72ZM526.053 686.171H527.131V687.53H526.053V686.171ZM531.947 694.433V697.755H530.863V688.696H531.947V689.534C532.127 689.21 532.365 688.964 532.662 688.796C532.963 688.624 533.309 688.538 533.699 688.538C534.492 688.538 535.113 688.845 535.562 689.458C536.016 690.071 536.242 690.921 536.242 692.007C536.242 693.073 536.016 693.911 535.562 694.521C535.109 695.126 534.488 695.429 533.699 695.429C533.301 695.429 532.951 695.345 532.65 695.177C532.354 695.005 532.119 694.757 531.947 694.433ZM535.111 691.984C535.111 691.148 534.979 690.517 534.713 690.091C534.451 689.665 534.061 689.452 533.541 689.452C533.018 689.452 532.621 689.667 532.352 690.097C532.082 690.523 531.947 691.151 531.947 691.984C531.947 692.812 532.082 693.441 532.352 693.87C532.621 694.3 533.018 694.515 533.541 694.515C534.061 694.515 534.451 694.302 534.713 693.876C534.979 693.45 535.111 692.819 535.111 691.984ZM540.578 686.833V688.696H543.027V689.534H540.578V693.097C540.578 693.581 540.67 693.919 540.854 694.11C541.037 694.302 541.357 694.398 541.814 694.398H543.027V695.259H541.709C540.9 695.259 540.33 695.097 539.998 694.773C539.666 694.448 539.5 693.89 539.5 693.097V689.534H537.748V688.696H539.5V686.833H540.578ZM546.062 688.72H548.822V694.421H550.961V695.259H545.605V694.421H547.744V689.558H546.062V688.72ZM547.744 686.171H548.822V687.53H547.744V686.171ZM555.051 689.452C554.504 689.452 554.09 689.665 553.809 690.091C553.527 690.517 553.387 691.148 553.387 691.984C553.387 692.816 553.527 693.446 553.809 693.876C554.09 694.302 554.504 694.515 555.051 694.515C555.602 694.515 556.018 694.302 556.299 693.876C556.58 693.446 556.721 692.816 556.721 691.984C556.721 691.148 556.58 690.517 556.299 690.091C556.018 689.665 555.602 689.452 555.051 689.452ZM555.051 688.538C555.961 688.538 556.656 688.833 557.137 689.423C557.621 690.013 557.863 690.866 557.863 691.984C557.863 693.105 557.623 693.96 557.143 694.55C556.662 695.136 555.965 695.429 555.051 695.429C554.141 695.429 553.445 695.136 552.965 694.55C552.484 693.96 552.244 693.105 552.244 691.984C552.244 690.866 552.484 690.013 552.965 689.423C553.445 688.833 554.141 688.538 555.051 688.538ZM564.83 691.193V695.259H563.746V691.193C563.746 690.603 563.643 690.169 563.436 689.892C563.229 689.614 562.904 689.476 562.463 689.476C561.959 689.476 561.57 689.655 561.297 690.015C561.027 690.37 560.893 690.882 560.893 691.55V695.259H559.814V688.696H560.893V689.681C561.084 689.306 561.344 689.023 561.672 688.831C562 688.636 562.389 688.538 562.838 688.538C563.506 688.538 564.004 688.759 564.332 689.2C564.664 689.638 564.83 690.302 564.83 691.193ZM133.926 706.72H136.686V712.421H138.824V713.259H133.469V712.421H135.607V707.558H133.926V706.72ZM135.607 704.171H136.686V705.53H135.607V704.171ZM143.266 707.364C143.398 707.083 143.566 706.876 143.77 706.743C143.977 706.607 144.225 706.538 144.514 706.538C145.041 706.538 145.412 706.743 145.627 707.153C145.846 707.56 145.955 708.327 145.955 709.456V713.259H144.971V709.503C144.971 708.577 144.918 708.003 144.812 707.78C144.711 707.554 144.523 707.441 144.25 707.441C143.938 707.441 143.723 707.562 143.605 707.804C143.492 708.042 143.436 708.609 143.436 709.503V713.259H142.451V709.503C142.451 708.566 142.395 707.987 142.281 707.769C142.172 707.55 141.973 707.441 141.684 707.441C141.398 707.441 141.199 707.562 141.086 707.804C140.977 708.042 140.922 708.609 140.922 709.503V713.259H139.943V706.696H140.922V707.259C141.051 707.025 141.211 706.847 141.402 706.726C141.598 706.601 141.818 706.538 142.064 706.538C142.361 706.538 142.607 706.607 142.803 706.743C143.002 706.88 143.156 707.087 143.266 707.364ZM150.648 709.96H150.291C149.662 709.96 149.188 710.071 148.867 710.294C148.551 710.513 148.393 710.841 148.393 711.278C148.393 711.673 148.512 711.98 148.75 712.198C148.988 712.417 149.318 712.526 149.74 712.526C150.334 712.526 150.801 712.321 151.141 711.911C151.48 711.497 151.652 710.927 151.656 710.2V709.96H150.648ZM152.74 709.515V713.259H151.656V712.286C151.426 712.677 151.135 712.966 150.783 713.153C150.436 713.337 150.012 713.429 149.512 713.429C148.844 713.429 148.311 713.241 147.912 712.866C147.514 712.487 147.314 711.982 147.314 711.349C147.314 710.618 147.559 710.064 148.047 709.685C148.539 709.306 149.26 709.116 150.209 709.116H151.656V708.946C151.652 708.423 151.52 708.044 151.258 707.81C150.996 707.571 150.578 707.452 150.004 707.452C149.637 707.452 149.266 707.505 148.891 707.61C148.516 707.716 148.15 707.87 147.795 708.073V706.995C148.193 706.843 148.574 706.73 148.938 706.655C149.305 706.577 149.66 706.538 150.004 706.538C150.547 706.538 151.01 706.618 151.393 706.778C151.779 706.939 152.092 707.179 152.33 707.499C152.479 707.694 152.584 707.937 152.646 708.226C152.709 708.511 152.74 708.941 152.74 709.515ZM158.793 709.925C158.793 709.116 158.66 708.503 158.395 708.085C158.133 707.663 157.75 707.452 157.246 707.452C156.719 707.452 156.316 707.663 156.039 708.085C155.762 708.503 155.623 709.116 155.623 709.925C155.623 710.734 155.762 711.351 156.039 711.776C156.32 712.198 156.727 712.409 157.258 712.409C157.754 712.409 158.133 712.196 158.395 711.771C158.66 711.345 158.793 710.73 158.793 709.925ZM159.871 712.837C159.871 713.821 159.639 714.568 159.174 715.075C158.709 715.583 158.025 715.837 157.123 715.837C156.826 715.837 156.516 715.81 156.191 715.755C155.867 715.7 155.543 715.62 155.219 715.515V714.448C155.602 714.628 155.949 714.761 156.262 714.847C156.574 714.933 156.861 714.976 157.123 714.976C157.705 714.976 158.129 714.818 158.395 714.501C158.66 714.185 158.793 713.683 158.793 712.995V712.948V712.216C158.621 712.583 158.387 712.857 158.09 713.036C157.793 713.216 157.432 713.306 157.006 713.306C156.24 713.306 155.629 712.999 155.172 712.386C154.715 711.773 154.486 710.952 154.486 709.925C154.486 708.894 154.715 708.071 155.172 707.458C155.629 706.845 156.24 706.538 157.006 706.538C157.428 706.538 157.785 706.622 158.078 706.79C158.371 706.958 158.609 707.218 158.793 707.569V706.72H159.871V712.837ZM167.559 709.439V709.966H162.889V710.001C162.857 710.896 163.027 711.538 163.398 711.929C163.773 712.319 164.301 712.515 164.98 712.515C165.324 712.515 165.684 712.46 166.059 712.351C166.434 712.241 166.834 712.075 167.26 711.853V712.925C166.85 713.093 166.453 713.218 166.07 713.3C165.691 713.386 165.324 713.429 164.969 713.429C163.949 713.429 163.152 713.124 162.578 712.515C162.004 711.901 161.717 711.058 161.717 709.984C161.717 708.937 161.998 708.101 162.561 707.476C163.123 706.851 163.873 706.538 164.811 706.538C165.646 706.538 166.305 706.821 166.785 707.388C167.27 707.954 167.527 708.638 167.559 709.439ZM166.48 709.122C166.434 708.669 166.268 708.278 165.982 707.95C165.701 707.618 165.295 707.452 164.764 707.452C164.244 707.452 163.816 707.624 163.48 707.968C163.145 708.312 162.961 708.698 162.93 709.128L166.48 709.122ZM173.928 706.925V707.98C173.619 707.8 173.309 707.665 172.996 707.575C172.684 707.485 172.365 707.441 172.041 707.441C171.553 707.441 171.188 707.521 170.945 707.681C170.707 707.837 170.588 708.077 170.588 708.401C170.588 708.694 170.678 708.913 170.857 709.058C171.037 709.202 171.484 709.343 172.199 709.48L172.633 709.562C173.168 709.663 173.572 709.866 173.846 710.171C174.123 710.476 174.262 710.872 174.262 711.36C174.262 712.009 174.031 712.517 173.57 712.884C173.109 713.247 172.469 713.429 171.648 713.429C171.324 713.429 170.984 713.394 170.629 713.323C170.273 713.257 169.889 713.155 169.475 713.019V711.905C169.877 712.112 170.262 712.269 170.629 712.374C170.996 712.476 171.344 712.526 171.672 712.526C172.148 712.526 172.518 712.431 172.779 712.239C173.041 712.044 173.172 711.773 173.172 711.425C173.172 710.925 172.693 710.579 171.736 710.388L171.689 710.376L171.285 710.294C170.664 710.173 170.211 709.97 169.926 709.685C169.641 709.396 169.498 709.003 169.498 708.507C169.498 707.878 169.711 707.394 170.137 707.054C170.562 706.71 171.17 706.538 171.959 706.538C172.311 706.538 172.648 706.571 172.973 706.638C173.297 706.7 173.615 706.796 173.928 706.925ZM220.691 706.72H223.451V712.421H225.59V713.259H220.234V712.421H222.373V707.558H220.691V706.72ZM222.373 704.171H223.451V705.53H222.373V704.171ZM230.031 707.364C230.164 707.083 230.332 706.876 230.535 706.743C230.742 706.607 230.99 706.538 231.279 706.538C231.807 706.538 232.178 706.743 232.393 707.153C232.611 707.56 232.721 708.327 232.721 709.456V713.259H231.736V709.503C231.736 708.577 231.684 708.003 231.578 707.78C231.477 707.554 231.289 707.441 231.016 707.441C230.703 707.441 230.488 707.562 230.371 707.804C230.258 708.042 230.201 708.609 230.201 709.503V713.259H229.217V709.503C229.217 708.566 229.16 707.987 229.047 707.769C228.938 707.55 228.738 707.441 228.449 707.441C228.164 707.441 227.965 707.562 227.852 707.804C227.742 708.042 227.688 708.609 227.688 709.503V713.259H226.709V706.696H227.688V707.259C227.816 707.025 227.977 706.847 228.168 706.726C228.363 706.601 228.584 706.538 228.83 706.538C229.127 706.538 229.373 706.607 229.568 706.743C229.768 706.88 229.922 707.087 230.031 707.364ZM237.414 709.96H237.057C236.428 709.96 235.953 710.071 235.633 710.294C235.316 710.513 235.158 710.841 235.158 711.278C235.158 711.673 235.277 711.98 235.516 712.198C235.754 712.417 236.084 712.526 236.506 712.526C237.1 712.526 237.566 712.321 237.906 711.911C238.246 711.497 238.418 710.927 238.422 710.2V709.96H237.414ZM239.506 709.515V713.259H238.422V712.286C238.191 712.677 237.9 712.966 237.549 713.153C237.201 713.337 236.777 713.429 236.277 713.429C235.609 713.429 235.076 713.241 234.678 712.866C234.279 712.487 234.08 711.982 234.08 711.349C234.08 710.618 234.324 710.064 234.812 709.685C235.305 709.306 236.025 709.116 236.975 709.116H238.422V708.946C238.418 708.423 238.285 708.044 238.023 707.81C237.762 707.571 237.344 707.452 236.77 707.452C236.402 707.452 236.031 707.505 235.656 707.61C235.281 707.716 234.916 707.87 234.561 708.073V706.995C234.959 706.843 235.34 706.73 235.703 706.655C236.07 706.577 236.426 706.538 236.77 706.538C237.312 706.538 237.775 706.618 238.158 706.778C238.545 706.939 238.857 707.179 239.096 707.499C239.244 707.694 239.35 707.937 239.412 708.226C239.475 708.511 239.506 708.941 239.506 709.515ZM245.559 709.925C245.559 709.116 245.426 708.503 245.16 708.085C244.898 707.663 244.516 707.452 244.012 707.452C243.484 707.452 243.082 707.663 242.805 708.085C242.527 708.503 242.389 709.116 242.389 709.925C242.389 710.734 242.527 711.351 242.805 711.776C243.086 712.198 243.492 712.409 244.023 712.409C244.52 712.409 244.898 712.196 245.16 711.771C245.426 711.345 245.559 710.73 245.559 709.925ZM246.637 712.837C246.637 713.821 246.404 714.568 245.939 715.075C245.475 715.583 244.791 715.837 243.889 715.837C243.592 715.837 243.281 715.81 242.957 715.755C242.633 715.7 242.309 715.62 241.984 715.515V714.448C242.367 714.628 242.715 714.761 243.027 714.847C243.34 714.933 243.627 714.976 243.889 714.976C244.471 714.976 244.895 714.818 245.16 714.501C245.426 714.185 245.559 713.683 245.559 712.995V712.948V712.216C245.387 712.583 245.152 712.857 244.855 713.036C244.559 713.216 244.197 713.306 243.771 713.306C243.006 713.306 242.395 712.999 241.938 712.386C241.48 711.773 241.252 710.952 241.252 709.925C241.252 708.894 241.48 708.071 241.938 707.458C242.395 706.845 243.006 706.538 243.771 706.538C244.193 706.538 244.551 706.622 244.844 706.79C245.137 706.958 245.375 707.218 245.559 707.569V706.72H246.637V712.837ZM254.324 709.439V709.966H249.654V710.001C249.623 710.896 249.793 711.538 250.164 711.929C250.539 712.319 251.066 712.515 251.746 712.515C252.09 712.515 252.449 712.46 252.824 712.351C253.199 712.241 253.6 712.075 254.025 711.853V712.925C253.615 713.093 253.219 713.218 252.836 713.3C252.457 713.386 252.09 713.429 251.734 713.429C250.715 713.429 249.918 713.124 249.344 712.515C248.77 711.901 248.482 711.058 248.482 709.984C248.482 708.937 248.764 708.101 249.326 707.476C249.889 706.851 250.639 706.538 251.576 706.538C252.412 706.538 253.07 706.821 253.551 707.388C254.035 707.954 254.293 708.638 254.324 709.439ZM253.246 709.122C253.199 708.669 253.033 708.278 252.748 707.95C252.467 707.618 252.061 707.452 251.529 707.452C251.01 707.452 250.582 707.624 250.246 707.968C249.91 708.312 249.727 708.698 249.695 709.128L253.246 709.122ZM271.305 706.72H274.064V712.421H276.203V713.259H270.848V712.421H272.986V707.558H271.305V706.72ZM272.986 704.171H274.064V705.53H272.986V704.171ZM282.842 709.193V713.259H281.758V709.193C281.758 708.603 281.654 708.169 281.447 707.892C281.24 707.614 280.916 707.476 280.475 707.476C279.971 707.476 279.582 707.655 279.309 708.015C279.039 708.37 278.904 708.882 278.904 709.55V713.259H277.826V706.696H278.904V707.681C279.096 707.306 279.355 707.023 279.684 706.831C280.012 706.636 280.4 706.538 280.85 706.538C281.518 706.538 282.016 706.759 282.344 707.2C282.676 707.638 282.842 708.302 282.842 709.193ZM288.941 707.534V704.142H290.02V713.259H288.941V712.433C288.762 712.757 288.521 713.005 288.221 713.177C287.924 713.345 287.58 713.429 287.189 713.429C286.396 713.429 285.771 713.122 285.314 712.509C284.861 711.892 284.635 711.042 284.635 709.96C284.635 708.894 284.863 708.058 285.32 707.452C285.777 706.843 286.4 706.538 287.189 706.538C287.584 706.538 287.932 706.624 288.232 706.796C288.533 706.964 288.77 707.21 288.941 707.534ZM285.771 709.984C285.771 710.819 285.904 711.45 286.17 711.876C286.436 712.302 286.828 712.515 287.348 712.515C287.867 712.515 288.262 712.3 288.531 711.87C288.805 711.441 288.941 710.812 288.941 709.984C288.941 709.151 288.805 708.523 288.531 708.097C288.262 707.667 287.867 707.452 287.348 707.452C286.828 707.452 286.436 707.665 286.17 708.091C285.904 708.517 285.771 709.148 285.771 709.984ZM297.707 709.439V709.966H293.037V710.001C293.006 710.896 293.176 711.538 293.547 711.929C293.922 712.319 294.449 712.515 295.129 712.515C295.473 712.515 295.832 712.46 296.207 712.351C296.582 712.241 296.982 712.075 297.408 711.853V712.925C296.998 713.093 296.602 713.218 296.219 713.3C295.84 713.386 295.473 713.429 295.117 713.429C294.098 713.429 293.301 713.124 292.727 712.515C292.152 711.901 291.865 711.058 291.865 709.984C291.865 708.937 292.146 708.101 292.709 707.476C293.271 706.851 294.021 706.538 294.959 706.538C295.795 706.538 296.453 706.821 296.934 707.388C297.418 707.954 297.676 708.638 297.707 709.439ZM296.629 709.122C296.582 708.669 296.416 708.278 296.131 707.95C295.85 707.618 295.443 707.452 294.912 707.452C294.393 707.452 293.965 707.624 293.629 707.968C293.293 708.312 293.109 708.698 293.078 709.128L296.629 709.122ZM304.926 706.696L302.576 709.837L305.154 713.259H303.906L301.984 710.628L300.068 713.259H298.82L301.398 709.837L299.049 706.696H300.244L301.984 709.069L303.713 706.696H304.926ZM155.148 740.142H156.262V745.421L159.092 742.696H160.404L157.82 745.169L160.809 749.259H159.49L157.064 745.872L156.262 746.628V749.259H155.148V740.142ZM167.559 745.439V745.966H162.889V746.001C162.857 746.896 163.027 747.538 163.398 747.929C163.773 748.319 164.301 748.515 164.98 748.515C165.324 748.515 165.684 748.46 166.059 748.351C166.434 748.241 166.834 748.075 167.26 747.853V748.925C166.85 749.093 166.453 749.218 166.07 749.3C165.691 749.386 165.324 749.429 164.969 749.429C163.949 749.429 163.152 749.124 162.578 748.515C162.004 747.901 161.717 747.058 161.717 745.984C161.717 744.937 161.998 744.101 162.561 743.476C163.123 742.851 163.873 742.538 164.811 742.538C165.646 742.538 166.305 742.821 166.785 743.388C167.27 743.954 167.527 744.638 167.559 745.439ZM166.48 745.122C166.434 744.669 166.268 744.278 165.982 743.95C165.701 743.618 165.295 743.452 164.764 743.452C164.244 743.452 163.816 743.624 163.48 743.968C163.145 744.312 162.961 744.698 162.93 745.128L166.48 745.122ZM173.254 747.15C173.074 747.607 172.846 748.208 172.568 748.954C172.182 749.985 171.922 750.614 171.789 750.841C171.609 751.146 171.385 751.374 171.115 751.526C170.846 751.679 170.531 751.755 170.172 751.755H169.305V750.853H169.943C170.26 750.853 170.508 750.761 170.688 750.577C170.867 750.394 171.096 749.919 171.373 749.153L168.836 742.696H169.979L171.924 747.829L173.84 742.696H174.982L173.254 747.15ZM191.77 742.72H194.529V748.421H196.668V749.259H191.312V748.421H193.451V743.558H191.77V742.72ZM193.451 740.171H194.529V741.53H193.451V740.171ZM203.307 745.193V749.259H202.223V745.193C202.223 744.603 202.119 744.169 201.912 743.892C201.705 743.614 201.381 743.476 200.939 743.476C200.436 743.476 200.047 743.655 199.773 744.015C199.504 744.37 199.369 744.882 199.369 745.55V749.259H198.291V742.696H199.369V743.681C199.561 743.306 199.82 743.023 200.148 742.831C200.477 742.636 200.865 742.538 201.314 742.538C201.982 742.538 202.48 742.759 202.809 743.2C203.141 743.638 203.307 744.302 203.307 745.193ZM209.406 743.534V740.142H210.484V749.259H209.406V748.433C209.227 748.757 208.986 749.005 208.686 749.177C208.389 749.345 208.045 749.429 207.654 749.429C206.861 749.429 206.236 749.122 205.779 748.509C205.326 747.892 205.1 747.042 205.1 745.96C205.1 744.894 205.328 744.058 205.785 743.452C206.242 742.843 206.865 742.538 207.654 742.538C208.049 742.538 208.396 742.624 208.697 742.796C208.998 742.964 209.234 743.21 209.406 743.534ZM206.236 745.984C206.236 746.819 206.369 747.45 206.635 747.876C206.9 748.302 207.293 748.515 207.812 748.515C208.332 748.515 208.727 748.3 208.996 747.87C209.27 747.441 209.406 746.812 209.406 745.984C209.406 745.151 209.27 744.523 208.996 744.097C208.727 743.667 208.332 743.452 207.812 743.452C207.293 743.452 206.9 743.665 206.635 744.091C206.369 744.517 206.236 745.148 206.236 745.984ZM218.172 745.439V745.966H213.502V746.001C213.471 746.896 213.641 747.538 214.012 747.929C214.387 748.319 214.914 748.515 215.594 748.515C215.938 748.515 216.297 748.46 216.672 748.351C217.047 748.241 217.447 748.075 217.873 747.853V748.925C217.463 749.093 217.066 749.218 216.684 749.3C216.305 749.386 215.938 749.429 215.582 749.429C214.562 749.429 213.766 749.124 213.191 748.515C212.617 747.901 212.33 747.058 212.33 745.984C212.33 744.937 212.611 744.101 213.174 743.476C213.736 742.851 214.486 742.538 215.424 742.538C216.26 742.538 216.918 742.821 217.398 743.388C217.883 743.954 218.141 744.638 218.172 745.439ZM217.094 745.122C217.047 744.669 216.881 744.278 216.596 743.95C216.314 743.618 215.908 743.452 215.377 743.452C214.857 743.452 214.43 743.624 214.094 743.968C213.758 744.312 213.574 744.698 213.543 745.128L217.094 745.122ZM225.391 742.696L223.041 745.837L225.619 749.259H224.371L222.449 746.628L220.533 749.259H219.285L221.863 745.837L219.514 742.696H220.709L222.449 745.069L224.178 742.696H225.391ZM159.467 760.925V761.98C159.158 761.8 158.848 761.665 158.535 761.575C158.223 761.485 157.904 761.441 157.58 761.441C157.092 761.441 156.727 761.521 156.484 761.681C156.246 761.837 156.127 762.077 156.127 762.401C156.127 762.694 156.217 762.913 156.396 763.058C156.576 763.202 157.023 763.343 157.738 763.48L158.172 763.562C158.707 763.663 159.111 763.866 159.385 764.171C159.662 764.476 159.801 764.872 159.801 765.36C159.801 766.009 159.57 766.517 159.109 766.884C158.648 767.247 158.008 767.429 157.188 767.429C156.863 767.429 156.523 767.394 156.168 767.323C155.812 767.257 155.428 767.155 155.014 767.019V765.905C155.416 766.112 155.801 766.269 156.168 766.374C156.535 766.476 156.883 766.526 157.211 766.526C157.688 766.526 158.057 766.431 158.318 766.239C158.58 766.044 158.711 765.773 158.711 765.425C158.711 764.925 158.232 764.579 157.275 764.388L157.229 764.376L156.824 764.294C156.203 764.173 155.75 763.97 155.465 763.685C155.18 763.396 155.037 763.003 155.037 762.507C155.037 761.878 155.25 761.394 155.676 761.054C156.102 760.71 156.709 760.538 157.498 760.538C157.85 760.538 158.188 760.571 158.512 760.638C158.836 760.7 159.154 760.796 159.467 760.925ZM167.764 762.05C167.533 761.87 167.299 761.739 167.061 761.657C166.822 761.575 166.561 761.534 166.275 761.534C165.604 761.534 165.09 761.745 164.734 762.167C164.379 762.589 164.201 763.198 164.201 763.995V767.259H163.117V760.696H164.201V761.98C164.381 761.515 164.656 761.159 165.027 760.913C165.402 760.663 165.846 760.538 166.357 760.538C166.623 760.538 166.871 760.571 167.102 760.638C167.332 760.704 167.553 760.808 167.764 760.948V762.05ZM174.443 766.925C174.154 767.093 173.855 767.218 173.547 767.3C173.242 767.386 172.93 767.429 172.609 767.429C171.594 767.429 170.799 767.124 170.225 766.515C169.654 765.905 169.369 765.062 169.369 763.984C169.369 762.905 169.654 762.062 170.225 761.452C170.799 760.843 171.594 760.538 172.609 760.538C172.926 760.538 173.234 760.579 173.535 760.661C173.836 760.743 174.139 760.87 174.443 761.042V762.173C174.158 761.919 173.871 761.735 173.582 761.622C173.297 761.509 172.973 761.452 172.609 761.452C171.934 761.452 171.414 761.671 171.051 762.109C170.688 762.546 170.506 763.171 170.506 763.984C170.506 764.792 170.688 765.417 171.051 765.859C171.418 766.296 171.938 766.515 172.609 766.515C172.984 766.515 173.32 766.458 173.617 766.345C173.914 766.228 174.189 766.048 174.443 765.806V766.925ZM191.77 760.72H194.529V766.421H196.668V767.259H191.312V766.421H193.451V761.558H191.77V760.72ZM193.451 758.171H194.529V759.53H193.451V758.171ZM201.109 761.364C201.242 761.083 201.41 760.876 201.613 760.743C201.82 760.607 202.068 760.538 202.357 760.538C202.885 760.538 203.256 760.743 203.471 761.153C203.689 761.56 203.799 762.327 203.799 763.456V767.259H202.814V763.503C202.814 762.577 202.762 762.003 202.656 761.78C202.555 761.554 202.367 761.441 202.094 761.441C201.781 761.441 201.566 761.562 201.449 761.804C201.336 762.042 201.279 762.609 201.279 763.503V767.259H200.295V763.503C200.295 762.566 200.238 761.987 200.125 761.769C200.016 761.55 199.816 761.441 199.527 761.441C199.242 761.441 199.043 761.562 198.93 761.804C198.82 762.042 198.766 762.609 198.766 763.503V767.259H197.787V760.696H198.766V761.259C198.895 761.025 199.055 760.847 199.246 760.726C199.441 760.601 199.662 760.538 199.908 760.538C200.205 760.538 200.451 760.607 200.646 760.743C200.846 760.88 201 761.087 201.109 761.364ZM208.492 763.96H208.135C207.506 763.96 207.031 764.071 206.711 764.294C206.395 764.513 206.236 764.841 206.236 765.278C206.236 765.673 206.355 765.98 206.594 766.198C206.832 766.417 207.162 766.526 207.584 766.526C208.178 766.526 208.645 766.321 208.984 765.911C209.324 765.497 209.496 764.927 209.5 764.2V763.96H208.492ZM210.584 763.515V767.259H209.5V766.286C209.27 766.677 208.979 766.966 208.627 767.153C208.279 767.337 207.855 767.429 207.355 767.429C206.688 767.429 206.154 767.241 205.756 766.866C205.357 766.487 205.158 765.982 205.158 765.349C205.158 764.618 205.402 764.064 205.891 763.685C206.383 763.306 207.104 763.116 208.053 763.116H209.5V762.946C209.496 762.423 209.363 762.044 209.102 761.81C208.84 761.571 208.422 761.452 207.848 761.452C207.48 761.452 207.109 761.505 206.734 761.61C206.359 761.716 205.994 761.87 205.639 762.073V760.995C206.037 760.843 206.418 760.73 206.781 760.655C207.148 760.577 207.504 760.538 207.848 760.538C208.391 760.538 208.854 760.618 209.236 760.778C209.623 760.939 209.936 761.179 210.174 761.499C210.322 761.694 210.428 761.937 210.49 762.226C210.553 762.511 210.584 762.941 210.584 763.515ZM216.637 763.925C216.637 763.116 216.504 762.503 216.238 762.085C215.977 761.663 215.594 761.452 215.09 761.452C214.562 761.452 214.16 761.663 213.883 762.085C213.605 762.503 213.467 763.116 213.467 763.925C213.467 764.734 213.605 765.351 213.883 765.776C214.164 766.198 214.57 766.409 215.102 766.409C215.598 766.409 215.977 766.196 216.238 765.771C216.504 765.345 216.637 764.73 216.637 763.925ZM217.715 766.837C217.715 767.821 217.482 768.568 217.018 769.075C216.553 769.583 215.869 769.837 214.967 769.837C214.67 769.837 214.359 769.81 214.035 769.755C213.711 769.7 213.387 769.62 213.062 769.515V768.448C213.445 768.628 213.793 768.761 214.105 768.847C214.418 768.933 214.705 768.976 214.967 768.976C215.549 768.976 215.973 768.818 216.238 768.501C216.504 768.185 216.637 767.683 216.637 766.995V766.948V766.216C216.465 766.583 216.23 766.857 215.934 767.036C215.637 767.216 215.275 767.306 214.85 767.306C214.084 767.306 213.473 766.999 213.016 766.386C212.559 765.773 212.33 764.952 212.33 763.925C212.33 762.894 212.559 762.071 213.016 761.458C213.473 760.845 214.084 760.538 214.85 760.538C215.271 760.538 215.629 760.622 215.922 760.79C216.215 760.958 216.453 761.218 216.637 761.569V760.72H217.715V766.837ZM225.402 763.439V763.966H220.732V764.001C220.701 764.896 220.871 765.538 221.242 765.929C221.617 766.319 222.145 766.515 222.824 766.515C223.168 766.515 223.527 766.46 223.902 766.351C224.277 766.241 224.678 766.075 225.104 765.853V766.925C224.693 767.093 224.297 767.218 223.914 767.3C223.535 767.386 223.168 767.429 222.812 767.429C221.793 767.429 220.996 767.124 220.422 766.515C219.848 765.901 219.561 765.058 219.561 763.984C219.561 762.937 219.842 762.101 220.404 761.476C220.967 760.851 221.717 760.538 222.654 760.538C223.49 760.538 224.148 760.821 224.629 761.388C225.113 761.954 225.371 762.638 225.402 763.439ZM224.324 763.122C224.277 762.669 224.111 762.278 223.826 761.95C223.545 761.618 223.139 761.452 222.607 761.452C222.088 761.452 221.66 761.624 221.324 761.968C220.988 762.312 220.805 762.698 220.773 763.128L224.324 763.122ZM157.879 781.96H157.521C156.893 781.96 156.418 782.071 156.098 782.294C155.781 782.513 155.623 782.841 155.623 783.278C155.623 783.673 155.742 783.98 155.98 784.198C156.219 784.417 156.549 784.526 156.971 784.526C157.564 784.526 158.031 784.321 158.371 783.911C158.711 783.497 158.883 782.927 158.887 782.2V781.96H157.879ZM159.971 781.515V785.259H158.887V784.286C158.656 784.677 158.365 784.966 158.014 785.153C157.666 785.337 157.242 785.429 156.742 785.429C156.074 785.429 155.541 785.241 155.143 784.866C154.744 784.487 154.545 783.982 154.545 783.349C154.545 782.618 154.789 782.064 155.277 781.685C155.77 781.306 156.49 781.116 157.439 781.116H158.887V780.946C158.883 780.423 158.75 780.044 158.488 779.81C158.227 779.571 157.809 779.452 157.234 779.452C156.867 779.452 156.496 779.505 156.121 779.61C155.746 779.716 155.381 779.87 155.025 780.073V778.995C155.424 778.843 155.805 778.73 156.168 778.655C156.535 778.577 156.891 778.538 157.234 778.538C157.777 778.538 158.24 778.618 158.623 778.778C159.01 778.939 159.322 779.179 159.561 779.499C159.709 779.694 159.814 779.937 159.877 780.226C159.939 780.511 159.971 780.941 159.971 781.515ZM165.209 782.886C165.209 783.37 165.297 783.735 165.473 783.982C165.652 784.228 165.916 784.351 166.264 784.351H167.523V785.259H166.158C165.514 785.259 165.014 785.054 164.658 784.644C164.307 784.23 164.131 783.644 164.131 782.886V776.95H162.402V776.107H165.209V782.886ZM171.824 776.833V778.696H174.273V779.534H171.824V783.097C171.824 783.581 171.916 783.919 172.1 784.11C172.283 784.302 172.604 784.398 173.061 784.398H174.273V785.259H172.955C172.146 785.259 171.576 785.097 171.244 784.773C170.912 784.448 170.746 783.89 170.746 783.097V779.534H168.994V778.696H170.746V776.833H171.824ZM193.516 776.833V778.696H195.965V779.534H193.516V783.097C193.516 783.581 193.607 783.919 193.791 784.11C193.975 784.302 194.295 784.398 194.752 784.398H195.965V785.259H194.646C193.838 785.259 193.268 785.097 192.936 784.773C192.604 784.448 192.438 783.89 192.438 783.097V779.534H190.686V778.696H192.438V776.833H193.516ZM199 778.72H201.76V784.421H203.898V785.259H198.543V784.421H200.682V779.558H199V778.72ZM200.682 776.171H201.76V777.53H200.682V776.171ZM207.977 776.833V778.696H210.426V779.534H207.977V783.097C207.977 783.581 208.068 783.919 208.252 784.11C208.436 784.302 208.756 784.398 209.213 784.398H210.426V785.259H209.107C208.299 785.259 207.729 785.097 207.396 784.773C207.064 784.448 206.898 783.89 206.898 783.097V779.534H205.146V778.696H206.898V776.833H207.977ZM215.822 782.886C215.822 783.37 215.91 783.735 216.086 783.982C216.266 784.228 216.529 784.351 216.877 784.351H218.137V785.259H216.771C216.127 785.259 215.627 785.054 215.271 784.644C214.92 784.23 214.744 783.644 214.744 782.886V776.95H213.016V776.107H215.822V782.886ZM225.402 781.439V781.966H220.732V782.001C220.701 782.896 220.871 783.538 221.242 783.929C221.617 784.319 222.145 784.515 222.824 784.515C223.168 784.515 223.527 784.46 223.902 784.351C224.277 784.241 224.678 784.075 225.104 783.853V784.925C224.693 785.093 224.297 785.218 223.914 785.3C223.535 785.386 223.168 785.429 222.812 785.429C221.793 785.429 220.996 785.124 220.422 784.515C219.848 783.901 219.561 783.058 219.561 781.984C219.561 780.937 219.842 780.101 220.404 779.476C220.967 778.851 221.717 778.538 222.654 778.538C223.49 778.538 224.148 778.821 224.629 779.388C225.113 779.954 225.371 780.638 225.402 781.439ZM224.324 781.122C224.277 780.669 224.111 780.278 223.826 779.95C223.545 779.618 223.139 779.452 222.607 779.452C222.088 779.452 221.66 779.624 221.324 779.968C220.988 780.312 220.805 780.698 220.773 781.128L224.324 781.122ZM153.766 796.696H154.832L155.975 801.999L156.912 798.612H157.832L158.781 801.999L159.924 796.696H160.99L159.455 803.259H158.424L157.375 799.661L156.332 803.259H155.301L153.766 796.696ZM162.848 796.72H165.607V802.421H167.746V803.259H162.391V802.421H164.529V797.558H162.848V796.72ZM164.529 794.171H165.607V795.53H164.529V794.171ZM173.254 797.534V794.142H174.332V803.259H173.254V802.433C173.074 802.757 172.834 803.005 172.533 803.177C172.236 803.345 171.893 803.429 171.502 803.429C170.709 803.429 170.084 803.122 169.627 802.509C169.174 801.892 168.947 801.042 168.947 799.96C168.947 798.894 169.176 798.058 169.633 797.452C170.09 796.843 170.713 796.538 171.502 796.538C171.896 796.538 172.244 796.624 172.545 796.796C172.846 796.964 173.082 797.21 173.254 797.534ZM170.084 799.984C170.084 800.819 170.217 801.45 170.482 801.876C170.748 802.302 171.141 802.515 171.66 802.515C172.18 802.515 172.574 802.3 172.844 801.87C173.117 801.441 173.254 800.812 173.254 799.984C173.254 799.151 173.117 798.523 172.844 798.097C172.574 797.667 172.18 797.452 171.66 797.452C171.141 797.452 170.748 797.665 170.482 798.091C170.217 798.517 170.084 799.148 170.084 799.984ZM179.055 794.833V796.696H181.504V797.534H179.055V801.097C179.055 801.581 179.146 801.919 179.33 802.11C179.514 802.302 179.834 802.398 180.291 802.398H181.504V803.259H180.186C179.377 803.259 178.807 803.097 178.475 802.773C178.143 802.448 177.977 801.89 177.977 801.097V797.534H176.225V796.696H177.977V794.833H179.055ZM188.846 799.193V803.259H187.762V799.193C187.762 798.603 187.658 798.169 187.451 797.892C187.244 797.614 186.92 797.476 186.479 797.476C185.975 797.476 185.586 797.655 185.312 798.015C185.043 798.37 184.908 798.882 184.908 799.55V803.259H183.83V794.142H184.908V797.681C185.1 797.306 185.359 797.023 185.688 796.831C186.016 796.636 186.404 796.538 186.854 796.538C187.521 796.538 188.02 796.759 188.348 797.2C188.68 797.638 188.846 798.302 188.846 799.193ZM159.924 817.193V821.259H158.84V817.193C158.84 816.603 158.736 816.169 158.529 815.892C158.322 815.614 157.998 815.476 157.557 815.476C157.053 815.476 156.664 815.655 156.391 816.015C156.121 816.37 155.986 816.882 155.986 817.55V821.259H154.908V812.142H155.986V815.681C156.178 815.306 156.438 815.023 156.766 814.831C157.094 814.636 157.482 814.538 157.932 814.538C158.6 814.538 159.098 814.759 159.426 815.2C159.758 815.638 159.924 816.302 159.924 817.193ZM167.559 817.439V817.966H162.889V818.001C162.857 818.896 163.027 819.538 163.398 819.929C163.773 820.319 164.301 820.515 164.98 820.515C165.324 820.515 165.684 820.46 166.059 820.351C166.434 820.241 166.834 820.075 167.26 819.853V820.925C166.85 821.093 166.453 821.218 166.07 821.3C165.691 821.386 165.324 821.429 164.969 821.429C163.949 821.429 163.152 821.124 162.578 820.515C162.004 819.901 161.717 819.058 161.717 817.984C161.717 816.937 161.998 816.101 162.561 815.476C163.123 814.851 163.873 814.538 164.811 814.538C165.646 814.538 166.305 814.821 166.785 815.388C167.27 815.954 167.527 816.638 167.559 817.439ZM166.48 817.122C166.434 816.669 166.268 816.278 165.982 815.95C165.701 815.618 165.295 815.452 164.764 815.452C164.244 815.452 163.816 815.624 163.48 815.968C163.145 816.312 162.961 816.698 162.93 817.128L166.48 817.122ZM170.078 814.72H172.838V820.421H174.977V821.259H169.621V820.421H171.76V815.558H170.078V814.72ZM171.76 812.171H172.838V813.53H171.76V812.171ZM180.484 817.925C180.484 817.116 180.352 816.503 180.086 816.085C179.824 815.663 179.441 815.452 178.938 815.452C178.41 815.452 178.008 815.663 177.73 816.085C177.453 816.503 177.314 817.116 177.314 817.925C177.314 818.734 177.453 819.351 177.73 819.776C178.012 820.198 178.418 820.409 178.949 820.409C179.445 820.409 179.824 820.196 180.086 819.771C180.352 819.345 180.484 818.73 180.484 817.925ZM181.562 820.837C181.562 821.821 181.33 822.568 180.865 823.075C180.4 823.583 179.717 823.837 178.814 823.837C178.518 823.837 178.207 823.81 177.883 823.755C177.559 823.7 177.234 823.62 176.91 823.515V822.448C177.293 822.628 177.641 822.761 177.953 822.847C178.266 822.933 178.553 822.976 178.814 822.976C179.396 822.976 179.82 822.818 180.086 822.501C180.352 822.185 180.484 821.683 180.484 820.995V820.948V820.216C180.312 820.583 180.078 820.857 179.781 821.036C179.484 821.216 179.123 821.306 178.697 821.306C177.932 821.306 177.32 820.999 176.863 820.386C176.406 819.773 176.178 818.952 176.178 817.925C176.178 816.894 176.406 816.071 176.863 815.458C177.32 814.845 177.932 814.538 178.697 814.538C179.119 814.538 179.477 814.622 179.77 814.79C180.062 814.958 180.301 815.218 180.484 815.569V814.72H181.562V820.837ZM188.846 817.193V821.259H187.762V817.193C187.762 816.603 187.658 816.169 187.451 815.892C187.244 815.614 186.92 815.476 186.479 815.476C185.975 815.476 185.586 815.655 185.312 816.015C185.043 816.37 184.908 816.882 184.908 817.55V821.259H183.83V812.142H184.908V815.681C185.1 815.306 185.359 815.023 185.688 814.831C186.016 814.636 186.404 814.538 186.854 814.538C187.521 814.538 188.02 814.759 188.348 815.2C188.68 815.638 188.846 816.302 188.846 817.193ZM193.516 812.833V814.696H195.965V815.534H193.516V819.097C193.516 819.581 193.607 819.919 193.791 820.11C193.975 820.302 194.295 820.398 194.752 820.398H195.965V821.259H194.646C193.838 821.259 193.268 821.097 192.936 820.773C192.604 820.448 192.438 819.89 192.438 819.097V815.534H190.686V814.696H192.438V812.833H193.516ZM159.982 838.925C159.693 839.093 159.395 839.218 159.086 839.3C158.781 839.386 158.469 839.429 158.148 839.429C157.133 839.429 156.338 839.124 155.764 838.515C155.193 837.905 154.908 837.062 154.908 835.984C154.908 834.905 155.193 834.062 155.764 833.452C156.338 832.843 157.133 832.538 158.148 832.538C158.465 832.538 158.773 832.579 159.074 832.661C159.375 832.743 159.678 832.87 159.982 833.042V834.173C159.697 833.919 159.41 833.735 159.121 833.622C158.836 833.509 158.512 833.452 158.148 833.452C157.473 833.452 156.953 833.671 156.59 834.109C156.227 834.546 156.045 835.171 156.045 835.984C156.045 836.792 156.227 837.417 156.59 837.859C156.957 838.296 157.477 838.515 158.148 838.515C158.523 838.515 158.859 838.458 159.156 838.345C159.453 838.228 159.729 838.048 159.982 837.806V838.925ZM165.209 836.886C165.209 837.37 165.297 837.735 165.473 837.982C165.652 838.228 165.916 838.351 166.264 838.351H167.523V839.259H166.158C165.514 839.259 165.014 839.054 164.658 838.644C164.307 838.23 164.131 837.644 164.131 836.886V830.95H162.402V830.107H165.209V836.886ZM172.34 835.96H171.982C171.354 835.96 170.879 836.071 170.559 836.294C170.242 836.513 170.084 836.841 170.084 837.278C170.084 837.673 170.203 837.98 170.441 838.198C170.68 838.417 171.01 838.526 171.432 838.526C172.025 838.526 172.492 838.321 172.832 837.911C173.172 837.497 173.344 836.927 173.348 836.2V835.96H172.34ZM174.432 835.515V839.259H173.348V838.286C173.117 838.677 172.826 838.966 172.475 839.153C172.127 839.337 171.703 839.429 171.203 839.429C170.535 839.429 170.002 839.241 169.604 838.866C169.205 838.487 169.006 837.982 169.006 837.349C169.006 836.618 169.25 836.064 169.738 835.685C170.23 835.306 170.951 835.116 171.9 835.116H173.348V834.946C173.344 834.423 173.211 834.044 172.949 833.81C172.688 833.571 172.27 833.452 171.695 833.452C171.328 833.452 170.957 833.505 170.582 833.61C170.207 833.716 169.842 833.87 169.486 834.073V832.995C169.885 832.843 170.266 832.73 170.629 832.655C170.996 832.577 171.352 832.538 171.695 832.538C172.238 832.538 172.701 832.618 173.084 832.778C173.471 832.939 173.783 833.179 174.021 833.499C174.17 833.694 174.275 833.937 174.338 834.226C174.4 834.511 174.432 834.941 174.432 835.515ZM181.158 832.925V833.98C180.85 833.8 180.539 833.665 180.227 833.575C179.914 833.485 179.596 833.441 179.271 833.441C178.783 833.441 178.418 833.521 178.176 833.681C177.938 833.837 177.818 834.077 177.818 834.401C177.818 834.694 177.908 834.913 178.088 835.058C178.268 835.202 178.715 835.343 179.43 835.48L179.863 835.562C180.398 835.663 180.803 835.866 181.076 836.171C181.354 836.476 181.492 836.872 181.492 837.36C181.492 838.009 181.262 838.517 180.801 838.884C180.34 839.247 179.699 839.429 178.879 839.429C178.555 839.429 178.215 839.394 177.859 839.323C177.504 839.257 177.119 839.155 176.705 839.019V837.905C177.107 838.112 177.492 838.269 177.859 838.374C178.227 838.476 178.574 838.526 178.902 838.526C179.379 838.526 179.748 838.431 180.01 838.239C180.271 838.044 180.402 837.773 180.402 837.425C180.402 836.925 179.924 836.579 178.967 836.388L178.92 836.376L178.516 836.294C177.895 836.173 177.441 835.97 177.156 835.685C176.871 835.396 176.729 835.003 176.729 834.507C176.729 833.878 176.941 833.394 177.367 833.054C177.793 832.71 178.4 832.538 179.189 832.538C179.541 832.538 179.879 832.571 180.203 832.638C180.527 832.7 180.846 832.796 181.158 832.925ZM188.389 832.925V833.98C188.08 833.8 187.77 833.665 187.457 833.575C187.145 833.485 186.826 833.441 186.502 833.441C186.014 833.441 185.648 833.521 185.406 833.681C185.168 833.837 185.049 834.077 185.049 834.401C185.049 834.694 185.139 834.913 185.318 835.058C185.498 835.202 185.945 835.343 186.66 835.48L187.094 835.562C187.629 835.663 188.033 835.866 188.307 836.171C188.584 836.476 188.723 836.872 188.723 837.36C188.723 838.009 188.492 838.517 188.031 838.884C187.57 839.247 186.93 839.429 186.109 839.429C185.785 839.429 185.445 839.394 185.09 839.323C184.734 839.257 184.35 839.155 183.936 839.019V837.905C184.338 838.112 184.723 838.269 185.09 838.374C185.457 838.476 185.805 838.526 186.133 838.526C186.609 838.526 186.979 838.431 187.24 838.239C187.502 838.044 187.633 837.773 187.633 837.425C187.633 836.925 187.154 836.579 186.197 836.388L186.15 836.376L185.746 836.294C185.125 836.173 184.672 835.97 184.387 835.685C184.102 835.396 183.959 835.003 183.959 834.507C183.959 833.878 184.172 833.394 184.598 833.054C185.023 832.71 185.631 832.538 186.42 832.538C186.771 832.538 187.109 832.571 187.434 832.638C187.758 832.7 188.076 832.796 188.389 832.925ZM190.029 830.54H191.646L195.068 837.718V830.54H196.328V839.259H194.711L191.289 832.081V839.259H190.029V830.54ZM201.262 835.96H200.904C200.275 835.96 199.801 836.071 199.48 836.294C199.164 836.513 199.006 836.841 199.006 837.278C199.006 837.673 199.125 837.98 199.363 838.198C199.602 838.417 199.932 838.526 200.354 838.526C200.947 838.526 201.414 838.321 201.754 837.911C202.094 837.497 202.266 836.927 202.27 836.2V835.96H201.262ZM203.354 835.515V839.259H202.27V838.286C202.039 838.677 201.748 838.966 201.396 839.153C201.049 839.337 200.625 839.429 200.125 839.429C199.457 839.429 198.924 839.241 198.525 838.866C198.127 838.487 197.928 837.982 197.928 837.349C197.928 836.618 198.172 836.064 198.66 835.685C199.152 835.306 199.873 835.116 200.822 835.116H202.27V834.946C202.266 834.423 202.133 834.044 201.871 833.81C201.609 833.571 201.191 833.452 200.617 833.452C200.25 833.452 199.879 833.505 199.504 833.61C199.129 833.716 198.764 833.87 198.408 834.073V832.995C198.807 832.843 199.188 832.73 199.551 832.655C199.918 832.577 200.273 832.538 200.617 832.538C201.16 832.538 201.623 832.618 202.006 832.778C202.393 832.939 202.705 833.179 202.943 833.499C203.092 833.694 203.197 833.937 203.26 834.226C203.322 834.511 203.354 834.941 203.354 835.515ZM208.34 833.364C208.473 833.083 208.641 832.876 208.844 832.743C209.051 832.607 209.299 832.538 209.588 832.538C210.115 832.538 210.486 832.743 210.701 833.153C210.92 833.56 211.029 834.327 211.029 835.456V839.259H210.045V835.503C210.045 834.577 209.992 834.003 209.887 833.78C209.785 833.554 209.598 833.441 209.324 833.441C209.012 833.441 208.797 833.562 208.68 833.804C208.566 834.042 208.51 834.609 208.51 835.503V839.259H207.525V835.503C207.525 834.566 207.469 833.987 207.355 833.769C207.246 833.55 207.047 833.441 206.758 833.441C206.473 833.441 206.273 833.562 206.16 833.804C206.051 834.042 205.996 834.609 205.996 835.503V839.259H205.018V832.696H205.996V833.259C206.125 833.025 206.285 832.847 206.477 832.726C206.672 832.601 206.893 832.538 207.139 832.538C207.436 832.538 207.682 832.607 207.877 832.743C208.076 832.88 208.23 833.087 208.34 833.364ZM218.172 835.439V835.966H213.502V836.001C213.471 836.896 213.641 837.538 214.012 837.929C214.387 838.319 214.914 838.515 215.594 838.515C215.938 838.515 216.297 838.46 216.672 838.351C217.047 838.241 217.447 838.075 217.873 837.853V838.925C217.463 839.093 217.066 839.218 216.684 839.3C216.305 839.386 215.938 839.429 215.582 839.429C214.562 839.429 213.766 839.124 213.191 838.515C212.617 837.901 212.33 837.058 212.33 835.984C212.33 834.937 212.611 834.101 213.174 833.476C213.736 832.851 214.486 832.538 215.424 832.538C216.26 832.538 216.918 832.821 217.398 833.388C217.883 833.954 218.141 834.638 218.172 835.439ZM217.094 835.122C217.047 834.669 216.881 834.278 216.596 833.95C216.314 833.618 215.908 833.452 215.377 833.452C214.857 833.452 214.43 833.624 214.094 833.968C213.758 834.312 213.574 834.698 213.543 835.128L217.094 835.122ZM138.291 1018.92C138.002 1019.09 137.703 1019.22 137.395 1019.3C137.09 1019.39 136.777 1019.43 136.457 1019.43C135.441 1019.43 134.646 1019.12 134.072 1018.51C133.502 1017.91 133.217 1017.06 133.217 1015.98C133.217 1014.91 133.502 1014.06 134.072 1013.45C134.646 1012.84 135.441 1012.54 136.457 1012.54C136.773 1012.54 137.082 1012.58 137.383 1012.66C137.684 1012.74 137.986 1012.87 138.291 1013.04V1014.17C138.006 1013.92 137.719 1013.74 137.43 1013.62C137.145 1013.51 136.82 1013.45 136.457 1013.45C135.781 1013.45 135.262 1013.67 134.898 1014.11C134.535 1014.55 134.354 1015.17 134.354 1015.98C134.354 1016.79 134.535 1017.42 134.898 1017.86C135.266 1018.3 135.785 1018.51 136.457 1018.51C136.832 1018.51 137.168 1018.46 137.465 1018.34C137.762 1018.23 138.037 1018.05 138.291 1017.81V1018.92ZM143.518 1016.89C143.518 1017.37 143.605 1017.74 143.781 1017.98C143.961 1018.23 144.225 1018.35 144.572 1018.35H145.832V1019.26H144.467C143.822 1019.26 143.322 1019.05 142.967 1018.64C142.615 1018.23 142.439 1017.64 142.439 1016.89V1010.95H140.711V1010.11H143.518V1016.89ZM150.648 1015.96H150.291C149.662 1015.96 149.188 1016.07 148.867 1016.29C148.551 1016.51 148.393 1016.84 148.393 1017.28C148.393 1017.67 148.512 1017.98 148.75 1018.2C148.988 1018.42 149.318 1018.53 149.74 1018.53C150.334 1018.53 150.801 1018.32 151.141 1017.91C151.48 1017.5 151.652 1016.93 151.656 1016.2V1015.96H150.648ZM152.74 1015.51V1019.26H151.656V1018.29C151.426 1018.68 151.135 1018.97 150.783 1019.15C150.436 1019.34 150.012 1019.43 149.512 1019.43C148.844 1019.43 148.311 1019.24 147.912 1018.87C147.514 1018.49 147.314 1017.98 147.314 1017.35C147.314 1016.62 147.559 1016.06 148.047 1015.68C148.539 1015.31 149.26 1015.12 150.209 1015.12H151.656V1014.95C151.652 1014.42 151.52 1014.04 151.258 1013.81C150.996 1013.57 150.578 1013.45 150.004 1013.45C149.637 1013.45 149.266 1013.51 148.891 1013.61C148.516 1013.72 148.15 1013.87 147.795 1014.07V1013C148.193 1012.84 148.574 1012.73 148.938 1012.66C149.305 1012.58 149.66 1012.54 150.004 1012.54C150.547 1012.54 151.01 1012.62 151.393 1012.78C151.779 1012.94 152.092 1013.18 152.33 1013.5C152.479 1013.69 152.584 1013.94 152.646 1014.23C152.709 1014.51 152.74 1014.94 152.74 1015.51ZM159.467 1012.92V1013.98C159.158 1013.8 158.848 1013.67 158.535 1013.58C158.223 1013.49 157.904 1013.44 157.58 1013.44C157.092 1013.44 156.727 1013.52 156.484 1013.68C156.246 1013.84 156.127 1014.08 156.127 1014.4C156.127 1014.69 156.217 1014.91 156.396 1015.06C156.576 1015.2 157.023 1015.34 157.738 1015.48L158.172 1015.56C158.707 1015.66 159.111 1015.87 159.385 1016.17C159.662 1016.48 159.801 1016.87 159.801 1017.36C159.801 1018.01 159.57 1018.52 159.109 1018.88C158.648 1019.25 158.008 1019.43 157.188 1019.43C156.863 1019.43 156.523 1019.39 156.168 1019.32C155.812 1019.26 155.428 1019.16 155.014 1019.02V1017.91C155.416 1018.11 155.801 1018.27 156.168 1018.37C156.535 1018.48 156.883 1018.53 157.211 1018.53C157.688 1018.53 158.057 1018.43 158.318 1018.24C158.58 1018.04 158.711 1017.77 158.711 1017.42C158.711 1016.92 158.232 1016.58 157.275 1016.39L157.229 1016.38L156.824 1016.29C156.203 1016.17 155.75 1015.97 155.465 1015.68C155.18 1015.4 155.037 1015 155.037 1014.51C155.037 1013.88 155.25 1013.39 155.676 1013.05C156.102 1012.71 156.709 1012.54 157.498 1012.54C157.85 1012.54 158.188 1012.57 158.512 1012.64C158.836 1012.7 159.154 1012.8 159.467 1012.92ZM166.697 1012.92V1013.98C166.389 1013.8 166.078 1013.67 165.766 1013.58C165.453 1013.49 165.135 1013.44 164.811 1013.44C164.322 1013.44 163.957 1013.52 163.715 1013.68C163.477 1013.84 163.357 1014.08 163.357 1014.4C163.357 1014.69 163.447 1014.91 163.627 1015.06C163.807 1015.2 164.254 1015.34 164.969 1015.48L165.402 1015.56C165.938 1015.66 166.342 1015.87 166.615 1016.17C166.893 1016.48 167.031 1016.87 167.031 1017.36C167.031 1018.01 166.801 1018.52 166.34 1018.88C165.879 1019.25 165.238 1019.43 164.418 1019.43C164.094 1019.43 163.754 1019.39 163.398 1019.32C163.043 1019.26 162.658 1019.16 162.244 1019.02V1017.91C162.646 1018.11 163.031 1018.27 163.398 1018.37C163.766 1018.48 164.113 1018.53 164.441 1018.53C164.918 1018.53 165.287 1018.43 165.549 1018.24C165.811 1018.04 165.941 1017.77 165.941 1017.42C165.941 1016.92 165.463 1016.58 164.506 1016.39L164.459 1016.38L164.055 1016.29C163.434 1016.17 162.98 1015.97 162.695 1015.68C162.41 1015.4 162.268 1015 162.268 1014.51C162.268 1013.88 162.48 1013.39 162.906 1013.05C163.332 1012.71 163.939 1012.54 164.729 1012.54C165.08 1012.54 165.418 1012.57 165.742 1012.64C166.066 1012.7 166.385 1012.8 166.697 1012.92ZM168.338 1010.54H169.955L173.377 1017.72V1010.54H174.637V1019.26H173.02L169.598 1012.08V1019.26H168.338V1010.54ZM179.57 1015.96H179.213C178.584 1015.96 178.109 1016.07 177.789 1016.29C177.473 1016.51 177.314 1016.84 177.314 1017.28C177.314 1017.67 177.434 1017.98 177.672 1018.2C177.91 1018.42 178.24 1018.53 178.662 1018.53C179.256 1018.53 179.723 1018.32 180.062 1017.91C180.402 1017.5 180.574 1016.93 180.578 1016.2V1015.96H179.57ZM181.662 1015.51V1019.26H180.578V1018.29C180.348 1018.68 180.057 1018.97 179.705 1019.15C179.357 1019.34 178.934 1019.43 178.434 1019.43C177.766 1019.43 177.232 1019.24 176.834 1018.87C176.436 1018.49 176.236 1017.98 176.236 1017.35C176.236 1016.62 176.48 1016.06 176.969 1015.68C177.461 1015.31 178.182 1015.12 179.131 1015.12H180.578V1014.95C180.574 1014.42 180.441 1014.04 180.18 1013.81C179.918 1013.57 179.5 1013.45 178.926 1013.45C178.559 1013.45 178.188 1013.51 177.812 1013.61C177.438 1013.72 177.072 1013.87 176.717 1014.07V1013C177.115 1012.84 177.496 1012.73 177.859 1012.66C178.227 1012.58 178.582 1012.54 178.926 1012.54C179.469 1012.54 179.932 1012.62 180.314 1012.78C180.701 1012.94 181.014 1013.18 181.252 1013.5C181.4 1013.69 181.506 1013.94 181.568 1014.23C181.631 1014.51 181.662 1014.94 181.662 1015.51ZM186.648 1013.36C186.781 1013.08 186.949 1012.88 187.152 1012.74C187.359 1012.61 187.607 1012.54 187.896 1012.54C188.424 1012.54 188.795 1012.74 189.01 1013.15C189.229 1013.56 189.338 1014.33 189.338 1015.46V1019.26H188.354V1015.5C188.354 1014.58 188.301 1014 188.195 1013.78C188.094 1013.55 187.906 1013.44 187.633 1013.44C187.32 1013.44 187.105 1013.56 186.988 1013.8C186.875 1014.04 186.818 1014.61 186.818 1015.5V1019.26H185.834V1015.5C185.834 1014.57 185.777 1013.99 185.664 1013.77C185.555 1013.55 185.355 1013.44 185.066 1013.44C184.781 1013.44 184.582 1013.56 184.469 1013.8C184.359 1014.04 184.305 1014.61 184.305 1015.5V1019.26H183.326V1012.7H184.305V1013.26C184.434 1013.02 184.594 1012.85 184.785 1012.73C184.98 1012.6 185.201 1012.54 185.447 1012.54C185.744 1012.54 185.99 1012.61 186.186 1012.74C186.385 1012.88 186.539 1013.09 186.648 1013.36ZM196.48 1015.44V1015.97H191.811V1016C191.779 1016.9 191.949 1017.54 192.32 1017.93C192.695 1018.32 193.223 1018.51 193.902 1018.51C194.246 1018.51 194.605 1018.46 194.98 1018.35C195.355 1018.24 195.756 1018.08 196.182 1017.85V1018.92C195.771 1019.09 195.375 1019.22 194.992 1019.3C194.613 1019.39 194.246 1019.43 193.891 1019.43C192.871 1019.43 192.074 1019.12 191.5 1018.51C190.926 1017.9 190.639 1017.06 190.639 1015.98C190.639 1014.94 190.92 1014.1 191.482 1013.48C192.045 1012.85 192.795 1012.54 193.732 1012.54C194.568 1012.54 195.227 1012.82 195.707 1013.39C196.191 1013.95 196.449 1014.64 196.48 1015.44ZM195.402 1015.12C195.355 1014.67 195.189 1014.28 194.904 1013.95C194.623 1013.62 194.217 1013.45 193.686 1013.45C193.166 1013.45 192.738 1013.62 192.402 1013.97C192.066 1014.31 191.883 1014.7 191.852 1015.13L195.402 1015.12ZM145.521 1036.92C145.232 1037.09 144.934 1037.22 144.625 1037.3C144.32 1037.39 144.008 1037.43 143.688 1037.43C142.672 1037.43 141.877 1037.12 141.303 1036.51C140.732 1035.91 140.447 1035.06 140.447 1033.98C140.447 1032.91 140.732 1032.06 141.303 1031.45C141.877 1030.84 142.672 1030.54 143.688 1030.54C144.004 1030.54 144.312 1030.58 144.613 1030.66C144.914 1030.74 145.217 1030.87 145.521 1031.04V1032.17C145.236 1031.92 144.949 1031.74 144.66 1031.62C144.375 1031.51 144.051 1031.45 143.688 1031.45C143.012 1031.45 142.492 1031.67 142.129 1032.11C141.766 1032.55 141.584 1033.17 141.584 1033.98C141.584 1034.79 141.766 1035.42 142.129 1035.86C142.496 1036.3 143.016 1036.51 143.688 1036.51C144.062 1036.51 144.398 1036.46 144.695 1036.34C144.992 1036.23 145.268 1036.05 145.521 1035.81V1036.92ZM150.748 1034.89C150.748 1035.37 150.836 1035.74 151.012 1035.98C151.191 1036.23 151.455 1036.35 151.803 1036.35H153.062V1037.26H151.697C151.053 1037.26 150.553 1037.05 150.197 1036.64C149.846 1036.23 149.67 1035.64 149.67 1034.89V1028.95H147.941V1028.11H150.748V1034.89ZM157.879 1033.96H157.521C156.893 1033.96 156.418 1034.07 156.098 1034.29C155.781 1034.51 155.623 1034.84 155.623 1035.28C155.623 1035.67 155.742 1035.98 155.98 1036.2C156.219 1036.42 156.549 1036.53 156.971 1036.53C157.564 1036.53 158.031 1036.32 158.371 1035.91C158.711 1035.5 158.883 1034.93 158.887 1034.2V1033.96H157.879ZM159.971 1033.51V1037.26H158.887V1036.29C158.656 1036.68 158.365 1036.97 158.014 1037.15C157.666 1037.34 157.242 1037.43 156.742 1037.43C156.074 1037.43 155.541 1037.24 155.143 1036.87C154.744 1036.49 154.545 1035.98 154.545 1035.35C154.545 1034.62 154.789 1034.06 155.277 1033.68C155.77 1033.31 156.49 1033.12 157.439 1033.12H158.887V1032.95C158.883 1032.42 158.75 1032.04 158.488 1031.81C158.227 1031.57 157.809 1031.45 157.234 1031.45C156.867 1031.45 156.496 1031.51 156.121 1031.61C155.746 1031.72 155.381 1031.87 155.025 1032.07V1031C155.424 1030.84 155.805 1030.73 156.168 1030.66C156.535 1030.58 156.891 1030.54 157.234 1030.54C157.777 1030.54 158.24 1030.62 158.623 1030.78C159.01 1030.94 159.322 1031.18 159.561 1031.5C159.709 1031.69 159.814 1031.94 159.877 1032.23C159.939 1032.51 159.971 1032.94 159.971 1033.51ZM166.697 1030.92V1031.98C166.389 1031.8 166.078 1031.67 165.766 1031.58C165.453 1031.49 165.135 1031.44 164.811 1031.44C164.322 1031.44 163.957 1031.52 163.715 1031.68C163.477 1031.84 163.357 1032.08 163.357 1032.4C163.357 1032.69 163.447 1032.91 163.627 1033.06C163.807 1033.2 164.254 1033.34 164.969 1033.48L165.402 1033.56C165.938 1033.66 166.342 1033.87 166.615 1034.17C166.893 1034.48 167.031 1034.87 167.031 1035.36C167.031 1036.01 166.801 1036.52 166.34 1036.88C165.879 1037.25 165.238 1037.43 164.418 1037.43C164.094 1037.43 163.754 1037.39 163.398 1037.32C163.043 1037.26 162.658 1037.16 162.244 1037.02V1035.91C162.646 1036.11 163.031 1036.27 163.398 1036.37C163.766 1036.48 164.113 1036.53 164.441 1036.53C164.918 1036.53 165.287 1036.43 165.549 1036.24C165.811 1036.04 165.941 1035.77 165.941 1035.42C165.941 1034.92 165.463 1034.58 164.506 1034.39L164.459 1034.38L164.055 1034.29C163.434 1034.17 162.98 1033.97 162.695 1033.68C162.41 1033.4 162.268 1033 162.268 1032.51C162.268 1031.88 162.48 1031.39 162.906 1031.05C163.332 1030.71 163.939 1030.54 164.729 1030.54C165.08 1030.54 165.418 1030.57 165.742 1030.64C166.066 1030.7 166.385 1030.8 166.697 1030.92ZM173.928 1030.92V1031.98C173.619 1031.8 173.309 1031.67 172.996 1031.58C172.684 1031.49 172.365 1031.44 172.041 1031.44C171.553 1031.44 171.188 1031.52 170.945 1031.68C170.707 1031.84 170.588 1032.08 170.588 1032.4C170.588 1032.69 170.678 1032.91 170.857 1033.06C171.037 1033.2 171.484 1033.34 172.199 1033.48L172.633 1033.56C173.168 1033.66 173.572 1033.87 173.846 1034.17C174.123 1034.48 174.262 1034.87 174.262 1035.36C174.262 1036.01 174.031 1036.52 173.57 1036.88C173.109 1037.25 172.469 1037.43 171.648 1037.43C171.324 1037.43 170.984 1037.39 170.629 1037.32C170.273 1037.26 169.889 1037.16 169.475 1037.02V1035.91C169.877 1036.11 170.262 1036.27 170.629 1036.37C170.996 1036.48 171.344 1036.53 171.672 1036.53C172.148 1036.53 172.518 1036.43 172.779 1036.24C173.041 1036.04 173.172 1035.77 173.172 1035.42C173.172 1034.92 172.693 1034.58 171.736 1034.39L171.689 1034.38L171.285 1034.29C170.664 1034.17 170.211 1033.97 169.926 1033.68C169.641 1033.4 169.498 1033 169.498 1032.51C169.498 1031.88 169.711 1031.39 170.137 1031.05C170.562 1030.71 171.17 1030.54 171.959 1030.54C172.311 1030.54 172.648 1030.57 172.973 1030.64C173.297 1030.7 173.615 1030.8 173.928 1030.92ZM175.568 1028.54H177.186L180.607 1035.72V1028.54H181.867V1037.26H180.25L176.828 1030.08V1037.26H175.568V1028.54ZM186.801 1033.96H186.443C185.814 1033.96 185.34 1034.07 185.02 1034.29C184.703 1034.51 184.545 1034.84 184.545 1035.28C184.545 1035.67 184.664 1035.98 184.902 1036.2C185.141 1036.42 185.471 1036.53 185.893 1036.53C186.486 1036.53 186.953 1036.32 187.293 1035.91C187.633 1035.5 187.805 1034.93 187.809 1034.2V1033.96H186.801ZM188.893 1033.51V1037.26H187.809V1036.29C187.578 1036.68 187.287 1036.97 186.936 1037.15C186.588 1037.34 186.164 1037.43 185.664 1037.43C184.996 1037.43 184.463 1037.24 184.064 1036.87C183.666 1036.49 183.467 1035.98 183.467 1035.35C183.467 1034.62 183.711 1034.06 184.199 1033.68C184.691 1033.31 185.412 1033.12 186.361 1033.12H187.809V1032.95C187.805 1032.42 187.672 1032.04 187.41 1031.81C187.148 1031.57 186.73 1031.45 186.156 1031.45C185.789 1031.45 185.418 1031.51 185.043 1031.61C184.668 1031.72 184.303 1031.87 183.947 1032.07V1031C184.346 1030.84 184.727 1030.73 185.09 1030.66C185.457 1030.58 185.812 1030.54 186.156 1030.54C186.699 1030.54 187.162 1030.62 187.545 1030.78C187.932 1030.94 188.244 1031.18 188.482 1031.5C188.631 1031.69 188.736 1031.94 188.799 1032.23C188.861 1032.51 188.893 1032.94 188.893 1033.51ZM193.879 1031.36C194.012 1031.08 194.18 1030.88 194.383 1030.74C194.59 1030.61 194.838 1030.54 195.127 1030.54C195.654 1030.54 196.025 1030.74 196.24 1031.15C196.459 1031.56 196.568 1032.33 196.568 1033.46V1037.26H195.584V1033.5C195.584 1032.58 195.531 1032 195.426 1031.78C195.324 1031.55 195.137 1031.44 194.863 1031.44C194.551 1031.44 194.336 1031.56 194.219 1031.8C194.105 1032.04 194.049 1032.61 194.049 1033.5V1037.26H193.064V1033.5C193.064 1032.57 193.008 1031.99 192.895 1031.77C192.785 1031.55 192.586 1031.44 192.297 1031.44C192.012 1031.44 191.812 1031.56 191.699 1031.8C191.59 1032.04 191.535 1032.61 191.535 1033.5V1037.26H190.557V1030.7H191.535V1031.26C191.664 1031.02 191.824 1030.85 192.016 1030.73C192.211 1030.6 192.432 1030.54 192.678 1030.54C192.975 1030.54 193.221 1030.61 193.416 1030.74C193.615 1030.88 193.77 1031.09 193.879 1031.36ZM203.711 1033.44V1033.97H199.041V1034C199.01 1034.9 199.18 1035.54 199.551 1035.93C199.926 1036.32 200.453 1036.51 201.133 1036.51C201.477 1036.51 201.836 1036.46 202.211 1036.35C202.586 1036.24 202.986 1036.08 203.412 1035.85V1036.92C203.002 1037.09 202.605 1037.22 202.223 1037.3C201.844 1037.39 201.477 1037.43 201.121 1037.43C200.102 1037.43 199.305 1037.12 198.73 1036.51C198.156 1035.9 197.869 1035.06 197.869 1033.98C197.869 1032.94 198.15 1032.1 198.713 1031.48C199.275 1030.85 200.025 1030.54 200.963 1030.54C201.799 1030.54 202.457 1030.82 202.938 1031.39C203.422 1031.95 203.68 1032.64 203.711 1033.44ZM202.633 1033.12C202.586 1032.67 202.42 1032.28 202.135 1031.95C201.854 1031.62 201.447 1031.45 200.916 1031.45C200.396 1031.45 199.969 1031.62 199.633 1031.97C199.297 1032.31 199.113 1032.7 199.082 1033.13L202.633 1033.12ZM152.752 1090.92C152.463 1091.09 152.164 1091.22 151.855 1091.3C151.551 1091.39 151.238 1091.43 150.918 1091.43C149.902 1091.43 149.107 1091.12 148.533 1090.51C147.963 1089.91 147.678 1089.06 147.678 1087.98C147.678 1086.91 147.963 1086.06 148.533 1085.45C149.107 1084.84 149.902 1084.54 150.918 1084.54C151.234 1084.54 151.543 1084.58 151.844 1084.66C152.145 1084.74 152.447 1084.87 152.752 1085.04V1086.17C152.467 1085.92 152.18 1085.74 151.891 1085.62C151.605 1085.51 151.281 1085.45 150.918 1085.45C150.242 1085.45 149.723 1085.67 149.359 1086.11C148.996 1086.55 148.814 1087.17 148.814 1087.98C148.814 1088.79 148.996 1089.42 149.359 1089.86C149.727 1090.3 150.246 1090.51 150.918 1090.51C151.293 1090.51 151.629 1090.46 151.926 1090.34C152.223 1090.23 152.498 1090.05 152.752 1089.81V1090.92ZM157.979 1088.89C157.979 1089.37 158.066 1089.74 158.242 1089.98C158.422 1090.23 158.686 1090.35 159.033 1090.35H160.293V1091.26H158.928C158.283 1091.26 157.783 1091.05 157.428 1090.64C157.076 1090.23 156.9 1089.64 156.9 1088.89V1082.95H155.172V1082.11H157.979V1088.89ZM165.109 1087.96H164.752C164.123 1087.96 163.648 1088.07 163.328 1088.29C163.012 1088.51 162.854 1088.84 162.854 1089.28C162.854 1089.67 162.973 1089.98 163.211 1090.2C163.449 1090.42 163.779 1090.53 164.201 1090.53C164.795 1090.53 165.262 1090.32 165.602 1089.91C165.941 1089.5 166.113 1088.93 166.117 1088.2V1087.96H165.109ZM167.201 1087.51V1091.26H166.117V1090.29C165.887 1090.68 165.596 1090.97 165.244 1091.15C164.896 1091.34 164.473 1091.43 163.973 1091.43C163.305 1091.43 162.771 1091.24 162.373 1090.87C161.975 1090.49 161.775 1089.98 161.775 1089.35C161.775 1088.62 162.02 1088.06 162.508 1087.68C163 1087.31 163.721 1087.12 164.67 1087.12H166.117V1086.95C166.113 1086.42 165.98 1086.04 165.719 1085.81C165.457 1085.57 165.039 1085.45 164.465 1085.45C164.098 1085.45 163.727 1085.51 163.352 1085.61C162.977 1085.72 162.611 1085.87 162.256 1086.07V1085C162.654 1084.84 163.035 1084.73 163.398 1084.66C163.766 1084.58 164.121 1084.54 164.465 1084.54C165.008 1084.54 165.471 1084.62 165.854 1084.78C166.24 1084.94 166.553 1085.18 166.791 1085.5C166.939 1085.69 167.045 1085.94 167.107 1086.23C167.17 1086.51 167.201 1086.94 167.201 1087.51ZM173.928 1084.92V1085.98C173.619 1085.8 173.309 1085.67 172.996 1085.58C172.684 1085.49 172.365 1085.44 172.041 1085.44C171.553 1085.44 171.188 1085.52 170.945 1085.68C170.707 1085.84 170.588 1086.08 170.588 1086.4C170.588 1086.69 170.678 1086.91 170.857 1087.06C171.037 1087.2 171.484 1087.34 172.199 1087.48L172.633 1087.56C173.168 1087.66 173.572 1087.87 173.846 1088.17C174.123 1088.48 174.262 1088.87 174.262 1089.36C174.262 1090.01 174.031 1090.52 173.57 1090.88C173.109 1091.25 172.469 1091.43 171.648 1091.43C171.324 1091.43 170.984 1091.39 170.629 1091.32C170.273 1091.26 169.889 1091.16 169.475 1091.02V1089.91C169.877 1090.11 170.262 1090.27 170.629 1090.37C170.996 1090.48 171.344 1090.53 171.672 1090.53C172.148 1090.53 172.518 1090.43 172.779 1090.24C173.041 1090.04 173.172 1089.77 173.172 1089.42C173.172 1088.92 172.693 1088.58 171.736 1088.39L171.689 1088.38L171.285 1088.29C170.664 1088.17 170.211 1087.97 169.926 1087.68C169.641 1087.4 169.498 1087 169.498 1086.51C169.498 1085.88 169.711 1085.39 170.137 1085.05C170.562 1084.71 171.17 1084.54 171.959 1084.54C172.311 1084.54 172.648 1084.57 172.973 1084.64C173.297 1084.7 173.615 1084.8 173.928 1084.92ZM181.158 1084.92V1085.98C180.85 1085.8 180.539 1085.67 180.227 1085.58C179.914 1085.49 179.596 1085.44 179.271 1085.44C178.783 1085.44 178.418 1085.52 178.176 1085.68C177.938 1085.84 177.818 1086.08 177.818 1086.4C177.818 1086.69 177.908 1086.91 178.088 1087.06C178.268 1087.2 178.715 1087.34 179.43 1087.48L179.863 1087.56C180.398 1087.66 180.803 1087.87 181.076 1088.17C181.354 1088.48 181.492 1088.87 181.492 1089.36C181.492 1090.01 181.262 1090.52 180.801 1090.88C180.34 1091.25 179.699 1091.43 178.879 1091.43C178.555 1091.43 178.215 1091.39 177.859 1091.32C177.504 1091.26 177.119 1091.16 176.705 1091.02V1089.91C177.107 1090.11 177.492 1090.27 177.859 1090.37C178.227 1090.48 178.574 1090.53 178.902 1090.53C179.379 1090.53 179.748 1090.43 180.01 1090.24C180.271 1090.04 180.402 1089.77 180.402 1089.42C180.402 1088.92 179.924 1088.58 178.967 1088.39L178.92 1088.38L178.516 1088.29C177.895 1088.17 177.441 1087.97 177.156 1087.68C176.871 1087.4 176.729 1087 176.729 1086.51C176.729 1085.88 176.941 1085.39 177.367 1085.05C177.793 1084.71 178.4 1084.54 179.189 1084.54C179.541 1084.54 179.879 1084.57 180.203 1084.64C180.527 1084.7 180.846 1084.8 181.158 1084.92ZM182.799 1082.54H184.416L187.838 1089.72V1082.54H189.098V1091.26H187.48L184.059 1084.08V1091.26H182.799V1082.54ZM194.031 1087.96H193.674C193.045 1087.96 192.57 1088.07 192.25 1088.29C191.934 1088.51 191.775 1088.84 191.775 1089.28C191.775 1089.67 191.895 1089.98 192.133 1090.2C192.371 1090.42 192.701 1090.53 193.123 1090.53C193.717 1090.53 194.184 1090.32 194.523 1089.91C194.863 1089.5 195.035 1088.93 195.039 1088.2V1087.96H194.031ZM196.123 1087.51V1091.26H195.039V1090.29C194.809 1090.68 194.518 1090.97 194.166 1091.15C193.818 1091.34 193.395 1091.43 192.895 1091.43C192.227 1091.43 191.693 1091.24 191.295 1090.87C190.896 1090.49 190.697 1089.98 190.697 1089.35C190.697 1088.62 190.941 1088.06 191.43 1087.68C191.922 1087.31 192.643 1087.12 193.592 1087.12H195.039V1086.95C195.035 1086.42 194.902 1086.04 194.641 1085.81C194.379 1085.57 193.961 1085.45 193.387 1085.45C193.02 1085.45 192.648 1085.51 192.273 1085.61C191.898 1085.72 191.533 1085.87 191.178 1086.07V1085C191.576 1084.84 191.957 1084.73 192.32 1084.66C192.688 1084.58 193.043 1084.54 193.387 1084.54C193.93 1084.54 194.393 1084.62 194.775 1084.78C195.162 1084.94 195.475 1085.18 195.713 1085.5C195.861 1085.69 195.967 1085.94 196.029 1086.23C196.092 1086.51 196.123 1086.94 196.123 1087.51ZM201.109 1085.36C201.242 1085.08 201.41 1084.88 201.613 1084.74C201.82 1084.61 202.068 1084.54 202.357 1084.54C202.885 1084.54 203.256 1084.74 203.471 1085.15C203.689 1085.56 203.799 1086.33 203.799 1087.46V1091.26H202.814V1087.5C202.814 1086.58 202.762 1086 202.656 1085.78C202.555 1085.55 202.367 1085.44 202.094 1085.44C201.781 1085.44 201.566 1085.56 201.449 1085.8C201.336 1086.04 201.279 1086.61 201.279 1087.5V1091.26H200.295V1087.5C200.295 1086.57 200.238 1085.99 200.125 1085.77C200.016 1085.55 199.816 1085.44 199.527 1085.44C199.242 1085.44 199.043 1085.56 198.93 1085.8C198.82 1086.04 198.766 1086.61 198.766 1087.5V1091.26H197.787V1084.7H198.766V1085.26C198.895 1085.02 199.055 1084.85 199.246 1084.73C199.441 1084.6 199.662 1084.54 199.908 1084.54C200.205 1084.54 200.451 1084.61 200.646 1084.74C200.846 1084.88 201 1085.09 201.109 1085.36ZM210.941 1087.44V1087.97H206.271V1088C206.24 1088.9 206.41 1089.54 206.781 1089.93C207.156 1090.32 207.684 1090.51 208.363 1090.51C208.707 1090.51 209.066 1090.46 209.441 1090.35C209.816 1090.24 210.217 1090.08 210.643 1089.85V1090.92C210.232 1091.09 209.836 1091.22 209.453 1091.3C209.074 1091.39 208.707 1091.43 208.352 1091.43C207.332 1091.43 206.535 1091.12 205.961 1090.51C205.387 1089.9 205.1 1089.06 205.1 1087.98C205.1 1086.94 205.381 1086.1 205.943 1085.48C206.506 1084.85 207.256 1084.54 208.193 1084.54C209.029 1084.54 209.688 1084.82 210.168 1085.39C210.652 1085.95 210.91 1086.64 210.941 1087.44ZM209.863 1087.12C209.816 1086.67 209.65 1086.28 209.365 1085.95C209.084 1085.62 208.678 1085.45 208.146 1085.45C207.627 1085.45 207.199 1085.62 206.863 1085.97C206.527 1086.31 206.344 1086.7 206.312 1087.13L209.863 1087.12ZM142.902 1118.83V1120.7H145.352V1121.53H142.902V1125.1C142.902 1125.58 142.994 1125.92 143.178 1126.11C143.361 1126.3 143.682 1126.4 144.139 1126.4H145.352V1127.26H144.033C143.225 1127.26 142.654 1127.1 142.322 1126.77C141.99 1126.45 141.824 1125.89 141.824 1125.1V1121.53H140.072V1120.7H141.824V1118.83H142.902ZM148.387 1120.72H151.146V1126.42H153.285V1127.26H147.93V1126.42H150.068V1121.56H148.387V1120.72ZM150.068 1118.17H151.146V1119.53H150.068V1118.17ZM157.363 1118.83V1120.7H159.812V1121.53H157.363V1125.1C157.363 1125.58 157.455 1125.92 157.639 1126.11C157.822 1126.3 158.143 1126.4 158.6 1126.4H159.812V1127.26H158.494C157.686 1127.26 157.115 1127.1 156.783 1126.77C156.451 1126.45 156.285 1125.89 156.285 1125.1V1121.53H154.533V1120.7H156.285V1118.83H157.363ZM165.209 1124.89C165.209 1125.37 165.297 1125.74 165.473 1125.98C165.652 1126.23 165.916 1126.35 166.264 1126.35H167.523V1127.26H166.158C165.514 1127.26 165.014 1127.05 164.658 1126.64C164.307 1126.23 164.131 1125.64 164.131 1124.89V1118.95H162.402V1118.11H165.209V1124.89ZM174.789 1123.44V1123.97H170.119V1124C170.088 1124.9 170.258 1125.54 170.629 1125.93C171.004 1126.32 171.531 1126.51 172.211 1126.51C172.555 1126.51 172.914 1126.46 173.289 1126.35C173.664 1126.24 174.064 1126.08 174.49 1125.85V1126.92C174.08 1127.09 173.684 1127.22 173.301 1127.3C172.922 1127.39 172.555 1127.43 172.199 1127.43C171.18 1127.43 170.383 1127.12 169.809 1126.51C169.234 1125.9 168.947 1125.06 168.947 1123.98C168.947 1122.94 169.229 1122.1 169.791 1121.48C170.354 1120.85 171.104 1120.54 172.041 1120.54C172.877 1120.54 173.535 1120.82 174.016 1121.39C174.5 1121.95 174.758 1122.64 174.789 1123.44ZM173.711 1123.12C173.664 1122.67 173.498 1122.28 173.213 1121.95C172.932 1121.62 172.525 1121.45 171.994 1121.45C171.475 1121.45 171.047 1121.62 170.711 1121.97C170.375 1122.31 170.191 1122.7 170.16 1123.13L173.711 1123.12ZM144.332 1139.53V1136.14H145.41V1145.26H144.332V1144.43C144.152 1144.76 143.912 1145.01 143.611 1145.18C143.314 1145.34 142.971 1145.43 142.58 1145.43C141.787 1145.43 141.162 1145.12 140.705 1144.51C140.252 1143.89 140.025 1143.04 140.025 1141.96C140.025 1140.89 140.254 1140.06 140.711 1139.45C141.168 1138.84 141.791 1138.54 142.58 1138.54C142.975 1138.54 143.322 1138.62 143.623 1138.8C143.924 1138.96 144.16 1139.21 144.332 1139.53ZM141.162 1141.98C141.162 1142.82 141.295 1143.45 141.561 1143.88C141.826 1144.3 142.219 1144.51 142.738 1144.51C143.258 1144.51 143.652 1144.3 143.922 1143.87C144.195 1143.44 144.332 1142.81 144.332 1141.98C144.332 1141.15 144.195 1140.52 143.922 1140.1C143.652 1139.67 143.258 1139.45 142.738 1139.45C142.219 1139.45 141.826 1139.67 141.561 1140.09C141.295 1140.52 141.162 1141.15 141.162 1141.98ZM153.098 1141.44V1141.97H148.428V1142C148.396 1142.9 148.566 1143.54 148.938 1143.93C149.312 1144.32 149.84 1144.51 150.52 1144.51C150.863 1144.51 151.223 1144.46 151.598 1144.35C151.973 1144.24 152.373 1144.08 152.799 1143.85V1144.92C152.389 1145.09 151.992 1145.22 151.609 1145.3C151.23 1145.39 150.863 1145.43 150.508 1145.43C149.488 1145.43 148.691 1145.12 148.117 1144.51C147.543 1143.9 147.256 1143.06 147.256 1141.98C147.256 1140.94 147.537 1140.1 148.1 1139.48C148.662 1138.85 149.412 1138.54 150.35 1138.54C151.186 1138.54 151.844 1138.82 152.324 1139.39C152.809 1139.95 153.066 1140.64 153.098 1141.44ZM152.02 1141.12C151.973 1140.67 151.807 1140.28 151.521 1139.95C151.24 1139.62 150.834 1139.45 150.303 1139.45C149.783 1139.45 149.355 1139.62 149.02 1139.97C148.684 1140.31 148.5 1140.7 148.469 1141.13L152.02 1141.12ZM159.467 1138.92V1139.98C159.158 1139.8 158.848 1139.67 158.535 1139.58C158.223 1139.49 157.904 1139.44 157.58 1139.44C157.092 1139.44 156.727 1139.52 156.484 1139.68C156.246 1139.84 156.127 1140.08 156.127 1140.4C156.127 1140.69 156.217 1140.91 156.396 1141.06C156.576 1141.2 157.023 1141.34 157.738 1141.48L158.172 1141.56C158.707 1141.66 159.111 1141.87 159.385 1142.17C159.662 1142.48 159.801 1142.87 159.801 1143.36C159.801 1144.01 159.57 1144.52 159.109 1144.88C158.648 1145.25 158.008 1145.43 157.188 1145.43C156.863 1145.43 156.523 1145.39 156.168 1145.32C155.812 1145.26 155.428 1145.16 155.014 1145.02V1143.91C155.416 1144.11 155.801 1144.27 156.168 1144.37C156.535 1144.48 156.883 1144.53 157.211 1144.53C157.688 1144.53 158.057 1144.43 158.318 1144.24C158.58 1144.04 158.711 1143.77 158.711 1143.42C158.711 1142.92 158.232 1142.58 157.275 1142.39L157.229 1142.38L156.824 1142.29C156.203 1142.17 155.75 1141.97 155.465 1141.68C155.18 1141.4 155.037 1141 155.037 1140.51C155.037 1139.88 155.25 1139.39 155.676 1139.05C156.102 1138.71 156.709 1138.54 157.498 1138.54C157.85 1138.54 158.188 1138.57 158.512 1138.64C158.836 1138.7 159.154 1138.8 159.467 1138.92ZM167.213 1144.92C166.924 1145.09 166.625 1145.22 166.316 1145.3C166.012 1145.39 165.699 1145.43 165.379 1145.43C164.363 1145.43 163.568 1145.12 162.994 1144.51C162.424 1143.91 162.139 1143.06 162.139 1141.98C162.139 1140.91 162.424 1140.06 162.994 1139.45C163.568 1138.84 164.363 1138.54 165.379 1138.54C165.695 1138.54 166.004 1138.58 166.305 1138.66C166.605 1138.74 166.908 1138.87 167.213 1139.04V1140.17C166.928 1139.92 166.641 1139.74 166.352 1139.62C166.066 1139.51 165.742 1139.45 165.379 1139.45C164.703 1139.45 164.184 1139.67 163.82 1140.11C163.457 1140.55 163.275 1141.17 163.275 1141.98C163.275 1142.79 163.457 1143.42 163.82 1143.86C164.188 1144.3 164.707 1144.51 165.379 1144.51C165.754 1144.51 166.09 1144.46 166.387 1144.34C166.684 1144.23 166.959 1144.05 167.213 1143.81V1144.92ZM174.994 1140.05C174.764 1139.87 174.529 1139.74 174.291 1139.66C174.053 1139.58 173.791 1139.53 173.506 1139.53C172.834 1139.53 172.32 1139.75 171.965 1140.17C171.609 1140.59 171.432 1141.2 171.432 1142V1145.26H170.348V1138.7H171.432V1139.98C171.611 1139.51 171.887 1139.16 172.258 1138.91C172.633 1138.66 173.076 1138.54 173.588 1138.54C173.854 1138.54 174.102 1138.57 174.332 1138.64C174.562 1138.7 174.783 1138.81 174.994 1138.95V1140.05ZM177.309 1138.72H180.068V1144.42H182.207V1145.26H176.852V1144.42H178.99V1139.56H177.309V1138.72ZM178.99 1136.17H180.068V1137.53H178.99V1136.17ZM184.885 1144.43V1147.76H183.801V1138.7H184.885V1139.53C185.064 1139.21 185.303 1138.96 185.6 1138.8C185.9 1138.62 186.246 1138.54 186.637 1138.54C187.43 1138.54 188.051 1138.84 188.5 1139.46C188.953 1140.07 189.18 1140.92 189.18 1142.01C189.18 1143.07 188.953 1143.91 188.5 1144.52C188.047 1145.13 187.426 1145.43 186.637 1145.43C186.238 1145.43 185.889 1145.34 185.588 1145.18C185.291 1145.01 185.057 1144.76 184.885 1144.43ZM188.049 1141.98C188.049 1141.15 187.916 1140.52 187.65 1140.09C187.389 1139.67 186.998 1139.45 186.479 1139.45C185.955 1139.45 185.559 1139.67 185.289 1140.1C185.02 1140.52 184.885 1141.15 184.885 1141.98C184.885 1142.81 185.02 1143.44 185.289 1143.87C185.559 1144.3 185.955 1144.51 186.479 1144.51C186.998 1144.51 187.389 1144.3 187.65 1143.88C187.916 1143.45 188.049 1142.82 188.049 1141.98ZM193.516 1136.83V1138.7H195.965V1139.53H193.516V1143.1C193.516 1143.58 193.607 1143.92 193.791 1144.11C193.975 1144.3 194.295 1144.4 194.752 1144.4H195.965V1145.26H194.646C193.838 1145.26 193.268 1145.1 192.936 1144.77C192.604 1144.45 192.438 1143.89 192.438 1143.1V1139.53H190.686V1138.7H192.438V1136.83H193.516ZM199 1138.72H201.76V1144.42H203.898V1145.26H198.543V1144.42H200.682V1139.56H199V1138.72ZM200.682 1136.17H201.76V1137.53H200.682V1136.17ZM207.988 1139.45C207.441 1139.45 207.027 1139.67 206.746 1140.09C206.465 1140.52 206.324 1141.15 206.324 1141.98C206.324 1142.82 206.465 1143.45 206.746 1143.88C207.027 1144.3 207.441 1144.51 207.988 1144.51C208.539 1144.51 208.955 1144.3 209.236 1143.88C209.518 1143.45 209.658 1142.82 209.658 1141.98C209.658 1141.15 209.518 1140.52 209.236 1140.09C208.955 1139.67 208.539 1139.45 207.988 1139.45ZM207.988 1138.54C208.898 1138.54 209.594 1138.83 210.074 1139.42C210.559 1140.01 210.801 1140.87 210.801 1141.98C210.801 1143.1 210.561 1143.96 210.08 1144.55C209.6 1145.14 208.902 1145.43 207.988 1145.43C207.078 1145.43 206.383 1145.14 205.902 1144.55C205.422 1143.96 205.182 1143.1 205.182 1141.98C205.182 1140.87 205.422 1140.01 205.902 1139.42C206.383 1138.83 207.078 1138.54 207.988 1138.54ZM217.768 1141.19V1145.26H216.684V1141.19C216.684 1140.6 216.58 1140.17 216.373 1139.89C216.166 1139.61 215.842 1139.48 215.4 1139.48C214.896 1139.48 214.508 1139.66 214.234 1140.01C213.965 1140.37 213.83 1140.88 213.83 1141.55V1145.26H212.752V1138.7H213.83V1139.68C214.021 1139.31 214.281 1139.02 214.609 1138.83C214.938 1138.64 215.326 1138.54 215.775 1138.54C216.443 1138.54 216.941 1138.76 217.27 1139.2C217.602 1139.64 217.768 1140.3 217.768 1141.19ZM141.156 1156.72H143.916V1162.42H146.055V1163.26H140.699V1162.42H142.838V1157.56H141.156V1156.72ZM142.838 1154.17H143.916V1155.53H142.838V1154.17ZM150.496 1157.36C150.629 1157.08 150.797 1156.88 151 1156.74C151.207 1156.61 151.455 1156.54 151.744 1156.54C152.271 1156.54 152.643 1156.74 152.857 1157.15C153.076 1157.56 153.186 1158.33 153.186 1159.46V1163.26H152.201V1159.5C152.201 1158.58 152.148 1158 152.043 1157.78C151.941 1157.55 151.754 1157.44 151.48 1157.44C151.168 1157.44 150.953 1157.56 150.836 1157.8C150.723 1158.04 150.666 1158.61 150.666 1159.5V1163.26H149.682V1159.5C149.682 1158.57 149.625 1157.99 149.512 1157.77C149.402 1157.55 149.203 1157.44 148.914 1157.44C148.629 1157.44 148.43 1157.56 148.316 1157.8C148.207 1158.04 148.152 1158.61 148.152 1159.5V1163.26H147.174V1156.7H148.152V1157.26C148.281 1157.02 148.441 1156.85 148.633 1156.73C148.828 1156.6 149.049 1156.54 149.295 1156.54C149.592 1156.54 149.838 1156.61 150.033 1156.74C150.232 1156.88 150.387 1157.09 150.496 1157.36ZM157.879 1159.96H157.521C156.893 1159.96 156.418 1160.07 156.098 1160.29C155.781 1160.51 155.623 1160.84 155.623 1161.28C155.623 1161.67 155.742 1161.98 155.98 1162.2C156.219 1162.42 156.549 1162.53 156.971 1162.53C157.564 1162.53 158.031 1162.32 158.371 1161.91C158.711 1161.5 158.883 1160.93 158.887 1160.2V1159.96H157.879ZM159.971 1159.51V1163.26H158.887V1162.29C158.656 1162.68 158.365 1162.97 158.014 1163.15C157.666 1163.34 157.242 1163.43 156.742 1163.43C156.074 1163.43 155.541 1163.24 155.143 1162.87C154.744 1162.49 154.545 1161.98 154.545 1161.35C154.545 1160.62 154.789 1160.06 155.277 1159.68C155.77 1159.31 156.49 1159.12 157.439 1159.12H158.887V1158.95C158.883 1158.42 158.75 1158.04 158.488 1157.81C158.227 1157.57 157.809 1157.45 157.234 1157.45C156.867 1157.45 156.496 1157.51 156.121 1157.61C155.746 1157.72 155.381 1157.87 155.025 1158.07V1157C155.424 1156.84 155.805 1156.73 156.168 1156.66C156.535 1156.58 156.891 1156.54 157.234 1156.54C157.777 1156.54 158.24 1156.62 158.623 1156.78C159.01 1156.94 159.322 1157.18 159.561 1157.5C159.709 1157.69 159.814 1157.94 159.877 1158.23C159.939 1158.51 159.971 1158.94 159.971 1159.51ZM166.023 1159.92C166.023 1159.12 165.891 1158.5 165.625 1158.09C165.363 1157.66 164.98 1157.45 164.477 1157.45C163.949 1157.45 163.547 1157.66 163.27 1158.09C162.992 1158.5 162.854 1159.12 162.854 1159.92C162.854 1160.73 162.992 1161.35 163.27 1161.78C163.551 1162.2 163.957 1162.41 164.488 1162.41C164.984 1162.41 165.363 1162.2 165.625 1161.77C165.891 1161.34 166.023 1160.73 166.023 1159.92ZM167.102 1162.84C167.102 1163.82 166.869 1164.57 166.404 1165.08C165.939 1165.58 165.256 1165.84 164.354 1165.84C164.057 1165.84 163.746 1165.81 163.422 1165.76C163.098 1165.7 162.773 1165.62 162.449 1165.51V1164.45C162.832 1164.63 163.18 1164.76 163.492 1164.85C163.805 1164.93 164.092 1164.98 164.354 1164.98C164.936 1164.98 165.359 1164.82 165.625 1164.5C165.891 1164.18 166.023 1163.68 166.023 1163V1162.95V1162.22C165.852 1162.58 165.617 1162.86 165.32 1163.04C165.023 1163.22 164.662 1163.31 164.236 1163.31C163.471 1163.31 162.859 1163 162.402 1162.39C161.945 1161.77 161.717 1160.95 161.717 1159.92C161.717 1158.89 161.945 1158.07 162.402 1157.46C162.859 1156.84 163.471 1156.54 164.236 1156.54C164.658 1156.54 165.016 1156.62 165.309 1156.79C165.602 1156.96 165.84 1157.22 166.023 1157.57V1156.72H167.102V1162.84ZM174.789 1159.44V1159.97H170.119V1160C170.088 1160.9 170.258 1161.54 170.629 1161.93C171.004 1162.32 171.531 1162.51 172.211 1162.51C172.555 1162.51 172.914 1162.46 173.289 1162.35C173.664 1162.24 174.064 1162.08 174.49 1161.85V1162.92C174.08 1163.09 173.684 1163.22 173.301 1163.3C172.922 1163.39 172.555 1163.43 172.199 1163.43C171.18 1163.43 170.383 1163.12 169.809 1162.51C169.234 1161.9 168.947 1161.06 168.947 1159.98C168.947 1158.94 169.229 1158.1 169.791 1157.48C170.354 1156.85 171.104 1156.54 172.041 1156.54C172.877 1156.54 173.535 1156.82 174.016 1157.39C174.5 1157.95 174.758 1158.64 174.789 1159.44ZM173.711 1159.12C173.664 1158.67 173.498 1158.28 173.213 1157.95C172.932 1157.62 172.525 1157.45 171.994 1157.45C171.475 1157.45 171.047 1157.62 170.711 1157.97C170.375 1158.31 170.191 1158.7 170.16 1159.13L173.711 1159.12ZM181.158 1156.92V1157.98C180.85 1157.8 180.539 1157.67 180.227 1157.58C179.914 1157.49 179.596 1157.44 179.271 1157.44C178.783 1157.44 178.418 1157.52 178.176 1157.68C177.938 1157.84 177.818 1158.08 177.818 1158.4C177.818 1158.69 177.908 1158.91 178.088 1159.06C178.268 1159.2 178.715 1159.34 179.43 1159.48L179.863 1159.56C180.398 1159.66 180.803 1159.87 181.076 1160.17C181.354 1160.48 181.492 1160.87 181.492 1161.36C181.492 1162.01 181.262 1162.52 180.801 1162.88C180.34 1163.25 179.699 1163.43 178.879 1163.43C178.555 1163.43 178.215 1163.39 177.859 1163.32C177.504 1163.26 177.119 1163.16 176.705 1163.02V1161.91C177.107 1162.11 177.492 1162.27 177.859 1162.37C178.227 1162.48 178.574 1162.53 178.902 1162.53C179.379 1162.53 179.748 1162.43 180.01 1162.24C180.271 1162.04 180.402 1161.77 180.402 1161.42C180.402 1160.92 179.924 1160.58 178.967 1160.39L178.92 1160.38L178.516 1160.29C177.895 1160.17 177.441 1159.97 177.156 1159.68C176.871 1159.4 176.729 1159 176.729 1158.51C176.729 1157.88 176.941 1157.39 177.367 1157.05C177.793 1156.71 178.4 1156.54 179.189 1156.54C179.541 1156.54 179.879 1156.57 180.203 1156.64C180.527 1156.7 180.846 1156.8 181.158 1156.92ZM143.518 1178.89C143.518 1179.37 143.605 1179.74 143.781 1179.98C143.961 1180.23 144.225 1180.35 144.572 1180.35H145.832V1181.26H144.467C143.822 1181.26 143.322 1181.05 142.967 1180.64C142.615 1180.23 142.439 1179.64 142.439 1178.89V1172.95H140.711V1172.11H143.518V1178.89ZM148.387 1174.72H151.146V1180.42H153.285V1181.26H147.93V1180.42H150.068V1175.56H148.387V1174.72ZM150.068 1172.17H151.146V1173.53H150.068V1172.17ZM159.924 1177.19V1181.26H158.84V1177.19C158.84 1176.6 158.736 1176.17 158.529 1175.89C158.322 1175.61 157.998 1175.48 157.557 1175.48C157.053 1175.48 156.664 1175.66 156.391 1176.01C156.121 1176.37 155.986 1176.88 155.986 1177.55V1181.26H154.908V1174.7H155.986V1175.68C156.178 1175.31 156.438 1175.02 156.766 1174.83C157.094 1174.64 157.482 1174.54 157.932 1174.54C158.6 1174.54 159.098 1174.76 159.426 1175.2C159.758 1175.64 159.924 1176.3 159.924 1177.19ZM162.379 1172.14H163.492V1177.42L166.322 1174.7H167.635L165.051 1177.17L168.039 1181.26H166.721L164.295 1177.87L163.492 1178.63V1181.26H162.379V1172.14ZM142.902 1226.83V1228.7H145.352V1229.53H142.902V1233.1C142.902 1233.58 142.994 1233.92 143.178 1234.11C143.361 1234.3 143.682 1234.4 144.139 1234.4H145.352V1235.26H144.033C143.225 1235.26 142.654 1235.1 142.322 1234.77C141.99 1234.45 141.824 1233.89 141.824 1233.1V1229.53H140.072V1228.7H141.824V1226.83H142.902ZM148.387 1228.72H151.146V1234.42H153.285V1235.26H147.93V1234.42H150.068V1229.56H148.387V1228.72ZM150.068 1226.17H151.146V1227.53H150.068V1226.17ZM157.363 1226.83V1228.7H159.812V1229.53H157.363V1233.1C157.363 1233.58 157.455 1233.92 157.639 1234.11C157.822 1234.3 158.143 1234.4 158.6 1234.4H159.812V1235.26H158.494C157.686 1235.26 157.115 1235.1 156.783 1234.77C156.451 1234.45 156.285 1233.89 156.285 1233.1V1229.53H154.533V1228.7H156.285V1226.83H157.363ZM165.209 1232.89C165.209 1233.37 165.297 1233.74 165.473 1233.98C165.652 1234.23 165.916 1234.35 166.264 1234.35H167.523V1235.26H166.158C165.514 1235.26 165.014 1235.05 164.658 1234.64C164.307 1234.23 164.131 1233.64 164.131 1232.89V1226.95H162.402V1226.11H165.209V1232.89ZM174.789 1231.44V1231.97H170.119V1232C170.088 1232.9 170.258 1233.54 170.629 1233.93C171.004 1234.32 171.531 1234.51 172.211 1234.51C172.555 1234.51 172.914 1234.46 173.289 1234.35C173.664 1234.24 174.064 1234.08 174.49 1233.85V1234.92C174.08 1235.09 173.684 1235.22 173.301 1235.3C172.922 1235.39 172.555 1235.43 172.199 1235.43C171.18 1235.43 170.383 1235.12 169.809 1234.51C169.234 1233.9 168.947 1233.06 168.947 1231.98C168.947 1230.94 169.229 1230.1 169.791 1229.48C170.354 1228.85 171.104 1228.54 172.041 1228.54C172.877 1228.54 173.535 1228.82 174.016 1229.39C174.5 1229.95 174.758 1230.64 174.789 1231.44ZM173.711 1231.12C173.664 1230.67 173.498 1230.28 173.213 1229.95C172.932 1229.62 172.525 1229.45 171.994 1229.45C171.475 1229.45 171.047 1229.62 170.711 1229.97C170.375 1230.31 170.191 1230.7 170.16 1231.13L173.711 1231.12ZM144.332 1247.53V1244.14H145.41V1253.26H144.332V1252.43C144.152 1252.76 143.912 1253.01 143.611 1253.18C143.314 1253.34 142.971 1253.43 142.58 1253.43C141.787 1253.43 141.162 1253.12 140.705 1252.51C140.252 1251.89 140.025 1251.04 140.025 1249.96C140.025 1248.89 140.254 1248.06 140.711 1247.45C141.168 1246.84 141.791 1246.54 142.58 1246.54C142.975 1246.54 143.322 1246.62 143.623 1246.8C143.924 1246.96 144.16 1247.21 144.332 1247.53ZM141.162 1249.98C141.162 1250.82 141.295 1251.45 141.561 1251.88C141.826 1252.3 142.219 1252.51 142.738 1252.51C143.258 1252.51 143.652 1252.3 143.922 1251.87C144.195 1251.44 144.332 1250.81 144.332 1249.98C144.332 1249.15 144.195 1248.52 143.922 1248.1C143.652 1247.67 143.258 1247.45 142.738 1247.45C142.219 1247.45 141.826 1247.67 141.561 1248.09C141.295 1248.52 141.162 1249.15 141.162 1249.98ZM153.098 1249.44V1249.97H148.428V1250C148.396 1250.9 148.566 1251.54 148.938 1251.93C149.312 1252.32 149.84 1252.51 150.52 1252.51C150.863 1252.51 151.223 1252.46 151.598 1252.35C151.973 1252.24 152.373 1252.08 152.799 1251.85V1252.92C152.389 1253.09 151.992 1253.22 151.609 1253.3C151.23 1253.39 150.863 1253.43 150.508 1253.43C149.488 1253.43 148.691 1253.12 148.117 1252.51C147.543 1251.9 147.256 1251.06 147.256 1249.98C147.256 1248.94 147.537 1248.1 148.1 1247.48C148.662 1246.85 149.412 1246.54 150.35 1246.54C151.186 1246.54 151.844 1246.82 152.324 1247.39C152.809 1247.95 153.066 1248.64 153.098 1249.44ZM152.02 1249.12C151.973 1248.67 151.807 1248.28 151.521 1247.95C151.24 1247.62 150.834 1247.45 150.303 1247.45C149.783 1247.45 149.355 1247.62 149.02 1247.97C148.684 1248.31 148.5 1248.7 148.469 1249.13L152.02 1249.12ZM159.467 1246.92V1247.98C159.158 1247.8 158.848 1247.67 158.535 1247.58C158.223 1247.49 157.904 1247.44 157.58 1247.44C157.092 1247.44 156.727 1247.52 156.484 1247.68C156.246 1247.84 156.127 1248.08 156.127 1248.4C156.127 1248.69 156.217 1248.91 156.396 1249.06C156.576 1249.2 157.023 1249.34 157.738 1249.48L158.172 1249.56C158.707 1249.66 159.111 1249.87 159.385 1250.17C159.662 1250.48 159.801 1250.87 159.801 1251.36C159.801 1252.01 159.57 1252.52 159.109 1252.88C158.648 1253.25 158.008 1253.43 157.188 1253.43C156.863 1253.43 156.523 1253.39 156.168 1253.32C155.812 1253.26 155.428 1253.16 155.014 1253.02V1251.91C155.416 1252.11 155.801 1252.27 156.168 1252.37C156.535 1252.48 156.883 1252.53 157.211 1252.53C157.688 1252.53 158.057 1252.43 158.318 1252.24C158.58 1252.04 158.711 1251.77 158.711 1251.42C158.711 1250.92 158.232 1250.58 157.275 1250.39L157.229 1250.38L156.824 1250.29C156.203 1250.17 155.75 1249.97 155.465 1249.68C155.18 1249.4 155.037 1249 155.037 1248.51C155.037 1247.88 155.25 1247.39 155.676 1247.05C156.102 1246.71 156.709 1246.54 157.498 1246.54C157.85 1246.54 158.188 1246.57 158.512 1246.64C158.836 1246.7 159.154 1246.8 159.467 1246.92ZM167.213 1252.92C166.924 1253.09 166.625 1253.22 166.316 1253.3C166.012 1253.39 165.699 1253.43 165.379 1253.43C164.363 1253.43 163.568 1253.12 162.994 1252.51C162.424 1251.91 162.139 1251.06 162.139 1249.98C162.139 1248.91 162.424 1248.06 162.994 1247.45C163.568 1246.84 164.363 1246.54 165.379 1246.54C165.695 1246.54 166.004 1246.58 166.305 1246.66C166.605 1246.74 166.908 1246.87 167.213 1247.04V1248.17C166.928 1247.92 166.641 1247.74 166.352 1247.62C166.066 1247.51 165.742 1247.45 165.379 1247.45C164.703 1247.45 164.184 1247.67 163.82 1248.11C163.457 1248.55 163.275 1249.17 163.275 1249.98C163.275 1250.79 163.457 1251.42 163.82 1251.86C164.188 1252.3 164.707 1252.51 165.379 1252.51C165.754 1252.51 166.09 1252.46 166.387 1252.34C166.684 1252.23 166.959 1252.05 167.213 1251.81V1252.92ZM174.994 1248.05C174.764 1247.87 174.529 1247.74 174.291 1247.66C174.053 1247.58 173.791 1247.53 173.506 1247.53C172.834 1247.53 172.32 1247.75 171.965 1248.17C171.609 1248.59 171.432 1249.2 171.432 1250V1253.26H170.348V1246.7H171.432V1247.98C171.611 1247.51 171.887 1247.16 172.258 1246.91C172.633 1246.66 173.076 1246.54 173.588 1246.54C173.854 1246.54 174.102 1246.57 174.332 1246.64C174.562 1246.7 174.783 1246.81 174.994 1246.95V1248.05ZM177.309 1246.72H180.068V1252.42H182.207V1253.26H176.852V1252.42H178.99V1247.56H177.309V1246.72ZM178.99 1244.17H180.068V1245.53H178.99V1244.17ZM184.885 1252.43V1255.76H183.801V1246.7H184.885V1247.53C185.064 1247.21 185.303 1246.96 185.6 1246.8C185.9 1246.62 186.246 1246.54 186.637 1246.54C187.43 1246.54 188.051 1246.84 188.5 1247.46C188.953 1248.07 189.18 1248.92 189.18 1250.01C189.18 1251.07 188.953 1251.91 188.5 1252.52C188.047 1253.13 187.426 1253.43 186.637 1253.43C186.238 1253.43 185.889 1253.34 185.588 1253.18C185.291 1253.01 185.057 1252.76 184.885 1252.43ZM188.049 1249.98C188.049 1249.15 187.916 1248.52 187.65 1248.09C187.389 1247.67 186.998 1247.45 186.479 1247.45C185.955 1247.45 185.559 1247.67 185.289 1248.1C185.02 1248.52 184.885 1249.15 184.885 1249.98C184.885 1250.81 185.02 1251.44 185.289 1251.87C185.559 1252.3 185.955 1252.51 186.479 1252.51C186.998 1252.51 187.389 1252.3 187.65 1251.88C187.916 1251.45 188.049 1250.82 188.049 1249.98ZM193.516 1244.83V1246.7H195.965V1247.53H193.516V1251.1C193.516 1251.58 193.607 1251.92 193.791 1252.11C193.975 1252.3 194.295 1252.4 194.752 1252.4H195.965V1253.26H194.646C193.838 1253.26 193.268 1253.1 192.936 1252.77C192.604 1252.45 192.438 1251.89 192.438 1251.1V1247.53H190.686V1246.7H192.438V1244.83H193.516ZM199 1246.72H201.76V1252.42H203.898V1253.26H198.543V1252.42H200.682V1247.56H199V1246.72ZM200.682 1244.17H201.76V1245.53H200.682V1244.17ZM207.988 1247.45C207.441 1247.45 207.027 1247.67 206.746 1248.09C206.465 1248.52 206.324 1249.15 206.324 1249.98C206.324 1250.82 206.465 1251.45 206.746 1251.88C207.027 1252.3 207.441 1252.51 207.988 1252.51C208.539 1252.51 208.955 1252.3 209.236 1251.88C209.518 1251.45 209.658 1250.82 209.658 1249.98C209.658 1249.15 209.518 1248.52 209.236 1248.09C208.955 1247.67 208.539 1247.45 207.988 1247.45ZM207.988 1246.54C208.898 1246.54 209.594 1246.83 210.074 1247.42C210.559 1248.01 210.801 1248.87 210.801 1249.98C210.801 1251.1 210.561 1251.96 210.08 1252.55C209.6 1253.14 208.902 1253.43 207.988 1253.43C207.078 1253.43 206.383 1253.14 205.902 1252.55C205.422 1251.96 205.182 1251.1 205.182 1249.98C205.182 1248.87 205.422 1248.01 205.902 1247.42C206.383 1246.83 207.078 1246.54 207.988 1246.54ZM217.768 1249.19V1253.26H216.684V1249.19C216.684 1248.6 216.58 1248.17 216.373 1247.89C216.166 1247.61 215.842 1247.48 215.4 1247.48C214.896 1247.48 214.508 1247.66 214.234 1248.01C213.965 1248.37 213.83 1248.88 213.83 1249.55V1253.26H212.752V1246.7H213.83V1247.68C214.021 1247.31 214.281 1247.02 214.609 1246.83C214.938 1246.64 215.326 1246.54 215.775 1246.54C216.443 1246.54 216.941 1246.76 217.27 1247.2C217.602 1247.64 217.768 1248.3 217.768 1249.19ZM141.156 1264.72H143.916V1270.42H146.055V1271.26H140.699V1270.42H142.838V1265.56H141.156V1264.72ZM142.838 1262.17H143.916V1263.53H142.838V1262.17ZM150.496 1265.36C150.629 1265.08 150.797 1264.88 151 1264.74C151.207 1264.61 151.455 1264.54 151.744 1264.54C152.271 1264.54 152.643 1264.74 152.857 1265.15C153.076 1265.56 153.186 1266.33 153.186 1267.46V1271.26H152.201V1267.5C152.201 1266.58 152.148 1266 152.043 1265.78C151.941 1265.55 151.754 1265.44 151.48 1265.44C151.168 1265.44 150.953 1265.56 150.836 1265.8C150.723 1266.04 150.666 1266.61 150.666 1267.5V1271.26H149.682V1267.5C149.682 1266.57 149.625 1265.99 149.512 1265.77C149.402 1265.55 149.203 1265.44 148.914 1265.44C148.629 1265.44 148.43 1265.56 148.316 1265.8C148.207 1266.04 148.152 1266.61 148.152 1267.5V1271.26H147.174V1264.7H148.152V1265.26C148.281 1265.02 148.441 1264.85 148.633 1264.73C148.828 1264.6 149.049 1264.54 149.295 1264.54C149.592 1264.54 149.838 1264.61 150.033 1264.74C150.232 1264.88 150.387 1265.09 150.496 1265.36ZM157.879 1267.96H157.521C156.893 1267.96 156.418 1268.07 156.098 1268.29C155.781 1268.51 155.623 1268.84 155.623 1269.28C155.623 1269.67 155.742 1269.98 155.98 1270.2C156.219 1270.42 156.549 1270.53 156.971 1270.53C157.564 1270.53 158.031 1270.32 158.371 1269.91C158.711 1269.5 158.883 1268.93 158.887 1268.2V1267.96H157.879ZM159.971 1267.51V1271.26H158.887V1270.29C158.656 1270.68 158.365 1270.97 158.014 1271.15C157.666 1271.34 157.242 1271.43 156.742 1271.43C156.074 1271.43 155.541 1271.24 155.143 1270.87C154.744 1270.49 154.545 1269.98 154.545 1269.35C154.545 1268.62 154.789 1268.06 155.277 1267.68C155.77 1267.31 156.49 1267.12 157.439 1267.12H158.887V1266.95C158.883 1266.42 158.75 1266.04 158.488 1265.81C158.227 1265.57 157.809 1265.45 157.234 1265.45C156.867 1265.45 156.496 1265.51 156.121 1265.61C155.746 1265.72 155.381 1265.87 155.025 1266.07V1265C155.424 1264.84 155.805 1264.73 156.168 1264.66C156.535 1264.58 156.891 1264.54 157.234 1264.54C157.777 1264.54 158.24 1264.62 158.623 1264.78C159.01 1264.94 159.322 1265.18 159.561 1265.5C159.709 1265.69 159.814 1265.94 159.877 1266.23C159.939 1266.51 159.971 1266.94 159.971 1267.51ZM166.023 1267.92C166.023 1267.12 165.891 1266.5 165.625 1266.09C165.363 1265.66 164.98 1265.45 164.477 1265.45C163.949 1265.45 163.547 1265.66 163.27 1266.09C162.992 1266.5 162.854 1267.12 162.854 1267.92C162.854 1268.73 162.992 1269.35 163.27 1269.78C163.551 1270.2 163.957 1270.41 164.488 1270.41C164.984 1270.41 165.363 1270.2 165.625 1269.77C165.891 1269.34 166.023 1268.73 166.023 1267.92ZM167.102 1270.84C167.102 1271.82 166.869 1272.57 166.404 1273.08C165.939 1273.58 165.256 1273.84 164.354 1273.84C164.057 1273.84 163.746 1273.81 163.422 1273.76C163.098 1273.7 162.773 1273.62 162.449 1273.51V1272.45C162.832 1272.63 163.18 1272.76 163.492 1272.85C163.805 1272.93 164.092 1272.98 164.354 1272.98C164.936 1272.98 165.359 1272.82 165.625 1272.5C165.891 1272.18 166.023 1271.68 166.023 1271V1270.95V1270.22C165.852 1270.58 165.617 1270.86 165.32 1271.04C165.023 1271.22 164.662 1271.31 164.236 1271.31C163.471 1271.31 162.859 1271 162.402 1270.39C161.945 1269.77 161.717 1268.95 161.717 1267.92C161.717 1266.89 161.945 1266.07 162.402 1265.46C162.859 1264.84 163.471 1264.54 164.236 1264.54C164.658 1264.54 165.016 1264.62 165.309 1264.79C165.602 1264.96 165.84 1265.22 166.023 1265.57V1264.72H167.102V1270.84ZM174.789 1267.44V1267.97H170.119V1268C170.088 1268.9 170.258 1269.54 170.629 1269.93C171.004 1270.32 171.531 1270.51 172.211 1270.51C172.555 1270.51 172.914 1270.46 173.289 1270.35C173.664 1270.24 174.064 1270.08 174.49 1269.85V1270.92C174.08 1271.09 173.684 1271.22 173.301 1271.3C172.922 1271.39 172.555 1271.43 172.199 1271.43C171.18 1271.43 170.383 1271.12 169.809 1270.51C169.234 1269.9 168.947 1269.06 168.947 1267.98C168.947 1266.94 169.229 1266.1 169.791 1265.48C170.354 1264.85 171.104 1264.54 172.041 1264.54C172.877 1264.54 173.535 1264.82 174.016 1265.39C174.5 1265.95 174.758 1266.64 174.789 1267.44ZM173.711 1267.12C173.664 1266.67 173.498 1266.28 173.213 1265.95C172.932 1265.62 172.525 1265.45 171.994 1265.45C171.475 1265.45 171.047 1265.62 170.711 1265.97C170.375 1266.31 170.191 1266.7 170.16 1267.13L173.711 1267.12ZM181.158 1264.92V1265.98C180.85 1265.8 180.539 1265.67 180.227 1265.58C179.914 1265.49 179.596 1265.44 179.271 1265.44C178.783 1265.44 178.418 1265.52 178.176 1265.68C177.938 1265.84 177.818 1266.08 177.818 1266.4C177.818 1266.69 177.908 1266.91 178.088 1267.06C178.268 1267.2 178.715 1267.34 179.43 1267.48L179.863 1267.56C180.398 1267.66 180.803 1267.87 181.076 1268.17C181.354 1268.48 181.492 1268.87 181.492 1269.36C181.492 1270.01 181.262 1270.52 180.801 1270.88C180.34 1271.25 179.699 1271.43 178.879 1271.43C178.555 1271.43 178.215 1271.39 177.859 1271.32C177.504 1271.26 177.119 1271.16 176.705 1271.02V1269.91C177.107 1270.11 177.492 1270.27 177.859 1270.37C178.227 1270.48 178.574 1270.53 178.902 1270.53C179.379 1270.53 179.748 1270.43 180.01 1270.24C180.271 1270.04 180.402 1269.77 180.402 1269.42C180.402 1268.92 179.924 1268.58 178.967 1268.39L178.92 1268.38L178.516 1268.29C177.895 1268.17 177.441 1267.97 177.156 1267.68C176.871 1267.4 176.729 1267 176.729 1266.51C176.729 1265.88 176.941 1265.39 177.367 1265.05C177.793 1264.71 178.4 1264.54 179.189 1264.54C179.541 1264.54 179.879 1264.57 180.203 1264.64C180.527 1264.7 180.846 1264.8 181.158 1264.92ZM143.518 1286.89C143.518 1287.37 143.605 1287.74 143.781 1287.98C143.961 1288.23 144.225 1288.35 144.572 1288.35H145.832V1289.26H144.467C143.822 1289.26 143.322 1289.05 142.967 1288.64C142.615 1288.23 142.439 1287.64 142.439 1286.89V1280.95H140.711V1280.11H143.518V1286.89ZM148.387 1282.72H151.146V1288.42H153.285V1289.26H147.93V1288.42H150.068V1283.56H148.387V1282.72ZM150.068 1280.17H151.146V1281.53H150.068V1280.17ZM159.924 1285.19V1289.26H158.84V1285.19C158.84 1284.6 158.736 1284.17 158.529 1283.89C158.322 1283.61 157.998 1283.48 157.557 1283.48C157.053 1283.48 156.664 1283.66 156.391 1284.01C156.121 1284.37 155.986 1284.88 155.986 1285.55V1289.26H154.908V1282.7H155.986V1283.68C156.178 1283.31 156.438 1283.02 156.766 1282.83C157.094 1282.64 157.482 1282.54 157.932 1282.54C158.6 1282.54 159.098 1282.76 159.426 1283.2C159.758 1283.64 159.924 1284.3 159.924 1285.19ZM162.379 1280.14H163.492V1285.42L166.322 1282.7H167.635L165.051 1285.17L168.039 1289.26H166.721L164.295 1285.87L163.492 1286.63V1289.26H162.379V1280.14ZM142.902 1334.83V1336.7H145.352V1337.53H142.902V1341.1C142.902 1341.58 142.994 1341.92 143.178 1342.11C143.361 1342.3 143.682 1342.4 144.139 1342.4H145.352V1343.26H144.033C143.225 1343.26 142.654 1343.1 142.322 1342.77C141.99 1342.45 141.824 1341.89 141.824 1341.1V1337.53H140.072V1336.7H141.824V1334.83H142.902ZM148.387 1336.72H151.146V1342.42H153.285V1343.26H147.93V1342.42H150.068V1337.56H148.387V1336.72ZM150.068 1334.17H151.146V1335.53H150.068V1334.17ZM157.363 1334.83V1336.7H159.812V1337.53H157.363V1341.1C157.363 1341.58 157.455 1341.92 157.639 1342.11C157.822 1342.3 158.143 1342.4 158.6 1342.4H159.812V1343.26H158.494C157.686 1343.26 157.115 1343.1 156.783 1342.77C156.451 1342.45 156.285 1341.89 156.285 1341.1V1337.53H154.533V1336.7H156.285V1334.83H157.363ZM165.209 1340.89C165.209 1341.37 165.297 1341.74 165.473 1341.98C165.652 1342.23 165.916 1342.35 166.264 1342.35H167.523V1343.26H166.158C165.514 1343.26 165.014 1343.05 164.658 1342.64C164.307 1342.23 164.131 1341.64 164.131 1340.89V1334.95H162.402V1334.11H165.209V1340.89ZM174.789 1339.44V1339.97H170.119V1340C170.088 1340.9 170.258 1341.54 170.629 1341.93C171.004 1342.32 171.531 1342.51 172.211 1342.51C172.555 1342.51 172.914 1342.46 173.289 1342.35C173.664 1342.24 174.064 1342.08 174.49 1341.85V1342.92C174.08 1343.09 173.684 1343.22 173.301 1343.3C172.922 1343.39 172.555 1343.43 172.199 1343.43C171.18 1343.43 170.383 1343.12 169.809 1342.51C169.234 1341.9 168.947 1341.06 168.947 1339.98C168.947 1338.94 169.229 1338.1 169.791 1337.48C170.354 1336.85 171.104 1336.54 172.041 1336.54C172.877 1336.54 173.535 1336.82 174.016 1337.39C174.5 1337.95 174.758 1338.64 174.789 1339.44ZM173.711 1339.12C173.664 1338.67 173.498 1338.28 173.213 1337.95C172.932 1337.62 172.525 1337.45 171.994 1337.45C171.475 1337.45 171.047 1337.62 170.711 1337.97C170.375 1338.31 170.191 1338.7 170.16 1339.13L173.711 1339.12ZM144.332 1355.53V1352.14H145.41V1361.26H144.332V1360.43C144.152 1360.76 143.912 1361.01 143.611 1361.18C143.314 1361.34 142.971 1361.43 142.58 1361.43C141.787 1361.43 141.162 1361.12 140.705 1360.51C140.252 1359.89 140.025 1359.04 140.025 1357.96C140.025 1356.89 140.254 1356.06 140.711 1355.45C141.168 1354.84 141.791 1354.54 142.58 1354.54C142.975 1354.54 143.322 1354.62 143.623 1354.8C143.924 1354.96 144.16 1355.21 144.332 1355.53ZM141.162 1357.98C141.162 1358.82 141.295 1359.45 141.561 1359.88C141.826 1360.3 142.219 1360.51 142.738 1360.51C143.258 1360.51 143.652 1360.3 143.922 1359.87C144.195 1359.44 144.332 1358.81 144.332 1357.98C144.332 1357.15 144.195 1356.52 143.922 1356.1C143.652 1355.67 143.258 1355.45 142.738 1355.45C142.219 1355.45 141.826 1355.67 141.561 1356.09C141.295 1356.52 141.162 1357.15 141.162 1357.98ZM153.098 1357.44V1357.97H148.428V1358C148.396 1358.9 148.566 1359.54 148.938 1359.93C149.312 1360.32 149.84 1360.51 150.52 1360.51C150.863 1360.51 151.223 1360.46 151.598 1360.35C151.973 1360.24 152.373 1360.08 152.799 1359.85V1360.92C152.389 1361.09 151.992 1361.22 151.609 1361.3C151.23 1361.39 150.863 1361.43 150.508 1361.43C149.488 1361.43 148.691 1361.12 148.117 1360.51C147.543 1359.9 147.256 1359.06 147.256 1357.98C147.256 1356.94 147.537 1356.1 148.1 1355.48C148.662 1354.85 149.412 1354.54 150.35 1354.54C151.186 1354.54 151.844 1354.82 152.324 1355.39C152.809 1355.95 153.066 1356.64 153.098 1357.44ZM152.02 1357.12C151.973 1356.67 151.807 1356.28 151.521 1355.95C151.24 1355.62 150.834 1355.45 150.303 1355.45C149.783 1355.45 149.355 1355.62 149.02 1355.97C148.684 1356.31 148.5 1356.7 148.469 1357.13L152.02 1357.12ZM159.467 1354.92V1355.98C159.158 1355.8 158.848 1355.67 158.535 1355.58C158.223 1355.49 157.904 1355.44 157.58 1355.44C157.092 1355.44 156.727 1355.52 156.484 1355.68C156.246 1355.84 156.127 1356.08 156.127 1356.4C156.127 1356.69 156.217 1356.91 156.396 1357.06C156.576 1357.2 157.023 1357.34 157.738 1357.48L158.172 1357.56C158.707 1357.66 159.111 1357.87 159.385 1358.17C159.662 1358.48 159.801 1358.87 159.801 1359.36C159.801 1360.01 159.57 1360.52 159.109 1360.88C158.648 1361.25 158.008 1361.43 157.188 1361.43C156.863 1361.43 156.523 1361.39 156.168 1361.32C155.812 1361.26 155.428 1361.16 155.014 1361.02V1359.91C155.416 1360.11 155.801 1360.27 156.168 1360.37C156.535 1360.48 156.883 1360.53 157.211 1360.53C157.688 1360.53 158.057 1360.43 158.318 1360.24C158.58 1360.04 158.711 1359.77 158.711 1359.42C158.711 1358.92 158.232 1358.58 157.275 1358.39L157.229 1358.38L156.824 1358.29C156.203 1358.17 155.75 1357.97 155.465 1357.68C155.18 1357.4 155.037 1357 155.037 1356.51C155.037 1355.88 155.25 1355.39 155.676 1355.05C156.102 1354.71 156.709 1354.54 157.498 1354.54C157.85 1354.54 158.188 1354.57 158.512 1354.64C158.836 1354.7 159.154 1354.8 159.467 1354.92ZM167.213 1360.92C166.924 1361.09 166.625 1361.22 166.316 1361.3C166.012 1361.39 165.699 1361.43 165.379 1361.43C164.363 1361.43 163.568 1361.12 162.994 1360.51C162.424 1359.91 162.139 1359.06 162.139 1357.98C162.139 1356.91 162.424 1356.06 162.994 1355.45C163.568 1354.84 164.363 1354.54 165.379 1354.54C165.695 1354.54 166.004 1354.58 166.305 1354.66C166.605 1354.74 166.908 1354.87 167.213 1355.04V1356.17C166.928 1355.92 166.641 1355.74 166.352 1355.62C166.066 1355.51 165.742 1355.45 165.379 1355.45C164.703 1355.45 164.184 1355.67 163.82 1356.11C163.457 1356.55 163.275 1357.17 163.275 1357.98C163.275 1358.79 163.457 1359.42 163.82 1359.86C164.188 1360.3 164.707 1360.51 165.379 1360.51C165.754 1360.51 166.09 1360.46 166.387 1360.34C166.684 1360.23 166.959 1360.05 167.213 1359.81V1360.92ZM174.994 1356.05C174.764 1355.87 174.529 1355.74 174.291 1355.66C174.053 1355.58 173.791 1355.53 173.506 1355.53C172.834 1355.53 172.32 1355.75 171.965 1356.17C171.609 1356.59 171.432 1357.2 171.432 1358V1361.26H170.348V1354.7H171.432V1355.98C171.611 1355.51 171.887 1355.16 172.258 1354.91C172.633 1354.66 173.076 1354.54 173.588 1354.54C173.854 1354.54 174.102 1354.57 174.332 1354.64C174.562 1354.7 174.783 1354.81 174.994 1354.95V1356.05ZM177.309 1354.72H180.068V1360.42H182.207V1361.26H176.852V1360.42H178.99V1355.56H177.309V1354.72ZM178.99 1352.17H180.068V1353.53H178.99V1352.17ZM184.885 1360.43V1363.76H183.801V1354.7H184.885V1355.53C185.064 1355.21 185.303 1354.96 185.6 1354.8C185.9 1354.62 186.246 1354.54 186.637 1354.54C187.43 1354.54 188.051 1354.84 188.5 1355.46C188.953 1356.07 189.18 1356.92 189.18 1358.01C189.18 1359.07 188.953 1359.91 188.5 1360.52C188.047 1361.13 187.426 1361.43 186.637 1361.43C186.238 1361.43 185.889 1361.34 185.588 1361.18C185.291 1361.01 185.057 1360.76 184.885 1360.43ZM188.049 1357.98C188.049 1357.15 187.916 1356.52 187.65 1356.09C187.389 1355.67 186.998 1355.45 186.479 1355.45C185.955 1355.45 185.559 1355.67 185.289 1356.1C185.02 1356.52 184.885 1357.15 184.885 1357.98C184.885 1358.81 185.02 1359.44 185.289 1359.87C185.559 1360.3 185.955 1360.51 186.479 1360.51C186.998 1360.51 187.389 1360.3 187.65 1359.88C187.916 1359.45 188.049 1358.82 188.049 1357.98ZM193.516 1352.83V1354.7H195.965V1355.53H193.516V1359.1C193.516 1359.58 193.607 1359.92 193.791 1360.11C193.975 1360.3 194.295 1360.4 194.752 1360.4H195.965V1361.26H194.646C193.838 1361.26 193.268 1361.1 192.936 1360.77C192.604 1360.45 192.438 1359.89 192.438 1359.1V1355.53H190.686V1354.7H192.438V1352.83H193.516ZM199 1354.72H201.76V1360.42H203.898V1361.26H198.543V1360.42H200.682V1355.56H199V1354.72ZM200.682 1352.17H201.76V1353.53H200.682V1352.17ZM207.988 1355.45C207.441 1355.45 207.027 1355.67 206.746 1356.09C206.465 1356.52 206.324 1357.15 206.324 1357.98C206.324 1358.82 206.465 1359.45 206.746 1359.88C207.027 1360.3 207.441 1360.51 207.988 1360.51C208.539 1360.51 208.955 1360.3 209.236 1359.88C209.518 1359.45 209.658 1358.82 209.658 1357.98C209.658 1357.15 209.518 1356.52 209.236 1356.09C208.955 1355.67 208.539 1355.45 207.988 1355.45ZM207.988 1354.54C208.898 1354.54 209.594 1354.83 210.074 1355.42C210.559 1356.01 210.801 1356.87 210.801 1357.98C210.801 1359.1 210.561 1359.96 210.08 1360.55C209.6 1361.14 208.902 1361.43 207.988 1361.43C207.078 1361.43 206.383 1361.14 205.902 1360.55C205.422 1359.96 205.182 1359.1 205.182 1357.98C205.182 1356.87 205.422 1356.01 205.902 1355.42C206.383 1354.83 207.078 1354.54 207.988 1354.54ZM217.768 1357.19V1361.26H216.684V1357.19C216.684 1356.6 216.58 1356.17 216.373 1355.89C216.166 1355.61 215.842 1355.48 215.4 1355.48C214.896 1355.48 214.508 1355.66 214.234 1356.01C213.965 1356.37 213.83 1356.88 213.83 1357.55V1361.26H212.752V1354.7H213.83V1355.68C214.021 1355.31 214.281 1355.02 214.609 1354.83C214.938 1354.64 215.326 1354.54 215.775 1354.54C216.443 1354.54 216.941 1354.76 217.27 1355.2C217.602 1355.64 217.768 1356.3 217.768 1357.19ZM141.156 1372.72H143.916V1378.42H146.055V1379.26H140.699V1378.42H142.838V1373.56H141.156V1372.72ZM142.838 1370.17H143.916V1371.53H142.838V1370.17ZM150.496 1373.36C150.629 1373.08 150.797 1372.88 151 1372.74C151.207 1372.61 151.455 1372.54 151.744 1372.54C152.271 1372.54 152.643 1372.74 152.857 1373.15C153.076 1373.56 153.186 1374.33 153.186 1375.46V1379.26H152.201V1375.5C152.201 1374.58 152.148 1374 152.043 1373.78C151.941 1373.55 151.754 1373.44 151.48 1373.44C151.168 1373.44 150.953 1373.56 150.836 1373.8C150.723 1374.04 150.666 1374.61 150.666 1375.5V1379.26H149.682V1375.5C149.682 1374.57 149.625 1373.99 149.512 1373.77C149.402 1373.55 149.203 1373.44 148.914 1373.44C148.629 1373.44 148.43 1373.56 148.316 1373.8C148.207 1374.04 148.152 1374.61 148.152 1375.5V1379.26H147.174V1372.7H148.152V1373.26C148.281 1373.02 148.441 1372.85 148.633 1372.73C148.828 1372.6 149.049 1372.54 149.295 1372.54C149.592 1372.54 149.838 1372.61 150.033 1372.74C150.232 1372.88 150.387 1373.09 150.496 1373.36ZM157.879 1375.96H157.521C156.893 1375.96 156.418 1376.07 156.098 1376.29C155.781 1376.51 155.623 1376.84 155.623 1377.28C155.623 1377.67 155.742 1377.98 155.98 1378.2C156.219 1378.42 156.549 1378.53 156.971 1378.53C157.564 1378.53 158.031 1378.32 158.371 1377.91C158.711 1377.5 158.883 1376.93 158.887 1376.2V1375.96H157.879ZM159.971 1375.51V1379.26H158.887V1378.29C158.656 1378.68 158.365 1378.97 158.014 1379.15C157.666 1379.34 157.242 1379.43 156.742 1379.43C156.074 1379.43 155.541 1379.24 155.143 1378.87C154.744 1378.49 154.545 1377.98 154.545 1377.35C154.545 1376.62 154.789 1376.06 155.277 1375.68C155.77 1375.31 156.49 1375.12 157.439 1375.12H158.887V1374.95C158.883 1374.42 158.75 1374.04 158.488 1373.81C158.227 1373.57 157.809 1373.45 157.234 1373.45C156.867 1373.45 156.496 1373.51 156.121 1373.61C155.746 1373.72 155.381 1373.87 155.025 1374.07V1373C155.424 1372.84 155.805 1372.73 156.168 1372.66C156.535 1372.58 156.891 1372.54 157.234 1372.54C157.777 1372.54 158.24 1372.62 158.623 1372.78C159.01 1372.94 159.322 1373.18 159.561 1373.5C159.709 1373.69 159.814 1373.94 159.877 1374.23C159.939 1374.51 159.971 1374.94 159.971 1375.51ZM166.023 1375.92C166.023 1375.12 165.891 1374.5 165.625 1374.09C165.363 1373.66 164.98 1373.45 164.477 1373.45C163.949 1373.45 163.547 1373.66 163.27 1374.09C162.992 1374.5 162.854 1375.12 162.854 1375.92C162.854 1376.73 162.992 1377.35 163.27 1377.78C163.551 1378.2 163.957 1378.41 164.488 1378.41C164.984 1378.41 165.363 1378.2 165.625 1377.77C165.891 1377.34 166.023 1376.73 166.023 1375.92ZM167.102 1378.84C167.102 1379.82 166.869 1380.57 166.404 1381.08C165.939 1381.58 165.256 1381.84 164.354 1381.84C164.057 1381.84 163.746 1381.81 163.422 1381.76C163.098 1381.7 162.773 1381.62 162.449 1381.51V1380.45C162.832 1380.63 163.18 1380.76 163.492 1380.85C163.805 1380.93 164.092 1380.98 164.354 1380.98C164.936 1380.98 165.359 1380.82 165.625 1380.5C165.891 1380.18 166.023 1379.68 166.023 1379V1378.95V1378.22C165.852 1378.58 165.617 1378.86 165.32 1379.04C165.023 1379.22 164.662 1379.31 164.236 1379.31C163.471 1379.31 162.859 1379 162.402 1378.39C161.945 1377.77 161.717 1376.95 161.717 1375.92C161.717 1374.89 161.945 1374.07 162.402 1373.46C162.859 1372.84 163.471 1372.54 164.236 1372.54C164.658 1372.54 165.016 1372.62 165.309 1372.79C165.602 1372.96 165.84 1373.22 166.023 1373.57V1372.72H167.102V1378.84ZM174.789 1375.44V1375.97H170.119V1376C170.088 1376.9 170.258 1377.54 170.629 1377.93C171.004 1378.32 171.531 1378.51 172.211 1378.51C172.555 1378.51 172.914 1378.46 173.289 1378.35C173.664 1378.24 174.064 1378.08 174.49 1377.85V1378.92C174.08 1379.09 173.684 1379.22 173.301 1379.3C172.922 1379.39 172.555 1379.43 172.199 1379.43C171.18 1379.43 170.383 1379.12 169.809 1378.51C169.234 1377.9 168.947 1377.06 168.947 1375.98C168.947 1374.94 169.229 1374.1 169.791 1373.48C170.354 1372.85 171.104 1372.54 172.041 1372.54C172.877 1372.54 173.535 1372.82 174.016 1373.39C174.5 1373.95 174.758 1374.64 174.789 1375.44ZM173.711 1375.12C173.664 1374.67 173.498 1374.28 173.213 1373.95C172.932 1373.62 172.525 1373.45 171.994 1373.45C171.475 1373.45 171.047 1373.62 170.711 1373.97C170.375 1374.31 170.191 1374.7 170.16 1375.13L173.711 1375.12ZM181.158 1372.92V1373.98C180.85 1373.8 180.539 1373.67 180.227 1373.58C179.914 1373.49 179.596 1373.44 179.271 1373.44C178.783 1373.44 178.418 1373.52 178.176 1373.68C177.938 1373.84 177.818 1374.08 177.818 1374.4C177.818 1374.69 177.908 1374.91 178.088 1375.06C178.268 1375.2 178.715 1375.34 179.43 1375.48L179.863 1375.56C180.398 1375.66 180.803 1375.87 181.076 1376.17C181.354 1376.48 181.492 1376.87 181.492 1377.36C181.492 1378.01 181.262 1378.52 180.801 1378.88C180.34 1379.25 179.699 1379.43 178.879 1379.43C178.555 1379.43 178.215 1379.39 177.859 1379.32C177.504 1379.26 177.119 1379.16 176.705 1379.02V1377.91C177.107 1378.11 177.492 1378.27 177.859 1378.37C178.227 1378.48 178.574 1378.53 178.902 1378.53C179.379 1378.53 179.748 1378.43 180.01 1378.24C180.271 1378.04 180.402 1377.77 180.402 1377.42C180.402 1376.92 179.924 1376.58 178.967 1376.39L178.92 1376.38L178.516 1376.29C177.895 1376.17 177.441 1375.97 177.156 1375.68C176.871 1375.4 176.729 1375 176.729 1374.51C176.729 1373.88 176.941 1373.39 177.367 1373.05C177.793 1372.71 178.4 1372.54 179.189 1372.54C179.541 1372.54 179.879 1372.57 180.203 1372.64C180.527 1372.7 180.846 1372.8 181.158 1372.92ZM142.902 1424.83V1426.7H145.352V1427.53H142.902V1431.1C142.902 1431.58 142.994 1431.92 143.178 1432.11C143.361 1432.3 143.682 1432.4 144.139 1432.4H145.352V1433.26H144.033C143.225 1433.26 142.654 1433.1 142.322 1432.77C141.99 1432.45 141.824 1431.89 141.824 1431.1V1427.53H140.072V1426.7H141.824V1424.83H142.902ZM148.387 1426.72H151.146V1432.42H153.285V1433.26H147.93V1432.42H150.068V1427.56H148.387V1426.72ZM150.068 1424.17H151.146V1425.53H150.068V1424.17ZM157.363 1424.83V1426.7H159.812V1427.53H157.363V1431.1C157.363 1431.58 157.455 1431.92 157.639 1432.11C157.822 1432.3 158.143 1432.4 158.6 1432.4H159.812V1433.26H158.494C157.686 1433.26 157.115 1433.1 156.783 1432.77C156.451 1432.45 156.285 1431.89 156.285 1431.1V1427.53H154.533V1426.7H156.285V1424.83H157.363ZM165.209 1430.89C165.209 1431.37 165.297 1431.74 165.473 1431.98C165.652 1432.23 165.916 1432.35 166.264 1432.35H167.523V1433.26H166.158C165.514 1433.26 165.014 1433.05 164.658 1432.64C164.307 1432.23 164.131 1431.64 164.131 1430.89V1424.95H162.402V1424.11H165.209V1430.89ZM174.789 1429.44V1429.97H170.119V1430C170.088 1430.9 170.258 1431.54 170.629 1431.93C171.004 1432.32 171.531 1432.51 172.211 1432.51C172.555 1432.51 172.914 1432.46 173.289 1432.35C173.664 1432.24 174.064 1432.08 174.49 1431.85V1432.92C174.08 1433.09 173.684 1433.22 173.301 1433.3C172.922 1433.39 172.555 1433.43 172.199 1433.43C171.18 1433.43 170.383 1433.12 169.809 1432.51C169.234 1431.9 168.947 1431.06 168.947 1429.98C168.947 1428.94 169.229 1428.1 169.791 1427.48C170.354 1426.85 171.104 1426.54 172.041 1426.54C172.877 1426.54 173.535 1426.82 174.016 1427.39C174.5 1427.95 174.758 1428.64 174.789 1429.44ZM173.711 1429.12C173.664 1428.67 173.498 1428.28 173.213 1427.95C172.932 1427.62 172.525 1427.45 171.994 1427.45C171.475 1427.45 171.047 1427.62 170.711 1427.97C170.375 1428.31 170.191 1428.7 170.16 1429.13L173.711 1429.12ZM144.332 1445.53V1442.14H145.41V1451.26H144.332V1450.43C144.152 1450.76 143.912 1451.01 143.611 1451.18C143.314 1451.34 142.971 1451.43 142.58 1451.43C141.787 1451.43 141.162 1451.12 140.705 1450.51C140.252 1449.89 140.025 1449.04 140.025 1447.96C140.025 1446.89 140.254 1446.06 140.711 1445.45C141.168 1444.84 141.791 1444.54 142.58 1444.54C142.975 1444.54 143.322 1444.62 143.623 1444.8C143.924 1444.96 144.16 1445.21 144.332 1445.53ZM141.162 1447.98C141.162 1448.82 141.295 1449.45 141.561 1449.88C141.826 1450.3 142.219 1450.51 142.738 1450.51C143.258 1450.51 143.652 1450.3 143.922 1449.87C144.195 1449.44 144.332 1448.81 144.332 1447.98C144.332 1447.15 144.195 1446.52 143.922 1446.1C143.652 1445.67 143.258 1445.45 142.738 1445.45C142.219 1445.45 141.826 1445.67 141.561 1446.09C141.295 1446.52 141.162 1447.15 141.162 1447.98ZM153.098 1447.44V1447.97H148.428V1448C148.396 1448.9 148.566 1449.54 148.938 1449.93C149.312 1450.32 149.84 1450.51 150.52 1450.51C150.863 1450.51 151.223 1450.46 151.598 1450.35C151.973 1450.24 152.373 1450.08 152.799 1449.85V1450.92C152.389 1451.09 151.992 1451.22 151.609 1451.3C151.23 1451.39 150.863 1451.43 150.508 1451.43C149.488 1451.43 148.691 1451.12 148.117 1450.51C147.543 1449.9 147.256 1449.06 147.256 1447.98C147.256 1446.94 147.537 1446.1 148.1 1445.48C148.662 1444.85 149.412 1444.54 150.35 1444.54C151.186 1444.54 151.844 1444.82 152.324 1445.39C152.809 1445.95 153.066 1446.64 153.098 1447.44ZM152.02 1447.12C151.973 1446.67 151.807 1446.28 151.521 1445.95C151.24 1445.62 150.834 1445.45 150.303 1445.45C149.783 1445.45 149.355 1445.62 149.02 1445.97C148.684 1446.31 148.5 1446.7 148.469 1447.13L152.02 1447.12ZM159.467 1444.92V1445.98C159.158 1445.8 158.848 1445.67 158.535 1445.58C158.223 1445.49 157.904 1445.44 157.58 1445.44C157.092 1445.44 156.727 1445.52 156.484 1445.68C156.246 1445.84 156.127 1446.08 156.127 1446.4C156.127 1446.69 156.217 1446.91 156.396 1447.06C156.576 1447.2 157.023 1447.34 157.738 1447.48L158.172 1447.56C158.707 1447.66 159.111 1447.87 159.385 1448.17C159.662 1448.48 159.801 1448.87 159.801 1449.36C159.801 1450.01 159.57 1450.52 159.109 1450.88C158.648 1451.25 158.008 1451.43 157.188 1451.43C156.863 1451.43 156.523 1451.39 156.168 1451.32C155.812 1451.26 155.428 1451.16 155.014 1451.02V1449.91C155.416 1450.11 155.801 1450.27 156.168 1450.37C156.535 1450.48 156.883 1450.53 157.211 1450.53C157.688 1450.53 158.057 1450.43 158.318 1450.24C158.58 1450.04 158.711 1449.77 158.711 1449.42C158.711 1448.92 158.232 1448.58 157.275 1448.39L157.229 1448.38L156.824 1448.29C156.203 1448.17 155.75 1447.97 155.465 1447.68C155.18 1447.4 155.037 1447 155.037 1446.51C155.037 1445.88 155.25 1445.39 155.676 1445.05C156.102 1444.71 156.709 1444.54 157.498 1444.54C157.85 1444.54 158.188 1444.57 158.512 1444.64C158.836 1444.7 159.154 1444.8 159.467 1444.92ZM167.213 1450.92C166.924 1451.09 166.625 1451.22 166.316 1451.3C166.012 1451.39 165.699 1451.43 165.379 1451.43C164.363 1451.43 163.568 1451.12 162.994 1450.51C162.424 1449.91 162.139 1449.06 162.139 1447.98C162.139 1446.91 162.424 1446.06 162.994 1445.45C163.568 1444.84 164.363 1444.54 165.379 1444.54C165.695 1444.54 166.004 1444.58 166.305 1444.66C166.605 1444.74 166.908 1444.87 167.213 1445.04V1446.17C166.928 1445.92 166.641 1445.74 166.352 1445.62C166.066 1445.51 165.742 1445.45 165.379 1445.45C164.703 1445.45 164.184 1445.67 163.82 1446.11C163.457 1446.55 163.275 1447.17 163.275 1447.98C163.275 1448.79 163.457 1449.42 163.82 1449.86C164.188 1450.3 164.707 1450.51 165.379 1450.51C165.754 1450.51 166.09 1450.46 166.387 1450.34C166.684 1450.23 166.959 1450.05 167.213 1449.81V1450.92ZM174.994 1446.05C174.764 1445.87 174.529 1445.74 174.291 1445.66C174.053 1445.58 173.791 1445.53 173.506 1445.53C172.834 1445.53 172.32 1445.75 171.965 1446.17C171.609 1446.59 171.432 1447.2 171.432 1448V1451.26H170.348V1444.7H171.432V1445.98C171.611 1445.51 171.887 1445.16 172.258 1444.91C172.633 1444.66 173.076 1444.54 173.588 1444.54C173.854 1444.54 174.102 1444.57 174.332 1444.64C174.562 1444.7 174.783 1444.81 174.994 1444.95V1446.05ZM177.309 1444.72H180.068V1450.42H182.207V1451.26H176.852V1450.42H178.99V1445.56H177.309V1444.72ZM178.99 1442.17H180.068V1443.53H178.99V1442.17ZM184.885 1450.43V1453.76H183.801V1444.7H184.885V1445.53C185.064 1445.21 185.303 1444.96 185.6 1444.8C185.9 1444.62 186.246 1444.54 186.637 1444.54C187.43 1444.54 188.051 1444.84 188.5 1445.46C188.953 1446.07 189.18 1446.92 189.18 1448.01C189.18 1449.07 188.953 1449.91 188.5 1450.52C188.047 1451.13 187.426 1451.43 186.637 1451.43C186.238 1451.43 185.889 1451.34 185.588 1451.18C185.291 1451.01 185.057 1450.76 184.885 1450.43ZM188.049 1447.98C188.049 1447.15 187.916 1446.52 187.65 1446.09C187.389 1445.67 186.998 1445.45 186.479 1445.45C185.955 1445.45 185.559 1445.67 185.289 1446.1C185.02 1446.52 184.885 1447.15 184.885 1447.98C184.885 1448.81 185.02 1449.44 185.289 1449.87C185.559 1450.3 185.955 1450.51 186.479 1450.51C186.998 1450.51 187.389 1450.3 187.65 1449.88C187.916 1449.45 188.049 1448.82 188.049 1447.98ZM193.516 1442.83V1444.7H195.965V1445.53H193.516V1449.1C193.516 1449.58 193.607 1449.92 193.791 1450.11C193.975 1450.3 194.295 1450.4 194.752 1450.4H195.965V1451.26H194.646C193.838 1451.26 193.268 1451.1 192.936 1450.77C192.604 1450.45 192.438 1449.89 192.438 1449.1V1445.53H190.686V1444.7H192.438V1442.83H193.516ZM199 1444.72H201.76V1450.42H203.898V1451.26H198.543V1450.42H200.682V1445.56H199V1444.72ZM200.682 1442.17H201.76V1443.53H200.682V1442.17ZM207.988 1445.45C207.441 1445.45 207.027 1445.67 206.746 1446.09C206.465 1446.52 206.324 1447.15 206.324 1447.98C206.324 1448.82 206.465 1449.45 206.746 1449.88C207.027 1450.3 207.441 1450.51 207.988 1450.51C208.539 1450.51 208.955 1450.3 209.236 1449.88C209.518 1449.45 209.658 1448.82 209.658 1447.98C209.658 1447.15 209.518 1446.52 209.236 1446.09C208.955 1445.67 208.539 1445.45 207.988 1445.45ZM207.988 1444.54C208.898 1444.54 209.594 1444.83 210.074 1445.42C210.559 1446.01 210.801 1446.87 210.801 1447.98C210.801 1449.1 210.561 1449.96 210.08 1450.55C209.6 1451.14 208.902 1451.43 207.988 1451.43C207.078 1451.43 206.383 1451.14 205.902 1450.55C205.422 1449.96 205.182 1449.1 205.182 1447.98C205.182 1446.87 205.422 1446.01 205.902 1445.42C206.383 1444.83 207.078 1444.54 207.988 1444.54ZM217.768 1447.19V1451.26H216.684V1447.19C216.684 1446.6 216.58 1446.17 216.373 1445.89C216.166 1445.61 215.842 1445.48 215.4 1445.48C214.896 1445.48 214.508 1445.66 214.234 1446.01C213.965 1446.37 213.83 1446.88 213.83 1447.55V1451.26H212.752V1444.7H213.83V1445.68C214.021 1445.31 214.281 1445.02 214.609 1444.83C214.938 1444.64 215.326 1444.54 215.775 1444.54C216.443 1444.54 216.941 1444.76 217.27 1445.2C217.602 1445.64 217.768 1446.3 217.768 1447.19ZM141.156 1462.72H143.916V1468.42H146.055V1469.26H140.699V1468.42H142.838V1463.56H141.156V1462.72ZM142.838 1460.17H143.916V1461.53H142.838V1460.17ZM150.496 1463.36C150.629 1463.08 150.797 1462.88 151 1462.74C151.207 1462.61 151.455 1462.54 151.744 1462.54C152.271 1462.54 152.643 1462.74 152.857 1463.15C153.076 1463.56 153.186 1464.33 153.186 1465.46V1469.26H152.201V1465.5C152.201 1464.58 152.148 1464 152.043 1463.78C151.941 1463.55 151.754 1463.44 151.48 1463.44C151.168 1463.44 150.953 1463.56 150.836 1463.8C150.723 1464.04 150.666 1464.61 150.666 1465.5V1469.26H149.682V1465.5C149.682 1464.57 149.625 1463.99 149.512 1463.77C149.402 1463.55 149.203 1463.44 148.914 1463.44C148.629 1463.44 148.43 1463.56 148.316 1463.8C148.207 1464.04 148.152 1464.61 148.152 1465.5V1469.26H147.174V1462.7H148.152V1463.26C148.281 1463.02 148.441 1462.85 148.633 1462.73C148.828 1462.6 149.049 1462.54 149.295 1462.54C149.592 1462.54 149.838 1462.61 150.033 1462.74C150.232 1462.88 150.387 1463.09 150.496 1463.36ZM157.879 1465.96H157.521C156.893 1465.96 156.418 1466.07 156.098 1466.29C155.781 1466.51 155.623 1466.84 155.623 1467.28C155.623 1467.67 155.742 1467.98 155.98 1468.2C156.219 1468.42 156.549 1468.53 156.971 1468.53C157.564 1468.53 158.031 1468.32 158.371 1467.91C158.711 1467.5 158.883 1466.93 158.887 1466.2V1465.96H157.879ZM159.971 1465.51V1469.26H158.887V1468.29C158.656 1468.68 158.365 1468.97 158.014 1469.15C157.666 1469.34 157.242 1469.43 156.742 1469.43C156.074 1469.43 155.541 1469.24 155.143 1468.87C154.744 1468.49 154.545 1467.98 154.545 1467.35C154.545 1466.62 154.789 1466.06 155.277 1465.68C155.77 1465.31 156.49 1465.12 157.439 1465.12H158.887V1464.95C158.883 1464.42 158.75 1464.04 158.488 1463.81C158.227 1463.57 157.809 1463.45 157.234 1463.45C156.867 1463.45 156.496 1463.51 156.121 1463.61C155.746 1463.72 155.381 1463.87 155.025 1464.07V1463C155.424 1462.84 155.805 1462.73 156.168 1462.66C156.535 1462.58 156.891 1462.54 157.234 1462.54C157.777 1462.54 158.24 1462.62 158.623 1462.78C159.01 1462.94 159.322 1463.18 159.561 1463.5C159.709 1463.69 159.814 1463.94 159.877 1464.23C159.939 1464.51 159.971 1464.94 159.971 1465.51ZM166.023 1465.92C166.023 1465.12 165.891 1464.5 165.625 1464.09C165.363 1463.66 164.98 1463.45 164.477 1463.45C163.949 1463.45 163.547 1463.66 163.27 1464.09C162.992 1464.5 162.854 1465.12 162.854 1465.92C162.854 1466.73 162.992 1467.35 163.27 1467.78C163.551 1468.2 163.957 1468.41 164.488 1468.41C164.984 1468.41 165.363 1468.2 165.625 1467.77C165.891 1467.34 166.023 1466.73 166.023 1465.92ZM167.102 1468.84C167.102 1469.82 166.869 1470.57 166.404 1471.08C165.939 1471.58 165.256 1471.84 164.354 1471.84C164.057 1471.84 163.746 1471.81 163.422 1471.76C163.098 1471.7 162.773 1471.62 162.449 1471.51V1470.45C162.832 1470.63 163.18 1470.76 163.492 1470.85C163.805 1470.93 164.092 1470.98 164.354 1470.98C164.936 1470.98 165.359 1470.82 165.625 1470.5C165.891 1470.18 166.023 1469.68 166.023 1469V1468.95V1468.22C165.852 1468.58 165.617 1468.86 165.32 1469.04C165.023 1469.22 164.662 1469.31 164.236 1469.31C163.471 1469.31 162.859 1469 162.402 1468.39C161.945 1467.77 161.717 1466.95 161.717 1465.92C161.717 1464.89 161.945 1464.07 162.402 1463.46C162.859 1462.84 163.471 1462.54 164.236 1462.54C164.658 1462.54 165.016 1462.62 165.309 1462.79C165.602 1462.96 165.84 1463.22 166.023 1463.57V1462.72H167.102V1468.84ZM174.789 1465.44V1465.97H170.119V1466C170.088 1466.9 170.258 1467.54 170.629 1467.93C171.004 1468.32 171.531 1468.51 172.211 1468.51C172.555 1468.51 172.914 1468.46 173.289 1468.35C173.664 1468.24 174.064 1468.08 174.49 1467.85V1468.92C174.08 1469.09 173.684 1469.22 173.301 1469.3C172.922 1469.39 172.555 1469.43 172.199 1469.43C171.18 1469.43 170.383 1469.12 169.809 1468.51C169.234 1467.9 168.947 1467.06 168.947 1465.98C168.947 1464.94 169.229 1464.1 169.791 1463.48C170.354 1462.85 171.104 1462.54 172.041 1462.54C172.877 1462.54 173.535 1462.82 174.016 1463.39C174.5 1463.95 174.758 1464.64 174.789 1465.44ZM173.711 1465.12C173.664 1464.67 173.498 1464.28 173.213 1463.95C172.932 1463.62 172.525 1463.45 171.994 1463.45C171.475 1463.45 171.047 1463.62 170.711 1463.97C170.375 1464.31 170.191 1464.7 170.16 1465.13L173.711 1465.12ZM181.158 1462.92V1463.98C180.85 1463.8 180.539 1463.67 180.227 1463.58C179.914 1463.49 179.596 1463.44 179.271 1463.44C178.783 1463.44 178.418 1463.52 178.176 1463.68C177.938 1463.84 177.818 1464.08 177.818 1464.4C177.818 1464.69 177.908 1464.91 178.088 1465.06C178.268 1465.2 178.715 1465.34 179.43 1465.48L179.863 1465.56C180.398 1465.66 180.803 1465.87 181.076 1466.17C181.354 1466.48 181.492 1466.87 181.492 1467.36C181.492 1468.01 181.262 1468.52 180.801 1468.88C180.34 1469.25 179.699 1469.43 178.879 1469.43C178.555 1469.43 178.215 1469.39 177.859 1469.32C177.504 1469.26 177.119 1469.16 176.705 1469.02V1467.91C177.107 1468.11 177.492 1468.27 177.859 1468.37C178.227 1468.48 178.574 1468.53 178.902 1468.53C179.379 1468.53 179.748 1468.43 180.01 1468.24C180.271 1468.04 180.402 1467.77 180.402 1467.42C180.402 1466.92 179.924 1466.58 178.967 1466.39L178.92 1466.38L178.516 1466.29C177.895 1466.17 177.441 1465.97 177.156 1465.68C176.871 1465.4 176.729 1465 176.729 1464.51C176.729 1463.88 176.941 1463.39 177.367 1463.05C177.793 1462.71 178.4 1462.54 179.189 1462.54C179.541 1462.54 179.879 1462.57 180.203 1462.64C180.527 1462.7 180.846 1462.8 181.158 1462.92ZM142.902 1514.83V1516.7H145.352V1517.53H142.902V1521.1C142.902 1521.58 142.994 1521.92 143.178 1522.11C143.361 1522.3 143.682 1522.4 144.139 1522.4H145.352V1523.26H144.033C143.225 1523.26 142.654 1523.1 142.322 1522.77C141.99 1522.45 141.824 1521.89 141.824 1521.1V1517.53H140.072V1516.7H141.824V1514.83H142.902ZM148.387 1516.72H151.146V1522.42H153.285V1523.26H147.93V1522.42H150.068V1517.56H148.387V1516.72ZM150.068 1514.17H151.146V1515.53H150.068V1514.17ZM157.363 1514.83V1516.7H159.812V1517.53H157.363V1521.1C157.363 1521.58 157.455 1521.92 157.639 1522.11C157.822 1522.3 158.143 1522.4 158.6 1522.4H159.812V1523.26H158.494C157.686 1523.26 157.115 1523.1 156.783 1522.77C156.451 1522.45 156.285 1521.89 156.285 1521.1V1517.53H154.533V1516.7H156.285V1514.83H157.363ZM165.209 1520.89C165.209 1521.37 165.297 1521.74 165.473 1521.98C165.652 1522.23 165.916 1522.35 166.264 1522.35H167.523V1523.26H166.158C165.514 1523.26 165.014 1523.05 164.658 1522.64C164.307 1522.23 164.131 1521.64 164.131 1520.89V1514.95H162.402V1514.11H165.209V1520.89ZM174.789 1519.44V1519.97H170.119V1520C170.088 1520.9 170.258 1521.54 170.629 1521.93C171.004 1522.32 171.531 1522.51 172.211 1522.51C172.555 1522.51 172.914 1522.46 173.289 1522.35C173.664 1522.24 174.064 1522.08 174.49 1521.85V1522.92C174.08 1523.09 173.684 1523.22 173.301 1523.3C172.922 1523.39 172.555 1523.43 172.199 1523.43C171.18 1523.43 170.383 1523.12 169.809 1522.51C169.234 1521.9 168.947 1521.06 168.947 1519.98C168.947 1518.94 169.229 1518.1 169.791 1517.48C170.354 1516.85 171.104 1516.54 172.041 1516.54C172.877 1516.54 173.535 1516.82 174.016 1517.39C174.5 1517.95 174.758 1518.64 174.789 1519.44ZM173.711 1519.12C173.664 1518.67 173.498 1518.28 173.213 1517.95C172.932 1517.62 172.525 1517.45 171.994 1517.45C171.475 1517.45 171.047 1517.62 170.711 1517.97C170.375 1518.31 170.191 1518.7 170.16 1519.13L173.711 1519.12ZM144.332 1535.53V1532.14H145.41V1541.26H144.332V1540.43C144.152 1540.76 143.912 1541.01 143.611 1541.18C143.314 1541.34 142.971 1541.43 142.58 1541.43C141.787 1541.43 141.162 1541.12 140.705 1540.51C140.252 1539.89 140.025 1539.04 140.025 1537.96C140.025 1536.89 140.254 1536.06 140.711 1535.45C141.168 1534.84 141.791 1534.54 142.58 1534.54C142.975 1534.54 143.322 1534.62 143.623 1534.8C143.924 1534.96 144.16 1535.21 144.332 1535.53ZM141.162 1537.98C141.162 1538.82 141.295 1539.45 141.561 1539.88C141.826 1540.3 142.219 1540.51 142.738 1540.51C143.258 1540.51 143.652 1540.3 143.922 1539.87C144.195 1539.44 144.332 1538.81 144.332 1537.98C144.332 1537.15 144.195 1536.52 143.922 1536.1C143.652 1535.67 143.258 1535.45 142.738 1535.45C142.219 1535.45 141.826 1535.67 141.561 1536.09C141.295 1536.52 141.162 1537.15 141.162 1537.98ZM153.098 1537.44V1537.97H148.428V1538C148.396 1538.9 148.566 1539.54 148.938 1539.93C149.312 1540.32 149.84 1540.51 150.52 1540.51C150.863 1540.51 151.223 1540.46 151.598 1540.35C151.973 1540.24 152.373 1540.08 152.799 1539.85V1540.92C152.389 1541.09 151.992 1541.22 151.609 1541.3C151.23 1541.39 150.863 1541.43 150.508 1541.43C149.488 1541.43 148.691 1541.12 148.117 1540.51C147.543 1539.9 147.256 1539.06 147.256 1537.98C147.256 1536.94 147.537 1536.1 148.1 1535.48C148.662 1534.85 149.412 1534.54 150.35 1534.54C151.186 1534.54 151.844 1534.82 152.324 1535.39C152.809 1535.95 153.066 1536.64 153.098 1537.44ZM152.02 1537.12C151.973 1536.67 151.807 1536.28 151.521 1535.95C151.24 1535.62 150.834 1535.45 150.303 1535.45C149.783 1535.45 149.355 1535.62 149.02 1535.97C148.684 1536.31 148.5 1536.7 148.469 1537.13L152.02 1537.12ZM159.467 1534.92V1535.98C159.158 1535.8 158.848 1535.67 158.535 1535.58C158.223 1535.49 157.904 1535.44 157.58 1535.44C157.092 1535.44 156.727 1535.52 156.484 1535.68C156.246 1535.84 156.127 1536.08 156.127 1536.4C156.127 1536.69 156.217 1536.91 156.396 1537.06C156.576 1537.2 157.023 1537.34 157.738 1537.48L158.172 1537.56C158.707 1537.66 159.111 1537.87 159.385 1538.17C159.662 1538.48 159.801 1538.87 159.801 1539.36C159.801 1540.01 159.57 1540.52 159.109 1540.88C158.648 1541.25 158.008 1541.43 157.188 1541.43C156.863 1541.43 156.523 1541.39 156.168 1541.32C155.812 1541.26 155.428 1541.16 155.014 1541.02V1539.91C155.416 1540.11 155.801 1540.27 156.168 1540.37C156.535 1540.48 156.883 1540.53 157.211 1540.53C157.688 1540.53 158.057 1540.43 158.318 1540.24C158.58 1540.04 158.711 1539.77 158.711 1539.42C158.711 1538.92 158.232 1538.58 157.275 1538.39L157.229 1538.38L156.824 1538.29C156.203 1538.17 155.75 1537.97 155.465 1537.68C155.18 1537.4 155.037 1537 155.037 1536.51C155.037 1535.88 155.25 1535.39 155.676 1535.05C156.102 1534.71 156.709 1534.54 157.498 1534.54C157.85 1534.54 158.188 1534.57 158.512 1534.64C158.836 1534.7 159.154 1534.8 159.467 1534.92ZM167.213 1540.92C166.924 1541.09 166.625 1541.22 166.316 1541.3C166.012 1541.39 165.699 1541.43 165.379 1541.43C164.363 1541.43 163.568 1541.12 162.994 1540.51C162.424 1539.91 162.139 1539.06 162.139 1537.98C162.139 1536.91 162.424 1536.06 162.994 1535.45C163.568 1534.84 164.363 1534.54 165.379 1534.54C165.695 1534.54 166.004 1534.58 166.305 1534.66C166.605 1534.74 166.908 1534.87 167.213 1535.04V1536.17C166.928 1535.92 166.641 1535.74 166.352 1535.62C166.066 1535.51 165.742 1535.45 165.379 1535.45C164.703 1535.45 164.184 1535.67 163.82 1536.11C163.457 1536.55 163.275 1537.17 163.275 1537.98C163.275 1538.79 163.457 1539.42 163.82 1539.86C164.188 1540.3 164.707 1540.51 165.379 1540.51C165.754 1540.51 166.09 1540.46 166.387 1540.34C166.684 1540.23 166.959 1540.05 167.213 1539.81V1540.92ZM174.994 1536.05C174.764 1535.87 174.529 1535.74 174.291 1535.66C174.053 1535.58 173.791 1535.53 173.506 1535.53C172.834 1535.53 172.32 1535.75 171.965 1536.17C171.609 1536.59 171.432 1537.2 171.432 1538V1541.26H170.348V1534.7H171.432V1535.98C171.611 1535.51 171.887 1535.16 172.258 1534.91C172.633 1534.66 173.076 1534.54 173.588 1534.54C173.854 1534.54 174.102 1534.57 174.332 1534.64C174.562 1534.7 174.783 1534.81 174.994 1534.95V1536.05ZM177.309 1534.72H180.068V1540.42H182.207V1541.26H176.852V1540.42H178.99V1535.56H177.309V1534.72ZM178.99 1532.17H180.068V1533.53H178.99V1532.17ZM184.885 1540.43V1543.76H183.801V1534.7H184.885V1535.53C185.064 1535.21 185.303 1534.96 185.6 1534.8C185.9 1534.62 186.246 1534.54 186.637 1534.54C187.43 1534.54 188.051 1534.84 188.5 1535.46C188.953 1536.07 189.18 1536.92 189.18 1538.01C189.18 1539.07 188.953 1539.91 188.5 1540.52C188.047 1541.13 187.426 1541.43 186.637 1541.43C186.238 1541.43 185.889 1541.34 185.588 1541.18C185.291 1541.01 185.057 1540.76 184.885 1540.43ZM188.049 1537.98C188.049 1537.15 187.916 1536.52 187.65 1536.09C187.389 1535.67 186.998 1535.45 186.479 1535.45C185.955 1535.45 185.559 1535.67 185.289 1536.1C185.02 1536.52 184.885 1537.15 184.885 1537.98C184.885 1538.81 185.02 1539.44 185.289 1539.87C185.559 1540.3 185.955 1540.51 186.479 1540.51C186.998 1540.51 187.389 1540.3 187.65 1539.88C187.916 1539.45 188.049 1538.82 188.049 1537.98ZM193.516 1532.83V1534.7H195.965V1535.53H193.516V1539.1C193.516 1539.58 193.607 1539.92 193.791 1540.11C193.975 1540.3 194.295 1540.4 194.752 1540.4H195.965V1541.26H194.646C193.838 1541.26 193.268 1541.1 192.936 1540.77C192.604 1540.45 192.438 1539.89 192.438 1539.1V1535.53H190.686V1534.7H192.438V1532.83H193.516ZM199 1534.72H201.76V1540.42H203.898V1541.26H198.543V1540.42H200.682V1535.56H199V1534.72ZM200.682 1532.17H201.76V1533.53H200.682V1532.17ZM207.988 1535.45C207.441 1535.45 207.027 1535.67 206.746 1536.09C206.465 1536.52 206.324 1537.15 206.324 1537.98C206.324 1538.82 206.465 1539.45 206.746 1539.88C207.027 1540.3 207.441 1540.51 207.988 1540.51C208.539 1540.51 208.955 1540.3 209.236 1539.88C209.518 1539.45 209.658 1538.82 209.658 1537.98C209.658 1537.15 209.518 1536.52 209.236 1536.09C208.955 1535.67 208.539 1535.45 207.988 1535.45ZM207.988 1534.54C208.898 1534.54 209.594 1534.83 210.074 1535.42C210.559 1536.01 210.801 1536.87 210.801 1537.98C210.801 1539.1 210.561 1539.96 210.08 1540.55C209.6 1541.14 208.902 1541.43 207.988 1541.43C207.078 1541.43 206.383 1541.14 205.902 1540.55C205.422 1539.96 205.182 1539.1 205.182 1537.98C205.182 1536.87 205.422 1536.01 205.902 1535.42C206.383 1534.83 207.078 1534.54 207.988 1534.54ZM217.768 1537.19V1541.26H216.684V1537.19C216.684 1536.6 216.58 1536.17 216.373 1535.89C216.166 1535.61 215.842 1535.48 215.4 1535.48C214.896 1535.48 214.508 1535.66 214.234 1536.01C213.965 1536.37 213.83 1536.88 213.83 1537.55V1541.26H212.752V1534.7H213.83V1535.68C214.021 1535.31 214.281 1535.02 214.609 1534.83C214.938 1534.64 215.326 1534.54 215.775 1534.54C216.443 1534.54 216.941 1534.76 217.27 1535.2C217.602 1535.64 217.768 1536.3 217.768 1537.19ZM141.156 1552.72H143.916V1558.42H146.055V1559.26H140.699V1558.42H142.838V1553.56H141.156V1552.72ZM142.838 1550.17H143.916V1551.53H142.838V1550.17ZM150.496 1553.36C150.629 1553.08 150.797 1552.88 151 1552.74C151.207 1552.61 151.455 1552.54 151.744 1552.54C152.271 1552.54 152.643 1552.74 152.857 1553.15C153.076 1553.56 153.186 1554.33 153.186 1555.46V1559.26H152.201V1555.5C152.201 1554.58 152.148 1554 152.043 1553.78C151.941 1553.55 151.754 1553.44 151.48 1553.44C151.168 1553.44 150.953 1553.56 150.836 1553.8C150.723 1554.04 150.666 1554.61 150.666 1555.5V1559.26H149.682V1555.5C149.682 1554.57 149.625 1553.99 149.512 1553.77C149.402 1553.55 149.203 1553.44 148.914 1553.44C148.629 1553.44 148.43 1553.56 148.316 1553.8C148.207 1554.04 148.152 1554.61 148.152 1555.5V1559.26H147.174V1552.7H148.152V1553.26C148.281 1553.02 148.441 1552.85 148.633 1552.73C148.828 1552.6 149.049 1552.54 149.295 1552.54C149.592 1552.54 149.838 1552.61 150.033 1552.74C150.232 1552.88 150.387 1553.09 150.496 1553.36ZM157.879 1555.96H157.521C156.893 1555.96 156.418 1556.07 156.098 1556.29C155.781 1556.51 155.623 1556.84 155.623 1557.28C155.623 1557.67 155.742 1557.98 155.98 1558.2C156.219 1558.42 156.549 1558.53 156.971 1558.53C157.564 1558.53 158.031 1558.32 158.371 1557.91C158.711 1557.5 158.883 1556.93 158.887 1556.2V1555.96H157.879ZM159.971 1555.51V1559.26H158.887V1558.29C158.656 1558.68 158.365 1558.97 158.014 1559.15C157.666 1559.34 157.242 1559.43 156.742 1559.43C156.074 1559.43 155.541 1559.24 155.143 1558.87C154.744 1558.49 154.545 1557.98 154.545 1557.35C154.545 1556.62 154.789 1556.06 155.277 1555.68C155.77 1555.31 156.49 1555.12 157.439 1555.12H158.887V1554.95C158.883 1554.42 158.75 1554.04 158.488 1553.81C158.227 1553.57 157.809 1553.45 157.234 1553.45C156.867 1553.45 156.496 1553.51 156.121 1553.61C155.746 1553.72 155.381 1553.87 155.025 1554.07V1553C155.424 1552.84 155.805 1552.73 156.168 1552.66C156.535 1552.58 156.891 1552.54 157.234 1552.54C157.777 1552.54 158.24 1552.62 158.623 1552.78C159.01 1552.94 159.322 1553.18 159.561 1553.5C159.709 1553.69 159.814 1553.94 159.877 1554.23C159.939 1554.51 159.971 1554.94 159.971 1555.51ZM166.023 1555.92C166.023 1555.12 165.891 1554.5 165.625 1554.09C165.363 1553.66 164.98 1553.45 164.477 1553.45C163.949 1553.45 163.547 1553.66 163.27 1554.09C162.992 1554.5 162.854 1555.12 162.854 1555.92C162.854 1556.73 162.992 1557.35 163.27 1557.78C163.551 1558.2 163.957 1558.41 164.488 1558.41C164.984 1558.41 165.363 1558.2 165.625 1557.77C165.891 1557.34 166.023 1556.73 166.023 1555.92ZM167.102 1558.84C167.102 1559.82 166.869 1560.57 166.404 1561.08C165.939 1561.58 165.256 1561.84 164.354 1561.84C164.057 1561.84 163.746 1561.81 163.422 1561.76C163.098 1561.7 162.773 1561.62 162.449 1561.51V1560.45C162.832 1560.63 163.18 1560.76 163.492 1560.85C163.805 1560.93 164.092 1560.98 164.354 1560.98C164.936 1560.98 165.359 1560.82 165.625 1560.5C165.891 1560.18 166.023 1559.68 166.023 1559V1558.95V1558.22C165.852 1558.58 165.617 1558.86 165.32 1559.04C165.023 1559.22 164.662 1559.31 164.236 1559.31C163.471 1559.31 162.859 1559 162.402 1558.39C161.945 1557.77 161.717 1556.95 161.717 1555.92C161.717 1554.89 161.945 1554.07 162.402 1553.46C162.859 1552.84 163.471 1552.54 164.236 1552.54C164.658 1552.54 165.016 1552.62 165.309 1552.79C165.602 1552.96 165.84 1553.22 166.023 1553.57V1552.72H167.102V1558.84ZM174.789 1555.44V1555.97H170.119V1556C170.088 1556.9 170.258 1557.54 170.629 1557.93C171.004 1558.32 171.531 1558.51 172.211 1558.51C172.555 1558.51 172.914 1558.46 173.289 1558.35C173.664 1558.24 174.064 1558.08 174.49 1557.85V1558.92C174.08 1559.09 173.684 1559.22 173.301 1559.3C172.922 1559.39 172.555 1559.43 172.199 1559.43C171.18 1559.43 170.383 1559.12 169.809 1558.51C169.234 1557.9 168.947 1557.06 168.947 1555.98C168.947 1554.94 169.229 1554.1 169.791 1553.48C170.354 1552.85 171.104 1552.54 172.041 1552.54C172.877 1552.54 173.535 1552.82 174.016 1553.39C174.5 1553.95 174.758 1554.64 174.789 1555.44ZM173.711 1555.12C173.664 1554.67 173.498 1554.28 173.213 1553.95C172.932 1553.62 172.525 1553.45 171.994 1553.45C171.475 1553.45 171.047 1553.62 170.711 1553.97C170.375 1554.31 170.191 1554.7 170.16 1555.13L173.711 1555.12ZM181.158 1552.92V1553.98C180.85 1553.8 180.539 1553.67 180.227 1553.58C179.914 1553.49 179.596 1553.44 179.271 1553.44C178.783 1553.44 178.418 1553.52 178.176 1553.68C177.938 1553.84 177.818 1554.08 177.818 1554.4C177.818 1554.69 177.908 1554.91 178.088 1555.06C178.268 1555.2 178.715 1555.34 179.43 1555.48L179.863 1555.56C180.398 1555.66 180.803 1555.87 181.076 1556.17C181.354 1556.48 181.492 1556.87 181.492 1557.36C181.492 1558.01 181.262 1558.52 180.801 1558.88C180.34 1559.25 179.699 1559.43 178.879 1559.43C178.555 1559.43 178.215 1559.39 177.859 1559.32C177.504 1559.26 177.119 1559.16 176.705 1559.02V1557.91C177.107 1558.11 177.492 1558.27 177.859 1558.37C178.227 1558.48 178.574 1558.53 178.902 1558.53C179.379 1558.53 179.748 1558.43 180.01 1558.24C180.271 1558.04 180.402 1557.77 180.402 1557.42C180.402 1556.92 179.924 1556.58 178.967 1556.39L178.92 1556.38L178.516 1556.29C177.895 1556.17 177.441 1555.97 177.156 1555.68C176.871 1555.4 176.729 1555 176.729 1554.51C176.729 1553.88 176.941 1553.39 177.367 1553.05C177.793 1552.71 178.4 1552.54 179.189 1552.54C179.541 1552.54 179.879 1552.57 180.203 1552.64C180.527 1552.7 180.846 1552.8 181.158 1552.92ZM142.902 1604.83V1606.7H145.352V1607.53H142.902V1611.1C142.902 1611.58 142.994 1611.92 143.178 1612.11C143.361 1612.3 143.682 1612.4 144.139 1612.4H145.352V1613.26H144.033C143.225 1613.26 142.654 1613.1 142.322 1612.77C141.99 1612.45 141.824 1611.89 141.824 1611.1V1607.53H140.072V1606.7H141.824V1604.83H142.902ZM148.387 1606.72H151.146V1612.42H153.285V1613.26H147.93V1612.42H150.068V1607.56H148.387V1606.72ZM150.068 1604.17H151.146V1605.53H150.068V1604.17ZM157.363 1604.83V1606.7H159.812V1607.53H157.363V1611.1C157.363 1611.58 157.455 1611.92 157.639 1612.11C157.822 1612.3 158.143 1612.4 158.6 1612.4H159.812V1613.26H158.494C157.686 1613.26 157.115 1613.1 156.783 1612.77C156.451 1612.45 156.285 1611.89 156.285 1611.1V1607.53H154.533V1606.7H156.285V1604.83H157.363ZM165.209 1610.89C165.209 1611.37 165.297 1611.74 165.473 1611.98C165.652 1612.23 165.916 1612.35 166.264 1612.35H167.523V1613.26H166.158C165.514 1613.26 165.014 1613.05 164.658 1612.64C164.307 1612.23 164.131 1611.64 164.131 1610.89V1604.95H162.402V1604.11H165.209V1610.89ZM174.789 1609.44V1609.97H170.119V1610C170.088 1610.9 170.258 1611.54 170.629 1611.93C171.004 1612.32 171.531 1612.51 172.211 1612.51C172.555 1612.51 172.914 1612.46 173.289 1612.35C173.664 1612.24 174.064 1612.08 174.49 1611.85V1612.92C174.08 1613.09 173.684 1613.22 173.301 1613.3C172.922 1613.39 172.555 1613.43 172.199 1613.43C171.18 1613.43 170.383 1613.12 169.809 1612.51C169.234 1611.9 168.947 1611.06 168.947 1609.98C168.947 1608.94 169.229 1608.1 169.791 1607.48C170.354 1606.85 171.104 1606.54 172.041 1606.54C172.877 1606.54 173.535 1606.82 174.016 1607.39C174.5 1607.95 174.758 1608.64 174.789 1609.44ZM173.711 1609.12C173.664 1608.67 173.498 1608.28 173.213 1607.95C172.932 1607.62 172.525 1607.45 171.994 1607.45C171.475 1607.45 171.047 1607.62 170.711 1607.97C170.375 1608.31 170.191 1608.7 170.16 1609.13L173.711 1609.12ZM144.332 1625.53V1622.14H145.41V1631.26H144.332V1630.43C144.152 1630.76 143.912 1631.01 143.611 1631.18C143.314 1631.34 142.971 1631.43 142.58 1631.43C141.787 1631.43 141.162 1631.12 140.705 1630.51C140.252 1629.89 140.025 1629.04 140.025 1627.96C140.025 1626.89 140.254 1626.06 140.711 1625.45C141.168 1624.84 141.791 1624.54 142.58 1624.54C142.975 1624.54 143.322 1624.62 143.623 1624.8C143.924 1624.96 144.16 1625.21 144.332 1625.53ZM141.162 1627.98C141.162 1628.82 141.295 1629.45 141.561 1629.88C141.826 1630.3 142.219 1630.51 142.738 1630.51C143.258 1630.51 143.652 1630.3 143.922 1629.87C144.195 1629.44 144.332 1628.81 144.332 1627.98C144.332 1627.15 144.195 1626.52 143.922 1626.1C143.652 1625.67 143.258 1625.45 142.738 1625.45C142.219 1625.45 141.826 1625.67 141.561 1626.09C141.295 1626.52 141.162 1627.15 141.162 1627.98ZM153.098 1627.44V1627.97H148.428V1628C148.396 1628.9 148.566 1629.54 148.938 1629.93C149.312 1630.32 149.84 1630.51 150.52 1630.51C150.863 1630.51 151.223 1630.46 151.598 1630.35C151.973 1630.24 152.373 1630.08 152.799 1629.85V1630.92C152.389 1631.09 151.992 1631.22 151.609 1631.3C151.23 1631.39 150.863 1631.43 150.508 1631.43C149.488 1631.43 148.691 1631.12 148.117 1630.51C147.543 1629.9 147.256 1629.06 147.256 1627.98C147.256 1626.94 147.537 1626.1 148.1 1625.48C148.662 1624.85 149.412 1624.54 150.35 1624.54C151.186 1624.54 151.844 1624.82 152.324 1625.39C152.809 1625.95 153.066 1626.64 153.098 1627.44ZM152.02 1627.12C151.973 1626.67 151.807 1626.28 151.521 1625.95C151.24 1625.62 150.834 1625.45 150.303 1625.45C149.783 1625.45 149.355 1625.62 149.02 1625.97C148.684 1626.31 148.5 1626.7 148.469 1627.13L152.02 1627.12ZM159.467 1624.92V1625.98C159.158 1625.8 158.848 1625.67 158.535 1625.58C158.223 1625.49 157.904 1625.44 157.58 1625.44C157.092 1625.44 156.727 1625.52 156.484 1625.68C156.246 1625.84 156.127 1626.08 156.127 1626.4C156.127 1626.69 156.217 1626.91 156.396 1627.06C156.576 1627.2 157.023 1627.34 157.738 1627.48L158.172 1627.56C158.707 1627.66 159.111 1627.87 159.385 1628.17C159.662 1628.48 159.801 1628.87 159.801 1629.36C159.801 1630.01 159.57 1630.52 159.109 1630.88C158.648 1631.25 158.008 1631.43 157.188 1631.43C156.863 1631.43 156.523 1631.39 156.168 1631.32C155.812 1631.26 155.428 1631.16 155.014 1631.02V1629.91C155.416 1630.11 155.801 1630.27 156.168 1630.37C156.535 1630.48 156.883 1630.53 157.211 1630.53C157.688 1630.53 158.057 1630.43 158.318 1630.24C158.58 1630.04 158.711 1629.77 158.711 1629.42C158.711 1628.92 158.232 1628.58 157.275 1628.39L157.229 1628.38L156.824 1628.29C156.203 1628.17 155.75 1627.97 155.465 1627.68C155.18 1627.4 155.037 1627 155.037 1626.51C155.037 1625.88 155.25 1625.39 155.676 1625.05C156.102 1624.71 156.709 1624.54 157.498 1624.54C157.85 1624.54 158.188 1624.57 158.512 1624.64C158.836 1624.7 159.154 1624.8 159.467 1624.92ZM167.213 1630.92C166.924 1631.09 166.625 1631.22 166.316 1631.3C166.012 1631.39 165.699 1631.43 165.379 1631.43C164.363 1631.43 163.568 1631.12 162.994 1630.51C162.424 1629.91 162.139 1629.06 162.139 1627.98C162.139 1626.91 162.424 1626.06 162.994 1625.45C163.568 1624.84 164.363 1624.54 165.379 1624.54C165.695 1624.54 166.004 1624.58 166.305 1624.66C166.605 1624.74 166.908 1624.87 167.213 1625.04V1626.17C166.928 1625.92 166.641 1625.74 166.352 1625.62C166.066 1625.51 165.742 1625.45 165.379 1625.45C164.703 1625.45 164.184 1625.67 163.82 1626.11C163.457 1626.55 163.275 1627.17 163.275 1627.98C163.275 1628.79 163.457 1629.42 163.82 1629.86C164.188 1630.3 164.707 1630.51 165.379 1630.51C165.754 1630.51 166.09 1630.46 166.387 1630.34C166.684 1630.23 166.959 1630.05 167.213 1629.81V1630.92ZM174.994 1626.05C174.764 1625.87 174.529 1625.74 174.291 1625.66C174.053 1625.58 173.791 1625.53 173.506 1625.53C172.834 1625.53 172.32 1625.75 171.965 1626.17C171.609 1626.59 171.432 1627.2 171.432 1628V1631.26H170.348V1624.7H171.432V1625.98C171.611 1625.51 171.887 1625.16 172.258 1624.91C172.633 1624.66 173.076 1624.54 173.588 1624.54C173.854 1624.54 174.102 1624.57 174.332 1624.64C174.562 1624.7 174.783 1624.81 174.994 1624.95V1626.05ZM177.309 1624.72H180.068V1630.42H182.207V1631.26H176.852V1630.42H178.99V1625.56H177.309V1624.72ZM178.99 1622.17H180.068V1623.53H178.99V1622.17ZM184.885 1630.43V1633.76H183.801V1624.7H184.885V1625.53C185.064 1625.21 185.303 1624.96 185.6 1624.8C185.9 1624.62 186.246 1624.54 186.637 1624.54C187.43 1624.54 188.051 1624.84 188.5 1625.46C188.953 1626.07 189.18 1626.92 189.18 1628.01C189.18 1629.07 188.953 1629.91 188.5 1630.52C188.047 1631.13 187.426 1631.43 186.637 1631.43C186.238 1631.43 185.889 1631.34 185.588 1631.18C185.291 1631.01 185.057 1630.76 184.885 1630.43ZM188.049 1627.98C188.049 1627.15 187.916 1626.52 187.65 1626.09C187.389 1625.67 186.998 1625.45 186.479 1625.45C185.955 1625.45 185.559 1625.67 185.289 1626.1C185.02 1626.52 184.885 1627.15 184.885 1627.98C184.885 1628.81 185.02 1629.44 185.289 1629.87C185.559 1630.3 185.955 1630.51 186.479 1630.51C186.998 1630.51 187.389 1630.3 187.65 1629.88C187.916 1629.45 188.049 1628.82 188.049 1627.98ZM193.516 1622.83V1624.7H195.965V1625.53H193.516V1629.1C193.516 1629.58 193.607 1629.92 193.791 1630.11C193.975 1630.3 194.295 1630.4 194.752 1630.4H195.965V1631.26H194.646C193.838 1631.26 193.268 1631.1 192.936 1630.77C192.604 1630.45 192.438 1629.89 192.438 1629.1V1625.53H190.686V1624.7H192.438V1622.83H193.516ZM199 1624.72H201.76V1630.42H203.898V1631.26H198.543V1630.42H200.682V1625.56H199V1624.72ZM200.682 1622.17H201.76V1623.53H200.682V1622.17ZM207.988 1625.45C207.441 1625.45 207.027 1625.67 206.746 1626.09C206.465 1626.52 206.324 1627.15 206.324 1627.98C206.324 1628.82 206.465 1629.45 206.746 1629.88C207.027 1630.3 207.441 1630.51 207.988 1630.51C208.539 1630.51 208.955 1630.3 209.236 1629.88C209.518 1629.45 209.658 1628.82 209.658 1627.98C209.658 1627.15 209.518 1626.52 209.236 1626.09C208.955 1625.67 208.539 1625.45 207.988 1625.45ZM207.988 1624.54C208.898 1624.54 209.594 1624.83 210.074 1625.42C210.559 1626.01 210.801 1626.87 210.801 1627.98C210.801 1629.1 210.561 1629.96 210.08 1630.55C209.6 1631.14 208.902 1631.43 207.988 1631.43C207.078 1631.43 206.383 1631.14 205.902 1630.55C205.422 1629.96 205.182 1629.1 205.182 1627.98C205.182 1626.87 205.422 1626.01 205.902 1625.42C206.383 1624.83 207.078 1624.54 207.988 1624.54ZM217.768 1627.19V1631.26H216.684V1627.19C216.684 1626.6 216.58 1626.17 216.373 1625.89C216.166 1625.61 215.842 1625.48 215.4 1625.48C214.896 1625.48 214.508 1625.66 214.234 1626.01C213.965 1626.37 213.83 1626.88 213.83 1627.55V1631.26H212.752V1624.7H213.83V1625.68C214.021 1625.31 214.281 1625.02 214.609 1624.83C214.938 1624.64 215.326 1624.54 215.775 1624.54C216.443 1624.54 216.941 1624.76 217.27 1625.2C217.602 1625.64 217.768 1626.3 217.768 1627.19ZM141.156 1642.72H143.916V1648.42H146.055V1649.26H140.699V1648.42H142.838V1643.56H141.156V1642.72ZM142.838 1640.17H143.916V1641.53H142.838V1640.17ZM150.496 1643.36C150.629 1643.08 150.797 1642.88 151 1642.74C151.207 1642.61 151.455 1642.54 151.744 1642.54C152.271 1642.54 152.643 1642.74 152.857 1643.15C153.076 1643.56 153.186 1644.33 153.186 1645.46V1649.26H152.201V1645.5C152.201 1644.58 152.148 1644 152.043 1643.78C151.941 1643.55 151.754 1643.44 151.48 1643.44C151.168 1643.44 150.953 1643.56 150.836 1643.8C150.723 1644.04 150.666 1644.61 150.666 1645.5V1649.26H149.682V1645.5C149.682 1644.57 149.625 1643.99 149.512 1643.77C149.402 1643.55 149.203 1643.44 148.914 1643.44C148.629 1643.44 148.43 1643.56 148.316 1643.8C148.207 1644.04 148.152 1644.61 148.152 1645.5V1649.26H147.174V1642.7H148.152V1643.26C148.281 1643.02 148.441 1642.85 148.633 1642.73C148.828 1642.6 149.049 1642.54 149.295 1642.54C149.592 1642.54 149.838 1642.61 150.033 1642.74C150.232 1642.88 150.387 1643.09 150.496 1643.36ZM157.879 1645.96H157.521C156.893 1645.96 156.418 1646.07 156.098 1646.29C155.781 1646.51 155.623 1646.84 155.623 1647.28C155.623 1647.67 155.742 1647.98 155.98 1648.2C156.219 1648.42 156.549 1648.53 156.971 1648.53C157.564 1648.53 158.031 1648.32 158.371 1647.91C158.711 1647.5 158.883 1646.93 158.887 1646.2V1645.96H157.879ZM159.971 1645.51V1649.26H158.887V1648.29C158.656 1648.68 158.365 1648.97 158.014 1649.15C157.666 1649.34 157.242 1649.43 156.742 1649.43C156.074 1649.43 155.541 1649.24 155.143 1648.87C154.744 1648.49 154.545 1647.98 154.545 1647.35C154.545 1646.62 154.789 1646.06 155.277 1645.68C155.77 1645.31 156.49 1645.12 157.439 1645.12H158.887V1644.95C158.883 1644.42 158.75 1644.04 158.488 1643.81C158.227 1643.57 157.809 1643.45 157.234 1643.45C156.867 1643.45 156.496 1643.51 156.121 1643.61C155.746 1643.72 155.381 1643.87 155.025 1644.07V1643C155.424 1642.84 155.805 1642.73 156.168 1642.66C156.535 1642.58 156.891 1642.54 157.234 1642.54C157.777 1642.54 158.24 1642.62 158.623 1642.78C159.01 1642.94 159.322 1643.18 159.561 1643.5C159.709 1643.69 159.814 1643.94 159.877 1644.23C159.939 1644.51 159.971 1644.94 159.971 1645.51ZM166.023 1645.92C166.023 1645.12 165.891 1644.5 165.625 1644.09C165.363 1643.66 164.98 1643.45 164.477 1643.45C163.949 1643.45 163.547 1643.66 163.27 1644.09C162.992 1644.5 162.854 1645.12 162.854 1645.92C162.854 1646.73 162.992 1647.35 163.27 1647.78C163.551 1648.2 163.957 1648.41 164.488 1648.41C164.984 1648.41 165.363 1648.2 165.625 1647.77C165.891 1647.34 166.023 1646.73 166.023 1645.92ZM167.102 1648.84C167.102 1649.82 166.869 1650.57 166.404 1651.08C165.939 1651.58 165.256 1651.84 164.354 1651.84C164.057 1651.84 163.746 1651.81 163.422 1651.76C163.098 1651.7 162.773 1651.62 162.449 1651.51V1650.45C162.832 1650.63 163.18 1650.76 163.492 1650.85C163.805 1650.93 164.092 1650.98 164.354 1650.98C164.936 1650.98 165.359 1650.82 165.625 1650.5C165.891 1650.18 166.023 1649.68 166.023 1649V1648.95V1648.22C165.852 1648.58 165.617 1648.86 165.32 1649.04C165.023 1649.22 164.662 1649.31 164.236 1649.31C163.471 1649.31 162.859 1649 162.402 1648.39C161.945 1647.77 161.717 1646.95 161.717 1645.92C161.717 1644.89 161.945 1644.07 162.402 1643.46C162.859 1642.84 163.471 1642.54 164.236 1642.54C164.658 1642.54 165.016 1642.62 165.309 1642.79C165.602 1642.96 165.84 1643.22 166.023 1643.57V1642.72H167.102V1648.84ZM174.789 1645.44V1645.97H170.119V1646C170.088 1646.9 170.258 1647.54 170.629 1647.93C171.004 1648.32 171.531 1648.51 172.211 1648.51C172.555 1648.51 172.914 1648.46 173.289 1648.35C173.664 1648.24 174.064 1648.08 174.49 1647.85V1648.92C174.08 1649.09 173.684 1649.22 173.301 1649.3C172.922 1649.39 172.555 1649.43 172.199 1649.43C171.18 1649.43 170.383 1649.12 169.809 1648.51C169.234 1647.9 168.947 1647.06 168.947 1645.98C168.947 1644.94 169.229 1644.1 169.791 1643.48C170.354 1642.85 171.104 1642.54 172.041 1642.54C172.877 1642.54 173.535 1642.82 174.016 1643.39C174.5 1643.95 174.758 1644.64 174.789 1645.44ZM173.711 1645.12C173.664 1644.67 173.498 1644.28 173.213 1643.95C172.932 1643.62 172.525 1643.45 171.994 1643.45C171.475 1643.45 171.047 1643.62 170.711 1643.97C170.375 1644.31 170.191 1644.7 170.16 1645.13L173.711 1645.12ZM181.158 1642.92V1643.98C180.85 1643.8 180.539 1643.67 180.227 1643.58C179.914 1643.49 179.596 1643.44 179.271 1643.44C178.783 1643.44 178.418 1643.52 178.176 1643.68C177.938 1643.84 177.818 1644.08 177.818 1644.4C177.818 1644.69 177.908 1644.91 178.088 1645.06C178.268 1645.2 178.715 1645.34 179.43 1645.48L179.863 1645.56C180.398 1645.66 180.803 1645.87 181.076 1646.17C181.354 1646.48 181.492 1646.87 181.492 1647.36C181.492 1648.01 181.262 1648.52 180.801 1648.88C180.34 1649.25 179.699 1649.43 178.879 1649.43C178.555 1649.43 178.215 1649.39 177.859 1649.32C177.504 1649.26 177.119 1649.16 176.705 1649.02V1647.91C177.107 1648.11 177.492 1648.27 177.859 1648.37C178.227 1648.48 178.574 1648.53 178.902 1648.53C179.379 1648.53 179.748 1648.43 180.01 1648.24C180.271 1648.04 180.402 1647.77 180.402 1647.42C180.402 1646.92 179.924 1646.58 178.967 1646.39L178.92 1646.38L178.516 1646.29C177.895 1646.17 177.441 1645.97 177.156 1645.68C176.871 1645.4 176.729 1645 176.729 1644.51C176.729 1643.88 176.941 1643.39 177.367 1643.05C177.793 1642.71 178.4 1642.54 179.189 1642.54C179.541 1642.54 179.879 1642.57 180.203 1642.64C180.527 1642.7 180.846 1642.8 181.158 1642.92ZM142.902 1694.83V1696.7H145.352V1697.53H142.902V1701.1C142.902 1701.58 142.994 1701.92 143.178 1702.11C143.361 1702.3 143.682 1702.4 144.139 1702.4H145.352V1703.26H144.033C143.225 1703.26 142.654 1703.1 142.322 1702.77C141.99 1702.45 141.824 1701.89 141.824 1701.1V1697.53H140.072V1696.7H141.824V1694.83H142.902ZM148.387 1696.72H151.146V1702.42H153.285V1703.26H147.93V1702.42H150.068V1697.56H148.387V1696.72ZM150.068 1694.17H151.146V1695.53H150.068V1694.17ZM157.363 1694.83V1696.7H159.812V1697.53H157.363V1701.1C157.363 1701.58 157.455 1701.92 157.639 1702.11C157.822 1702.3 158.143 1702.4 158.6 1702.4H159.812V1703.26H158.494C157.686 1703.26 157.115 1703.1 156.783 1702.77C156.451 1702.45 156.285 1701.89 156.285 1701.1V1697.53H154.533V1696.7H156.285V1694.83H157.363ZM165.209 1700.89C165.209 1701.37 165.297 1701.74 165.473 1701.98C165.652 1702.23 165.916 1702.35 166.264 1702.35H167.523V1703.26H166.158C165.514 1703.26 165.014 1703.05 164.658 1702.64C164.307 1702.23 164.131 1701.64 164.131 1700.89V1694.95H162.402V1694.11H165.209V1700.89ZM174.789 1699.44V1699.97H170.119V1700C170.088 1700.9 170.258 1701.54 170.629 1701.93C171.004 1702.32 171.531 1702.51 172.211 1702.51C172.555 1702.51 172.914 1702.46 173.289 1702.35C173.664 1702.24 174.064 1702.08 174.49 1701.85V1702.92C174.08 1703.09 173.684 1703.22 173.301 1703.3C172.922 1703.39 172.555 1703.43 172.199 1703.43C171.18 1703.43 170.383 1703.12 169.809 1702.51C169.234 1701.9 168.947 1701.06 168.947 1699.98C168.947 1698.94 169.229 1698.1 169.791 1697.48C170.354 1696.85 171.104 1696.54 172.041 1696.54C172.877 1696.54 173.535 1696.82 174.016 1697.39C174.5 1697.95 174.758 1698.64 174.789 1699.44ZM173.711 1699.12C173.664 1698.67 173.498 1698.28 173.213 1697.95C172.932 1697.62 172.525 1697.45 171.994 1697.45C171.475 1697.45 171.047 1697.62 170.711 1697.97C170.375 1698.31 170.191 1698.7 170.16 1699.13L173.711 1699.12ZM144.332 1715.53V1712.14H145.41V1721.26H144.332V1720.43C144.152 1720.76 143.912 1721.01 143.611 1721.18C143.314 1721.34 142.971 1721.43 142.58 1721.43C141.787 1721.43 141.162 1721.12 140.705 1720.51C140.252 1719.89 140.025 1719.04 140.025 1717.96C140.025 1716.89 140.254 1716.06 140.711 1715.45C141.168 1714.84 141.791 1714.54 142.58 1714.54C142.975 1714.54 143.322 1714.62 143.623 1714.8C143.924 1714.96 144.16 1715.21 144.332 1715.53ZM141.162 1717.98C141.162 1718.82 141.295 1719.45 141.561 1719.88C141.826 1720.3 142.219 1720.51 142.738 1720.51C143.258 1720.51 143.652 1720.3 143.922 1719.87C144.195 1719.44 144.332 1718.81 144.332 1717.98C144.332 1717.15 144.195 1716.52 143.922 1716.1C143.652 1715.67 143.258 1715.45 142.738 1715.45C142.219 1715.45 141.826 1715.67 141.561 1716.09C141.295 1716.52 141.162 1717.15 141.162 1717.98ZM153.098 1717.44V1717.97H148.428V1718C148.396 1718.9 148.566 1719.54 148.938 1719.93C149.312 1720.32 149.84 1720.51 150.52 1720.51C150.863 1720.51 151.223 1720.46 151.598 1720.35C151.973 1720.24 152.373 1720.08 152.799 1719.85V1720.92C152.389 1721.09 151.992 1721.22 151.609 1721.3C151.23 1721.39 150.863 1721.43 150.508 1721.43C149.488 1721.43 148.691 1721.12 148.117 1720.51C147.543 1719.9 147.256 1719.06 147.256 1717.98C147.256 1716.94 147.537 1716.1 148.1 1715.48C148.662 1714.85 149.412 1714.54 150.35 1714.54C151.186 1714.54 151.844 1714.82 152.324 1715.39C152.809 1715.95 153.066 1716.64 153.098 1717.44ZM152.02 1717.12C151.973 1716.67 151.807 1716.28 151.521 1715.95C151.24 1715.62 150.834 1715.45 150.303 1715.45C149.783 1715.45 149.355 1715.62 149.02 1715.97C148.684 1716.31 148.5 1716.7 148.469 1717.13L152.02 1717.12ZM159.467 1714.92V1715.98C159.158 1715.8 158.848 1715.67 158.535 1715.58C158.223 1715.49 157.904 1715.44 157.58 1715.44C157.092 1715.44 156.727 1715.52 156.484 1715.68C156.246 1715.84 156.127 1716.08 156.127 1716.4C156.127 1716.69 156.217 1716.91 156.396 1717.06C156.576 1717.2 157.023 1717.34 157.738 1717.48L158.172 1717.56C158.707 1717.66 159.111 1717.87 159.385 1718.17C159.662 1718.48 159.801 1718.87 159.801 1719.36C159.801 1720.01 159.57 1720.52 159.109 1720.88C158.648 1721.25 158.008 1721.43 157.188 1721.43C156.863 1721.43 156.523 1721.39 156.168 1721.32C155.812 1721.26 155.428 1721.16 155.014 1721.02V1719.91C155.416 1720.11 155.801 1720.27 156.168 1720.37C156.535 1720.48 156.883 1720.53 157.211 1720.53C157.688 1720.53 158.057 1720.43 158.318 1720.24C158.58 1720.04 158.711 1719.77 158.711 1719.42C158.711 1718.92 158.232 1718.58 157.275 1718.39L157.229 1718.38L156.824 1718.29C156.203 1718.17 155.75 1717.97 155.465 1717.68C155.18 1717.4 155.037 1717 155.037 1716.51C155.037 1715.88 155.25 1715.39 155.676 1715.05C156.102 1714.71 156.709 1714.54 157.498 1714.54C157.85 1714.54 158.188 1714.57 158.512 1714.64C158.836 1714.7 159.154 1714.8 159.467 1714.92ZM167.213 1720.92C166.924 1721.09 166.625 1721.22 166.316 1721.3C166.012 1721.39 165.699 1721.43 165.379 1721.43C164.363 1721.43 163.568 1721.12 162.994 1720.51C162.424 1719.91 162.139 1719.06 162.139 1717.98C162.139 1716.91 162.424 1716.06 162.994 1715.45C163.568 1714.84 164.363 1714.54 165.379 1714.54C165.695 1714.54 166.004 1714.58 166.305 1714.66C166.605 1714.74 166.908 1714.87 167.213 1715.04V1716.17C166.928 1715.92 166.641 1715.74 166.352 1715.62C166.066 1715.51 165.742 1715.45 165.379 1715.45C164.703 1715.45 164.184 1715.67 163.82 1716.11C163.457 1716.55 163.275 1717.17 163.275 1717.98C163.275 1718.79 163.457 1719.42 163.82 1719.86C164.188 1720.3 164.707 1720.51 165.379 1720.51C165.754 1720.51 166.09 1720.46 166.387 1720.34C166.684 1720.23 166.959 1720.05 167.213 1719.81V1720.92ZM174.994 1716.05C174.764 1715.87 174.529 1715.74 174.291 1715.66C174.053 1715.58 173.791 1715.53 173.506 1715.53C172.834 1715.53 172.32 1715.75 171.965 1716.17C171.609 1716.59 171.432 1717.2 171.432 1718V1721.26H170.348V1714.7H171.432V1715.98C171.611 1715.51 171.887 1715.16 172.258 1714.91C172.633 1714.66 173.076 1714.54 173.588 1714.54C173.854 1714.54 174.102 1714.57 174.332 1714.64C174.562 1714.7 174.783 1714.81 174.994 1714.95V1716.05ZM177.309 1714.72H180.068V1720.42H182.207V1721.26H176.852V1720.42H178.99V1715.56H177.309V1714.72ZM178.99 1712.17H180.068V1713.53H178.99V1712.17ZM184.885 1720.43V1723.76H183.801V1714.7H184.885V1715.53C185.064 1715.21 185.303 1714.96 185.6 1714.8C185.9 1714.62 186.246 1714.54 186.637 1714.54C187.43 1714.54 188.051 1714.84 188.5 1715.46C188.953 1716.07 189.18 1716.92 189.18 1718.01C189.18 1719.07 188.953 1719.91 188.5 1720.52C188.047 1721.13 187.426 1721.43 186.637 1721.43C186.238 1721.43 185.889 1721.34 185.588 1721.18C185.291 1721.01 185.057 1720.76 184.885 1720.43ZM188.049 1717.98C188.049 1717.15 187.916 1716.52 187.65 1716.09C187.389 1715.67 186.998 1715.45 186.479 1715.45C185.955 1715.45 185.559 1715.67 185.289 1716.1C185.02 1716.52 184.885 1717.15 184.885 1717.98C184.885 1718.81 185.02 1719.44 185.289 1719.87C185.559 1720.3 185.955 1720.51 186.479 1720.51C186.998 1720.51 187.389 1720.3 187.65 1719.88C187.916 1719.45 188.049 1718.82 188.049 1717.98ZM193.516 1712.83V1714.7H195.965V1715.53H193.516V1719.1C193.516 1719.58 193.607 1719.92 193.791 1720.11C193.975 1720.3 194.295 1720.4 194.752 1720.4H195.965V1721.26H194.646C193.838 1721.26 193.268 1721.1 192.936 1720.77C192.604 1720.45 192.438 1719.89 192.438 1719.1V1715.53H190.686V1714.7H192.438V1712.83H193.516ZM199 1714.72H201.76V1720.42H203.898V1721.26H198.543V1720.42H200.682V1715.56H199V1714.72ZM200.682 1712.17H201.76V1713.53H200.682V1712.17ZM207.988 1715.45C207.441 1715.45 207.027 1715.67 206.746 1716.09C206.465 1716.52 206.324 1717.15 206.324 1717.98C206.324 1718.82 206.465 1719.45 206.746 1719.88C207.027 1720.3 207.441 1720.51 207.988 1720.51C208.539 1720.51 208.955 1720.3 209.236 1719.88C209.518 1719.45 209.658 1718.82 209.658 1717.98C209.658 1717.15 209.518 1716.52 209.236 1716.09C208.955 1715.67 208.539 1715.45 207.988 1715.45ZM207.988 1714.54C208.898 1714.54 209.594 1714.83 210.074 1715.42C210.559 1716.01 210.801 1716.87 210.801 1717.98C210.801 1719.1 210.561 1719.96 210.08 1720.55C209.6 1721.14 208.902 1721.43 207.988 1721.43C207.078 1721.43 206.383 1721.14 205.902 1720.55C205.422 1719.96 205.182 1719.1 205.182 1717.98C205.182 1716.87 205.422 1716.01 205.902 1715.42C206.383 1714.83 207.078 1714.54 207.988 1714.54ZM217.768 1717.19V1721.26H216.684V1717.19C216.684 1716.6 216.58 1716.17 216.373 1715.89C216.166 1715.61 215.842 1715.48 215.4 1715.48C214.896 1715.48 214.508 1715.66 214.234 1716.01C213.965 1716.37 213.83 1716.88 213.83 1717.55V1721.26H212.752V1714.7H213.83V1715.68C214.021 1715.31 214.281 1715.02 214.609 1714.83C214.938 1714.64 215.326 1714.54 215.775 1714.54C216.443 1714.54 216.941 1714.76 217.27 1715.2C217.602 1715.64 217.768 1716.3 217.768 1717.19ZM141.156 1732.72H143.916V1738.42H146.055V1739.26H140.699V1738.42H142.838V1733.56H141.156V1732.72ZM142.838 1730.17H143.916V1731.53H142.838V1730.17ZM150.496 1733.36C150.629 1733.08 150.797 1732.88 151 1732.74C151.207 1732.61 151.455 1732.54 151.744 1732.54C152.271 1732.54 152.643 1732.74 152.857 1733.15C153.076 1733.56 153.186 1734.33 153.186 1735.46V1739.26H152.201V1735.5C152.201 1734.58 152.148 1734 152.043 1733.78C151.941 1733.55 151.754 1733.44 151.48 1733.44C151.168 1733.44 150.953 1733.56 150.836 1733.8C150.723 1734.04 150.666 1734.61 150.666 1735.5V1739.26H149.682V1735.5C149.682 1734.57 149.625 1733.99 149.512 1733.77C149.402 1733.55 149.203 1733.44 148.914 1733.44C148.629 1733.44 148.43 1733.56 148.316 1733.8C148.207 1734.04 148.152 1734.61 148.152 1735.5V1739.26H147.174V1732.7H148.152V1733.26C148.281 1733.02 148.441 1732.85 148.633 1732.73C148.828 1732.6 149.049 1732.54 149.295 1732.54C149.592 1732.54 149.838 1732.61 150.033 1732.74C150.232 1732.88 150.387 1733.09 150.496 1733.36ZM157.879 1735.96H157.521C156.893 1735.96 156.418 1736.07 156.098 1736.29C155.781 1736.51 155.623 1736.84 155.623 1737.28C155.623 1737.67 155.742 1737.98 155.98 1738.2C156.219 1738.42 156.549 1738.53 156.971 1738.53C157.564 1738.53 158.031 1738.32 158.371 1737.91C158.711 1737.5 158.883 1736.93 158.887 1736.2V1735.96H157.879ZM159.971 1735.51V1739.26H158.887V1738.29C158.656 1738.68 158.365 1738.97 158.014 1739.15C157.666 1739.34 157.242 1739.43 156.742 1739.43C156.074 1739.43 155.541 1739.24 155.143 1738.87C154.744 1738.49 154.545 1737.98 154.545 1737.35C154.545 1736.62 154.789 1736.06 155.277 1735.68C155.77 1735.31 156.49 1735.12 157.439 1735.12H158.887V1734.95C158.883 1734.42 158.75 1734.04 158.488 1733.81C158.227 1733.57 157.809 1733.45 157.234 1733.45C156.867 1733.45 156.496 1733.51 156.121 1733.61C155.746 1733.72 155.381 1733.87 155.025 1734.07V1733C155.424 1732.84 155.805 1732.73 156.168 1732.66C156.535 1732.58 156.891 1732.54 157.234 1732.54C157.777 1732.54 158.24 1732.62 158.623 1732.78C159.01 1732.94 159.322 1733.18 159.561 1733.5C159.709 1733.69 159.814 1733.94 159.877 1734.23C159.939 1734.51 159.971 1734.94 159.971 1735.51ZM166.023 1735.92C166.023 1735.12 165.891 1734.5 165.625 1734.09C165.363 1733.66 164.98 1733.45 164.477 1733.45C163.949 1733.45 163.547 1733.66 163.27 1734.09C162.992 1734.5 162.854 1735.12 162.854 1735.92C162.854 1736.73 162.992 1737.35 163.27 1737.78C163.551 1738.2 163.957 1738.41 164.488 1738.41C164.984 1738.41 165.363 1738.2 165.625 1737.77C165.891 1737.34 166.023 1736.73 166.023 1735.92ZM167.102 1738.84C167.102 1739.82 166.869 1740.57 166.404 1741.08C165.939 1741.58 165.256 1741.84 164.354 1741.84C164.057 1741.84 163.746 1741.81 163.422 1741.76C163.098 1741.7 162.773 1741.62 162.449 1741.51V1740.45C162.832 1740.63 163.18 1740.76 163.492 1740.85C163.805 1740.93 164.092 1740.98 164.354 1740.98C164.936 1740.98 165.359 1740.82 165.625 1740.5C165.891 1740.18 166.023 1739.68 166.023 1739V1738.95V1738.22C165.852 1738.58 165.617 1738.86 165.32 1739.04C165.023 1739.22 164.662 1739.31 164.236 1739.31C163.471 1739.31 162.859 1739 162.402 1738.39C161.945 1737.77 161.717 1736.95 161.717 1735.92C161.717 1734.89 161.945 1734.07 162.402 1733.46C162.859 1732.84 163.471 1732.54 164.236 1732.54C164.658 1732.54 165.016 1732.62 165.309 1732.79C165.602 1732.96 165.84 1733.22 166.023 1733.57V1732.72H167.102V1738.84ZM174.789 1735.44V1735.97H170.119V1736C170.088 1736.9 170.258 1737.54 170.629 1737.93C171.004 1738.32 171.531 1738.51 172.211 1738.51C172.555 1738.51 172.914 1738.46 173.289 1738.35C173.664 1738.24 174.064 1738.08 174.49 1737.85V1738.92C174.08 1739.09 173.684 1739.22 173.301 1739.3C172.922 1739.39 172.555 1739.43 172.199 1739.43C171.18 1739.43 170.383 1739.12 169.809 1738.51C169.234 1737.9 168.947 1737.06 168.947 1735.98C168.947 1734.94 169.229 1734.1 169.791 1733.48C170.354 1732.85 171.104 1732.54 172.041 1732.54C172.877 1732.54 173.535 1732.82 174.016 1733.39C174.5 1733.95 174.758 1734.64 174.789 1735.44ZM173.711 1735.12C173.664 1734.67 173.498 1734.28 173.213 1733.95C172.932 1733.62 172.525 1733.45 171.994 1733.45C171.475 1733.45 171.047 1733.62 170.711 1733.97C170.375 1734.31 170.191 1734.7 170.16 1735.13L173.711 1735.12ZM181.158 1732.92V1733.98C180.85 1733.8 180.539 1733.67 180.227 1733.58C179.914 1733.49 179.596 1733.44 179.271 1733.44C178.783 1733.44 178.418 1733.52 178.176 1733.68C177.938 1733.84 177.818 1734.08 177.818 1734.4C177.818 1734.69 177.908 1734.91 178.088 1735.06C178.268 1735.2 178.715 1735.34 179.43 1735.48L179.863 1735.56C180.398 1735.66 180.803 1735.87 181.076 1736.17C181.354 1736.48 181.492 1736.87 181.492 1737.36C181.492 1738.01 181.262 1738.52 180.801 1738.88C180.34 1739.25 179.699 1739.43 178.879 1739.43C178.555 1739.43 178.215 1739.39 177.859 1739.32C177.504 1739.26 177.119 1739.16 176.705 1739.02V1737.91C177.107 1738.11 177.492 1738.27 177.859 1738.37C178.227 1738.48 178.574 1738.53 178.902 1738.53C179.379 1738.53 179.748 1738.43 180.01 1738.24C180.271 1738.04 180.402 1737.77 180.402 1737.42C180.402 1736.92 179.924 1736.58 178.967 1736.39L178.92 1736.38L178.516 1736.29C177.895 1736.17 177.441 1735.97 177.156 1735.68C176.871 1735.4 176.729 1735 176.729 1734.51C176.729 1733.88 176.941 1733.39 177.367 1733.05C177.793 1732.71 178.4 1732.54 179.189 1732.54C179.541 1732.54 179.879 1732.57 180.203 1732.64C180.527 1732.7 180.846 1732.8 181.158 1732.92ZM142.902 1784.83V1786.7H145.352V1787.53H142.902V1791.1C142.902 1791.58 142.994 1791.92 143.178 1792.11C143.361 1792.3 143.682 1792.4 144.139 1792.4H145.352V1793.26H144.033C143.225 1793.26 142.654 1793.1 142.322 1792.77C141.99 1792.45 141.824 1791.89 141.824 1791.1V1787.53H140.072V1786.7H141.824V1784.83H142.902ZM148.387 1786.72H151.146V1792.42H153.285V1793.26H147.93V1792.42H150.068V1787.56H148.387V1786.72ZM150.068 1784.17H151.146V1785.53H150.068V1784.17ZM157.363 1784.83V1786.7H159.812V1787.53H157.363V1791.1C157.363 1791.58 157.455 1791.92 157.639 1792.11C157.822 1792.3 158.143 1792.4 158.6 1792.4H159.812V1793.26H158.494C157.686 1793.26 157.115 1793.1 156.783 1792.77C156.451 1792.45 156.285 1791.89 156.285 1791.1V1787.53H154.533V1786.7H156.285V1784.83H157.363ZM165.209 1790.89C165.209 1791.37 165.297 1791.74 165.473 1791.98C165.652 1792.23 165.916 1792.35 166.264 1792.35H167.523V1793.26H166.158C165.514 1793.26 165.014 1793.05 164.658 1792.64C164.307 1792.23 164.131 1791.64 164.131 1790.89V1784.95H162.402V1784.11H165.209V1790.89ZM174.789 1789.44V1789.97H170.119V1790C170.088 1790.9 170.258 1791.54 170.629 1791.93C171.004 1792.32 171.531 1792.51 172.211 1792.51C172.555 1792.51 172.914 1792.46 173.289 1792.35C173.664 1792.24 174.064 1792.08 174.49 1791.85V1792.92C174.08 1793.09 173.684 1793.22 173.301 1793.3C172.922 1793.39 172.555 1793.43 172.199 1793.43C171.18 1793.43 170.383 1793.12 169.809 1792.51C169.234 1791.9 168.947 1791.06 168.947 1789.98C168.947 1788.94 169.229 1788.1 169.791 1787.48C170.354 1786.85 171.104 1786.54 172.041 1786.54C172.877 1786.54 173.535 1786.82 174.016 1787.39C174.5 1787.95 174.758 1788.64 174.789 1789.44ZM173.711 1789.12C173.664 1788.67 173.498 1788.28 173.213 1787.95C172.932 1787.62 172.525 1787.45 171.994 1787.45C171.475 1787.45 171.047 1787.62 170.711 1787.97C170.375 1788.31 170.191 1788.7 170.16 1789.13L173.711 1789.12ZM144.332 1805.53V1802.14H145.41V1811.26H144.332V1810.43C144.152 1810.76 143.912 1811.01 143.611 1811.18C143.314 1811.34 142.971 1811.43 142.58 1811.43C141.787 1811.43 141.162 1811.12 140.705 1810.51C140.252 1809.89 140.025 1809.04 140.025 1807.96C140.025 1806.89 140.254 1806.06 140.711 1805.45C141.168 1804.84 141.791 1804.54 142.58 1804.54C142.975 1804.54 143.322 1804.62 143.623 1804.8C143.924 1804.96 144.16 1805.21 144.332 1805.53ZM141.162 1807.98C141.162 1808.82 141.295 1809.45 141.561 1809.88C141.826 1810.3 142.219 1810.51 142.738 1810.51C143.258 1810.51 143.652 1810.3 143.922 1809.87C144.195 1809.44 144.332 1808.81 144.332 1807.98C144.332 1807.15 144.195 1806.52 143.922 1806.1C143.652 1805.67 143.258 1805.45 142.738 1805.45C142.219 1805.45 141.826 1805.67 141.561 1806.09C141.295 1806.52 141.162 1807.15 141.162 1807.98ZM153.098 1807.44V1807.97H148.428V1808C148.396 1808.9 148.566 1809.54 148.938 1809.93C149.312 1810.32 149.84 1810.51 150.52 1810.51C150.863 1810.51 151.223 1810.46 151.598 1810.35C151.973 1810.24 152.373 1810.08 152.799 1809.85V1810.92C152.389 1811.09 151.992 1811.22 151.609 1811.3C151.23 1811.39 150.863 1811.43 150.508 1811.43C149.488 1811.43 148.691 1811.12 148.117 1810.51C147.543 1809.9 147.256 1809.06 147.256 1807.98C147.256 1806.94 147.537 1806.1 148.1 1805.48C148.662 1804.85 149.412 1804.54 150.35 1804.54C151.186 1804.54 151.844 1804.82 152.324 1805.39C152.809 1805.95 153.066 1806.64 153.098 1807.44ZM152.02 1807.12C151.973 1806.67 151.807 1806.28 151.521 1805.95C151.24 1805.62 150.834 1805.45 150.303 1805.45C149.783 1805.45 149.355 1805.62 149.02 1805.97C148.684 1806.31 148.5 1806.7 148.469 1807.13L152.02 1807.12ZM159.467 1804.92V1805.98C159.158 1805.8 158.848 1805.67 158.535 1805.58C158.223 1805.49 157.904 1805.44 157.58 1805.44C157.092 1805.44 156.727 1805.52 156.484 1805.68C156.246 1805.84 156.127 1806.08 156.127 1806.4C156.127 1806.69 156.217 1806.91 156.396 1807.06C156.576 1807.2 157.023 1807.34 157.738 1807.48L158.172 1807.56C158.707 1807.66 159.111 1807.87 159.385 1808.17C159.662 1808.48 159.801 1808.87 159.801 1809.36C159.801 1810.01 159.57 1810.52 159.109 1810.88C158.648 1811.25 158.008 1811.43 157.188 1811.43C156.863 1811.43 156.523 1811.39 156.168 1811.32C155.812 1811.26 155.428 1811.16 155.014 1811.02V1809.91C155.416 1810.11 155.801 1810.27 156.168 1810.37C156.535 1810.48 156.883 1810.53 157.211 1810.53C157.688 1810.53 158.057 1810.43 158.318 1810.24C158.58 1810.04 158.711 1809.77 158.711 1809.42C158.711 1808.92 158.232 1808.58 157.275 1808.39L157.229 1808.38L156.824 1808.29C156.203 1808.17 155.75 1807.97 155.465 1807.68C155.18 1807.4 155.037 1807 155.037 1806.51C155.037 1805.88 155.25 1805.39 155.676 1805.05C156.102 1804.71 156.709 1804.54 157.498 1804.54C157.85 1804.54 158.188 1804.57 158.512 1804.64C158.836 1804.7 159.154 1804.8 159.467 1804.92ZM167.213 1810.92C166.924 1811.09 166.625 1811.22 166.316 1811.3C166.012 1811.39 165.699 1811.43 165.379 1811.43C164.363 1811.43 163.568 1811.12 162.994 1810.51C162.424 1809.91 162.139 1809.06 162.139 1807.98C162.139 1806.91 162.424 1806.06 162.994 1805.45C163.568 1804.84 164.363 1804.54 165.379 1804.54C165.695 1804.54 166.004 1804.58 166.305 1804.66C166.605 1804.74 166.908 1804.87 167.213 1805.04V1806.17C166.928 1805.92 166.641 1805.74 166.352 1805.62C166.066 1805.51 165.742 1805.45 165.379 1805.45C164.703 1805.45 164.184 1805.67 163.82 1806.11C163.457 1806.55 163.275 1807.17 163.275 1807.98C163.275 1808.79 163.457 1809.42 163.82 1809.86C164.188 1810.3 164.707 1810.51 165.379 1810.51C165.754 1810.51 166.09 1810.46 166.387 1810.34C166.684 1810.23 166.959 1810.05 167.213 1809.81V1810.92ZM174.994 1806.05C174.764 1805.87 174.529 1805.74 174.291 1805.66C174.053 1805.58 173.791 1805.53 173.506 1805.53C172.834 1805.53 172.32 1805.75 171.965 1806.17C171.609 1806.59 171.432 1807.2 171.432 1808V1811.26H170.348V1804.7H171.432V1805.98C171.611 1805.51 171.887 1805.16 172.258 1804.91C172.633 1804.66 173.076 1804.54 173.588 1804.54C173.854 1804.54 174.102 1804.57 174.332 1804.64C174.562 1804.7 174.783 1804.81 174.994 1804.95V1806.05ZM177.309 1804.72H180.068V1810.42H182.207V1811.26H176.852V1810.42H178.99V1805.56H177.309V1804.72ZM178.99 1802.17H180.068V1803.53H178.99V1802.17ZM184.885 1810.43V1813.76H183.801V1804.7H184.885V1805.53C185.064 1805.21 185.303 1804.96 185.6 1804.8C185.9 1804.62 186.246 1804.54 186.637 1804.54C187.43 1804.54 188.051 1804.84 188.5 1805.46C188.953 1806.07 189.18 1806.92 189.18 1808.01C189.18 1809.07 188.953 1809.91 188.5 1810.52C188.047 1811.13 187.426 1811.43 186.637 1811.43C186.238 1811.43 185.889 1811.34 185.588 1811.18C185.291 1811.01 185.057 1810.76 184.885 1810.43ZM188.049 1807.98C188.049 1807.15 187.916 1806.52 187.65 1806.09C187.389 1805.67 186.998 1805.45 186.479 1805.45C185.955 1805.45 185.559 1805.67 185.289 1806.1C185.02 1806.52 184.885 1807.15 184.885 1807.98C184.885 1808.81 185.02 1809.44 185.289 1809.87C185.559 1810.3 185.955 1810.51 186.479 1810.51C186.998 1810.51 187.389 1810.3 187.65 1809.88C187.916 1809.45 188.049 1808.82 188.049 1807.98ZM193.516 1802.83V1804.7H195.965V1805.53H193.516V1809.1C193.516 1809.58 193.607 1809.92 193.791 1810.11C193.975 1810.3 194.295 1810.4 194.752 1810.4H195.965V1811.26H194.646C193.838 1811.26 193.268 1811.1 192.936 1810.77C192.604 1810.45 192.438 1809.89 192.438 1809.1V1805.53H190.686V1804.7H192.438V1802.83H193.516ZM199 1804.72H201.76V1810.42H203.898V1811.26H198.543V1810.42H200.682V1805.56H199V1804.72ZM200.682 1802.17H201.76V1803.53H200.682V1802.17ZM207.988 1805.45C207.441 1805.45 207.027 1805.67 206.746 1806.09C206.465 1806.52 206.324 1807.15 206.324 1807.98C206.324 1808.82 206.465 1809.45 206.746 1809.88C207.027 1810.3 207.441 1810.51 207.988 1810.51C208.539 1810.51 208.955 1810.3 209.236 1809.88C209.518 1809.45 209.658 1808.82 209.658 1807.98C209.658 1807.15 209.518 1806.52 209.236 1806.09C208.955 1805.67 208.539 1805.45 207.988 1805.45ZM207.988 1804.54C208.898 1804.54 209.594 1804.83 210.074 1805.42C210.559 1806.01 210.801 1806.87 210.801 1807.98C210.801 1809.1 210.561 1809.96 210.08 1810.55C209.6 1811.14 208.902 1811.43 207.988 1811.43C207.078 1811.43 206.383 1811.14 205.902 1810.55C205.422 1809.96 205.182 1809.1 205.182 1807.98C205.182 1806.87 205.422 1806.01 205.902 1805.42C206.383 1804.83 207.078 1804.54 207.988 1804.54ZM217.768 1807.19V1811.26H216.684V1807.19C216.684 1806.6 216.58 1806.17 216.373 1805.89C216.166 1805.61 215.842 1805.48 215.4 1805.48C214.896 1805.48 214.508 1805.66 214.234 1806.01C213.965 1806.37 213.83 1806.88 213.83 1807.55V1811.26H212.752V1804.7H213.83V1805.68C214.021 1805.31 214.281 1805.02 214.609 1804.83C214.938 1804.64 215.326 1804.54 215.775 1804.54C216.443 1804.54 216.941 1804.76 217.27 1805.2C217.602 1805.64 217.768 1806.3 217.768 1807.19ZM141.156 1822.72H143.916V1828.42H146.055V1829.26H140.699V1828.42H142.838V1823.56H141.156V1822.72ZM142.838 1820.17H143.916V1821.53H142.838V1820.17ZM150.496 1823.36C150.629 1823.08 150.797 1822.88 151 1822.74C151.207 1822.61 151.455 1822.54 151.744 1822.54C152.271 1822.54 152.643 1822.74 152.857 1823.15C153.076 1823.56 153.186 1824.33 153.186 1825.46V1829.26H152.201V1825.5C152.201 1824.58 152.148 1824 152.043 1823.78C151.941 1823.55 151.754 1823.44 151.48 1823.44C151.168 1823.44 150.953 1823.56 150.836 1823.8C150.723 1824.04 150.666 1824.61 150.666 1825.5V1829.26H149.682V1825.5C149.682 1824.57 149.625 1823.99 149.512 1823.77C149.402 1823.55 149.203 1823.44 148.914 1823.44C148.629 1823.44 148.43 1823.56 148.316 1823.8C148.207 1824.04 148.152 1824.61 148.152 1825.5V1829.26H147.174V1822.7H148.152V1823.26C148.281 1823.02 148.441 1822.85 148.633 1822.73C148.828 1822.6 149.049 1822.54 149.295 1822.54C149.592 1822.54 149.838 1822.61 150.033 1822.74C150.232 1822.88 150.387 1823.09 150.496 1823.36ZM157.879 1825.96H157.521C156.893 1825.96 156.418 1826.07 156.098 1826.29C155.781 1826.51 155.623 1826.84 155.623 1827.28C155.623 1827.67 155.742 1827.98 155.98 1828.2C156.219 1828.42 156.549 1828.53 156.971 1828.53C157.564 1828.53 158.031 1828.32 158.371 1827.91C158.711 1827.5 158.883 1826.93 158.887 1826.2V1825.96H157.879ZM159.971 1825.51V1829.26H158.887V1828.29C158.656 1828.68 158.365 1828.97 158.014 1829.15C157.666 1829.34 157.242 1829.43 156.742 1829.43C156.074 1829.43 155.541 1829.24 155.143 1828.87C154.744 1828.49 154.545 1827.98 154.545 1827.35C154.545 1826.62 154.789 1826.06 155.277 1825.68C155.77 1825.31 156.49 1825.12 157.439 1825.12H158.887V1824.95C158.883 1824.42 158.75 1824.04 158.488 1823.81C158.227 1823.57 157.809 1823.45 157.234 1823.45C156.867 1823.45 156.496 1823.51 156.121 1823.61C155.746 1823.72 155.381 1823.87 155.025 1824.07V1823C155.424 1822.84 155.805 1822.73 156.168 1822.66C156.535 1822.58 156.891 1822.54 157.234 1822.54C157.777 1822.54 158.24 1822.62 158.623 1822.78C159.01 1822.94 159.322 1823.18 159.561 1823.5C159.709 1823.69 159.814 1823.94 159.877 1824.23C159.939 1824.51 159.971 1824.94 159.971 1825.51ZM166.023 1825.92C166.023 1825.12 165.891 1824.5 165.625 1824.09C165.363 1823.66 164.98 1823.45 164.477 1823.45C163.949 1823.45 163.547 1823.66 163.27 1824.09C162.992 1824.5 162.854 1825.12 162.854 1825.92C162.854 1826.73 162.992 1827.35 163.27 1827.78C163.551 1828.2 163.957 1828.41 164.488 1828.41C164.984 1828.41 165.363 1828.2 165.625 1827.77C165.891 1827.34 166.023 1826.73 166.023 1825.92ZM167.102 1828.84C167.102 1829.82 166.869 1830.57 166.404 1831.08C165.939 1831.58 165.256 1831.84 164.354 1831.84C164.057 1831.84 163.746 1831.81 163.422 1831.76C163.098 1831.7 162.773 1831.62 162.449 1831.51V1830.45C162.832 1830.63 163.18 1830.76 163.492 1830.85C163.805 1830.93 164.092 1830.98 164.354 1830.98C164.936 1830.98 165.359 1830.82 165.625 1830.5C165.891 1830.18 166.023 1829.68 166.023 1829V1828.95V1828.22C165.852 1828.58 165.617 1828.86 165.32 1829.04C165.023 1829.22 164.662 1829.31 164.236 1829.31C163.471 1829.31 162.859 1829 162.402 1828.39C161.945 1827.77 161.717 1826.95 161.717 1825.92C161.717 1824.89 161.945 1824.07 162.402 1823.46C162.859 1822.84 163.471 1822.54 164.236 1822.54C164.658 1822.54 165.016 1822.62 165.309 1822.79C165.602 1822.96 165.84 1823.22 166.023 1823.57V1822.72H167.102V1828.84ZM174.789 1825.44V1825.97H170.119V1826C170.088 1826.9 170.258 1827.54 170.629 1827.93C171.004 1828.32 171.531 1828.51 172.211 1828.51C172.555 1828.51 172.914 1828.46 173.289 1828.35C173.664 1828.24 174.064 1828.08 174.49 1827.85V1828.92C174.08 1829.09 173.684 1829.22 173.301 1829.3C172.922 1829.39 172.555 1829.43 172.199 1829.43C171.18 1829.43 170.383 1829.12 169.809 1828.51C169.234 1827.9 168.947 1827.06 168.947 1825.98C168.947 1824.94 169.229 1824.1 169.791 1823.48C170.354 1822.85 171.104 1822.54 172.041 1822.54C172.877 1822.54 173.535 1822.82 174.016 1823.39C174.5 1823.95 174.758 1824.64 174.789 1825.44ZM173.711 1825.12C173.664 1824.67 173.498 1824.28 173.213 1823.95C172.932 1823.62 172.525 1823.45 171.994 1823.45C171.475 1823.45 171.047 1823.62 170.711 1823.97C170.375 1824.31 170.191 1824.7 170.16 1825.13L173.711 1825.12ZM181.158 1822.92V1823.98C180.85 1823.8 180.539 1823.67 180.227 1823.58C179.914 1823.49 179.596 1823.44 179.271 1823.44C178.783 1823.44 178.418 1823.52 178.176 1823.68C177.938 1823.84 177.818 1824.08 177.818 1824.4C177.818 1824.69 177.908 1824.91 178.088 1825.06C178.268 1825.2 178.715 1825.34 179.43 1825.48L179.863 1825.56C180.398 1825.66 180.803 1825.87 181.076 1826.17C181.354 1826.48 181.492 1826.87 181.492 1827.36C181.492 1828.01 181.262 1828.52 180.801 1828.88C180.34 1829.25 179.699 1829.43 178.879 1829.43C178.555 1829.43 178.215 1829.39 177.859 1829.32C177.504 1829.26 177.119 1829.16 176.705 1829.02V1827.91C177.107 1828.11 177.492 1828.27 177.859 1828.37C178.227 1828.48 178.574 1828.53 178.902 1828.53C179.379 1828.53 179.748 1828.43 180.01 1828.24C180.271 1828.04 180.402 1827.77 180.402 1827.42C180.402 1826.92 179.924 1826.58 178.967 1826.39L178.92 1826.38L178.516 1826.29C177.895 1826.17 177.441 1825.97 177.156 1825.68C176.871 1825.4 176.729 1825 176.729 1824.51C176.729 1823.88 176.941 1823.39 177.367 1823.05C177.793 1822.71 178.4 1822.54 179.189 1822.54C179.541 1822.54 179.879 1822.57 180.203 1822.64C180.527 1822.7 180.846 1822.8 181.158 1822.92ZM142.902 1874.83V1876.7H145.352V1877.53H142.902V1881.1C142.902 1881.58 142.994 1881.92 143.178 1882.11C143.361 1882.3 143.682 1882.4 144.139 1882.4H145.352V1883.26H144.033C143.225 1883.26 142.654 1883.1 142.322 1882.77C141.99 1882.45 141.824 1881.89 141.824 1881.1V1877.53H140.072V1876.7H141.824V1874.83H142.902ZM148.387 1876.72H151.146V1882.42H153.285V1883.26H147.93V1882.42H150.068V1877.56H148.387V1876.72ZM150.068 1874.17H151.146V1875.53H150.068V1874.17ZM157.363 1874.83V1876.7H159.812V1877.53H157.363V1881.1C157.363 1881.58 157.455 1881.92 157.639 1882.11C157.822 1882.3 158.143 1882.4 158.6 1882.4H159.812V1883.26H158.494C157.686 1883.26 157.115 1883.1 156.783 1882.77C156.451 1882.45 156.285 1881.89 156.285 1881.1V1877.53H154.533V1876.7H156.285V1874.83H157.363ZM165.209 1880.89C165.209 1881.37 165.297 1881.74 165.473 1881.98C165.652 1882.23 165.916 1882.35 166.264 1882.35H167.523V1883.26H166.158C165.514 1883.26 165.014 1883.05 164.658 1882.64C164.307 1882.23 164.131 1881.64 164.131 1880.89V1874.95H162.402V1874.11H165.209V1880.89ZM174.789 1879.44V1879.97H170.119V1880C170.088 1880.9 170.258 1881.54 170.629 1881.93C171.004 1882.32 171.531 1882.51 172.211 1882.51C172.555 1882.51 172.914 1882.46 173.289 1882.35C173.664 1882.24 174.064 1882.08 174.49 1881.85V1882.92C174.08 1883.09 173.684 1883.22 173.301 1883.3C172.922 1883.39 172.555 1883.43 172.199 1883.43C171.18 1883.43 170.383 1883.12 169.809 1882.51C169.234 1881.9 168.947 1881.06 168.947 1879.98C168.947 1878.94 169.229 1878.1 169.791 1877.48C170.354 1876.85 171.104 1876.54 172.041 1876.54C172.877 1876.54 173.535 1876.82 174.016 1877.39C174.5 1877.95 174.758 1878.64 174.789 1879.44ZM173.711 1879.12C173.664 1878.67 173.498 1878.28 173.213 1877.95C172.932 1877.62 172.525 1877.45 171.994 1877.45C171.475 1877.45 171.047 1877.62 170.711 1877.97C170.375 1878.31 170.191 1878.7 170.16 1879.13L173.711 1879.12ZM144.332 1895.53V1892.14H145.41V1901.26H144.332V1900.43C144.152 1900.76 143.912 1901.01 143.611 1901.18C143.314 1901.34 142.971 1901.43 142.58 1901.43C141.787 1901.43 141.162 1901.12 140.705 1900.51C140.252 1899.89 140.025 1899.04 140.025 1897.96C140.025 1896.89 140.254 1896.06 140.711 1895.45C141.168 1894.84 141.791 1894.54 142.58 1894.54C142.975 1894.54 143.322 1894.62 143.623 1894.8C143.924 1894.96 144.16 1895.21 144.332 1895.53ZM141.162 1897.98C141.162 1898.82 141.295 1899.45 141.561 1899.88C141.826 1900.3 142.219 1900.51 142.738 1900.51C143.258 1900.51 143.652 1900.3 143.922 1899.87C144.195 1899.44 144.332 1898.81 144.332 1897.98C144.332 1897.15 144.195 1896.52 143.922 1896.1C143.652 1895.67 143.258 1895.45 142.738 1895.45C142.219 1895.45 141.826 1895.67 141.561 1896.09C141.295 1896.52 141.162 1897.15 141.162 1897.98ZM153.098 1897.44V1897.97H148.428V1898C148.396 1898.9 148.566 1899.54 148.938 1899.93C149.312 1900.32 149.84 1900.51 150.52 1900.51C150.863 1900.51 151.223 1900.46 151.598 1900.35C151.973 1900.24 152.373 1900.08 152.799 1899.85V1900.92C152.389 1901.09 151.992 1901.22 151.609 1901.3C151.23 1901.39 150.863 1901.43 150.508 1901.43C149.488 1901.43 148.691 1901.12 148.117 1900.51C147.543 1899.9 147.256 1899.06 147.256 1897.98C147.256 1896.94 147.537 1896.1 148.1 1895.48C148.662 1894.85 149.412 1894.54 150.35 1894.54C151.186 1894.54 151.844 1894.82 152.324 1895.39C152.809 1895.95 153.066 1896.64 153.098 1897.44ZM152.02 1897.12C151.973 1896.67 151.807 1896.28 151.521 1895.95C151.24 1895.62 150.834 1895.45 150.303 1895.45C149.783 1895.45 149.355 1895.62 149.02 1895.97C148.684 1896.31 148.5 1896.7 148.469 1897.13L152.02 1897.12ZM159.467 1894.92V1895.98C159.158 1895.8 158.848 1895.67 158.535 1895.58C158.223 1895.49 157.904 1895.44 157.58 1895.44C157.092 1895.44 156.727 1895.52 156.484 1895.68C156.246 1895.84 156.127 1896.08 156.127 1896.4C156.127 1896.69 156.217 1896.91 156.396 1897.06C156.576 1897.2 157.023 1897.34 157.738 1897.48L158.172 1897.56C158.707 1897.66 159.111 1897.87 159.385 1898.17C159.662 1898.48 159.801 1898.87 159.801 1899.36C159.801 1900.01 159.57 1900.52 159.109 1900.88C158.648 1901.25 158.008 1901.43 157.188 1901.43C156.863 1901.43 156.523 1901.39 156.168 1901.32C155.812 1901.26 155.428 1901.16 155.014 1901.02V1899.91C155.416 1900.11 155.801 1900.27 156.168 1900.37C156.535 1900.48 156.883 1900.53 157.211 1900.53C157.688 1900.53 158.057 1900.43 158.318 1900.24C158.58 1900.04 158.711 1899.77 158.711 1899.42C158.711 1898.92 158.232 1898.58 157.275 1898.39L157.229 1898.38L156.824 1898.29C156.203 1898.17 155.75 1897.97 155.465 1897.68C155.18 1897.4 155.037 1897 155.037 1896.51C155.037 1895.88 155.25 1895.39 155.676 1895.05C156.102 1894.71 156.709 1894.54 157.498 1894.54C157.85 1894.54 158.188 1894.57 158.512 1894.64C158.836 1894.7 159.154 1894.8 159.467 1894.92ZM167.213 1900.92C166.924 1901.09 166.625 1901.22 166.316 1901.3C166.012 1901.39 165.699 1901.43 165.379 1901.43C164.363 1901.43 163.568 1901.12 162.994 1900.51C162.424 1899.91 162.139 1899.06 162.139 1897.98C162.139 1896.91 162.424 1896.06 162.994 1895.45C163.568 1894.84 164.363 1894.54 165.379 1894.54C165.695 1894.54 166.004 1894.58 166.305 1894.66C166.605 1894.74 166.908 1894.87 167.213 1895.04V1896.17C166.928 1895.92 166.641 1895.74 166.352 1895.62C166.066 1895.51 165.742 1895.45 165.379 1895.45C164.703 1895.45 164.184 1895.67 163.82 1896.11C163.457 1896.55 163.275 1897.17 163.275 1897.98C163.275 1898.79 163.457 1899.42 163.82 1899.86C164.188 1900.3 164.707 1900.51 165.379 1900.51C165.754 1900.51 166.09 1900.46 166.387 1900.34C166.684 1900.23 166.959 1900.05 167.213 1899.81V1900.92ZM174.994 1896.05C174.764 1895.87 174.529 1895.74 174.291 1895.66C174.053 1895.58 173.791 1895.53 173.506 1895.53C172.834 1895.53 172.32 1895.75 171.965 1896.17C171.609 1896.59 171.432 1897.2 171.432 1898V1901.26H170.348V1894.7H171.432V1895.98C171.611 1895.51 171.887 1895.16 172.258 1894.91C172.633 1894.66 173.076 1894.54 173.588 1894.54C173.854 1894.54 174.102 1894.57 174.332 1894.64C174.562 1894.7 174.783 1894.81 174.994 1894.95V1896.05ZM177.309 1894.72H180.068V1900.42H182.207V1901.26H176.852V1900.42H178.99V1895.56H177.309V1894.72ZM178.99 1892.17H180.068V1893.53H178.99V1892.17ZM184.885 1900.43V1903.76H183.801V1894.7H184.885V1895.53C185.064 1895.21 185.303 1894.96 185.6 1894.8C185.9 1894.62 186.246 1894.54 186.637 1894.54C187.43 1894.54 188.051 1894.84 188.5 1895.46C188.953 1896.07 189.18 1896.92 189.18 1898.01C189.18 1899.07 188.953 1899.91 188.5 1900.52C188.047 1901.13 187.426 1901.43 186.637 1901.43C186.238 1901.43 185.889 1901.34 185.588 1901.18C185.291 1901.01 185.057 1900.76 184.885 1900.43ZM188.049 1897.98C188.049 1897.15 187.916 1896.52 187.65 1896.09C187.389 1895.67 186.998 1895.45 186.479 1895.45C185.955 1895.45 185.559 1895.67 185.289 1896.1C185.02 1896.52 184.885 1897.15 184.885 1897.98C184.885 1898.81 185.02 1899.44 185.289 1899.87C185.559 1900.3 185.955 1900.51 186.479 1900.51C186.998 1900.51 187.389 1900.3 187.65 1899.88C187.916 1899.45 188.049 1898.82 188.049 1897.98ZM193.516 1892.83V1894.7H195.965V1895.53H193.516V1899.1C193.516 1899.58 193.607 1899.92 193.791 1900.11C193.975 1900.3 194.295 1900.4 194.752 1900.4H195.965V1901.26H194.646C193.838 1901.26 193.268 1901.1 192.936 1900.77C192.604 1900.45 192.438 1899.89 192.438 1899.1V1895.53H190.686V1894.7H192.438V1892.83H193.516ZM199 1894.72H201.76V1900.42H203.898V1901.26H198.543V1900.42H200.682V1895.56H199V1894.72ZM200.682 1892.17H201.76V1893.53H200.682V1892.17ZM207.988 1895.45C207.441 1895.45 207.027 1895.67 206.746 1896.09C206.465 1896.52 206.324 1897.15 206.324 1897.98C206.324 1898.82 206.465 1899.45 206.746 1899.88C207.027 1900.3 207.441 1900.51 207.988 1900.51C208.539 1900.51 208.955 1900.3 209.236 1899.88C209.518 1899.45 209.658 1898.82 209.658 1897.98C209.658 1897.15 209.518 1896.52 209.236 1896.09C208.955 1895.67 208.539 1895.45 207.988 1895.45ZM207.988 1894.54C208.898 1894.54 209.594 1894.83 210.074 1895.42C210.559 1896.01 210.801 1896.87 210.801 1897.98C210.801 1899.1 210.561 1899.96 210.08 1900.55C209.6 1901.14 208.902 1901.43 207.988 1901.43C207.078 1901.43 206.383 1901.14 205.902 1900.55C205.422 1899.96 205.182 1899.1 205.182 1897.98C205.182 1896.87 205.422 1896.01 205.902 1895.42C206.383 1894.83 207.078 1894.54 207.988 1894.54ZM217.768 1897.19V1901.26H216.684V1897.19C216.684 1896.6 216.58 1896.17 216.373 1895.89C216.166 1895.61 215.842 1895.48 215.4 1895.48C214.896 1895.48 214.508 1895.66 214.234 1896.01C213.965 1896.37 213.83 1896.88 213.83 1897.55V1901.26H212.752V1894.7H213.83V1895.68C214.021 1895.31 214.281 1895.02 214.609 1894.83C214.938 1894.64 215.326 1894.54 215.775 1894.54C216.443 1894.54 216.941 1894.76 217.27 1895.2C217.602 1895.64 217.768 1896.3 217.768 1897.19ZM141.156 1912.72H143.916V1918.42H146.055V1919.26H140.699V1918.42H142.838V1913.56H141.156V1912.72ZM142.838 1910.17H143.916V1911.53H142.838V1910.17ZM150.496 1913.36C150.629 1913.08 150.797 1912.88 151 1912.74C151.207 1912.61 151.455 1912.54 151.744 1912.54C152.271 1912.54 152.643 1912.74 152.857 1913.15C153.076 1913.56 153.186 1914.33 153.186 1915.46V1919.26H152.201V1915.5C152.201 1914.58 152.148 1914 152.043 1913.78C151.941 1913.55 151.754 1913.44 151.48 1913.44C151.168 1913.44 150.953 1913.56 150.836 1913.8C150.723 1914.04 150.666 1914.61 150.666 1915.5V1919.26H149.682V1915.5C149.682 1914.57 149.625 1913.99 149.512 1913.77C149.402 1913.55 149.203 1913.44 148.914 1913.44C148.629 1913.44 148.43 1913.56 148.316 1913.8C148.207 1914.04 148.152 1914.61 148.152 1915.5V1919.26H147.174V1912.7H148.152V1913.26C148.281 1913.02 148.441 1912.85 148.633 1912.73C148.828 1912.6 149.049 1912.54 149.295 1912.54C149.592 1912.54 149.838 1912.61 150.033 1912.74C150.232 1912.88 150.387 1913.09 150.496 1913.36ZM157.879 1915.96H157.521C156.893 1915.96 156.418 1916.07 156.098 1916.29C155.781 1916.51 155.623 1916.84 155.623 1917.28C155.623 1917.67 155.742 1917.98 155.98 1918.2C156.219 1918.42 156.549 1918.53 156.971 1918.53C157.564 1918.53 158.031 1918.32 158.371 1917.91C158.711 1917.5 158.883 1916.93 158.887 1916.2V1915.96H157.879ZM159.971 1915.51V1919.26H158.887V1918.29C158.656 1918.68 158.365 1918.97 158.014 1919.15C157.666 1919.34 157.242 1919.43 156.742 1919.43C156.074 1919.43 155.541 1919.24 155.143 1918.87C154.744 1918.49 154.545 1917.98 154.545 1917.35C154.545 1916.62 154.789 1916.06 155.277 1915.68C155.77 1915.31 156.49 1915.12 157.439 1915.12H158.887V1914.95C158.883 1914.42 158.75 1914.04 158.488 1913.81C158.227 1913.57 157.809 1913.45 157.234 1913.45C156.867 1913.45 156.496 1913.51 156.121 1913.61C155.746 1913.72 155.381 1913.87 155.025 1914.07V1913C155.424 1912.84 155.805 1912.73 156.168 1912.66C156.535 1912.58 156.891 1912.54 157.234 1912.54C157.777 1912.54 158.24 1912.62 158.623 1912.78C159.01 1912.94 159.322 1913.18 159.561 1913.5C159.709 1913.69 159.814 1913.94 159.877 1914.23C159.939 1914.51 159.971 1914.94 159.971 1915.51ZM166.023 1915.92C166.023 1915.12 165.891 1914.5 165.625 1914.09C165.363 1913.66 164.98 1913.45 164.477 1913.45C163.949 1913.45 163.547 1913.66 163.27 1914.09C162.992 1914.5 162.854 1915.12 162.854 1915.92C162.854 1916.73 162.992 1917.35 163.27 1917.78C163.551 1918.2 163.957 1918.41 164.488 1918.41C164.984 1918.41 165.363 1918.2 165.625 1917.77C165.891 1917.34 166.023 1916.73 166.023 1915.92ZM167.102 1918.84C167.102 1919.82 166.869 1920.57 166.404 1921.08C165.939 1921.58 165.256 1921.84 164.354 1921.84C164.057 1921.84 163.746 1921.81 163.422 1921.76C163.098 1921.7 162.773 1921.62 162.449 1921.51V1920.45C162.832 1920.63 163.18 1920.76 163.492 1920.85C163.805 1920.93 164.092 1920.98 164.354 1920.98C164.936 1920.98 165.359 1920.82 165.625 1920.5C165.891 1920.18 166.023 1919.68 166.023 1919V1918.95V1918.22C165.852 1918.58 165.617 1918.86 165.32 1919.04C165.023 1919.22 164.662 1919.31 164.236 1919.31C163.471 1919.31 162.859 1919 162.402 1918.39C161.945 1917.77 161.717 1916.95 161.717 1915.92C161.717 1914.89 161.945 1914.07 162.402 1913.46C162.859 1912.84 163.471 1912.54 164.236 1912.54C164.658 1912.54 165.016 1912.62 165.309 1912.79C165.602 1912.96 165.84 1913.22 166.023 1913.57V1912.72H167.102V1918.84ZM174.789 1915.44V1915.97H170.119V1916C170.088 1916.9 170.258 1917.54 170.629 1917.93C171.004 1918.32 171.531 1918.51 172.211 1918.51C172.555 1918.51 172.914 1918.46 173.289 1918.35C173.664 1918.24 174.064 1918.08 174.49 1917.85V1918.92C174.08 1919.09 173.684 1919.22 173.301 1919.3C172.922 1919.39 172.555 1919.43 172.199 1919.43C171.18 1919.43 170.383 1919.12 169.809 1918.51C169.234 1917.9 168.947 1917.06 168.947 1915.98C168.947 1914.94 169.229 1914.1 169.791 1913.48C170.354 1912.85 171.104 1912.54 172.041 1912.54C172.877 1912.54 173.535 1912.82 174.016 1913.39C174.5 1913.95 174.758 1914.64 174.789 1915.44ZM173.711 1915.12C173.664 1914.67 173.498 1914.28 173.213 1913.95C172.932 1913.62 172.525 1913.45 171.994 1913.45C171.475 1913.45 171.047 1913.62 170.711 1913.97C170.375 1914.31 170.191 1914.7 170.16 1915.13L173.711 1915.12ZM181.158 1912.92V1913.98C180.85 1913.8 180.539 1913.67 180.227 1913.58C179.914 1913.49 179.596 1913.44 179.271 1913.44C178.783 1913.44 178.418 1913.52 178.176 1913.68C177.938 1913.84 177.818 1914.08 177.818 1914.4C177.818 1914.69 177.908 1914.91 178.088 1915.06C178.268 1915.2 178.715 1915.34 179.43 1915.48L179.863 1915.56C180.398 1915.66 180.803 1915.87 181.076 1916.17C181.354 1916.48 181.492 1916.87 181.492 1917.36C181.492 1918.01 181.262 1918.52 180.801 1918.88C180.34 1919.25 179.699 1919.43 178.879 1919.43C178.555 1919.43 178.215 1919.39 177.859 1919.32C177.504 1919.26 177.119 1919.16 176.705 1919.02V1917.91C177.107 1918.11 177.492 1918.27 177.859 1918.37C178.227 1918.48 178.574 1918.53 178.902 1918.53C179.379 1918.53 179.748 1918.43 180.01 1918.24C180.271 1918.04 180.402 1917.77 180.402 1917.42C180.402 1916.92 179.924 1916.58 178.967 1916.39L178.92 1916.38L178.516 1916.29C177.895 1916.17 177.441 1915.97 177.156 1915.68C176.871 1915.4 176.729 1915 176.729 1914.51C176.729 1913.88 176.941 1913.39 177.367 1913.05C177.793 1912.71 178.4 1912.54 179.189 1912.54C179.541 1912.54 179.879 1912.57 180.203 1912.64C180.527 1912.7 180.846 1912.8 181.158 1912.92ZM142.902 1964.83V1966.7H145.352V1967.53H142.902V1971.1C142.902 1971.58 142.994 1971.92 143.178 1972.11C143.361 1972.3 143.682 1972.4 144.139 1972.4H145.352V1973.26H144.033C143.225 1973.26 142.654 1973.1 142.322 1972.77C141.99 1972.45 141.824 1971.89 141.824 1971.1V1967.53H140.072V1966.7H141.824V1964.83H142.902ZM148.387 1966.72H151.146V1972.42H153.285V1973.26H147.93V1972.42H150.068V1967.56H148.387V1966.72ZM150.068 1964.17H151.146V1965.53H150.068V1964.17ZM157.363 1964.83V1966.7H159.812V1967.53H157.363V1971.1C157.363 1971.58 157.455 1971.92 157.639 1972.11C157.822 1972.3 158.143 1972.4 158.6 1972.4H159.812V1973.26H158.494C157.686 1973.26 157.115 1973.1 156.783 1972.77C156.451 1972.45 156.285 1971.89 156.285 1971.1V1967.53H154.533V1966.7H156.285V1964.83H157.363ZM165.209 1970.89C165.209 1971.37 165.297 1971.74 165.473 1971.98C165.652 1972.23 165.916 1972.35 166.264 1972.35H167.523V1973.26H166.158C165.514 1973.26 165.014 1973.05 164.658 1972.64C164.307 1972.23 164.131 1971.64 164.131 1970.89V1964.95H162.402V1964.11H165.209V1970.89ZM174.789 1969.44V1969.97H170.119V1970C170.088 1970.9 170.258 1971.54 170.629 1971.93C171.004 1972.32 171.531 1972.51 172.211 1972.51C172.555 1972.51 172.914 1972.46 173.289 1972.35C173.664 1972.24 174.064 1972.08 174.49 1971.85V1972.92C174.08 1973.09 173.684 1973.22 173.301 1973.3C172.922 1973.39 172.555 1973.43 172.199 1973.43C171.18 1973.43 170.383 1973.12 169.809 1972.51C169.234 1971.9 168.947 1971.06 168.947 1969.98C168.947 1968.94 169.229 1968.1 169.791 1967.48C170.354 1966.85 171.104 1966.54 172.041 1966.54C172.877 1966.54 173.535 1966.82 174.016 1967.39C174.5 1967.95 174.758 1968.64 174.789 1969.44ZM173.711 1969.12C173.664 1968.67 173.498 1968.28 173.213 1967.95C172.932 1967.62 172.525 1967.45 171.994 1967.45C171.475 1967.45 171.047 1967.62 170.711 1967.97C170.375 1968.31 170.191 1968.7 170.16 1969.13L173.711 1969.12ZM144.332 1985.53V1982.14H145.41V1991.26H144.332V1990.43C144.152 1990.76 143.912 1991.01 143.611 1991.18C143.314 1991.34 142.971 1991.43 142.58 1991.43C141.787 1991.43 141.162 1991.12 140.705 1990.51C140.252 1989.89 140.025 1989.04 140.025 1987.96C140.025 1986.89 140.254 1986.06 140.711 1985.45C141.168 1984.84 141.791 1984.54 142.58 1984.54C142.975 1984.54 143.322 1984.62 143.623 1984.8C143.924 1984.96 144.16 1985.21 144.332 1985.53ZM141.162 1987.98C141.162 1988.82 141.295 1989.45 141.561 1989.88C141.826 1990.3 142.219 1990.51 142.738 1990.51C143.258 1990.51 143.652 1990.3 143.922 1989.87C144.195 1989.44 144.332 1988.81 144.332 1987.98C144.332 1987.15 144.195 1986.52 143.922 1986.1C143.652 1985.67 143.258 1985.45 142.738 1985.45C142.219 1985.45 141.826 1985.67 141.561 1986.09C141.295 1986.52 141.162 1987.15 141.162 1987.98ZM153.098 1987.44V1987.97H148.428V1988C148.396 1988.9 148.566 1989.54 148.938 1989.93C149.312 1990.32 149.84 1990.51 150.52 1990.51C150.863 1990.51 151.223 1990.46 151.598 1990.35C151.973 1990.24 152.373 1990.08 152.799 1989.85V1990.92C152.389 1991.09 151.992 1991.22 151.609 1991.3C151.23 1991.39 150.863 1991.43 150.508 1991.43C149.488 1991.43 148.691 1991.12 148.117 1990.51C147.543 1989.9 147.256 1989.06 147.256 1987.98C147.256 1986.94 147.537 1986.1 148.1 1985.48C148.662 1984.85 149.412 1984.54 150.35 1984.54C151.186 1984.54 151.844 1984.82 152.324 1985.39C152.809 1985.95 153.066 1986.64 153.098 1987.44ZM152.02 1987.12C151.973 1986.67 151.807 1986.28 151.521 1985.95C151.24 1985.62 150.834 1985.45 150.303 1985.45C149.783 1985.45 149.355 1985.62 149.02 1985.97C148.684 1986.31 148.5 1986.7 148.469 1987.13L152.02 1987.12ZM159.467 1984.92V1985.98C159.158 1985.8 158.848 1985.67 158.535 1985.58C158.223 1985.49 157.904 1985.44 157.58 1985.44C157.092 1985.44 156.727 1985.52 156.484 1985.68C156.246 1985.84 156.127 1986.08 156.127 1986.4C156.127 1986.69 156.217 1986.91 156.396 1987.06C156.576 1987.2 157.023 1987.34 157.738 1987.48L158.172 1987.56C158.707 1987.66 159.111 1987.87 159.385 1988.17C159.662 1988.48 159.801 1988.87 159.801 1989.36C159.801 1990.01 159.57 1990.52 159.109 1990.88C158.648 1991.25 158.008 1991.43 157.188 1991.43C156.863 1991.43 156.523 1991.39 156.168 1991.32C155.812 1991.26 155.428 1991.16 155.014 1991.02V1989.91C155.416 1990.11 155.801 1990.27 156.168 1990.37C156.535 1990.48 156.883 1990.53 157.211 1990.53C157.688 1990.53 158.057 1990.43 158.318 1990.24C158.58 1990.04 158.711 1989.77 158.711 1989.42C158.711 1988.92 158.232 1988.58 157.275 1988.39L157.229 1988.38L156.824 1988.29C156.203 1988.17 155.75 1987.97 155.465 1987.68C155.18 1987.4 155.037 1987 155.037 1986.51C155.037 1985.88 155.25 1985.39 155.676 1985.05C156.102 1984.71 156.709 1984.54 157.498 1984.54C157.85 1984.54 158.188 1984.57 158.512 1984.64C158.836 1984.7 159.154 1984.8 159.467 1984.92ZM167.213 1990.92C166.924 1991.09 166.625 1991.22 166.316 1991.3C166.012 1991.39 165.699 1991.43 165.379 1991.43C164.363 1991.43 163.568 1991.12 162.994 1990.51C162.424 1989.91 162.139 1989.06 162.139 1987.98C162.139 1986.91 162.424 1986.06 162.994 1985.45C163.568 1984.84 164.363 1984.54 165.379 1984.54C165.695 1984.54 166.004 1984.58 166.305 1984.66C166.605 1984.74 166.908 1984.87 167.213 1985.04V1986.17C166.928 1985.92 166.641 1985.74 166.352 1985.62C166.066 1985.51 165.742 1985.45 165.379 1985.45C164.703 1985.45 164.184 1985.67 163.82 1986.11C163.457 1986.55 163.275 1987.17 163.275 1987.98C163.275 1988.79 163.457 1989.42 163.82 1989.86C164.188 1990.3 164.707 1990.51 165.379 1990.51C165.754 1990.51 166.09 1990.46 166.387 1990.34C166.684 1990.23 166.959 1990.05 167.213 1989.81V1990.92ZM174.994 1986.05C174.764 1985.87 174.529 1985.74 174.291 1985.66C174.053 1985.58 173.791 1985.53 173.506 1985.53C172.834 1985.53 172.32 1985.75 171.965 1986.17C171.609 1986.59 171.432 1987.2 171.432 1988V1991.26H170.348V1984.7H171.432V1985.98C171.611 1985.51 171.887 1985.16 172.258 1984.91C172.633 1984.66 173.076 1984.54 173.588 1984.54C173.854 1984.54 174.102 1984.57 174.332 1984.64C174.562 1984.7 174.783 1984.81 174.994 1984.95V1986.05ZM177.309 1984.72H180.068V1990.42H182.207V1991.26H176.852V1990.42H178.99V1985.56H177.309V1984.72ZM178.99 1982.17H180.068V1983.53H178.99V1982.17ZM184.885 1990.43V1993.76H183.801V1984.7H184.885V1985.53C185.064 1985.21 185.303 1984.96 185.6 1984.8C185.9 1984.62 186.246 1984.54 186.637 1984.54C187.43 1984.54 188.051 1984.84 188.5 1985.46C188.953 1986.07 189.18 1986.92 189.18 1988.01C189.18 1989.07 188.953 1989.91 188.5 1990.52C188.047 1991.13 187.426 1991.43 186.637 1991.43C186.238 1991.43 185.889 1991.34 185.588 1991.18C185.291 1991.01 185.057 1990.76 184.885 1990.43ZM188.049 1987.98C188.049 1987.15 187.916 1986.52 187.65 1986.09C187.389 1985.67 186.998 1985.45 186.479 1985.45C185.955 1985.45 185.559 1985.67 185.289 1986.1C185.02 1986.52 184.885 1987.15 184.885 1987.98C184.885 1988.81 185.02 1989.44 185.289 1989.87C185.559 1990.3 185.955 1990.51 186.479 1990.51C186.998 1990.51 187.389 1990.3 187.65 1989.88C187.916 1989.45 188.049 1988.82 188.049 1987.98ZM193.516 1982.83V1984.7H195.965V1985.53H193.516V1989.1C193.516 1989.58 193.607 1989.92 193.791 1990.11C193.975 1990.3 194.295 1990.4 194.752 1990.4H195.965V1991.26H194.646C193.838 1991.26 193.268 1991.1 192.936 1990.77C192.604 1990.45 192.438 1989.89 192.438 1989.1V1985.53H190.686V1984.7H192.438V1982.83H193.516ZM199 1984.72H201.76V1990.42H203.898V1991.26H198.543V1990.42H200.682V1985.56H199V1984.72ZM200.682 1982.17H201.76V1983.53H200.682V1982.17ZM207.988 1985.45C207.441 1985.45 207.027 1985.67 206.746 1986.09C206.465 1986.52 206.324 1987.15 206.324 1987.98C206.324 1988.82 206.465 1989.45 206.746 1989.88C207.027 1990.3 207.441 1990.51 207.988 1990.51C208.539 1990.51 208.955 1990.3 209.236 1989.88C209.518 1989.45 209.658 1988.82 209.658 1987.98C209.658 1987.15 209.518 1986.52 209.236 1986.09C208.955 1985.67 208.539 1985.45 207.988 1985.45ZM207.988 1984.54C208.898 1984.54 209.594 1984.83 210.074 1985.42C210.559 1986.01 210.801 1986.87 210.801 1987.98C210.801 1989.1 210.561 1989.96 210.08 1990.55C209.6 1991.14 208.902 1991.43 207.988 1991.43C207.078 1991.43 206.383 1991.14 205.902 1990.55C205.422 1989.96 205.182 1989.1 205.182 1987.98C205.182 1986.87 205.422 1986.01 205.902 1985.42C206.383 1984.83 207.078 1984.54 207.988 1984.54ZM217.768 1987.19V1991.26H216.684V1987.19C216.684 1986.6 216.58 1986.17 216.373 1985.89C216.166 1985.61 215.842 1985.48 215.4 1985.48C214.896 1985.48 214.508 1985.66 214.234 1986.01C213.965 1986.37 213.83 1986.88 213.83 1987.55V1991.26H212.752V1984.7H213.83V1985.68C214.021 1985.31 214.281 1985.02 214.609 1984.83C214.938 1984.64 215.326 1984.54 215.775 1984.54C216.443 1984.54 216.941 1984.76 217.27 1985.2C217.602 1985.64 217.768 1986.3 217.768 1987.19ZM141.156 2002.72H143.916V2008.42H146.055V2009.26H140.699V2008.42H142.838V2003.56H141.156V2002.72ZM142.838 2000.17H143.916V2001.53H142.838V2000.17ZM150.496 2003.36C150.629 2003.08 150.797 2002.88 151 2002.74C151.207 2002.61 151.455 2002.54 151.744 2002.54C152.271 2002.54 152.643 2002.74 152.857 2003.15C153.076 2003.56 153.186 2004.33 153.186 2005.46V2009.26H152.201V2005.5C152.201 2004.58 152.148 2004 152.043 2003.78C151.941 2003.55 151.754 2003.44 151.48 2003.44C151.168 2003.44 150.953 2003.56 150.836 2003.8C150.723 2004.04 150.666 2004.61 150.666 2005.5V2009.26H149.682V2005.5C149.682 2004.57 149.625 2003.99 149.512 2003.77C149.402 2003.55 149.203 2003.44 148.914 2003.44C148.629 2003.44 148.43 2003.56 148.316 2003.8C148.207 2004.04 148.152 2004.61 148.152 2005.5V2009.26H147.174V2002.7H148.152V2003.26C148.281 2003.02 148.441 2002.85 148.633 2002.73C148.828 2002.6 149.049 2002.54 149.295 2002.54C149.592 2002.54 149.838 2002.61 150.033 2002.74C150.232 2002.88 150.387 2003.09 150.496 2003.36ZM157.879 2005.96H157.521C156.893 2005.96 156.418 2006.07 156.098 2006.29C155.781 2006.51 155.623 2006.84 155.623 2007.28C155.623 2007.67 155.742 2007.98 155.98 2008.2C156.219 2008.42 156.549 2008.53 156.971 2008.53C157.564 2008.53 158.031 2008.32 158.371 2007.91C158.711 2007.5 158.883 2006.93 158.887 2006.2V2005.96H157.879ZM159.971 2005.51V2009.26H158.887V2008.29C158.656 2008.68 158.365 2008.97 158.014 2009.15C157.666 2009.34 157.242 2009.43 156.742 2009.43C156.074 2009.43 155.541 2009.24 155.143 2008.87C154.744 2008.49 154.545 2007.98 154.545 2007.35C154.545 2006.62 154.789 2006.06 155.277 2005.68C155.77 2005.31 156.49 2005.12 157.439 2005.12H158.887V2004.95C158.883 2004.42 158.75 2004.04 158.488 2003.81C158.227 2003.57 157.809 2003.45 157.234 2003.45C156.867 2003.45 156.496 2003.51 156.121 2003.61C155.746 2003.72 155.381 2003.87 155.025 2004.07V2003C155.424 2002.84 155.805 2002.73 156.168 2002.66C156.535 2002.58 156.891 2002.54 157.234 2002.54C157.777 2002.54 158.24 2002.62 158.623 2002.78C159.01 2002.94 159.322 2003.18 159.561 2003.5C159.709 2003.69 159.814 2003.94 159.877 2004.23C159.939 2004.51 159.971 2004.94 159.971 2005.51ZM166.023 2005.92C166.023 2005.12 165.891 2004.5 165.625 2004.09C165.363 2003.66 164.98 2003.45 164.477 2003.45C163.949 2003.45 163.547 2003.66 163.27 2004.09C162.992 2004.5 162.854 2005.12 162.854 2005.92C162.854 2006.73 162.992 2007.35 163.27 2007.78C163.551 2008.2 163.957 2008.41 164.488 2008.41C164.984 2008.41 165.363 2008.2 165.625 2007.77C165.891 2007.34 166.023 2006.73 166.023 2005.92ZM167.102 2008.84C167.102 2009.82 166.869 2010.57 166.404 2011.08C165.939 2011.58 165.256 2011.84 164.354 2011.84C164.057 2011.84 163.746 2011.81 163.422 2011.76C163.098 2011.7 162.773 2011.62 162.449 2011.51V2010.45C162.832 2010.63 163.18 2010.76 163.492 2010.85C163.805 2010.93 164.092 2010.98 164.354 2010.98C164.936 2010.98 165.359 2010.82 165.625 2010.5C165.891 2010.18 166.023 2009.68 166.023 2009V2008.95V2008.22C165.852 2008.58 165.617 2008.86 165.32 2009.04C165.023 2009.22 164.662 2009.31 164.236 2009.31C163.471 2009.31 162.859 2009 162.402 2008.39C161.945 2007.77 161.717 2006.95 161.717 2005.92C161.717 2004.89 161.945 2004.07 162.402 2003.46C162.859 2002.84 163.471 2002.54 164.236 2002.54C164.658 2002.54 165.016 2002.62 165.309 2002.79C165.602 2002.96 165.84 2003.22 166.023 2003.57V2002.72H167.102V2008.84ZM174.789 2005.44V2005.97H170.119V2006C170.088 2006.9 170.258 2007.54 170.629 2007.93C171.004 2008.32 171.531 2008.51 172.211 2008.51C172.555 2008.51 172.914 2008.46 173.289 2008.35C173.664 2008.24 174.064 2008.08 174.49 2007.85V2008.92C174.08 2009.09 173.684 2009.22 173.301 2009.3C172.922 2009.39 172.555 2009.43 172.199 2009.43C171.18 2009.43 170.383 2009.12 169.809 2008.51C169.234 2007.9 168.947 2007.06 168.947 2005.98C168.947 2004.94 169.229 2004.1 169.791 2003.48C170.354 2002.85 171.104 2002.54 172.041 2002.54C172.877 2002.54 173.535 2002.82 174.016 2003.39C174.5 2003.95 174.758 2004.64 174.789 2005.44ZM173.711 2005.12C173.664 2004.67 173.498 2004.28 173.213 2003.95C172.932 2003.62 172.525 2003.45 171.994 2003.45C171.475 2003.45 171.047 2003.62 170.711 2003.97C170.375 2004.31 170.191 2004.7 170.16 2005.13L173.711 2005.12ZM181.158 2002.92V2003.98C180.85 2003.8 180.539 2003.67 180.227 2003.58C179.914 2003.49 179.596 2003.44 179.271 2003.44C178.783 2003.44 178.418 2003.52 178.176 2003.68C177.938 2003.84 177.818 2004.08 177.818 2004.4C177.818 2004.69 177.908 2004.91 178.088 2005.06C178.268 2005.2 178.715 2005.34 179.43 2005.48L179.863 2005.56C180.398 2005.66 180.803 2005.87 181.076 2006.17C181.354 2006.48 181.492 2006.87 181.492 2007.36C181.492 2008.01 181.262 2008.52 180.801 2008.88C180.34 2009.25 179.699 2009.43 178.879 2009.43C178.555 2009.43 178.215 2009.39 177.859 2009.32C177.504 2009.26 177.119 2009.16 176.705 2009.02V2007.91C177.107 2008.11 177.492 2008.27 177.859 2008.37C178.227 2008.48 178.574 2008.53 178.902 2008.53C179.379 2008.53 179.748 2008.43 180.01 2008.24C180.271 2008.04 180.402 2007.77 180.402 2007.42C180.402 2006.92 179.924 2006.58 178.967 2006.39L178.92 2006.38L178.516 2006.29C177.895 2006.17 177.441 2005.97 177.156 2005.68C176.871 2005.4 176.729 2005 176.729 2004.51C176.729 2003.88 176.941 2003.39 177.367 2003.05C177.793 2002.71 178.4 2002.54 179.189 2002.54C179.541 2002.54 179.879 2002.57 180.203 2002.64C180.527 2002.7 180.846 2002.8 181.158 2002.92Z" fill="var(--vscode-terminal-ansiBrightBlue, #9CDCFE)" />
+                      <path d="M202.686 92.1945V95.7804H201.373V92.1945H202.686ZM199.562 92.1945V95.7804H198.25V92.1945H199.562ZM210.537 97.1925V101.259H209.453V97.1925C209.453 96.6027 209.35 96.1691 209.143 95.8917C208.936 95.6144 208.611 95.4757 208.17 95.4757C207.666 95.4757 207.277 95.6554 207.004 96.0148C206.734 96.3702 206.6 96.882 206.6 97.5499V101.259H205.521V94.6964H206.6V95.6808C206.791 95.3058 207.051 95.0226 207.379 94.8312C207.707 94.6359 208.096 94.5382 208.545 94.5382C209.213 94.5382 209.711 94.7589 210.039 95.2003C210.371 95.6378 210.537 96.3019 210.537 97.1925ZM218.172 97.4386V97.9659H213.502V98.0011C213.471 98.8956 213.641 99.5382 214.012 99.9288C214.387 100.319 214.914 100.515 215.594 100.515C215.938 100.515 216.297 100.46 216.672 100.351C217.047 100.241 217.447 100.075 217.873 99.8527V100.925C217.463 101.093 217.066 101.218 216.684 101.3C216.305 101.386 215.938 101.429 215.582 101.429C214.562 101.429 213.766 101.124 213.191 100.515C212.617 99.9015 212.33 99.0577 212.33 97.9835C212.33 96.9366 212.611 96.1007 213.174 95.4757C213.736 94.8507 214.486 94.5382 215.424 94.5382C216.26 94.5382 216.918 94.8214 217.398 95.3878C217.883 95.9542 218.141 96.6378 218.172 97.4386ZM217.094 97.1222C217.047 96.6691 216.881 96.2784 216.596 95.9503C216.314 95.6183 215.908 95.4523 215.377 95.4523C214.857 95.4523 214.43 95.6241 214.094 95.9679C213.758 96.3116 213.574 96.6984 213.543 97.1281L217.094 97.1222ZM225.391 94.6964L223.041 97.837L225.619 101.259H224.371L222.449 98.6281L220.533 101.259H219.285L221.863 97.837L219.514 94.6964H220.709L222.449 97.0695L224.178 94.6964H225.391ZM229.668 92.8331V94.6964H232.117V95.5343H229.668V99.0968C229.668 99.5812 229.76 99.9191 229.943 100.11C230.127 100.302 230.447 100.398 230.904 100.398H232.117V101.259H230.799C229.99 101.259 229.42 101.097 229.088 100.773C228.756 100.448 228.59 99.8898 228.59 99.0968V95.5343H226.838V94.6964H228.59V92.8331H229.668ZM238.51 92.5109H239.623L235.018 102.372H233.898L238.51 92.5109ZM242.383 94.7198H245.143V100.421H247.281V101.259H241.926V100.421H244.064V95.5577H242.383V94.7198ZM244.064 92.171H245.143V93.5304H244.064V92.171ZM251.723 95.3644C251.855 95.0831 252.023 94.8761 252.227 94.7433C252.434 94.6066 252.682 94.5382 252.971 94.5382C253.498 94.5382 253.869 94.7433 254.084 95.1534C254.303 95.5597 254.412 96.3273 254.412 97.4562V101.259H253.428V97.5031C253.428 96.5773 253.375 96.0031 253.27 95.7804C253.168 95.5538 252.98 95.4406 252.707 95.4406C252.395 95.4406 252.18 95.5616 252.062 95.8038C251.949 96.0421 251.893 96.6085 251.893 97.5031V101.259H250.908V97.5031C250.908 96.5656 250.852 95.9874 250.738 95.7687C250.629 95.5499 250.43 95.4406 250.141 95.4406C249.855 95.4406 249.656 95.5616 249.543 95.8038C249.434 96.0421 249.379 96.6085 249.379 97.5031V101.259H248.4V94.6964H249.379V95.2589C249.508 95.0245 249.668 94.8468 249.859 94.7257C250.055 94.6007 250.275 94.5382 250.521 94.5382C250.818 94.5382 251.064 94.6066 251.26 94.7433C251.459 94.88 251.613 95.087 251.723 95.3644ZM259.105 97.9601H258.748C258.119 97.9601 257.645 98.0714 257.324 98.2941C257.008 98.5128 256.85 98.8409 256.85 99.2784C256.85 99.673 256.969 99.9796 257.207 100.198C257.445 100.417 257.775 100.526 258.197 100.526C258.791 100.526 259.258 100.321 259.598 99.9113C259.938 99.4972 260.109 98.9269 260.113 98.2003V97.9601H259.105ZM261.197 97.5148V101.259H260.113V100.286C259.883 100.677 259.592 100.966 259.24 101.153C258.893 101.337 258.469 101.429 257.969 101.429C257.301 101.429 256.768 101.241 256.369 100.866C255.971 100.487 255.771 99.9816 255.771 99.3488C255.771 98.6183 256.016 98.0636 256.504 97.6847C256.996 97.3058 257.717 97.1163 258.666 97.1163H260.113V96.9464C260.109 96.423 259.977 96.0441 259.715 95.8097C259.453 95.5714 259.035 95.4523 258.461 95.4523C258.094 95.4523 257.723 95.505 257.348 95.6105C256.973 95.7159 256.607 95.8702 256.252 96.0734V94.9952C256.65 94.8429 257.031 94.7296 257.395 94.6554C257.762 94.5773 258.117 94.5382 258.461 94.5382C259.004 94.5382 259.467 94.6183 259.85 94.7784C260.236 94.9386 260.549 95.1788 260.787 95.4991C260.936 95.6945 261.041 95.9366 261.104 96.2257C261.166 96.5109 261.197 96.9406 261.197 97.5148ZM267.25 97.9249C267.25 97.1163 267.117 96.5031 266.852 96.0851C266.59 95.6632 266.207 95.4523 265.703 95.4523C265.176 95.4523 264.773 95.6632 264.496 96.0851C264.219 96.5031 264.08 97.1163 264.08 97.9249C264.08 98.7335 264.219 99.3507 264.496 99.7765C264.777 100.198 265.184 100.409 265.715 100.409C266.211 100.409 266.59 100.196 266.852 99.7706C267.117 99.3448 267.25 98.7296 267.25 97.9249ZM268.328 100.837C268.328 101.821 268.096 102.568 267.631 103.075C267.166 103.583 266.482 103.837 265.58 103.837C265.283 103.837 264.973 103.81 264.648 103.755C264.324 103.7 264 103.62 263.676 103.515V102.448C264.059 102.628 264.406 102.761 264.719 102.847C265.031 102.933 265.318 102.976 265.58 102.976C266.162 102.976 266.586 102.818 266.852 102.501C267.117 102.185 267.25 101.683 267.25 100.995V100.948V100.216C267.078 100.583 266.844 100.857 266.547 101.036C266.25 101.216 265.889 101.306 265.463 101.306C264.697 101.306 264.086 100.999 263.629 100.386C263.172 99.7726 262.943 98.9523 262.943 97.9249C262.943 96.8937 263.172 96.0714 263.629 95.4581C264.086 94.8448 264.697 94.5382 265.463 94.5382C265.885 94.5382 266.242 94.6222 266.535 94.7902C266.828 94.9581 267.066 95.2179 267.25 95.5695V94.7198H268.328V100.837ZM276.016 97.4386V97.9659H271.346V98.0011C271.314 98.8956 271.484 99.5382 271.855 99.9288C272.23 100.319 272.758 100.515 273.438 100.515C273.781 100.515 274.141 100.46 274.516 100.351C274.891 100.241 275.291 100.075 275.717 99.8527V100.925C275.307 101.093 274.91 101.218 274.527 101.3C274.148 101.386 273.781 101.429 273.426 101.429C272.406 101.429 271.609 101.124 271.035 100.515C270.461 99.9015 270.174 99.0577 270.174 97.9835C270.174 96.9366 270.455 96.1007 271.018 95.4757C271.58 94.8507 272.33 94.5382 273.268 94.5382C274.104 94.5382 274.762 94.8214 275.242 95.3878C275.727 95.9542 275.984 96.6378 276.016 97.4386ZM274.938 97.1222C274.891 96.6691 274.725 96.2784 274.439 95.9503C274.158 95.6183 273.752 95.4523 273.221 95.4523C272.701 95.4523 272.273 95.6241 271.938 95.9679C271.602 96.3116 271.418 96.6984 271.387 97.1281L274.938 97.1222ZM282.221 92.1945V95.7804H280.908V92.1945H282.221ZM279.098 92.1945V95.7804H277.785V92.1945H279.098ZM195.455 110.194V113.78H194.143V110.194H195.455ZM192.332 110.194V113.78H191.02V110.194H192.332ZM203.307 115.193V119.259H202.223V115.193C202.223 114.603 202.119 114.169 201.912 113.892C201.705 113.614 201.381 113.476 200.939 113.476C200.436 113.476 200.047 113.655 199.773 114.015C199.504 114.37 199.369 114.882 199.369 115.55V119.259H198.291V112.696H199.369V113.681C199.561 113.306 199.82 113.023 200.148 112.831C200.477 112.636 200.865 112.538 201.314 112.538C201.982 112.538 202.48 112.759 202.809 113.2C203.141 113.638 203.307 114.302 203.307 115.193ZM210.941 115.439V115.966H206.271V116.001C206.24 116.896 206.41 117.538 206.781 117.929C207.156 118.319 207.684 118.515 208.363 118.515C208.707 118.515 209.066 118.46 209.441 118.351C209.816 118.241 210.217 118.075 210.643 117.853V118.925C210.232 119.093 209.836 119.218 209.453 119.3C209.074 119.386 208.707 119.429 208.352 119.429C207.332 119.429 206.535 119.124 205.961 118.515C205.387 117.901 205.1 117.058 205.1 115.984C205.1 114.937 205.381 114.101 205.943 113.476C206.506 112.851 207.256 112.538 208.193 112.538C209.029 112.538 209.688 112.821 210.168 113.388C210.652 113.954 210.91 114.638 210.941 115.439ZM209.863 115.122C209.816 114.669 209.65 114.278 209.365 113.95C209.084 113.618 208.678 113.452 208.146 113.452C207.627 113.452 207.199 113.624 206.863 113.968C206.527 114.312 206.344 114.698 206.312 115.128L209.863 115.122ZM218.16 112.696L215.811 115.837L218.389 119.259H217.141L215.219 116.628L213.303 119.259H212.055L214.633 115.837L212.283 112.696H213.479L215.219 115.069L216.947 112.696H218.16ZM222.438 110.833V112.696H224.887V113.534H222.438V117.097C222.438 117.581 222.529 117.919 222.713 118.11C222.896 118.302 223.217 118.398 223.674 118.398H224.887V119.259H223.568C222.76 119.259 222.189 119.097 221.857 118.773C221.525 118.448 221.359 117.89 221.359 117.097V113.534H219.607V112.696H221.359V110.833H222.438ZM231.279 110.511H232.393L227.787 120.372H226.668L231.279 110.511ZM237.514 116.886C237.514 117.37 237.602 117.735 237.777 117.982C237.957 118.228 238.221 118.351 238.568 118.351H239.828V119.259H238.463C237.818 119.259 237.318 119.054 236.963 118.644C236.611 118.23 236.436 117.644 236.436 116.886V110.95H234.707V110.107H237.514V116.886ZM242.383 112.72H245.143V118.421H247.281V119.259H241.926V118.421H244.064V113.558H242.383V112.72ZM244.064 110.171H245.143V111.53H244.064V110.171ZM253.92 115.193V119.259H252.836V115.193C252.836 114.603 252.732 114.169 252.525 113.892C252.318 113.614 251.994 113.476 251.553 113.476C251.049 113.476 250.66 113.655 250.387 114.015C250.117 114.37 249.982 114.882 249.982 115.55V119.259H248.904V112.696H249.982V113.681C250.174 113.306 250.434 113.023 250.762 112.831C251.09 112.636 251.479 112.538 251.928 112.538C252.596 112.538 253.094 112.759 253.422 113.2C253.754 113.638 253.92 114.302 253.92 115.193ZM256.375 110.142H257.488V115.421L260.318 112.696H261.631L259.047 115.169L262.035 119.259H260.717L258.291 115.872L257.488 116.628V119.259H256.375V110.142ZM267.76 110.194V113.78H266.447V110.194H267.76ZM264.637 110.194V113.78H263.324V110.194H264.637ZM296.682 128.194V131.78H295.369V128.194H296.682ZM293.559 128.194V131.78H292.246V128.194H293.559ZM300.654 134.892H302.717V137.259H300.654V134.892ZM310.814 128.511H311.928L307.322 138.372H306.203L310.814 128.511ZM317.863 131.534V128.142H318.941V137.259H317.863V136.433C317.684 136.757 317.443 137.005 317.143 137.177C316.846 137.345 316.502 137.429 316.111 137.429C315.318 137.429 314.693 137.122 314.236 136.509C313.783 135.892 313.557 135.042 313.557 133.96C313.557 132.894 313.785 132.058 314.242 131.452C314.699 130.843 315.322 130.538 316.111 130.538C316.506 130.538 316.854 130.624 317.154 130.796C317.455 130.964 317.691 131.21 317.863 131.534ZM314.693 133.984C314.693 134.819 314.826 135.45 315.092 135.876C315.357 136.302 315.75 136.515 316.27 136.515C316.789 136.515 317.184 136.3 317.453 135.87C317.727 135.441 317.863 134.812 317.863 133.984C317.863 133.151 317.727 132.523 317.453 132.097C317.184 131.667 316.789 131.452 316.27 131.452C315.75 131.452 315.357 131.665 315.092 132.091C314.826 132.517 314.693 133.148 314.693 133.984ZM326.629 133.439V133.966H321.959V134.001C321.928 134.896 322.098 135.538 322.469 135.929C322.844 136.319 323.371 136.515 324.051 136.515C324.395 136.515 324.754 136.46 325.129 136.351C325.504 136.241 325.904 136.075 326.33 135.853V136.925C325.92 137.093 325.523 137.218 325.141 137.3C324.762 137.386 324.395 137.429 324.039 137.429C323.02 137.429 322.223 137.124 321.648 136.515C321.074 135.901 320.787 135.058 320.787 133.984C320.787 132.937 321.068 132.101 321.631 131.476C322.193 130.851 322.943 130.538 323.881 130.538C324.717 130.538 325.375 130.821 325.855 131.388C326.34 131.954 326.598 132.638 326.629 133.439ZM325.551 133.122C325.504 132.669 325.338 132.278 325.053 131.95C324.771 131.618 324.365 131.452 323.834 131.452C323.314 131.452 322.887 131.624 322.551 131.968C322.215 132.312 322.031 132.698 322 133.128L325.551 133.122ZM332.998 130.925V131.98C332.689 131.8 332.379 131.665 332.066 131.575C331.754 131.485 331.436 131.441 331.111 131.441C330.623 131.441 330.258 131.521 330.016 131.681C329.777 131.837 329.658 132.077 329.658 132.401C329.658 132.694 329.748 132.913 329.928 133.058C330.107 133.202 330.555 133.343 331.27 133.48L331.703 133.562C332.238 133.663 332.643 133.866 332.916 134.171C333.193 134.476 333.332 134.872 333.332 135.36C333.332 136.009 333.102 136.517 332.641 136.884C332.18 137.247 331.539 137.429 330.719 137.429C330.395 137.429 330.055 137.394 329.699 137.323C329.344 137.257 328.959 137.155 328.545 137.019V135.905C328.947 136.112 329.332 136.269 329.699 136.374C330.066 136.476 330.414 136.526 330.742 136.526C331.219 136.526 331.588 136.431 331.85 136.239C332.111 136.044 332.242 135.773 332.242 135.425C332.242 134.925 331.764 134.579 330.807 134.388L330.76 134.376L330.355 134.294C329.734 134.173 329.281 133.97 328.996 133.685C328.711 133.396 328.568 133.003 328.568 132.507C328.568 131.878 328.781 131.394 329.207 131.054C329.633 130.71 330.24 130.538 331.029 130.538C331.381 130.538 331.719 130.571 332.043 130.638C332.367 130.7 332.686 130.796 332.998 130.925ZM340.744 136.925C340.455 137.093 340.156 137.218 339.848 137.3C339.543 137.386 339.23 137.429 338.91 137.429C337.895 137.429 337.1 137.124 336.525 136.515C335.955 135.905 335.67 135.062 335.67 133.984C335.67 132.905 335.955 132.062 336.525 131.452C337.1 130.843 337.895 130.538 338.91 130.538C339.227 130.538 339.535 130.579 339.836 130.661C340.137 130.743 340.439 130.87 340.744 131.042V132.173C340.459 131.919 340.172 131.735 339.883 131.622C339.598 131.509 339.273 131.452 338.91 131.452C338.234 131.452 337.715 131.671 337.352 132.109C336.988 132.546 336.807 133.171 336.807 133.984C336.807 134.792 336.988 135.417 337.352 135.859C337.719 136.296 338.238 136.515 338.91 136.515C339.285 136.515 339.621 136.458 339.918 136.345C340.215 136.228 340.49 136.048 340.744 135.806V136.925ZM348.525 132.05C348.295 131.87 348.061 131.739 347.822 131.657C347.584 131.575 347.322 131.534 347.037 131.534C346.365 131.534 345.852 131.745 345.496 132.167C345.141 132.589 344.963 133.198 344.963 133.995V137.259H343.879V130.696H344.963V131.98C345.143 131.515 345.418 131.159 345.789 130.913C346.164 130.663 346.607 130.538 347.119 130.538C347.385 130.538 347.633 130.571 347.863 130.638C348.094 130.704 348.314 130.808 348.525 130.948V132.05ZM350.84 130.72H353.6V136.421H355.738V137.259H350.383V136.421H352.521V131.558H350.84V130.72ZM352.521 128.171H353.6V129.53H352.521V128.171ZM358.416 136.433V139.755H357.332V130.696H358.416V131.534C358.596 131.21 358.834 130.964 359.131 130.796C359.432 130.624 359.777 130.538 360.168 130.538C360.961 130.538 361.582 130.845 362.031 131.458C362.484 132.071 362.711 132.921 362.711 134.007C362.711 135.073 362.484 135.911 362.031 136.521C361.578 137.126 360.957 137.429 360.168 137.429C359.77 137.429 359.42 137.345 359.119 137.177C358.822 137.005 358.588 136.757 358.416 136.433ZM361.58 133.984C361.58 133.148 361.447 132.517 361.182 132.091C360.92 131.665 360.529 131.452 360.01 131.452C359.486 131.452 359.09 131.667 358.82 132.097C358.551 132.523 358.416 133.151 358.416 133.984C358.416 134.812 358.551 135.441 358.82 135.87C359.09 136.3 359.486 136.515 360.01 136.515C360.529 136.515 360.92 136.302 361.182 135.876C361.447 135.45 361.58 134.819 361.58 133.984ZM367.047 128.833V130.696H369.496V131.534H367.047V135.097C367.047 135.581 367.139 135.919 367.322 136.11C367.506 136.302 367.826 136.398 368.283 136.398H369.496V137.259H368.178C367.369 137.259 366.799 137.097 366.467 136.773C366.135 136.448 365.969 135.89 365.969 135.097V131.534H364.217V130.696H365.969V128.833H367.047ZM372.531 130.72H375.291V136.421H377.43V137.259H372.074V136.421H374.213V131.558H372.531V130.72ZM374.213 128.171H375.291V129.53H374.213V128.171ZM381.52 131.452C380.973 131.452 380.559 131.665 380.277 132.091C379.996 132.517 379.855 133.148 379.855 133.984C379.855 134.816 379.996 135.446 380.277 135.876C380.559 136.302 380.973 136.515 381.52 136.515C382.07 136.515 382.486 136.302 382.768 135.876C383.049 135.446 383.189 134.816 383.189 133.984C383.189 133.148 383.049 132.517 382.768 132.091C382.486 131.665 382.07 131.452 381.52 131.452ZM381.52 130.538C382.43 130.538 383.125 130.833 383.605 131.423C384.09 132.013 384.332 132.866 384.332 133.984C384.332 135.105 384.092 135.96 383.611 136.55C383.131 137.136 382.434 137.429 381.52 137.429C380.609 137.429 379.914 137.136 379.434 136.55C378.953 135.96 378.713 135.105 378.713 133.984C378.713 132.866 378.953 132.013 379.434 131.423C379.914 130.833 380.609 130.538 381.52 130.538ZM391.299 133.193V137.259H390.215V133.193C390.215 132.603 390.111 132.169 389.904 131.892C389.697 131.614 389.373 131.476 388.932 131.476C388.428 131.476 388.039 131.655 387.766 132.015C387.496 132.37 387.361 132.882 387.361 133.55V137.259H386.283V130.696H387.361V131.681C387.553 131.306 387.812 131.023 388.141 130.831C388.469 130.636 388.857 130.538 389.307 130.538C389.975 130.538 390.473 130.759 390.801 131.2C391.133 131.638 391.299 132.302 391.299 133.193ZM392.969 133.017H399.18V134.007H392.969V133.017ZM406.369 132.05C406.139 131.87 405.904 131.739 405.666 131.657C405.428 131.575 405.166 131.534 404.881 131.534C404.209 131.534 403.695 131.745 403.34 132.167C402.984 132.589 402.807 133.198 402.807 133.995V137.259H401.723V130.696H402.807V131.98C402.986 131.515 403.262 131.159 403.633 130.913C404.008 130.663 404.451 130.538 404.963 130.538C405.229 130.538 405.477 130.571 405.707 130.638C405.938 130.704 406.158 130.808 406.369 130.948V132.05ZM410.441 131.452C409.895 131.452 409.48 131.665 409.199 132.091C408.918 132.517 408.777 133.148 408.777 133.984C408.777 134.816 408.918 135.446 409.199 135.876C409.48 136.302 409.895 136.515 410.441 136.515C410.992 136.515 411.408 136.302 411.689 135.876C411.971 135.446 412.111 134.816 412.111 133.984C412.111 133.148 411.971 132.517 411.689 132.091C411.408 131.665 410.992 131.452 410.441 131.452ZM410.441 130.538C411.352 130.538 412.047 130.833 412.527 131.423C413.012 132.013 413.254 132.866 413.254 133.984C413.254 135.105 413.014 135.96 412.533 136.55C412.053 137.136 411.355 137.429 410.441 137.429C409.531 137.429 408.836 137.136 408.355 136.55C407.875 135.96 407.635 135.105 407.635 133.984C407.635 132.866 407.875 132.013 408.355 131.423C408.836 130.833 409.531 130.538 410.441 130.538ZM414.062 130.696H415.129L416.271 135.999L417.209 132.612H418.129L419.078 135.999L420.221 130.696H421.287L419.752 137.259H418.721L417.672 133.661L416.629 137.259H415.598L414.062 130.696ZM426.83 128.194V131.78H425.518V128.194H426.83ZM423.707 128.194V131.78H422.395V128.194H423.707ZM209.916 416.194V419.78H208.604V416.194H209.916ZM206.793 416.194V419.78H205.48V416.194H206.793ZM217.838 416.142V417.038H216.613C216.227 417.038 215.957 417.118 215.805 417.278C215.656 417.435 215.582 417.714 215.582 418.116V418.696H217.838V419.534H215.582V425.259H214.504V419.534H212.752V418.696H214.504V418.239C214.504 417.521 214.668 416.991 214.996 416.651C215.328 416.312 215.844 416.142 216.543 416.142H217.838ZM223.053 422.886C223.053 423.37 223.141 423.735 223.316 423.982C223.496 424.228 223.76 424.351 224.107 424.351H225.367V425.259H224.002C223.357 425.259 222.857 425.054 222.502 424.644C222.15 424.23 221.975 423.644 221.975 422.886V416.95H220.246V416.107H223.053V422.886ZM232.633 421.439V421.966H227.963V422.001C227.932 422.896 228.102 423.538 228.473 423.929C228.848 424.319 229.375 424.515 230.055 424.515C230.398 424.515 230.758 424.46 231.133 424.351C231.508 424.241 231.908 424.075 232.334 423.853V424.925C231.924 425.093 231.527 425.218 231.145 425.3C230.766 425.386 230.398 425.429 230.043 425.429C229.023 425.429 228.227 425.124 227.652 424.515C227.078 423.901 226.791 423.058 226.791 421.984C226.791 420.937 227.072 420.101 227.635 419.476C228.197 418.851 228.947 418.538 229.885 418.538C230.721 418.538 231.379 418.821 231.859 419.388C232.344 419.954 232.602 420.638 232.633 421.439ZM231.555 421.122C231.508 420.669 231.342 420.278 231.057 419.95C230.775 419.618 230.369 419.452 229.838 419.452C229.318 419.452 228.891 419.624 228.555 419.968C228.219 420.312 228.035 420.698 228.004 421.128L231.555 421.122ZM239.852 418.696L237.502 421.837L240.08 425.259H238.832L236.91 422.628L234.994 425.259H233.746L236.324 421.837L233.975 418.696H235.17L236.91 421.069L238.639 418.696H239.852ZM253.99 416.142V417.038H252.766C252.379 417.038 252.109 417.118 251.957 417.278C251.809 417.435 251.734 417.714 251.734 418.116V418.696H253.99V419.534H251.734V425.259H250.656V419.534H248.904V418.696H250.656V418.239C250.656 417.521 250.82 416.991 251.148 416.651C251.48 416.312 251.996 416.142 252.695 416.142H253.99ZM259.205 422.886C259.205 423.37 259.293 423.735 259.469 423.982C259.648 424.228 259.912 424.351 260.26 424.351H261.52V425.259H260.154C259.51 425.259 259.01 425.054 258.654 424.644C258.303 424.23 258.127 423.644 258.127 422.886V416.95H256.398V416.107H259.205V422.886ZM268.785 421.439V421.966H264.115V422.001C264.084 422.896 264.254 423.538 264.625 423.929C265 424.319 265.527 424.515 266.207 424.515C266.551 424.515 266.91 424.46 267.285 424.351C267.66 424.241 268.061 424.075 268.486 423.853V424.925C268.076 425.093 267.68 425.218 267.297 425.3C266.918 425.386 266.551 425.429 266.195 425.429C265.176 425.429 264.379 425.124 263.805 424.515C263.23 423.901 262.943 423.058 262.943 421.984C262.943 420.937 263.225 420.101 263.787 419.476C264.35 418.851 265.1 418.538 266.037 418.538C266.873 418.538 267.531 418.821 268.012 419.388C268.496 419.954 268.754 420.638 268.785 421.439ZM267.707 421.122C267.66 420.669 267.494 420.278 267.209 419.95C266.928 419.618 266.521 419.452 265.99 419.452C265.471 419.452 265.043 419.624 264.707 419.968C264.371 420.312 264.188 420.698 264.156 421.128L267.707 421.122ZM276.004 418.696L273.654 421.837L276.232 425.259H274.984L273.062 422.628L271.146 425.259H269.898L272.477 421.837L270.127 418.696H271.322L273.062 421.069L274.791 418.696H276.004ZM277.281 421.017H283.492V422.007H277.281V421.017ZM290.131 424.925C289.842 425.093 289.543 425.218 289.234 425.3C288.93 425.386 288.617 425.429 288.297 425.429C287.281 425.429 286.486 425.124 285.912 424.515C285.342 423.905 285.057 423.062 285.057 421.984C285.057 420.905 285.342 420.062 285.912 419.452C286.486 418.843 287.281 418.538 288.297 418.538C288.613 418.538 288.922 418.579 289.223 418.661C289.523 418.743 289.826 418.87 290.131 419.042V420.173C289.846 419.919 289.559 419.735 289.27 419.622C288.984 419.509 288.66 419.452 288.297 419.452C287.621 419.452 287.102 419.671 286.738 420.109C286.375 420.546 286.193 421.171 286.193 421.984C286.193 422.792 286.375 423.417 286.738 423.859C287.105 424.296 287.625 424.515 288.297 424.515C288.672 424.515 289.008 424.458 289.305 424.345C289.602 424.228 289.877 424.048 290.131 423.806V424.925ZM294.754 419.452C294.207 419.452 293.793 419.665 293.512 420.091C293.23 420.517 293.09 421.148 293.09 421.984C293.09 422.816 293.23 423.446 293.512 423.876C293.793 424.302 294.207 424.515 294.754 424.515C295.305 424.515 295.721 424.302 296.002 423.876C296.283 423.446 296.424 422.816 296.424 421.984C296.424 421.148 296.283 420.517 296.002 420.091C295.721 419.665 295.305 419.452 294.754 419.452ZM294.754 418.538C295.664 418.538 296.359 418.833 296.84 419.423C297.324 420.013 297.566 420.866 297.566 421.984C297.566 423.105 297.326 423.96 296.846 424.55C296.365 425.136 295.668 425.429 294.754 425.429C293.844 425.429 293.148 425.136 292.668 424.55C292.188 423.96 291.947 423.105 291.947 421.984C291.947 420.866 292.188 420.013 292.668 419.423C293.148 418.833 293.844 418.538 294.754 418.538ZM302.588 422.886C302.588 423.37 302.676 423.735 302.852 423.982C303.031 424.228 303.295 424.351 303.643 424.351H304.902V425.259H303.537C302.893 425.259 302.393 425.054 302.037 424.644C301.686 424.23 301.51 423.644 301.51 422.886V416.95H299.781V416.107H302.588V422.886ZM317.863 421.925C317.863 421.116 317.73 420.503 317.465 420.085C317.203 419.663 316.82 419.452 316.316 419.452C315.789 419.452 315.387 419.663 315.109 420.085C314.832 420.503 314.693 421.116 314.693 421.925C314.693 422.734 314.832 423.351 315.109 423.776C315.391 424.198 315.797 424.409 316.328 424.409C316.824 424.409 317.203 424.196 317.465 423.771C317.73 423.345 317.863 422.73 317.863 421.925ZM318.941 424.837C318.941 425.821 318.709 426.568 318.244 427.075C317.779 427.583 317.096 427.837 316.193 427.837C315.896 427.837 315.586 427.81 315.262 427.755C314.938 427.7 314.613 427.62 314.289 427.515V426.448C314.672 426.628 315.02 426.761 315.332 426.847C315.645 426.933 315.932 426.976 316.193 426.976C316.775 426.976 317.199 426.818 317.465 426.501C317.73 426.185 317.863 425.683 317.863 424.995V424.948V424.216C317.691 424.583 317.457 424.857 317.16 425.036C316.863 425.216 316.502 425.306 316.076 425.306C315.311 425.306 314.699 424.999 314.242 424.386C313.785 423.773 313.557 422.952 313.557 421.925C313.557 420.894 313.785 420.071 314.242 419.458C314.699 418.845 315.311 418.538 316.076 418.538C316.498 418.538 316.855 418.622 317.148 418.79C317.441 418.958 317.68 419.218 317.863 419.569V418.72H318.941V424.837ZM324.18 421.96H323.822C323.193 421.96 322.719 422.071 322.398 422.294C322.082 422.513 321.924 422.841 321.924 423.278C321.924 423.673 322.043 423.98 322.281 424.198C322.52 424.417 322.85 424.526 323.271 424.526C323.865 424.526 324.332 424.321 324.672 423.911C325.012 423.497 325.184 422.927 325.188 422.2V421.96H324.18ZM326.271 421.515V425.259H325.188V424.286C324.957 424.677 324.666 424.966 324.314 425.153C323.967 425.337 323.543 425.429 323.043 425.429C322.375 425.429 321.842 425.241 321.443 424.866C321.045 424.487 320.846 423.982 320.846 423.349C320.846 422.618 321.09 422.064 321.578 421.685C322.07 421.306 322.791 421.116 323.74 421.116H325.188V420.946C325.184 420.423 325.051 420.044 324.789 419.81C324.527 419.571 324.109 419.452 323.535 419.452C323.168 419.452 322.797 419.505 322.422 419.61C322.047 419.716 321.682 419.87 321.326 420.073V418.995C321.725 418.843 322.105 418.73 322.469 418.655C322.836 418.577 323.191 418.538 323.535 418.538C324.078 418.538 324.541 418.618 324.924 418.778C325.311 418.939 325.623 419.179 325.861 419.499C326.01 419.694 326.115 419.937 326.178 420.226C326.24 420.511 326.271 420.941 326.271 421.515ZM329.494 424.433V427.755H328.41V418.696H329.494V419.534C329.674 419.21 329.912 418.964 330.209 418.796C330.51 418.624 330.855 418.538 331.246 418.538C332.039 418.538 332.66 418.845 333.109 419.458C333.562 420.071 333.789 420.921 333.789 422.007C333.789 423.073 333.562 423.911 333.109 424.521C332.656 425.126 332.035 425.429 331.246 425.429C330.848 425.429 330.498 425.345 330.197 425.177C329.9 425.005 329.666 424.757 329.494 424.433ZM332.658 421.984C332.658 421.148 332.525 420.517 332.26 420.091C331.998 419.665 331.607 419.452 331.088 419.452C330.564 419.452 330.168 419.667 329.898 420.097C329.629 420.523 329.494 421.151 329.494 421.984C329.494 422.812 329.629 423.441 329.898 423.87C330.168 424.3 330.564 424.515 331.088 424.515C331.607 424.515 331.998 424.302 332.26 423.876C332.525 423.45 332.658 422.819 332.658 421.984ZM335.125 421.017H341.336V422.007H335.125V421.017ZM346.064 417.589L343.305 422.212H346.064V417.589ZM345.871 416.511H347.242V422.212H348.408V423.173H347.242V425.259H346.064V423.173H342.355V422.054L345.871 416.511ZM354.525 416.194V419.78H353.213V416.194H354.525ZM351.402 416.194V419.78H350.09V416.194H351.402ZM188.225 542.194V545.78H186.912V542.194H188.225ZM185.102 542.194V545.78H183.789V542.194H185.102ZM191.5 550.269H193.34V543.659L191.137 544.72V543.583L193.328 542.54H194.512V550.269H196.328V551.259H191.5V550.269ZM202.955 542.704V543.794C202.709 543.65 202.447 543.54 202.17 543.466C201.893 543.388 201.604 543.349 201.303 543.349C200.553 543.349 199.984 543.632 199.598 544.198C199.211 544.761 199.018 545.591 199.018 546.689C199.205 546.298 199.465 545.999 199.797 545.792C200.129 545.581 200.51 545.476 200.939 545.476C201.783 545.476 202.436 545.735 202.896 546.255C203.361 546.771 203.594 547.503 203.594 548.452C203.594 549.398 203.355 550.13 202.879 550.65C202.402 551.169 201.732 551.429 200.869 551.429C199.854 551.429 199.109 551.066 198.637 550.339C198.164 549.609 197.928 548.46 197.928 546.894C197.928 545.417 198.211 544.292 198.777 543.519C199.348 542.741 200.172 542.353 201.25 542.353C201.539 542.353 201.828 542.384 202.117 542.446C202.406 542.505 202.686 542.591 202.955 542.704ZM200.846 546.401C200.342 546.401 199.945 546.583 199.656 546.946C199.367 547.31 199.223 547.812 199.223 548.452C199.223 549.093 199.367 549.595 199.656 549.958C199.945 550.321 200.342 550.503 200.846 550.503C201.369 550.503 201.764 550.331 202.029 549.987C202.295 549.64 202.428 549.128 202.428 548.452C202.428 547.773 202.295 547.261 202.029 546.917C201.764 546.573 201.369 546.401 200.846 546.401ZM207.988 542.382C208.922 542.382 209.627 542.763 210.104 543.525C210.584 544.286 210.824 545.413 210.824 546.905C210.824 548.398 210.584 549.525 210.104 550.286C209.627 551.048 208.922 551.429 207.988 551.429C207.055 551.429 206.35 551.048 205.873 550.286C205.396 549.525 205.158 548.398 205.158 546.905C205.158 545.413 205.396 544.286 205.873 543.525C206.35 542.763 207.055 542.382 207.988 542.382ZM207.988 550.491C208.543 550.491 208.955 550.196 209.225 549.607C209.498 549.017 209.635 548.116 209.635 546.905C209.635 546.261 209.596 545.679 209.518 545.159L206.729 549.525C207.021 550.169 207.441 550.491 207.988 550.491ZM207.988 543.319C207.438 543.319 207.025 543.614 206.752 544.204C206.482 544.794 206.348 545.694 206.348 546.905C206.348 547.456 206.385 547.972 206.459 548.452L209.189 544.099C208.893 543.579 208.492 543.319 207.988 543.319ZM215.219 542.382C216.152 542.382 216.857 542.763 217.334 543.525C217.814 544.286 218.055 545.413 218.055 546.905C218.055 548.398 217.814 549.525 217.334 550.286C216.857 551.048 216.152 551.429 215.219 551.429C214.285 551.429 213.58 551.048 213.104 550.286C212.627 549.525 212.389 548.398 212.389 546.905C212.389 545.413 212.627 544.286 213.104 543.525C213.58 542.763 214.285 542.382 215.219 542.382ZM215.219 550.491C215.773 550.491 216.186 550.196 216.455 549.607C216.729 549.017 216.865 548.116 216.865 546.905C216.865 546.261 216.826 545.679 216.748 545.159L213.959 549.525C214.252 550.169 214.672 550.491 215.219 550.491ZM215.219 543.319C214.668 543.319 214.256 543.614 213.982 544.204C213.713 544.794 213.578 545.694 213.578 546.905C213.578 547.456 213.615 547.972 213.689 548.452L216.42 544.099C216.123 543.579 215.723 543.319 215.219 543.319ZM224.377 542.194V545.78H223.064V542.194H224.377ZM221.254 542.194V545.78H219.941V542.194H221.254ZM195.455 560.194V563.78H194.143V560.194H195.455ZM192.332 560.194V563.78H191.02V560.194H192.332ZM200.758 565.105C200.23 565.105 199.822 565.253 199.533 565.55C199.248 565.843 199.105 566.259 199.105 566.798C199.105 567.337 199.25 567.757 199.539 568.058C199.832 568.355 200.238 568.503 200.758 568.503C201.289 568.503 201.697 568.357 201.982 568.064C202.271 567.767 202.416 567.345 202.416 566.798C202.416 566.263 202.27 565.847 201.977 565.55C201.688 565.253 201.281 565.105 200.758 565.105ZM199.727 564.612C199.223 564.484 198.828 564.243 198.543 563.892C198.262 563.54 198.121 563.116 198.121 562.62C198.121 561.925 198.357 561.374 198.83 560.968C199.303 560.558 199.945 560.353 200.758 560.353C201.574 560.353 202.219 560.558 202.691 560.968C203.164 561.374 203.4 561.925 203.4 562.62C203.4 563.116 203.258 563.54 202.973 563.892C202.691 564.243 202.299 564.484 201.795 564.612C202.381 564.741 202.828 565.001 203.137 565.392C203.449 565.782 203.605 566.288 203.605 566.909C203.605 567.698 203.354 568.316 202.85 568.761C202.346 569.206 201.648 569.429 200.758 569.429C199.867 569.429 199.17 569.208 198.666 568.767C198.166 568.321 197.916 567.706 197.916 566.921C197.916 566.296 198.07 565.788 198.379 565.398C198.691 565.003 199.141 564.741 199.727 564.612ZM199.299 562.732C199.299 563.2 199.424 563.558 199.674 563.804C199.924 564.05 200.285 564.173 200.758 564.173C201.234 564.173 201.598 564.05 201.848 563.804C202.098 563.558 202.223 563.2 202.223 562.732C202.223 562.255 202.098 561.892 201.848 561.642C201.602 561.392 201.238 561.267 200.758 561.267C200.285 561.267 199.924 561.394 199.674 561.648C199.424 561.898 199.299 562.259 199.299 562.732ZM207.988 560.382C208.922 560.382 209.627 560.763 210.104 561.525C210.584 562.286 210.824 563.413 210.824 564.905C210.824 566.398 210.584 567.525 210.104 568.286C209.627 569.048 208.922 569.429 207.988 569.429C207.055 569.429 206.35 569.048 205.873 568.286C205.396 567.525 205.158 566.398 205.158 564.905C205.158 563.413 205.396 562.286 205.873 561.525C206.35 560.763 207.055 560.382 207.988 560.382ZM207.988 568.491C208.543 568.491 208.955 568.196 209.225 567.607C209.498 567.017 209.635 566.116 209.635 564.905C209.635 564.261 209.596 563.679 209.518 563.159L206.729 567.525C207.021 568.169 207.441 568.491 207.988 568.491ZM207.988 561.319C207.438 561.319 207.025 561.614 206.752 562.204C206.482 562.794 206.348 563.694 206.348 564.905C206.348 565.456 206.385 565.972 206.459 566.452L209.189 562.099C208.893 561.579 208.492 561.319 207.988 561.319ZM215.219 560.382C216.152 560.382 216.857 560.763 217.334 561.525C217.814 562.286 218.055 563.413 218.055 564.905C218.055 566.398 217.814 567.525 217.334 568.286C216.857 569.048 216.152 569.429 215.219 569.429C214.285 569.429 213.58 569.048 213.104 568.286C212.627 567.525 212.389 566.398 212.389 564.905C212.389 563.413 212.627 562.286 213.104 561.525C213.58 560.763 214.285 560.382 215.219 560.382ZM215.219 568.491C215.773 568.491 216.186 568.196 216.455 567.607C216.729 567.017 216.865 566.116 216.865 564.905C216.865 564.261 216.826 563.679 216.748 563.159L213.959 567.525C214.252 568.169 214.672 568.491 215.219 568.491ZM215.219 561.319C214.668 561.319 214.256 561.614 213.982 562.204C213.713 562.794 213.578 563.694 213.578 564.905C213.578 565.456 213.615 565.972 213.689 566.452L216.42 562.099C216.123 561.579 215.723 561.319 215.219 561.319ZM224.377 560.194V563.78H223.064V560.194H224.377ZM221.254 560.194V563.78H219.941V560.194H221.254ZM217.146 578.194V581.78H215.834V578.194H217.146ZM214.023 578.194V581.78H212.711V578.194H214.023ZM225.607 582.05C225.377 581.87 225.143 581.739 224.904 581.657C224.666 581.575 224.404 581.534 224.119 581.534C223.447 581.534 222.934 581.745 222.578 582.167C222.223 582.589 222.045 583.198 222.045 583.995V587.259H220.961V580.696H222.045V581.98C222.225 581.515 222.5 581.159 222.871 580.913C223.246 580.663 223.689 580.538 224.201 580.538C224.467 580.538 224.715 580.571 224.945 580.638C225.176 580.704 225.396 580.808 225.607 580.948V582.05ZM229.68 581.452C229.133 581.452 228.719 581.665 228.438 582.091C228.156 582.517 228.016 583.148 228.016 583.984C228.016 584.816 228.156 585.446 228.438 585.876C228.719 586.302 229.133 586.515 229.68 586.515C230.23 586.515 230.646 586.302 230.928 585.876C231.209 585.446 231.35 584.816 231.35 583.984C231.35 583.148 231.209 582.517 230.928 582.091C230.646 581.665 230.23 581.452 229.68 581.452ZM229.68 580.538C230.59 580.538 231.285 580.833 231.766 581.423C232.25 582.013 232.492 582.866 232.492 583.984C232.492 585.105 232.252 585.96 231.771 586.55C231.291 587.136 230.594 587.429 229.68 587.429C228.77 587.429 228.074 587.136 227.594 586.55C227.113 585.96 226.873 585.105 226.873 583.984C226.873 582.866 227.113 582.013 227.594 581.423C228.074 580.833 228.77 580.538 229.68 580.538ZM234.443 584.775V580.708H235.521V584.775C235.521 585.364 235.625 585.798 235.832 586.075C236.043 586.353 236.367 586.491 236.805 586.491C237.312 586.491 237.701 586.314 237.971 585.958C238.24 585.599 238.375 585.085 238.375 584.417V580.708H239.459V587.259H238.375V586.275C238.184 586.653 237.922 586.941 237.59 587.136C237.262 587.331 236.877 587.429 236.436 587.429C235.764 587.429 235.264 587.21 234.936 586.773C234.607 586.331 234.443 585.665 234.443 584.775ZM246.689 583.193V587.259H245.605V583.193C245.605 582.603 245.502 582.169 245.295 581.892C245.088 581.614 244.764 581.476 244.322 581.476C243.818 581.476 243.43 581.655 243.156 582.015C242.887 582.37 242.752 582.882 242.752 583.55V587.259H241.674V580.696H242.752V581.681C242.943 581.306 243.203 581.023 243.531 580.831C243.859 580.636 244.248 580.538 244.697 580.538C245.365 580.538 245.863 580.759 246.191 581.2C246.523 581.638 246.689 582.302 246.689 583.193ZM252.789 581.534V578.142H253.867V587.259H252.789V586.433C252.609 586.757 252.369 587.005 252.068 587.177C251.771 587.345 251.428 587.429 251.037 587.429C250.244 587.429 249.619 587.122 249.162 586.509C248.709 585.892 248.482 585.042 248.482 583.96C248.482 582.894 248.711 582.058 249.168 581.452C249.625 580.843 250.248 580.538 251.037 580.538C251.432 580.538 251.779 580.624 252.08 580.796C252.381 580.964 252.617 581.21 252.789 581.534ZM249.619 583.984C249.619 584.819 249.752 585.45 250.018 585.876C250.283 586.302 250.676 586.515 251.195 586.515C251.715 586.515 252.109 586.3 252.379 585.87C252.652 585.441 252.789 584.812 252.789 583.984C252.789 583.151 252.652 582.523 252.379 582.097C252.109 581.667 251.715 581.452 251.195 581.452C250.676 581.452 250.283 581.665 250.018 582.091C249.752 582.517 249.619 583.148 249.619 583.984ZM261.555 583.439V583.966H256.885V584.001C256.854 584.896 257.023 585.538 257.395 585.929C257.77 586.319 258.297 586.515 258.977 586.515C259.32 586.515 259.68 586.46 260.055 586.351C260.43 586.241 260.83 586.075 261.256 585.853V586.925C260.846 587.093 260.449 587.218 260.066 587.3C259.688 587.386 259.32 587.429 258.965 587.429C257.945 587.429 257.148 587.124 256.574 586.515C256 585.901 255.713 585.058 255.713 583.984C255.713 582.937 255.994 582.101 256.557 581.476C257.119 580.851 257.869 580.538 258.807 580.538C259.643 580.538 260.301 580.821 260.781 581.388C261.266 581.954 261.523 582.638 261.555 583.439ZM260.477 583.122C260.43 582.669 260.264 582.278 259.979 581.95C259.697 581.618 259.291 581.452 258.76 581.452C258.24 581.452 257.812 581.624 257.477 581.968C257.141 582.312 256.957 582.698 256.926 583.128L260.477 583.122ZM267.25 581.534V578.142H268.328V587.259H267.25V586.433C267.07 586.757 266.83 587.005 266.529 587.177C266.232 587.345 265.889 587.429 265.498 587.429C264.705 587.429 264.08 587.122 263.623 586.509C263.17 585.892 262.943 585.042 262.943 583.96C262.943 582.894 263.172 582.058 263.629 581.452C264.086 580.843 264.709 580.538 265.498 580.538C265.893 580.538 266.24 580.624 266.541 580.796C266.842 580.964 267.078 581.21 267.25 581.534ZM264.08 583.984C264.08 584.819 264.213 585.45 264.479 585.876C264.744 586.302 265.137 586.515 265.656 586.515C266.176 586.515 266.57 586.3 266.84 585.87C267.113 585.441 267.25 584.812 267.25 583.984C267.25 583.151 267.113 582.523 266.84 582.097C266.57 581.667 266.176 581.452 265.656 581.452C265.137 581.452 264.744 581.665 264.479 582.091C264.213 582.517 264.08 583.148 264.08 583.984ZM270.051 583.017H276.262V584.007H270.051V583.017ZM280.645 581.364C280.777 581.083 280.945 580.876 281.148 580.743C281.355 580.607 281.604 580.538 281.893 580.538C282.42 580.538 282.791 580.743 283.006 581.153C283.225 581.56 283.334 582.327 283.334 583.456V587.259H282.35V583.503C282.35 582.577 282.297 582.003 282.191 581.78C282.09 581.554 281.902 581.441 281.629 581.441C281.316 581.441 281.102 581.562 280.984 581.804C280.871 582.042 280.814 582.609 280.814 583.503V587.259H279.83V583.503C279.83 582.566 279.773 581.987 279.66 581.769C279.551 581.55 279.352 581.441 279.062 581.441C278.777 581.441 278.578 581.562 278.465 581.804C278.355 582.042 278.301 582.609 278.301 583.503V587.259H277.322V580.696H278.301V581.259C278.43 581.025 278.59 580.847 278.781 580.726C278.977 580.601 279.197 580.538 279.443 580.538C279.74 580.538 279.986 580.607 280.182 580.743C280.381 580.88 280.535 581.087 280.645 581.364ZM288.941 581.534V578.142H290.02V587.259H288.941V586.433C288.762 586.757 288.521 587.005 288.221 587.177C287.924 587.345 287.58 587.429 287.189 587.429C286.396 587.429 285.771 587.122 285.314 586.509C284.861 585.892 284.635 585.042 284.635 583.96C284.635 582.894 284.863 582.058 285.32 581.452C285.777 580.843 286.4 580.538 287.189 580.538C287.584 580.538 287.932 580.624 288.232 580.796C288.533 580.964 288.77 581.21 288.941 581.534ZM285.771 583.984C285.771 584.819 285.904 585.45 286.17 585.876C286.436 586.302 286.828 586.515 287.348 586.515C287.867 586.515 288.262 586.3 288.531 585.87C288.805 585.441 288.941 584.812 288.941 583.984C288.941 583.151 288.805 582.523 288.531 582.097C288.262 581.667 287.867 581.452 287.348 581.452C286.828 581.452 286.436 581.665 286.17 582.091C285.904 582.517 285.771 583.148 285.771 583.984ZM296.682 578.194V581.78H295.369V578.194H296.682ZM293.559 578.194V581.78H292.246V578.194H293.559ZM303.912 650.194V653.78H302.6V650.194H303.912ZM300.789 650.194V653.78H299.477V650.194H300.789ZM310.984 655.984C310.984 655.148 310.852 654.517 310.586 654.091C310.32 653.665 309.928 653.452 309.408 653.452C308.885 653.452 308.488 653.667 308.219 654.097C307.949 654.523 307.814 655.151 307.814 655.984C307.814 656.812 307.949 657.441 308.219 657.87C308.488 658.3 308.885 658.515 309.408 658.515C309.928 658.515 310.32 658.302 310.586 657.876C310.852 657.45 310.984 656.819 310.984 655.984ZM307.814 653.534C307.986 653.214 308.223 652.968 308.523 652.796C308.828 652.624 309.18 652.538 309.578 652.538C310.367 652.538 310.988 652.843 311.441 653.452C311.895 654.058 312.121 654.894 312.121 655.96C312.121 657.042 311.893 657.892 311.436 658.509C310.982 659.122 310.359 659.429 309.566 659.429C309.176 659.429 308.83 659.345 308.529 659.177C308.232 659.005 307.994 658.757 307.814 658.433V659.259H306.736V650.142H307.814V653.534ZM317.049 656.886C317.049 657.37 317.137 657.735 317.312 657.982C317.492 658.228 317.756 658.351 318.104 658.351H319.363V659.259H317.998C317.354 659.259 316.854 659.054 316.498 658.644C316.146 658.23 315.971 657.644 315.971 656.886V650.95H314.242V650.107H317.049V656.886ZM323.676 653.452C323.129 653.452 322.715 653.665 322.434 654.091C322.152 654.517 322.012 655.148 322.012 655.984C322.012 656.816 322.152 657.446 322.434 657.876C322.715 658.302 323.129 658.515 323.676 658.515C324.227 658.515 324.643 658.302 324.924 657.876C325.205 657.446 325.346 656.816 325.346 655.984C325.346 655.148 325.205 654.517 324.924 654.091C324.643 653.665 324.227 653.452 323.676 653.452ZM323.676 652.538C324.586 652.538 325.281 652.833 325.762 653.423C326.246 654.013 326.488 654.866 326.488 655.984C326.488 657.105 326.248 657.96 325.768 658.55C325.287 659.136 324.59 659.429 323.676 659.429C322.766 659.429 322.07 659.136 321.59 658.55C321.109 657.96 320.869 657.105 320.869 655.984C320.869 654.866 321.109 654.013 321.59 653.423C322.07 652.833 322.766 652.538 323.676 652.538ZM333.514 658.925C333.225 659.093 332.926 659.218 332.617 659.3C332.312 659.386 332 659.429 331.68 659.429C330.664 659.429 329.869 659.124 329.295 658.515C328.725 657.905 328.439 657.062 328.439 655.984C328.439 654.905 328.725 654.062 329.295 653.452C329.869 652.843 330.664 652.538 331.68 652.538C331.996 652.538 332.305 652.579 332.605 652.661C332.906 652.743 333.209 652.87 333.514 653.042V654.173C333.229 653.919 332.941 653.735 332.652 653.622C332.367 653.509 332.043 653.452 331.68 653.452C331.004 653.452 330.484 653.671 330.121 654.109C329.758 654.546 329.576 655.171 329.576 655.984C329.576 656.792 329.758 657.417 330.121 657.859C330.488 658.296 331.008 658.515 331.68 658.515C332.055 658.515 332.391 658.458 332.688 658.345C332.984 658.228 333.26 658.048 333.514 657.806V658.925ZM335.91 650.142H337.023V655.421L339.854 652.696H341.166L338.582 655.169L341.57 659.259H340.252L337.826 655.872L337.023 656.628V659.259H335.91V650.142ZM355.146 655.193V659.259H354.062V655.193C354.062 654.603 353.959 654.169 353.752 653.892C353.545 653.614 353.221 653.476 352.779 653.476C352.275 653.476 351.887 653.655 351.613 654.015C351.344 654.37 351.209 654.882 351.209 655.55V659.259H350.131V650.142H351.209V653.681C351.4 653.306 351.66 653.023 351.988 652.831C352.316 652.636 352.705 652.538 353.154 652.538C353.822 652.538 354.32 652.759 354.648 653.2C354.98 653.638 355.146 654.302 355.146 655.193ZM359.828 653.452C359.281 653.452 358.867 653.665 358.586 654.091C358.305 654.517 358.164 655.148 358.164 655.984C358.164 656.816 358.305 657.446 358.586 657.876C358.867 658.302 359.281 658.515 359.828 658.515C360.379 658.515 360.795 658.302 361.076 657.876C361.357 657.446 361.498 656.816 361.498 655.984C361.498 655.148 361.357 654.517 361.076 654.091C360.795 653.665 360.379 653.452 359.828 653.452ZM359.828 652.538C360.738 652.538 361.434 652.833 361.914 653.423C362.398 654.013 362.641 654.866 362.641 655.984C362.641 657.105 362.4 657.96 361.92 658.55C361.439 659.136 360.742 659.429 359.828 659.429C358.918 659.429 358.223 659.136 357.742 658.55C357.262 657.96 357.021 657.105 357.021 655.984C357.021 654.866 357.262 654.013 357.742 653.423C358.223 652.833 358.918 652.538 359.828 652.538ZM364.035 652.696H365.154L367.059 658.204L368.969 652.696H370.088L367.756 659.259H366.367L364.035 652.696ZM377.242 655.439V655.966H372.572V656.001C372.541 656.896 372.711 657.538 373.082 657.929C373.457 658.319 373.984 658.515 374.664 658.515C375.008 658.515 375.367 658.46 375.742 658.351C376.117 658.241 376.518 658.075 376.943 657.853V658.925C376.533 659.093 376.137 659.218 375.754 659.3C375.375 659.386 375.008 659.429 374.652 659.429C373.633 659.429 372.836 659.124 372.262 658.515C371.688 657.901 371.4 657.058 371.4 655.984C371.4 654.937 371.682 654.101 372.244 653.476C372.807 652.851 373.557 652.538 374.494 652.538C375.33 652.538 375.988 652.821 376.469 653.388C376.953 653.954 377.211 654.638 377.242 655.439ZM376.164 655.122C376.117 654.669 375.951 654.278 375.666 653.95C375.385 653.618 374.979 653.452 374.447 653.452C373.928 653.452 373.5 653.624 373.164 653.968C372.828 654.312 372.645 654.698 372.613 655.128L376.164 655.122ZM384.678 654.05C384.447 653.87 384.213 653.739 383.975 653.657C383.736 653.575 383.475 653.534 383.189 653.534C382.518 653.534 382.004 653.745 381.648 654.167C381.293 654.589 381.115 655.198 381.115 655.995V659.259H380.031V652.696H381.115V653.98C381.295 653.515 381.57 653.159 381.941 652.913C382.316 652.663 382.76 652.538 383.271 652.538C383.537 652.538 383.785 652.571 384.016 652.638C384.246 652.704 384.467 652.808 384.678 652.948V654.05ZM387.654 652.702H389.482V654.818H387.654V652.702ZM387.654 657.126H389.482V659.259H387.654V657.126ZM395.98 653.452C395.434 653.452 395.02 653.665 394.738 654.091C394.457 654.517 394.316 655.148 394.316 655.984C394.316 656.816 394.457 657.446 394.738 657.876C395.02 658.302 395.434 658.515 395.98 658.515C396.531 658.515 396.947 658.302 397.229 657.876C397.51 657.446 397.65 656.816 397.65 655.984C397.65 655.148 397.51 654.517 397.229 654.091C396.947 653.665 396.531 653.452 395.98 653.452ZM395.98 652.538C396.891 652.538 397.586 652.833 398.066 653.423C398.551 654.013 398.793 654.866 398.793 655.984C398.793 657.105 398.553 657.96 398.072 658.55C397.592 659.136 396.895 659.429 395.98 659.429C395.07 659.429 394.375 659.136 393.895 658.55C393.414 657.96 393.174 657.105 393.174 655.984C393.174 654.866 393.414 654.013 393.895 653.423C394.375 652.833 395.07 652.538 395.98 652.538ZM401.799 658.433V661.755H400.715V652.696H401.799V653.534C401.979 653.21 402.217 652.964 402.514 652.796C402.814 652.624 403.16 652.538 403.551 652.538C404.344 652.538 404.965 652.845 405.414 653.458C405.867 654.071 406.094 654.921 406.094 656.007C406.094 657.073 405.867 657.911 405.414 658.521C404.961 659.126 404.34 659.429 403.551 659.429C403.152 659.429 402.803 659.345 402.502 659.177C402.205 659.005 401.971 658.757 401.799 658.433ZM404.963 655.984C404.963 655.148 404.83 654.517 404.564 654.091C404.303 653.665 403.912 653.452 403.393 653.452C402.869 653.452 402.473 653.667 402.203 654.097C401.934 654.523 401.799 655.151 401.799 655.984C401.799 656.812 401.934 657.441 402.203 657.87C402.473 658.3 402.869 658.515 403.393 658.515C403.912 658.515 404.303 658.302 404.564 657.876C404.83 657.45 404.963 656.819 404.963 655.984ZM410.945 655.96H410.588C409.959 655.96 409.484 656.071 409.164 656.294C408.848 656.513 408.689 656.841 408.689 657.278C408.689 657.673 408.809 657.98 409.047 658.198C409.285 658.417 409.615 658.526 410.037 658.526C410.631 658.526 411.098 658.321 411.438 657.911C411.777 657.497 411.949 656.927 411.953 656.2V655.96H410.945ZM413.037 655.515V659.259H411.953V658.286C411.723 658.677 411.432 658.966 411.08 659.153C410.732 659.337 410.309 659.429 409.809 659.429C409.141 659.429 408.607 659.241 408.209 658.866C407.811 658.487 407.611 657.982 407.611 657.349C407.611 656.618 407.855 656.064 408.344 655.685C408.836 655.306 409.557 655.116 410.506 655.116H411.953V654.946C411.949 654.423 411.816 654.044 411.555 653.81C411.293 653.571 410.875 653.452 410.301 653.452C409.934 653.452 409.562 653.505 409.188 653.61C408.812 653.716 408.447 653.87 408.092 654.073V652.995C408.49 652.843 408.871 652.73 409.234 652.655C409.602 652.577 409.957 652.538 410.301 652.538C410.844 652.538 411.307 652.618 411.689 652.778C412.076 652.939 412.389 653.179 412.627 653.499C412.775 653.694 412.881 653.937 412.943 654.226C413.006 654.511 413.037 654.941 413.037 655.515ZM420.279 658.925C419.99 659.093 419.691 659.218 419.383 659.3C419.078 659.386 418.766 659.429 418.445 659.429C417.43 659.429 416.635 659.124 416.061 658.515C415.49 657.905 415.205 657.062 415.205 655.984C415.205 654.905 415.49 654.062 416.061 653.452C416.635 652.843 417.43 652.538 418.445 652.538C418.762 652.538 419.07 652.579 419.371 652.661C419.672 652.743 419.975 652.87 420.279 653.042V654.173C419.994 653.919 419.707 653.735 419.418 653.622C419.133 653.509 418.809 653.452 418.445 653.452C417.77 653.452 417.25 653.671 416.887 654.109C416.523 654.546 416.342 655.171 416.342 655.984C416.342 656.792 416.523 657.417 416.887 657.859C417.254 658.296 417.773 658.515 418.445 658.515C418.82 658.515 419.156 658.458 419.453 658.345C419.75 658.228 420.025 658.048 420.279 657.806V658.925ZM423.145 652.72H425.904V658.421H428.043V659.259H422.688V658.421H424.826V653.558H423.145V652.72ZM424.826 650.171H425.904V651.53H424.826V650.171ZM432.121 650.833V652.696H434.57V653.534H432.121V657.097C432.121 657.581 432.213 657.919 432.396 658.11C432.58 658.302 432.9 658.398 433.357 658.398H434.57V659.259H433.252C432.443 659.259 431.873 659.097 431.541 658.773C431.209 658.448 431.043 657.89 431.043 657.097V653.534H429.291V652.696H431.043V650.833H432.121ZM440.781 657.15C440.602 657.607 440.373 658.208 440.096 658.954C439.709 659.985 439.449 660.614 439.316 660.841C439.137 661.146 438.912 661.374 438.643 661.526C438.373 661.679 438.059 661.755 437.699 661.755H436.832V660.853H437.471C437.787 660.853 438.035 660.761 438.215 660.577C438.395 660.394 438.623 659.919 438.9 659.153L436.363 652.696H437.506L439.451 657.829L441.367 652.696H442.51L440.781 657.15ZM443.582 655.017H449.793V656.007H443.582V655.017ZM453.824 655.105C453.297 655.105 452.889 655.253 452.6 655.55C452.314 655.843 452.172 656.259 452.172 656.798C452.172 657.337 452.316 657.757 452.605 658.058C452.898 658.355 453.305 658.503 453.824 658.503C454.355 658.503 454.764 658.357 455.049 658.064C455.338 657.767 455.482 657.345 455.482 656.798C455.482 656.263 455.336 655.847 455.043 655.55C454.754 655.253 454.348 655.105 453.824 655.105ZM452.793 654.612C452.289 654.484 451.895 654.243 451.609 653.892C451.328 653.54 451.188 653.116 451.188 652.62C451.188 651.925 451.424 651.374 451.896 650.968C452.369 650.558 453.012 650.353 453.824 650.353C454.641 650.353 455.285 650.558 455.758 650.968C456.23 651.374 456.467 651.925 456.467 652.62C456.467 653.116 456.324 653.54 456.039 653.892C455.758 654.243 455.365 654.484 454.861 654.612C455.447 654.741 455.895 655.001 456.203 655.392C456.516 655.782 456.672 656.288 456.672 656.909C456.672 657.698 456.42 658.316 455.916 658.761C455.412 659.206 454.715 659.429 453.824 659.429C452.934 659.429 452.236 659.208 451.732 658.767C451.232 658.321 450.982 657.706 450.982 656.921C450.982 656.296 451.137 655.788 451.445 655.398C451.758 655.003 452.207 654.741 452.793 654.612ZM452.365 652.732C452.365 653.2 452.49 653.558 452.74 653.804C452.99 654.05 453.352 654.173 453.824 654.173C454.301 654.173 454.664 654.05 454.914 653.804C455.164 653.558 455.289 653.2 455.289 652.732C455.289 652.255 455.164 651.892 454.914 651.642C454.668 651.392 454.305 651.267 453.824 651.267C453.352 651.267 452.99 651.394 452.74 651.648C452.49 651.898 452.365 652.259 452.365 652.732ZM461.055 650.382C461.988 650.382 462.693 650.763 463.17 651.525C463.65 652.286 463.891 653.413 463.891 654.905C463.891 656.398 463.65 657.525 463.17 658.286C462.693 659.048 461.988 659.429 461.055 659.429C460.121 659.429 459.416 659.048 458.939 658.286C458.463 657.525 458.225 656.398 458.225 654.905C458.225 653.413 458.463 652.286 458.939 651.525C459.416 650.763 460.121 650.382 461.055 650.382ZM461.055 658.491C461.609 658.491 462.021 658.196 462.291 657.607C462.564 657.017 462.701 656.116 462.701 654.905C462.701 654.261 462.662 653.679 462.584 653.159L459.795 657.525C460.088 658.169 460.508 658.491 461.055 658.491ZM461.055 651.319C460.504 651.319 460.092 651.614 459.818 652.204C459.549 652.794 459.414 653.694 459.414 654.905C459.414 655.456 459.451 655.972 459.525 656.452L462.256 652.099C461.959 651.579 461.559 651.319 461.055 651.319ZM475.504 650.833V652.696H477.953V653.534H475.504V657.097C475.504 657.581 475.596 657.919 475.779 658.11C475.963 658.302 476.283 658.398 476.74 658.398H477.953V659.259H476.635C475.826 659.259 475.256 659.097 474.924 658.773C474.592 658.448 474.426 657.89 474.426 657.097V653.534H472.674V652.696H474.426V650.833H475.504ZM485.904 654.05C485.674 653.87 485.439 653.739 485.201 653.657C484.963 653.575 484.701 653.534 484.416 653.534C483.744 653.534 483.23 653.745 482.875 654.167C482.52 654.589 482.342 655.198 482.342 655.995V659.259H481.258V652.696H482.342V653.98C482.521 653.515 482.797 653.159 483.168 652.913C483.543 652.663 483.986 652.538 484.498 652.538C484.764 652.538 485.012 652.571 485.242 652.638C485.473 652.704 485.693 652.808 485.904 652.948V654.05ZM490.48 655.96H490.123C489.494 655.96 489.02 656.071 488.699 656.294C488.383 656.513 488.225 656.841 488.225 657.278C488.225 657.673 488.344 657.98 488.582 658.198C488.82 658.417 489.15 658.526 489.572 658.526C490.166 658.526 490.633 658.321 490.973 657.911C491.312 657.497 491.484 656.927 491.488 656.2V655.96H490.48ZM492.572 655.515V659.259H491.488V658.286C491.258 658.677 490.967 658.966 490.615 659.153C490.268 659.337 489.844 659.429 489.344 659.429C488.676 659.429 488.143 659.241 487.744 658.866C487.346 658.487 487.146 657.982 487.146 657.349C487.146 656.618 487.391 656.064 487.879 655.685C488.371 655.306 489.092 655.116 490.041 655.116H491.488V654.946C491.484 654.423 491.352 654.044 491.09 653.81C490.828 653.571 490.41 653.452 489.836 653.452C489.469 653.452 489.098 653.505 488.723 653.61C488.348 653.716 487.982 653.87 487.627 654.073V652.995C488.025 652.843 488.406 652.73 488.77 652.655C489.137 652.577 489.492 652.538 489.836 652.538C490.379 652.538 490.842 652.618 491.225 652.778C491.611 652.939 491.924 653.179 492.162 653.499C492.311 653.694 492.416 653.937 492.479 654.226C492.541 654.511 492.572 654.941 492.572 655.515ZM499.756 655.193V659.259H498.672V655.193C498.672 654.603 498.568 654.169 498.361 653.892C498.154 653.614 497.83 653.476 497.389 653.476C496.885 653.476 496.496 653.655 496.223 654.015C495.953 654.37 495.818 654.882 495.818 655.55V659.259H494.74V652.696H495.818V653.681C496.01 653.306 496.27 653.023 496.598 652.831C496.926 652.636 497.314 652.538 497.764 652.538C498.432 652.538 498.93 652.759 499.258 653.2C499.59 653.638 499.756 654.302 499.756 655.193ZM506.529 652.925V653.98C506.221 653.8 505.91 653.665 505.598 653.575C505.285 653.485 504.967 653.441 504.643 653.441C504.154 653.441 503.789 653.521 503.547 653.681C503.309 653.837 503.189 654.077 503.189 654.401C503.189 654.694 503.279 654.913 503.459 655.058C503.639 655.202 504.086 655.343 504.801 655.48L505.234 655.562C505.77 655.663 506.174 655.866 506.447 656.171C506.725 656.476 506.863 656.872 506.863 657.36C506.863 658.009 506.633 658.517 506.172 658.884C505.711 659.247 505.07 659.429 504.25 659.429C503.926 659.429 503.586 659.394 503.23 659.323C502.875 659.257 502.49 659.155 502.076 659.019V657.905C502.479 658.112 502.863 658.269 503.23 658.374C503.598 658.476 503.945 658.526 504.273 658.526C504.75 658.526 505.119 658.431 505.381 658.239C505.643 658.044 505.773 657.773 505.773 657.425C505.773 656.925 505.295 656.579 504.338 656.388L504.291 656.376L503.887 656.294C503.266 656.173 502.812 655.97 502.527 655.685C502.242 655.396 502.1 655.003 502.1 654.507C502.1 653.878 502.312 653.394 502.738 653.054C503.164 652.71 503.771 652.538 504.561 652.538C504.912 652.538 505.25 652.571 505.574 652.638C505.898 652.7 506.217 652.796 506.529 652.925ZM509.91 652.72H512.67V658.421H514.809V659.259H509.453V658.421H511.592V653.558H509.91V652.72ZM511.592 650.171H512.67V651.53H511.592V650.171ZM518.887 650.833V652.696H521.336V653.534H518.887V657.097C518.887 657.581 518.979 657.919 519.162 658.11C519.346 658.302 519.666 658.398 520.123 658.398H521.336V659.259H520.018C519.209 659.259 518.639 659.097 518.307 658.773C517.975 658.448 517.809 657.89 517.809 657.097V653.534H516.057V652.696H517.809V650.833H518.887ZM524.371 652.72H527.131V658.421H529.27V659.259H523.914V658.421H526.053V653.558H524.371V652.72ZM526.053 650.171H527.131V651.53H526.053V650.171ZM533.359 653.452C532.812 653.452 532.398 653.665 532.117 654.091C531.836 654.517 531.695 655.148 531.695 655.984C531.695 656.816 531.836 657.446 532.117 657.876C532.398 658.302 532.812 658.515 533.359 658.515C533.91 658.515 534.326 658.302 534.607 657.876C534.889 657.446 535.029 656.816 535.029 655.984C535.029 655.148 534.889 654.517 534.607 654.091C534.326 653.665 533.91 653.452 533.359 653.452ZM533.359 652.538C534.27 652.538 534.965 652.833 535.445 653.423C535.93 654.013 536.172 654.866 536.172 655.984C536.172 657.105 535.932 657.96 535.451 658.55C534.971 659.136 534.273 659.429 533.359 659.429C532.449 659.429 531.754 659.136 531.273 658.55C530.793 657.96 530.553 657.105 530.553 655.984C530.553 654.866 530.793 654.013 531.273 653.423C531.754 652.833 532.449 652.538 533.359 652.538ZM543.139 655.193V659.259H542.055V655.193C542.055 654.603 541.951 654.169 541.744 653.892C541.537 653.614 541.213 653.476 540.771 653.476C540.268 653.476 539.879 653.655 539.605 654.015C539.336 654.37 539.201 654.882 539.201 655.55V659.259H538.123V652.696H539.201V653.681C539.393 653.306 539.652 653.023 539.98 652.831C540.309 652.636 540.697 652.538 541.146 652.538C541.814 652.538 542.312 652.759 542.641 653.2C542.973 653.638 543.139 654.302 543.139 655.193ZM544.809 655.017H551.02V656.007H544.809V655.017ZM555.051 653.452C554.504 653.452 554.09 653.665 553.809 654.091C553.527 654.517 553.387 655.148 553.387 655.984C553.387 656.816 553.527 657.446 553.809 657.876C554.09 658.302 554.504 658.515 555.051 658.515C555.602 658.515 556.018 658.302 556.299 657.876C556.58 657.446 556.721 656.816 556.721 655.984C556.721 655.148 556.58 654.517 556.299 654.091C556.018 653.665 555.602 653.452 555.051 653.452ZM555.051 652.538C555.961 652.538 556.656 652.833 557.137 653.423C557.621 654.013 557.863 654.866 557.863 655.984C557.863 657.105 557.623 657.96 557.143 658.55C556.662 659.136 555.965 659.429 555.051 659.429C554.141 659.429 553.445 659.136 552.965 658.55C552.484 657.96 552.244 657.105 552.244 655.984C552.244 654.866 552.484 654.013 552.965 653.423C553.445 652.833 554.141 652.538 555.051 652.538ZM560.869 658.433V661.755H559.785V652.696H560.869V653.534C561.049 653.21 561.287 652.964 561.584 652.796C561.885 652.624 562.23 652.538 562.621 652.538C563.414 652.538 564.035 652.845 564.484 653.458C564.938 654.071 565.164 654.921 565.164 656.007C565.164 657.073 564.938 657.911 564.484 658.521C564.031 659.126 563.41 659.429 562.621 659.429C562.223 659.429 561.873 659.345 561.572 659.177C561.275 659.005 561.041 658.757 560.869 658.433ZM564.033 655.984C564.033 655.148 563.9 654.517 563.635 654.091C563.373 653.665 562.982 653.452 562.463 653.452C561.939 653.452 561.543 653.667 561.273 654.097C561.004 654.523 560.869 655.151 560.869 655.984C560.869 656.812 561.004 657.441 561.273 657.87C561.543 658.3 561.939 658.515 562.463 658.515C562.982 658.515 563.373 658.302 563.635 657.876C563.9 657.45 564.033 656.819 564.033 655.984ZM570.016 655.96H569.658C569.029 655.96 568.555 656.071 568.234 656.294C567.918 656.513 567.76 656.841 567.76 657.278C567.76 657.673 567.879 657.98 568.117 658.198C568.355 658.417 568.686 658.526 569.107 658.526C569.701 658.526 570.168 658.321 570.508 657.911C570.848 657.497 571.02 656.927 571.023 656.2V655.96H570.016ZM572.107 655.515V659.259H571.023V658.286C570.793 658.677 570.502 658.966 570.15 659.153C569.803 659.337 569.379 659.429 568.879 659.429C568.211 659.429 567.678 659.241 567.279 658.866C566.881 658.487 566.682 657.982 566.682 657.349C566.682 656.618 566.926 656.064 567.414 655.685C567.906 655.306 568.627 655.116 569.576 655.116H571.023V654.946C571.02 654.423 570.887 654.044 570.625 653.81C570.363 653.571 569.945 653.452 569.371 653.452C569.004 653.452 568.633 653.505 568.258 653.61C567.883 653.716 567.518 653.87 567.162 654.073V652.995C567.561 652.843 567.941 652.73 568.305 652.655C568.672 652.577 569.027 652.538 569.371 652.538C569.914 652.538 570.377 652.618 570.76 652.778C571.146 652.939 571.459 653.179 571.697 653.499C571.846 653.694 571.951 653.937 572.014 654.226C572.076 654.511 572.107 654.941 572.107 655.515ZM579.35 658.925C579.061 659.093 578.762 659.218 578.453 659.3C578.148 659.386 577.836 659.429 577.516 659.429C576.5 659.429 575.705 659.124 575.131 658.515C574.561 657.905 574.275 657.062 574.275 655.984C574.275 654.905 574.561 654.062 575.131 653.452C575.705 652.843 576.5 652.538 577.516 652.538C577.832 652.538 578.141 652.579 578.441 652.661C578.742 652.743 579.045 652.87 579.35 653.042V654.173C579.064 653.919 578.777 653.735 578.488 653.622C578.203 653.509 577.879 653.452 577.516 653.452C576.84 653.452 576.32 653.671 575.957 654.109C575.594 654.546 575.412 655.171 575.412 655.984C575.412 656.792 575.594 657.417 575.957 657.859C576.324 658.296 576.844 658.515 577.516 658.515C577.891 658.515 578.227 658.458 578.523 658.345C578.82 658.228 579.096 658.048 579.35 657.806V658.925ZM582.215 652.72H584.975V658.421H587.113V659.259H581.758V658.421H583.896V653.558H582.215V652.72ZM583.896 650.171H584.975V651.53H583.896V650.171ZM591.191 650.833V652.696H593.641V653.534H591.191V657.097C591.191 657.581 591.283 657.919 591.467 658.11C591.65 658.302 591.971 658.398 592.428 658.398H593.641V659.259H592.322C591.514 659.259 590.943 659.097 590.611 658.773C590.279 658.448 590.113 657.89 590.113 657.097V653.534H588.361V652.696H590.113V650.833H591.191ZM599.852 657.15C599.672 657.607 599.443 658.208 599.166 658.954C598.779 659.985 598.52 660.614 598.387 660.841C598.207 661.146 597.982 661.374 597.713 661.526C597.443 661.679 597.129 661.755 596.77 661.755H595.902V660.853H596.541C596.857 660.853 597.105 660.761 597.285 660.577C597.465 660.394 597.693 659.919 597.971 659.153L595.434 652.696H596.576L598.521 657.829L600.438 652.696H601.58L599.852 657.15ZM607.592 650.194V653.78H606.279V650.194H607.592ZM604.469 650.194V653.78H603.156V650.194H604.469ZM224.377 668.194V671.78H223.064V668.194H224.377ZM221.254 668.194V671.78H219.941V668.194H221.254ZM232.299 668.142V669.038H231.074C230.688 669.038 230.418 669.118 230.266 669.278C230.117 669.435 230.043 669.714 230.043 670.116V670.696H232.299V671.534H230.043V677.259H228.965V671.534H227.213V670.696H228.965V670.239C228.965 669.521 229.129 668.991 229.457 668.651C229.789 668.312 230.305 668.142 231.004 668.142H232.299ZM237.514 674.886C237.514 675.37 237.602 675.735 237.777 675.982C237.957 676.228 238.221 676.351 238.568 676.351H239.828V677.259H238.463C237.818 677.259 237.318 677.054 236.963 676.644C236.611 676.23 236.436 675.644 236.436 674.886V668.95H234.707V668.107H237.514V674.886ZM247.094 673.439V673.966H242.424V674.001C242.393 674.896 242.562 675.538 242.934 675.929C243.309 676.319 243.836 676.515 244.516 676.515C244.859 676.515 245.219 676.46 245.594 676.351C245.969 676.241 246.369 676.075 246.795 675.853V676.925C246.385 677.093 245.988 677.218 245.605 677.3C245.227 677.386 244.859 677.429 244.504 677.429C243.484 677.429 242.688 677.124 242.113 676.515C241.539 675.901 241.252 675.058 241.252 673.984C241.252 672.937 241.533 672.101 242.096 671.476C242.658 670.851 243.408 670.538 244.346 670.538C245.182 670.538 245.84 670.821 246.32 671.388C246.805 671.954 247.062 672.638 247.094 673.439ZM246.016 673.122C245.969 672.669 245.803 672.278 245.518 671.95C245.236 671.618 244.83 671.452 244.299 671.452C243.779 671.452 243.352 671.624 243.016 671.968C242.68 672.312 242.496 672.698 242.465 673.128L246.016 673.122ZM254.312 670.696L251.963 673.837L254.541 677.259H253.293L251.371 674.628L249.455 677.259H248.207L250.785 673.837L248.436 670.696H249.631L251.371 673.069L253.1 670.696H254.312ZM268.451 668.142V669.038H267.227C266.84 669.038 266.57 669.118 266.418 669.278C266.27 669.435 266.195 669.714 266.195 670.116V670.696H268.451V671.534H266.195V677.259H265.117V671.534H263.365V670.696H265.117V670.239C265.117 669.521 265.281 668.991 265.609 668.651C265.941 668.312 266.457 668.142 267.156 668.142H268.451ZM273.666 674.886C273.666 675.37 273.754 675.735 273.93 675.982C274.109 676.228 274.373 676.351 274.721 676.351H275.98V677.259H274.615C273.971 677.259 273.471 677.054 273.115 676.644C272.764 676.23 272.588 675.644 272.588 674.886V668.95H270.859V668.107H273.666V674.886ZM283.246 673.439V673.966H278.576V674.001C278.545 674.896 278.715 675.538 279.086 675.929C279.461 676.319 279.988 676.515 280.668 676.515C281.012 676.515 281.371 676.46 281.746 676.351C282.121 676.241 282.521 676.075 282.947 675.853V676.925C282.537 677.093 282.141 677.218 281.758 677.3C281.379 677.386 281.012 677.429 280.656 677.429C279.637 677.429 278.84 677.124 278.266 676.515C277.691 675.901 277.404 675.058 277.404 673.984C277.404 672.937 277.686 672.101 278.248 671.476C278.811 670.851 279.561 670.538 280.498 670.538C281.334 670.538 281.992 670.821 282.473 671.388C282.957 671.954 283.215 672.638 283.246 673.439ZM282.168 673.122C282.121 672.669 281.955 672.278 281.67 671.95C281.389 671.618 280.982 671.452 280.451 671.452C279.932 671.452 279.504 671.624 279.168 671.968C278.832 672.312 278.648 672.698 278.617 673.128L282.168 673.122ZM290.465 670.696L288.115 673.837L290.693 677.259H289.445L287.523 674.628L285.607 677.259H284.359L286.938 673.837L284.588 670.696H285.783L287.523 673.069L289.252 670.696H290.465ZM291.742 673.017H297.953V674.007H291.742V673.017ZM304.592 676.925C304.303 677.093 304.004 677.218 303.695 677.3C303.391 677.386 303.078 677.429 302.758 677.429C301.742 677.429 300.947 677.124 300.373 676.515C299.803 675.905 299.518 675.062 299.518 673.984C299.518 672.905 299.803 672.062 300.373 671.452C300.947 670.843 301.742 670.538 302.758 670.538C303.074 670.538 303.383 670.579 303.684 670.661C303.984 670.743 304.287 670.87 304.592 671.042V672.173C304.307 671.919 304.02 671.735 303.73 671.622C303.445 671.509 303.121 671.452 302.758 671.452C302.082 671.452 301.562 671.671 301.199 672.109C300.836 672.546 300.654 673.171 300.654 673.984C300.654 674.792 300.836 675.417 301.199 675.859C301.566 676.296 302.086 676.515 302.758 676.515C303.133 676.515 303.469 676.458 303.766 676.345C304.062 676.228 304.338 676.048 304.592 675.806V676.925ZM309.215 671.452C308.668 671.452 308.254 671.665 307.973 672.091C307.691 672.517 307.551 673.148 307.551 673.984C307.551 674.816 307.691 675.446 307.973 675.876C308.254 676.302 308.668 676.515 309.215 676.515C309.766 676.515 310.182 676.302 310.463 675.876C310.744 675.446 310.885 674.816 310.885 673.984C310.885 673.148 310.744 672.517 310.463 672.091C310.182 671.665 309.766 671.452 309.215 671.452ZM309.215 670.538C310.125 670.538 310.82 670.833 311.301 671.423C311.785 672.013 312.027 672.866 312.027 673.984C312.027 675.105 311.787 675.96 311.307 676.55C310.826 677.136 310.129 677.429 309.215 677.429C308.305 677.429 307.609 677.136 307.129 676.55C306.648 675.96 306.408 675.105 306.408 673.984C306.408 672.866 306.648 672.013 307.129 671.423C307.609 670.833 308.305 670.538 309.215 670.538ZM317.049 674.886C317.049 675.37 317.137 675.735 317.312 675.982C317.492 676.228 317.756 676.351 318.104 676.351H319.363V677.259H317.998C317.354 677.259 316.854 677.054 316.498 676.644C316.146 676.23 315.971 675.644 315.971 674.886V668.95H314.242V668.107H317.049V674.886ZM332.324 673.925C332.324 673.116 332.191 672.503 331.926 672.085C331.664 671.663 331.281 671.452 330.777 671.452C330.25 671.452 329.848 671.663 329.57 672.085C329.293 672.503 329.154 673.116 329.154 673.925C329.154 674.734 329.293 675.351 329.57 675.776C329.852 676.198 330.258 676.409 330.789 676.409C331.285 676.409 331.664 676.196 331.926 675.771C332.191 675.345 332.324 674.73 332.324 673.925ZM333.402 676.837C333.402 677.821 333.17 678.568 332.705 679.075C332.24 679.583 331.557 679.837 330.654 679.837C330.357 679.837 330.047 679.81 329.723 679.755C329.398 679.7 329.074 679.62 328.75 679.515V678.448C329.133 678.628 329.48 678.761 329.793 678.847C330.105 678.933 330.393 678.976 330.654 678.976C331.236 678.976 331.66 678.818 331.926 678.501C332.191 678.185 332.324 677.683 332.324 676.995V676.948V676.216C332.152 676.583 331.918 676.857 331.621 677.036C331.324 677.216 330.963 677.306 330.537 677.306C329.771 677.306 329.16 676.999 328.703 676.386C328.246 675.773 328.018 674.952 328.018 673.925C328.018 672.894 328.246 672.071 328.703 671.458C329.16 670.845 329.771 670.538 330.537 670.538C330.959 670.538 331.316 670.622 331.609 670.79C331.902 670.958 332.141 671.218 332.324 671.569V670.72H333.402V676.837ZM338.641 673.96H338.283C337.654 673.96 337.18 674.071 336.859 674.294C336.543 674.513 336.385 674.841 336.385 675.278C336.385 675.673 336.504 675.98 336.742 676.198C336.98 676.417 337.311 676.526 337.732 676.526C338.326 676.526 338.793 676.321 339.133 675.911C339.473 675.497 339.645 674.927 339.648 674.2V673.96H338.641ZM340.732 673.515V677.259H339.648V676.286C339.418 676.677 339.127 676.966 338.775 677.153C338.428 677.337 338.004 677.429 337.504 677.429C336.836 677.429 336.303 677.241 335.904 676.866C335.506 676.487 335.307 675.982 335.307 675.349C335.307 674.618 335.551 674.064 336.039 673.685C336.531 673.306 337.252 673.116 338.201 673.116H339.648V672.946C339.645 672.423 339.512 672.044 339.25 671.81C338.988 671.571 338.57 671.452 337.996 671.452C337.629 671.452 337.258 671.505 336.883 671.61C336.508 671.716 336.143 671.87 335.787 672.073V670.995C336.186 670.843 336.566 670.73 336.93 670.655C337.297 670.577 337.652 670.538 337.996 670.538C338.539 670.538 339.002 670.618 339.385 670.778C339.771 670.939 340.084 671.179 340.322 671.499C340.471 671.694 340.576 671.937 340.639 672.226C340.701 672.511 340.732 672.941 340.732 673.515ZM343.955 676.433V679.755H342.871V670.696H343.955V671.534C344.135 671.21 344.373 670.964 344.67 670.796C344.971 670.624 345.316 670.538 345.707 670.538C346.5 670.538 347.121 670.845 347.57 671.458C348.023 672.071 348.25 672.921 348.25 674.007C348.25 675.073 348.023 675.911 347.57 676.521C347.117 677.126 346.496 677.429 345.707 677.429C345.309 677.429 344.959 677.345 344.658 677.177C344.361 677.005 344.127 676.757 343.955 676.433ZM347.119 673.984C347.119 673.148 346.986 672.517 346.721 672.091C346.459 671.665 346.068 671.452 345.549 671.452C345.025 671.452 344.629 671.667 344.359 672.097C344.09 672.523 343.955 673.151 343.955 673.984C343.955 674.812 344.09 675.441 344.359 675.87C344.629 676.3 345.025 676.515 345.549 676.515C346.068 676.515 346.459 676.302 346.721 675.876C346.986 675.45 347.119 674.819 347.119 673.984ZM349.586 673.017H355.797V674.007H349.586V673.017ZM360.525 669.589L357.766 674.212H360.525V669.589ZM360.332 668.511H361.703V674.212H362.869V675.173H361.703V677.259H360.525V675.173H356.816V674.054L360.332 668.511ZM368.986 668.194V671.78H367.674V668.194H368.986ZM365.863 668.194V671.78H364.551V668.194H365.863ZM202.686 794.194V797.78H201.373V794.194H202.686ZM199.562 794.194V797.78H198.25V794.194H199.562ZM205.961 802.269H207.801V795.659L205.598 796.72V795.583L207.789 794.54H208.973V802.269H210.789V803.259H205.961V802.269ZM217.416 794.704V795.794C217.17 795.65 216.908 795.54 216.631 795.466C216.354 795.388 216.064 795.349 215.764 795.349C215.014 795.349 214.445 795.632 214.059 796.198C213.672 796.761 213.479 797.591 213.479 798.689C213.666 798.298 213.926 797.999 214.258 797.792C214.59 797.581 214.971 797.476 215.4 797.476C216.244 797.476 216.896 797.735 217.357 798.255C217.822 798.771 218.055 799.503 218.055 800.452C218.055 801.398 217.816 802.13 217.34 802.65C216.863 803.169 216.193 803.429 215.33 803.429C214.314 803.429 213.57 803.066 213.098 802.339C212.625 801.609 212.389 800.46 212.389 798.894C212.389 797.417 212.672 796.292 213.238 795.519C213.809 794.741 214.633 794.353 215.711 794.353C216 794.353 216.289 794.384 216.578 794.446C216.867 794.505 217.146 794.591 217.416 794.704ZM215.307 798.401C214.803 798.401 214.406 798.583 214.117 798.946C213.828 799.31 213.684 799.812 213.684 800.452C213.684 801.093 213.828 801.595 214.117 801.958C214.406 802.321 214.803 802.503 215.307 802.503C215.83 802.503 216.225 802.331 216.49 801.987C216.756 801.64 216.889 801.128 216.889 800.452C216.889 799.773 216.756 799.261 216.49 798.917C216.225 798.573 215.83 798.401 215.307 798.401ZM222.449 794.382C223.383 794.382 224.088 794.763 224.564 795.525C225.045 796.286 225.285 797.413 225.285 798.905C225.285 800.398 225.045 801.525 224.564 802.286C224.088 803.048 223.383 803.429 222.449 803.429C221.516 803.429 220.811 803.048 220.334 802.286C219.857 801.525 219.619 800.398 219.619 798.905C219.619 797.413 219.857 796.286 220.334 795.525C220.811 794.763 221.516 794.382 222.449 794.382ZM222.449 802.491C223.004 802.491 223.416 802.196 223.686 801.607C223.959 801.017 224.096 800.116 224.096 798.905C224.096 798.261 224.057 797.679 223.979 797.159L221.189 801.525C221.482 802.169 221.902 802.491 222.449 802.491ZM222.449 795.319C221.898 795.319 221.486 795.614 221.213 796.204C220.943 796.794 220.809 797.694 220.809 798.905C220.809 799.456 220.846 799.972 220.92 800.452L223.65 796.099C223.354 795.579 222.953 795.319 222.449 795.319ZM229.68 794.382C230.613 794.382 231.318 794.763 231.795 795.525C232.275 796.286 232.516 797.413 232.516 798.905C232.516 800.398 232.275 801.525 231.795 802.286C231.318 803.048 230.613 803.429 229.68 803.429C228.746 803.429 228.041 803.048 227.564 802.286C227.088 801.525 226.85 800.398 226.85 798.905C226.85 797.413 227.088 796.286 227.564 795.525C228.041 794.763 228.746 794.382 229.68 794.382ZM229.68 802.491C230.234 802.491 230.646 802.196 230.916 801.607C231.189 801.017 231.326 800.116 231.326 798.905C231.326 798.261 231.287 797.679 231.209 797.159L228.42 801.525C228.713 802.169 229.133 802.491 229.68 802.491ZM229.68 795.319C229.129 795.319 228.717 795.614 228.443 796.204C228.174 796.794 228.039 797.694 228.039 798.905C228.039 799.456 228.076 799.972 228.15 800.452L230.881 796.099C230.584 795.579 230.184 795.319 229.68 795.319ZM238.838 794.194V797.78H237.525V794.194H238.838ZM235.715 794.194V797.78H234.402V794.194H235.715ZM209.916 812.194V815.78H208.604V812.194H209.916ZM206.793 812.194V815.78H205.48V812.194H206.793ZM215.219 817.105C214.691 817.105 214.283 817.253 213.994 817.55C213.709 817.843 213.566 818.259 213.566 818.798C213.566 819.337 213.711 819.757 214 820.058C214.293 820.355 214.699 820.503 215.219 820.503C215.75 820.503 216.158 820.357 216.443 820.064C216.732 819.767 216.877 819.345 216.877 818.798C216.877 818.263 216.73 817.847 216.438 817.55C216.148 817.253 215.742 817.105 215.219 817.105ZM214.188 816.612C213.684 816.484 213.289 816.243 213.004 815.892C212.723 815.54 212.582 815.116 212.582 814.62C212.582 813.925 212.818 813.374 213.291 812.968C213.764 812.558 214.406 812.353 215.219 812.353C216.035 812.353 216.68 812.558 217.152 812.968C217.625 813.374 217.861 813.925 217.861 814.62C217.861 815.116 217.719 815.54 217.434 815.892C217.152 816.243 216.76 816.484 216.256 816.612C216.842 816.741 217.289 817.001 217.598 817.392C217.91 817.782 218.066 818.288 218.066 818.909C218.066 819.698 217.814 820.316 217.311 820.761C216.807 821.206 216.109 821.429 215.219 821.429C214.328 821.429 213.631 821.208 213.127 820.767C212.627 820.321 212.377 819.706 212.377 818.921C212.377 818.296 212.531 817.788 212.84 817.398C213.152 817.003 213.602 816.741 214.188 816.612ZM213.76 814.732C213.76 815.2 213.885 815.558 214.135 815.804C214.385 816.05 214.746 816.173 215.219 816.173C215.695 816.173 216.059 816.05 216.309 815.804C216.559 815.558 216.684 815.2 216.684 814.732C216.684 814.255 216.559 813.892 216.309 813.642C216.062 813.392 215.699 813.267 215.219 813.267C214.746 813.267 214.385 813.394 214.135 813.648C213.885 813.898 213.76 814.259 213.76 814.732ZM222.449 812.382C223.383 812.382 224.088 812.763 224.564 813.525C225.045 814.286 225.285 815.413 225.285 816.905C225.285 818.398 225.045 819.525 224.564 820.286C224.088 821.048 223.383 821.429 222.449 821.429C221.516 821.429 220.811 821.048 220.334 820.286C219.857 819.525 219.619 818.398 219.619 816.905C219.619 815.413 219.857 814.286 220.334 813.525C220.811 812.763 221.516 812.382 222.449 812.382ZM222.449 820.491C223.004 820.491 223.416 820.196 223.686 819.607C223.959 819.017 224.096 818.116 224.096 816.905C224.096 816.261 224.057 815.679 223.979 815.159L221.189 819.525C221.482 820.169 221.902 820.491 222.449 820.491ZM222.449 813.319C221.898 813.319 221.486 813.614 221.213 814.204C220.943 814.794 220.809 815.694 220.809 816.905C220.809 817.456 220.846 817.972 220.92 818.452L223.65 814.099C223.354 813.579 222.953 813.319 222.449 813.319ZM229.68 812.382C230.613 812.382 231.318 812.763 231.795 813.525C232.275 814.286 232.516 815.413 232.516 816.905C232.516 818.398 232.275 819.525 231.795 820.286C231.318 821.048 230.613 821.429 229.68 821.429C228.746 821.429 228.041 821.048 227.564 820.286C227.088 819.525 226.85 818.398 226.85 816.905C226.85 815.413 227.088 814.286 227.564 813.525C228.041 812.763 228.746 812.382 229.68 812.382ZM229.68 820.491C230.234 820.491 230.646 820.196 230.916 819.607C231.189 819.017 231.326 818.116 231.326 816.905C231.326 816.261 231.287 815.679 231.209 815.159L228.42 819.525C228.713 820.169 229.133 820.491 229.68 820.491ZM229.68 813.319C229.129 813.319 228.717 813.614 228.443 814.204C228.174 814.794 228.039 815.694 228.039 816.905C228.039 817.456 228.076 817.972 228.15 818.452L230.881 814.099C230.584 813.579 230.184 813.319 229.68 813.319ZM238.838 812.194V815.78H237.525V812.194H238.838ZM235.715 812.194V815.78H234.402V812.194H235.715ZM231.607 830.194V833.78H230.295V830.194H231.607ZM228.484 830.194V833.78H227.172V830.194H228.484ZM240.068 834.05C239.838 833.87 239.604 833.739 239.365 833.657C239.127 833.575 238.865 833.534 238.58 833.534C237.908 833.534 237.395 833.745 237.039 834.167C236.684 834.589 236.506 835.198 236.506 835.995V839.259H235.422V832.696H236.506V833.98C236.686 833.515 236.961 833.159 237.332 832.913C237.707 832.663 238.15 832.538 238.662 832.538C238.928 832.538 239.176 832.571 239.406 832.638C239.637 832.704 239.857 832.808 240.068 832.948V834.05ZM244.141 833.452C243.594 833.452 243.18 833.665 242.898 834.091C242.617 834.517 242.477 835.148 242.477 835.984C242.477 836.816 242.617 837.446 242.898 837.876C243.18 838.302 243.594 838.515 244.141 838.515C244.691 838.515 245.107 838.302 245.389 837.876C245.67 837.446 245.811 836.816 245.811 835.984C245.811 835.148 245.67 834.517 245.389 834.091C245.107 833.665 244.691 833.452 244.141 833.452ZM244.141 832.538C245.051 832.538 245.746 832.833 246.227 833.423C246.711 834.013 246.953 834.866 246.953 835.984C246.953 837.105 246.713 837.96 246.232 838.55C245.752 839.136 245.055 839.429 244.141 839.429C243.23 839.429 242.535 839.136 242.055 838.55C241.574 837.96 241.334 837.105 241.334 835.984C241.334 834.866 241.574 834.013 242.055 833.423C242.535 832.833 243.23 832.538 244.141 832.538ZM248.904 836.775V832.708H249.982V836.775C249.982 837.364 250.086 837.798 250.293 838.075C250.504 838.353 250.828 838.491 251.266 838.491C251.773 838.491 252.162 838.314 252.432 837.958C252.701 837.599 252.836 837.085 252.836 836.417V832.708H253.92V839.259H252.836V838.275C252.645 838.653 252.383 838.941 252.051 839.136C251.723 839.331 251.338 839.429 250.896 839.429C250.225 839.429 249.725 839.21 249.396 838.773C249.068 838.331 248.904 837.665 248.904 836.775ZM261.15 835.193V839.259H260.066V835.193C260.066 834.603 259.963 834.169 259.756 833.892C259.549 833.614 259.225 833.476 258.783 833.476C258.279 833.476 257.891 833.655 257.617 834.015C257.348 834.37 257.213 834.882 257.213 835.55V839.259H256.135V832.696H257.213V833.681C257.404 833.306 257.664 833.023 257.992 832.831C258.32 832.636 258.709 832.538 259.158 832.538C259.826 832.538 260.324 832.759 260.652 833.2C260.984 833.638 261.15 834.302 261.15 835.193ZM267.25 833.534V830.142H268.328V839.259H267.25V838.433C267.07 838.757 266.83 839.005 266.529 839.177C266.232 839.345 265.889 839.429 265.498 839.429C264.705 839.429 264.08 839.122 263.623 838.509C263.17 837.892 262.943 837.042 262.943 835.96C262.943 834.894 263.172 834.058 263.629 833.452C264.086 832.843 264.709 832.538 265.498 832.538C265.893 832.538 266.24 832.624 266.541 832.796C266.842 832.964 267.078 833.21 267.25 833.534ZM264.08 835.984C264.08 836.819 264.213 837.45 264.479 837.876C264.744 838.302 265.137 838.515 265.656 838.515C266.176 838.515 266.57 838.3 266.84 837.87C267.113 837.441 267.25 836.812 267.25 835.984C267.25 835.151 267.113 834.523 266.84 834.097C266.57 833.667 266.176 833.452 265.656 833.452C265.137 833.452 264.744 833.665 264.479 834.091C264.213 834.517 264.08 835.148 264.08 835.984ZM276.016 835.439V835.966H271.346V836.001C271.314 836.896 271.484 837.538 271.855 837.929C272.23 838.319 272.758 838.515 273.438 838.515C273.781 838.515 274.141 838.46 274.516 838.351C274.891 838.241 275.291 838.075 275.717 837.853V838.925C275.307 839.093 274.91 839.218 274.527 839.3C274.148 839.386 273.781 839.429 273.426 839.429C272.406 839.429 271.609 839.124 271.035 838.515C270.461 837.901 270.174 837.058 270.174 835.984C270.174 834.937 270.455 834.101 271.018 833.476C271.58 832.851 272.33 832.538 273.268 832.538C274.104 832.538 274.762 832.821 275.242 833.388C275.727 833.954 275.984 834.638 276.016 835.439ZM274.938 835.122C274.891 834.669 274.725 834.278 274.439 833.95C274.158 833.618 273.752 833.452 273.221 833.452C272.701 833.452 272.273 833.624 271.938 833.968C271.602 834.312 271.418 834.698 271.387 835.128L274.938 835.122ZM281.711 833.534V830.142H282.789V839.259H281.711V838.433C281.531 838.757 281.291 839.005 280.99 839.177C280.693 839.345 280.35 839.429 279.959 839.429C279.166 839.429 278.541 839.122 278.084 838.509C277.631 837.892 277.404 837.042 277.404 835.96C277.404 834.894 277.633 834.058 278.09 833.452C278.547 832.843 279.17 832.538 279.959 832.538C280.354 832.538 280.701 832.624 281.002 832.796C281.303 832.964 281.539 833.21 281.711 833.534ZM278.541 835.984C278.541 836.819 278.674 837.45 278.939 837.876C279.205 838.302 279.598 838.515 280.117 838.515C280.637 838.515 281.031 838.3 281.301 837.87C281.574 837.441 281.711 836.812 281.711 835.984C281.711 835.151 281.574 834.523 281.301 834.097C281.031 833.667 280.637 833.452 280.117 833.452C279.598 833.452 279.205 833.665 278.939 834.091C278.674 834.517 278.541 835.148 278.541 835.984ZM284.512 835.017H290.723V836.007H284.512V835.017ZM295.105 833.364C295.238 833.083 295.406 832.876 295.609 832.743C295.816 832.607 296.064 832.538 296.354 832.538C296.881 832.538 297.252 832.743 297.467 833.153C297.686 833.56 297.795 834.327 297.795 835.456V839.259H296.811V835.503C296.811 834.577 296.758 834.003 296.652 833.78C296.551 833.554 296.363 833.441 296.09 833.441C295.777 833.441 295.562 833.562 295.445 833.804C295.332 834.042 295.275 834.609 295.275 835.503V839.259H294.291V835.503C294.291 834.566 294.234 833.987 294.121 833.769C294.012 833.55 293.812 833.441 293.523 833.441C293.238 833.441 293.039 833.562 292.926 833.804C292.816 834.042 292.762 834.609 292.762 835.503V839.259H291.783V832.696H292.762V833.259C292.891 833.025 293.051 832.847 293.242 832.726C293.438 832.601 293.658 832.538 293.904 832.538C294.201 832.538 294.447 832.607 294.643 832.743C294.842 832.88 294.996 833.087 295.105 833.364ZM303.402 833.534V830.142H304.48V839.259H303.402V838.433C303.223 838.757 302.982 839.005 302.682 839.177C302.385 839.345 302.041 839.429 301.65 839.429C300.857 839.429 300.232 839.122 299.775 838.509C299.322 837.892 299.096 837.042 299.096 835.96C299.096 834.894 299.324 834.058 299.781 833.452C300.238 832.843 300.861 832.538 301.65 832.538C302.045 832.538 302.393 832.624 302.693 832.796C302.994 832.964 303.23 833.21 303.402 833.534ZM300.232 835.984C300.232 836.819 300.365 837.45 300.631 837.876C300.896 838.302 301.289 838.515 301.809 838.515C302.328 838.515 302.723 838.3 302.992 837.87C303.266 837.441 303.402 836.812 303.402 835.984C303.402 835.151 303.266 834.523 302.992 834.097C302.723 833.667 302.328 833.452 301.809 833.452C301.289 833.452 300.896 833.665 300.631 834.091C300.365 834.517 300.232 835.148 300.232 835.984ZM311.143 830.194V833.78H309.83V830.194H311.143ZM308.02 830.194V833.78H306.707V830.194H308.02ZM209.916 1010.19V1013.78H208.604V1010.19H209.916ZM206.793 1010.19V1013.78H205.48V1010.19H206.793ZM217.838 1010.14V1011.04H216.613C216.227 1011.04 215.957 1011.12 215.805 1011.28C215.656 1011.43 215.582 1011.71 215.582 1012.12V1012.7H217.838V1013.53H215.582V1019.26H214.504V1013.53H212.752V1012.7H214.504V1012.24C214.504 1011.52 214.668 1010.99 214.996 1010.65C215.328 1010.31 215.844 1010.14 216.543 1010.14H217.838ZM223.053 1016.89C223.053 1017.37 223.141 1017.74 223.316 1017.98C223.496 1018.23 223.76 1018.35 224.107 1018.35H225.367V1019.26H224.002C223.357 1019.26 222.857 1019.05 222.502 1018.64C222.15 1018.23 221.975 1017.64 221.975 1016.89V1010.95H220.246V1010.11H223.053V1016.89ZM232.633 1015.44V1015.97H227.963V1016C227.932 1016.9 228.102 1017.54 228.473 1017.93C228.848 1018.32 229.375 1018.51 230.055 1018.51C230.398 1018.51 230.758 1018.46 231.133 1018.35C231.508 1018.24 231.908 1018.08 232.334 1017.85V1018.92C231.924 1019.09 231.527 1019.22 231.145 1019.3C230.766 1019.39 230.398 1019.43 230.043 1019.43C229.023 1019.43 228.227 1019.12 227.652 1018.51C227.078 1017.9 226.791 1017.06 226.791 1015.98C226.791 1014.94 227.072 1014.1 227.635 1013.48C228.197 1012.85 228.947 1012.54 229.885 1012.54C230.721 1012.54 231.379 1012.82 231.859 1013.39C232.344 1013.95 232.602 1014.64 232.633 1015.44ZM231.555 1015.12C231.508 1014.67 231.342 1014.28 231.057 1013.95C230.775 1013.62 230.369 1013.45 229.838 1013.45C229.318 1013.45 228.891 1013.62 228.555 1013.97C228.219 1014.31 228.035 1014.7 228.004 1015.13L231.555 1015.12ZM239.852 1012.7L237.502 1015.84L240.08 1019.26H238.832L236.91 1016.63L234.994 1019.26H233.746L236.324 1015.84L233.975 1012.7H235.17L236.91 1015.07L238.639 1012.7H239.852ZM241.129 1015.02H247.34V1016.01H241.129V1015.02ZM253.979 1018.92C253.689 1019.09 253.391 1019.22 253.082 1019.3C252.777 1019.39 252.465 1019.43 252.145 1019.43C251.129 1019.43 250.334 1019.12 249.76 1018.51C249.189 1017.91 248.904 1017.06 248.904 1015.98C248.904 1014.91 249.189 1014.06 249.76 1013.45C250.334 1012.84 251.129 1012.54 252.145 1012.54C252.461 1012.54 252.77 1012.58 253.07 1012.66C253.371 1012.74 253.674 1012.87 253.979 1013.04V1014.17C253.693 1013.92 253.406 1013.74 253.117 1013.62C252.832 1013.51 252.508 1013.45 252.145 1013.45C251.469 1013.45 250.949 1013.67 250.586 1014.11C250.223 1014.55 250.041 1015.17 250.041 1015.98C250.041 1016.79 250.223 1017.42 250.586 1017.86C250.953 1018.3 251.473 1018.51 252.145 1018.51C252.52 1018.51 252.855 1018.46 253.152 1018.34C253.449 1018.23 253.725 1018.05 253.979 1017.81V1018.92ZM258.602 1013.45C258.055 1013.45 257.641 1013.67 257.359 1014.09C257.078 1014.52 256.938 1015.15 256.938 1015.98C256.938 1016.82 257.078 1017.45 257.359 1017.88C257.641 1018.3 258.055 1018.51 258.602 1018.51C259.152 1018.51 259.568 1018.3 259.85 1017.88C260.131 1017.45 260.271 1016.82 260.271 1015.98C260.271 1015.15 260.131 1014.52 259.85 1014.09C259.568 1013.67 259.152 1013.45 258.602 1013.45ZM258.602 1012.54C259.512 1012.54 260.207 1012.83 260.688 1013.42C261.172 1014.01 261.414 1014.87 261.414 1015.98C261.414 1017.1 261.174 1017.96 260.693 1018.55C260.213 1019.14 259.516 1019.43 258.602 1019.43C257.691 1019.43 256.996 1019.14 256.516 1018.55C256.035 1017.96 255.795 1017.1 255.795 1015.98C255.795 1014.87 256.035 1014.01 256.516 1013.42C256.996 1012.83 257.691 1012.54 258.602 1012.54ZM266.436 1016.89C266.436 1017.37 266.523 1017.74 266.699 1017.98C266.879 1018.23 267.143 1018.35 267.49 1018.35H268.75V1019.26H267.385C266.74 1019.26 266.24 1019.05 265.885 1018.64C265.533 1018.23 265.357 1017.64 265.357 1016.89V1010.95H263.629V1010.11H266.436V1016.89ZM274.99 1010.19V1013.78H273.678V1010.19H274.99ZM271.867 1010.19V1013.78H270.555V1010.19H271.867ZM217.146 1028.19V1031.78H215.834V1028.19H217.146ZM214.023 1028.19V1031.78H212.711V1028.19H214.023ZM222.801 1031.36C222.934 1031.08 223.102 1030.88 223.305 1030.74C223.512 1030.61 223.76 1030.54 224.049 1030.54C224.576 1030.54 224.947 1030.74 225.162 1031.15C225.381 1031.56 225.49 1032.33 225.49 1033.46V1037.26H224.506V1033.5C224.506 1032.58 224.453 1032 224.348 1031.78C224.246 1031.55 224.059 1031.44 223.785 1031.44C223.473 1031.44 223.258 1031.56 223.141 1031.8C223.027 1032.04 222.971 1032.61 222.971 1033.5V1037.26H221.986V1033.5C221.986 1032.57 221.93 1031.99 221.816 1031.77C221.707 1031.55 221.508 1031.44 221.219 1031.44C220.934 1031.44 220.734 1031.56 220.621 1031.8C220.512 1032.04 220.457 1032.61 220.457 1033.5V1037.26H219.479V1030.7H220.457V1031.26C220.586 1031.02 220.746 1030.85 220.938 1030.73C221.133 1030.6 221.354 1030.54 221.6 1030.54C221.896 1030.54 222.143 1030.61 222.338 1030.74C222.537 1030.88 222.691 1031.09 222.801 1031.36ZM229.668 1028.83V1030.7H232.117V1031.53H229.668V1035.1C229.668 1035.58 229.76 1035.92 229.943 1036.11C230.127 1036.3 230.447 1036.4 230.904 1036.4H232.117V1037.26H230.799C229.99 1037.26 229.42 1037.1 229.088 1036.77C228.756 1036.45 228.59 1035.89 228.59 1035.1V1031.53H226.838V1030.7H228.59V1028.83H229.668ZM233.898 1033.02H240.109V1034.01H233.898V1033.02ZM244.141 1028.38C245.074 1028.38 245.779 1028.76 246.256 1029.52C246.736 1030.29 246.977 1031.41 246.977 1032.91C246.977 1034.4 246.736 1035.52 246.256 1036.29C245.779 1037.05 245.074 1037.43 244.141 1037.43C243.207 1037.43 242.502 1037.05 242.025 1036.29C241.549 1035.52 241.311 1034.4 241.311 1032.91C241.311 1031.41 241.549 1030.29 242.025 1029.52C242.502 1028.76 243.207 1028.38 244.141 1028.38ZM244.141 1036.49C244.695 1036.49 245.107 1036.2 245.377 1035.61C245.65 1035.02 245.787 1034.12 245.787 1032.91C245.787 1032.26 245.748 1031.68 245.67 1031.16L242.881 1035.52C243.174 1036.17 243.594 1036.49 244.141 1036.49ZM244.141 1029.32C243.59 1029.32 243.178 1029.61 242.904 1030.2C242.635 1030.79 242.5 1031.69 242.5 1032.91C242.5 1033.46 242.537 1033.97 242.611 1034.45L245.342 1030.1C245.045 1029.58 244.645 1029.32 244.141 1029.32ZM261.221 1028.14V1029.04H259.996C259.609 1029.04 259.34 1029.12 259.188 1029.28C259.039 1029.43 258.965 1029.71 258.965 1030.12V1030.7H261.221V1031.53H258.965V1037.26H257.887V1031.53H256.135V1030.7H257.887V1030.24C257.887 1029.52 258.051 1028.99 258.379 1028.65C258.711 1028.31 259.227 1028.14 259.926 1028.14H261.221ZM265.832 1031.45C265.285 1031.45 264.871 1031.67 264.59 1032.09C264.309 1032.52 264.168 1033.15 264.168 1033.98C264.168 1034.82 264.309 1035.45 264.59 1035.88C264.871 1036.3 265.285 1036.51 265.832 1036.51C266.383 1036.51 266.799 1036.3 267.08 1035.88C267.361 1035.45 267.502 1034.82 267.502 1033.98C267.502 1033.15 267.361 1032.52 267.08 1032.09C266.799 1031.67 266.383 1031.45 265.832 1031.45ZM265.832 1030.54C266.742 1030.54 267.438 1030.83 267.918 1031.42C268.402 1032.01 268.645 1032.87 268.645 1033.98C268.645 1035.1 268.404 1035.96 267.924 1036.55C267.443 1037.14 266.746 1037.43 265.832 1037.43C264.922 1037.43 264.227 1037.14 263.746 1036.55C263.266 1035.96 263.025 1035.1 263.025 1033.98C263.025 1032.87 263.266 1032.01 263.746 1031.42C264.227 1030.83 264.922 1030.54 265.832 1030.54ZM275.611 1033.19V1037.26H274.527V1033.19C274.527 1032.6 274.424 1032.17 274.217 1031.89C274.01 1031.61 273.686 1031.48 273.244 1031.48C272.74 1031.48 272.352 1031.66 272.078 1032.01C271.809 1032.37 271.674 1032.88 271.674 1033.55V1037.26H270.596V1030.7H271.674V1031.68C271.865 1031.31 272.125 1031.02 272.453 1030.83C272.781 1030.64 273.17 1030.54 273.619 1030.54C274.287 1030.54 274.785 1030.76 275.113 1031.2C275.445 1031.64 275.611 1032.3 275.611 1033.19ZM280.281 1028.83V1030.7H282.73V1031.53H280.281V1035.1C280.281 1035.58 280.373 1035.92 280.557 1036.11C280.74 1036.3 281.061 1036.4 281.518 1036.4H282.73V1037.26H281.412C280.604 1037.26 280.033 1037.1 279.701 1036.77C279.369 1036.45 279.203 1035.89 279.203 1035.1V1031.53H277.451V1030.7H279.203V1028.83H280.281ZM284.512 1033.02H290.723V1034.01H284.512V1033.02ZM296.523 1033.98C296.523 1033.15 296.391 1032.52 296.125 1032.09C295.859 1031.67 295.467 1031.45 294.947 1031.45C294.424 1031.45 294.027 1031.67 293.758 1032.1C293.488 1032.52 293.354 1033.15 293.354 1033.98C293.354 1034.81 293.488 1035.44 293.758 1035.87C294.027 1036.3 294.424 1036.51 294.947 1036.51C295.467 1036.51 295.859 1036.3 296.125 1035.88C296.391 1035.45 296.523 1034.82 296.523 1033.98ZM293.354 1031.53C293.525 1031.21 293.762 1030.97 294.062 1030.8C294.367 1030.62 294.719 1030.54 295.117 1030.54C295.906 1030.54 296.527 1030.84 296.98 1031.45C297.434 1032.06 297.66 1032.89 297.66 1033.96C297.66 1035.04 297.432 1035.89 296.975 1036.51C296.521 1037.12 295.898 1037.43 295.105 1037.43C294.715 1037.43 294.369 1037.34 294.068 1037.18C293.771 1037.01 293.533 1036.76 293.354 1036.43V1037.26H292.275V1028.14H293.354V1031.53ZM302.488 1033.96H302.131C301.502 1033.96 301.027 1034.07 300.707 1034.29C300.391 1034.51 300.232 1034.84 300.232 1035.28C300.232 1035.67 300.352 1035.98 300.59 1036.2C300.828 1036.42 301.158 1036.53 301.58 1036.53C302.174 1036.53 302.641 1036.32 302.98 1035.91C303.32 1035.5 303.492 1034.93 303.496 1034.2V1033.96H302.488ZM304.58 1033.51V1037.26H303.496V1036.29C303.266 1036.68 302.975 1036.97 302.623 1037.15C302.275 1037.34 301.852 1037.43 301.352 1037.43C300.684 1037.43 300.15 1037.24 299.752 1036.87C299.354 1036.49 299.154 1035.98 299.154 1035.35C299.154 1034.62 299.398 1034.06 299.887 1033.68C300.379 1033.31 301.1 1033.12 302.049 1033.12H303.496V1032.95C303.492 1032.42 303.359 1032.04 303.098 1031.81C302.836 1031.57 302.418 1031.45 301.844 1031.45C301.477 1031.45 301.105 1031.51 300.73 1031.61C300.355 1031.72 299.99 1031.87 299.635 1032.07V1031C300.033 1030.84 300.414 1030.73 300.777 1030.66C301.145 1030.58 301.5 1030.54 301.844 1030.54C302.387 1030.54 302.85 1030.62 303.232 1030.78C303.619 1030.94 303.932 1031.18 304.17 1031.5C304.318 1031.69 304.424 1031.94 304.486 1032.23C304.549 1032.51 304.58 1032.94 304.58 1033.51ZM311.307 1030.92V1031.98C310.998 1031.8 310.688 1031.67 310.375 1031.58C310.062 1031.49 309.744 1031.44 309.42 1031.44C308.932 1031.44 308.566 1031.52 308.324 1031.68C308.086 1031.84 307.967 1032.08 307.967 1032.4C307.967 1032.69 308.057 1032.91 308.236 1033.06C308.416 1033.2 308.863 1033.34 309.578 1033.48L310.012 1033.56C310.547 1033.66 310.951 1033.87 311.225 1034.17C311.502 1034.48 311.641 1034.87 311.641 1035.36C311.641 1036.01 311.41 1036.52 310.949 1036.88C310.488 1037.25 309.848 1037.43 309.027 1037.43C308.703 1037.43 308.363 1037.39 308.008 1037.32C307.652 1037.26 307.268 1037.16 306.854 1037.02V1035.91C307.256 1036.11 307.641 1036.27 308.008 1036.37C308.375 1036.48 308.723 1036.53 309.051 1036.53C309.527 1036.53 309.896 1036.43 310.158 1036.24C310.42 1036.04 310.551 1035.77 310.551 1035.42C310.551 1034.92 310.072 1034.58 309.115 1034.39L309.068 1034.38L308.664 1034.29C308.043 1034.17 307.59 1033.97 307.305 1033.68C307.02 1033.4 306.877 1033 306.877 1032.51C306.877 1031.88 307.09 1031.39 307.516 1031.05C307.941 1030.71 308.549 1030.54 309.338 1030.54C309.689 1030.54 310.027 1030.57 310.352 1030.64C310.676 1030.7 310.994 1030.8 311.307 1030.92ZM319.398 1033.44V1033.97H314.729V1034C314.697 1034.9 314.867 1035.54 315.238 1035.93C315.613 1036.32 316.141 1036.51 316.82 1036.51C317.164 1036.51 317.523 1036.46 317.898 1036.35C318.273 1036.24 318.674 1036.08 319.1 1035.85V1036.92C318.689 1037.09 318.293 1037.22 317.91 1037.3C317.531 1037.39 317.164 1037.43 316.809 1037.43C315.789 1037.43 314.992 1037.12 314.418 1036.51C313.844 1035.9 313.557 1035.06 313.557 1033.98C313.557 1032.94 313.838 1032.1 314.4 1031.48C314.963 1030.85 315.713 1030.54 316.65 1030.54C317.486 1030.54 318.145 1030.82 318.625 1031.39C319.109 1031.95 319.367 1032.64 319.398 1033.44ZM318.32 1033.12C318.273 1032.67 318.107 1032.28 317.822 1031.95C317.541 1031.62 317.135 1031.45 316.604 1031.45C316.084 1031.45 315.656 1031.62 315.32 1031.97C314.984 1032.31 314.801 1032.7 314.77 1033.13L318.32 1033.12ZM333.525 1028.14V1029.04H332.301C331.914 1029.04 331.645 1029.12 331.492 1029.28C331.344 1029.43 331.27 1029.71 331.27 1030.12V1030.7H333.525V1031.53H331.27V1037.26H330.191V1031.53H328.439V1030.7H330.191V1030.24C330.191 1029.52 330.355 1028.99 330.684 1028.65C331.016 1028.31 331.531 1028.14 332.23 1028.14H333.525ZM338.137 1031.45C337.59 1031.45 337.176 1031.67 336.895 1032.09C336.613 1032.52 336.473 1033.15 336.473 1033.98C336.473 1034.82 336.613 1035.45 336.895 1035.88C337.176 1036.3 337.59 1036.51 338.137 1036.51C338.688 1036.51 339.104 1036.3 339.385 1035.88C339.666 1035.45 339.807 1034.82 339.807 1033.98C339.807 1033.15 339.666 1032.52 339.385 1032.09C339.104 1031.67 338.688 1031.45 338.137 1031.45ZM338.137 1030.54C339.047 1030.54 339.742 1030.83 340.223 1031.42C340.707 1032.01 340.949 1032.87 340.949 1033.98C340.949 1035.1 340.709 1035.96 340.229 1036.55C339.748 1037.14 339.051 1037.43 338.137 1037.43C337.227 1037.43 336.531 1037.14 336.051 1036.55C335.57 1035.96 335.33 1035.1 335.33 1033.98C335.33 1032.87 335.57 1032.01 336.051 1031.42C336.531 1030.83 337.227 1030.54 338.137 1030.54ZM347.916 1033.19V1037.26H346.832V1033.19C346.832 1032.6 346.729 1032.17 346.521 1031.89C346.314 1031.61 345.99 1031.48 345.549 1031.48C345.045 1031.48 344.656 1031.66 344.383 1032.01C344.113 1032.37 343.979 1032.88 343.979 1033.55V1037.26H342.9V1030.7H343.979V1031.68C344.17 1031.31 344.43 1031.02 344.758 1030.83C345.086 1030.64 345.475 1030.54 345.924 1030.54C346.592 1030.54 347.09 1030.76 347.418 1031.2C347.75 1031.64 347.916 1032.3 347.916 1033.19ZM352.586 1028.83V1030.7H355.035V1031.53H352.586V1035.1C352.586 1035.58 352.678 1035.92 352.861 1036.11C353.045 1036.3 353.365 1036.4 353.822 1036.4H355.035V1037.26H353.717C352.908 1037.26 352.338 1037.1 352.006 1036.77C351.674 1036.45 351.508 1035.89 351.508 1035.1V1031.53H349.756V1030.7H351.508V1028.83H352.586ZM356.816 1033.02H363.027V1034.01H356.816V1033.02ZM369.15 1030.92V1031.98C368.842 1031.8 368.531 1031.67 368.219 1031.58C367.906 1031.49 367.588 1031.44 367.264 1031.44C366.775 1031.44 366.41 1031.52 366.168 1031.68C365.93 1031.84 365.811 1032.08 365.811 1032.4C365.811 1032.69 365.9 1032.91 366.08 1033.06C366.26 1033.2 366.707 1033.34 367.422 1033.48L367.855 1033.56C368.391 1033.66 368.795 1033.87 369.068 1034.17C369.346 1034.48 369.484 1034.87 369.484 1035.36C369.484 1036.01 369.254 1036.52 368.793 1036.88C368.332 1037.25 367.691 1037.43 366.871 1037.43C366.547 1037.43 366.207 1037.39 365.852 1037.32C365.496 1037.26 365.111 1037.16 364.697 1037.02V1035.91C365.1 1036.11 365.484 1036.27 365.852 1036.37C366.219 1036.48 366.566 1036.53 366.895 1036.53C367.371 1036.53 367.74 1036.43 368.002 1036.24C368.264 1036.04 368.395 1035.77 368.395 1035.42C368.395 1034.92 367.916 1034.58 366.959 1034.39L366.912 1034.38L366.508 1034.29C365.887 1034.17 365.434 1033.97 365.148 1033.68C364.863 1033.4 364.721 1033 364.721 1032.51C364.721 1031.88 364.934 1031.39 365.359 1031.05C365.785 1030.71 366.393 1030.54 367.182 1030.54C367.533 1030.54 367.871 1030.57 368.195 1030.64C368.52 1030.7 368.838 1030.8 369.15 1030.92ZM377.242 1033.44V1033.97H372.572V1034C372.541 1034.9 372.711 1035.54 373.082 1035.93C373.457 1036.32 373.984 1036.51 374.664 1036.51C375.008 1036.51 375.367 1036.46 375.742 1036.35C376.117 1036.24 376.518 1036.08 376.943 1035.85V1036.92C376.533 1037.09 376.137 1037.22 375.754 1037.3C375.375 1037.39 375.008 1037.43 374.652 1037.43C373.633 1037.43 372.836 1037.12 372.262 1036.51C371.688 1035.9 371.4 1035.06 371.4 1033.98C371.4 1032.94 371.682 1032.1 372.244 1031.48C372.807 1030.85 373.557 1030.54 374.494 1030.54C375.33 1030.54 375.988 1030.82 376.469 1031.39C376.953 1031.95 377.211 1032.64 377.242 1033.44ZM376.164 1033.12C376.117 1032.67 375.951 1032.28 375.666 1031.95C375.385 1031.62 374.979 1031.45 374.447 1031.45C373.928 1031.45 373.5 1031.62 373.164 1031.97C372.828 1032.31 372.645 1032.7 372.613 1033.13L376.164 1033.12ZM381.871 1031.36C382.004 1031.08 382.172 1030.88 382.375 1030.74C382.582 1030.61 382.83 1030.54 383.119 1030.54C383.646 1030.54 384.018 1030.74 384.232 1031.15C384.451 1031.56 384.561 1032.33 384.561 1033.46V1037.26H383.576V1033.5C383.576 1032.58 383.523 1032 383.418 1031.78C383.316 1031.55 383.129 1031.44 382.855 1031.44C382.543 1031.44 382.328 1031.56 382.211 1031.8C382.098 1032.04 382.041 1032.61 382.041 1033.5V1037.26H381.057V1033.5C381.057 1032.57 381 1031.99 380.887 1031.77C380.777 1031.55 380.578 1031.44 380.289 1031.44C380.004 1031.44 379.805 1031.56 379.691 1031.8C379.582 1032.04 379.527 1032.61 379.527 1033.5V1037.26H378.549V1030.7H379.527V1031.26C379.656 1031.02 379.816 1030.85 380.008 1030.73C380.203 1030.6 380.424 1030.54 380.67 1030.54C380.967 1030.54 381.213 1030.61 381.408 1030.74C381.607 1030.88 381.762 1031.09 381.871 1031.36ZM386.992 1030.72H389.752V1036.42H391.891V1037.26H386.535V1036.42H388.674V1031.56H386.992V1030.72ZM388.674 1028.17H389.752V1029.53H388.674V1028.17ZM397.75 1033.98C397.75 1033.15 397.617 1032.52 397.352 1032.09C397.086 1031.67 396.693 1031.45 396.174 1031.45C395.65 1031.45 395.254 1031.67 394.984 1032.1C394.715 1032.52 394.58 1033.15 394.58 1033.98C394.58 1034.81 394.715 1035.44 394.984 1035.87C395.254 1036.3 395.65 1036.51 396.174 1036.51C396.693 1036.51 397.086 1036.3 397.352 1035.88C397.617 1035.45 397.75 1034.82 397.75 1033.98ZM394.58 1031.53C394.752 1031.21 394.988 1030.97 395.289 1030.8C395.594 1030.62 395.945 1030.54 396.344 1030.54C397.133 1030.54 397.754 1030.84 398.207 1031.45C398.66 1032.06 398.887 1032.89 398.887 1033.96C398.887 1035.04 398.658 1035.89 398.201 1036.51C397.748 1037.12 397.125 1037.43 396.332 1037.43C395.941 1037.43 395.596 1037.34 395.295 1037.18C394.998 1037.01 394.76 1036.76 394.58 1036.43V1037.26H393.502V1028.14H394.58V1031.53ZM403.211 1031.45C402.664 1031.45 402.25 1031.67 401.969 1032.09C401.688 1032.52 401.547 1033.15 401.547 1033.98C401.547 1034.82 401.688 1035.45 401.969 1035.88C402.25 1036.3 402.664 1036.51 403.211 1036.51C403.762 1036.51 404.178 1036.3 404.459 1035.88C404.74 1035.45 404.881 1034.82 404.881 1033.98C404.881 1033.15 404.74 1032.52 404.459 1032.09C404.178 1031.67 403.762 1031.45 403.211 1031.45ZM403.211 1030.54C404.121 1030.54 404.816 1030.83 405.297 1031.42C405.781 1032.01 406.023 1032.87 406.023 1033.98C406.023 1035.1 405.783 1035.96 405.303 1036.55C404.822 1037.14 404.125 1037.43 403.211 1037.43C402.301 1037.43 401.605 1037.14 401.125 1036.55C400.645 1035.96 400.404 1035.1 400.404 1033.98C400.404 1032.87 400.645 1032.01 401.125 1031.42C401.605 1030.83 402.301 1030.54 403.211 1030.54ZM411.045 1034.89C411.045 1035.37 411.133 1035.74 411.309 1035.98C411.488 1036.23 411.752 1036.35 412.1 1036.35H413.359V1037.26H411.994C411.35 1037.26 410.85 1037.05 410.494 1036.64C410.143 1036.23 409.967 1035.64 409.967 1034.89V1028.95H408.238V1028.11H411.045V1034.89ZM419.09 1031.53V1028.14H420.168V1037.26H419.09V1036.43C418.91 1036.76 418.67 1037.01 418.369 1037.18C418.072 1037.34 417.729 1037.43 417.338 1037.43C416.545 1037.43 415.92 1037.12 415.463 1036.51C415.01 1035.89 414.783 1035.04 414.783 1033.96C414.783 1032.89 415.012 1032.06 415.469 1031.45C415.926 1030.84 416.549 1030.54 417.338 1030.54C417.732 1030.54 418.08 1030.62 418.381 1030.8C418.682 1030.96 418.918 1031.21 419.09 1031.53ZM415.92 1033.98C415.92 1034.82 416.053 1035.45 416.318 1035.88C416.584 1036.3 416.977 1036.51 417.496 1036.51C418.016 1036.51 418.41 1036.3 418.68 1035.87C418.953 1035.44 419.09 1034.81 419.09 1033.98C419.09 1033.15 418.953 1032.52 418.68 1032.1C418.41 1031.67 418.016 1031.45 417.496 1031.45C416.977 1031.45 416.584 1031.67 416.318 1032.09C416.053 1032.52 415.92 1033.15 415.92 1033.98ZM432.121 1028.83V1030.7H434.57V1031.53H432.121V1035.1C432.121 1035.58 432.213 1035.92 432.396 1036.11C432.58 1036.3 432.9 1036.4 433.357 1036.4H434.57V1037.26H433.252C432.443 1037.26 431.873 1037.1 431.541 1036.77C431.209 1036.45 431.043 1035.89 431.043 1035.1V1031.53H429.291V1030.7H431.043V1028.83H432.121ZM442.316 1033.44V1033.97H437.646V1034C437.615 1034.9 437.785 1035.54 438.156 1035.93C438.531 1036.32 439.059 1036.51 439.738 1036.51C440.082 1036.51 440.441 1036.46 440.816 1036.35C441.191 1036.24 441.592 1036.08 442.018 1035.85V1036.92C441.607 1037.09 441.211 1037.22 440.828 1037.3C440.449 1037.39 440.082 1037.43 439.727 1037.43C438.707 1037.43 437.91 1037.12 437.336 1036.51C436.762 1035.9 436.475 1035.06 436.475 1033.98C436.475 1032.94 436.756 1032.1 437.318 1031.48C437.881 1030.85 438.631 1030.54 439.568 1030.54C440.404 1030.54 441.062 1030.82 441.543 1031.39C442.027 1031.95 442.285 1032.64 442.316 1033.44ZM441.238 1033.12C441.191 1032.67 441.025 1032.28 440.74 1031.95C440.459 1031.62 440.053 1031.45 439.521 1031.45C439.002 1031.45 438.574 1031.62 438.238 1031.97C437.902 1032.31 437.719 1032.7 437.688 1033.13L441.238 1033.12ZM449.535 1030.7L447.186 1033.84L449.764 1037.26H448.516L446.594 1034.63L444.678 1037.26H443.43L446.008 1033.84L443.658 1030.7H444.854L446.594 1033.07L448.322 1030.7H449.535ZM453.812 1028.83V1030.7H456.262V1031.53H453.812V1035.1C453.812 1035.58 453.904 1035.92 454.088 1036.11C454.271 1036.3 454.592 1036.4 455.049 1036.4H456.262V1037.26H454.943C454.135 1037.26 453.564 1037.1 453.232 1036.77C452.9 1036.45 452.734 1035.89 452.734 1035.1V1031.53H450.982V1030.7H452.734V1028.83H453.812ZM458.043 1033.02H464.254V1034.01H458.043V1033.02ZM470.055 1033.98C470.055 1033.15 469.922 1032.52 469.656 1032.09C469.391 1031.67 468.998 1031.45 468.479 1031.45C467.955 1031.45 467.559 1031.67 467.289 1032.1C467.02 1032.52 466.885 1033.15 466.885 1033.98C466.885 1034.81 467.02 1035.44 467.289 1035.87C467.559 1036.3 467.955 1036.51 468.479 1036.51C468.998 1036.51 469.391 1036.3 469.656 1035.88C469.922 1035.45 470.055 1034.82 470.055 1033.98ZM466.885 1031.53C467.057 1031.21 467.293 1030.97 467.594 1030.8C467.898 1030.62 468.25 1030.54 468.648 1030.54C469.438 1030.54 470.059 1030.84 470.512 1031.45C470.965 1032.06 471.191 1032.89 471.191 1033.96C471.191 1035.04 470.963 1035.89 470.506 1036.51C470.053 1037.12 469.43 1037.43 468.637 1037.43C468.246 1037.43 467.9 1037.34 467.6 1037.18C467.303 1037.01 467.064 1036.76 466.885 1036.43V1037.26H465.807V1028.14H466.885V1031.53ZM476.119 1034.89C476.119 1035.37 476.207 1035.74 476.383 1035.98C476.562 1036.23 476.826 1036.35 477.174 1036.35H478.434V1037.26H477.068C476.424 1037.26 475.924 1037.05 475.568 1036.64C475.217 1036.23 475.041 1035.64 475.041 1034.89V1028.95H473.312V1028.11H476.119V1034.89ZM480.279 1034.77V1030.71H481.357V1034.77C481.357 1035.36 481.461 1035.8 481.668 1036.08C481.879 1036.35 482.203 1036.49 482.641 1036.49C483.148 1036.49 483.537 1036.31 483.807 1035.96C484.076 1035.6 484.211 1035.09 484.211 1034.42V1030.71H485.295V1037.26H484.211V1036.27C484.02 1036.65 483.758 1036.94 483.426 1037.14C483.098 1037.33 482.713 1037.43 482.271 1037.43C481.6 1037.43 481.1 1037.21 480.771 1036.77C480.443 1036.33 480.279 1035.67 480.279 1034.77ZM492.93 1033.44V1033.97H488.26V1034C488.229 1034.9 488.398 1035.54 488.77 1035.93C489.145 1036.32 489.672 1036.51 490.352 1036.51C490.695 1036.51 491.055 1036.46 491.43 1036.35C491.805 1036.24 492.205 1036.08 492.631 1035.85V1036.92C492.221 1037.09 491.824 1037.22 491.441 1037.3C491.062 1037.39 490.695 1037.43 490.34 1037.43C489.32 1037.43 488.523 1037.12 487.949 1036.51C487.375 1035.9 487.088 1035.06 487.088 1033.98C487.088 1032.94 487.369 1032.1 487.932 1031.48C488.494 1030.85 489.244 1030.54 490.182 1030.54C491.018 1030.54 491.676 1030.82 492.156 1031.39C492.641 1031.95 492.898 1032.64 492.93 1033.44ZM491.852 1033.12C491.805 1032.67 491.639 1032.28 491.354 1031.95C491.072 1031.62 490.666 1031.45 490.135 1031.45C489.615 1031.45 489.188 1031.62 488.852 1031.97C488.516 1032.31 488.332 1032.7 488.301 1033.13L491.852 1033.12ZM494.195 1033.02H500.406V1034.01H494.195V1033.02ZM506.635 1028.7V1029.79C506.389 1029.65 506.127 1029.54 505.85 1029.47C505.572 1029.39 505.283 1029.35 504.982 1029.35C504.232 1029.35 503.664 1029.63 503.277 1030.2C502.891 1030.76 502.697 1031.59 502.697 1032.69C502.885 1032.3 503.145 1032 503.477 1031.79C503.809 1031.58 504.189 1031.48 504.619 1031.48C505.463 1031.48 506.115 1031.74 506.576 1032.26C507.041 1032.77 507.273 1033.5 507.273 1034.45C507.273 1035.4 507.035 1036.13 506.559 1036.65C506.082 1037.17 505.412 1037.43 504.549 1037.43C503.533 1037.43 502.789 1037.07 502.316 1036.34C501.844 1035.61 501.607 1034.46 501.607 1032.89C501.607 1031.42 501.891 1030.29 502.457 1029.52C503.027 1028.74 503.852 1028.35 504.93 1028.35C505.219 1028.35 505.508 1028.38 505.797 1028.45C506.086 1028.51 506.365 1028.59 506.635 1028.7ZM504.525 1032.4C504.021 1032.4 503.625 1032.58 503.336 1032.95C503.047 1033.31 502.902 1033.81 502.902 1034.45C502.902 1035.09 503.047 1035.59 503.336 1035.96C503.625 1036.32 504.021 1036.5 504.525 1036.5C505.049 1036.5 505.443 1036.33 505.709 1035.99C505.975 1035.64 506.107 1035.13 506.107 1034.45C506.107 1033.77 505.975 1033.26 505.709 1032.92C505.443 1032.57 505.049 1032.4 504.525 1032.4ZM511.668 1028.38C512.602 1028.38 513.307 1028.76 513.783 1029.52C514.264 1030.29 514.504 1031.41 514.504 1032.91C514.504 1034.4 514.264 1035.52 513.783 1036.29C513.307 1037.05 512.602 1037.43 511.668 1037.43C510.734 1037.43 510.029 1037.05 509.553 1036.29C509.076 1035.52 508.838 1034.4 508.838 1032.91C508.838 1031.41 509.076 1030.29 509.553 1029.52C510.029 1028.76 510.734 1028.38 511.668 1028.38ZM511.668 1036.49C512.223 1036.49 512.635 1036.2 512.904 1035.61C513.178 1035.02 513.314 1034.12 513.314 1032.91C513.314 1032.26 513.275 1031.68 513.197 1031.16L510.408 1035.52C510.701 1036.17 511.121 1036.49 511.668 1036.49ZM511.668 1029.32C511.117 1029.32 510.705 1029.61 510.432 1030.2C510.162 1030.79 510.027 1031.69 510.027 1032.91C510.027 1033.46 510.064 1033.97 510.139 1034.45L512.869 1030.1C512.572 1029.58 512.172 1029.32 511.668 1029.32ZM518.898 1028.38C519.832 1028.38 520.537 1028.76 521.014 1029.52C521.494 1030.29 521.734 1031.41 521.734 1032.91C521.734 1034.4 521.494 1035.52 521.014 1036.29C520.537 1037.05 519.832 1037.43 518.898 1037.43C517.965 1037.43 517.26 1037.05 516.783 1036.29C516.307 1035.52 516.068 1034.4 516.068 1032.91C516.068 1031.41 516.307 1030.29 516.783 1029.52C517.26 1028.76 517.965 1028.38 518.898 1028.38ZM518.898 1036.49C519.453 1036.49 519.865 1036.2 520.135 1035.61C520.408 1035.02 520.545 1034.12 520.545 1032.91C520.545 1032.26 520.506 1031.68 520.428 1031.16L517.639 1035.52C517.932 1036.17 518.352 1036.49 518.898 1036.49ZM518.898 1029.32C518.348 1029.32 517.936 1029.61 517.662 1030.2C517.393 1030.79 517.258 1031.69 517.258 1032.91C517.258 1033.46 517.295 1033.97 517.369 1034.45L520.1 1030.1C519.803 1029.58 519.402 1029.32 518.898 1029.32ZM534.777 1031.53V1028.14H535.855V1037.26H534.777V1036.43C534.598 1036.76 534.357 1037.01 534.057 1037.18C533.76 1037.34 533.416 1037.43 533.025 1037.43C532.232 1037.43 531.607 1037.12 531.15 1036.51C530.697 1035.89 530.471 1035.04 530.471 1033.96C530.471 1032.89 530.699 1032.06 531.156 1031.45C531.613 1030.84 532.236 1030.54 533.025 1030.54C533.42 1030.54 533.768 1030.62 534.068 1030.8C534.369 1030.96 534.605 1031.21 534.777 1031.53ZM531.607 1033.98C531.607 1034.82 531.74 1035.45 532.006 1035.88C532.271 1036.3 532.664 1036.51 533.184 1036.51C533.703 1036.51 534.098 1036.3 534.367 1035.87C534.641 1035.44 534.777 1034.81 534.777 1033.98C534.777 1033.15 534.641 1032.52 534.367 1032.1C534.098 1031.67 533.703 1031.45 533.184 1031.45C532.664 1031.45 532.271 1031.67 532.006 1032.09C531.74 1032.52 531.607 1033.15 531.607 1033.98ZM541.094 1033.96H540.736C540.107 1033.96 539.633 1034.07 539.312 1034.29C538.996 1034.51 538.838 1034.84 538.838 1035.28C538.838 1035.67 538.957 1035.98 539.195 1036.2C539.434 1036.42 539.764 1036.53 540.186 1036.53C540.779 1036.53 541.246 1036.32 541.586 1035.91C541.926 1035.5 542.098 1034.93 542.102 1034.2V1033.96H541.094ZM543.186 1033.51V1037.26H542.102V1036.29C541.871 1036.68 541.58 1036.97 541.229 1037.15C540.881 1037.34 540.457 1037.43 539.957 1037.43C539.289 1037.43 538.756 1037.24 538.357 1036.87C537.959 1036.49 537.76 1035.98 537.76 1035.35C537.76 1034.62 538.004 1034.06 538.492 1033.68C538.984 1033.31 539.705 1033.12 540.654 1033.12H542.102V1032.95C542.098 1032.42 541.965 1032.04 541.703 1031.81C541.441 1031.57 541.023 1031.45 540.449 1031.45C540.082 1031.45 539.711 1031.51 539.336 1031.61C538.961 1031.72 538.596 1031.87 538.24 1032.07V1031C538.639 1030.84 539.02 1030.73 539.383 1030.66C539.75 1030.58 540.105 1030.54 540.449 1030.54C540.992 1030.54 541.455 1030.62 541.838 1030.78C542.225 1030.94 542.537 1031.18 542.775 1031.5C542.924 1031.69 543.029 1031.94 543.092 1032.23C543.154 1032.51 543.186 1032.94 543.186 1033.51ZM550.979 1032.05C550.748 1031.87 550.514 1031.74 550.275 1031.66C550.037 1031.58 549.775 1031.53 549.49 1031.53C548.818 1031.53 548.305 1031.75 547.949 1032.17C547.594 1032.59 547.416 1033.2 547.416 1034V1037.26H546.332V1030.7H547.416V1031.98C547.596 1031.51 547.871 1031.16 548.242 1030.91C548.617 1030.66 549.061 1030.54 549.572 1030.54C549.838 1030.54 550.086 1030.57 550.316 1030.64C550.547 1030.7 550.768 1030.81 550.979 1030.95V1032.05ZM552.824 1028.14H553.938V1033.42L556.768 1030.7H558.08L555.496 1033.17L558.484 1037.26H557.166L554.74 1033.87L553.938 1034.63V1037.26H552.824V1028.14ZM561.186 1030.7H563.014V1032.82H561.186V1030.7ZM561.186 1035.13H563.014V1037.26H561.186V1035.13ZM569.5 1028.83V1030.7H571.949V1031.53H569.5V1035.1C569.5 1035.58 569.592 1035.92 569.775 1036.11C569.959 1036.3 570.279 1036.4 570.736 1036.4H571.949V1037.26H570.631C569.822 1037.26 569.252 1037.1 568.92 1036.77C568.588 1036.45 568.422 1035.89 568.422 1035.1V1031.53H566.67V1030.7H568.422V1028.83H569.5ZM579.695 1033.44V1033.97H575.025V1034C574.994 1034.9 575.164 1035.54 575.535 1035.93C575.91 1036.32 576.438 1036.51 577.117 1036.51C577.461 1036.51 577.82 1036.46 578.195 1036.35C578.57 1036.24 578.971 1036.08 579.396 1035.85V1036.92C578.986 1037.09 578.59 1037.22 578.207 1037.3C577.828 1037.39 577.461 1037.43 577.105 1037.43C576.086 1037.43 575.289 1037.12 574.715 1036.51C574.141 1035.9 573.854 1035.06 573.854 1033.98C573.854 1032.94 574.135 1032.1 574.697 1031.48C575.26 1030.85 576.01 1030.54 576.947 1030.54C577.783 1030.54 578.441 1030.82 578.922 1031.39C579.406 1031.95 579.664 1032.64 579.695 1033.44ZM578.617 1033.12C578.57 1032.67 578.404 1032.28 578.119 1031.95C577.838 1031.62 577.432 1031.45 576.9 1031.45C576.381 1031.45 575.953 1031.62 575.617 1031.97C575.281 1032.31 575.098 1032.7 575.066 1033.13L578.617 1033.12ZM586.914 1030.7L584.564 1033.84L587.143 1037.26H585.895L583.973 1034.63L582.057 1037.26H580.809L583.387 1033.84L581.037 1030.7H582.232L583.973 1033.07L585.701 1030.7H586.914ZM591.191 1028.83V1030.7H593.641V1031.53H591.191V1035.1C591.191 1035.58 591.283 1035.92 591.467 1036.11C591.65 1036.3 591.971 1036.4 592.428 1036.4H593.641V1037.26H592.322C591.514 1037.26 590.943 1037.1 590.611 1036.77C590.279 1036.45 590.113 1035.89 590.113 1035.1V1031.53H588.361V1030.7H590.113V1028.83H591.191ZM595.422 1033.02H601.633V1034.01H595.422V1033.02ZM607.434 1033.98C607.434 1033.15 607.301 1032.52 607.035 1032.09C606.77 1031.67 606.377 1031.45 605.857 1031.45C605.334 1031.45 604.938 1031.67 604.668 1032.1C604.398 1032.52 604.264 1033.15 604.264 1033.98C604.264 1034.81 604.398 1035.44 604.668 1035.87C604.938 1036.3 605.334 1036.51 605.857 1036.51C606.377 1036.51 606.77 1036.3 607.035 1035.88C607.301 1035.45 607.434 1034.82 607.434 1033.98ZM604.264 1031.53C604.436 1031.21 604.672 1030.97 604.973 1030.8C605.277 1030.62 605.629 1030.54 606.027 1030.54C606.816 1030.54 607.438 1030.84 607.891 1031.45C608.344 1032.06 608.57 1032.89 608.57 1033.96C608.57 1035.04 608.342 1035.89 607.885 1036.51C607.432 1037.12 606.809 1037.43 606.016 1037.43C605.625 1037.43 605.279 1037.34 604.979 1037.18C604.682 1037.01 604.443 1036.76 604.264 1036.43V1037.26H603.186V1028.14H604.264V1031.53ZM613.498 1034.89C613.498 1035.37 613.586 1035.74 613.762 1035.98C613.941 1036.23 614.205 1036.35 614.553 1036.35H615.812V1037.26H614.447C613.803 1037.26 613.303 1037.05 612.947 1036.64C612.596 1036.23 612.42 1035.64 612.42 1034.89V1028.95H610.691V1028.11H613.498V1034.89ZM617.658 1034.77V1030.71H618.736V1034.77C618.736 1035.36 618.84 1035.8 619.047 1036.08C619.258 1036.35 619.582 1036.49 620.02 1036.49C620.527 1036.49 620.916 1036.31 621.186 1035.96C621.455 1035.6 621.59 1035.09 621.59 1034.42V1030.71H622.674V1037.26H621.59V1036.27C621.398 1036.65 621.137 1036.94 620.805 1037.14C620.477 1037.33 620.092 1037.43 619.65 1037.43C618.979 1037.43 618.479 1037.21 618.15 1036.77C617.822 1036.33 617.658 1035.67 617.658 1034.77ZM630.309 1033.44V1033.97H625.639V1034C625.607 1034.9 625.777 1035.54 626.148 1035.93C626.523 1036.32 627.051 1036.51 627.73 1036.51C628.074 1036.51 628.434 1036.46 628.809 1036.35C629.184 1036.24 629.584 1036.08 630.01 1035.85V1036.92C629.6 1037.09 629.203 1037.22 628.82 1037.3C628.441 1037.39 628.074 1037.43 627.719 1037.43C626.699 1037.43 625.902 1037.12 625.328 1036.51C624.754 1035.9 624.467 1035.06 624.467 1033.98C624.467 1032.94 624.748 1032.1 625.311 1031.48C625.873 1030.85 626.623 1030.54 627.561 1030.54C628.396 1030.54 629.055 1030.82 629.535 1031.39C630.02 1031.95 630.277 1032.64 630.309 1033.44ZM629.23 1033.12C629.184 1032.67 629.018 1032.28 628.732 1031.95C628.451 1031.62 628.045 1031.45 627.514 1031.45C626.994 1031.45 626.566 1031.62 626.23 1031.97C625.895 1032.31 625.711 1032.7 625.68 1033.13L629.23 1033.12ZM631.574 1033.02H637.785V1034.01H631.574V1033.02ZM642.514 1029.59L639.754 1034.21H642.514V1029.59ZM642.32 1028.51H643.691V1034.21H644.857V1035.17H643.691V1037.26H642.514V1035.17H638.805V1034.05L642.32 1028.51ZM649.047 1028.38C649.98 1028.38 650.686 1028.76 651.162 1029.52C651.643 1030.29 651.883 1031.41 651.883 1032.91C651.883 1034.4 651.643 1035.52 651.162 1036.29C650.686 1037.05 649.98 1037.43 649.047 1037.43C648.113 1037.43 647.408 1037.05 646.932 1036.29C646.455 1035.52 646.217 1034.4 646.217 1032.91C646.217 1031.41 646.455 1030.29 646.932 1029.52C647.408 1028.76 648.113 1028.38 649.047 1028.38ZM649.047 1036.49C649.602 1036.49 650.014 1036.2 650.283 1035.61C650.557 1035.02 650.693 1034.12 650.693 1032.91C650.693 1032.26 650.654 1031.68 650.576 1031.16L647.787 1035.52C648.08 1036.17 648.5 1036.49 649.047 1036.49ZM649.047 1029.32C648.496 1029.32 648.084 1029.61 647.811 1030.2C647.541 1030.79 647.406 1031.69 647.406 1032.91C647.406 1033.46 647.443 1033.97 647.518 1034.45L650.248 1030.1C649.951 1029.58 649.551 1029.32 649.047 1029.32ZM656.277 1028.38C657.211 1028.38 657.916 1028.76 658.393 1029.52C658.873 1030.29 659.113 1031.41 659.113 1032.91C659.113 1034.4 658.873 1035.52 658.393 1036.29C657.916 1037.05 657.211 1037.43 656.277 1037.43C655.344 1037.43 654.639 1037.05 654.162 1036.29C653.686 1035.52 653.447 1034.4 653.447 1032.91C653.447 1031.41 653.686 1030.29 654.162 1029.52C654.639 1028.76 655.344 1028.38 656.277 1028.38ZM656.277 1036.49C656.832 1036.49 657.244 1036.2 657.514 1035.61C657.787 1035.02 657.924 1034.12 657.924 1032.91C657.924 1032.26 657.885 1031.68 657.807 1031.16L655.018 1035.52C655.311 1036.17 655.73 1036.49 656.277 1036.49ZM656.277 1029.32C655.727 1029.32 655.314 1029.61 655.041 1030.2C654.771 1030.79 654.637 1031.69 654.637 1032.91C654.637 1033.46 654.674 1033.97 654.748 1034.45L657.479 1030.1C657.182 1029.58 656.781 1029.32 656.277 1029.32ZM665.436 1028.19V1031.78H664.123V1028.19H665.436ZM662.312 1028.19V1031.78H661V1028.19H662.312ZM224.377 1082.19V1085.78H223.064V1082.19H224.377ZM221.254 1082.19V1085.78H219.941V1082.19H221.254ZM232.299 1082.14V1083.04H231.074C230.688 1083.04 230.418 1083.12 230.266 1083.28C230.117 1083.43 230.043 1083.71 230.043 1084.12V1084.7H232.299V1085.53H230.043V1091.26H228.965V1085.53H227.213V1084.7H228.965V1084.24C228.965 1083.52 229.129 1082.99 229.457 1082.65C229.789 1082.31 230.305 1082.14 231.004 1082.14H232.299ZM237.514 1088.89C237.514 1089.37 237.602 1089.74 237.777 1089.98C237.957 1090.23 238.221 1090.35 238.568 1090.35H239.828V1091.26H238.463C237.818 1091.26 237.318 1091.05 236.963 1090.64C236.611 1090.23 236.436 1089.64 236.436 1088.89V1082.95H234.707V1082.11H237.514V1088.89ZM247.094 1087.44V1087.97H242.424V1088C242.393 1088.9 242.562 1089.54 242.934 1089.93C243.309 1090.32 243.836 1090.51 244.516 1090.51C244.859 1090.51 245.219 1090.46 245.594 1090.35C245.969 1090.24 246.369 1090.08 246.795 1089.85V1090.92C246.385 1091.09 245.988 1091.22 245.605 1091.3C245.227 1091.39 244.859 1091.43 244.504 1091.43C243.484 1091.43 242.688 1091.12 242.113 1090.51C241.539 1089.9 241.252 1089.06 241.252 1087.98C241.252 1086.94 241.533 1086.1 242.096 1085.48C242.658 1084.85 243.408 1084.54 244.346 1084.54C245.182 1084.54 245.84 1084.82 246.32 1085.39C246.805 1085.95 247.062 1086.64 247.094 1087.44ZM246.016 1087.12C245.969 1086.67 245.803 1086.28 245.518 1085.95C245.236 1085.62 244.83 1085.45 244.299 1085.45C243.779 1085.45 243.352 1085.62 243.016 1085.97C242.68 1086.31 242.496 1086.7 242.465 1087.13L246.016 1087.12ZM254.312 1084.7L251.963 1087.84L254.541 1091.26H253.293L251.371 1088.63L249.455 1091.26H248.207L250.785 1087.84L248.436 1084.7H249.631L251.371 1087.07L253.1 1084.7H254.312ZM268.451 1082.14V1083.04H267.227C266.84 1083.04 266.57 1083.12 266.418 1083.28C266.27 1083.43 266.195 1083.71 266.195 1084.12V1084.7H268.451V1085.53H266.195V1091.26H265.117V1085.53H263.365V1084.7H265.117V1084.24C265.117 1083.52 265.281 1082.99 265.609 1082.65C265.941 1082.31 266.457 1082.14 267.156 1082.14H268.451ZM273.666 1088.89C273.666 1089.37 273.754 1089.74 273.93 1089.98C274.109 1090.23 274.373 1090.35 274.721 1090.35H275.98V1091.26H274.615C273.971 1091.26 273.471 1091.05 273.115 1090.64C272.764 1090.23 272.588 1089.64 272.588 1088.89V1082.95H270.859V1082.11H273.666V1088.89ZM283.246 1087.44V1087.97H278.576V1088C278.545 1088.9 278.715 1089.54 279.086 1089.93C279.461 1090.32 279.988 1090.51 280.668 1090.51C281.012 1090.51 281.371 1090.46 281.746 1090.35C282.121 1090.24 282.521 1090.08 282.947 1089.85V1090.92C282.537 1091.09 282.141 1091.22 281.758 1091.3C281.379 1091.39 281.012 1091.43 280.656 1091.43C279.637 1091.43 278.84 1091.12 278.266 1090.51C277.691 1089.9 277.404 1089.06 277.404 1087.98C277.404 1086.94 277.686 1086.1 278.248 1085.48C278.811 1084.85 279.561 1084.54 280.498 1084.54C281.334 1084.54 281.992 1084.82 282.473 1085.39C282.957 1085.95 283.215 1086.64 283.246 1087.44ZM282.168 1087.12C282.121 1086.67 281.955 1086.28 281.67 1085.95C281.389 1085.62 280.982 1085.45 280.451 1085.45C279.932 1085.45 279.504 1085.62 279.168 1085.97C278.832 1086.31 278.648 1086.7 278.617 1087.13L282.168 1087.12ZM290.465 1084.7L288.115 1087.84L290.693 1091.26H289.445L287.523 1088.63L285.607 1091.26H284.359L286.938 1087.84L284.588 1084.7H285.783L287.523 1087.07L289.252 1084.7H290.465ZM291.742 1087.02H297.953V1088.01H291.742V1087.02ZM304.592 1090.92C304.303 1091.09 304.004 1091.22 303.695 1091.3C303.391 1091.39 303.078 1091.43 302.758 1091.43C301.742 1091.43 300.947 1091.12 300.373 1090.51C299.803 1089.91 299.518 1089.06 299.518 1087.98C299.518 1086.91 299.803 1086.06 300.373 1085.45C300.947 1084.84 301.742 1084.54 302.758 1084.54C303.074 1084.54 303.383 1084.58 303.684 1084.66C303.984 1084.74 304.287 1084.87 304.592 1085.04V1086.17C304.307 1085.92 304.02 1085.74 303.73 1085.62C303.445 1085.51 303.121 1085.45 302.758 1085.45C302.082 1085.45 301.562 1085.67 301.199 1086.11C300.836 1086.55 300.654 1087.17 300.654 1087.98C300.654 1088.79 300.836 1089.42 301.199 1089.86C301.566 1090.3 302.086 1090.51 302.758 1090.51C303.133 1090.51 303.469 1090.46 303.766 1090.34C304.062 1090.23 304.338 1090.05 304.592 1089.81V1090.92ZM309.215 1085.45C308.668 1085.45 308.254 1085.67 307.973 1086.09C307.691 1086.52 307.551 1087.15 307.551 1087.98C307.551 1088.82 307.691 1089.45 307.973 1089.88C308.254 1090.3 308.668 1090.51 309.215 1090.51C309.766 1090.51 310.182 1090.3 310.463 1089.88C310.744 1089.45 310.885 1088.82 310.885 1087.98C310.885 1087.15 310.744 1086.52 310.463 1086.09C310.182 1085.67 309.766 1085.45 309.215 1085.45ZM309.215 1084.54C310.125 1084.54 310.82 1084.83 311.301 1085.42C311.785 1086.01 312.027 1086.87 312.027 1087.98C312.027 1089.1 311.787 1089.96 311.307 1090.55C310.826 1091.14 310.129 1091.43 309.215 1091.43C308.305 1091.43 307.609 1091.14 307.129 1090.55C306.648 1089.96 306.408 1089.1 306.408 1087.98C306.408 1086.87 306.648 1086.01 307.129 1085.42C307.609 1084.83 308.305 1084.54 309.215 1084.54ZM317.049 1088.89C317.049 1089.37 317.137 1089.74 317.312 1089.98C317.492 1090.23 317.756 1090.35 318.104 1090.35H319.363V1091.26H317.998C317.354 1091.26 316.854 1091.05 316.498 1090.64C316.146 1090.23 315.971 1089.64 315.971 1088.89V1082.95H314.242V1082.11H317.049V1088.89ZM332.324 1087.92C332.324 1087.12 332.191 1086.5 331.926 1086.09C331.664 1085.66 331.281 1085.45 330.777 1085.45C330.25 1085.45 329.848 1085.66 329.57 1086.09C329.293 1086.5 329.154 1087.12 329.154 1087.92C329.154 1088.73 329.293 1089.35 329.57 1089.78C329.852 1090.2 330.258 1090.41 330.789 1090.41C331.285 1090.41 331.664 1090.2 331.926 1089.77C332.191 1089.34 332.324 1088.73 332.324 1087.92ZM333.402 1090.84C333.402 1091.82 333.17 1092.57 332.705 1093.08C332.24 1093.58 331.557 1093.84 330.654 1093.84C330.357 1093.84 330.047 1093.81 329.723 1093.76C329.398 1093.7 329.074 1093.62 328.75 1093.51V1092.45C329.133 1092.63 329.48 1092.76 329.793 1092.85C330.105 1092.93 330.393 1092.98 330.654 1092.98C331.236 1092.98 331.66 1092.82 331.926 1092.5C332.191 1092.18 332.324 1091.68 332.324 1091V1090.95V1090.22C332.152 1090.58 331.918 1090.86 331.621 1091.04C331.324 1091.22 330.963 1091.31 330.537 1091.31C329.771 1091.31 329.16 1091 328.703 1090.39C328.246 1089.77 328.018 1088.95 328.018 1087.92C328.018 1086.89 328.246 1086.07 328.703 1085.46C329.16 1084.84 329.771 1084.54 330.537 1084.54C330.959 1084.54 331.316 1084.62 331.609 1084.79C331.902 1084.96 332.141 1085.22 332.324 1085.57V1084.72H333.402V1090.84ZM338.641 1087.96H338.283C337.654 1087.96 337.18 1088.07 336.859 1088.29C336.543 1088.51 336.385 1088.84 336.385 1089.28C336.385 1089.67 336.504 1089.98 336.742 1090.2C336.98 1090.42 337.311 1090.53 337.732 1090.53C338.326 1090.53 338.793 1090.32 339.133 1089.91C339.473 1089.5 339.645 1088.93 339.648 1088.2V1087.96H338.641ZM340.732 1087.51V1091.26H339.648V1090.29C339.418 1090.68 339.127 1090.97 338.775 1091.15C338.428 1091.34 338.004 1091.43 337.504 1091.43C336.836 1091.43 336.303 1091.24 335.904 1090.87C335.506 1090.49 335.307 1089.98 335.307 1089.35C335.307 1088.62 335.551 1088.06 336.039 1087.68C336.531 1087.31 337.252 1087.12 338.201 1087.12H339.648V1086.95C339.645 1086.42 339.512 1086.04 339.25 1085.81C338.988 1085.57 338.57 1085.45 337.996 1085.45C337.629 1085.45 337.258 1085.51 336.883 1085.61C336.508 1085.72 336.143 1085.87 335.787 1086.07V1085C336.186 1084.84 336.566 1084.73 336.93 1084.66C337.297 1084.58 337.652 1084.54 337.996 1084.54C338.539 1084.54 339.002 1084.62 339.385 1084.78C339.771 1084.94 340.084 1085.18 340.322 1085.5C340.471 1085.69 340.576 1085.94 340.639 1086.23C340.701 1086.51 340.732 1086.94 340.732 1087.51ZM343.955 1090.43V1093.76H342.871V1084.7H343.955V1085.53C344.135 1085.21 344.373 1084.96 344.67 1084.8C344.971 1084.62 345.316 1084.54 345.707 1084.54C346.5 1084.54 347.121 1084.84 347.57 1085.46C348.023 1086.07 348.25 1086.92 348.25 1088.01C348.25 1089.07 348.023 1089.91 347.57 1090.52C347.117 1091.13 346.496 1091.43 345.707 1091.43C345.309 1091.43 344.959 1091.34 344.658 1091.18C344.361 1091.01 344.127 1090.76 343.955 1090.43ZM347.119 1087.98C347.119 1087.15 346.986 1086.52 346.721 1086.09C346.459 1085.67 346.068 1085.45 345.549 1085.45C345.025 1085.45 344.629 1085.67 344.359 1086.1C344.09 1086.52 343.955 1087.15 343.955 1087.98C343.955 1088.81 344.09 1089.44 344.359 1089.87C344.629 1090.3 345.025 1090.51 345.549 1090.51C346.068 1090.51 346.459 1090.3 346.721 1089.88C346.986 1089.45 347.119 1088.82 347.119 1087.98ZM349.586 1087.02H355.797V1088.01H349.586V1087.02ZM357.801 1090.27H359.641V1083.66L357.438 1084.72V1083.58L359.629 1082.54H360.812V1090.27H362.629V1091.26H357.801V1090.27ZM365.635 1090.26H369.654V1091.26H364.34V1090.26C365.07 1089.49 365.709 1088.81 366.256 1088.22C366.803 1087.63 367.18 1087.22 367.387 1086.98C367.777 1086.5 368.041 1086.11 368.178 1085.82C368.314 1085.52 368.383 1085.22 368.383 1084.91C368.383 1084.42 368.238 1084.04 367.949 1083.76C367.664 1083.49 367.271 1083.35 366.771 1083.35C366.416 1083.35 366.043 1083.41 365.652 1083.54C365.262 1083.67 364.848 1083.87 364.41 1084.13V1082.93C364.812 1082.74 365.207 1082.6 365.594 1082.5C365.984 1082.4 366.369 1082.35 366.748 1082.35C367.604 1082.35 368.291 1082.58 368.811 1083.04C369.334 1083.49 369.596 1084.09 369.596 1084.83C369.596 1085.2 369.508 1085.58 369.332 1085.95C369.16 1086.33 368.879 1086.74 368.488 1087.19C368.27 1087.45 367.951 1087.8 367.533 1088.25C367.119 1088.7 366.486 1089.37 365.635 1090.26ZM376.217 1082.19V1085.78H374.904V1082.19H376.217ZM373.094 1082.19V1085.78H371.781V1082.19H373.094ZM188.225 1118.19V1121.78H186.912V1118.19H188.225ZM185.102 1118.19V1121.78H183.789V1118.19H185.102ZM196.387 1126.54C196.07 1126.83 195.713 1127.05 195.314 1127.21C194.92 1127.35 194.492 1127.43 194.031 1127.43C192.922 1127.43 192.059 1127.03 191.441 1126.24C190.824 1125.44 190.516 1124.33 190.516 1122.89C190.516 1121.46 190.828 1120.35 191.453 1119.55C192.078 1118.75 192.947 1118.35 194.061 1118.35C194.428 1118.35 194.779 1118.41 195.115 1118.51C195.451 1118.61 195.775 1118.77 196.088 1118.98V1120.19C195.771 1119.89 195.447 1119.67 195.115 1119.53C194.783 1119.39 194.432 1119.31 194.061 1119.31C193.291 1119.31 192.713 1119.61 192.326 1120.21C191.943 1120.8 191.752 1121.7 191.752 1122.89C191.752 1124.11 191.938 1125.01 192.309 1125.59C192.684 1126.18 193.258 1126.47 194.031 1126.47C194.293 1126.47 194.521 1126.44 194.717 1126.38C194.916 1126.32 195.096 1126.22 195.256 1126.09V1123.74H193.984V1122.77H196.387V1126.54ZM199 1120.72H201.76V1126.42H203.898V1127.26H198.543V1126.42H200.682V1121.56H199V1120.72ZM200.682 1118.17H201.76V1119.53H200.682V1118.17ZM207.977 1118.83V1120.7H210.426V1121.53H207.977V1125.1C207.977 1125.58 208.068 1125.92 208.252 1126.11C208.436 1126.3 208.756 1126.4 209.213 1126.4H210.426V1127.26H209.107C208.299 1127.26 207.729 1127.1 207.396 1126.77C207.064 1126.45 206.898 1125.89 206.898 1125.1V1121.53H205.146V1120.7H206.898V1118.83H207.977ZM212.412 1118.51H213.602V1121.86H216.842V1118.51H218.031V1127.26H216.842V1122.86H213.602V1127.26H212.412V1118.51ZM219.982 1124.77V1120.71H221.061V1124.77C221.061 1125.36 221.164 1125.8 221.371 1126.08C221.582 1126.35 221.906 1126.49 222.344 1126.49C222.852 1126.49 223.24 1126.31 223.51 1125.96C223.779 1125.6 223.914 1125.09 223.914 1124.42V1120.71H224.998V1127.26H223.914V1126.27C223.723 1126.65 223.461 1126.94 223.129 1127.14C222.801 1127.33 222.416 1127.43 221.975 1127.43C221.303 1127.43 220.803 1127.21 220.475 1126.77C220.146 1126.33 219.982 1125.67 219.982 1124.77ZM231.449 1123.98C231.449 1123.15 231.316 1122.52 231.051 1122.09C230.785 1121.67 230.393 1121.45 229.873 1121.45C229.35 1121.45 228.953 1121.67 228.684 1122.1C228.414 1122.52 228.279 1123.15 228.279 1123.98C228.279 1124.81 228.414 1125.44 228.684 1125.87C228.953 1126.3 229.35 1126.51 229.873 1126.51C230.393 1126.51 230.785 1126.3 231.051 1125.88C231.316 1125.45 231.449 1124.82 231.449 1123.98ZM228.279 1121.53C228.451 1121.21 228.688 1120.97 228.988 1120.8C229.293 1120.62 229.645 1120.54 230.043 1120.54C230.832 1120.54 231.453 1120.84 231.906 1121.45C232.359 1122.06 232.586 1122.89 232.586 1123.96C232.586 1125.04 232.357 1125.89 231.9 1126.51C231.447 1127.12 230.824 1127.43 230.031 1127.43C229.641 1127.43 229.295 1127.34 228.994 1127.18C228.697 1127.01 228.459 1126.76 228.279 1126.43V1127.26H227.201V1118.14H228.279V1121.53ZM246.818 1126.95C246.518 1127.11 246.209 1127.23 245.893 1127.31C245.576 1127.39 245.24 1127.43 244.885 1127.43C243.764 1127.43 242.893 1127.03 242.271 1126.24C241.654 1125.45 241.346 1124.33 241.346 1122.89C241.346 1121.46 241.656 1120.35 242.277 1119.55C242.902 1118.75 243.771 1118.35 244.885 1118.35C245.24 1118.35 245.576 1118.39 245.893 1118.48C246.209 1118.55 246.518 1118.67 246.818 1118.83V1120.05C246.529 1119.81 246.219 1119.63 245.887 1119.5C245.555 1119.38 245.221 1119.31 244.885 1119.31C244.115 1119.31 243.539 1119.61 243.156 1120.2C242.773 1120.8 242.582 1121.69 242.582 1122.89C242.582 1124.09 242.773 1124.98 243.156 1125.58C243.539 1126.17 244.115 1126.47 244.885 1126.47C245.229 1126.47 245.564 1126.41 245.893 1126.28C246.225 1126.16 246.533 1125.97 246.818 1125.74V1126.95ZM251.371 1121.45C250.824 1121.45 250.41 1121.67 250.129 1122.09C249.848 1122.52 249.707 1123.15 249.707 1123.98C249.707 1124.82 249.848 1125.45 250.129 1125.88C250.41 1126.3 250.824 1126.51 251.371 1126.51C251.922 1126.51 252.338 1126.3 252.619 1125.88C252.9 1125.45 253.041 1124.82 253.041 1123.98C253.041 1123.15 252.9 1122.52 252.619 1122.09C252.338 1121.67 251.922 1121.45 251.371 1121.45ZM251.371 1120.54C252.281 1120.54 252.977 1120.83 253.457 1121.42C253.941 1122.01 254.184 1122.87 254.184 1123.98C254.184 1125.1 253.943 1125.96 253.463 1126.55C252.982 1127.14 252.285 1127.43 251.371 1127.43C250.461 1127.43 249.766 1127.14 249.285 1126.55C248.805 1125.96 248.564 1125.1 248.564 1123.98C248.564 1122.87 248.805 1122.01 249.285 1121.42C249.766 1120.83 250.461 1120.54 251.371 1120.54ZM257.189 1126.43V1129.76H256.105V1120.7H257.189V1121.53C257.369 1121.21 257.607 1120.96 257.904 1120.8C258.205 1120.62 258.551 1120.54 258.941 1120.54C259.734 1120.54 260.355 1120.84 260.805 1121.46C261.258 1122.07 261.484 1122.92 261.484 1124.01C261.484 1125.07 261.258 1125.91 260.805 1126.52C260.352 1127.13 259.73 1127.43 258.941 1127.43C258.543 1127.43 258.193 1127.34 257.893 1127.18C257.596 1127.01 257.361 1126.76 257.189 1126.43ZM260.354 1123.98C260.354 1123.15 260.221 1122.52 259.955 1122.09C259.693 1121.67 259.303 1121.45 258.783 1121.45C258.26 1121.45 257.863 1121.67 257.594 1122.1C257.324 1122.52 257.189 1123.15 257.189 1123.98C257.189 1124.81 257.324 1125.44 257.594 1125.87C257.863 1126.3 258.26 1126.51 258.783 1126.51C259.303 1126.51 259.693 1126.3 259.955 1125.88C260.221 1125.45 260.354 1124.82 260.354 1123.98ZM264.074 1120.72H266.834V1126.42H268.973V1127.26H263.617V1126.42H265.756V1121.56H264.074V1120.72ZM265.756 1118.17H266.834V1119.53H265.756V1118.17ZM273.666 1124.89C273.666 1125.37 273.754 1125.74 273.93 1125.98C274.109 1126.23 274.373 1126.35 274.721 1126.35H275.98V1127.26H274.615C273.971 1127.26 273.471 1127.05 273.115 1126.64C272.764 1126.23 272.588 1125.64 272.588 1124.89V1118.95H270.859V1118.11H273.666V1124.89ZM280.293 1121.45C279.746 1121.45 279.332 1121.67 279.051 1122.09C278.77 1122.52 278.629 1123.15 278.629 1123.98C278.629 1124.82 278.77 1125.45 279.051 1125.88C279.332 1126.3 279.746 1126.51 280.293 1126.51C280.844 1126.51 281.26 1126.3 281.541 1125.88C281.822 1125.45 281.963 1124.82 281.963 1123.98C281.963 1123.15 281.822 1122.52 281.541 1122.09C281.26 1121.67 280.844 1121.45 280.293 1121.45ZM280.293 1120.54C281.203 1120.54 281.898 1120.83 282.379 1121.42C282.863 1122.01 283.105 1122.87 283.105 1123.98C283.105 1125.1 282.865 1125.96 282.385 1126.55C281.904 1127.14 281.207 1127.43 280.293 1127.43C279.383 1127.43 278.688 1127.14 278.207 1126.55C277.727 1125.96 277.486 1125.1 277.486 1123.98C277.486 1122.87 277.727 1122.01 278.207 1121.42C278.688 1120.83 279.383 1120.54 280.293 1120.54ZM287.512 1118.83V1120.7H289.961V1121.53H287.512V1125.1C287.512 1125.58 287.604 1125.92 287.787 1126.11C287.971 1126.3 288.291 1126.4 288.748 1126.4H289.961V1127.26H288.643C287.834 1127.26 287.264 1127.1 286.932 1126.77C286.6 1126.45 286.434 1125.89 286.434 1125.1V1121.53H284.682V1120.7H286.434V1118.83H287.512ZM304.662 1126.95C304.361 1127.11 304.053 1127.23 303.736 1127.31C303.42 1127.39 303.084 1127.43 302.729 1127.43C301.607 1127.43 300.736 1127.03 300.115 1126.24C299.498 1125.45 299.189 1124.33 299.189 1122.89C299.189 1121.46 299.5 1120.35 300.121 1119.55C300.746 1118.75 301.615 1118.35 302.729 1118.35C303.084 1118.35 303.42 1118.39 303.736 1118.48C304.053 1118.55 304.361 1118.67 304.662 1118.83V1120.05C304.373 1119.81 304.062 1119.63 303.73 1119.5C303.398 1119.38 303.064 1119.31 302.729 1119.31C301.959 1119.31 301.383 1119.61 301 1120.2C300.617 1120.8 300.426 1121.69 300.426 1122.89C300.426 1124.09 300.617 1124.98 301 1125.58C301.383 1126.17 301.959 1126.47 302.729 1126.47C303.072 1126.47 303.408 1126.41 303.736 1126.28C304.068 1126.16 304.377 1125.97 304.662 1125.74V1126.95ZM311.764 1123.19V1127.26H310.68V1123.19C310.68 1122.6 310.576 1122.17 310.369 1121.89C310.162 1121.61 309.838 1121.48 309.396 1121.48C308.893 1121.48 308.504 1121.66 308.23 1122.01C307.961 1122.37 307.826 1122.88 307.826 1123.55V1127.26H306.748V1118.14H307.826V1121.68C308.018 1121.31 308.277 1121.02 308.605 1120.83C308.934 1120.64 309.322 1120.54 309.771 1120.54C310.439 1120.54 310.938 1120.76 311.266 1121.2C311.598 1121.64 311.764 1122.3 311.764 1123.19ZM316.949 1123.96H316.592C315.963 1123.96 315.488 1124.07 315.168 1124.29C314.852 1124.51 314.693 1124.84 314.693 1125.28C314.693 1125.67 314.812 1125.98 315.051 1126.2C315.289 1126.42 315.619 1126.53 316.041 1126.53C316.635 1126.53 317.102 1126.32 317.441 1125.91C317.781 1125.5 317.953 1124.93 317.957 1124.2V1123.96H316.949ZM319.041 1123.51V1127.26H317.957V1126.29C317.727 1126.68 317.436 1126.97 317.084 1127.15C316.736 1127.34 316.312 1127.43 315.812 1127.43C315.145 1127.43 314.611 1127.24 314.213 1126.87C313.814 1126.49 313.615 1125.98 313.615 1125.35C313.615 1124.62 313.859 1124.06 314.348 1123.68C314.84 1123.31 315.561 1123.12 316.51 1123.12H317.957V1122.95C317.953 1122.42 317.82 1122.04 317.559 1121.81C317.297 1121.57 316.879 1121.45 316.305 1121.45C315.938 1121.45 315.566 1121.51 315.191 1121.61C314.816 1121.72 314.451 1121.87 314.096 1122.07V1121C314.494 1120.84 314.875 1120.73 315.238 1120.66C315.605 1120.58 315.961 1120.54 316.305 1120.54C316.848 1120.54 317.311 1120.62 317.693 1120.78C318.08 1120.94 318.393 1121.18 318.631 1121.5C318.779 1121.69 318.885 1121.94 318.947 1122.23C319.01 1122.51 319.041 1122.94 319.041 1123.51ZM323.664 1118.83V1120.7H326.113V1121.53H323.664V1125.1C323.664 1125.58 323.756 1125.92 323.939 1126.11C324.123 1126.3 324.443 1126.4 324.9 1126.4H326.113V1127.26H324.795C323.986 1127.26 323.416 1127.1 323.084 1126.77C322.752 1126.45 322.586 1125.89 322.586 1125.1V1121.53H320.834V1120.7H322.586V1118.83H323.664ZM332.834 1118.19V1121.78H331.521V1118.19H332.834ZM329.711 1118.19V1121.78H328.398V1118.19H329.711ZM231.607 1136.19V1139.78H230.295V1136.19H231.607ZM228.484 1136.19V1139.78H227.172V1136.19H228.484ZM239.588 1144.95C239.287 1145.11 238.979 1145.23 238.662 1145.31C238.346 1145.39 238.01 1145.43 237.654 1145.43C236.533 1145.43 235.662 1145.03 235.041 1144.24C234.424 1143.45 234.115 1142.33 234.115 1140.89C234.115 1139.46 234.426 1138.35 235.047 1137.55C235.672 1136.75 236.541 1136.35 237.654 1136.35C238.01 1136.35 238.346 1136.39 238.662 1136.48C238.979 1136.55 239.287 1136.67 239.588 1136.83V1138.05C239.299 1137.81 238.988 1137.63 238.656 1137.5C238.324 1137.38 237.99 1137.31 237.654 1137.31C236.885 1137.31 236.309 1137.61 235.926 1138.2C235.543 1138.8 235.352 1139.69 235.352 1140.89C235.352 1142.09 235.543 1142.98 235.926 1143.58C236.309 1144.17 236.885 1144.47 237.654 1144.47C237.998 1144.47 238.334 1144.41 238.662 1144.28C238.994 1144.16 239.303 1143.97 239.588 1143.74V1144.95ZM244.141 1139.45C243.594 1139.45 243.18 1139.67 242.898 1140.09C242.617 1140.52 242.477 1141.15 242.477 1141.98C242.477 1142.82 242.617 1143.45 242.898 1143.88C243.18 1144.3 243.594 1144.51 244.141 1144.51C244.691 1144.51 245.107 1144.3 245.389 1143.88C245.67 1143.45 245.811 1142.82 245.811 1141.98C245.811 1141.15 245.67 1140.52 245.389 1140.09C245.107 1139.67 244.691 1139.45 244.141 1139.45ZM244.141 1138.54C245.051 1138.54 245.746 1138.83 246.227 1139.42C246.711 1140.01 246.953 1140.87 246.953 1141.98C246.953 1143.1 246.713 1143.96 246.232 1144.55C245.752 1145.14 245.055 1145.43 244.141 1145.43C243.23 1145.43 242.535 1145.14 242.055 1144.55C241.574 1143.96 241.334 1143.1 241.334 1141.98C241.334 1140.87 241.574 1140.01 242.055 1139.42C242.535 1138.83 243.23 1138.54 244.141 1138.54ZM249.959 1144.43V1147.76H248.875V1138.7H249.959V1139.53C250.139 1139.21 250.377 1138.96 250.674 1138.8C250.975 1138.62 251.32 1138.54 251.711 1138.54C252.504 1138.54 253.125 1138.84 253.574 1139.46C254.027 1140.07 254.254 1140.92 254.254 1142.01C254.254 1143.07 254.027 1143.91 253.574 1144.52C253.121 1145.13 252.5 1145.43 251.711 1145.43C251.312 1145.43 250.963 1145.34 250.662 1145.18C250.365 1145.01 250.131 1144.76 249.959 1144.43ZM253.123 1141.98C253.123 1141.15 252.99 1140.52 252.725 1140.09C252.463 1139.67 252.072 1139.45 251.553 1139.45C251.029 1139.45 250.633 1139.67 250.363 1140.1C250.094 1140.52 249.959 1141.15 249.959 1141.98C249.959 1142.81 250.094 1143.44 250.363 1143.87C250.633 1144.3 251.029 1144.51 251.553 1144.51C252.072 1144.51 252.463 1144.3 252.725 1143.88C252.99 1143.45 253.123 1142.82 253.123 1141.98ZM256.844 1138.72H259.604V1144.42H261.742V1145.26H256.387V1144.42H258.525V1139.56H256.844V1138.72ZM258.525 1136.17H259.604V1137.53H258.525V1136.17ZM266.436 1142.89C266.436 1143.37 266.523 1143.74 266.699 1143.98C266.879 1144.23 267.143 1144.35 267.49 1144.35H268.75V1145.26H267.385C266.74 1145.26 266.24 1145.05 265.885 1144.64C265.533 1144.23 265.357 1143.64 265.357 1142.89V1136.95H263.629V1136.11H266.436V1142.89ZM273.062 1139.45C272.516 1139.45 272.102 1139.67 271.82 1140.09C271.539 1140.52 271.398 1141.15 271.398 1141.98C271.398 1142.82 271.539 1143.45 271.82 1143.88C272.102 1144.3 272.516 1144.51 273.062 1144.51C273.613 1144.51 274.029 1144.3 274.311 1143.88C274.592 1143.45 274.732 1142.82 274.732 1141.98C274.732 1141.15 274.592 1140.52 274.311 1140.09C274.029 1139.67 273.613 1139.45 273.062 1139.45ZM273.062 1138.54C273.973 1138.54 274.668 1138.83 275.148 1139.42C275.633 1140.01 275.875 1140.87 275.875 1141.98C275.875 1143.1 275.635 1143.96 275.154 1144.55C274.674 1145.14 273.977 1145.43 273.062 1145.43C272.152 1145.43 271.457 1145.14 270.977 1144.55C270.496 1143.96 270.256 1143.1 270.256 1141.98C270.256 1140.87 270.496 1140.01 270.977 1139.42C271.457 1138.83 272.152 1138.54 273.062 1138.54ZM280.281 1136.83V1138.7H282.73V1139.53H280.281V1143.1C280.281 1143.58 280.373 1143.92 280.557 1144.11C280.74 1144.3 281.061 1144.4 281.518 1144.4H282.73V1145.26H281.412C280.604 1145.26 280.033 1145.1 279.701 1144.77C279.369 1144.45 279.203 1143.89 279.203 1143.1V1139.53H277.451V1138.7H279.203V1136.83H280.281ZM297.432 1144.95C297.131 1145.11 296.822 1145.23 296.506 1145.31C296.189 1145.39 295.854 1145.43 295.498 1145.43C294.377 1145.43 293.506 1145.03 292.885 1144.24C292.268 1143.45 291.959 1142.33 291.959 1140.89C291.959 1139.46 292.27 1138.35 292.891 1137.55C293.516 1136.75 294.385 1136.35 295.498 1136.35C295.854 1136.35 296.189 1136.39 296.506 1136.48C296.822 1136.55 297.131 1136.67 297.432 1136.83V1138.05C297.143 1137.81 296.832 1137.63 296.5 1137.5C296.168 1137.38 295.834 1137.31 295.498 1137.31C294.729 1137.31 294.152 1137.61 293.77 1138.2C293.387 1138.8 293.195 1139.69 293.195 1140.89C293.195 1142.09 293.387 1142.98 293.77 1143.58C294.152 1144.17 294.729 1144.47 295.498 1144.47C295.842 1144.47 296.178 1144.41 296.506 1144.28C296.838 1144.16 297.146 1143.97 297.432 1143.74V1144.95ZM304.533 1141.19V1145.26H303.449V1141.19C303.449 1140.6 303.346 1140.17 303.139 1139.89C302.932 1139.61 302.607 1139.48 302.166 1139.48C301.662 1139.48 301.273 1139.66 301 1140.01C300.73 1140.37 300.596 1140.88 300.596 1141.55V1145.26H299.518V1136.14H300.596V1139.68C300.787 1139.31 301.047 1139.02 301.375 1138.83C301.703 1138.64 302.092 1138.54 302.541 1138.54C303.209 1138.54 303.707 1138.76 304.035 1139.2C304.367 1139.64 304.533 1140.3 304.533 1141.19ZM309.719 1141.96H309.361C308.732 1141.96 308.258 1142.07 307.938 1142.29C307.621 1142.51 307.463 1142.84 307.463 1143.28C307.463 1143.67 307.582 1143.98 307.82 1144.2C308.059 1144.42 308.389 1144.53 308.811 1144.53C309.404 1144.53 309.871 1144.32 310.211 1143.91C310.551 1143.5 310.723 1142.93 310.727 1142.2V1141.96H309.719ZM311.811 1141.51V1145.26H310.727V1144.29C310.496 1144.68 310.205 1144.97 309.854 1145.15C309.506 1145.34 309.082 1145.43 308.582 1145.43C307.914 1145.43 307.381 1145.24 306.982 1144.87C306.584 1144.49 306.385 1143.98 306.385 1143.35C306.385 1142.62 306.629 1142.06 307.117 1141.68C307.609 1141.31 308.33 1141.12 309.279 1141.12H310.727V1140.95C310.723 1140.42 310.59 1140.04 310.328 1139.81C310.066 1139.57 309.648 1139.45 309.074 1139.45C308.707 1139.45 308.336 1139.51 307.961 1139.61C307.586 1139.72 307.221 1139.87 306.865 1140.07V1139C307.264 1138.84 307.645 1138.73 308.008 1138.66C308.375 1138.58 308.73 1138.54 309.074 1138.54C309.617 1138.54 310.08 1138.62 310.463 1138.78C310.85 1138.94 311.162 1139.18 311.4 1139.5C311.549 1139.69 311.654 1139.94 311.717 1140.23C311.779 1140.51 311.811 1140.94 311.811 1141.51ZM316.434 1136.83V1138.7H318.883V1139.53H316.434V1143.1C316.434 1143.58 316.525 1143.92 316.709 1144.11C316.893 1144.3 317.213 1144.4 317.67 1144.4H318.883V1145.26H317.564C316.756 1145.26 316.186 1145.1 315.854 1144.77C315.521 1144.45 315.355 1143.89 315.355 1143.1V1139.53H313.604V1138.7H315.355V1136.83H316.434ZM322.656 1143.14H324.484V1144.7L323.184 1147.22L322.012 1147.23L322.656 1144.7V1143.14ZM335.705 1136.51H340.562V1137.51H338.729V1144.26H340.562V1145.26H335.705V1144.26H337.539V1137.51H335.705V1136.51ZM347.916 1141.19V1145.26H346.832V1141.19C346.832 1140.6 346.729 1140.17 346.521 1139.89C346.314 1139.61 345.99 1139.48 345.549 1139.48C345.045 1139.48 344.656 1139.66 344.383 1140.01C344.113 1140.37 343.979 1140.88 343.979 1141.55V1145.26H342.9V1138.7H343.979V1139.68C344.17 1139.31 344.43 1139.02 344.758 1138.83C345.086 1138.64 345.475 1138.54 345.924 1138.54C346.592 1138.54 347.09 1138.76 347.418 1139.2C347.75 1139.64 347.916 1140.3 347.916 1141.19ZM353.201 1142.89C353.201 1143.37 353.289 1143.74 353.465 1143.98C353.645 1144.23 353.908 1144.35 354.256 1144.35H355.516V1145.26H354.15C353.506 1145.26 353.006 1145.05 352.65 1144.64C352.299 1144.23 352.123 1143.64 352.123 1142.89V1136.95H350.395V1136.11H353.201V1142.89ZM358.07 1138.72H360.83V1144.42H362.969V1145.26H357.613V1144.42H359.752V1139.56H358.07V1138.72ZM359.752 1136.17H360.83V1137.53H359.752V1136.17ZM369.607 1141.19V1145.26H368.523V1141.19C368.523 1140.6 368.42 1140.17 368.213 1139.89C368.006 1139.61 367.682 1139.48 367.24 1139.48C366.736 1139.48 366.348 1139.66 366.074 1140.01C365.805 1140.37 365.67 1140.88 365.67 1141.55V1145.26H364.592V1138.7H365.67V1139.68C365.861 1139.31 366.121 1139.02 366.449 1138.83C366.777 1138.64 367.166 1138.54 367.615 1138.54C368.283 1138.54 368.781 1138.76 369.109 1139.2C369.441 1139.64 369.607 1140.3 369.607 1141.19ZM377.242 1141.44V1141.97H372.572V1142C372.541 1142.9 372.711 1143.54 373.082 1143.93C373.457 1144.32 373.984 1144.51 374.664 1144.51C375.008 1144.51 375.367 1144.46 375.742 1144.35C376.117 1144.24 376.518 1144.08 376.943 1143.85V1144.92C376.533 1145.09 376.137 1145.22 375.754 1145.3C375.375 1145.39 375.008 1145.43 374.652 1145.43C373.633 1145.43 372.836 1145.12 372.262 1144.51C371.688 1143.9 371.4 1143.06 371.4 1141.98C371.4 1140.94 371.682 1140.1 372.244 1139.48C372.807 1138.85 373.557 1138.54 374.494 1138.54C375.33 1138.54 375.988 1138.82 376.469 1139.39C376.953 1139.95 377.211 1140.64 377.242 1141.44ZM376.164 1141.12C376.117 1140.67 375.951 1140.28 375.666 1139.95C375.385 1139.62 374.979 1139.45 374.447 1139.45C373.928 1139.45 373.5 1139.62 373.164 1139.97C372.828 1140.31 372.645 1140.7 372.613 1141.13L376.164 1141.12ZM391.428 1144.95C391.127 1145.11 390.818 1145.23 390.502 1145.31C390.186 1145.39 389.85 1145.43 389.494 1145.43C388.373 1145.43 387.502 1145.03 386.881 1144.24C386.264 1143.45 385.955 1142.33 385.955 1140.89C385.955 1139.46 386.266 1138.35 386.887 1137.55C387.512 1136.75 388.381 1136.35 389.494 1136.35C389.85 1136.35 390.186 1136.39 390.502 1136.48C390.818 1136.55 391.127 1136.67 391.428 1136.83V1138.05C391.139 1137.81 390.828 1137.63 390.496 1137.5C390.164 1137.38 389.83 1137.31 389.494 1137.31C388.725 1137.31 388.148 1137.61 387.766 1138.2C387.383 1138.8 387.191 1139.69 387.191 1140.89C387.191 1142.09 387.383 1142.98 387.766 1143.58C388.148 1144.17 388.725 1144.47 389.494 1144.47C389.838 1144.47 390.174 1144.41 390.502 1144.28C390.834 1144.16 391.143 1143.97 391.428 1143.74V1144.95ZM398.529 1141.19V1145.26H397.445V1141.19C397.445 1140.6 397.342 1140.17 397.135 1139.89C396.928 1139.61 396.604 1139.48 396.162 1139.48C395.658 1139.48 395.27 1139.66 394.996 1140.01C394.727 1140.37 394.592 1140.88 394.592 1141.55V1145.26H393.514V1136.14H394.592V1139.68C394.783 1139.31 395.043 1139.02 395.371 1138.83C395.699 1138.64 396.088 1138.54 396.537 1138.54C397.205 1138.54 397.703 1138.76 398.031 1139.2C398.363 1139.64 398.529 1140.3 398.529 1141.19ZM403.715 1141.96H403.357C402.729 1141.96 402.254 1142.07 401.934 1142.29C401.617 1142.51 401.459 1142.84 401.459 1143.28C401.459 1143.67 401.578 1143.98 401.816 1144.2C402.055 1144.42 402.385 1144.53 402.807 1144.53C403.4 1144.53 403.867 1144.32 404.207 1143.91C404.547 1143.5 404.719 1142.93 404.723 1142.2V1141.96H403.715ZM405.807 1141.51V1145.26H404.723V1144.29C404.492 1144.68 404.201 1144.97 403.85 1145.15C403.502 1145.34 403.078 1145.43 402.578 1145.43C401.91 1145.43 401.377 1145.24 400.979 1144.87C400.58 1144.49 400.381 1143.98 400.381 1143.35C400.381 1142.62 400.625 1142.06 401.113 1141.68C401.605 1141.31 402.326 1141.12 403.275 1141.12H404.723V1140.95C404.719 1140.42 404.586 1140.04 404.324 1139.81C404.062 1139.57 403.645 1139.45 403.07 1139.45C402.703 1139.45 402.332 1139.51 401.957 1139.61C401.582 1139.72 401.217 1139.87 400.861 1140.07V1139C401.26 1138.84 401.641 1138.73 402.004 1138.66C402.371 1138.58 402.727 1138.54 403.07 1138.54C403.613 1138.54 404.076 1138.62 404.459 1138.78C404.846 1138.94 405.158 1139.18 405.396 1139.5C405.545 1139.69 405.65 1139.94 405.713 1140.23C405.775 1140.51 405.807 1140.94 405.807 1141.51ZM410.43 1136.83V1138.7H412.879V1139.53H410.43V1143.1C410.43 1143.58 410.521 1143.92 410.705 1144.11C410.889 1144.3 411.209 1144.4 411.666 1144.4H412.879V1145.26H411.561C410.752 1145.26 410.182 1145.1 409.85 1144.77C409.518 1144.45 409.352 1143.89 409.352 1143.1V1139.53H407.6V1138.7H409.352V1136.83H410.43ZM416.652 1143.14H418.48V1144.7L417.18 1147.22L416.008 1147.23L416.652 1144.7V1143.14ZM432.637 1141.96H432.279C431.65 1141.96 431.176 1142.07 430.855 1142.29C430.539 1142.51 430.381 1142.84 430.381 1143.28C430.381 1143.67 430.5 1143.98 430.738 1144.2C430.977 1144.42 431.307 1144.53 431.729 1144.53C432.322 1144.53 432.789 1144.32 433.129 1143.91C433.469 1143.5 433.641 1142.93 433.645 1142.2V1141.96H432.637ZM434.729 1141.51V1145.26H433.645V1144.29C433.414 1144.68 433.123 1144.97 432.771 1145.15C432.424 1145.34 432 1145.43 431.5 1145.43C430.832 1145.43 430.299 1145.24 429.9 1144.87C429.502 1144.49 429.303 1143.98 429.303 1143.35C429.303 1142.62 429.547 1142.06 430.035 1141.68C430.527 1141.31 431.248 1141.12 432.197 1141.12H433.645V1140.95C433.641 1140.42 433.508 1140.04 433.246 1139.81C432.984 1139.57 432.566 1139.45 431.992 1139.45C431.625 1139.45 431.254 1139.51 430.879 1139.61C430.504 1139.72 430.139 1139.87 429.783 1140.07V1139C430.182 1138.84 430.562 1138.73 430.926 1138.66C431.293 1138.58 431.648 1138.54 431.992 1138.54C432.535 1138.54 432.998 1138.62 433.381 1138.78C433.768 1138.94 434.08 1139.18 434.318 1139.5C434.467 1139.69 434.572 1139.94 434.635 1140.23C434.697 1140.51 434.729 1140.94 434.729 1141.51ZM441.912 1141.19V1145.26H440.828V1141.19C440.828 1140.6 440.725 1140.17 440.518 1139.89C440.311 1139.61 439.986 1139.48 439.545 1139.48C439.041 1139.48 438.652 1139.66 438.379 1140.01C438.109 1140.37 437.975 1140.88 437.975 1141.55V1145.26H436.896V1138.7H437.975V1139.68C438.166 1139.31 438.426 1139.02 438.754 1138.83C439.082 1138.64 439.471 1138.54 439.92 1138.54C440.588 1138.54 441.086 1138.76 441.414 1139.2C441.746 1139.64 441.912 1140.3 441.912 1141.19ZM448.012 1139.53V1136.14H449.09V1145.26H448.012V1144.43C447.832 1144.76 447.592 1145.01 447.291 1145.18C446.994 1145.34 446.65 1145.43 446.26 1145.43C445.467 1145.43 444.842 1145.12 444.385 1144.51C443.932 1143.89 443.705 1143.04 443.705 1141.96C443.705 1140.89 443.934 1140.06 444.391 1139.45C444.848 1138.84 445.471 1138.54 446.26 1138.54C446.654 1138.54 447.002 1138.62 447.303 1138.8C447.604 1138.96 447.84 1139.21 448.012 1139.53ZM444.842 1141.98C444.842 1142.82 444.975 1143.45 445.24 1143.88C445.506 1144.3 445.898 1144.51 446.418 1144.51C446.938 1144.51 447.332 1144.3 447.602 1143.87C447.875 1143.44 448.012 1142.81 448.012 1141.98C448.012 1141.15 447.875 1140.52 447.602 1140.1C447.332 1139.67 446.938 1139.45 446.418 1139.45C445.898 1139.45 445.506 1139.67 445.24 1140.09C444.975 1140.52 444.842 1141.15 444.842 1141.98ZM464.008 1141.44V1141.97H459.338V1142C459.307 1142.9 459.477 1143.54 459.848 1143.93C460.223 1144.32 460.75 1144.51 461.43 1144.51C461.773 1144.51 462.133 1144.46 462.508 1144.35C462.883 1144.24 463.283 1144.08 463.709 1143.85V1144.92C463.299 1145.09 462.902 1145.22 462.52 1145.3C462.141 1145.39 461.773 1145.43 461.418 1145.43C460.398 1145.43 459.602 1145.12 459.027 1144.51C458.453 1143.9 458.166 1143.06 458.166 1141.98C458.166 1140.94 458.447 1140.1 459.01 1139.48C459.572 1138.85 460.322 1138.54 461.26 1138.54C462.096 1138.54 462.754 1138.82 463.234 1139.39C463.719 1139.95 463.977 1140.64 464.008 1141.44ZM462.93 1141.12C462.883 1140.67 462.717 1140.28 462.432 1139.95C462.15 1139.62 461.744 1139.45 461.213 1139.45C460.693 1139.45 460.266 1139.62 459.93 1139.97C459.594 1140.31 459.41 1140.7 459.379 1141.13L462.93 1141.12ZM471.227 1138.7L468.877 1141.84L471.455 1145.26H470.207L468.285 1142.63L466.369 1145.26H465.121L467.699 1141.84L465.35 1138.7H466.545L468.285 1141.07L470.014 1138.7H471.227ZM475.504 1136.83V1138.7H477.953V1139.53H475.504V1143.1C475.504 1143.58 475.596 1143.92 475.779 1144.11C475.963 1144.3 476.283 1144.4 476.74 1144.4H477.953V1145.26H476.635C475.826 1145.26 475.256 1145.1 474.924 1144.77C474.592 1144.45 474.426 1143.89 474.426 1143.1V1139.53H472.674V1138.7H474.426V1136.83H475.504ZM485.699 1141.44V1141.97H481.029V1142C480.998 1142.9 481.168 1143.54 481.539 1143.93C481.914 1144.32 482.441 1144.51 483.121 1144.51C483.465 1144.51 483.824 1144.46 484.199 1144.35C484.574 1144.24 484.975 1144.08 485.4 1143.85V1144.92C484.99 1145.09 484.594 1145.22 484.211 1145.3C483.832 1145.39 483.465 1145.43 483.109 1145.43C482.09 1145.43 481.293 1145.12 480.719 1144.51C480.145 1143.9 479.857 1143.06 479.857 1141.98C479.857 1140.94 480.139 1140.1 480.701 1139.48C481.264 1138.85 482.014 1138.54 482.951 1138.54C483.787 1138.54 484.445 1138.82 484.926 1139.39C485.41 1139.95 485.668 1140.64 485.699 1141.44ZM484.621 1141.12C484.574 1140.67 484.408 1140.28 484.123 1139.95C483.842 1139.62 483.436 1139.45 482.904 1139.45C482.385 1139.45 481.957 1139.62 481.621 1139.97C481.285 1140.31 481.102 1140.7 481.07 1141.13L484.621 1141.12ZM492.525 1141.19V1145.26H491.441V1141.19C491.441 1140.6 491.338 1140.17 491.131 1139.89C490.924 1139.61 490.6 1139.48 490.158 1139.48C489.654 1139.48 489.266 1139.66 488.992 1140.01C488.723 1140.37 488.588 1140.88 488.588 1141.55V1145.26H487.51V1138.7H488.588V1139.68C488.779 1139.31 489.039 1139.02 489.367 1138.83C489.695 1138.64 490.084 1138.54 490.533 1138.54C491.201 1138.54 491.699 1138.76 492.027 1139.2C492.359 1139.64 492.525 1140.3 492.525 1141.19ZM499.299 1138.92V1139.98C498.99 1139.8 498.68 1139.67 498.367 1139.58C498.055 1139.49 497.736 1139.44 497.412 1139.44C496.924 1139.44 496.559 1139.52 496.316 1139.68C496.078 1139.84 495.959 1140.08 495.959 1140.4C495.959 1140.69 496.049 1140.91 496.229 1141.06C496.408 1141.2 496.855 1141.34 497.57 1141.48L498.004 1141.56C498.539 1141.66 498.943 1141.87 499.217 1142.17C499.494 1142.48 499.633 1142.87 499.633 1143.36C499.633 1144.01 499.402 1144.52 498.941 1144.88C498.48 1145.25 497.84 1145.43 497.02 1145.43C496.695 1145.43 496.355 1145.39 496 1145.32C495.645 1145.26 495.26 1145.16 494.846 1145.02V1143.91C495.248 1144.11 495.633 1144.27 496 1144.37C496.367 1144.48 496.715 1144.53 497.043 1144.53C497.52 1144.53 497.889 1144.43 498.15 1144.24C498.412 1144.04 498.543 1143.77 498.543 1143.42C498.543 1142.92 498.064 1142.58 497.107 1142.39L497.061 1142.38L496.656 1142.29C496.035 1142.17 495.582 1141.97 495.297 1141.68C495.012 1141.4 494.869 1141 494.869 1140.51C494.869 1139.88 495.082 1139.39 495.508 1139.05C495.934 1138.71 496.541 1138.54 497.33 1138.54C497.682 1138.54 498.02 1138.57 498.344 1138.64C498.668 1138.7 498.986 1138.8 499.299 1138.92ZM502.68 1138.72H505.439V1144.42H507.578V1145.26H502.223V1144.42H504.361V1139.56H502.68V1138.72ZM504.361 1136.17H505.439V1137.53H504.361V1136.17ZM513.438 1141.98C513.438 1141.15 513.305 1140.52 513.039 1140.09C512.773 1139.67 512.381 1139.45 511.861 1139.45C511.338 1139.45 510.941 1139.67 510.672 1140.1C510.402 1140.52 510.268 1141.15 510.268 1141.98C510.268 1142.81 510.402 1143.44 510.672 1143.87C510.941 1144.3 511.338 1144.51 511.861 1144.51C512.381 1144.51 512.773 1144.3 513.039 1143.88C513.305 1143.45 513.438 1142.82 513.438 1141.98ZM510.268 1139.53C510.439 1139.21 510.676 1138.97 510.977 1138.8C511.281 1138.62 511.633 1138.54 512.031 1138.54C512.82 1138.54 513.441 1138.84 513.895 1139.45C514.348 1140.06 514.574 1140.89 514.574 1141.96C514.574 1143.04 514.346 1143.89 513.889 1144.51C513.436 1145.12 512.812 1145.43 512.02 1145.43C511.629 1145.43 511.283 1145.34 510.982 1145.18C510.686 1145.01 510.447 1144.76 510.268 1144.43V1145.26H509.189V1136.14H510.268V1139.53ZM517.141 1138.72H519.9V1144.42H522.039V1145.26H516.684V1144.42H518.822V1139.56H517.141V1138.72ZM518.822 1136.17H519.9V1137.53H518.822V1136.17ZM526.732 1142.89C526.732 1143.37 526.82 1143.74 526.996 1143.98C527.176 1144.23 527.439 1144.35 527.787 1144.35H529.047V1145.26H527.682C527.037 1145.26 526.537 1145.05 526.182 1144.64C525.83 1144.23 525.654 1143.64 525.654 1142.89V1136.95H523.926V1136.11H526.732V1142.89ZM531.602 1138.72H534.361V1144.42H536.5V1145.26H531.145V1144.42H533.283V1139.56H531.602V1138.72ZM533.283 1136.17H534.361V1137.53H533.283V1136.17ZM540.578 1136.83V1138.7H543.027V1139.53H540.578V1143.1C540.578 1143.58 540.67 1143.92 540.854 1144.11C541.037 1144.3 541.357 1144.4 541.814 1144.4H543.027V1145.26H541.709C540.9 1145.26 540.33 1145.1 539.998 1144.77C539.666 1144.45 539.5 1143.89 539.5 1143.1V1139.53H537.748V1138.7H539.5V1136.83H540.578ZM549.238 1143.15C549.059 1143.61 548.83 1144.21 548.553 1144.95C548.166 1145.99 547.906 1146.61 547.773 1146.84C547.594 1147.15 547.369 1147.37 547.1 1147.53C546.83 1147.68 546.516 1147.76 546.156 1147.76H545.289V1146.85H545.928C546.244 1146.85 546.492 1146.76 546.672 1146.58C546.852 1146.39 547.08 1145.92 547.357 1145.15L544.82 1138.7H545.963L547.908 1143.83L549.824 1138.7H550.967L549.238 1143.15ZM560.523 1138.72H563.283V1144.42H565.422V1145.26H560.066V1144.42H562.205V1139.56H560.523V1138.72ZM562.205 1136.17H563.283V1137.53H562.205V1136.17ZM572.061 1141.19V1145.26H570.977V1141.19C570.977 1140.6 570.873 1140.17 570.666 1139.89C570.459 1139.61 570.135 1139.48 569.693 1139.48C569.189 1139.48 568.801 1139.66 568.527 1140.01C568.258 1140.37 568.123 1140.88 568.123 1141.55V1145.26H567.045V1138.7H568.123V1139.68C568.314 1139.31 568.574 1139.02 568.902 1138.83C569.23 1138.64 569.619 1138.54 570.068 1138.54C570.736 1138.54 571.234 1138.76 571.562 1139.2C571.895 1139.64 572.061 1140.3 572.061 1141.19ZM583.973 1144.26L586.029 1136.51H587.254L584.693 1145.26H583.258L580.697 1136.51H581.922L583.973 1144.26ZM593.523 1136.81V1138.01C593.164 1137.78 592.803 1137.61 592.439 1137.49C592.08 1137.37 591.717 1137.31 591.35 1137.31C590.791 1137.31 590.35 1137.44 590.025 1137.71C589.701 1137.96 589.539 1138.31 589.539 1138.76C589.539 1139.14 589.645 1139.44 589.855 1139.64C590.07 1139.84 590.469 1140.01 591.051 1140.15L591.672 1140.29C592.492 1140.48 593.09 1140.78 593.465 1141.19C593.84 1141.6 594.027 1142.16 594.027 1142.87C594.027 1143.7 593.77 1144.34 593.254 1144.77C592.738 1145.21 591.988 1145.43 591.004 1145.43C590.594 1145.43 590.182 1145.38 589.768 1145.29C589.354 1145.21 588.938 1145.08 588.52 1144.9V1143.64C588.969 1143.93 589.393 1144.14 589.791 1144.27C590.193 1144.4 590.598 1144.47 591.004 1144.47C591.602 1144.47 592.066 1144.34 592.398 1144.07C592.73 1143.8 592.896 1143.42 592.896 1142.94C592.896 1142.51 592.781 1142.17 592.551 1141.94C592.324 1141.71 591.928 1141.53 591.361 1141.41L590.729 1141.26C589.916 1141.08 589.326 1140.8 588.959 1140.43C588.592 1140.06 588.408 1139.56 588.408 1138.94C588.408 1138.16 588.67 1137.53 589.193 1137.06C589.721 1136.59 590.42 1136.35 591.291 1136.35C591.627 1136.35 591.98 1136.39 592.352 1136.47C592.723 1136.54 593.113 1136.66 593.523 1136.81ZM608.342 1144.95C608.041 1145.11 607.732 1145.23 607.416 1145.31C607.1 1145.39 606.764 1145.43 606.408 1145.43C605.287 1145.43 604.416 1145.03 603.795 1144.24C603.178 1143.45 602.869 1142.33 602.869 1140.89C602.869 1139.46 603.18 1138.35 603.801 1137.55C604.426 1136.75 605.295 1136.35 606.408 1136.35C606.764 1136.35 607.1 1136.39 607.416 1136.48C607.732 1136.55 608.041 1136.67 608.342 1136.83V1138.05C608.053 1137.81 607.742 1137.63 607.41 1137.5C607.078 1137.38 606.744 1137.31 606.408 1137.31C605.639 1137.31 605.062 1137.61 604.68 1138.2C604.297 1138.8 604.105 1139.69 604.105 1140.89C604.105 1142.09 604.297 1142.98 604.68 1143.58C605.062 1144.17 605.639 1144.47 606.408 1144.47C606.752 1144.47 607.088 1144.41 607.416 1144.28C607.748 1144.16 608.057 1143.97 608.342 1143.74V1144.95ZM612.895 1139.45C612.348 1139.45 611.934 1139.67 611.652 1140.09C611.371 1140.52 611.23 1141.15 611.23 1141.98C611.23 1142.82 611.371 1143.45 611.652 1143.88C611.934 1144.3 612.348 1144.51 612.895 1144.51C613.445 1144.51 613.861 1144.3 614.143 1143.88C614.424 1143.45 614.564 1142.82 614.564 1141.98C614.564 1141.15 614.424 1140.52 614.143 1140.09C613.861 1139.67 613.445 1139.45 612.895 1139.45ZM612.895 1138.54C613.805 1138.54 614.5 1138.83 614.98 1139.42C615.465 1140.01 615.707 1140.87 615.707 1141.98C615.707 1143.1 615.467 1143.96 614.986 1144.55C614.506 1145.14 613.809 1145.43 612.895 1145.43C611.984 1145.43 611.289 1145.14 610.809 1144.55C610.328 1143.96 610.088 1143.1 610.088 1141.98C610.088 1140.87 610.328 1140.01 610.809 1139.42C611.289 1138.83 611.984 1138.54 612.895 1138.54ZM621.543 1139.53V1136.14H622.621V1145.26H621.543V1144.43C621.363 1144.76 621.123 1145.01 620.822 1145.18C620.525 1145.34 620.182 1145.43 619.791 1145.43C618.998 1145.43 618.373 1145.12 617.916 1144.51C617.463 1143.89 617.236 1143.04 617.236 1141.96C617.236 1140.89 617.465 1140.06 617.922 1139.45C618.379 1138.84 619.002 1138.54 619.791 1138.54C620.186 1138.54 620.533 1138.62 620.834 1138.8C621.135 1138.96 621.371 1139.21 621.543 1139.53ZM618.373 1141.98C618.373 1142.82 618.506 1143.45 618.771 1143.88C619.037 1144.3 619.43 1144.51 619.949 1144.51C620.469 1144.51 620.863 1144.3 621.133 1143.87C621.406 1143.44 621.543 1142.81 621.543 1141.98C621.543 1141.15 621.406 1140.52 621.133 1140.1C620.863 1139.67 620.469 1139.45 619.949 1139.45C619.43 1139.45 619.037 1139.67 618.771 1140.09C618.506 1140.52 618.373 1141.15 618.373 1141.98ZM630.309 1141.44V1141.97H625.639V1142C625.607 1142.9 625.777 1143.54 626.148 1143.93C626.523 1144.32 627.051 1144.51 627.73 1144.51C628.074 1144.51 628.434 1144.46 628.809 1144.35C629.184 1144.24 629.584 1144.08 630.01 1143.85V1144.92C629.6 1145.09 629.203 1145.22 628.82 1145.3C628.441 1145.39 628.074 1145.43 627.719 1145.43C626.699 1145.43 625.902 1145.12 625.328 1144.51C624.754 1143.9 624.467 1143.06 624.467 1141.98C624.467 1140.94 624.748 1140.1 625.311 1139.48C625.873 1138.85 626.623 1138.54 627.561 1138.54C628.396 1138.54 629.055 1138.82 629.535 1139.39C630.02 1139.95 630.277 1140.64 630.309 1141.44ZM629.23 1141.12C629.184 1140.67 629.018 1140.28 628.732 1139.95C628.451 1139.62 628.045 1139.45 627.514 1139.45C626.994 1139.45 626.566 1139.62 626.23 1139.97C625.895 1140.31 625.711 1140.7 625.68 1141.13L629.23 1141.12ZM636.514 1136.19V1139.78H635.201V1136.19H636.514ZM633.391 1136.19V1139.78H632.078V1136.19H633.391ZM209.916 1154.19V1157.78H208.604V1154.19H209.916ZM206.793 1154.19V1157.78H205.48V1154.19H206.793ZM216.818 1154.51H217.932L213.326 1164.37H212.207L216.818 1154.51ZM220.691 1156.72H223.451V1162.42H225.59V1163.26H220.234V1162.42H222.373V1157.56H220.691V1156.72ZM222.373 1154.17H223.451V1155.53H222.373V1154.17ZM230.031 1157.36C230.164 1157.08 230.332 1156.88 230.535 1156.74C230.742 1156.61 230.99 1156.54 231.279 1156.54C231.807 1156.54 232.178 1156.74 232.393 1157.15C232.611 1157.56 232.721 1158.33 232.721 1159.46V1163.26H231.736V1159.5C231.736 1158.58 231.684 1158 231.578 1157.78C231.477 1157.55 231.289 1157.44 231.016 1157.44C230.703 1157.44 230.488 1157.56 230.371 1157.8C230.258 1158.04 230.201 1158.61 230.201 1159.5V1163.26H229.217V1159.5C229.217 1158.57 229.16 1157.99 229.047 1157.77C228.938 1157.55 228.738 1157.44 228.449 1157.44C228.164 1157.44 227.965 1157.56 227.852 1157.8C227.742 1158.04 227.688 1158.61 227.688 1159.5V1163.26H226.709V1156.7H227.688V1157.26C227.816 1157.02 227.977 1156.85 228.168 1156.73C228.363 1156.6 228.584 1156.54 228.83 1156.54C229.127 1156.54 229.373 1156.61 229.568 1156.74C229.768 1156.88 229.922 1157.09 230.031 1157.36ZM237.414 1159.96H237.057C236.428 1159.96 235.953 1160.07 235.633 1160.29C235.316 1160.51 235.158 1160.84 235.158 1161.28C235.158 1161.67 235.277 1161.98 235.516 1162.2C235.754 1162.42 236.084 1162.53 236.506 1162.53C237.1 1162.53 237.566 1162.32 237.906 1161.91C238.246 1161.5 238.418 1160.93 238.422 1160.2V1159.96H237.414ZM239.506 1159.51V1163.26H238.422V1162.29C238.191 1162.68 237.9 1162.97 237.549 1163.15C237.201 1163.34 236.777 1163.43 236.277 1163.43C235.609 1163.43 235.076 1163.24 234.678 1162.87C234.279 1162.49 234.08 1161.98 234.08 1161.35C234.08 1160.62 234.324 1160.06 234.812 1159.68C235.305 1159.31 236.025 1159.12 236.975 1159.12H238.422V1158.95C238.418 1158.42 238.285 1158.04 238.023 1157.81C237.762 1157.57 237.344 1157.45 236.77 1157.45C236.402 1157.45 236.031 1157.51 235.656 1157.61C235.281 1157.72 234.916 1157.87 234.561 1158.07V1157C234.959 1156.84 235.34 1156.73 235.703 1156.66C236.07 1156.58 236.426 1156.54 236.77 1156.54C237.312 1156.54 237.775 1156.62 238.158 1156.78C238.545 1156.94 238.857 1157.18 239.096 1157.5C239.244 1157.69 239.35 1157.94 239.412 1158.23C239.475 1158.51 239.506 1158.94 239.506 1159.51ZM245.559 1159.92C245.559 1159.12 245.426 1158.5 245.16 1158.09C244.898 1157.66 244.516 1157.45 244.012 1157.45C243.484 1157.45 243.082 1157.66 242.805 1158.09C242.527 1158.5 242.389 1159.12 242.389 1159.92C242.389 1160.73 242.527 1161.35 242.805 1161.78C243.086 1162.2 243.492 1162.41 244.023 1162.41C244.52 1162.41 244.898 1162.2 245.16 1161.77C245.426 1161.34 245.559 1160.73 245.559 1159.92ZM246.637 1162.84C246.637 1163.82 246.404 1164.57 245.939 1165.08C245.475 1165.58 244.791 1165.84 243.889 1165.84C243.592 1165.84 243.281 1165.81 242.957 1165.76C242.633 1165.7 242.309 1165.62 241.984 1165.51V1164.45C242.367 1164.63 242.715 1164.76 243.027 1164.85C243.34 1164.93 243.627 1164.98 243.889 1164.98C244.471 1164.98 244.895 1164.82 245.16 1164.5C245.426 1164.18 245.559 1163.68 245.559 1163V1162.95V1162.22C245.387 1162.58 245.152 1162.86 244.855 1163.04C244.559 1163.22 244.197 1163.31 243.771 1163.31C243.006 1163.31 242.395 1163 241.938 1162.39C241.48 1161.77 241.252 1160.95 241.252 1159.92C241.252 1158.89 241.48 1158.07 241.938 1157.46C242.395 1156.84 243.006 1156.54 243.771 1156.54C244.193 1156.54 244.551 1156.62 244.844 1156.79C245.137 1156.96 245.375 1157.22 245.559 1157.57V1156.72H246.637V1162.84ZM254.324 1159.44V1159.97H249.654V1160C249.623 1160.9 249.793 1161.54 250.164 1161.93C250.539 1162.32 251.066 1162.51 251.746 1162.51C252.09 1162.51 252.449 1162.46 252.824 1162.35C253.199 1162.24 253.6 1162.08 254.025 1161.85V1162.92C253.615 1163.09 253.219 1163.22 252.836 1163.3C252.457 1163.39 252.09 1163.43 251.734 1163.43C250.715 1163.43 249.918 1163.12 249.344 1162.51C248.77 1161.9 248.482 1161.06 248.482 1159.98C248.482 1158.94 248.764 1158.1 249.326 1157.48C249.889 1156.85 250.639 1156.54 251.576 1156.54C252.412 1156.54 253.07 1156.82 253.551 1157.39C254.035 1157.95 254.293 1158.64 254.324 1159.44ZM253.246 1159.12C253.199 1158.67 253.033 1158.28 252.748 1157.95C252.467 1157.62 252.061 1157.45 251.529 1157.45C251.01 1157.45 250.582 1157.62 250.246 1157.97C249.91 1158.31 249.727 1158.7 249.695 1159.13L253.246 1159.12ZM260.693 1156.92V1157.98C260.385 1157.8 260.074 1157.67 259.762 1157.58C259.449 1157.49 259.131 1157.44 258.807 1157.44C258.318 1157.44 257.953 1157.52 257.711 1157.68C257.473 1157.84 257.354 1158.08 257.354 1158.4C257.354 1158.69 257.443 1158.91 257.623 1159.06C257.803 1159.2 258.25 1159.34 258.965 1159.48L259.398 1159.56C259.934 1159.66 260.338 1159.87 260.611 1160.17C260.889 1160.48 261.027 1160.87 261.027 1161.36C261.027 1162.01 260.797 1162.52 260.336 1162.88C259.875 1163.25 259.234 1163.43 258.414 1163.43C258.09 1163.43 257.75 1163.39 257.395 1163.32C257.039 1163.26 256.654 1163.16 256.24 1163.02V1161.91C256.643 1162.11 257.027 1162.27 257.395 1162.37C257.762 1162.48 258.109 1162.53 258.438 1162.53C258.914 1162.53 259.283 1162.43 259.545 1162.24C259.807 1162.04 259.938 1161.77 259.938 1161.42C259.938 1160.92 259.459 1160.58 258.502 1160.39L258.455 1160.38L258.051 1160.29C257.43 1160.17 256.977 1159.97 256.691 1159.68C256.406 1159.4 256.264 1159 256.264 1158.51C256.264 1157.88 256.477 1157.39 256.902 1157.05C257.328 1156.71 257.936 1156.54 258.725 1156.54C259.076 1156.54 259.414 1156.57 259.738 1156.64C260.062 1156.7 260.381 1156.8 260.693 1156.92ZM267.432 1154.51H268.545L263.939 1164.37H262.82L267.432 1154.51ZM275.67 1162.92C275.381 1163.09 275.082 1163.22 274.773 1163.3C274.469 1163.39 274.156 1163.43 273.836 1163.43C272.82 1163.43 272.025 1163.12 271.451 1162.51C270.881 1161.91 270.596 1161.06 270.596 1159.98C270.596 1158.91 270.881 1158.06 271.451 1157.45C272.025 1156.84 272.82 1156.54 273.836 1156.54C274.152 1156.54 274.461 1156.58 274.762 1156.66C275.062 1156.74 275.365 1156.87 275.67 1157.04V1158.17C275.385 1157.92 275.098 1157.74 274.809 1157.62C274.523 1157.51 274.199 1157.45 273.836 1157.45C273.16 1157.45 272.641 1157.67 272.277 1158.11C271.914 1158.55 271.732 1159.17 271.732 1159.98C271.732 1160.79 271.914 1161.42 272.277 1161.86C272.645 1162.3 273.164 1162.51 273.836 1162.51C274.211 1162.51 274.547 1162.46 274.844 1162.34C275.141 1162.23 275.416 1162.05 275.67 1161.81V1162.92ZM280.293 1157.45C279.746 1157.45 279.332 1157.67 279.051 1158.09C278.77 1158.52 278.629 1159.15 278.629 1159.98C278.629 1160.82 278.77 1161.45 279.051 1161.88C279.332 1162.3 279.746 1162.51 280.293 1162.51C280.844 1162.51 281.26 1162.3 281.541 1161.88C281.822 1161.45 281.963 1160.82 281.963 1159.98C281.963 1159.15 281.822 1158.52 281.541 1158.09C281.26 1157.67 280.844 1157.45 280.293 1157.45ZM280.293 1156.54C281.203 1156.54 281.898 1156.83 282.379 1157.42C282.863 1158.01 283.105 1158.87 283.105 1159.98C283.105 1161.1 282.865 1161.96 282.385 1162.55C281.904 1163.14 281.207 1163.43 280.293 1163.43C279.383 1163.43 278.688 1163.14 278.207 1162.55C277.727 1161.96 277.486 1161.1 277.486 1159.98C277.486 1158.87 277.727 1158.01 278.207 1157.42C278.688 1156.83 279.383 1156.54 280.293 1156.54ZM286.111 1162.43V1165.76H285.027V1156.7H286.111V1157.53C286.291 1157.21 286.529 1156.96 286.826 1156.8C287.127 1156.62 287.473 1156.54 287.863 1156.54C288.656 1156.54 289.277 1156.84 289.727 1157.46C290.18 1158.07 290.406 1158.92 290.406 1160.01C290.406 1161.07 290.18 1161.91 289.727 1162.52C289.273 1163.13 288.652 1163.43 287.863 1163.43C287.465 1163.43 287.115 1163.34 286.814 1163.18C286.518 1163.01 286.283 1162.76 286.111 1162.43ZM289.275 1159.98C289.275 1159.15 289.143 1158.52 288.877 1158.09C288.615 1157.67 288.225 1157.45 287.705 1157.45C287.182 1157.45 286.785 1157.67 286.516 1158.1C286.246 1158.52 286.111 1159.15 286.111 1159.98C286.111 1160.81 286.246 1161.44 286.516 1161.87C286.785 1162.3 287.182 1162.51 287.705 1162.51C288.225 1162.51 288.615 1162.3 288.877 1161.88C289.143 1161.45 289.275 1160.82 289.275 1159.98ZM292.996 1156.72H295.756V1162.42H297.895V1163.26H292.539V1162.42H294.678V1157.56H292.996V1156.72ZM294.678 1154.17H295.756V1155.53H294.678V1154.17ZM302.588 1160.89C302.588 1161.37 302.676 1161.74 302.852 1161.98C303.031 1162.23 303.295 1162.35 303.643 1162.35H304.902V1163.26H303.537C302.893 1163.26 302.393 1163.05 302.037 1162.64C301.686 1162.23 301.51 1161.64 301.51 1160.89V1154.95H299.781V1154.11H302.588V1160.89ZM309.215 1157.45C308.668 1157.45 308.254 1157.67 307.973 1158.09C307.691 1158.52 307.551 1159.15 307.551 1159.98C307.551 1160.82 307.691 1161.45 307.973 1161.88C308.254 1162.3 308.668 1162.51 309.215 1162.51C309.766 1162.51 310.182 1162.3 310.463 1161.88C310.744 1161.45 310.885 1160.82 310.885 1159.98C310.885 1159.15 310.744 1158.52 310.463 1158.09C310.182 1157.67 309.766 1157.45 309.215 1157.45ZM309.215 1156.54C310.125 1156.54 310.82 1156.83 311.301 1157.42C311.785 1158.01 312.027 1158.87 312.027 1159.98C312.027 1161.1 311.787 1161.96 311.307 1162.55C310.826 1163.14 310.129 1163.43 309.215 1163.43C308.305 1163.43 307.609 1163.14 307.129 1162.55C306.648 1161.96 306.408 1161.1 306.408 1159.98C306.408 1158.87 306.648 1158.01 307.129 1157.42C307.609 1156.83 308.305 1156.54 309.215 1156.54ZM316.434 1154.83V1156.7H318.883V1157.53H316.434V1161.1C316.434 1161.58 316.525 1161.92 316.709 1162.11C316.893 1162.3 317.213 1162.4 317.67 1162.4H318.883V1163.26H317.564C316.756 1163.26 316.186 1163.1 315.854 1162.77C315.521 1162.45 315.355 1161.89 315.355 1161.1V1157.53H313.604V1156.7H315.355V1154.83H316.434ZM320.664 1159.02H326.875V1160.01H320.664V1159.02ZM333.514 1162.92C333.225 1163.09 332.926 1163.22 332.617 1163.3C332.312 1163.39 332 1163.43 331.68 1163.43C330.664 1163.43 329.869 1163.12 329.295 1162.51C328.725 1161.91 328.439 1161.06 328.439 1159.98C328.439 1158.91 328.725 1158.06 329.295 1157.45C329.869 1156.84 330.664 1156.54 331.68 1156.54C331.996 1156.54 332.305 1156.58 332.605 1156.66C332.906 1156.74 333.209 1156.87 333.514 1157.04V1158.17C333.229 1157.92 332.941 1157.74 332.652 1157.62C332.367 1157.51 332.043 1157.45 331.68 1157.45C331.004 1157.45 330.484 1157.67 330.121 1158.11C329.758 1158.55 329.576 1159.17 329.576 1159.98C329.576 1160.79 329.758 1161.42 330.121 1161.86C330.488 1162.3 331.008 1162.51 331.68 1162.51C332.055 1162.51 332.391 1162.46 332.688 1162.34C332.984 1162.23 333.26 1162.05 333.514 1161.81V1162.92ZM340.686 1159.19V1163.26H339.602V1159.19C339.602 1158.6 339.498 1158.17 339.291 1157.89C339.084 1157.61 338.76 1157.48 338.318 1157.48C337.814 1157.48 337.426 1157.66 337.152 1158.01C336.883 1158.37 336.748 1158.88 336.748 1159.55V1163.26H335.67V1154.14H336.748V1157.68C336.939 1157.31 337.199 1157.02 337.527 1156.83C337.855 1156.64 338.244 1156.54 338.693 1156.54C339.361 1156.54 339.859 1156.76 340.188 1157.2C340.52 1157.64 340.686 1158.3 340.686 1159.19ZM345.871 1159.96H345.514C344.885 1159.96 344.41 1160.07 344.09 1160.29C343.773 1160.51 343.615 1160.84 343.615 1161.28C343.615 1161.67 343.734 1161.98 343.973 1162.2C344.211 1162.42 344.541 1162.53 344.963 1162.53C345.557 1162.53 346.023 1162.32 346.363 1161.91C346.703 1161.5 346.875 1160.93 346.879 1160.2V1159.96H345.871ZM347.963 1159.51V1163.26H346.879V1162.29C346.648 1162.68 346.357 1162.97 346.006 1163.15C345.658 1163.34 345.234 1163.43 344.734 1163.43C344.066 1163.43 343.533 1163.24 343.135 1162.87C342.736 1162.49 342.537 1161.98 342.537 1161.35C342.537 1160.62 342.781 1160.06 343.27 1159.68C343.762 1159.31 344.482 1159.12 345.432 1159.12H346.879V1158.95C346.875 1158.42 346.742 1158.04 346.48 1157.81C346.219 1157.57 345.801 1157.45 345.227 1157.45C344.859 1157.45 344.488 1157.51 344.113 1157.61C343.738 1157.72 343.373 1157.87 343.018 1158.07V1157C343.416 1156.84 343.797 1156.73 344.16 1156.66C344.527 1156.58 344.883 1156.54 345.227 1156.54C345.77 1156.54 346.232 1156.62 346.615 1156.78C347.002 1156.94 347.314 1157.18 347.553 1157.5C347.701 1157.69 347.807 1157.94 347.869 1158.23C347.932 1158.51 347.963 1158.94 347.963 1159.51ZM352.586 1154.83V1156.7H355.035V1157.53H352.586V1161.1C352.586 1161.58 352.678 1161.92 352.861 1162.11C353.045 1162.3 353.365 1162.4 353.822 1162.4H355.035V1163.26H353.717C352.908 1163.26 352.338 1163.1 352.006 1162.77C351.674 1162.45 351.508 1161.89 351.508 1161.1V1157.53H349.756V1156.7H351.508V1154.83H352.586ZM358.498 1160.89H360.561V1163.26H358.498V1160.89ZM365.646 1162.43V1165.76H364.562V1156.7H365.646V1157.53C365.826 1157.21 366.064 1156.96 366.361 1156.8C366.662 1156.62 367.008 1156.54 367.398 1156.54C368.191 1156.54 368.812 1156.84 369.262 1157.46C369.715 1158.07 369.941 1158.92 369.941 1160.01C369.941 1161.07 369.715 1161.91 369.262 1162.52C368.809 1163.13 368.188 1163.43 367.398 1163.43C367 1163.43 366.65 1163.34 366.35 1163.18C366.053 1163.01 365.818 1162.76 365.646 1162.43ZM368.811 1159.98C368.811 1159.15 368.678 1158.52 368.412 1158.09C368.15 1157.67 367.76 1157.45 367.24 1157.45C366.717 1157.45 366.32 1157.67 366.051 1158.1C365.781 1158.52 365.646 1159.15 365.646 1159.98C365.646 1160.81 365.781 1161.44 366.051 1161.87C366.32 1162.3 366.717 1162.51 367.24 1162.51C367.76 1162.51 368.15 1162.3 368.412 1161.88C368.678 1161.45 368.811 1160.82 368.811 1159.98ZM376.838 1159.19V1163.26H375.754V1159.19C375.754 1158.6 375.65 1158.17 375.443 1157.89C375.236 1157.61 374.912 1157.48 374.471 1157.48C373.967 1157.48 373.578 1157.66 373.305 1158.01C373.035 1158.37 372.9 1158.88 372.9 1159.55V1163.26H371.822V1156.7H372.9V1157.68C373.092 1157.31 373.352 1157.02 373.68 1156.83C374.008 1156.64 374.396 1156.54 374.846 1156.54C375.514 1156.54 376.012 1156.76 376.34 1157.2C376.672 1157.64 376.838 1158.3 376.838 1159.19ZM382.938 1159.92C382.938 1159.12 382.805 1158.5 382.539 1158.09C382.277 1157.66 381.895 1157.45 381.391 1157.45C380.863 1157.45 380.461 1157.66 380.184 1158.09C379.906 1158.5 379.768 1159.12 379.768 1159.92C379.768 1160.73 379.906 1161.35 380.184 1161.78C380.465 1162.2 380.871 1162.41 381.402 1162.41C381.898 1162.41 382.277 1162.2 382.539 1161.77C382.805 1161.34 382.938 1160.73 382.938 1159.92ZM384.016 1162.84C384.016 1163.82 383.783 1164.57 383.318 1165.08C382.854 1165.58 382.17 1165.84 381.268 1165.84C380.971 1165.84 380.66 1165.81 380.336 1165.76C380.012 1165.7 379.688 1165.62 379.363 1165.51V1164.45C379.746 1164.63 380.094 1164.76 380.406 1164.85C380.719 1164.93 381.006 1164.98 381.268 1164.98C381.85 1164.98 382.273 1164.82 382.539 1164.5C382.805 1164.18 382.938 1163.68 382.938 1163V1162.95V1162.22C382.766 1162.58 382.531 1162.86 382.234 1163.04C381.938 1163.22 381.576 1163.31 381.15 1163.31C380.385 1163.31 379.773 1163 379.316 1162.39C378.859 1161.77 378.631 1160.95 378.631 1159.92C378.631 1158.89 378.859 1158.07 379.316 1157.46C379.773 1156.84 380.385 1156.54 381.15 1156.54C381.572 1156.54 381.93 1156.62 382.223 1156.79C382.516 1156.96 382.754 1157.22 382.938 1157.57V1156.72H384.016V1162.84ZM390.678 1154.19V1157.78H389.365V1154.19H390.678ZM387.555 1154.19V1157.78H386.242V1154.19H387.555ZM180.994 1172.19V1175.78H179.682V1172.19H180.994ZM177.871 1172.19V1175.78H176.559V1172.19H177.871ZM187.896 1172.51H189.01L184.404 1182.37H183.285L187.896 1172.51ZM192.115 1180.43V1183.76H191.031V1174.7H192.115V1175.53C192.295 1175.21 192.533 1174.96 192.83 1174.8C193.131 1174.62 193.477 1174.54 193.867 1174.54C194.66 1174.54 195.281 1174.84 195.73 1175.46C196.184 1176.07 196.41 1176.92 196.41 1178.01C196.41 1179.07 196.184 1179.91 195.73 1180.52C195.277 1181.13 194.656 1181.43 193.867 1181.43C193.469 1181.43 193.119 1181.34 192.818 1181.18C192.521 1181.01 192.287 1180.76 192.115 1180.43ZM195.279 1177.98C195.279 1177.15 195.146 1176.52 194.881 1176.09C194.619 1175.67 194.229 1175.45 193.709 1175.45C193.186 1175.45 192.789 1175.67 192.52 1176.1C192.25 1176.52 192.115 1177.15 192.115 1177.98C192.115 1178.81 192.25 1179.44 192.52 1179.87C192.789 1180.3 193.186 1180.51 193.709 1180.51C194.229 1180.51 194.619 1180.3 194.881 1179.88C195.146 1179.45 195.279 1178.82 195.279 1177.98ZM203.916 1176.05C203.686 1175.87 203.451 1175.74 203.213 1175.66C202.975 1175.58 202.713 1175.53 202.428 1175.53C201.756 1175.53 201.242 1175.75 200.887 1176.17C200.531 1176.59 200.354 1177.2 200.354 1178V1181.26H199.27V1174.7H200.354V1175.98C200.533 1175.51 200.809 1175.16 201.18 1174.91C201.555 1174.66 201.998 1174.54 202.51 1174.54C202.775 1174.54 203.023 1174.57 203.254 1174.64C203.484 1174.7 203.705 1174.81 203.916 1174.95V1176.05ZM207.988 1175.45C207.441 1175.45 207.027 1175.67 206.746 1176.09C206.465 1176.52 206.324 1177.15 206.324 1177.98C206.324 1178.82 206.465 1179.45 206.746 1179.88C207.027 1180.3 207.441 1180.51 207.988 1180.51C208.539 1180.51 208.955 1180.3 209.236 1179.88C209.518 1179.45 209.658 1178.82 209.658 1177.98C209.658 1177.15 209.518 1176.52 209.236 1176.09C208.955 1175.67 208.539 1175.45 207.988 1175.45ZM207.988 1174.54C208.898 1174.54 209.594 1174.83 210.074 1175.42C210.559 1176.01 210.801 1176.87 210.801 1177.98C210.801 1179.1 210.561 1179.96 210.08 1180.55C209.6 1181.14 208.902 1181.43 207.988 1181.43C207.078 1181.43 206.383 1181.14 205.902 1180.55C205.422 1179.96 205.182 1179.1 205.182 1177.98C205.182 1176.87 205.422 1176.01 205.902 1175.42C206.383 1174.83 207.078 1174.54 207.988 1174.54ZM215.125 1181.38V1175.53H213.268V1174.7H216.203V1181.38C216.203 1182.14 216.027 1182.72 215.676 1183.13C215.328 1183.55 214.832 1183.76 214.188 1183.76H212.699V1182.84H214.07C214.422 1182.84 214.686 1182.72 214.861 1182.47C215.037 1182.23 215.125 1181.86 215.125 1181.38ZM215.125 1172.14H216.203V1173.51H215.125V1172.14ZM225.402 1177.44V1177.97H220.732V1178C220.701 1178.9 220.871 1179.54 221.242 1179.93C221.617 1180.32 222.145 1180.51 222.824 1180.51C223.168 1180.51 223.527 1180.46 223.902 1180.35C224.277 1180.24 224.678 1180.08 225.104 1179.85V1180.92C224.693 1181.09 224.297 1181.22 223.914 1181.3C223.535 1181.39 223.168 1181.43 222.812 1181.43C221.793 1181.43 220.996 1181.12 220.422 1180.51C219.848 1179.9 219.561 1179.06 219.561 1177.98C219.561 1176.94 219.842 1176.1 220.404 1175.48C220.967 1174.85 221.717 1174.54 222.654 1174.54C223.49 1174.54 224.148 1174.82 224.629 1175.39C225.113 1175.95 225.371 1176.64 225.402 1177.44ZM224.324 1177.12C224.277 1176.67 224.111 1176.28 223.826 1175.95C223.545 1175.62 223.139 1175.45 222.607 1175.45C222.088 1175.45 221.66 1175.62 221.324 1175.97C220.988 1176.31 220.805 1176.7 220.773 1177.13L224.324 1177.12ZM232.287 1180.92C231.998 1181.09 231.699 1181.22 231.391 1181.3C231.086 1181.39 230.773 1181.43 230.453 1181.43C229.438 1181.43 228.643 1181.12 228.068 1180.51C227.498 1179.91 227.213 1179.06 227.213 1177.98C227.213 1176.91 227.498 1176.06 228.068 1175.45C228.643 1174.84 229.438 1174.54 230.453 1174.54C230.77 1174.54 231.078 1174.58 231.379 1174.66C231.68 1174.74 231.982 1174.87 232.287 1175.04V1176.17C232.002 1175.92 231.715 1175.74 231.426 1175.62C231.141 1175.51 230.816 1175.45 230.453 1175.45C229.777 1175.45 229.258 1175.67 228.895 1176.11C228.531 1176.55 228.35 1177.17 228.35 1177.98C228.35 1178.79 228.531 1179.42 228.895 1179.86C229.262 1180.3 229.781 1180.51 230.453 1180.51C230.828 1180.51 231.164 1180.46 231.461 1180.34C231.758 1180.23 232.033 1180.05 232.287 1179.81V1180.92ZM236.898 1172.83V1174.7H239.348V1175.53H236.898V1179.1C236.898 1179.58 236.99 1179.92 237.174 1180.11C237.357 1180.3 237.678 1180.4 238.135 1180.4H239.348V1181.26H238.029C237.221 1181.26 236.65 1181.1 236.318 1180.77C235.986 1180.45 235.82 1179.89 235.82 1179.1V1175.53H234.068V1174.7H235.82V1172.83H236.898ZM246.232 1174.92V1175.98C245.924 1175.8 245.613 1175.67 245.301 1175.58C244.988 1175.49 244.67 1175.44 244.346 1175.44C243.857 1175.44 243.492 1175.52 243.25 1175.68C243.012 1175.84 242.893 1176.08 242.893 1176.4C242.893 1176.69 242.982 1176.91 243.162 1177.06C243.342 1177.2 243.789 1177.34 244.504 1177.48L244.938 1177.56C245.473 1177.66 245.877 1177.87 246.15 1178.17C246.428 1178.48 246.566 1178.87 246.566 1179.36C246.566 1180.01 246.336 1180.52 245.875 1180.88C245.414 1181.25 244.773 1181.43 243.953 1181.43C243.629 1181.43 243.289 1181.39 242.934 1181.32C242.578 1181.26 242.193 1181.16 241.779 1181.02V1179.91C242.182 1180.11 242.566 1180.27 242.934 1180.37C243.301 1180.48 243.648 1180.53 243.977 1180.53C244.453 1180.53 244.822 1180.43 245.084 1180.24C245.346 1180.04 245.477 1179.77 245.477 1179.42C245.477 1178.92 244.998 1178.58 244.041 1178.39L243.994 1178.38L243.59 1178.29C242.969 1178.17 242.516 1177.97 242.23 1177.68C241.945 1177.4 241.803 1177 241.803 1176.51C241.803 1175.88 242.016 1175.39 242.441 1175.05C242.867 1174.71 243.475 1174.54 244.264 1174.54C244.615 1174.54 244.953 1174.57 245.277 1174.64C245.602 1174.7 245.92 1174.8 246.232 1174.92ZM252.971 1172.51H254.084L249.479 1182.37H248.359L252.971 1172.51ZM260.02 1177.92C260.02 1177.12 259.887 1176.5 259.621 1176.09C259.359 1175.66 258.977 1175.45 258.473 1175.45C257.945 1175.45 257.543 1175.66 257.266 1176.09C256.988 1176.5 256.85 1177.12 256.85 1177.92C256.85 1178.73 256.988 1179.35 257.266 1179.78C257.547 1180.2 257.953 1180.41 258.484 1180.41C258.98 1180.41 259.359 1180.2 259.621 1179.77C259.887 1179.34 260.02 1178.73 260.02 1177.92ZM261.098 1180.84C261.098 1181.82 260.865 1182.57 260.4 1183.08C259.936 1183.58 259.252 1183.84 258.35 1183.84C258.053 1183.84 257.742 1183.81 257.418 1183.76C257.094 1183.7 256.77 1183.62 256.445 1183.51V1182.45C256.828 1182.63 257.176 1182.76 257.488 1182.85C257.801 1182.93 258.088 1182.98 258.35 1182.98C258.932 1182.98 259.355 1182.82 259.621 1182.5C259.887 1182.18 260.02 1181.68 260.02 1181V1180.95V1180.22C259.848 1180.58 259.613 1180.86 259.316 1181.04C259.02 1181.22 258.658 1181.31 258.232 1181.31C257.467 1181.31 256.855 1181 256.398 1180.39C255.941 1179.77 255.713 1178.95 255.713 1177.92C255.713 1176.89 255.941 1176.07 256.398 1175.46C256.855 1174.84 257.467 1174.54 258.232 1174.54C258.654 1174.54 259.012 1174.62 259.305 1174.79C259.598 1174.96 259.836 1175.22 260.02 1175.57V1174.72H261.098V1180.84ZM264.074 1174.72H266.834V1180.42H268.973V1181.26H263.617V1180.42H265.756V1175.56H264.074V1174.72ZM265.756 1172.17H266.834V1173.53H265.756V1172.17ZM273.051 1172.83V1174.7H275.5V1175.53H273.051V1179.1C273.051 1179.58 273.143 1179.92 273.326 1180.11C273.51 1180.3 273.83 1180.4 274.287 1180.4H275.5V1181.26H274.182C273.373 1181.26 272.803 1181.1 272.471 1180.77C272.139 1180.45 271.973 1179.89 271.973 1179.1V1175.53H270.221V1174.7H271.973V1172.83H273.051ZM282.842 1177.19V1181.26H281.758V1177.19C281.758 1176.6 281.654 1176.17 281.447 1175.89C281.24 1175.61 280.916 1175.48 280.475 1175.48C279.971 1175.48 279.582 1175.66 279.309 1176.01C279.039 1176.37 278.904 1176.88 278.904 1177.55V1181.26H277.826V1172.14H278.904V1175.68C279.096 1175.31 279.355 1175.02 279.684 1174.83C280.012 1174.64 280.4 1174.54 280.85 1174.54C281.518 1174.54 282.016 1174.76 282.344 1175.2C282.676 1175.64 282.842 1176.3 282.842 1177.19ZM285.057 1178.77V1174.71H286.135V1178.77C286.135 1179.36 286.238 1179.8 286.445 1180.08C286.656 1180.35 286.98 1180.49 287.418 1180.49C287.926 1180.49 288.314 1180.31 288.584 1179.96C288.854 1179.6 288.988 1179.09 288.988 1178.42V1174.71H290.072V1181.26H288.988V1180.27C288.797 1180.65 288.535 1180.94 288.203 1181.14C287.875 1181.33 287.49 1181.43 287.049 1181.43C286.377 1181.43 285.877 1181.21 285.549 1180.77C285.221 1180.33 285.057 1179.67 285.057 1178.77ZM296.523 1177.98C296.523 1177.15 296.391 1176.52 296.125 1176.09C295.859 1175.67 295.467 1175.45 294.947 1175.45C294.424 1175.45 294.027 1175.67 293.758 1176.1C293.488 1176.52 293.354 1177.15 293.354 1177.98C293.354 1178.81 293.488 1179.44 293.758 1179.87C294.027 1180.3 294.424 1180.51 294.947 1180.51C295.467 1180.51 295.859 1180.3 296.125 1179.88C296.391 1179.45 296.523 1178.82 296.523 1177.98ZM293.354 1175.53C293.525 1175.21 293.762 1174.97 294.062 1174.8C294.367 1174.62 294.719 1174.54 295.117 1174.54C295.906 1174.54 296.527 1174.84 296.98 1175.45C297.434 1176.06 297.66 1176.89 297.66 1177.96C297.66 1179.04 297.432 1179.89 296.975 1180.51C296.521 1181.12 295.898 1181.43 295.105 1181.43C294.715 1181.43 294.369 1181.34 294.068 1181.18C293.771 1181.01 293.533 1180.76 293.354 1180.43V1181.26H292.275V1172.14H293.354V1175.53ZM298.973 1177.02H305.184V1178.01H298.973V1177.02ZM311.822 1180.92C311.533 1181.09 311.234 1181.22 310.926 1181.3C310.621 1181.39 310.309 1181.43 309.988 1181.43C308.973 1181.43 308.178 1181.12 307.604 1180.51C307.033 1179.91 306.748 1179.06 306.748 1177.98C306.748 1176.91 307.033 1176.06 307.604 1175.45C308.178 1174.84 308.973 1174.54 309.988 1174.54C310.305 1174.54 310.613 1174.58 310.914 1174.66C311.215 1174.74 311.518 1174.87 311.822 1175.04V1176.17C311.537 1175.92 311.25 1175.74 310.961 1175.62C310.676 1175.51 310.352 1175.45 309.988 1175.45C309.312 1175.45 308.793 1175.67 308.43 1176.11C308.066 1176.55 307.885 1177.17 307.885 1177.98C307.885 1178.79 308.066 1179.42 308.43 1179.86C308.797 1180.3 309.316 1180.51 309.988 1180.51C310.363 1180.51 310.699 1180.46 310.996 1180.34C311.293 1180.23 311.568 1180.05 311.822 1179.81V1180.92ZM316.445 1175.45C315.898 1175.45 315.484 1175.67 315.203 1176.09C314.922 1176.52 314.781 1177.15 314.781 1177.98C314.781 1178.82 314.922 1179.45 315.203 1179.88C315.484 1180.3 315.898 1180.51 316.445 1180.51C316.996 1180.51 317.412 1180.3 317.693 1179.88C317.975 1179.45 318.115 1178.82 318.115 1177.98C318.115 1177.15 317.975 1176.52 317.693 1176.09C317.412 1175.67 316.996 1175.45 316.445 1175.45ZM316.445 1174.54C317.355 1174.54 318.051 1174.83 318.531 1175.42C319.016 1176.01 319.258 1176.87 319.258 1177.98C319.258 1179.1 319.018 1179.96 318.537 1180.55C318.057 1181.14 317.359 1181.43 316.445 1181.43C315.535 1181.43 314.84 1181.14 314.359 1180.55C313.879 1179.96 313.639 1179.1 313.639 1177.98C313.639 1176.87 313.879 1176.01 314.359 1175.42C314.84 1174.83 315.535 1174.54 316.445 1174.54ZM322.264 1180.43V1183.76H321.18V1174.7H322.264V1175.53C322.443 1175.21 322.682 1174.96 322.979 1174.8C323.279 1174.62 323.625 1174.54 324.016 1174.54C324.809 1174.54 325.43 1174.84 325.879 1175.46C326.332 1176.07 326.559 1176.92 326.559 1178.01C326.559 1179.07 326.332 1179.91 325.879 1180.52C325.426 1181.13 324.805 1181.43 324.016 1181.43C323.617 1181.43 323.268 1181.34 322.967 1181.18C322.67 1181.01 322.436 1180.76 322.264 1180.43ZM325.428 1177.98C325.428 1177.15 325.295 1176.52 325.029 1176.09C324.768 1175.67 324.377 1175.45 323.857 1175.45C323.334 1175.45 322.938 1175.67 322.668 1176.1C322.398 1176.52 322.264 1177.15 322.264 1177.98C322.264 1178.81 322.398 1179.44 322.668 1179.87C322.938 1180.3 323.334 1180.51 323.857 1180.51C324.377 1180.51 324.768 1180.3 325.029 1179.88C325.295 1179.45 325.428 1178.82 325.428 1177.98ZM329.148 1174.72H331.908V1180.42H334.047V1181.26H328.691V1180.42H330.83V1175.56H329.148V1174.72ZM330.83 1172.17H331.908V1173.53H330.83V1172.17ZM338.74 1178.89C338.74 1179.37 338.828 1179.74 339.004 1179.98C339.184 1180.23 339.447 1180.35 339.795 1180.35H341.055V1181.26H339.689C339.045 1181.26 338.545 1181.05 338.189 1180.64C337.838 1180.23 337.662 1179.64 337.662 1178.89V1172.95H335.934V1172.11H338.74V1178.89ZM345.367 1175.45C344.82 1175.45 344.406 1175.67 344.125 1176.09C343.844 1176.52 343.703 1177.15 343.703 1177.98C343.703 1178.82 343.844 1179.45 344.125 1179.88C344.406 1180.3 344.82 1180.51 345.367 1180.51C345.918 1180.51 346.334 1180.3 346.615 1179.88C346.896 1179.45 347.037 1178.82 347.037 1177.98C347.037 1177.15 346.896 1176.52 346.615 1176.09C346.334 1175.67 345.918 1175.45 345.367 1175.45ZM345.367 1174.54C346.277 1174.54 346.973 1174.83 347.453 1175.42C347.938 1176.01 348.18 1176.87 348.18 1177.98C348.18 1179.1 347.939 1179.96 347.459 1180.55C346.979 1181.14 346.281 1181.43 345.367 1181.43C344.457 1181.43 343.762 1181.14 343.281 1180.55C342.801 1179.96 342.561 1179.1 342.561 1177.98C342.561 1176.87 342.801 1176.01 343.281 1175.42C343.762 1174.83 344.457 1174.54 345.367 1174.54ZM352.586 1172.83V1174.7H355.035V1175.53H352.586V1179.1C352.586 1179.58 352.678 1179.92 352.861 1180.11C353.045 1180.3 353.365 1180.4 353.822 1180.4H355.035V1181.26H353.717C352.908 1181.26 352.338 1181.1 352.006 1180.77C351.674 1180.45 351.508 1179.89 351.508 1179.1V1175.53H349.756V1174.7H351.508V1172.83H352.586ZM356.816 1177.02H363.027V1178.01H356.816V1177.02ZM369.666 1180.92C369.377 1181.09 369.078 1181.22 368.77 1181.3C368.465 1181.39 368.152 1181.43 367.832 1181.43C366.816 1181.43 366.021 1181.12 365.447 1180.51C364.877 1179.91 364.592 1179.06 364.592 1177.98C364.592 1176.91 364.877 1176.06 365.447 1175.45C366.021 1174.84 366.816 1174.54 367.832 1174.54C368.148 1174.54 368.457 1174.58 368.758 1174.66C369.059 1174.74 369.361 1174.87 369.666 1175.04V1176.17C369.381 1175.92 369.094 1175.74 368.805 1175.62C368.52 1175.51 368.195 1175.45 367.832 1175.45C367.156 1175.45 366.637 1175.67 366.273 1176.11C365.91 1176.55 365.729 1177.17 365.729 1177.98C365.729 1178.79 365.91 1179.42 366.273 1179.86C366.641 1180.3 367.16 1180.51 367.832 1180.51C368.207 1180.51 368.543 1180.46 368.84 1180.34C369.137 1180.23 369.412 1180.05 369.666 1179.81V1180.92ZM376.838 1177.19V1181.26H375.754V1177.19C375.754 1176.6 375.65 1176.17 375.443 1175.89C375.236 1175.61 374.912 1175.48 374.471 1175.48C373.967 1175.48 373.578 1175.66 373.305 1176.01C373.035 1176.37 372.9 1176.88 372.9 1177.55V1181.26H371.822V1172.14H372.9V1175.68C373.092 1175.31 373.352 1175.02 373.68 1174.83C374.008 1174.64 374.396 1174.54 374.846 1174.54C375.514 1174.54 376.012 1174.76 376.34 1175.2C376.672 1175.64 376.838 1176.3 376.838 1177.19ZM382.023 1177.96H381.666C381.037 1177.96 380.562 1178.07 380.242 1178.29C379.926 1178.51 379.768 1178.84 379.768 1179.28C379.768 1179.67 379.887 1179.98 380.125 1180.2C380.363 1180.42 380.693 1180.53 381.115 1180.53C381.709 1180.53 382.176 1180.32 382.516 1179.91C382.855 1179.5 383.027 1178.93 383.031 1178.2V1177.96H382.023ZM384.115 1177.51V1181.26H383.031V1180.29C382.801 1180.68 382.51 1180.97 382.158 1181.15C381.811 1181.34 381.387 1181.43 380.887 1181.43C380.219 1181.43 379.686 1181.24 379.287 1180.87C378.889 1180.49 378.689 1179.98 378.689 1179.35C378.689 1178.62 378.934 1178.06 379.422 1177.68C379.914 1177.31 380.635 1177.12 381.584 1177.12H383.031V1176.95C383.027 1176.42 382.895 1176.04 382.633 1175.81C382.371 1175.57 381.953 1175.45 381.379 1175.45C381.012 1175.45 380.641 1175.51 380.266 1175.61C379.891 1175.72 379.525 1175.87 379.17 1176.07V1175C379.568 1174.84 379.949 1174.73 380.312 1174.66C380.68 1174.58 381.035 1174.54 381.379 1174.54C381.922 1174.54 382.385 1174.62 382.768 1174.78C383.154 1174.94 383.467 1175.18 383.705 1175.5C383.854 1175.69 383.959 1175.94 384.021 1176.23C384.084 1176.51 384.115 1176.94 384.115 1177.51ZM388.738 1172.83V1174.7H391.188V1175.53H388.738V1179.1C388.738 1179.58 388.83 1179.92 389.014 1180.11C389.197 1180.3 389.518 1180.4 389.975 1180.4H391.188V1181.26H389.869C389.061 1181.26 388.49 1181.1 388.158 1180.77C387.826 1180.45 387.66 1179.89 387.66 1179.1V1175.53H385.908V1174.7H387.66V1172.83H388.738ZM397.908 1172.19V1175.78H396.596V1172.19H397.908ZM394.785 1172.19V1175.78H393.473V1172.19H394.785ZM188.225 1226.19V1229.78H186.912V1226.19H188.225ZM185.102 1226.19V1229.78H183.789V1226.19H185.102ZM190.129 1226.54H191.711L193.223 1230.98L194.746 1226.54H196.334V1235.26H195.238V1227.55L193.68 1232.15H192.783L191.219 1227.55V1235.26H190.129V1226.54ZM203.711 1231.44V1231.97H199.041V1232C199.01 1232.9 199.18 1233.54 199.551 1233.93C199.926 1234.32 200.453 1234.51 201.133 1234.51C201.477 1234.51 201.836 1234.46 202.211 1234.35C202.586 1234.24 202.986 1234.08 203.412 1233.85V1234.92C203.002 1235.09 202.605 1235.22 202.223 1235.3C201.844 1235.39 201.477 1235.43 201.121 1235.43C200.102 1235.43 199.305 1235.12 198.73 1234.51C198.156 1233.9 197.869 1233.06 197.869 1231.98C197.869 1230.94 198.15 1230.1 198.713 1229.48C199.275 1228.85 200.025 1228.54 200.963 1228.54C201.799 1228.54 202.457 1228.82 202.938 1229.39C203.422 1229.95 203.68 1230.64 203.711 1231.44ZM202.633 1231.12C202.586 1230.67 202.42 1230.28 202.135 1229.95C201.854 1229.62 201.447 1229.45 200.916 1229.45C200.396 1229.45 199.969 1229.62 199.633 1229.97C199.297 1230.31 199.113 1230.7 199.082 1231.13L202.633 1231.12ZM211.146 1230.05C210.916 1229.87 210.682 1229.74 210.443 1229.66C210.205 1229.58 209.943 1229.53 209.658 1229.53C208.986 1229.53 208.473 1229.75 208.117 1230.17C207.762 1230.59 207.584 1231.2 207.584 1232V1235.26H206.5V1228.7H207.584V1229.98C207.764 1229.51 208.039 1229.16 208.41 1228.91C208.785 1228.66 209.229 1228.54 209.74 1228.54C210.006 1228.54 210.254 1228.57 210.484 1228.64C210.715 1228.7 210.936 1228.81 211.146 1228.95V1230.05ZM216.637 1231.92C216.637 1231.12 216.504 1230.5 216.238 1230.09C215.977 1229.66 215.594 1229.45 215.09 1229.45C214.562 1229.45 214.16 1229.66 213.883 1230.09C213.605 1230.5 213.467 1231.12 213.467 1231.92C213.467 1232.73 213.605 1233.35 213.883 1233.78C214.164 1234.2 214.57 1234.41 215.102 1234.41C215.598 1234.41 215.977 1234.2 216.238 1233.77C216.504 1233.34 216.637 1232.73 216.637 1231.92ZM217.715 1234.84C217.715 1235.82 217.482 1236.57 217.018 1237.08C216.553 1237.58 215.869 1237.84 214.967 1237.84C214.67 1237.84 214.359 1237.81 214.035 1237.76C213.711 1237.7 213.387 1237.62 213.062 1237.51V1236.45C213.445 1236.63 213.793 1236.76 214.105 1236.85C214.418 1236.93 214.705 1236.98 214.967 1236.98C215.549 1236.98 215.973 1236.82 216.238 1236.5C216.504 1236.18 216.637 1235.68 216.637 1235V1234.95V1234.22C216.465 1234.58 216.23 1234.86 215.934 1235.04C215.637 1235.22 215.275 1235.31 214.85 1235.31C214.084 1235.31 213.473 1235 213.016 1234.39C212.559 1233.77 212.33 1232.95 212.33 1231.92C212.33 1230.89 212.559 1230.07 213.016 1229.46C213.473 1228.84 214.084 1228.54 214.85 1228.54C215.271 1228.54 215.629 1228.62 215.922 1228.79C216.215 1228.96 216.453 1229.22 216.637 1229.57V1228.72H217.715V1234.84ZM225.402 1231.44V1231.97H220.732V1232C220.701 1232.9 220.871 1233.54 221.242 1233.93C221.617 1234.32 222.145 1234.51 222.824 1234.51C223.168 1234.51 223.527 1234.46 223.902 1234.35C224.277 1234.24 224.678 1234.08 225.104 1233.85V1234.92C224.693 1235.09 224.297 1235.22 223.914 1235.3C223.535 1235.39 223.168 1235.43 222.812 1235.43C221.793 1235.43 220.996 1235.12 220.422 1234.51C219.848 1233.9 219.561 1233.06 219.561 1231.98C219.561 1230.94 219.842 1230.1 220.404 1229.48C220.967 1228.85 221.717 1228.54 222.654 1228.54C223.49 1228.54 224.148 1228.82 224.629 1229.39C225.113 1229.95 225.371 1230.64 225.402 1231.44ZM224.324 1231.12C224.277 1230.67 224.111 1230.28 223.826 1229.95C223.545 1229.62 223.139 1229.45 222.607 1229.45C222.088 1229.45 221.66 1229.62 221.324 1229.97C220.988 1230.31 220.805 1230.7 220.773 1231.13L224.324 1231.12ZM234.455 1226.51H239.646V1227.51H235.639V1229.86H239.471V1230.86H235.639V1234.26H239.758V1235.26H234.455V1226.51ZM245.559 1229.53V1226.14H246.637V1235.26H245.559V1234.43C245.379 1234.76 245.139 1235.01 244.838 1235.18C244.541 1235.34 244.197 1235.43 243.807 1235.43C243.014 1235.43 242.389 1235.12 241.932 1234.51C241.479 1233.89 241.252 1233.04 241.252 1231.96C241.252 1230.89 241.48 1230.06 241.938 1229.45C242.395 1228.84 243.018 1228.54 243.807 1228.54C244.201 1228.54 244.549 1228.62 244.85 1228.8C245.15 1228.96 245.387 1229.21 245.559 1229.53ZM242.389 1231.98C242.389 1232.82 242.521 1233.45 242.787 1233.88C243.053 1234.3 243.445 1234.51 243.965 1234.51C244.484 1234.51 244.879 1234.3 245.148 1233.87C245.422 1233.44 245.559 1232.81 245.559 1231.98C245.559 1231.15 245.422 1230.52 245.148 1230.1C244.879 1229.67 244.484 1229.45 243.965 1229.45C243.445 1229.45 243.053 1229.67 242.787 1230.09C242.521 1230.52 242.389 1231.15 242.389 1231.98ZM249.613 1228.72H252.373V1234.42H254.512V1235.26H249.156V1234.42H251.295V1229.56H249.613V1228.72ZM251.295 1226.17H252.373V1227.53H251.295V1226.17ZM258.59 1226.83V1228.7H261.039V1229.53H258.59V1233.1C258.59 1233.58 258.682 1233.92 258.865 1234.11C259.049 1234.3 259.369 1234.4 259.826 1234.4H261.039V1235.26H259.721C258.912 1235.26 258.342 1235.1 258.01 1234.77C257.678 1234.45 257.512 1233.89 257.512 1233.1V1229.53H255.76V1228.7H257.512V1226.83H258.59ZM265.832 1229.45C265.285 1229.45 264.871 1229.67 264.59 1230.09C264.309 1230.52 264.168 1231.15 264.168 1231.98C264.168 1232.82 264.309 1233.45 264.59 1233.88C264.871 1234.3 265.285 1234.51 265.832 1234.51C266.383 1234.51 266.799 1234.3 267.08 1233.88C267.361 1233.45 267.502 1232.82 267.502 1231.98C267.502 1231.15 267.361 1230.52 267.08 1230.09C266.799 1229.67 266.383 1229.45 265.832 1229.45ZM265.832 1228.54C266.742 1228.54 267.438 1228.83 267.918 1229.42C268.402 1230.01 268.645 1230.87 268.645 1231.98C268.645 1233.1 268.404 1233.96 267.924 1234.55C267.443 1235.14 266.746 1235.43 265.832 1235.43C264.922 1235.43 264.227 1235.14 263.746 1234.55C263.266 1233.96 263.025 1233.1 263.025 1231.98C263.025 1230.87 263.266 1230.01 263.746 1229.42C264.227 1228.83 264.922 1228.54 265.832 1228.54ZM276.221 1230.05C275.99 1229.87 275.756 1229.74 275.518 1229.66C275.279 1229.58 275.018 1229.53 274.732 1229.53C274.061 1229.53 273.547 1229.75 273.191 1230.17C272.836 1230.59 272.658 1231.2 272.658 1232V1235.26H271.574V1228.7H272.658V1229.98C272.838 1229.51 273.113 1229.16 273.484 1228.91C273.859 1228.66 274.303 1228.54 274.814 1228.54C275.08 1228.54 275.328 1228.57 275.559 1228.64C275.789 1228.7 276.01 1228.81 276.221 1228.95V1230.05ZM282.221 1226.19V1229.78H280.908V1226.19H282.221ZM279.098 1226.19V1229.78H277.785V1226.19H279.098ZM231.607 1244.19V1247.78H230.295V1244.19H231.607ZM228.484 1244.19V1247.78H227.172V1244.19H228.484ZM237.754 1249.13C238.059 1249.21 238.318 1249.35 238.533 1249.57C238.748 1249.79 239.016 1250.22 239.336 1250.87L240.525 1253.26H239.254L238.211 1251.05C237.91 1250.42 237.639 1250.02 237.396 1249.84C237.158 1249.65 236.846 1249.56 236.459 1249.56H235.328V1253.26H234.139V1244.51H236.576C237.537 1244.51 238.273 1244.73 238.785 1245.16C239.297 1245.59 239.553 1246.22 239.553 1247.04C239.553 1247.62 239.395 1248.09 239.078 1248.46C238.766 1248.82 238.324 1249.05 237.754 1249.13ZM235.328 1245.48V1248.59H236.623C237.189 1248.59 237.611 1248.46 237.889 1248.21C238.166 1247.95 238.305 1247.57 238.305 1247.04C238.305 1246.54 238.156 1246.15 237.859 1245.89C237.566 1245.62 237.139 1245.48 236.576 1245.48H235.328ZM247.094 1249.44V1249.97H242.424V1250C242.393 1250.9 242.562 1251.54 242.934 1251.93C243.309 1252.32 243.836 1252.51 244.516 1252.51C244.859 1252.51 245.219 1252.46 245.594 1252.35C245.969 1252.24 246.369 1252.08 246.795 1251.85V1252.92C246.385 1253.09 245.988 1253.22 245.605 1253.3C245.227 1253.39 244.859 1253.43 244.504 1253.43C243.484 1253.43 242.688 1253.12 242.113 1252.51C241.539 1251.9 241.252 1251.06 241.252 1249.98C241.252 1248.94 241.533 1248.1 242.096 1247.48C242.658 1246.85 243.408 1246.54 244.346 1246.54C245.182 1246.54 245.84 1246.82 246.32 1247.39C246.805 1247.95 247.062 1248.64 247.094 1249.44ZM246.016 1249.12C245.969 1248.67 245.803 1248.28 245.518 1247.95C245.236 1247.62 244.83 1247.45 244.299 1247.45C243.779 1247.45 243.352 1247.62 243.016 1247.97C242.68 1248.31 242.496 1248.7 242.465 1249.13L246.016 1249.12ZM252.789 1247.53V1244.14H253.867V1253.26H252.789V1252.43C252.609 1252.76 252.369 1253.01 252.068 1253.18C251.771 1253.34 251.428 1253.43 251.037 1253.43C250.244 1253.43 249.619 1253.12 249.162 1252.51C248.709 1251.89 248.482 1251.04 248.482 1249.96C248.482 1248.89 248.711 1248.06 249.168 1247.45C249.625 1246.84 250.248 1246.54 251.037 1246.54C251.432 1246.54 251.779 1246.62 252.08 1246.8C252.381 1246.96 252.617 1247.21 252.789 1247.53ZM249.619 1249.98C249.619 1250.82 249.752 1251.45 250.018 1251.88C250.283 1252.3 250.676 1252.51 251.195 1252.51C251.715 1252.51 252.109 1252.3 252.379 1251.87C252.652 1251.44 252.789 1250.81 252.789 1249.98C252.789 1249.15 252.652 1248.52 252.379 1248.1C252.109 1247.67 251.715 1247.45 251.195 1247.45C250.676 1247.45 250.283 1247.67 250.018 1248.09C249.752 1248.52 249.619 1249.15 249.619 1249.98ZM256.135 1250.77V1246.71H257.213V1250.77C257.213 1251.36 257.316 1251.8 257.523 1252.08C257.734 1252.35 258.059 1252.49 258.496 1252.49C259.004 1252.49 259.393 1252.31 259.662 1251.96C259.932 1251.6 260.066 1251.09 260.066 1250.42V1246.71H261.15V1253.26H260.066V1252.27C259.875 1252.65 259.613 1252.94 259.281 1253.14C258.953 1253.33 258.568 1253.43 258.127 1253.43C257.455 1253.43 256.955 1253.21 256.627 1252.77C256.299 1252.33 256.135 1251.67 256.135 1250.77ZM268.439 1252.92C268.15 1253.09 267.852 1253.22 267.543 1253.3C267.238 1253.39 266.926 1253.43 266.605 1253.43C265.59 1253.43 264.795 1253.12 264.221 1252.51C263.65 1251.91 263.365 1251.06 263.365 1249.98C263.365 1248.91 263.65 1248.06 264.221 1247.45C264.795 1246.84 265.59 1246.54 266.605 1246.54C266.922 1246.54 267.23 1246.58 267.531 1246.66C267.832 1246.74 268.135 1246.87 268.439 1247.04V1248.17C268.154 1247.92 267.867 1247.74 267.578 1247.62C267.293 1247.51 266.969 1247.45 266.605 1247.45C265.93 1247.45 265.41 1247.67 265.047 1248.11C264.684 1248.55 264.502 1249.17 264.502 1249.98C264.502 1250.79 264.684 1251.42 265.047 1251.86C265.414 1252.3 265.934 1252.51 266.605 1252.51C266.98 1252.51 267.316 1252.46 267.613 1252.34C267.91 1252.23 268.186 1252.05 268.439 1251.81V1252.92ZM271.305 1246.72H274.064V1252.42H276.203V1253.26H270.848V1252.42H272.986V1247.56H271.305V1246.72ZM272.986 1244.17H274.064V1245.53H272.986V1244.17ZM282.842 1249.19V1253.26H281.758V1249.19C281.758 1248.6 281.654 1248.17 281.447 1247.89C281.24 1247.61 280.916 1247.48 280.475 1247.48C279.971 1247.48 279.582 1247.66 279.309 1248.01C279.039 1248.37 278.904 1248.88 278.904 1249.55V1253.26H277.826V1246.7H278.904V1247.68C279.096 1247.31 279.355 1247.02 279.684 1246.83C280.012 1246.64 280.4 1246.54 280.85 1246.54C281.518 1246.54 282.016 1246.76 282.344 1247.2C282.676 1247.64 282.842 1248.3 282.842 1249.19ZM288.941 1249.92C288.941 1249.12 288.809 1248.5 288.543 1248.09C288.281 1247.66 287.898 1247.45 287.395 1247.45C286.867 1247.45 286.465 1247.66 286.188 1248.09C285.91 1248.5 285.771 1249.12 285.771 1249.92C285.771 1250.73 285.91 1251.35 286.188 1251.78C286.469 1252.2 286.875 1252.41 287.406 1252.41C287.902 1252.41 288.281 1252.2 288.543 1251.77C288.809 1251.34 288.941 1250.73 288.941 1249.92ZM290.02 1252.84C290.02 1253.82 289.787 1254.57 289.322 1255.08C288.857 1255.58 288.174 1255.84 287.271 1255.84C286.975 1255.84 286.664 1255.81 286.34 1255.76C286.016 1255.7 285.691 1255.62 285.367 1255.51V1254.45C285.75 1254.63 286.098 1254.76 286.41 1254.85C286.723 1254.93 287.01 1254.98 287.271 1254.98C287.854 1254.98 288.277 1254.82 288.543 1254.5C288.809 1254.18 288.941 1253.68 288.941 1253V1252.95V1252.22C288.77 1252.58 288.535 1252.86 288.238 1253.04C287.941 1253.22 287.58 1253.31 287.154 1253.31C286.389 1253.31 285.777 1253 285.32 1252.39C284.863 1251.77 284.635 1250.95 284.635 1249.92C284.635 1248.89 284.863 1248.07 285.32 1247.46C285.777 1246.84 286.389 1246.54 287.154 1246.54C287.576 1246.54 287.934 1246.62 288.227 1246.79C288.52 1246.96 288.758 1247.22 288.941 1247.57V1246.72H290.02V1252.84ZM302.488 1249.96H302.131C301.502 1249.96 301.027 1250.07 300.707 1250.29C300.391 1250.51 300.232 1250.84 300.232 1251.28C300.232 1251.67 300.352 1251.98 300.59 1252.2C300.828 1252.42 301.158 1252.53 301.58 1252.53C302.174 1252.53 302.641 1252.32 302.98 1251.91C303.32 1251.5 303.492 1250.93 303.496 1250.2V1249.96H302.488ZM304.58 1249.51V1253.26H303.496V1252.29C303.266 1252.68 302.975 1252.97 302.623 1253.15C302.275 1253.34 301.852 1253.43 301.352 1253.43C300.684 1253.43 300.15 1253.24 299.752 1252.87C299.354 1252.49 299.154 1251.98 299.154 1251.35C299.154 1250.62 299.398 1250.06 299.887 1249.68C300.379 1249.31 301.1 1249.12 302.049 1249.12H303.496V1248.95C303.492 1248.42 303.359 1248.04 303.098 1247.81C302.836 1247.57 302.418 1247.45 301.844 1247.45C301.477 1247.45 301.105 1247.51 300.73 1247.61C300.355 1247.72 299.99 1247.87 299.635 1248.07V1247C300.033 1246.84 300.414 1246.73 300.777 1246.66C301.145 1246.58 301.5 1246.54 301.844 1246.54C302.387 1246.54 302.85 1246.62 303.232 1246.78C303.619 1246.94 303.932 1247.18 304.17 1247.5C304.318 1247.69 304.424 1247.94 304.486 1248.23C304.549 1248.51 304.58 1248.94 304.58 1249.51ZM311.764 1249.19V1253.26H310.68V1249.19C310.68 1248.6 310.576 1248.17 310.369 1247.89C310.162 1247.61 309.838 1247.48 309.396 1247.48C308.893 1247.48 308.504 1247.66 308.23 1248.01C307.961 1248.37 307.826 1248.88 307.826 1249.55V1253.26H306.748V1246.7H307.826V1247.68C308.018 1247.31 308.277 1247.02 308.605 1246.83C308.934 1246.64 309.322 1246.54 309.771 1246.54C310.439 1246.54 310.938 1246.76 311.266 1247.2C311.598 1247.64 311.764 1248.3 311.764 1249.19ZM319.387 1246.7L317.037 1249.84L319.615 1253.26H318.367L316.445 1250.63L314.529 1253.26H313.281L315.859 1249.84L313.51 1246.7H314.705L316.445 1249.07L318.174 1246.7H319.387ZM321.918 1246.72H324.678V1252.42H326.816V1253.26H321.461V1252.42H323.6V1247.56H321.918V1246.72ZM323.6 1244.17H324.678V1245.53H323.6V1244.17ZM333.859 1249.44V1249.97H329.189V1250C329.158 1250.9 329.328 1251.54 329.699 1251.93C330.074 1252.32 330.602 1252.51 331.281 1252.51C331.625 1252.51 331.984 1252.46 332.359 1252.35C332.734 1252.24 333.135 1252.08 333.561 1251.85V1252.92C333.15 1253.09 332.754 1253.22 332.371 1253.3C331.992 1253.39 331.625 1253.43 331.27 1253.43C330.25 1253.43 329.453 1253.12 328.879 1252.51C328.305 1251.9 328.018 1251.06 328.018 1249.98C328.018 1248.94 328.299 1248.1 328.861 1247.48C329.424 1246.85 330.174 1246.54 331.111 1246.54C331.947 1246.54 332.605 1246.82 333.086 1247.39C333.57 1247.95 333.828 1248.64 333.859 1249.44ZM332.781 1249.12C332.734 1248.67 332.568 1248.28 332.283 1247.95C332.002 1247.62 331.596 1247.45 331.064 1247.45C330.545 1247.45 330.117 1247.62 329.781 1247.97C329.445 1248.31 329.262 1248.7 329.23 1249.13L332.781 1249.12ZM338.125 1244.83V1246.7H340.574V1247.53H338.125V1251.1C338.125 1251.58 338.217 1251.92 338.4 1252.11C338.584 1252.3 338.904 1252.4 339.361 1252.4H340.574V1253.26H339.256C338.447 1253.26 337.877 1253.1 337.545 1252.77C337.213 1252.45 337.047 1251.89 337.047 1251.1V1247.53H335.295V1246.7H337.047V1244.83H338.125ZM346.785 1251.15C346.605 1251.61 346.377 1252.21 346.1 1252.95C345.713 1253.99 345.453 1254.61 345.32 1254.84C345.141 1255.15 344.916 1255.37 344.646 1255.53C344.377 1255.68 344.062 1255.76 343.703 1255.76H342.836V1254.85H343.475C343.791 1254.85 344.039 1254.76 344.219 1254.58C344.398 1254.39 344.627 1253.92 344.904 1253.15L342.367 1246.7H343.51L345.455 1251.83L347.371 1246.7H348.514L346.785 1251.15ZM356.219 1246.7H357.285L358.428 1252L359.365 1248.61H360.285L361.234 1252L362.377 1246.7H363.443L361.908 1253.26H360.877L359.828 1249.66L358.785 1253.26H357.754L356.219 1246.7ZM369.607 1249.19V1253.26H368.523V1249.19C368.523 1248.6 368.42 1248.17 368.213 1247.89C368.006 1247.61 367.682 1247.48 367.24 1247.48C366.736 1247.48 366.348 1247.66 366.074 1248.01C365.805 1248.37 365.67 1248.88 365.67 1249.55V1253.26H364.592V1244.14H365.67V1247.68C365.861 1247.31 366.121 1247.02 366.449 1246.83C366.777 1246.64 367.166 1246.54 367.615 1246.54C368.283 1246.54 368.781 1246.76 369.109 1247.2C369.441 1247.64 369.607 1248.3 369.607 1249.19ZM377.242 1249.44V1249.97H372.572V1250C372.541 1250.9 372.711 1251.54 373.082 1251.93C373.457 1252.32 373.984 1252.51 374.664 1252.51C375.008 1252.51 375.367 1252.46 375.742 1252.35C376.117 1252.24 376.518 1252.08 376.943 1251.85V1252.92C376.533 1253.09 376.137 1253.22 375.754 1253.3C375.375 1253.39 375.008 1253.43 374.652 1253.43C373.633 1253.43 372.836 1253.12 372.262 1252.51C371.688 1251.9 371.4 1251.06 371.4 1249.98C371.4 1248.94 371.682 1248.1 372.244 1247.48C372.807 1246.85 373.557 1246.54 374.494 1246.54C375.33 1246.54 375.988 1246.82 376.469 1247.39C376.953 1247.95 377.211 1248.64 377.242 1249.44ZM376.164 1249.12C376.117 1248.67 375.951 1248.28 375.666 1247.95C375.385 1247.62 374.979 1247.45 374.447 1247.45C373.928 1247.45 373.5 1247.62 373.164 1247.97C372.828 1248.31 372.645 1248.7 372.613 1249.13L376.164 1249.12ZM384.068 1249.19V1253.26H382.984V1249.19C382.984 1248.6 382.881 1248.17 382.674 1247.89C382.467 1247.61 382.143 1247.48 381.701 1247.48C381.197 1247.48 380.809 1247.66 380.535 1248.01C380.266 1248.37 380.131 1248.88 380.131 1249.55V1253.26H379.053V1246.7H380.131V1247.68C380.322 1247.31 380.582 1247.02 380.91 1246.83C381.238 1246.64 381.627 1246.54 382.076 1246.54C382.744 1246.54 383.242 1246.76 383.57 1247.2C383.902 1247.64 384.068 1248.3 384.068 1249.19ZM399.139 1248.05C398.908 1247.87 398.674 1247.74 398.436 1247.66C398.197 1247.58 397.936 1247.53 397.65 1247.53C396.979 1247.53 396.465 1247.75 396.109 1248.17C395.754 1248.59 395.576 1249.2 395.576 1250V1253.26H394.492V1246.7H395.576V1247.98C395.756 1247.51 396.031 1247.16 396.402 1246.91C396.777 1246.66 397.221 1246.54 397.732 1246.54C397.998 1246.54 398.246 1246.57 398.477 1246.64C398.707 1246.7 398.928 1246.81 399.139 1246.95V1248.05ZM406.164 1249.44V1249.97H401.494V1250C401.463 1250.9 401.633 1251.54 402.004 1251.93C402.379 1252.32 402.906 1252.51 403.586 1252.51C403.93 1252.51 404.289 1252.46 404.664 1252.35C405.039 1252.24 405.439 1252.08 405.865 1251.85V1252.92C405.455 1253.09 405.059 1253.22 404.676 1253.3C404.297 1253.39 403.93 1253.43 403.574 1253.43C402.555 1253.43 401.758 1253.12 401.184 1252.51C400.609 1251.9 400.322 1251.06 400.322 1249.98C400.322 1248.94 400.604 1248.1 401.166 1247.48C401.729 1246.85 402.479 1246.54 403.416 1246.54C404.252 1246.54 404.91 1246.82 405.391 1247.39C405.875 1247.95 406.133 1248.64 406.164 1249.44ZM405.086 1249.12C405.039 1248.67 404.873 1248.28 404.588 1247.95C404.307 1247.62 403.9 1247.45 403.369 1247.45C402.85 1247.45 402.422 1247.62 402.086 1247.97C401.75 1248.31 401.566 1248.7 401.535 1249.13L405.086 1249.12ZM412.533 1246.92V1247.98C412.225 1247.8 411.914 1247.67 411.602 1247.58C411.289 1247.49 410.971 1247.44 410.646 1247.44C410.158 1247.44 409.793 1247.52 409.551 1247.68C409.312 1247.84 409.193 1248.08 409.193 1248.4C409.193 1248.69 409.283 1248.91 409.463 1249.06C409.643 1249.2 410.09 1249.34 410.805 1249.48L411.238 1249.56C411.773 1249.66 412.178 1249.87 412.451 1250.17C412.729 1250.48 412.867 1250.87 412.867 1251.36C412.867 1252.01 412.637 1252.52 412.176 1252.88C411.715 1253.25 411.074 1253.43 410.254 1253.43C409.93 1253.43 409.59 1253.39 409.234 1253.32C408.879 1253.26 408.494 1253.16 408.08 1253.02V1251.91C408.482 1252.11 408.867 1252.27 409.234 1252.37C409.602 1252.48 409.949 1252.53 410.277 1252.53C410.754 1252.53 411.123 1252.43 411.385 1252.24C411.646 1252.04 411.777 1251.77 411.777 1251.42C411.777 1250.92 411.299 1250.58 410.342 1250.39L410.295 1250.38L409.891 1250.29C409.27 1250.17 408.816 1249.97 408.531 1249.68C408.246 1249.4 408.104 1249 408.104 1248.51C408.104 1247.88 408.316 1247.39 408.742 1247.05C409.168 1246.71 409.775 1246.54 410.564 1246.54C410.916 1246.54 411.254 1246.57 411.578 1246.64C411.902 1246.7 412.221 1246.8 412.533 1246.92ZM417.672 1247.45C417.125 1247.45 416.711 1247.67 416.43 1248.09C416.148 1248.52 416.008 1249.15 416.008 1249.98C416.008 1250.82 416.148 1251.45 416.43 1251.88C416.711 1252.3 417.125 1252.51 417.672 1252.51C418.223 1252.51 418.639 1252.3 418.92 1251.88C419.201 1251.45 419.342 1250.82 419.342 1249.98C419.342 1249.15 419.201 1248.52 418.92 1248.09C418.639 1247.67 418.223 1247.45 417.672 1247.45ZM417.672 1246.54C418.582 1246.54 419.277 1246.83 419.758 1247.42C420.242 1248.01 420.484 1248.87 420.484 1249.98C420.484 1251.1 420.244 1251.96 419.764 1252.55C419.283 1253.14 418.586 1253.43 417.672 1253.43C416.762 1253.43 416.066 1253.14 415.586 1252.55C415.105 1251.96 414.865 1251.1 414.865 1249.98C414.865 1248.87 415.105 1248.01 415.586 1247.42C416.066 1246.83 416.762 1246.54 417.672 1246.54ZM425.506 1250.89C425.506 1251.37 425.594 1251.74 425.77 1251.98C425.949 1252.23 426.213 1252.35 426.561 1252.35H427.82V1253.26H426.455C425.811 1253.26 425.311 1253.05 424.955 1252.64C424.604 1252.23 424.428 1251.64 424.428 1250.89V1244.95H422.699V1244.11H425.506V1250.89ZM429.109 1246.7H430.229L432.133 1252.2L434.043 1246.7H435.162L432.83 1253.26H431.441L429.109 1246.7ZM437.605 1246.72H440.365V1252.42H442.504V1253.26H437.148V1252.42H439.287V1247.56H437.605V1246.72ZM439.287 1244.17H440.365V1245.53H439.287V1244.17ZM449.143 1249.19V1253.26H448.059V1249.19C448.059 1248.6 447.955 1248.17 447.748 1247.89C447.541 1247.61 447.217 1247.48 446.775 1247.48C446.271 1247.48 445.883 1247.66 445.609 1248.01C445.34 1248.37 445.205 1248.88 445.205 1249.55V1253.26H444.127V1246.7H445.205V1247.68C445.396 1247.31 445.656 1247.02 445.984 1246.83C446.312 1246.64 446.701 1246.54 447.15 1246.54C447.818 1246.54 448.316 1246.76 448.645 1247.2C448.977 1247.64 449.143 1248.3 449.143 1249.19ZM455.242 1249.92C455.242 1249.12 455.109 1248.5 454.844 1248.09C454.582 1247.66 454.199 1247.45 453.695 1247.45C453.168 1247.45 452.766 1247.66 452.488 1248.09C452.211 1248.5 452.072 1249.12 452.072 1249.92C452.072 1250.73 452.211 1251.35 452.488 1251.78C452.77 1252.2 453.176 1252.41 453.707 1252.41C454.203 1252.41 454.582 1252.2 454.844 1251.77C455.109 1251.34 455.242 1250.73 455.242 1249.92ZM456.32 1252.84C456.32 1253.82 456.088 1254.57 455.623 1255.08C455.158 1255.58 454.475 1255.84 453.572 1255.84C453.275 1255.84 452.965 1255.81 452.641 1255.76C452.316 1255.7 451.992 1255.62 451.668 1255.51V1254.45C452.051 1254.63 452.398 1254.76 452.711 1254.85C453.023 1254.93 453.311 1254.98 453.572 1254.98C454.154 1254.98 454.578 1254.82 454.844 1254.5C455.109 1254.18 455.242 1253.68 455.242 1253V1252.95V1252.22C455.07 1252.58 454.836 1252.86 454.539 1253.04C454.242 1253.22 453.881 1253.31 453.455 1253.31C452.689 1253.31 452.078 1253 451.621 1252.39C451.164 1251.77 450.936 1250.95 450.936 1249.92C450.936 1248.89 451.164 1248.07 451.621 1247.46C452.078 1246.84 452.689 1246.54 453.455 1246.54C453.877 1246.54 454.234 1246.62 454.527 1246.79C454.82 1246.96 455.059 1247.22 455.242 1247.57V1246.72H456.32V1252.84ZM470.893 1252.92C470.604 1253.09 470.305 1253.22 469.996 1253.3C469.691 1253.39 469.379 1253.43 469.059 1253.43C468.043 1253.43 467.248 1253.12 466.674 1252.51C466.104 1251.91 465.818 1251.06 465.818 1249.98C465.818 1248.91 466.104 1248.06 466.674 1247.45C467.248 1246.84 468.043 1246.54 469.059 1246.54C469.375 1246.54 469.684 1246.58 469.984 1246.66C470.285 1246.74 470.588 1246.87 470.893 1247.04V1248.17C470.607 1247.92 470.32 1247.74 470.031 1247.62C469.746 1247.51 469.422 1247.45 469.059 1247.45C468.383 1247.45 467.863 1247.67 467.5 1248.11C467.137 1248.55 466.955 1249.17 466.955 1249.98C466.955 1250.79 467.137 1251.42 467.5 1251.86C467.867 1252.3 468.387 1252.51 469.059 1252.51C469.434 1252.51 469.77 1252.46 470.066 1252.34C470.363 1252.23 470.639 1252.05 470.893 1251.81V1252.92ZM475.516 1247.45C474.969 1247.45 474.555 1247.67 474.273 1248.09C473.992 1248.52 473.852 1249.15 473.852 1249.98C473.852 1250.82 473.992 1251.45 474.273 1251.88C474.555 1252.3 474.969 1252.51 475.516 1252.51C476.066 1252.51 476.482 1252.3 476.764 1251.88C477.045 1251.45 477.186 1250.82 477.186 1249.98C477.186 1249.15 477.045 1248.52 476.764 1248.09C476.482 1247.67 476.066 1247.45 475.516 1247.45ZM475.516 1246.54C476.426 1246.54 477.121 1246.83 477.602 1247.42C478.086 1248.01 478.328 1248.87 478.328 1249.98C478.328 1251.1 478.088 1251.96 477.607 1252.55C477.127 1253.14 476.43 1253.43 475.516 1253.43C474.605 1253.43 473.91 1253.14 473.43 1252.55C472.949 1251.96 472.709 1251.1 472.709 1249.98C472.709 1248.87 472.949 1248.01 473.43 1247.42C473.91 1246.83 474.605 1246.54 475.516 1246.54ZM483.098 1247.36C483.23 1247.08 483.398 1246.88 483.602 1246.74C483.809 1246.61 484.057 1246.54 484.346 1246.54C484.873 1246.54 485.244 1246.74 485.459 1247.15C485.678 1247.56 485.787 1248.33 485.787 1249.46V1253.26H484.803V1249.5C484.803 1248.58 484.75 1248 484.645 1247.78C484.543 1247.55 484.355 1247.44 484.082 1247.44C483.77 1247.44 483.555 1247.56 483.438 1247.8C483.324 1248.04 483.268 1248.61 483.268 1249.5V1253.26H482.283V1249.5C482.283 1248.57 482.227 1247.99 482.113 1247.77C482.004 1247.55 481.805 1247.44 481.516 1247.44C481.23 1247.44 481.031 1247.56 480.918 1247.8C480.809 1248.04 480.754 1248.61 480.754 1249.5V1253.26H479.775V1246.7H480.754V1247.26C480.883 1247.02 481.043 1246.85 481.234 1246.73C481.43 1246.6 481.65 1246.54 481.896 1246.54C482.193 1246.54 482.439 1246.61 482.635 1246.74C482.834 1246.88 482.988 1247.09 483.098 1247.36ZM488.564 1252.43V1255.76H487.48V1246.7H488.564V1247.53C488.744 1247.21 488.982 1246.96 489.279 1246.8C489.58 1246.62 489.926 1246.54 490.316 1246.54C491.109 1246.54 491.73 1246.84 492.18 1247.46C492.633 1248.07 492.859 1248.92 492.859 1250.01C492.859 1251.07 492.633 1251.91 492.18 1252.52C491.727 1253.13 491.105 1253.43 490.316 1253.43C489.918 1253.43 489.568 1253.34 489.268 1253.18C488.971 1253.01 488.736 1252.76 488.564 1252.43ZM491.729 1249.98C491.729 1249.15 491.596 1248.52 491.33 1248.09C491.068 1247.67 490.678 1247.45 490.158 1247.45C489.635 1247.45 489.238 1247.67 488.969 1248.1C488.699 1248.52 488.564 1249.15 488.564 1249.98C488.564 1250.81 488.699 1251.44 488.969 1251.87C489.238 1252.3 489.635 1252.51 490.158 1252.51C490.678 1252.51 491.068 1252.3 491.33 1251.88C491.596 1251.45 491.729 1250.82 491.729 1249.98ZM497.811 1250.89C497.811 1251.37 497.898 1251.74 498.074 1251.98C498.254 1252.23 498.518 1252.35 498.865 1252.35H500.125V1253.26H498.76C498.115 1253.26 497.615 1253.05 497.26 1252.64C496.908 1252.23 496.732 1251.64 496.732 1250.89V1244.95H495.004V1244.11H497.811V1250.89ZM507.391 1249.44V1249.97H502.721V1250C502.689 1250.9 502.859 1251.54 503.23 1251.93C503.605 1252.32 504.133 1252.51 504.812 1252.51C505.156 1252.51 505.516 1252.46 505.891 1252.35C506.266 1252.24 506.666 1252.08 507.092 1251.85V1252.92C506.682 1253.09 506.285 1253.22 505.902 1253.3C505.523 1253.39 505.156 1253.43 504.801 1253.43C503.781 1253.43 502.984 1253.12 502.41 1252.51C501.836 1251.9 501.549 1251.06 501.549 1249.98C501.549 1248.94 501.83 1248.1 502.393 1247.48C502.955 1246.85 503.705 1246.54 504.643 1246.54C505.479 1246.54 506.137 1246.82 506.617 1247.39C507.102 1247.95 507.359 1248.64 507.391 1249.44ZM506.312 1249.12C506.266 1248.67 506.1 1248.28 505.814 1247.95C505.533 1247.62 505.127 1247.45 504.596 1247.45C504.076 1247.45 503.648 1247.62 503.312 1247.97C502.977 1248.31 502.793 1248.7 502.762 1249.13L506.312 1249.12ZM514.609 1246.7L512.26 1249.84L514.838 1253.26H513.59L511.668 1250.63L509.752 1253.26H508.504L511.082 1249.84L508.732 1246.7H509.928L511.668 1249.07L513.396 1246.7H514.609ZM528.736 1252.92C528.447 1253.09 528.148 1253.22 527.84 1253.3C527.535 1253.39 527.223 1253.43 526.902 1253.43C525.887 1253.43 525.092 1253.12 524.518 1252.51C523.947 1251.91 523.662 1251.06 523.662 1249.98C523.662 1248.91 523.947 1248.06 524.518 1247.45C525.092 1246.84 525.887 1246.54 526.902 1246.54C527.219 1246.54 527.527 1246.58 527.828 1246.66C528.129 1246.74 528.432 1246.87 528.736 1247.04V1248.17C528.451 1247.92 528.164 1247.74 527.875 1247.62C527.59 1247.51 527.266 1247.45 526.902 1247.45C526.227 1247.45 525.707 1247.67 525.344 1248.11C524.98 1248.55 524.799 1249.17 524.799 1249.98C524.799 1250.79 524.98 1251.42 525.344 1251.86C525.711 1252.3 526.23 1252.51 526.902 1252.51C527.277 1252.51 527.613 1252.46 527.91 1252.34C528.207 1252.23 528.482 1252.05 528.736 1251.81V1252.92ZM533.359 1247.45C532.812 1247.45 532.398 1247.67 532.117 1248.09C531.836 1248.52 531.695 1249.15 531.695 1249.98C531.695 1250.82 531.836 1251.45 532.117 1251.88C532.398 1252.3 532.812 1252.51 533.359 1252.51C533.91 1252.51 534.326 1252.3 534.607 1251.88C534.889 1251.45 535.029 1250.82 535.029 1249.98C535.029 1249.15 534.889 1248.52 534.607 1248.09C534.326 1247.67 533.91 1247.45 533.359 1247.45ZM533.359 1246.54C534.27 1246.54 534.965 1246.83 535.445 1247.42C535.93 1248.01 536.172 1248.87 536.172 1249.98C536.172 1251.1 535.932 1251.96 535.451 1252.55C534.971 1253.14 534.273 1253.43 533.359 1253.43C532.449 1253.43 531.754 1253.14 531.273 1252.55C530.793 1251.96 530.553 1251.1 530.553 1249.98C530.553 1248.87 530.793 1248.01 531.273 1247.42C531.754 1246.83 532.449 1246.54 533.359 1246.54ZM543.139 1249.19V1253.26H542.055V1249.19C542.055 1248.6 541.951 1248.17 541.744 1247.89C541.537 1247.61 541.213 1247.48 540.771 1247.48C540.268 1247.48 539.879 1247.66 539.605 1248.01C539.336 1248.37 539.201 1248.88 539.201 1249.55V1253.26H538.123V1246.7H539.201V1247.68C539.393 1247.31 539.652 1247.02 539.98 1246.83C540.309 1246.64 540.697 1246.54 541.146 1246.54C541.814 1246.54 542.312 1246.76 542.641 1247.2C542.973 1247.64 543.139 1248.3 543.139 1249.19ZM550.439 1244.14V1245.04H549.215C548.828 1245.04 548.559 1245.12 548.406 1245.28C548.258 1245.43 548.184 1245.71 548.184 1246.12V1246.7H550.439V1247.53H548.184V1253.26H547.105V1247.53H545.354V1246.7H547.105V1246.24C547.105 1245.52 547.27 1244.99 547.598 1244.65C547.93 1244.31 548.445 1244.14 549.145 1244.14H550.439ZM555.654 1250.89C555.654 1251.37 555.742 1251.74 555.918 1251.98C556.098 1252.23 556.361 1252.35 556.709 1252.35H557.969V1253.26H556.604C555.959 1253.26 555.459 1253.05 555.104 1252.64C554.752 1252.23 554.576 1251.64 554.576 1250.89V1244.95H552.848V1244.11H555.654V1250.89ZM560.523 1246.72H563.283V1252.42H565.422V1253.26H560.066V1252.42H562.205V1247.56H560.523V1246.72ZM562.205 1244.17H563.283V1245.53H562.205V1244.17ZM572.119 1252.92C571.83 1253.09 571.531 1253.22 571.223 1253.3C570.918 1253.39 570.605 1253.43 570.285 1253.43C569.27 1253.43 568.475 1253.12 567.9 1252.51C567.33 1251.91 567.045 1251.06 567.045 1249.98C567.045 1248.91 567.33 1248.06 567.9 1247.45C568.475 1246.84 569.27 1246.54 570.285 1246.54C570.602 1246.54 570.91 1246.58 571.211 1246.66C571.512 1246.74 571.814 1246.87 572.119 1247.04V1248.17C571.834 1247.92 571.547 1247.74 571.258 1247.62C570.973 1247.51 570.648 1247.45 570.285 1247.45C569.609 1247.45 569.09 1247.67 568.727 1248.11C568.363 1248.55 568.182 1249.17 568.182 1249.98C568.182 1250.79 568.363 1251.42 568.727 1251.86C569.094 1252.3 569.613 1252.51 570.285 1252.51C570.66 1252.51 570.996 1252.46 571.293 1252.34C571.59 1252.23 571.865 1252.05 572.119 1251.81V1252.92ZM576.73 1244.83V1246.7H579.18V1247.53H576.73V1251.1C576.73 1251.58 576.822 1251.92 577.006 1252.11C577.189 1252.3 577.51 1252.4 577.967 1252.4H579.18V1253.26H577.861C577.053 1253.26 576.482 1253.1 576.15 1252.77C575.818 1252.45 575.652 1251.89 575.652 1251.1V1247.53H573.9V1246.7H575.652V1244.83H576.73ZM586.064 1246.92V1247.98C585.756 1247.8 585.445 1247.67 585.133 1247.58C584.82 1247.49 584.502 1247.44 584.178 1247.44C583.689 1247.44 583.324 1247.52 583.082 1247.68C582.844 1247.84 582.725 1248.08 582.725 1248.4C582.725 1248.69 582.814 1248.91 582.994 1249.06C583.174 1249.2 583.621 1249.34 584.336 1249.48L584.77 1249.56C585.305 1249.66 585.709 1249.87 585.982 1250.17C586.26 1250.48 586.398 1250.87 586.398 1251.36C586.398 1252.01 586.168 1252.52 585.707 1252.88C585.246 1253.25 584.605 1253.43 583.785 1253.43C583.461 1253.43 583.121 1253.39 582.766 1253.32C582.41 1253.26 582.025 1253.16 581.611 1253.02V1251.91C582.014 1252.11 582.398 1252.27 582.766 1252.37C583.133 1252.48 583.48 1252.53 583.809 1252.53C584.285 1252.53 584.654 1252.43 584.916 1252.24C585.178 1252.04 585.309 1251.77 585.309 1251.42C585.309 1250.92 584.83 1250.58 583.873 1250.39L583.826 1250.38L583.422 1250.29C582.801 1250.17 582.348 1249.97 582.062 1249.68C581.777 1249.4 581.635 1249 581.635 1248.51C581.635 1247.88 581.848 1247.39 582.273 1247.05C582.699 1246.71 583.307 1246.54 584.096 1246.54C584.447 1246.54 584.785 1246.57 585.109 1246.64C585.434 1246.7 585.752 1246.8 586.064 1246.92ZM593.131 1244.19V1247.78H591.818V1244.19H593.131ZM590.008 1244.19V1247.78H588.695V1244.19H590.008ZM209.916 1262.19V1265.78H208.604V1262.19H209.916ZM206.793 1262.19V1265.78H205.48V1262.19H206.793ZM216.818 1262.51H217.932L213.326 1272.37H212.207L216.818 1262.51ZM220.691 1264.72H223.451V1270.42H225.59V1271.26H220.234V1270.42H222.373V1265.56H220.691V1264.72ZM222.373 1262.17H223.451V1263.53H222.373V1262.17ZM230.031 1265.36C230.164 1265.08 230.332 1264.88 230.535 1264.74C230.742 1264.61 230.99 1264.54 231.279 1264.54C231.807 1264.54 232.178 1264.74 232.393 1265.15C232.611 1265.56 232.721 1266.33 232.721 1267.46V1271.26H231.736V1267.5C231.736 1266.58 231.684 1266 231.578 1265.78C231.477 1265.55 231.289 1265.44 231.016 1265.44C230.703 1265.44 230.488 1265.56 230.371 1265.8C230.258 1266.04 230.201 1266.61 230.201 1267.5V1271.26H229.217V1267.5C229.217 1266.57 229.16 1265.99 229.047 1265.77C228.938 1265.55 228.738 1265.44 228.449 1265.44C228.164 1265.44 227.965 1265.56 227.852 1265.8C227.742 1266.04 227.688 1266.61 227.688 1267.5V1271.26H226.709V1264.7H227.688V1265.26C227.816 1265.02 227.977 1264.85 228.168 1264.73C228.363 1264.6 228.584 1264.54 228.83 1264.54C229.127 1264.54 229.373 1264.61 229.568 1264.74C229.768 1264.88 229.922 1265.09 230.031 1265.36ZM237.414 1267.96H237.057C236.428 1267.96 235.953 1268.07 235.633 1268.29C235.316 1268.51 235.158 1268.84 235.158 1269.28C235.158 1269.67 235.277 1269.98 235.516 1270.2C235.754 1270.42 236.084 1270.53 236.506 1270.53C237.1 1270.53 237.566 1270.32 237.906 1269.91C238.246 1269.5 238.418 1268.93 238.422 1268.2V1267.96H237.414ZM239.506 1267.51V1271.26H238.422V1270.29C238.191 1270.68 237.9 1270.97 237.549 1271.15C237.201 1271.34 236.777 1271.43 236.277 1271.43C235.609 1271.43 235.076 1271.24 234.678 1270.87C234.279 1270.49 234.08 1269.98 234.08 1269.35C234.08 1268.62 234.324 1268.06 234.812 1267.68C235.305 1267.31 236.025 1267.12 236.975 1267.12H238.422V1266.95C238.418 1266.42 238.285 1266.04 238.023 1265.81C237.762 1265.57 237.344 1265.45 236.77 1265.45C236.402 1265.45 236.031 1265.51 235.656 1265.61C235.281 1265.72 234.916 1265.87 234.561 1266.07V1265C234.959 1264.84 235.34 1264.73 235.703 1264.66C236.07 1264.58 236.426 1264.54 236.77 1264.54C237.312 1264.54 237.775 1264.62 238.158 1264.78C238.545 1264.94 238.857 1265.18 239.096 1265.5C239.244 1265.69 239.35 1265.94 239.412 1266.23C239.475 1266.51 239.506 1266.94 239.506 1267.51ZM245.559 1267.92C245.559 1267.12 245.426 1266.5 245.16 1266.09C244.898 1265.66 244.516 1265.45 244.012 1265.45C243.484 1265.45 243.082 1265.66 242.805 1266.09C242.527 1266.5 242.389 1267.12 242.389 1267.92C242.389 1268.73 242.527 1269.35 242.805 1269.78C243.086 1270.2 243.492 1270.41 244.023 1270.41C244.52 1270.41 244.898 1270.2 245.16 1269.77C245.426 1269.34 245.559 1268.73 245.559 1267.92ZM246.637 1270.84C246.637 1271.82 246.404 1272.57 245.939 1273.08C245.475 1273.58 244.791 1273.84 243.889 1273.84C243.592 1273.84 243.281 1273.81 242.957 1273.76C242.633 1273.7 242.309 1273.62 241.984 1273.51V1272.45C242.367 1272.63 242.715 1272.76 243.027 1272.85C243.34 1272.93 243.627 1272.98 243.889 1272.98C244.471 1272.98 244.895 1272.82 245.16 1272.5C245.426 1272.18 245.559 1271.68 245.559 1271V1270.95V1270.22C245.387 1270.58 245.152 1270.86 244.855 1271.04C244.559 1271.22 244.197 1271.31 243.771 1271.31C243.006 1271.31 242.395 1271 241.938 1270.39C241.48 1269.77 241.252 1268.95 241.252 1267.92C241.252 1266.89 241.48 1266.07 241.938 1265.46C242.395 1264.84 243.006 1264.54 243.771 1264.54C244.193 1264.54 244.551 1264.62 244.844 1264.79C245.137 1264.96 245.375 1265.22 245.559 1265.57V1264.72H246.637V1270.84ZM254.324 1267.44V1267.97H249.654V1268C249.623 1268.9 249.793 1269.54 250.164 1269.93C250.539 1270.32 251.066 1270.51 251.746 1270.51C252.09 1270.51 252.449 1270.46 252.824 1270.35C253.199 1270.24 253.6 1270.08 254.025 1269.85V1270.92C253.615 1271.09 253.219 1271.22 252.836 1271.3C252.457 1271.39 252.09 1271.43 251.734 1271.43C250.715 1271.43 249.918 1271.12 249.344 1270.51C248.77 1269.9 248.482 1269.06 248.482 1267.98C248.482 1266.94 248.764 1266.1 249.326 1265.48C249.889 1264.85 250.639 1264.54 251.576 1264.54C252.412 1264.54 253.07 1264.82 253.551 1265.39C254.035 1265.95 254.293 1266.64 254.324 1267.44ZM253.246 1267.12C253.199 1266.67 253.033 1266.28 252.748 1265.95C252.467 1265.62 252.061 1265.45 251.529 1265.45C251.01 1265.45 250.582 1265.62 250.246 1265.97C249.91 1266.31 249.727 1266.7 249.695 1267.13L253.246 1267.12ZM260.693 1264.92V1265.98C260.385 1265.8 260.074 1265.67 259.762 1265.58C259.449 1265.49 259.131 1265.44 258.807 1265.44C258.318 1265.44 257.953 1265.52 257.711 1265.68C257.473 1265.84 257.354 1266.08 257.354 1266.4C257.354 1266.69 257.443 1266.91 257.623 1267.06C257.803 1267.2 258.25 1267.34 258.965 1267.48L259.398 1267.56C259.934 1267.66 260.338 1267.87 260.611 1268.17C260.889 1268.48 261.027 1268.87 261.027 1269.36C261.027 1270.01 260.797 1270.52 260.336 1270.88C259.875 1271.25 259.234 1271.43 258.414 1271.43C258.09 1271.43 257.75 1271.39 257.395 1271.32C257.039 1271.26 256.654 1271.16 256.24 1271.02V1269.91C256.643 1270.11 257.027 1270.27 257.395 1270.37C257.762 1270.48 258.109 1270.53 258.438 1270.53C258.914 1270.53 259.283 1270.43 259.545 1270.24C259.807 1270.04 259.938 1269.77 259.938 1269.42C259.938 1268.92 259.459 1268.58 258.502 1268.39L258.455 1268.38L258.051 1268.29C257.43 1268.17 256.977 1267.97 256.691 1267.68C256.406 1267.4 256.264 1267 256.264 1266.51C256.264 1265.88 256.477 1265.39 256.902 1265.05C257.328 1264.71 257.936 1264.54 258.725 1264.54C259.076 1264.54 259.414 1264.57 259.738 1264.64C260.062 1264.7 260.381 1264.8 260.693 1264.92ZM267.432 1262.51H268.545L263.939 1272.37H262.82L267.432 1262.51ZM270.039 1264.7H271.158L273.062 1270.2L274.973 1264.7H276.092L273.76 1271.26H272.371L270.039 1264.7ZM282.385 1264.92V1265.98C282.076 1265.8 281.766 1265.67 281.453 1265.58C281.141 1265.49 280.822 1265.44 280.498 1265.44C280.01 1265.44 279.645 1265.52 279.402 1265.68C279.164 1265.84 279.045 1266.08 279.045 1266.4C279.045 1266.69 279.135 1266.91 279.314 1267.06C279.494 1267.2 279.941 1267.34 280.656 1267.48L281.09 1267.56C281.625 1267.66 282.029 1267.87 282.303 1268.17C282.58 1268.48 282.719 1268.87 282.719 1269.36C282.719 1270.01 282.488 1270.52 282.027 1270.88C281.566 1271.25 280.926 1271.43 280.105 1271.43C279.781 1271.43 279.441 1271.39 279.086 1271.32C278.73 1271.26 278.346 1271.16 277.932 1271.02V1269.91C278.334 1270.11 278.719 1270.27 279.086 1270.37C279.453 1270.48 279.801 1270.53 280.129 1270.53C280.605 1270.53 280.975 1270.43 281.236 1270.24C281.498 1270.04 281.629 1269.77 281.629 1269.42C281.629 1268.92 281.15 1268.58 280.193 1268.39L280.146 1268.38L279.742 1268.29C279.121 1268.17 278.668 1267.97 278.383 1267.68C278.098 1267.4 277.955 1267 277.955 1266.51C277.955 1265.88 278.168 1265.39 278.594 1265.05C279.02 1264.71 279.627 1264.54 280.416 1264.54C280.768 1264.54 281.105 1264.57 281.43 1264.64C281.754 1264.7 282.072 1264.8 282.385 1264.92ZM290.131 1270.92C289.842 1271.09 289.543 1271.22 289.234 1271.3C288.93 1271.39 288.617 1271.43 288.297 1271.43C287.281 1271.43 286.486 1271.12 285.912 1270.51C285.342 1269.91 285.057 1269.06 285.057 1267.98C285.057 1266.91 285.342 1266.06 285.912 1265.45C286.486 1264.84 287.281 1264.54 288.297 1264.54C288.613 1264.54 288.922 1264.58 289.223 1264.66C289.523 1264.74 289.826 1264.87 290.131 1265.04V1266.17C289.846 1265.92 289.559 1265.74 289.27 1265.62C288.984 1265.51 288.66 1265.45 288.297 1265.45C287.621 1265.45 287.102 1265.67 286.738 1266.11C286.375 1266.55 286.193 1267.17 286.193 1267.98C286.193 1268.79 286.375 1269.42 286.738 1269.86C287.105 1270.3 287.625 1270.51 288.297 1270.51C288.672 1270.51 289.008 1270.46 289.305 1270.34C289.602 1270.23 289.877 1270.05 290.131 1269.81V1270.92ZM294.754 1265.45C294.207 1265.45 293.793 1265.67 293.512 1266.09C293.23 1266.52 293.09 1267.15 293.09 1267.98C293.09 1268.82 293.23 1269.45 293.512 1269.88C293.793 1270.3 294.207 1270.51 294.754 1270.51C295.305 1270.51 295.721 1270.3 296.002 1269.88C296.283 1269.45 296.424 1268.82 296.424 1267.98C296.424 1267.15 296.283 1266.52 296.002 1266.09C295.721 1265.67 295.305 1265.45 294.754 1265.45ZM294.754 1264.54C295.664 1264.54 296.359 1264.83 296.84 1265.42C297.324 1266.01 297.566 1266.87 297.566 1267.98C297.566 1269.1 297.326 1269.96 296.846 1270.55C296.365 1271.14 295.668 1271.43 294.754 1271.43C293.844 1271.43 293.148 1271.14 292.668 1270.55C292.188 1269.96 291.947 1269.1 291.947 1267.98C291.947 1266.87 292.188 1266.01 292.668 1265.42C293.148 1264.83 293.844 1264.54 294.754 1264.54ZM303.402 1265.53V1262.14H304.48V1271.26H303.402V1270.43C303.223 1270.76 302.982 1271.01 302.682 1271.18C302.385 1271.34 302.041 1271.43 301.65 1271.43C300.857 1271.43 300.232 1271.12 299.775 1270.51C299.322 1269.89 299.096 1269.04 299.096 1267.96C299.096 1266.89 299.324 1266.06 299.781 1265.45C300.238 1264.84 300.861 1264.54 301.65 1264.54C302.045 1264.54 302.393 1264.62 302.693 1264.8C302.994 1264.96 303.23 1265.21 303.402 1265.53ZM300.232 1267.98C300.232 1268.82 300.365 1269.45 300.631 1269.88C300.896 1270.3 301.289 1270.51 301.809 1270.51C302.328 1270.51 302.723 1270.3 302.992 1269.87C303.266 1269.44 303.402 1268.81 303.402 1267.98C303.402 1267.15 303.266 1266.52 302.992 1266.1C302.723 1265.67 302.328 1265.45 301.809 1265.45C301.289 1265.45 300.896 1265.67 300.631 1266.09C300.365 1266.52 300.232 1267.15 300.232 1267.98ZM312.168 1267.44V1267.97H307.498V1268C307.467 1268.9 307.637 1269.54 308.008 1269.93C308.383 1270.32 308.91 1270.51 309.59 1270.51C309.934 1270.51 310.293 1270.46 310.668 1270.35C311.043 1270.24 311.443 1270.08 311.869 1269.85V1270.92C311.459 1271.09 311.062 1271.22 310.68 1271.3C310.301 1271.39 309.934 1271.43 309.578 1271.43C308.559 1271.43 307.762 1271.12 307.188 1270.51C306.613 1269.9 306.326 1269.06 306.326 1267.98C306.326 1266.94 306.607 1266.1 307.17 1265.48C307.732 1264.85 308.482 1264.54 309.42 1264.54C310.256 1264.54 310.914 1264.82 311.395 1265.39C311.879 1265.95 312.137 1266.64 312.168 1267.44ZM311.09 1267.12C311.043 1266.67 310.877 1266.28 310.592 1265.95C310.311 1265.62 309.904 1265.45 309.373 1265.45C308.854 1265.45 308.426 1265.62 308.09 1265.97C307.754 1266.31 307.57 1266.7 307.539 1267.13L311.09 1267.12ZM313.434 1267.02H319.645V1268.01H313.434V1267.02ZM324.027 1265.36C324.16 1265.08 324.328 1264.88 324.531 1264.74C324.738 1264.61 324.986 1264.54 325.275 1264.54C325.803 1264.54 326.174 1264.74 326.389 1265.15C326.607 1265.56 326.717 1266.33 326.717 1267.46V1271.26H325.732V1267.5C325.732 1266.58 325.68 1266 325.574 1265.78C325.473 1265.55 325.285 1265.44 325.012 1265.44C324.699 1265.44 324.484 1265.56 324.367 1265.8C324.254 1266.04 324.197 1266.61 324.197 1267.5V1271.26H323.213V1267.5C323.213 1266.57 323.156 1265.99 323.043 1265.77C322.934 1265.55 322.734 1265.44 322.445 1265.44C322.16 1265.44 321.961 1265.56 321.848 1265.8C321.738 1266.04 321.684 1266.61 321.684 1267.5V1271.26H320.705V1264.7H321.684V1265.26C321.812 1265.02 321.973 1264.85 322.164 1264.73C322.359 1264.6 322.58 1264.54 322.826 1264.54C323.123 1264.54 323.369 1264.61 323.564 1264.74C323.764 1264.88 323.918 1265.09 324.027 1265.36ZM333.859 1267.44V1267.97H329.189V1268C329.158 1268.9 329.328 1269.54 329.699 1269.93C330.074 1270.32 330.602 1270.51 331.281 1270.51C331.625 1270.51 331.984 1270.46 332.359 1270.35C332.734 1270.24 333.135 1270.08 333.561 1269.85V1270.92C333.15 1271.09 332.754 1271.22 332.371 1271.3C331.992 1271.39 331.625 1271.43 331.27 1271.43C330.25 1271.43 329.453 1271.12 328.879 1270.51C328.305 1269.9 328.018 1269.06 328.018 1267.98C328.018 1266.94 328.299 1266.1 328.861 1265.48C329.424 1264.85 330.174 1264.54 331.111 1264.54C331.947 1264.54 332.605 1264.82 333.086 1265.39C333.57 1265.95 333.828 1266.64 333.859 1267.44ZM332.781 1267.12C332.734 1266.67 332.568 1266.28 332.283 1265.95C332.002 1265.62 331.596 1265.45 331.064 1265.45C330.545 1265.45 330.117 1265.62 329.781 1265.97C329.445 1266.31 329.262 1266.7 329.23 1267.13L332.781 1267.12ZM341.295 1266.05C341.064 1265.87 340.83 1265.74 340.592 1265.66C340.354 1265.58 340.092 1265.53 339.807 1265.53C339.135 1265.53 338.621 1265.75 338.266 1266.17C337.91 1266.59 337.732 1267.2 337.732 1268V1271.26H336.648V1264.7H337.732V1265.98C337.912 1265.51 338.188 1265.16 338.559 1264.91C338.934 1264.66 339.377 1264.54 339.889 1264.54C340.154 1264.54 340.402 1264.57 340.633 1264.64C340.863 1264.7 341.084 1264.81 341.295 1264.95V1266.05ZM346.785 1267.92C346.785 1267.12 346.652 1266.5 346.387 1266.09C346.125 1265.66 345.742 1265.45 345.238 1265.45C344.711 1265.45 344.309 1265.66 344.031 1266.09C343.754 1266.5 343.615 1267.12 343.615 1267.92C343.615 1268.73 343.754 1269.35 344.031 1269.78C344.312 1270.2 344.719 1270.41 345.25 1270.41C345.746 1270.41 346.125 1270.2 346.387 1269.77C346.652 1269.34 346.785 1268.73 346.785 1267.92ZM347.863 1270.84C347.863 1271.82 347.631 1272.57 347.166 1273.08C346.701 1273.58 346.018 1273.84 345.115 1273.84C344.818 1273.84 344.508 1273.81 344.184 1273.76C343.859 1273.7 343.535 1273.62 343.211 1273.51V1272.45C343.594 1272.63 343.941 1272.76 344.254 1272.85C344.566 1272.93 344.854 1272.98 345.115 1272.98C345.697 1272.98 346.121 1272.82 346.387 1272.5C346.652 1272.18 346.785 1271.68 346.785 1271V1270.95V1270.22C346.613 1270.58 346.379 1270.86 346.082 1271.04C345.785 1271.22 345.424 1271.31 344.998 1271.31C344.232 1271.31 343.621 1271 343.164 1270.39C342.707 1269.77 342.479 1268.95 342.479 1267.92C342.479 1266.89 342.707 1266.07 343.164 1265.46C343.621 1264.84 344.232 1264.54 344.998 1264.54C345.42 1264.54 345.777 1264.62 346.07 1264.79C346.363 1264.96 346.602 1265.22 346.785 1265.57V1264.72H347.863V1270.84ZM355.551 1267.44V1267.97H350.881V1268C350.85 1268.9 351.02 1269.54 351.391 1269.93C351.766 1270.32 352.293 1270.51 352.973 1270.51C353.316 1270.51 353.676 1270.46 354.051 1270.35C354.426 1270.24 354.826 1270.08 355.252 1269.85V1270.92C354.842 1271.09 354.445 1271.22 354.062 1271.3C353.684 1271.39 353.316 1271.43 352.961 1271.43C351.941 1271.43 351.145 1271.12 350.57 1270.51C349.996 1269.9 349.709 1269.06 349.709 1267.98C349.709 1266.94 349.99 1266.1 350.553 1265.48C351.115 1264.85 351.865 1264.54 352.803 1264.54C353.639 1264.54 354.297 1264.82 354.777 1265.39C355.262 1265.95 355.52 1266.64 355.551 1267.44ZM354.473 1267.12C354.426 1266.67 354.26 1266.28 353.975 1265.95C353.693 1265.62 353.287 1265.45 352.756 1265.45C352.236 1265.45 351.809 1265.62 351.473 1265.97C351.137 1266.31 350.953 1266.7 350.922 1267.13L354.473 1267.12ZM356.816 1267.02H363.027V1268.01H356.816V1267.02ZM370.012 1267.44V1267.97H365.342V1268C365.311 1268.9 365.48 1269.54 365.852 1269.93C366.227 1270.32 366.754 1270.51 367.434 1270.51C367.777 1270.51 368.137 1270.46 368.512 1270.35C368.887 1270.24 369.287 1270.08 369.713 1269.85V1270.92C369.303 1271.09 368.906 1271.22 368.523 1271.3C368.145 1271.39 367.777 1271.43 367.422 1271.43C366.402 1271.43 365.605 1271.12 365.031 1270.51C364.457 1269.9 364.17 1269.06 364.17 1267.98C364.17 1266.94 364.451 1266.1 365.014 1265.48C365.576 1264.85 366.326 1264.54 367.264 1264.54C368.1 1264.54 368.758 1264.82 369.238 1265.39C369.723 1265.95 369.98 1266.64 370.012 1267.44ZM368.934 1267.12C368.887 1266.67 368.721 1266.28 368.436 1265.95C368.154 1265.62 367.748 1265.45 367.217 1265.45C366.697 1265.45 366.27 1265.62 365.934 1265.97C365.598 1266.31 365.414 1266.7 365.383 1267.13L368.934 1267.12ZM375.707 1265.53V1262.14H376.785V1271.26H375.707V1270.43C375.527 1270.76 375.287 1271.01 374.986 1271.18C374.689 1271.34 374.346 1271.43 373.955 1271.43C373.162 1271.43 372.537 1271.12 372.08 1270.51C371.627 1269.89 371.4 1269.04 371.4 1267.96C371.4 1266.89 371.629 1266.06 372.086 1265.45C372.543 1264.84 373.166 1264.54 373.955 1264.54C374.35 1264.54 374.697 1264.62 374.998 1264.8C375.299 1264.96 375.535 1265.21 375.707 1265.53ZM372.537 1267.98C372.537 1268.82 372.67 1269.45 372.936 1269.88C373.201 1270.3 373.594 1270.51 374.113 1270.51C374.633 1270.51 375.027 1270.3 375.297 1269.87C375.57 1269.44 375.707 1268.81 375.707 1267.98C375.707 1267.15 375.57 1266.52 375.297 1266.1C375.027 1265.67 374.633 1265.45 374.113 1265.45C373.594 1265.45 373.201 1265.67 372.936 1266.09C372.67 1266.52 372.537 1267.15 372.537 1267.98ZM379.762 1264.72H382.521V1270.42H384.66V1271.26H379.305V1270.42H381.443V1265.56H379.762V1264.72ZM381.443 1262.17H382.521V1263.53H381.443V1262.17ZM388.738 1262.83V1264.7H391.188V1265.53H388.738V1269.1C388.738 1269.58 388.83 1269.92 389.014 1270.11C389.197 1270.3 389.518 1270.4 389.975 1270.4H391.188V1271.26H389.869C389.061 1271.26 388.49 1271.1 388.158 1270.77C387.826 1270.45 387.66 1269.89 387.66 1269.1V1265.53H385.908V1264.7H387.66V1262.83H388.738ZM395.98 1265.45C395.434 1265.45 395.02 1265.67 394.738 1266.09C394.457 1266.52 394.316 1267.15 394.316 1267.98C394.316 1268.82 394.457 1269.45 394.738 1269.88C395.02 1270.3 395.434 1270.51 395.98 1270.51C396.531 1270.51 396.947 1270.3 397.229 1269.88C397.51 1269.45 397.65 1268.82 397.65 1267.98C397.65 1267.15 397.51 1266.52 397.229 1266.09C396.947 1265.67 396.531 1265.45 395.98 1265.45ZM395.98 1264.54C396.891 1264.54 397.586 1264.83 398.066 1265.42C398.551 1266.01 398.793 1266.87 398.793 1267.98C398.793 1269.1 398.553 1269.96 398.072 1270.55C397.592 1271.14 396.895 1271.43 395.98 1271.43C395.07 1271.43 394.375 1271.14 393.895 1270.55C393.414 1269.96 393.174 1269.1 393.174 1267.98C393.174 1266.87 393.414 1266.01 393.895 1265.42C394.375 1264.83 395.07 1264.54 395.98 1264.54ZM406.369 1266.05C406.139 1265.87 405.904 1265.74 405.666 1265.66C405.428 1265.58 405.166 1265.53 404.881 1265.53C404.209 1265.53 403.695 1265.75 403.34 1266.17C402.984 1266.59 402.807 1267.2 402.807 1268V1271.26H401.723V1264.7H402.807V1265.98C402.986 1265.51 403.262 1265.16 403.633 1264.91C404.008 1264.66 404.451 1264.54 404.963 1264.54C405.229 1264.54 405.477 1264.57 405.707 1264.64C405.938 1264.7 406.158 1264.81 406.369 1264.95V1266.05ZM409.111 1268.89H411.174V1271.26H409.111V1268.89ZM416.26 1270.43V1273.76H415.176V1264.7H416.26V1265.53C416.439 1265.21 416.678 1264.96 416.975 1264.8C417.275 1264.62 417.621 1264.54 418.012 1264.54C418.805 1264.54 419.426 1264.84 419.875 1265.46C420.328 1266.07 420.555 1266.92 420.555 1268.01C420.555 1269.07 420.328 1269.91 419.875 1270.52C419.422 1271.13 418.801 1271.43 418.012 1271.43C417.613 1271.43 417.264 1271.34 416.963 1271.18C416.666 1271.01 416.432 1270.76 416.26 1270.43ZM419.424 1267.98C419.424 1267.15 419.291 1266.52 419.025 1266.09C418.764 1265.67 418.373 1265.45 417.854 1265.45C417.33 1265.45 416.934 1265.67 416.664 1266.1C416.395 1266.52 416.26 1267.15 416.26 1267.98C416.26 1268.81 416.395 1269.44 416.664 1269.87C416.934 1270.3 417.33 1270.51 417.854 1270.51C418.373 1270.51 418.764 1270.3 419.025 1269.88C419.291 1269.45 419.424 1268.82 419.424 1267.98ZM427.451 1267.19V1271.26H426.367V1267.19C426.367 1266.6 426.264 1266.17 426.057 1265.89C425.85 1265.61 425.525 1265.48 425.084 1265.48C424.58 1265.48 424.191 1265.66 423.918 1266.01C423.648 1266.37 423.514 1266.88 423.514 1267.55V1271.26H422.436V1264.7H423.514V1265.68C423.705 1265.31 423.965 1265.02 424.293 1264.83C424.621 1264.64 425.01 1264.54 425.459 1264.54C426.127 1264.54 426.625 1264.76 426.953 1265.2C427.285 1265.64 427.451 1266.3 427.451 1267.19ZM433.551 1267.92C433.551 1267.12 433.418 1266.5 433.152 1266.09C432.891 1265.66 432.508 1265.45 432.004 1265.45C431.477 1265.45 431.074 1265.66 430.797 1266.09C430.52 1266.5 430.381 1267.12 430.381 1267.92C430.381 1268.73 430.52 1269.35 430.797 1269.78C431.078 1270.2 431.484 1270.41 432.016 1270.41C432.512 1270.41 432.891 1270.2 433.152 1269.77C433.418 1269.34 433.551 1268.73 433.551 1267.92ZM434.629 1270.84C434.629 1271.82 434.396 1272.57 433.932 1273.08C433.467 1273.58 432.783 1273.84 431.881 1273.84C431.584 1273.84 431.273 1273.81 430.949 1273.76C430.625 1273.7 430.301 1273.62 429.977 1273.51V1272.45C430.359 1272.63 430.707 1272.76 431.02 1272.85C431.332 1272.93 431.619 1272.98 431.881 1272.98C432.463 1272.98 432.887 1272.82 433.152 1272.5C433.418 1272.18 433.551 1271.68 433.551 1271V1270.95V1270.22C433.379 1270.58 433.145 1270.86 432.848 1271.04C432.551 1271.22 432.189 1271.31 431.764 1271.31C430.998 1271.31 430.387 1271 429.93 1270.39C429.473 1269.77 429.244 1268.95 429.244 1267.92C429.244 1266.89 429.473 1266.07 429.93 1265.46C430.387 1264.84 430.998 1264.54 431.764 1264.54C432.186 1264.54 432.543 1264.62 432.836 1264.79C433.129 1264.96 433.367 1265.22 433.551 1265.57V1264.72H434.629V1270.84ZM441.291 1262.19V1265.78H439.979V1262.19H441.291ZM438.168 1262.19V1265.78H436.855V1262.19H438.168ZM180.994 1280.19V1283.78H179.682V1280.19H180.994ZM177.871 1280.19V1283.78H176.559V1280.19H177.871ZM187.896 1280.51H189.01L184.404 1290.37H183.285L187.896 1280.51ZM192.115 1288.43V1291.76H191.031V1282.7H192.115V1283.53C192.295 1283.21 192.533 1282.96 192.83 1282.8C193.131 1282.62 193.477 1282.54 193.867 1282.54C194.66 1282.54 195.281 1282.84 195.73 1283.46C196.184 1284.07 196.41 1284.92 196.41 1286.01C196.41 1287.07 196.184 1287.91 195.73 1288.52C195.277 1289.13 194.656 1289.43 193.867 1289.43C193.469 1289.43 193.119 1289.34 192.818 1289.18C192.521 1289.01 192.287 1288.76 192.115 1288.43ZM195.279 1285.98C195.279 1285.15 195.146 1284.52 194.881 1284.09C194.619 1283.67 194.229 1283.45 193.709 1283.45C193.186 1283.45 192.789 1283.67 192.52 1284.1C192.25 1284.52 192.115 1285.15 192.115 1285.98C192.115 1286.81 192.25 1287.44 192.52 1287.87C192.789 1288.3 193.186 1288.51 193.709 1288.51C194.229 1288.51 194.619 1288.3 194.881 1287.88C195.146 1287.45 195.279 1286.82 195.279 1285.98ZM203.916 1284.05C203.686 1283.87 203.451 1283.74 203.213 1283.66C202.975 1283.58 202.713 1283.53 202.428 1283.53C201.756 1283.53 201.242 1283.75 200.887 1284.17C200.531 1284.59 200.354 1285.2 200.354 1286V1289.26H199.27V1282.7H200.354V1283.98C200.533 1283.51 200.809 1283.16 201.18 1282.91C201.555 1282.66 201.998 1282.54 202.51 1282.54C202.775 1282.54 203.023 1282.57 203.254 1282.64C203.484 1282.7 203.705 1282.81 203.916 1282.95V1284.05ZM207.988 1283.45C207.441 1283.45 207.027 1283.67 206.746 1284.09C206.465 1284.52 206.324 1285.15 206.324 1285.98C206.324 1286.82 206.465 1287.45 206.746 1287.88C207.027 1288.3 207.441 1288.51 207.988 1288.51C208.539 1288.51 208.955 1288.3 209.236 1287.88C209.518 1287.45 209.658 1286.82 209.658 1285.98C209.658 1285.15 209.518 1284.52 209.236 1284.09C208.955 1283.67 208.539 1283.45 207.988 1283.45ZM207.988 1282.54C208.898 1282.54 209.594 1282.83 210.074 1283.42C210.559 1284.01 210.801 1284.87 210.801 1285.98C210.801 1287.1 210.561 1287.96 210.08 1288.55C209.6 1289.14 208.902 1289.43 207.988 1289.43C207.078 1289.43 206.383 1289.14 205.902 1288.55C205.422 1287.96 205.182 1287.1 205.182 1285.98C205.182 1284.87 205.422 1284.01 205.902 1283.42C206.383 1282.83 207.078 1282.54 207.988 1282.54ZM215.125 1289.38V1283.53H213.268V1282.7H216.203V1289.38C216.203 1290.14 216.027 1290.72 215.676 1291.13C215.328 1291.55 214.832 1291.76 214.188 1291.76H212.699V1290.84H214.07C214.422 1290.84 214.686 1290.72 214.861 1290.47C215.037 1290.23 215.125 1289.86 215.125 1289.38ZM215.125 1280.14H216.203V1281.51H215.125V1280.14ZM225.402 1285.44V1285.97H220.732V1286C220.701 1286.9 220.871 1287.54 221.242 1287.93C221.617 1288.32 222.145 1288.51 222.824 1288.51C223.168 1288.51 223.527 1288.46 223.902 1288.35C224.277 1288.24 224.678 1288.08 225.104 1287.85V1288.92C224.693 1289.09 224.297 1289.22 223.914 1289.3C223.535 1289.39 223.168 1289.43 222.812 1289.43C221.793 1289.43 220.996 1289.12 220.422 1288.51C219.848 1287.9 219.561 1287.06 219.561 1285.98C219.561 1284.94 219.842 1284.1 220.404 1283.48C220.967 1282.85 221.717 1282.54 222.654 1282.54C223.49 1282.54 224.148 1282.82 224.629 1283.39C225.113 1283.95 225.371 1284.64 225.402 1285.44ZM224.324 1285.12C224.277 1284.67 224.111 1284.28 223.826 1283.95C223.545 1283.62 223.139 1283.45 222.607 1283.45C222.088 1283.45 221.66 1283.62 221.324 1283.97C220.988 1284.31 220.805 1284.7 220.773 1285.13L224.324 1285.12ZM232.287 1288.92C231.998 1289.09 231.699 1289.22 231.391 1289.3C231.086 1289.39 230.773 1289.43 230.453 1289.43C229.438 1289.43 228.643 1289.12 228.068 1288.51C227.498 1287.91 227.213 1287.06 227.213 1285.98C227.213 1284.91 227.498 1284.06 228.068 1283.45C228.643 1282.84 229.438 1282.54 230.453 1282.54C230.77 1282.54 231.078 1282.58 231.379 1282.66C231.68 1282.74 231.982 1282.87 232.287 1283.04V1284.17C232.002 1283.92 231.715 1283.74 231.426 1283.62C231.141 1283.51 230.816 1283.45 230.453 1283.45C229.777 1283.45 229.258 1283.67 228.895 1284.11C228.531 1284.55 228.35 1285.17 228.35 1285.98C228.35 1286.79 228.531 1287.42 228.895 1287.86C229.262 1288.3 229.781 1288.51 230.453 1288.51C230.828 1288.51 231.164 1288.46 231.461 1288.34C231.758 1288.23 232.033 1288.05 232.287 1287.81V1288.92ZM236.898 1280.83V1282.7H239.348V1283.53H236.898V1287.1C236.898 1287.58 236.99 1287.92 237.174 1288.11C237.357 1288.3 237.678 1288.4 238.135 1288.4H239.348V1289.26H238.029C237.221 1289.26 236.65 1289.1 236.318 1288.77C235.986 1288.45 235.82 1287.89 235.82 1287.1V1283.53H234.068V1282.7H235.82V1280.83H236.898ZM246.232 1282.92V1283.98C245.924 1283.8 245.613 1283.67 245.301 1283.58C244.988 1283.49 244.67 1283.44 244.346 1283.44C243.857 1283.44 243.492 1283.52 243.25 1283.68C243.012 1283.84 242.893 1284.08 242.893 1284.4C242.893 1284.69 242.982 1284.91 243.162 1285.06C243.342 1285.2 243.789 1285.34 244.504 1285.48L244.938 1285.56C245.473 1285.66 245.877 1285.87 246.15 1286.17C246.428 1286.48 246.566 1286.87 246.566 1287.36C246.566 1288.01 246.336 1288.52 245.875 1288.88C245.414 1289.25 244.773 1289.43 243.953 1289.43C243.629 1289.43 243.289 1289.39 242.934 1289.32C242.578 1289.26 242.193 1289.16 241.779 1289.02V1287.91C242.182 1288.11 242.566 1288.27 242.934 1288.37C243.301 1288.48 243.648 1288.53 243.977 1288.53C244.453 1288.53 244.822 1288.43 245.084 1288.24C245.346 1288.04 245.477 1287.77 245.477 1287.42C245.477 1286.92 244.998 1286.58 244.041 1286.39L243.994 1286.38L243.59 1286.29C242.969 1286.17 242.516 1285.97 242.23 1285.68C241.945 1285.4 241.803 1285 241.803 1284.51C241.803 1283.88 242.016 1283.39 242.441 1283.05C242.867 1282.71 243.475 1282.54 244.264 1282.54C244.615 1282.54 244.953 1282.57 245.277 1282.64C245.602 1282.7 245.92 1282.8 246.232 1282.92ZM252.971 1280.51H254.084L249.479 1290.37H248.359L252.971 1280.51ZM258.953 1283.36C259.086 1283.08 259.254 1282.88 259.457 1282.74C259.664 1282.61 259.912 1282.54 260.201 1282.54C260.729 1282.54 261.1 1282.74 261.314 1283.15C261.533 1283.56 261.643 1284.33 261.643 1285.46V1289.26H260.658V1285.5C260.658 1284.58 260.605 1284 260.5 1283.78C260.398 1283.55 260.211 1283.44 259.938 1283.44C259.625 1283.44 259.41 1283.56 259.293 1283.8C259.18 1284.04 259.123 1284.61 259.123 1285.5V1289.26H258.139V1285.5C258.139 1284.57 258.082 1283.99 257.969 1283.77C257.859 1283.55 257.66 1283.44 257.371 1283.44C257.086 1283.44 256.887 1283.56 256.773 1283.8C256.664 1284.04 256.609 1284.61 256.609 1285.5V1289.26H255.631V1282.7H256.609V1283.26C256.738 1283.02 256.898 1282.85 257.09 1282.73C257.285 1282.6 257.506 1282.54 257.752 1282.54C258.049 1282.54 258.295 1282.61 258.49 1282.74C258.689 1282.88 258.844 1283.09 258.953 1283.36ZM268.785 1285.44V1285.97H264.115V1286C264.084 1286.9 264.254 1287.54 264.625 1287.93C265 1288.32 265.527 1288.51 266.207 1288.51C266.551 1288.51 266.91 1288.46 267.285 1288.35C267.66 1288.24 268.061 1288.08 268.486 1287.85V1288.92C268.076 1289.09 267.68 1289.22 267.297 1289.3C266.918 1289.39 266.551 1289.43 266.195 1289.43C265.176 1289.43 264.379 1289.12 263.805 1288.51C263.23 1287.9 262.943 1287.06 262.943 1285.98C262.943 1284.94 263.225 1284.1 263.787 1283.48C264.35 1282.85 265.1 1282.54 266.037 1282.54C266.873 1282.54 267.531 1282.82 268.012 1283.39C268.496 1283.95 268.754 1284.64 268.785 1285.44ZM267.707 1285.12C267.66 1284.67 267.494 1284.28 267.209 1283.95C266.928 1283.62 266.521 1283.45 265.99 1283.45C265.471 1283.45 265.043 1283.62 264.707 1283.97C264.371 1284.31 264.188 1284.7 264.156 1285.13L267.707 1285.12ZM276.221 1284.05C275.99 1283.87 275.756 1283.74 275.518 1283.66C275.279 1283.58 275.018 1283.53 274.732 1283.53C274.061 1283.53 273.547 1283.75 273.191 1284.17C272.836 1284.59 272.658 1285.2 272.658 1286V1289.26H271.574V1282.7H272.658V1283.98C272.838 1283.51 273.113 1283.16 273.484 1282.91C273.859 1282.66 274.303 1282.54 274.814 1282.54C275.08 1282.54 275.328 1282.57 275.559 1282.64C275.789 1282.7 276.01 1282.81 276.221 1282.95V1284.05ZM281.711 1285.92C281.711 1285.12 281.578 1284.5 281.312 1284.09C281.051 1283.66 280.668 1283.45 280.164 1283.45C279.637 1283.45 279.234 1283.66 278.957 1284.09C278.68 1284.5 278.541 1285.12 278.541 1285.92C278.541 1286.73 278.68 1287.35 278.957 1287.78C279.238 1288.2 279.645 1288.41 280.176 1288.41C280.672 1288.41 281.051 1288.2 281.312 1287.77C281.578 1287.34 281.711 1286.73 281.711 1285.92ZM282.789 1288.84C282.789 1289.82 282.557 1290.57 282.092 1291.08C281.627 1291.58 280.943 1291.84 280.041 1291.84C279.744 1291.84 279.434 1291.81 279.109 1291.76C278.785 1291.7 278.461 1291.62 278.137 1291.51V1290.45C278.52 1290.63 278.867 1290.76 279.18 1290.85C279.492 1290.93 279.779 1290.98 280.041 1290.98C280.623 1290.98 281.047 1290.82 281.312 1290.5C281.578 1290.18 281.711 1289.68 281.711 1289V1288.95V1288.22C281.539 1288.58 281.305 1288.86 281.008 1289.04C280.711 1289.22 280.35 1289.31 279.924 1289.31C279.158 1289.31 278.547 1289 278.09 1288.39C277.633 1287.77 277.404 1286.95 277.404 1285.92C277.404 1284.89 277.633 1284.07 278.09 1283.46C278.547 1282.84 279.158 1282.54 279.924 1282.54C280.346 1282.54 280.703 1282.62 280.996 1282.79C281.289 1282.96 281.527 1283.22 281.711 1283.57V1282.72H282.789V1288.84ZM290.477 1285.44V1285.97H285.807V1286C285.775 1286.9 285.945 1287.54 286.316 1287.93C286.691 1288.32 287.219 1288.51 287.898 1288.51C288.242 1288.51 288.602 1288.46 288.977 1288.35C289.352 1288.24 289.752 1288.08 290.178 1287.85V1288.92C289.768 1289.09 289.371 1289.22 288.988 1289.3C288.609 1289.39 288.242 1289.43 287.887 1289.43C286.867 1289.43 286.07 1289.12 285.496 1288.51C284.922 1287.9 284.635 1287.06 284.635 1285.98C284.635 1284.94 284.916 1284.1 285.479 1283.48C286.041 1282.85 286.791 1282.54 287.729 1282.54C288.564 1282.54 289.223 1282.82 289.703 1283.39C290.188 1283.95 290.445 1284.64 290.477 1285.44ZM289.398 1285.12C289.352 1284.67 289.186 1284.28 288.9 1283.95C288.619 1283.62 288.213 1283.45 287.682 1283.45C287.162 1283.45 286.734 1283.62 286.398 1283.97C286.062 1284.31 285.879 1284.7 285.848 1285.13L289.398 1285.12ZM291.742 1285.02H297.953V1286.01H291.742V1285.02ZM304.938 1285.44V1285.97H300.268V1286C300.236 1286.9 300.406 1287.54 300.777 1287.93C301.152 1288.32 301.68 1288.51 302.359 1288.51C302.703 1288.51 303.062 1288.46 303.438 1288.35C303.812 1288.24 304.213 1288.08 304.639 1287.85V1288.92C304.229 1289.09 303.832 1289.22 303.449 1289.3C303.07 1289.39 302.703 1289.43 302.348 1289.43C301.328 1289.43 300.531 1289.12 299.957 1288.51C299.383 1287.9 299.096 1287.06 299.096 1285.98C299.096 1284.94 299.377 1284.1 299.939 1283.48C300.502 1282.85 301.252 1282.54 302.189 1282.54C303.025 1282.54 303.684 1282.82 304.164 1283.39C304.648 1283.95 304.906 1284.64 304.938 1285.44ZM303.859 1285.12C303.812 1284.67 303.646 1284.28 303.361 1283.95C303.08 1283.62 302.674 1283.45 302.143 1283.45C301.623 1283.45 301.195 1283.62 300.859 1283.97C300.523 1284.31 300.34 1284.7 300.309 1285.13L303.859 1285.12ZM310.633 1283.53V1280.14H311.711V1289.26H310.633V1288.43C310.453 1288.76 310.213 1289.01 309.912 1289.18C309.615 1289.34 309.271 1289.43 308.881 1289.43C308.088 1289.43 307.463 1289.12 307.006 1288.51C306.553 1287.89 306.326 1287.04 306.326 1285.96C306.326 1284.89 306.555 1284.06 307.012 1283.45C307.469 1282.84 308.092 1282.54 308.881 1282.54C309.275 1282.54 309.623 1282.62 309.924 1282.8C310.225 1282.96 310.461 1283.21 310.633 1283.53ZM307.463 1285.98C307.463 1286.82 307.596 1287.45 307.861 1287.88C308.127 1288.3 308.52 1288.51 309.039 1288.51C309.559 1288.51 309.953 1288.3 310.223 1287.87C310.496 1287.44 310.633 1286.81 310.633 1285.98C310.633 1285.15 310.496 1284.52 310.223 1284.1C309.953 1283.67 309.559 1283.45 309.039 1283.45C308.52 1283.45 308.127 1283.67 307.861 1284.09C307.596 1284.52 307.463 1285.15 307.463 1285.98ZM314.688 1282.72H317.447V1288.42H319.586V1289.26H314.23V1288.42H316.369V1283.56H314.688V1282.72ZM316.369 1280.17H317.447V1281.53H316.369V1280.17ZM323.664 1280.83V1282.7H326.113V1283.53H323.664V1287.1C323.664 1287.58 323.756 1287.92 323.939 1288.11C324.123 1288.3 324.443 1288.4 324.9 1288.4H326.113V1289.26H324.795C323.986 1289.26 323.416 1289.1 323.084 1288.77C322.752 1288.45 322.586 1287.89 322.586 1287.1V1283.53H320.834V1282.7H322.586V1280.83H323.664ZM330.906 1283.45C330.359 1283.45 329.945 1283.67 329.664 1284.09C329.383 1284.52 329.242 1285.15 329.242 1285.98C329.242 1286.82 329.383 1287.45 329.664 1287.88C329.945 1288.3 330.359 1288.51 330.906 1288.51C331.457 1288.51 331.873 1288.3 332.154 1287.88C332.436 1287.45 332.576 1286.82 332.576 1285.98C332.576 1285.15 332.436 1284.52 332.154 1284.09C331.873 1283.67 331.457 1283.45 330.906 1283.45ZM330.906 1282.54C331.816 1282.54 332.512 1282.83 332.992 1283.42C333.477 1284.01 333.719 1284.87 333.719 1285.98C333.719 1287.1 333.479 1287.96 332.998 1288.55C332.518 1289.14 331.82 1289.43 330.906 1289.43C329.996 1289.43 329.301 1289.14 328.82 1288.55C328.34 1287.96 328.1 1287.1 328.1 1285.98C328.1 1284.87 328.34 1284.01 328.82 1283.42C329.301 1282.83 329.996 1282.54 330.906 1282.54ZM341.295 1284.05C341.064 1283.87 340.83 1283.74 340.592 1283.66C340.354 1283.58 340.092 1283.53 339.807 1283.53C339.135 1283.53 338.621 1283.75 338.266 1284.17C337.91 1284.59 337.732 1285.2 337.732 1286V1289.26H336.648V1282.7H337.732V1283.98C337.912 1283.51 338.188 1283.16 338.559 1282.91C338.934 1282.66 339.377 1282.54 339.889 1282.54C340.154 1282.54 340.402 1282.57 340.633 1282.64C340.863 1282.7 341.084 1282.81 341.295 1282.95V1284.05ZM347.295 1280.19V1283.78H345.982V1280.19H347.295ZM344.172 1280.19V1283.78H342.859V1280.19H344.172ZM188.225 1334.19V1337.78H186.912V1334.19H188.225ZM185.102 1334.19V1337.78H183.789V1334.19H185.102ZM196.205 1342.95C195.904 1343.11 195.596 1343.23 195.279 1343.31C194.963 1343.39 194.627 1343.43 194.271 1343.43C193.15 1343.43 192.279 1343.03 191.658 1342.24C191.041 1341.45 190.732 1340.33 190.732 1338.89C190.732 1337.46 191.043 1336.35 191.664 1335.55C192.289 1334.75 193.158 1334.35 194.271 1334.35C194.627 1334.35 194.963 1334.39 195.279 1334.48C195.596 1334.55 195.904 1334.67 196.205 1334.83V1336.05C195.916 1335.81 195.605 1335.63 195.273 1335.5C194.941 1335.38 194.607 1335.31 194.271 1335.31C193.502 1335.31 192.926 1335.61 192.543 1336.2C192.16 1336.8 191.969 1337.69 191.969 1338.89C191.969 1340.09 192.16 1340.98 192.543 1341.58C192.926 1342.17 193.502 1342.47 194.271 1342.47C194.615 1342.47 194.951 1342.41 195.279 1342.28C195.611 1342.16 195.92 1341.97 196.205 1341.74V1342.95ZM200.758 1337.45C200.211 1337.45 199.797 1337.67 199.516 1338.09C199.234 1338.52 199.094 1339.15 199.094 1339.98C199.094 1340.82 199.234 1341.45 199.516 1341.88C199.797 1342.3 200.211 1342.51 200.758 1342.51C201.309 1342.51 201.725 1342.3 202.006 1341.88C202.287 1341.45 202.428 1340.82 202.428 1339.98C202.428 1339.15 202.287 1338.52 202.006 1338.09C201.725 1337.67 201.309 1337.45 200.758 1337.45ZM200.758 1336.54C201.668 1336.54 202.363 1336.83 202.844 1337.42C203.328 1338.01 203.57 1338.87 203.57 1339.98C203.57 1341.1 203.33 1341.96 202.85 1342.55C202.369 1343.14 201.672 1343.43 200.758 1343.43C199.848 1343.43 199.152 1343.14 198.672 1342.55C198.191 1341.96 197.951 1341.1 197.951 1339.98C197.951 1338.87 198.191 1338.01 198.672 1337.42C199.152 1336.83 199.848 1336.54 200.758 1336.54ZM208.34 1337.36C208.473 1337.08 208.641 1336.88 208.844 1336.74C209.051 1336.61 209.299 1336.54 209.588 1336.54C210.115 1336.54 210.486 1336.74 210.701 1337.15C210.92 1337.56 211.029 1338.33 211.029 1339.46V1343.26H210.045V1339.5C210.045 1338.58 209.992 1338 209.887 1337.78C209.785 1337.55 209.598 1337.44 209.324 1337.44C209.012 1337.44 208.797 1337.56 208.68 1337.8C208.566 1338.04 208.51 1338.61 208.51 1339.5V1343.26H207.525V1339.5C207.525 1338.57 207.469 1337.99 207.355 1337.77C207.246 1337.55 207.047 1337.44 206.758 1337.44C206.473 1337.44 206.273 1337.56 206.16 1337.8C206.051 1338.04 205.996 1338.61 205.996 1339.5V1343.26H205.018V1336.7H205.996V1337.26C206.125 1337.02 206.285 1336.85 206.477 1336.73C206.672 1336.6 206.893 1336.54 207.139 1336.54C207.436 1336.54 207.682 1336.61 207.877 1336.74C208.076 1336.88 208.23 1337.09 208.34 1337.36ZM215.57 1337.36C215.703 1337.08 215.871 1336.88 216.074 1336.74C216.281 1336.61 216.529 1336.54 216.818 1336.54C217.346 1336.54 217.717 1336.74 217.932 1337.15C218.15 1337.56 218.26 1338.33 218.26 1339.46V1343.26H217.275V1339.5C217.275 1338.58 217.223 1338 217.117 1337.78C217.016 1337.55 216.828 1337.44 216.555 1337.44C216.242 1337.44 216.027 1337.56 215.91 1337.8C215.797 1338.04 215.74 1338.61 215.74 1339.5V1343.26H214.756V1339.5C214.756 1338.57 214.699 1337.99 214.586 1337.77C214.477 1337.55 214.277 1337.44 213.988 1337.44C213.703 1337.44 213.504 1337.56 213.391 1337.8C213.281 1338.04 213.227 1338.61 213.227 1339.5V1343.26H212.248V1336.7H213.227V1337.26C213.355 1337.02 213.516 1336.85 213.707 1336.73C213.902 1336.6 214.123 1336.54 214.369 1336.54C214.666 1336.54 214.912 1336.61 215.107 1336.74C215.307 1336.88 215.461 1337.09 215.57 1337.36ZM222.953 1339.96H222.596C221.967 1339.96 221.492 1340.07 221.172 1340.29C220.855 1340.51 220.697 1340.84 220.697 1341.28C220.697 1341.67 220.816 1341.98 221.055 1342.2C221.293 1342.42 221.623 1342.53 222.045 1342.53C222.639 1342.53 223.105 1342.32 223.445 1341.91C223.785 1341.5 223.957 1340.93 223.961 1340.2V1339.96H222.953ZM225.045 1339.51V1343.26H223.961V1342.29C223.73 1342.68 223.439 1342.97 223.088 1343.15C222.74 1343.34 222.316 1343.43 221.816 1343.43C221.148 1343.43 220.615 1343.24 220.217 1342.87C219.818 1342.49 219.619 1341.98 219.619 1341.35C219.619 1340.62 219.863 1340.06 220.352 1339.68C220.844 1339.31 221.564 1339.12 222.514 1339.12H223.961V1338.95C223.957 1338.42 223.824 1338.04 223.562 1337.81C223.301 1337.57 222.883 1337.45 222.309 1337.45C221.941 1337.45 221.57 1337.51 221.195 1337.61C220.82 1337.72 220.455 1337.87 220.1 1338.07V1337C220.498 1336.84 220.879 1336.73 221.242 1336.66C221.609 1336.58 221.965 1336.54 222.309 1336.54C222.852 1336.54 223.314 1336.62 223.697 1336.78C224.084 1336.94 224.396 1337.18 224.635 1337.5C224.783 1337.69 224.889 1337.94 224.951 1338.23C225.014 1338.51 225.045 1338.94 225.045 1339.51ZM232.229 1339.19V1343.26H231.145V1339.19C231.145 1338.6 231.041 1338.17 230.834 1337.89C230.627 1337.61 230.303 1337.48 229.861 1337.48C229.357 1337.48 228.969 1337.66 228.695 1338.01C228.426 1338.37 228.291 1338.88 228.291 1339.55V1343.26H227.213V1336.7H228.291V1337.68C228.482 1337.31 228.742 1337.02 229.07 1336.83C229.398 1336.64 229.787 1336.54 230.236 1336.54C230.904 1336.54 231.402 1336.76 231.73 1337.2C232.062 1337.64 232.229 1338.3 232.229 1339.19ZM238.328 1337.53V1334.14H239.406V1343.26H238.328V1342.43C238.148 1342.76 237.908 1343.01 237.607 1343.18C237.311 1343.34 236.967 1343.43 236.576 1343.43C235.783 1343.43 235.158 1343.12 234.701 1342.51C234.248 1341.89 234.021 1341.04 234.021 1339.96C234.021 1338.89 234.25 1338.06 234.707 1337.45C235.164 1336.84 235.787 1336.54 236.576 1336.54C236.971 1336.54 237.318 1336.62 237.619 1336.8C237.92 1336.96 238.156 1337.21 238.328 1337.53ZM235.158 1339.98C235.158 1340.82 235.291 1341.45 235.557 1341.88C235.822 1342.3 236.215 1342.51 236.734 1342.51C237.254 1342.51 237.648 1342.3 237.918 1341.87C238.191 1341.44 238.328 1340.81 238.328 1339.98C238.328 1339.15 238.191 1338.52 237.918 1338.1C237.648 1337.67 237.254 1337.45 236.734 1337.45C236.215 1337.45 235.822 1337.67 235.557 1338.09C235.291 1338.52 235.158 1339.15 235.158 1339.98ZM254.049 1342.95C253.748 1343.11 253.439 1343.23 253.123 1343.31C252.807 1343.39 252.471 1343.43 252.115 1343.43C250.994 1343.43 250.123 1343.03 249.502 1342.24C248.885 1341.45 248.576 1340.33 248.576 1338.89C248.576 1337.46 248.887 1336.35 249.508 1335.55C250.133 1334.75 251.002 1334.35 252.115 1334.35C252.471 1334.35 252.807 1334.39 253.123 1334.48C253.439 1334.55 253.748 1334.67 254.049 1334.83V1336.05C253.76 1335.81 253.449 1335.63 253.117 1335.5C252.785 1335.38 252.451 1335.31 252.115 1335.31C251.346 1335.31 250.77 1335.61 250.387 1336.2C250.004 1336.8 249.812 1337.69 249.812 1338.89C249.812 1340.09 250.004 1340.98 250.387 1341.58C250.77 1342.17 251.346 1342.47 252.115 1342.47C252.459 1342.47 252.795 1342.41 253.123 1342.28C253.455 1342.16 253.764 1341.97 254.049 1341.74V1342.95ZM261.555 1339.44V1339.97H256.885V1340C256.854 1340.9 257.023 1341.54 257.395 1341.93C257.77 1342.32 258.297 1342.51 258.977 1342.51C259.32 1342.51 259.68 1342.46 260.055 1342.35C260.43 1342.24 260.83 1342.08 261.256 1341.85V1342.92C260.846 1343.09 260.449 1343.22 260.066 1343.3C259.688 1343.39 259.32 1343.43 258.965 1343.43C257.945 1343.43 257.148 1343.12 256.574 1342.51C256 1341.9 255.713 1341.06 255.713 1339.98C255.713 1338.94 255.994 1338.1 256.557 1337.48C257.119 1336.85 257.869 1336.54 258.807 1336.54C259.643 1336.54 260.301 1336.82 260.781 1337.39C261.266 1337.95 261.523 1338.64 261.555 1339.44ZM260.477 1339.12C260.43 1338.67 260.264 1338.28 259.979 1337.95C259.697 1337.62 259.291 1337.45 258.76 1337.45C258.24 1337.45 257.812 1337.62 257.477 1337.97C257.141 1338.31 256.957 1338.7 256.926 1339.13L260.477 1339.12ZM268.381 1339.19V1343.26H267.297V1339.19C267.297 1338.6 267.193 1338.17 266.986 1337.89C266.779 1337.61 266.455 1337.48 266.014 1337.48C265.51 1337.48 265.121 1337.66 264.848 1338.01C264.578 1338.37 264.443 1338.88 264.443 1339.55V1343.26H263.365V1336.7H264.443V1337.68C264.635 1337.31 264.895 1337.02 265.223 1336.83C265.551 1336.64 265.939 1336.54 266.389 1336.54C267.057 1336.54 267.555 1336.76 267.883 1337.2C268.215 1337.64 268.381 1338.3 268.381 1339.19ZM273.051 1334.83V1336.7H275.5V1337.53H273.051V1341.1C273.051 1341.58 273.143 1341.92 273.326 1342.11C273.51 1342.3 273.83 1342.4 274.287 1342.4H275.5V1343.26H274.182C273.373 1343.26 272.803 1343.1 272.471 1342.77C272.139 1342.45 271.973 1341.89 271.973 1341.1V1337.53H270.221V1336.7H271.973V1334.83H273.051ZM283.246 1339.44V1339.97H278.576V1340C278.545 1340.9 278.715 1341.54 279.086 1341.93C279.461 1342.32 279.988 1342.51 280.668 1342.51C281.012 1342.51 281.371 1342.46 281.746 1342.35C282.121 1342.24 282.521 1342.08 282.947 1341.85V1342.92C282.537 1343.09 282.141 1343.22 281.758 1343.3C281.379 1343.39 281.012 1343.43 280.656 1343.43C279.637 1343.43 278.84 1343.12 278.266 1342.51C277.691 1341.9 277.404 1341.06 277.404 1339.98C277.404 1338.94 277.686 1338.1 278.248 1337.48C278.811 1336.85 279.561 1336.54 280.498 1336.54C281.334 1336.54 281.992 1336.82 282.473 1337.39C282.957 1337.95 283.215 1338.64 283.246 1339.44ZM282.168 1339.12C282.121 1338.67 281.955 1338.28 281.67 1337.95C281.389 1337.62 280.982 1337.45 280.451 1337.45C279.932 1337.45 279.504 1337.62 279.168 1337.97C278.832 1338.31 278.648 1338.7 278.617 1339.13L282.168 1339.12ZM290.682 1338.05C290.451 1337.87 290.217 1337.74 289.979 1337.66C289.74 1337.58 289.479 1337.53 289.193 1337.53C288.521 1337.53 288.008 1337.75 287.652 1338.17C287.297 1338.59 287.119 1339.2 287.119 1340V1343.26H286.035V1336.7H287.119V1337.98C287.299 1337.51 287.574 1337.16 287.945 1336.91C288.32 1336.66 288.764 1336.54 289.275 1336.54C289.541 1336.54 289.789 1336.57 290.02 1336.64C290.25 1336.7 290.471 1336.81 290.682 1336.95V1338.05ZM296.682 1334.19V1337.78H295.369V1334.19H296.682ZM293.559 1334.19V1337.78H292.246V1334.19H293.559ZM231.607 1352.19V1355.78H230.295V1352.19H231.607ZM228.484 1352.19V1355.78H227.172V1352.19H228.484ZM235.463 1356.85V1360.29H236.863C237.551 1360.29 238.041 1360.17 238.334 1359.93C238.627 1359.69 238.773 1359.29 238.773 1358.74C238.773 1358.01 238.619 1357.52 238.311 1357.25C238.002 1356.98 237.52 1356.85 236.863 1356.85H235.463ZM235.463 1353.48V1355.89H236.84C237.41 1355.89 237.822 1355.78 238.076 1355.56C238.334 1355.34 238.463 1355.06 238.463 1354.73C238.463 1354.29 238.336 1353.97 238.082 1353.78C237.832 1353.58 237.418 1353.48 236.84 1353.48H235.463ZM234.273 1352.51H236.863C237.758 1352.51 238.447 1352.7 238.932 1353.09C239.416 1353.48 239.658 1354.02 239.658 1354.73C239.658 1355.11 239.529 1355.45 239.271 1355.76C239.018 1356.07 238.635 1356.26 238.123 1356.34C238.697 1356.43 239.146 1356.67 239.471 1357.08C239.799 1357.48 239.963 1358.08 239.963 1358.86C239.963 1359.65 239.703 1360.25 239.184 1360.66C238.664 1361.06 237.891 1361.26 236.863 1361.26H234.273V1352.51ZM247.299 1356.05C247.068 1355.87 246.834 1355.74 246.596 1355.66C246.357 1355.58 246.096 1355.53 245.811 1355.53C245.139 1355.53 244.625 1355.75 244.27 1356.17C243.914 1356.59 243.736 1357.2 243.736 1358V1361.26H242.652V1354.7H243.736V1355.98C243.916 1355.51 244.191 1355.16 244.562 1354.91C244.938 1354.66 245.381 1354.54 245.893 1354.54C246.158 1354.54 246.406 1354.57 246.637 1354.64C246.867 1354.7 247.088 1354.81 247.299 1354.95V1356.05ZM249.613 1354.72H252.373V1360.42H254.512V1361.26H249.156V1360.42H251.295V1355.56H249.613V1354.72ZM251.295 1352.17H252.373V1353.53H251.295V1352.17ZM261.15 1357.19V1361.26H260.066V1357.19C260.066 1356.6 259.963 1356.17 259.756 1355.89C259.549 1355.61 259.225 1355.48 258.783 1355.48C258.279 1355.48 257.891 1355.66 257.617 1356.01C257.348 1356.37 257.213 1356.88 257.213 1357.55V1361.26H256.135V1354.7H257.213V1355.68C257.404 1355.31 257.664 1355.02 257.992 1354.83C258.32 1354.64 258.709 1354.54 259.158 1354.54C259.826 1354.54 260.324 1354.76 260.652 1355.2C260.984 1355.64 261.15 1356.3 261.15 1357.19ZM267.25 1357.92C267.25 1357.12 267.117 1356.5 266.852 1356.09C266.59 1355.66 266.207 1355.45 265.703 1355.45C265.176 1355.45 264.773 1355.66 264.496 1356.09C264.219 1356.5 264.08 1357.12 264.08 1357.92C264.08 1358.73 264.219 1359.35 264.496 1359.78C264.777 1360.2 265.184 1360.41 265.715 1360.41C266.211 1360.41 266.59 1360.2 266.852 1359.77C267.117 1359.34 267.25 1358.73 267.25 1357.92ZM268.328 1360.84C268.328 1361.82 268.096 1362.57 267.631 1363.08C267.166 1363.58 266.482 1363.84 265.58 1363.84C265.283 1363.84 264.973 1363.81 264.648 1363.76C264.324 1363.7 264 1363.62 263.676 1363.51V1362.45C264.059 1362.63 264.406 1362.76 264.719 1362.85C265.031 1362.93 265.318 1362.98 265.58 1362.98C266.162 1362.98 266.586 1362.82 266.852 1362.5C267.117 1362.18 267.25 1361.68 267.25 1361V1360.95V1360.22C267.078 1360.58 266.844 1360.86 266.547 1361.04C266.25 1361.22 265.889 1361.31 265.463 1361.31C264.697 1361.31 264.086 1361 263.629 1360.39C263.172 1359.77 262.943 1358.95 262.943 1357.92C262.943 1356.89 263.172 1356.07 263.629 1355.46C264.086 1354.84 264.697 1354.54 265.463 1354.54C265.885 1354.54 266.242 1354.62 266.535 1354.79C266.828 1354.96 267.066 1355.22 267.25 1355.57V1354.72H268.328V1360.84ZM271.305 1354.72H274.064V1360.42H276.203V1361.26H270.848V1360.42H272.986V1355.56H271.305V1354.72ZM272.986 1352.17H274.064V1353.53H272.986V1352.17ZM282.842 1357.19V1361.26H281.758V1357.19C281.758 1356.6 281.654 1356.17 281.447 1355.89C281.24 1355.61 280.916 1355.48 280.475 1355.48C279.971 1355.48 279.582 1355.66 279.309 1356.01C279.039 1356.37 278.904 1356.88 278.904 1357.55V1361.26H277.826V1354.7H278.904V1355.68C279.096 1355.31 279.355 1355.02 279.684 1354.83C280.012 1354.64 280.4 1354.54 280.85 1354.54C281.518 1354.54 282.016 1354.76 282.344 1355.2C282.676 1355.64 282.842 1356.3 282.842 1357.19ZM288.941 1357.92C288.941 1357.12 288.809 1356.5 288.543 1356.09C288.281 1355.66 287.898 1355.45 287.395 1355.45C286.867 1355.45 286.465 1355.66 286.188 1356.09C285.91 1356.5 285.771 1357.12 285.771 1357.92C285.771 1358.73 285.91 1359.35 286.188 1359.78C286.469 1360.2 286.875 1360.41 287.406 1360.41C287.902 1360.41 288.281 1360.2 288.543 1359.77C288.809 1359.34 288.941 1358.73 288.941 1357.92ZM290.02 1360.84C290.02 1361.82 289.787 1362.57 289.322 1363.08C288.857 1363.58 288.174 1363.84 287.271 1363.84C286.975 1363.84 286.664 1363.81 286.34 1363.76C286.016 1363.7 285.691 1363.62 285.367 1363.51V1362.45C285.75 1362.63 286.098 1362.76 286.41 1362.85C286.723 1362.93 287.01 1362.98 287.271 1362.98C287.854 1362.98 288.277 1362.82 288.543 1362.5C288.809 1362.18 288.941 1361.68 288.941 1361V1360.95V1360.22C288.77 1360.58 288.535 1360.86 288.238 1361.04C287.941 1361.22 287.58 1361.31 287.154 1361.31C286.389 1361.31 285.777 1361 285.32 1360.39C284.863 1359.77 284.635 1358.95 284.635 1357.92C284.635 1356.89 284.863 1356.07 285.32 1355.46C285.777 1354.84 286.389 1354.54 287.154 1354.54C287.576 1354.54 287.934 1354.62 288.227 1354.79C288.52 1354.96 288.758 1355.22 288.941 1355.57V1354.72H290.02V1360.84ZM299.758 1352.14H300.871V1357.42L303.701 1354.7H305.014L302.43 1357.17L305.418 1361.26H304.1L301.674 1357.87L300.871 1358.63V1361.26H299.758V1352.14ZM312.168 1357.44V1357.97H307.498V1358C307.467 1358.9 307.637 1359.54 308.008 1359.93C308.383 1360.32 308.91 1360.51 309.59 1360.51C309.934 1360.51 310.293 1360.46 310.668 1360.35C311.043 1360.24 311.443 1360.08 311.869 1359.85V1360.92C311.459 1361.09 311.062 1361.22 310.68 1361.3C310.301 1361.39 309.934 1361.43 309.578 1361.43C308.559 1361.43 307.762 1361.12 307.188 1360.51C306.613 1359.9 306.326 1359.06 306.326 1357.98C306.326 1356.94 306.607 1356.1 307.17 1355.48C307.732 1354.85 308.482 1354.54 309.42 1354.54C310.256 1354.54 310.914 1354.82 311.395 1355.39C311.879 1355.95 312.137 1356.64 312.168 1357.44ZM311.09 1357.12C311.043 1356.67 310.877 1356.28 310.592 1355.95C310.311 1355.62 309.904 1355.45 309.373 1355.45C308.854 1355.45 308.426 1355.62 308.09 1355.97C307.754 1356.31 307.57 1356.7 307.539 1357.13L311.09 1357.12ZM317.863 1359.15C317.684 1359.61 317.455 1360.21 317.178 1360.95C316.791 1361.99 316.531 1362.61 316.398 1362.84C316.219 1363.15 315.994 1363.37 315.725 1363.53C315.455 1363.68 315.141 1363.76 314.781 1363.76H313.914V1362.85H314.553C314.869 1362.85 315.117 1362.76 315.297 1362.58C315.477 1362.39 315.705 1361.92 315.982 1361.15L313.445 1354.7H314.588L316.533 1359.83L318.449 1354.7H319.592L317.863 1359.15ZM325.445 1357.98C325.445 1357.15 325.312 1356.52 325.047 1356.09C324.781 1355.67 324.389 1355.45 323.869 1355.45C323.346 1355.45 322.949 1355.67 322.68 1356.1C322.41 1356.52 322.275 1357.15 322.275 1357.98C322.275 1358.81 322.41 1359.44 322.68 1359.87C322.949 1360.3 323.346 1360.51 323.869 1360.51C324.389 1360.51 324.781 1360.3 325.047 1359.88C325.312 1359.45 325.445 1358.82 325.445 1357.98ZM322.275 1355.53C322.447 1355.21 322.684 1354.97 322.984 1354.8C323.289 1354.62 323.641 1354.54 324.039 1354.54C324.828 1354.54 325.449 1354.84 325.902 1355.45C326.355 1356.06 326.582 1356.89 326.582 1357.96C326.582 1359.04 326.354 1359.89 325.896 1360.51C325.443 1361.12 324.82 1361.43 324.027 1361.43C323.637 1361.43 323.291 1361.34 322.99 1361.18C322.693 1361.01 322.455 1360.76 322.275 1360.43V1361.26H321.197V1352.14H322.275V1355.53ZM330.906 1355.45C330.359 1355.45 329.945 1355.67 329.664 1356.09C329.383 1356.52 329.242 1357.15 329.242 1357.98C329.242 1358.82 329.383 1359.45 329.664 1359.88C329.945 1360.3 330.359 1360.51 330.906 1360.51C331.457 1360.51 331.873 1360.3 332.154 1359.88C332.436 1359.45 332.576 1358.82 332.576 1357.98C332.576 1357.15 332.436 1356.52 332.154 1356.09C331.873 1355.67 331.457 1355.45 330.906 1355.45ZM330.906 1354.54C331.816 1354.54 332.512 1354.83 332.992 1355.42C333.477 1356.01 333.719 1356.87 333.719 1357.98C333.719 1359.1 333.479 1359.96 332.998 1360.55C332.518 1361.14 331.82 1361.43 330.906 1361.43C329.996 1361.43 329.301 1361.14 328.82 1360.55C328.34 1359.96 328.1 1359.1 328.1 1357.98C328.1 1356.87 328.34 1356.01 328.82 1355.42C329.301 1354.83 329.996 1354.54 330.906 1354.54ZM338.641 1357.96H338.283C337.654 1357.96 337.18 1358.07 336.859 1358.29C336.543 1358.51 336.385 1358.84 336.385 1359.28C336.385 1359.67 336.504 1359.98 336.742 1360.2C336.98 1360.42 337.311 1360.53 337.732 1360.53C338.326 1360.53 338.793 1360.32 339.133 1359.91C339.473 1359.5 339.645 1358.93 339.648 1358.2V1357.96H338.641ZM340.732 1357.51V1361.26H339.648V1360.29C339.418 1360.68 339.127 1360.97 338.775 1361.15C338.428 1361.34 338.004 1361.43 337.504 1361.43C336.836 1361.43 336.303 1361.24 335.904 1360.87C335.506 1360.49 335.307 1359.98 335.307 1359.35C335.307 1358.62 335.551 1358.06 336.039 1357.68C336.531 1357.31 337.252 1357.12 338.201 1357.12H339.648V1356.95C339.645 1356.42 339.512 1356.04 339.25 1355.81C338.988 1355.57 338.57 1355.45 337.996 1355.45C337.629 1355.45 337.258 1355.51 336.883 1355.61C336.508 1355.72 336.143 1355.87 335.787 1356.07V1355C336.186 1354.84 336.566 1354.73 336.93 1354.66C337.297 1354.58 337.652 1354.54 337.996 1354.54C338.539 1354.54 339.002 1354.62 339.385 1354.78C339.771 1354.94 340.084 1355.18 340.322 1355.5C340.471 1355.69 340.576 1355.94 340.639 1356.23C340.701 1356.51 340.732 1356.94 340.732 1357.51ZM348.525 1356.05C348.295 1355.87 348.061 1355.74 347.822 1355.66C347.584 1355.58 347.322 1355.53 347.037 1355.53C346.365 1355.53 345.852 1355.75 345.496 1356.17C345.141 1356.59 344.963 1357.2 344.963 1358V1361.26H343.879V1354.7H344.963V1355.98C345.143 1355.51 345.418 1355.16 345.789 1354.91C346.164 1354.66 346.607 1354.54 347.119 1354.54C347.385 1354.54 347.633 1354.57 347.863 1354.64C348.094 1354.7 348.314 1354.81 348.525 1354.95V1356.05ZM354.016 1355.53V1352.14H355.094V1361.26H354.016V1360.43C353.836 1360.76 353.596 1361.01 353.295 1361.18C352.998 1361.34 352.654 1361.43 352.264 1361.43C351.471 1361.43 350.846 1361.12 350.389 1360.51C349.936 1359.89 349.709 1359.04 349.709 1357.96C349.709 1356.89 349.938 1356.06 350.395 1355.45C350.852 1354.84 351.475 1354.54 352.264 1354.54C352.658 1354.54 353.006 1354.62 353.307 1354.8C353.607 1354.96 353.844 1355.21 354.016 1355.53ZM350.846 1357.98C350.846 1358.82 350.979 1359.45 351.244 1359.88C351.51 1360.3 351.902 1360.51 352.422 1360.51C352.941 1360.51 353.336 1360.3 353.605 1359.87C353.879 1359.44 354.016 1358.81 354.016 1357.98C354.016 1357.15 353.879 1356.52 353.605 1356.1C353.336 1355.67 352.941 1355.45 352.422 1355.45C351.902 1355.45 351.51 1355.67 351.244 1356.09C350.979 1356.52 350.846 1357.15 350.846 1357.98ZM370.012 1357.44V1357.97H365.342V1358C365.311 1358.9 365.48 1359.54 365.852 1359.93C366.227 1360.32 366.754 1360.51 367.434 1360.51C367.777 1360.51 368.137 1360.46 368.512 1360.35C368.887 1360.24 369.287 1360.08 369.713 1359.85V1360.92C369.303 1361.09 368.906 1361.22 368.523 1361.3C368.145 1361.39 367.777 1361.43 367.422 1361.43C366.402 1361.43 365.605 1361.12 365.031 1360.51C364.457 1359.9 364.17 1359.06 364.17 1357.98C364.17 1356.94 364.451 1356.1 365.014 1355.48C365.576 1354.85 366.326 1354.54 367.264 1354.54C368.1 1354.54 368.758 1354.82 369.238 1355.39C369.723 1355.95 369.98 1356.64 370.012 1357.44ZM368.934 1357.12C368.887 1356.67 368.721 1356.28 368.436 1355.95C368.154 1355.62 367.748 1355.45 367.217 1355.45C366.697 1355.45 366.27 1355.62 365.934 1355.97C365.598 1356.31 365.414 1356.7 365.383 1357.13L368.934 1357.12ZM376.908 1352.14V1353.04H375.684C375.297 1353.04 375.027 1353.12 374.875 1353.28C374.727 1353.43 374.652 1353.71 374.652 1354.12V1354.7H376.908V1355.53H374.652V1361.26H373.574V1355.53H371.822V1354.7H373.574V1354.24C373.574 1353.52 373.738 1352.99 374.066 1352.65C374.398 1352.31 374.914 1352.14 375.613 1352.14H376.908ZM384.139 1352.14V1353.04H382.914C382.527 1353.04 382.258 1353.12 382.105 1353.28C381.957 1353.43 381.883 1353.71 381.883 1354.12V1354.7H384.139V1355.53H381.883V1361.26H380.805V1355.53H379.053V1354.7H380.805V1354.24C380.805 1353.52 380.969 1352.99 381.297 1352.65C381.629 1352.31 382.145 1352.14 382.844 1352.14H384.139ZM386.992 1354.72H389.752V1360.42H391.891V1361.26H386.535V1360.42H388.674V1355.56H386.992V1354.72ZM388.674 1352.17H389.752V1353.53H388.674V1352.17ZM398.588 1360.92C398.299 1361.09 398 1361.22 397.691 1361.3C397.387 1361.39 397.074 1361.43 396.754 1361.43C395.738 1361.43 394.943 1361.12 394.369 1360.51C393.799 1359.91 393.514 1359.06 393.514 1357.98C393.514 1356.91 393.799 1356.06 394.369 1355.45C394.943 1354.84 395.738 1354.54 396.754 1354.54C397.07 1354.54 397.379 1354.58 397.68 1354.66C397.98 1354.74 398.283 1354.87 398.588 1355.04V1356.17C398.303 1355.92 398.016 1355.74 397.727 1355.62C397.441 1355.51 397.117 1355.45 396.754 1355.45C396.078 1355.45 395.559 1355.67 395.195 1356.11C394.832 1356.55 394.65 1357.17 394.65 1357.98C394.65 1358.79 394.832 1359.42 395.195 1359.86C395.562 1360.3 396.082 1360.51 396.754 1360.51C397.129 1360.51 397.465 1360.46 397.762 1360.34C398.059 1360.23 398.334 1360.05 398.588 1359.81V1360.92ZM401.453 1354.72H404.213V1360.42H406.352V1361.26H400.996V1360.42H403.135V1355.56H401.453V1354.72ZM403.135 1352.17H404.213V1353.53H403.135V1352.17ZM413.395 1357.44V1357.97H408.725V1358C408.693 1358.9 408.863 1359.54 409.234 1359.93C409.609 1360.32 410.137 1360.51 410.816 1360.51C411.16 1360.51 411.52 1360.46 411.895 1360.35C412.27 1360.24 412.67 1360.08 413.096 1359.85V1360.92C412.686 1361.09 412.289 1361.22 411.906 1361.3C411.527 1361.39 411.16 1361.43 410.805 1361.43C409.785 1361.43 408.988 1361.12 408.414 1360.51C407.84 1359.9 407.553 1359.06 407.553 1357.98C407.553 1356.94 407.834 1356.1 408.396 1355.48C408.959 1354.85 409.709 1354.54 410.646 1354.54C411.482 1354.54 412.141 1354.82 412.621 1355.39C413.105 1355.95 413.363 1356.64 413.395 1357.44ZM412.316 1357.12C412.27 1356.67 412.104 1356.28 411.818 1355.95C411.537 1355.62 411.131 1355.45 410.6 1355.45C410.08 1355.45 409.652 1355.62 409.316 1355.97C408.98 1356.31 408.797 1356.7 408.766 1357.13L412.316 1357.12ZM420.221 1357.19V1361.26H419.137V1357.19C419.137 1356.6 419.033 1356.17 418.826 1355.89C418.619 1355.61 418.295 1355.48 417.854 1355.48C417.35 1355.48 416.961 1355.66 416.688 1356.01C416.418 1356.37 416.283 1356.88 416.283 1357.55V1361.26H415.205V1354.7H416.283V1355.68C416.475 1355.31 416.734 1355.02 417.062 1354.83C417.391 1354.64 417.779 1354.54 418.229 1354.54C418.896 1354.54 419.395 1354.76 419.723 1355.2C420.055 1355.64 420.221 1356.3 420.221 1357.19ZM427.51 1360.92C427.221 1361.09 426.922 1361.22 426.613 1361.3C426.309 1361.39 425.996 1361.43 425.676 1361.43C424.66 1361.43 423.865 1361.12 423.291 1360.51C422.721 1359.91 422.436 1359.06 422.436 1357.98C422.436 1356.91 422.721 1356.06 423.291 1355.45C423.865 1354.84 424.66 1354.54 425.676 1354.54C425.992 1354.54 426.301 1354.58 426.602 1354.66C426.902 1354.74 427.205 1354.87 427.51 1355.04V1356.17C427.225 1355.92 426.938 1355.74 426.648 1355.62C426.363 1355.51 426.039 1355.45 425.676 1355.45C425 1355.45 424.48 1355.67 424.117 1356.11C423.754 1356.55 423.572 1357.17 423.572 1357.98C423.572 1358.79 423.754 1359.42 424.117 1359.86C424.484 1360.3 425.004 1360.51 425.676 1360.51C426.051 1360.51 426.387 1360.46 426.684 1360.34C426.98 1360.23 427.256 1360.05 427.51 1359.81V1360.92ZM433.551 1359.15C433.371 1359.61 433.143 1360.21 432.865 1360.95C432.479 1361.99 432.219 1362.61 432.086 1362.84C431.906 1363.15 431.682 1363.37 431.412 1363.53C431.143 1363.68 430.828 1363.76 430.469 1363.76H429.602V1362.85H430.24C430.557 1362.85 430.805 1362.76 430.984 1362.58C431.164 1362.39 431.393 1361.92 431.67 1361.15L429.133 1354.7H430.275L432.221 1359.83L434.137 1354.7H435.279L433.551 1359.15ZM446.582 1352.83V1354.7H449.031V1355.53H446.582V1359.1C446.582 1359.58 446.674 1359.92 446.857 1360.11C447.041 1360.3 447.361 1360.4 447.818 1360.4H449.031V1361.26H447.713C446.904 1361.26 446.334 1361.1 446.002 1360.77C445.67 1360.45 445.504 1359.89 445.504 1359.1V1355.53H443.752V1354.7H445.504V1352.83H446.582ZM453.824 1355.45C453.277 1355.45 452.863 1355.67 452.582 1356.09C452.301 1356.52 452.16 1357.15 452.16 1357.98C452.16 1358.82 452.301 1359.45 452.582 1359.88C452.863 1360.3 453.277 1360.51 453.824 1360.51C454.375 1360.51 454.791 1360.3 455.072 1359.88C455.354 1359.45 455.494 1358.82 455.494 1357.98C455.494 1357.15 455.354 1356.52 455.072 1356.09C454.791 1355.67 454.375 1355.45 453.824 1355.45ZM453.824 1354.54C454.734 1354.54 455.43 1354.83 455.91 1355.42C456.395 1356.01 456.637 1356.87 456.637 1357.98C456.637 1359.1 456.396 1359.96 455.916 1360.55C455.436 1361.14 454.738 1361.43 453.824 1361.43C452.914 1361.43 452.219 1361.14 451.738 1360.55C451.258 1359.96 451.018 1359.1 451.018 1357.98C451.018 1356.87 451.258 1356.01 451.738 1355.42C452.219 1354.83 452.914 1354.54 453.824 1354.54ZM468.273 1352.83V1354.7H470.723V1355.53H468.273V1359.1C468.273 1359.58 468.365 1359.92 468.549 1360.11C468.732 1360.3 469.053 1360.4 469.51 1360.4H470.723V1361.26H469.404C468.596 1361.26 468.025 1361.1 467.693 1360.77C467.361 1360.45 467.195 1359.89 467.195 1359.1V1355.53H465.443V1354.7H467.195V1352.83H468.273ZM478.064 1357.19V1361.26H476.98V1357.19C476.98 1356.6 476.877 1356.17 476.67 1355.89C476.463 1355.61 476.139 1355.48 475.697 1355.48C475.193 1355.48 474.805 1355.66 474.531 1356.01C474.262 1356.37 474.127 1356.88 474.127 1357.55V1361.26H473.049V1352.14H474.127V1355.68C474.318 1355.31 474.578 1355.02 474.906 1354.83C475.234 1354.64 475.623 1354.54 476.072 1354.54C476.74 1354.54 477.238 1354.76 477.566 1355.2C477.898 1355.64 478.064 1356.3 478.064 1357.19ZM485.699 1357.44V1357.97H481.029V1358C480.998 1358.9 481.168 1359.54 481.539 1359.93C481.914 1360.32 482.441 1360.51 483.121 1360.51C483.465 1360.51 483.824 1360.46 484.199 1360.35C484.574 1360.24 484.975 1360.08 485.4 1359.85V1360.92C484.99 1361.09 484.594 1361.22 484.211 1361.3C483.832 1361.39 483.465 1361.43 483.109 1361.43C482.09 1361.43 481.293 1361.12 480.719 1360.51C480.145 1359.9 479.857 1359.06 479.857 1357.98C479.857 1356.94 480.139 1356.1 480.701 1355.48C481.264 1354.85 482.014 1354.54 482.951 1354.54C483.787 1354.54 484.445 1354.82 484.926 1355.39C485.41 1355.95 485.668 1356.64 485.699 1357.44ZM484.621 1357.12C484.574 1356.67 484.408 1356.28 484.123 1355.95C483.842 1355.62 483.436 1355.45 482.904 1355.45C482.385 1355.45 481.957 1355.62 481.621 1355.97C481.285 1356.31 481.102 1356.7 481.07 1357.13L484.621 1357.12ZM497.559 1355.36C497.691 1355.08 497.859 1354.88 498.062 1354.74C498.27 1354.61 498.518 1354.54 498.807 1354.54C499.334 1354.54 499.705 1354.74 499.92 1355.15C500.139 1355.56 500.248 1356.33 500.248 1357.46V1361.26H499.264V1357.5C499.264 1356.58 499.211 1356 499.105 1355.78C499.004 1355.55 498.816 1355.44 498.543 1355.44C498.23 1355.44 498.016 1355.56 497.898 1355.8C497.785 1356.04 497.729 1356.61 497.729 1357.5V1361.26H496.744V1357.5C496.744 1356.57 496.688 1355.99 496.574 1355.77C496.465 1355.55 496.266 1355.44 495.977 1355.44C495.691 1355.44 495.492 1355.56 495.379 1355.8C495.27 1356.04 495.215 1356.61 495.215 1357.5V1361.26H494.236V1354.7H495.215V1355.26C495.344 1355.02 495.504 1354.85 495.695 1354.73C495.891 1354.6 496.111 1354.54 496.357 1354.54C496.654 1354.54 496.9 1354.61 497.096 1354.74C497.295 1354.88 497.449 1355.09 497.559 1355.36ZM504.941 1357.96H504.584C503.955 1357.96 503.48 1358.07 503.16 1358.29C502.844 1358.51 502.686 1358.84 502.686 1359.28C502.686 1359.67 502.805 1359.98 503.043 1360.2C503.281 1360.42 503.611 1360.53 504.033 1360.53C504.627 1360.53 505.094 1360.32 505.434 1359.91C505.773 1359.5 505.945 1358.93 505.949 1358.2V1357.96H504.941ZM507.033 1357.51V1361.26H505.949V1360.29C505.719 1360.68 505.428 1360.97 505.076 1361.15C504.729 1361.34 504.305 1361.43 503.805 1361.43C503.137 1361.43 502.604 1361.24 502.205 1360.87C501.807 1360.49 501.607 1359.98 501.607 1359.35C501.607 1358.62 501.852 1358.06 502.34 1357.68C502.832 1357.31 503.553 1357.12 504.502 1357.12H505.949V1356.95C505.945 1356.42 505.812 1356.04 505.551 1355.81C505.289 1355.57 504.871 1355.45 504.297 1355.45C503.93 1355.45 503.559 1355.51 503.184 1355.61C502.809 1355.72 502.443 1355.87 502.088 1356.07V1355C502.486 1354.84 502.867 1354.73 503.23 1354.66C503.598 1354.58 503.953 1354.54 504.297 1354.54C504.84 1354.54 505.303 1354.62 505.686 1354.78C506.072 1354.94 506.385 1355.18 506.623 1355.5C506.771 1355.69 506.877 1355.94 506.939 1356.23C507.002 1356.51 507.033 1356.94 507.033 1357.51ZM513.76 1354.92V1355.98C513.451 1355.8 513.141 1355.67 512.828 1355.58C512.516 1355.49 512.197 1355.44 511.873 1355.44C511.385 1355.44 511.02 1355.52 510.777 1355.68C510.539 1355.84 510.42 1356.08 510.42 1356.4C510.42 1356.69 510.51 1356.91 510.689 1357.06C510.869 1357.2 511.316 1357.34 512.031 1357.48L512.465 1357.56C513 1357.66 513.404 1357.87 513.678 1358.17C513.955 1358.48 514.094 1358.87 514.094 1359.36C514.094 1360.01 513.863 1360.52 513.402 1360.88C512.941 1361.25 512.301 1361.43 511.48 1361.43C511.156 1361.43 510.816 1361.39 510.461 1361.32C510.105 1361.26 509.721 1361.16 509.307 1361.02V1359.91C509.709 1360.11 510.094 1360.27 510.461 1360.37C510.828 1360.48 511.176 1360.53 511.504 1360.53C511.98 1360.53 512.35 1360.43 512.611 1360.24C512.873 1360.04 513.004 1359.77 513.004 1359.42C513.004 1358.92 512.525 1358.58 511.568 1358.39L511.521 1358.38L511.117 1358.29C510.496 1358.17 510.043 1357.97 509.758 1357.68C509.473 1357.4 509.33 1357 509.33 1356.51C509.33 1355.88 509.543 1355.39 509.969 1355.05C510.395 1354.71 511.002 1354.54 511.791 1354.54C512.143 1354.54 512.48 1354.57 512.805 1354.64C513.129 1354.7 513.447 1354.8 513.76 1354.92ZM520.99 1354.92V1355.98C520.682 1355.8 520.371 1355.67 520.059 1355.58C519.746 1355.49 519.428 1355.44 519.104 1355.44C518.615 1355.44 518.25 1355.52 518.008 1355.68C517.77 1355.84 517.65 1356.08 517.65 1356.4C517.65 1356.69 517.74 1356.91 517.92 1357.06C518.1 1357.2 518.547 1357.34 519.262 1357.48L519.695 1357.56C520.23 1357.66 520.635 1357.87 520.908 1358.17C521.186 1358.48 521.324 1358.87 521.324 1359.36C521.324 1360.01 521.094 1360.52 520.633 1360.88C520.172 1361.25 519.531 1361.43 518.711 1361.43C518.387 1361.43 518.047 1361.39 517.691 1361.32C517.336 1361.26 516.951 1361.16 516.537 1361.02V1359.91C516.939 1360.11 517.324 1360.27 517.691 1360.37C518.059 1360.48 518.406 1360.53 518.734 1360.53C519.211 1360.53 519.58 1360.43 519.842 1360.24C520.104 1360.04 520.234 1359.77 520.234 1359.42C520.234 1358.92 519.756 1358.58 518.799 1358.39L518.752 1358.38L518.348 1358.29C517.727 1358.17 517.273 1357.97 516.988 1357.68C516.703 1357.4 516.561 1357 516.561 1356.51C516.561 1355.88 516.773 1355.39 517.199 1355.05C517.625 1354.71 518.232 1354.54 519.021 1354.54C519.373 1354.54 519.711 1354.57 520.035 1354.64C520.359 1354.7 520.678 1354.8 520.99 1354.92ZM529.082 1357.44V1357.97H524.412V1358C524.381 1358.9 524.551 1359.54 524.922 1359.93C525.297 1360.32 525.824 1360.51 526.504 1360.51C526.848 1360.51 527.207 1360.46 527.582 1360.35C527.957 1360.24 528.357 1360.08 528.783 1359.85V1360.92C528.373 1361.09 527.977 1361.22 527.594 1361.3C527.215 1361.39 526.848 1361.43 526.492 1361.43C525.473 1361.43 524.676 1361.12 524.102 1360.51C523.527 1359.9 523.24 1359.06 523.24 1357.98C523.24 1356.94 523.521 1356.1 524.084 1355.48C524.646 1354.85 525.396 1354.54 526.334 1354.54C527.17 1354.54 527.828 1354.82 528.309 1355.39C528.793 1355.95 529.051 1356.64 529.082 1357.44ZM528.004 1357.12C527.957 1356.67 527.791 1356.28 527.506 1355.95C527.225 1355.62 526.818 1355.45 526.287 1355.45C525.768 1355.45 525.34 1355.62 525.004 1355.97C524.668 1356.31 524.484 1356.7 524.453 1357.13L528.004 1357.12ZM535.451 1354.92V1355.98C535.143 1355.8 534.832 1355.67 534.52 1355.58C534.207 1355.49 533.889 1355.44 533.564 1355.44C533.076 1355.44 532.711 1355.52 532.469 1355.68C532.23 1355.84 532.111 1356.08 532.111 1356.4C532.111 1356.69 532.201 1356.91 532.381 1357.06C532.561 1357.2 533.008 1357.34 533.723 1357.48L534.156 1357.56C534.691 1357.66 535.096 1357.87 535.369 1358.17C535.646 1358.48 535.785 1358.87 535.785 1359.36C535.785 1360.01 535.555 1360.52 535.094 1360.88C534.633 1361.25 533.992 1361.43 533.172 1361.43C532.848 1361.43 532.508 1361.39 532.152 1361.32C531.797 1361.26 531.412 1361.16 530.998 1361.02V1359.91C531.4 1360.11 531.785 1360.27 532.152 1360.37C532.52 1360.48 532.867 1360.53 533.195 1360.53C533.672 1360.53 534.041 1360.43 534.303 1360.24C534.564 1360.04 534.695 1359.77 534.695 1359.42C534.695 1358.92 534.217 1358.58 533.26 1358.39L533.213 1358.38L532.809 1358.29C532.188 1358.17 531.734 1357.97 531.449 1357.68C531.164 1357.4 531.021 1357 531.021 1356.51C531.021 1355.88 531.234 1355.39 531.66 1355.05C532.086 1354.71 532.693 1354.54 533.482 1354.54C533.834 1354.54 534.172 1354.57 534.496 1354.64C534.82 1354.7 535.139 1354.8 535.451 1354.92ZM542.518 1352.19V1355.78H541.205V1352.19H542.518ZM539.395 1352.19V1355.78H538.082V1352.19H539.395ZM209.916 1370.19V1373.78H208.604V1370.19H209.916ZM206.793 1370.19V1373.78H205.48V1370.19H206.793ZM216.818 1370.51H217.932L213.326 1380.37H212.207L216.818 1370.51ZM220.691 1372.72H223.451V1378.42H225.59V1379.26H220.234V1378.42H222.373V1373.56H220.691V1372.72ZM222.373 1370.17H223.451V1371.53H222.373V1370.17ZM230.031 1373.36C230.164 1373.08 230.332 1372.88 230.535 1372.74C230.742 1372.61 230.99 1372.54 231.279 1372.54C231.807 1372.54 232.178 1372.74 232.393 1373.15C232.611 1373.56 232.721 1374.33 232.721 1375.46V1379.26H231.736V1375.5C231.736 1374.58 231.684 1374 231.578 1373.78C231.477 1373.55 231.289 1373.44 231.016 1373.44C230.703 1373.44 230.488 1373.56 230.371 1373.8C230.258 1374.04 230.201 1374.61 230.201 1375.5V1379.26H229.217V1375.5C229.217 1374.57 229.16 1373.99 229.047 1373.77C228.938 1373.55 228.738 1373.44 228.449 1373.44C228.164 1373.44 227.965 1373.56 227.852 1373.8C227.742 1374.04 227.688 1374.61 227.688 1375.5V1379.26H226.709V1372.7H227.688V1373.26C227.816 1373.02 227.977 1372.85 228.168 1372.73C228.363 1372.6 228.584 1372.54 228.83 1372.54C229.127 1372.54 229.373 1372.61 229.568 1372.74C229.768 1372.88 229.922 1373.09 230.031 1373.36ZM237.414 1375.96H237.057C236.428 1375.96 235.953 1376.07 235.633 1376.29C235.316 1376.51 235.158 1376.84 235.158 1377.28C235.158 1377.67 235.277 1377.98 235.516 1378.2C235.754 1378.42 236.084 1378.53 236.506 1378.53C237.1 1378.53 237.566 1378.32 237.906 1377.91C238.246 1377.5 238.418 1376.93 238.422 1376.2V1375.96H237.414ZM239.506 1375.51V1379.26H238.422V1378.29C238.191 1378.68 237.9 1378.97 237.549 1379.15C237.201 1379.34 236.777 1379.43 236.277 1379.43C235.609 1379.43 235.076 1379.24 234.678 1378.87C234.279 1378.49 234.08 1377.98 234.08 1377.35C234.08 1376.62 234.324 1376.06 234.812 1375.68C235.305 1375.31 236.025 1375.12 236.975 1375.12H238.422V1374.95C238.418 1374.42 238.285 1374.04 238.023 1373.81C237.762 1373.57 237.344 1373.45 236.77 1373.45C236.402 1373.45 236.031 1373.51 235.656 1373.61C235.281 1373.72 234.916 1373.87 234.561 1374.07V1373C234.959 1372.84 235.34 1372.73 235.703 1372.66C236.07 1372.58 236.426 1372.54 236.77 1372.54C237.312 1372.54 237.775 1372.62 238.158 1372.78C238.545 1372.94 238.857 1373.18 239.096 1373.5C239.244 1373.69 239.35 1373.94 239.412 1374.23C239.475 1374.51 239.506 1374.94 239.506 1375.51ZM245.559 1375.92C245.559 1375.12 245.426 1374.5 245.16 1374.09C244.898 1373.66 244.516 1373.45 244.012 1373.45C243.484 1373.45 243.082 1373.66 242.805 1374.09C242.527 1374.5 242.389 1375.12 242.389 1375.92C242.389 1376.73 242.527 1377.35 242.805 1377.78C243.086 1378.2 243.492 1378.41 244.023 1378.41C244.52 1378.41 244.898 1378.2 245.16 1377.77C245.426 1377.34 245.559 1376.73 245.559 1375.92ZM246.637 1378.84C246.637 1379.82 246.404 1380.57 245.939 1381.08C245.475 1381.58 244.791 1381.84 243.889 1381.84C243.592 1381.84 243.281 1381.81 242.957 1381.76C242.633 1381.7 242.309 1381.62 241.984 1381.51V1380.45C242.367 1380.63 242.715 1380.76 243.027 1380.85C243.34 1380.93 243.627 1380.98 243.889 1380.98C244.471 1380.98 244.895 1380.82 245.16 1380.5C245.426 1380.18 245.559 1379.68 245.559 1379V1378.95V1378.22C245.387 1378.58 245.152 1378.86 244.855 1379.04C244.559 1379.22 244.197 1379.31 243.771 1379.31C243.006 1379.31 242.395 1379 241.938 1378.39C241.48 1377.77 241.252 1376.95 241.252 1375.92C241.252 1374.89 241.48 1374.07 241.938 1373.46C242.395 1372.84 243.006 1372.54 243.771 1372.54C244.193 1372.54 244.551 1372.62 244.844 1372.79C245.137 1372.96 245.375 1373.22 245.559 1373.57V1372.72H246.637V1378.84ZM254.324 1375.44V1375.97H249.654V1376C249.623 1376.9 249.793 1377.54 250.164 1377.93C250.539 1378.32 251.066 1378.51 251.746 1378.51C252.09 1378.51 252.449 1378.46 252.824 1378.35C253.199 1378.24 253.6 1378.08 254.025 1377.85V1378.92C253.615 1379.09 253.219 1379.22 252.836 1379.3C252.457 1379.39 252.09 1379.43 251.734 1379.43C250.715 1379.43 249.918 1379.12 249.344 1378.51C248.77 1377.9 248.482 1377.06 248.482 1375.98C248.482 1374.94 248.764 1374.1 249.326 1373.48C249.889 1372.85 250.639 1372.54 251.576 1372.54C252.412 1372.54 253.07 1372.82 253.551 1373.39C254.035 1373.95 254.293 1374.64 254.324 1375.44ZM253.246 1375.12C253.199 1374.67 253.033 1374.28 252.748 1373.95C252.467 1373.62 252.061 1373.45 251.529 1373.45C251.01 1373.45 250.582 1373.62 250.246 1373.97C249.91 1374.31 249.727 1374.7 249.695 1375.13L253.246 1375.12ZM260.693 1372.92V1373.98C260.385 1373.8 260.074 1373.67 259.762 1373.58C259.449 1373.49 259.131 1373.44 258.807 1373.44C258.318 1373.44 257.953 1373.52 257.711 1373.68C257.473 1373.84 257.354 1374.08 257.354 1374.4C257.354 1374.69 257.443 1374.91 257.623 1375.06C257.803 1375.2 258.25 1375.34 258.965 1375.48L259.398 1375.56C259.934 1375.66 260.338 1375.87 260.611 1376.17C260.889 1376.48 261.027 1376.87 261.027 1377.36C261.027 1378.01 260.797 1378.52 260.336 1378.88C259.875 1379.25 259.234 1379.43 258.414 1379.43C258.09 1379.43 257.75 1379.39 257.395 1379.32C257.039 1379.26 256.654 1379.16 256.24 1379.02V1377.91C256.643 1378.11 257.027 1378.27 257.395 1378.37C257.762 1378.48 258.109 1378.53 258.438 1378.53C258.914 1378.53 259.283 1378.43 259.545 1378.24C259.807 1378.04 259.938 1377.77 259.938 1377.42C259.938 1376.92 259.459 1376.58 258.502 1376.39L258.455 1376.38L258.051 1376.29C257.43 1376.17 256.977 1375.97 256.691 1375.68C256.406 1375.4 256.264 1375 256.264 1374.51C256.264 1373.88 256.477 1373.39 256.902 1373.05C257.328 1372.71 257.936 1372.54 258.725 1372.54C259.076 1372.54 259.414 1372.57 259.738 1372.64C260.062 1372.7 260.381 1372.8 260.693 1372.92ZM267.432 1370.51H268.545L263.939 1380.37H262.82L267.432 1370.51ZM270.039 1372.7H271.158L273.062 1378.2L274.973 1372.7H276.092L273.76 1379.26H272.371L270.039 1372.7ZM282.385 1372.92V1373.98C282.076 1373.8 281.766 1373.67 281.453 1373.58C281.141 1373.49 280.822 1373.44 280.498 1373.44C280.01 1373.44 279.645 1373.52 279.402 1373.68C279.164 1373.84 279.045 1374.08 279.045 1374.4C279.045 1374.69 279.135 1374.91 279.314 1375.06C279.494 1375.2 279.941 1375.34 280.656 1375.48L281.09 1375.56C281.625 1375.66 282.029 1375.87 282.303 1376.17C282.58 1376.48 282.719 1376.87 282.719 1377.36C282.719 1378.01 282.488 1378.52 282.027 1378.88C281.566 1379.25 280.926 1379.43 280.105 1379.43C279.781 1379.43 279.441 1379.39 279.086 1379.32C278.73 1379.26 278.346 1379.16 277.932 1379.02V1377.91C278.334 1378.11 278.719 1378.27 279.086 1378.37C279.453 1378.48 279.801 1378.53 280.129 1378.53C280.605 1378.53 280.975 1378.43 281.236 1378.24C281.498 1378.04 281.629 1377.77 281.629 1377.42C281.629 1376.92 281.15 1376.58 280.193 1376.39L280.146 1376.38L279.742 1376.29C279.121 1376.17 278.668 1375.97 278.383 1375.68C278.098 1375.4 277.955 1375 277.955 1374.51C277.955 1373.88 278.168 1373.39 278.594 1373.05C279.02 1372.71 279.627 1372.54 280.416 1372.54C280.768 1372.54 281.105 1372.57 281.43 1372.64C281.754 1372.7 282.072 1372.8 282.385 1372.92ZM290.131 1378.92C289.842 1379.09 289.543 1379.22 289.234 1379.3C288.93 1379.39 288.617 1379.43 288.297 1379.43C287.281 1379.43 286.486 1379.12 285.912 1378.51C285.342 1377.91 285.057 1377.06 285.057 1375.98C285.057 1374.91 285.342 1374.06 285.912 1373.45C286.486 1372.84 287.281 1372.54 288.297 1372.54C288.613 1372.54 288.922 1372.58 289.223 1372.66C289.523 1372.74 289.826 1372.87 290.131 1373.04V1374.17C289.846 1373.92 289.559 1373.74 289.27 1373.62C288.984 1373.51 288.66 1373.45 288.297 1373.45C287.621 1373.45 287.102 1373.67 286.738 1374.11C286.375 1374.55 286.193 1375.17 286.193 1375.98C286.193 1376.79 286.375 1377.42 286.738 1377.86C287.105 1378.3 287.625 1378.51 288.297 1378.51C288.672 1378.51 289.008 1378.46 289.305 1378.34C289.602 1378.23 289.877 1378.05 290.131 1377.81V1378.92ZM294.754 1373.45C294.207 1373.45 293.793 1373.67 293.512 1374.09C293.23 1374.52 293.09 1375.15 293.09 1375.98C293.09 1376.82 293.23 1377.45 293.512 1377.88C293.793 1378.3 294.207 1378.51 294.754 1378.51C295.305 1378.51 295.721 1378.3 296.002 1377.88C296.283 1377.45 296.424 1376.82 296.424 1375.98C296.424 1375.15 296.283 1374.52 296.002 1374.09C295.721 1373.67 295.305 1373.45 294.754 1373.45ZM294.754 1372.54C295.664 1372.54 296.359 1372.83 296.84 1373.42C297.324 1374.01 297.566 1374.87 297.566 1375.98C297.566 1377.1 297.326 1377.96 296.846 1378.55C296.365 1379.14 295.668 1379.43 294.754 1379.43C293.844 1379.43 293.148 1379.14 292.668 1378.55C292.188 1377.96 291.947 1377.1 291.947 1375.98C291.947 1374.87 292.188 1374.01 292.668 1373.42C293.148 1372.83 293.844 1372.54 294.754 1372.54ZM303.402 1373.53V1370.14H304.48V1379.26H303.402V1378.43C303.223 1378.76 302.982 1379.01 302.682 1379.18C302.385 1379.34 302.041 1379.43 301.65 1379.43C300.857 1379.43 300.232 1379.12 299.775 1378.51C299.322 1377.89 299.096 1377.04 299.096 1375.96C299.096 1374.89 299.324 1374.06 299.781 1373.45C300.238 1372.84 300.861 1372.54 301.65 1372.54C302.045 1372.54 302.393 1372.62 302.693 1372.8C302.994 1372.96 303.23 1373.21 303.402 1373.53ZM300.232 1375.98C300.232 1376.82 300.365 1377.45 300.631 1377.88C300.896 1378.3 301.289 1378.51 301.809 1378.51C302.328 1378.51 302.723 1378.3 302.992 1377.87C303.266 1377.44 303.402 1376.81 303.402 1375.98C303.402 1375.15 303.266 1374.52 302.992 1374.1C302.723 1373.67 302.328 1373.45 301.809 1373.45C301.289 1373.45 300.896 1373.67 300.631 1374.09C300.365 1374.52 300.232 1375.15 300.232 1375.98ZM312.168 1375.44V1375.97H307.498V1376C307.467 1376.9 307.637 1377.54 308.008 1377.93C308.383 1378.32 308.91 1378.51 309.59 1378.51C309.934 1378.51 310.293 1378.46 310.668 1378.35C311.043 1378.24 311.443 1378.08 311.869 1377.85V1378.92C311.459 1379.09 311.062 1379.22 310.68 1379.3C310.301 1379.39 309.934 1379.43 309.578 1379.43C308.559 1379.43 307.762 1379.12 307.188 1378.51C306.613 1377.9 306.326 1377.06 306.326 1375.98C306.326 1374.94 306.607 1374.1 307.17 1373.48C307.732 1372.85 308.482 1372.54 309.42 1372.54C310.256 1372.54 310.914 1372.82 311.395 1373.39C311.879 1373.95 312.137 1374.64 312.168 1375.44ZM311.09 1375.12C311.043 1374.67 310.877 1374.28 310.592 1373.95C310.311 1373.62 309.904 1373.45 309.373 1373.45C308.854 1373.45 308.426 1373.62 308.09 1373.97C307.754 1374.31 307.57 1374.7 307.539 1375.13L311.09 1375.12ZM313.434 1375.02H319.645V1376.01H313.434V1375.02ZM326.283 1378.92C325.994 1379.09 325.695 1379.22 325.387 1379.3C325.082 1379.39 324.77 1379.43 324.449 1379.43C323.434 1379.43 322.639 1379.12 322.064 1378.51C321.494 1377.91 321.209 1377.06 321.209 1375.98C321.209 1374.91 321.494 1374.06 322.064 1373.45C322.639 1372.84 323.434 1372.54 324.449 1372.54C324.766 1372.54 325.074 1372.58 325.375 1372.66C325.676 1372.74 325.979 1372.87 326.283 1373.04V1374.17C325.998 1373.92 325.711 1373.74 325.422 1373.62C325.137 1373.51 324.812 1373.45 324.449 1373.45C323.773 1373.45 323.254 1373.67 322.891 1374.11C322.527 1374.55 322.346 1375.17 322.346 1375.98C322.346 1376.79 322.527 1377.42 322.891 1377.86C323.258 1378.3 323.777 1378.51 324.449 1378.51C324.824 1378.51 325.16 1378.46 325.457 1378.34C325.754 1378.23 326.029 1378.05 326.283 1377.81V1378.92ZM330.906 1373.45C330.359 1373.45 329.945 1373.67 329.664 1374.09C329.383 1374.52 329.242 1375.15 329.242 1375.98C329.242 1376.82 329.383 1377.45 329.664 1377.88C329.945 1378.3 330.359 1378.51 330.906 1378.51C331.457 1378.51 331.873 1378.3 332.154 1377.88C332.436 1377.45 332.576 1376.82 332.576 1375.98C332.576 1375.15 332.436 1374.52 332.154 1374.09C331.873 1373.67 331.457 1373.45 330.906 1373.45ZM330.906 1372.54C331.816 1372.54 332.512 1372.83 332.992 1373.42C333.477 1374.01 333.719 1374.87 333.719 1375.98C333.719 1377.1 333.479 1377.96 332.998 1378.55C332.518 1379.14 331.82 1379.43 330.906 1379.43C329.996 1379.43 329.301 1379.14 328.82 1378.55C328.34 1377.96 328.1 1377.1 328.1 1375.98C328.1 1374.87 328.34 1374.01 328.82 1373.42C329.301 1372.83 329.996 1372.54 330.906 1372.54ZM338.488 1373.36C338.621 1373.08 338.789 1372.88 338.992 1372.74C339.199 1372.61 339.447 1372.54 339.736 1372.54C340.264 1372.54 340.635 1372.74 340.85 1373.15C341.068 1373.56 341.178 1374.33 341.178 1375.46V1379.26H340.193V1375.5C340.193 1374.58 340.141 1374 340.035 1373.78C339.934 1373.55 339.746 1373.44 339.473 1373.44C339.16 1373.44 338.945 1373.56 338.828 1373.8C338.715 1374.04 338.658 1374.61 338.658 1375.5V1379.26H337.674V1375.5C337.674 1374.57 337.617 1373.99 337.504 1373.77C337.395 1373.55 337.195 1373.44 336.906 1373.44C336.621 1373.44 336.422 1373.56 336.309 1373.8C336.199 1374.04 336.145 1374.61 336.145 1375.5V1379.26H335.166V1372.7H336.145V1373.26C336.273 1373.02 336.434 1372.85 336.625 1372.73C336.82 1372.6 337.041 1372.54 337.287 1372.54C337.584 1372.54 337.83 1372.61 338.025 1372.74C338.225 1372.88 338.379 1373.09 338.488 1373.36ZM345.719 1373.36C345.852 1373.08 346.02 1372.88 346.223 1372.74C346.43 1372.61 346.678 1372.54 346.967 1372.54C347.494 1372.54 347.865 1372.74 348.08 1373.15C348.299 1373.56 348.408 1374.33 348.408 1375.46V1379.26H347.424V1375.5C347.424 1374.58 347.371 1374 347.266 1373.78C347.164 1373.55 346.977 1373.44 346.703 1373.44C346.391 1373.44 346.176 1373.56 346.059 1373.8C345.945 1374.04 345.889 1374.61 345.889 1375.5V1379.26H344.904V1375.5C344.904 1374.57 344.848 1373.99 344.734 1373.77C344.625 1373.55 344.426 1373.44 344.137 1373.44C343.852 1373.44 343.652 1373.56 343.539 1373.8C343.43 1374.04 343.375 1374.61 343.375 1375.5V1379.26H342.396V1372.7H343.375V1373.26C343.504 1373.02 343.664 1372.85 343.855 1372.73C344.051 1372.6 344.271 1372.54 344.518 1372.54C344.814 1372.54 345.061 1372.61 345.256 1372.74C345.455 1372.88 345.609 1373.09 345.719 1373.36ZM353.102 1375.96H352.744C352.115 1375.96 351.641 1376.07 351.32 1376.29C351.004 1376.51 350.846 1376.84 350.846 1377.28C350.846 1377.67 350.965 1377.98 351.203 1378.2C351.441 1378.42 351.771 1378.53 352.193 1378.53C352.787 1378.53 353.254 1378.32 353.594 1377.91C353.934 1377.5 354.105 1376.93 354.109 1376.2V1375.96H353.102ZM355.193 1375.51V1379.26H354.109V1378.29C353.879 1378.68 353.588 1378.97 353.236 1379.15C352.889 1379.34 352.465 1379.43 351.965 1379.43C351.297 1379.43 350.764 1379.24 350.365 1378.87C349.967 1378.49 349.768 1377.98 349.768 1377.35C349.768 1376.62 350.012 1376.06 350.5 1375.68C350.992 1375.31 351.713 1375.12 352.662 1375.12H354.109V1374.95C354.105 1374.42 353.973 1374.04 353.711 1373.81C353.449 1373.57 353.031 1373.45 352.457 1373.45C352.09 1373.45 351.719 1373.51 351.344 1373.61C350.969 1373.72 350.604 1373.87 350.248 1374.07V1373C350.646 1372.84 351.027 1372.73 351.391 1372.66C351.758 1372.58 352.113 1372.54 352.457 1372.54C353 1372.54 353.463 1372.62 353.846 1372.78C354.232 1372.94 354.545 1373.18 354.783 1373.5C354.932 1373.69 355.037 1373.94 355.1 1374.23C355.162 1374.51 355.193 1374.94 355.193 1375.51ZM362.377 1375.19V1379.26H361.293V1375.19C361.293 1374.6 361.189 1374.17 360.982 1373.89C360.775 1373.61 360.451 1373.48 360.01 1373.48C359.506 1373.48 359.117 1373.66 358.844 1374.01C358.574 1374.37 358.439 1374.88 358.439 1375.55V1379.26H357.361V1372.7H358.439V1373.68C358.631 1373.31 358.891 1373.02 359.219 1372.83C359.547 1372.64 359.936 1372.54 360.385 1372.54C361.053 1372.54 361.551 1372.76 361.879 1373.2C362.211 1373.64 362.377 1374.3 362.377 1375.19ZM368.477 1373.53V1370.14H369.555V1379.26H368.477V1378.43C368.297 1378.76 368.057 1379.01 367.756 1379.18C367.459 1379.34 367.115 1379.43 366.725 1379.43C365.932 1379.43 365.307 1379.12 364.85 1378.51C364.396 1377.89 364.17 1377.04 364.17 1375.96C364.17 1374.89 364.398 1374.06 364.855 1373.45C365.312 1372.84 365.936 1372.54 366.725 1372.54C367.119 1372.54 367.467 1372.62 367.768 1372.8C368.068 1372.96 368.305 1373.21 368.477 1373.53ZM365.307 1375.98C365.307 1376.82 365.439 1377.45 365.705 1377.88C365.971 1378.3 366.363 1378.51 366.883 1378.51C367.402 1378.51 367.797 1378.3 368.066 1377.87C368.34 1377.44 368.477 1376.81 368.477 1375.98C368.477 1375.15 368.34 1374.52 368.066 1374.1C367.797 1373.67 367.402 1373.45 366.883 1373.45C366.363 1373.45 365.971 1373.67 365.705 1374.09C365.439 1374.52 365.307 1375.15 365.307 1375.98ZM371.277 1375.02H377.488V1376.01H371.277V1375.02ZM384.127 1378.92C383.838 1379.09 383.539 1379.22 383.23 1379.3C382.926 1379.39 382.613 1379.43 382.293 1379.43C381.277 1379.43 380.482 1379.12 379.908 1378.51C379.338 1377.91 379.053 1377.06 379.053 1375.98C379.053 1374.91 379.338 1374.06 379.908 1373.45C380.482 1372.84 381.277 1372.54 382.293 1372.54C382.609 1372.54 382.918 1372.58 383.219 1372.66C383.52 1372.74 383.822 1372.87 384.127 1373.04V1374.17C383.842 1373.92 383.555 1373.74 383.266 1373.62C382.98 1373.51 382.656 1373.45 382.293 1373.45C381.617 1373.45 381.098 1373.67 380.734 1374.11C380.371 1374.55 380.189 1375.17 380.189 1375.98C380.189 1376.79 380.371 1377.42 380.734 1377.86C381.102 1378.3 381.621 1378.51 382.293 1378.51C382.668 1378.51 383.004 1378.46 383.301 1378.34C383.598 1378.23 383.873 1378.05 384.127 1377.81V1378.92ZM391.703 1375.44V1375.97H387.033V1376C387.002 1376.9 387.172 1377.54 387.543 1377.93C387.918 1378.32 388.445 1378.51 389.125 1378.51C389.469 1378.51 389.828 1378.46 390.203 1378.35C390.578 1378.24 390.979 1378.08 391.404 1377.85V1378.92C390.994 1379.09 390.598 1379.22 390.215 1379.3C389.836 1379.39 389.469 1379.43 389.113 1379.43C388.094 1379.43 387.297 1379.12 386.723 1378.51C386.148 1377.9 385.861 1377.06 385.861 1375.98C385.861 1374.94 386.143 1374.1 386.705 1373.48C387.268 1372.85 388.018 1372.54 388.955 1372.54C389.791 1372.54 390.449 1372.82 390.93 1373.39C391.414 1373.95 391.672 1374.64 391.703 1375.44ZM390.625 1375.12C390.578 1374.67 390.412 1374.28 390.127 1373.95C389.846 1373.62 389.439 1373.45 388.908 1373.45C388.389 1373.45 387.961 1373.62 387.625 1373.97C387.289 1374.31 387.105 1374.7 387.074 1375.13L390.625 1375.12ZM398.529 1375.19V1379.26H397.445V1375.19C397.445 1374.6 397.342 1374.17 397.135 1373.89C396.928 1373.61 396.604 1373.48 396.162 1373.48C395.658 1373.48 395.27 1373.66 394.996 1374.01C394.727 1374.37 394.592 1374.88 394.592 1375.55V1379.26H393.514V1372.7H394.592V1373.68C394.783 1373.31 395.043 1373.02 395.371 1372.83C395.699 1372.64 396.088 1372.54 396.537 1372.54C397.205 1372.54 397.703 1372.76 398.031 1373.2C398.363 1373.64 398.529 1374.3 398.529 1375.19ZM403.199 1370.83V1372.7H405.648V1373.53H403.199V1377.1C403.199 1377.58 403.291 1377.92 403.475 1378.11C403.658 1378.3 403.979 1378.4 404.436 1378.4H405.648V1379.26H404.33C403.521 1379.26 402.951 1379.1 402.619 1378.77C402.287 1378.45 402.121 1377.89 402.121 1377.1V1373.53H400.369V1372.7H402.121V1370.83H403.199ZM413.395 1375.44V1375.97H408.725V1376C408.693 1376.9 408.863 1377.54 409.234 1377.93C409.609 1378.32 410.137 1378.51 410.816 1378.51C411.16 1378.51 411.52 1378.46 411.895 1378.35C412.27 1378.24 412.67 1378.08 413.096 1377.85V1378.92C412.686 1379.09 412.289 1379.22 411.906 1379.3C411.527 1379.39 411.16 1379.43 410.805 1379.43C409.785 1379.43 408.988 1379.12 408.414 1378.51C407.84 1377.9 407.553 1377.06 407.553 1375.98C407.553 1374.94 407.834 1374.1 408.396 1373.48C408.959 1372.85 409.709 1372.54 410.646 1372.54C411.482 1372.54 412.141 1372.82 412.621 1373.39C413.105 1373.95 413.363 1374.64 413.395 1375.44ZM412.316 1375.12C412.27 1374.67 412.104 1374.28 411.818 1373.95C411.537 1373.62 411.131 1373.45 410.6 1373.45C410.08 1373.45 409.652 1373.62 409.316 1373.97C408.98 1374.31 408.797 1374.7 408.766 1375.13L412.316 1375.12ZM420.83 1374.05C420.6 1373.87 420.365 1373.74 420.127 1373.66C419.889 1373.58 419.627 1373.53 419.342 1373.53C418.67 1373.53 418.156 1373.75 417.801 1374.17C417.445 1374.59 417.268 1375.2 417.268 1376V1379.26H416.184V1372.7H417.268V1373.98C417.447 1373.51 417.723 1373.16 418.094 1372.91C418.469 1372.66 418.912 1372.54 419.424 1372.54C419.689 1372.54 419.938 1372.57 420.168 1372.64C420.398 1372.7 420.619 1372.81 420.83 1372.95V1374.05ZM423.572 1376.89H425.635V1379.26H423.572V1376.89ZM430.721 1378.43V1381.76H429.637V1372.7H430.721V1373.53C430.9 1373.21 431.139 1372.96 431.436 1372.8C431.736 1372.62 432.082 1372.54 432.473 1372.54C433.266 1372.54 433.887 1372.84 434.336 1373.46C434.789 1374.07 435.016 1374.92 435.016 1376.01C435.016 1377.07 434.789 1377.91 434.336 1378.52C433.883 1379.13 433.262 1379.43 432.473 1379.43C432.074 1379.43 431.725 1379.34 431.424 1379.18C431.127 1379.01 430.893 1378.76 430.721 1378.43ZM433.885 1375.98C433.885 1375.15 433.752 1374.52 433.486 1374.09C433.225 1373.67 432.834 1373.45 432.314 1373.45C431.791 1373.45 431.395 1373.67 431.125 1374.1C430.855 1374.52 430.721 1375.15 430.721 1375.98C430.721 1376.81 430.855 1377.44 431.125 1377.87C431.395 1378.3 431.791 1378.51 432.314 1378.51C432.834 1378.51 433.225 1378.3 433.486 1377.88C433.752 1377.45 433.885 1376.82 433.885 1375.98ZM441.912 1375.19V1379.26H440.828V1375.19C440.828 1374.6 440.725 1374.17 440.518 1373.89C440.311 1373.61 439.986 1373.48 439.545 1373.48C439.041 1373.48 438.652 1373.66 438.379 1374.01C438.109 1374.37 437.975 1374.88 437.975 1375.55V1379.26H436.896V1372.7H437.975V1373.68C438.166 1373.31 438.426 1373.02 438.754 1372.83C439.082 1372.64 439.471 1372.54 439.92 1372.54C440.588 1372.54 441.086 1372.76 441.414 1373.2C441.746 1373.64 441.912 1374.3 441.912 1375.19ZM448.012 1375.92C448.012 1375.12 447.879 1374.5 447.613 1374.09C447.352 1373.66 446.969 1373.45 446.465 1373.45C445.938 1373.45 445.535 1373.66 445.258 1374.09C444.98 1374.5 444.842 1375.12 444.842 1375.92C444.842 1376.73 444.98 1377.35 445.258 1377.78C445.539 1378.2 445.945 1378.41 446.477 1378.41C446.973 1378.41 447.352 1378.2 447.613 1377.77C447.879 1377.34 448.012 1376.73 448.012 1375.92ZM449.09 1378.84C449.09 1379.82 448.857 1380.57 448.393 1381.08C447.928 1381.58 447.244 1381.84 446.342 1381.84C446.045 1381.84 445.734 1381.81 445.41 1381.76C445.086 1381.7 444.762 1381.62 444.438 1381.51V1380.45C444.82 1380.63 445.168 1380.76 445.48 1380.85C445.793 1380.93 446.08 1380.98 446.342 1380.98C446.924 1380.98 447.348 1380.82 447.613 1380.5C447.879 1380.18 448.012 1379.68 448.012 1379V1378.95V1378.22C447.84 1378.58 447.605 1378.86 447.309 1379.04C447.012 1379.22 446.65 1379.31 446.225 1379.31C445.459 1379.31 444.848 1379 444.391 1378.39C443.934 1377.77 443.705 1376.95 443.705 1375.92C443.705 1374.89 443.934 1374.07 444.391 1373.46C444.848 1372.84 445.459 1372.54 446.225 1372.54C446.646 1372.54 447.004 1372.62 447.297 1372.79C447.59 1372.96 447.828 1373.22 448.012 1373.57V1372.72H449.09V1378.84ZM455.752 1370.19V1373.78H454.439V1370.19H455.752ZM452.629 1370.19V1373.78H451.316V1370.19H452.629ZM188.225 1424.19V1427.78H186.912V1424.19H188.225ZM185.102 1424.19V1427.78H183.789V1424.19H185.102ZM192.256 1425.48V1428.77H193.627C194.174 1428.77 194.6 1428.63 194.904 1428.34C195.213 1428.05 195.367 1427.64 195.367 1427.12C195.367 1426.6 195.215 1426.2 194.91 1425.92C194.605 1425.63 194.178 1425.48 193.627 1425.48H192.256ZM191.072 1424.51H193.627C194.604 1424.51 195.344 1424.73 195.848 1425.18C196.352 1425.62 196.604 1426.27 196.604 1427.12C196.604 1427.99 196.352 1428.64 195.848 1429.08C195.348 1429.52 194.607 1429.74 193.627 1429.74H192.256V1433.26H191.072V1424.51ZM203.916 1428.05C203.686 1427.87 203.451 1427.74 203.213 1427.66C202.975 1427.58 202.713 1427.53 202.428 1427.53C201.756 1427.53 201.242 1427.75 200.887 1428.17C200.531 1428.59 200.354 1429.2 200.354 1430V1433.26H199.27V1426.7H200.354V1427.98C200.533 1427.51 200.809 1427.16 201.18 1426.91C201.555 1426.66 201.998 1426.54 202.51 1426.54C202.775 1426.54 203.023 1426.57 203.254 1426.64C203.484 1426.7 203.705 1426.81 203.916 1426.95V1428.05ZM207.988 1427.45C207.441 1427.45 207.027 1427.67 206.746 1428.09C206.465 1428.52 206.324 1429.15 206.324 1429.98C206.324 1430.82 206.465 1431.45 206.746 1431.88C207.027 1432.3 207.441 1432.51 207.988 1432.51C208.539 1432.51 208.955 1432.3 209.236 1431.88C209.518 1431.45 209.658 1430.82 209.658 1429.98C209.658 1429.15 209.518 1428.52 209.236 1428.09C208.955 1427.67 208.539 1427.45 207.988 1427.45ZM207.988 1426.54C208.898 1426.54 209.594 1426.83 210.074 1427.42C210.559 1428.01 210.801 1428.87 210.801 1429.98C210.801 1431.1 210.561 1431.96 210.08 1432.55C209.6 1433.14 208.902 1433.43 207.988 1433.43C207.078 1433.43 206.383 1433.14 205.902 1432.55C205.422 1431.96 205.182 1431.1 205.182 1429.98C205.182 1428.87 205.422 1428.01 205.902 1427.42C206.383 1426.83 207.078 1426.54 207.988 1426.54ZM217.838 1424.14V1425.04H216.613C216.227 1425.04 215.957 1425.12 215.805 1425.28C215.656 1425.43 215.582 1425.71 215.582 1426.12V1426.7H217.838V1427.53H215.582V1433.26H214.504V1427.53H212.752V1426.7H214.504V1426.24C214.504 1425.52 214.668 1424.99 214.996 1424.65C215.328 1424.31 215.844 1424.14 216.543 1424.14H217.838ZM220.691 1426.72H223.451V1432.42H225.59V1433.26H220.234V1432.42H222.373V1427.56H220.691V1426.72ZM222.373 1424.17H223.451V1425.53H222.373V1424.17ZM230.283 1430.89C230.283 1431.37 230.371 1431.74 230.547 1431.98C230.727 1432.23 230.99 1432.35 231.338 1432.35H232.598V1433.26H231.232C230.588 1433.26 230.088 1433.05 229.732 1432.64C229.381 1432.23 229.205 1431.64 229.205 1430.89V1424.95H227.477V1424.11H230.283V1430.89ZM239.863 1429.44V1429.97H235.193V1430C235.162 1430.9 235.332 1431.54 235.703 1431.93C236.078 1432.32 236.605 1432.51 237.285 1432.51C237.629 1432.51 237.988 1432.46 238.363 1432.35C238.738 1432.24 239.139 1432.08 239.564 1431.85V1432.92C239.154 1433.09 238.758 1433.22 238.375 1433.3C237.996 1433.39 237.629 1433.43 237.273 1433.43C236.254 1433.43 235.457 1433.12 234.883 1432.51C234.309 1431.9 234.021 1431.06 234.021 1429.98C234.021 1428.94 234.303 1428.1 234.865 1427.48C235.428 1426.85 236.178 1426.54 237.115 1426.54C237.951 1426.54 238.609 1426.82 239.09 1427.39C239.574 1427.95 239.832 1428.64 239.863 1429.44ZM238.785 1429.12C238.738 1428.67 238.572 1428.28 238.287 1427.95C238.006 1427.62 237.6 1427.45 237.068 1427.45C236.549 1427.45 236.121 1427.62 235.785 1427.97C235.449 1428.31 235.266 1428.7 235.234 1429.13L238.785 1429.12ZM246.232 1426.92V1427.98C245.924 1427.8 245.613 1427.67 245.301 1427.58C244.988 1427.49 244.67 1427.44 244.346 1427.44C243.857 1427.44 243.492 1427.52 243.25 1427.68C243.012 1427.84 242.893 1428.08 242.893 1428.4C242.893 1428.69 242.982 1428.91 243.162 1429.06C243.342 1429.2 243.789 1429.34 244.504 1429.48L244.938 1429.56C245.473 1429.66 245.877 1429.87 246.15 1430.17C246.428 1430.48 246.566 1430.87 246.566 1431.36C246.566 1432.01 246.336 1432.52 245.875 1432.88C245.414 1433.25 244.773 1433.43 243.953 1433.43C243.629 1433.43 243.289 1433.39 242.934 1433.32C242.578 1433.26 242.193 1433.16 241.779 1433.02V1431.91C242.182 1432.11 242.566 1432.27 242.934 1432.37C243.301 1432.48 243.648 1432.53 243.977 1432.53C244.453 1432.53 244.822 1432.43 245.084 1432.24C245.346 1432.04 245.477 1431.77 245.477 1431.42C245.477 1430.92 244.998 1430.58 244.041 1430.39L243.994 1430.38L243.59 1430.29C242.969 1430.17 242.516 1429.97 242.23 1429.68C241.945 1429.4 241.803 1429 241.803 1428.51C241.803 1427.88 242.016 1427.39 242.441 1427.05C242.867 1426.71 243.475 1426.54 244.264 1426.54C244.615 1426.54 244.953 1426.57 245.277 1426.64C245.602 1426.7 245.92 1426.8 246.232 1426.92ZM253.299 1424.19V1427.78H251.986V1424.19H253.299ZM250.176 1424.19V1427.78H248.863V1424.19H250.176ZM231.607 1442.19V1445.78H230.295V1442.19H231.607ZM228.484 1442.19V1445.78H227.172V1442.19H228.484ZM239.588 1450.95C239.287 1451.11 238.979 1451.23 238.662 1451.31C238.346 1451.39 238.01 1451.43 237.654 1451.43C236.533 1451.43 235.662 1451.03 235.041 1450.24C234.424 1449.45 234.115 1448.33 234.115 1446.89C234.115 1445.46 234.426 1444.35 235.047 1443.55C235.672 1442.75 236.541 1442.35 237.654 1442.35C238.01 1442.35 238.346 1442.39 238.662 1442.48C238.979 1442.55 239.287 1442.67 239.588 1442.83V1444.05C239.299 1443.81 238.988 1443.63 238.656 1443.5C238.324 1443.38 237.99 1443.31 237.654 1443.31C236.885 1443.31 236.309 1443.61 235.926 1444.2C235.543 1444.8 235.352 1445.69 235.352 1446.89C235.352 1448.09 235.543 1448.98 235.926 1449.58C236.309 1450.17 236.885 1450.47 237.654 1450.47C237.998 1450.47 238.334 1450.41 238.662 1450.28C238.994 1450.16 239.303 1449.97 239.588 1449.74V1450.95ZM244.141 1445.45C243.594 1445.45 243.18 1445.67 242.898 1446.09C242.617 1446.52 242.477 1447.15 242.477 1447.98C242.477 1448.82 242.617 1449.45 242.898 1449.88C243.18 1450.3 243.594 1450.51 244.141 1450.51C244.691 1450.51 245.107 1450.3 245.389 1449.88C245.67 1449.45 245.811 1448.82 245.811 1447.98C245.811 1447.15 245.67 1446.52 245.389 1446.09C245.107 1445.67 244.691 1445.45 244.141 1445.45ZM244.141 1444.54C245.051 1444.54 245.746 1444.83 246.227 1445.42C246.711 1446.01 246.953 1446.87 246.953 1447.98C246.953 1449.1 246.713 1449.96 246.232 1450.55C245.752 1451.14 245.055 1451.43 244.141 1451.43C243.23 1451.43 242.535 1451.14 242.055 1450.55C241.574 1449.96 241.334 1449.1 241.334 1447.98C241.334 1446.87 241.574 1446.01 242.055 1445.42C242.535 1444.83 243.23 1444.54 244.141 1444.54ZM253.92 1447.19V1451.26H252.836V1447.19C252.836 1446.6 252.732 1446.17 252.525 1445.89C252.318 1445.61 251.994 1445.48 251.553 1445.48C251.049 1445.48 250.66 1445.66 250.387 1446.01C250.117 1446.37 249.982 1446.88 249.982 1447.55V1451.26H248.904V1444.7H249.982V1445.68C250.174 1445.31 250.434 1445.02 250.762 1444.83C251.09 1444.64 251.479 1444.54 251.928 1444.54C252.596 1444.54 253.094 1444.76 253.422 1445.2C253.754 1445.64 253.92 1446.3 253.92 1447.19ZM261.221 1442.14V1443.04H259.996C259.609 1443.04 259.34 1443.12 259.188 1443.28C259.039 1443.43 258.965 1443.71 258.965 1444.12V1444.7H261.221V1445.53H258.965V1451.26H257.887V1445.53H256.135V1444.7H257.887V1444.24C257.887 1443.52 258.051 1442.99 258.379 1442.65C258.711 1442.31 259.227 1442.14 259.926 1442.14H261.221ZM264.074 1444.72H266.834V1450.42H268.973V1451.26H263.617V1450.42H265.756V1445.56H264.074V1444.72ZM265.756 1442.17H266.834V1443.53H265.756V1442.17ZM274.48 1447.92C274.48 1447.12 274.348 1446.5 274.082 1446.09C273.82 1445.66 273.438 1445.45 272.934 1445.45C272.406 1445.45 272.004 1445.66 271.727 1446.09C271.449 1446.5 271.311 1447.12 271.311 1447.92C271.311 1448.73 271.449 1449.35 271.727 1449.78C272.008 1450.2 272.414 1450.41 272.945 1450.41C273.441 1450.41 273.82 1450.2 274.082 1449.77C274.348 1449.34 274.48 1448.73 274.48 1447.92ZM275.559 1450.84C275.559 1451.82 275.326 1452.57 274.861 1453.08C274.396 1453.58 273.713 1453.84 272.811 1453.84C272.514 1453.84 272.203 1453.81 271.879 1453.76C271.555 1453.7 271.23 1453.62 270.906 1453.51V1452.45C271.289 1452.63 271.637 1452.76 271.949 1452.85C272.262 1452.93 272.549 1452.98 272.811 1452.98C273.393 1452.98 273.816 1452.82 274.082 1452.5C274.348 1452.18 274.48 1451.68 274.48 1451V1450.95V1450.22C274.309 1450.58 274.074 1450.86 273.777 1451.04C273.48 1451.22 273.119 1451.31 272.693 1451.31C271.928 1451.31 271.316 1451 270.859 1450.39C270.402 1449.77 270.174 1448.95 270.174 1447.92C270.174 1446.89 270.402 1446.07 270.859 1445.46C271.316 1444.84 271.928 1444.54 272.693 1444.54C273.115 1444.54 273.473 1444.62 273.766 1444.79C274.059 1444.96 274.297 1445.22 274.48 1445.57V1444.72H275.559V1450.84ZM277.826 1448.77V1444.71H278.904V1448.77C278.904 1449.36 279.008 1449.8 279.215 1450.08C279.426 1450.35 279.75 1450.49 280.188 1450.49C280.695 1450.49 281.084 1450.31 281.354 1449.96C281.623 1449.6 281.758 1449.09 281.758 1448.42V1444.71H282.842V1451.26H281.758V1450.27C281.566 1450.65 281.305 1450.94 280.973 1451.14C280.645 1451.33 280.26 1451.43 279.818 1451.43C279.146 1451.43 278.646 1451.21 278.318 1450.77C277.99 1450.33 277.826 1449.67 277.826 1448.77ZM290.682 1446.05C290.451 1445.87 290.217 1445.74 289.979 1445.66C289.74 1445.58 289.479 1445.53 289.193 1445.53C288.521 1445.53 288.008 1445.75 287.652 1446.17C287.297 1446.59 287.119 1447.2 287.119 1448V1451.26H286.035V1444.7H287.119V1445.98C287.299 1445.51 287.574 1445.16 287.945 1444.91C288.32 1444.66 288.764 1444.54 289.275 1444.54C289.541 1444.54 289.789 1444.57 290.02 1444.64C290.25 1444.7 290.471 1444.81 290.682 1444.95V1446.05ZM297.707 1447.44V1447.97H293.037V1448C293.006 1448.9 293.176 1449.54 293.547 1449.93C293.922 1450.32 294.449 1450.51 295.129 1450.51C295.473 1450.51 295.832 1450.46 296.207 1450.35C296.582 1450.24 296.982 1450.08 297.408 1449.85V1450.92C296.998 1451.09 296.602 1451.22 296.219 1451.3C295.84 1451.39 295.473 1451.43 295.117 1451.43C294.098 1451.43 293.301 1451.12 292.727 1450.51C292.152 1449.9 291.865 1449.06 291.865 1447.98C291.865 1446.94 292.146 1446.1 292.709 1445.48C293.271 1444.85 294.021 1444.54 294.959 1444.54C295.795 1444.54 296.453 1444.82 296.934 1445.39C297.418 1445.95 297.676 1446.64 297.707 1447.44ZM296.629 1447.12C296.582 1446.67 296.416 1446.28 296.131 1445.95C295.85 1445.62 295.443 1445.45 294.912 1445.45C294.393 1445.45 293.965 1445.62 293.629 1445.97C293.293 1446.31 293.109 1446.7 293.078 1447.13L296.629 1447.12ZM309.215 1450.26L311.271 1442.51H312.496L309.936 1451.26H308.5L305.939 1442.51H307.164L309.215 1450.26ZM318.766 1442.81V1444.01C318.406 1443.78 318.045 1443.61 317.682 1443.49C317.322 1443.37 316.959 1443.31 316.592 1443.31C316.033 1443.31 315.592 1443.44 315.268 1443.71C314.943 1443.96 314.781 1444.31 314.781 1444.76C314.781 1445.14 314.887 1445.44 315.098 1445.64C315.312 1445.84 315.711 1446.01 316.293 1446.15L316.914 1446.29C317.734 1446.48 318.332 1446.78 318.707 1447.19C319.082 1447.6 319.27 1448.16 319.27 1448.87C319.27 1449.7 319.012 1450.34 318.496 1450.77C317.98 1451.21 317.23 1451.43 316.246 1451.43C315.836 1451.43 315.424 1451.38 315.01 1451.29C314.596 1451.21 314.18 1451.08 313.762 1450.9V1449.64C314.211 1449.93 314.635 1450.14 315.033 1450.27C315.436 1450.4 315.84 1450.47 316.246 1450.47C316.844 1450.47 317.309 1450.34 317.641 1450.07C317.973 1449.8 318.139 1449.42 318.139 1448.94C318.139 1448.51 318.023 1448.17 317.793 1447.94C317.566 1447.71 317.17 1447.53 316.604 1447.41L315.971 1447.26C315.158 1447.08 314.568 1446.8 314.201 1446.43C313.834 1446.06 313.65 1445.56 313.65 1444.94C313.65 1444.16 313.912 1443.53 314.436 1443.06C314.963 1442.59 315.662 1442.35 316.533 1442.35C316.869 1442.35 317.223 1442.39 317.594 1442.47C317.965 1442.54 318.355 1442.66 318.766 1442.81ZM333.584 1450.95C333.283 1451.11 332.975 1451.23 332.658 1451.31C332.342 1451.39 332.006 1451.43 331.65 1451.43C330.529 1451.43 329.658 1451.03 329.037 1450.24C328.42 1449.45 328.111 1448.33 328.111 1446.89C328.111 1445.46 328.422 1444.35 329.043 1443.55C329.668 1442.75 330.537 1442.35 331.65 1442.35C332.006 1442.35 332.342 1442.39 332.658 1442.48C332.975 1442.55 333.283 1442.67 333.584 1442.83V1444.05C333.295 1443.81 332.984 1443.63 332.652 1443.5C332.32 1443.38 331.986 1443.31 331.65 1443.31C330.881 1443.31 330.305 1443.61 329.922 1444.2C329.539 1444.8 329.348 1445.69 329.348 1446.89C329.348 1448.09 329.539 1448.98 329.922 1449.58C330.305 1450.17 330.881 1450.47 331.65 1450.47C331.994 1450.47 332.33 1450.41 332.658 1450.28C332.99 1450.16 333.299 1449.97 333.584 1449.74V1450.95ZM338.137 1445.45C337.59 1445.45 337.176 1445.67 336.895 1446.09C336.613 1446.52 336.473 1447.15 336.473 1447.98C336.473 1448.82 336.613 1449.45 336.895 1449.88C337.176 1450.3 337.59 1450.51 338.137 1450.51C338.688 1450.51 339.104 1450.3 339.385 1449.88C339.666 1449.45 339.807 1448.82 339.807 1447.98C339.807 1447.15 339.666 1446.52 339.385 1446.09C339.104 1445.67 338.688 1445.45 338.137 1445.45ZM338.137 1444.54C339.047 1444.54 339.742 1444.83 340.223 1445.42C340.707 1446.01 340.949 1446.87 340.949 1447.98C340.949 1449.1 340.709 1449.96 340.229 1450.55C339.748 1451.14 339.051 1451.43 338.137 1451.43C337.227 1451.43 336.531 1451.14 336.051 1450.55C335.57 1449.96 335.33 1449.1 335.33 1447.98C335.33 1446.87 335.57 1446.01 336.051 1445.42C336.531 1444.83 337.227 1444.54 338.137 1444.54ZM346.785 1445.53V1442.14H347.863V1451.26H346.785V1450.43C346.605 1450.76 346.365 1451.01 346.064 1451.18C345.768 1451.34 345.424 1451.43 345.033 1451.43C344.24 1451.43 343.615 1451.12 343.158 1450.51C342.705 1449.89 342.479 1449.04 342.479 1447.96C342.479 1446.89 342.707 1446.06 343.164 1445.45C343.621 1444.84 344.244 1444.54 345.033 1444.54C345.428 1444.54 345.775 1444.62 346.076 1444.8C346.377 1444.96 346.613 1445.21 346.785 1445.53ZM343.615 1447.98C343.615 1448.82 343.748 1449.45 344.014 1449.88C344.279 1450.3 344.672 1450.51 345.191 1450.51C345.711 1450.51 346.105 1450.3 346.375 1449.87C346.648 1449.44 346.785 1448.81 346.785 1447.98C346.785 1447.15 346.648 1446.52 346.375 1446.1C346.105 1445.67 345.711 1445.45 345.191 1445.45C344.672 1445.45 344.279 1445.67 344.014 1446.09C343.748 1446.52 343.615 1447.15 343.615 1447.98ZM355.551 1447.44V1447.97H350.881V1448C350.85 1448.9 351.02 1449.54 351.391 1449.93C351.766 1450.32 352.293 1450.51 352.973 1450.51C353.316 1450.51 353.676 1450.46 354.051 1450.35C354.426 1450.24 354.826 1450.08 355.252 1449.85V1450.92C354.842 1451.09 354.445 1451.22 354.062 1451.3C353.684 1451.39 353.316 1451.43 352.961 1451.43C351.941 1451.43 351.145 1451.12 350.57 1450.51C349.996 1449.9 349.709 1449.06 349.709 1447.98C349.709 1446.94 349.99 1446.1 350.553 1445.48C351.115 1444.85 351.865 1444.54 352.803 1444.54C353.639 1444.54 354.297 1444.82 354.777 1445.39C355.262 1445.95 355.52 1446.64 355.551 1447.44ZM354.473 1447.12C354.426 1446.67 354.26 1446.28 353.975 1445.95C353.693 1445.62 353.287 1445.45 352.756 1445.45C352.236 1445.45 351.809 1445.62 351.473 1445.97C351.137 1446.31 350.953 1446.7 350.922 1447.13L354.473 1447.12ZM369.678 1442.14V1443.04H368.453C368.066 1443.04 367.797 1443.12 367.645 1443.28C367.496 1443.43 367.422 1443.71 367.422 1444.12V1444.7H369.678V1445.53H367.422V1451.26H366.344V1445.53H364.592V1444.7H366.344V1444.24C366.344 1443.52 366.508 1442.99 366.836 1442.65C367.168 1442.31 367.684 1442.14 368.383 1442.14H369.678ZM374.289 1445.45C373.742 1445.45 373.328 1445.67 373.047 1446.09C372.766 1446.52 372.625 1447.15 372.625 1447.98C372.625 1448.82 372.766 1449.45 373.047 1449.88C373.328 1450.3 373.742 1450.51 374.289 1450.51C374.84 1450.51 375.256 1450.3 375.537 1449.88C375.818 1449.45 375.959 1448.82 375.959 1447.98C375.959 1447.15 375.818 1446.52 375.537 1446.09C375.256 1445.67 374.84 1445.45 374.289 1445.45ZM374.289 1444.54C375.199 1444.54 375.895 1444.83 376.375 1445.42C376.859 1446.01 377.102 1446.87 377.102 1447.98C377.102 1449.1 376.861 1449.96 376.381 1450.55C375.9 1451.14 375.203 1451.43 374.289 1451.43C373.379 1451.43 372.684 1451.14 372.203 1450.55C371.723 1449.96 371.482 1449.1 371.482 1447.98C371.482 1446.87 371.723 1446.01 372.203 1445.42C372.684 1444.83 373.379 1444.54 374.289 1444.54ZM384.678 1446.05C384.447 1445.87 384.213 1445.74 383.975 1445.66C383.736 1445.58 383.475 1445.53 383.189 1445.53C382.518 1445.53 382.004 1445.75 381.648 1446.17C381.293 1446.59 381.115 1447.2 381.115 1448V1451.26H380.031V1444.7H381.115V1445.98C381.295 1445.51 381.57 1445.16 381.941 1444.91C382.316 1444.66 382.76 1444.54 383.271 1444.54C383.537 1444.54 383.785 1444.57 384.016 1444.64C384.246 1444.7 384.467 1444.81 384.678 1444.95V1446.05ZM397.398 1445.53V1442.14H398.477V1451.26H397.398V1450.43C397.219 1450.76 396.979 1451.01 396.678 1451.18C396.381 1451.34 396.037 1451.43 395.646 1451.43C394.854 1451.43 394.229 1451.12 393.771 1450.51C393.318 1449.89 393.092 1449.04 393.092 1447.96C393.092 1446.89 393.32 1446.06 393.777 1445.45C394.234 1444.84 394.857 1444.54 395.646 1444.54C396.041 1444.54 396.389 1444.62 396.689 1444.8C396.99 1444.96 397.227 1445.21 397.398 1445.53ZM394.229 1447.98C394.229 1448.82 394.361 1449.45 394.627 1449.88C394.893 1450.3 395.285 1450.51 395.805 1450.51C396.324 1450.51 396.719 1450.3 396.988 1449.87C397.262 1449.44 397.398 1448.81 397.398 1447.98C397.398 1447.15 397.262 1446.52 396.988 1446.1C396.719 1445.67 396.324 1445.45 395.805 1445.45C395.285 1445.45 394.893 1445.67 394.627 1446.09C394.361 1446.52 394.229 1447.15 394.229 1447.98ZM401.453 1444.72H404.213V1450.42H406.352V1451.26H400.996V1450.42H403.135V1445.56H401.453V1444.72ZM403.135 1442.17H404.213V1443.53H403.135V1442.17ZM413.061 1442.14V1443.04H411.836C411.449 1443.04 411.18 1443.12 411.027 1443.28C410.879 1443.43 410.805 1443.71 410.805 1444.12V1444.7H413.061V1445.53H410.805V1451.26H409.727V1445.53H407.975V1444.7H409.727V1444.24C409.727 1443.52 409.891 1442.99 410.219 1442.65C410.551 1442.31 411.066 1442.14 411.766 1442.14H413.061ZM420.291 1442.14V1443.04H419.066C418.68 1443.04 418.41 1443.12 418.258 1443.28C418.109 1443.43 418.035 1443.71 418.035 1444.12V1444.7H420.291V1445.53H418.035V1451.26H416.957V1445.53H415.205V1444.7H416.957V1444.24C416.957 1443.52 417.121 1442.99 417.449 1442.65C417.781 1442.31 418.297 1442.14 418.996 1442.14H420.291ZM427.855 1447.44V1447.97H423.186V1448C423.154 1448.9 423.324 1449.54 423.695 1449.93C424.07 1450.32 424.598 1450.51 425.277 1450.51C425.621 1450.51 425.98 1450.46 426.355 1450.35C426.73 1450.24 427.131 1450.08 427.557 1449.85V1450.92C427.146 1451.09 426.75 1451.22 426.367 1451.3C425.988 1451.39 425.621 1451.43 425.266 1451.43C424.246 1451.43 423.449 1451.12 422.875 1450.51C422.301 1449.9 422.014 1449.06 422.014 1447.98C422.014 1446.94 422.295 1446.1 422.857 1445.48C423.42 1444.85 424.17 1444.54 425.107 1444.54C425.943 1444.54 426.602 1444.82 427.082 1445.39C427.566 1445.95 427.824 1446.64 427.855 1447.44ZM426.777 1447.12C426.73 1446.67 426.564 1446.28 426.279 1445.95C425.998 1445.62 425.592 1445.45 425.061 1445.45C424.541 1445.45 424.113 1445.62 423.777 1445.97C423.441 1446.31 423.258 1446.7 423.227 1447.13L426.777 1447.12ZM435.291 1446.05C435.061 1445.87 434.826 1445.74 434.588 1445.66C434.35 1445.58 434.088 1445.53 433.803 1445.53C433.131 1445.53 432.617 1445.75 432.262 1446.17C431.906 1446.59 431.729 1447.2 431.729 1448V1451.26H430.645V1444.7H431.729V1445.98C431.908 1445.51 432.184 1445.16 432.555 1444.91C432.93 1444.66 433.373 1444.54 433.885 1444.54C434.15 1444.54 434.398 1444.57 434.629 1444.64C434.859 1444.7 435.08 1444.81 435.291 1444.95V1446.05ZM442.316 1447.44V1447.97H437.646V1448C437.615 1448.9 437.785 1449.54 438.156 1449.93C438.531 1450.32 439.059 1450.51 439.738 1450.51C440.082 1450.51 440.441 1450.46 440.816 1450.35C441.191 1450.24 441.592 1450.08 442.018 1449.85V1450.92C441.607 1451.09 441.211 1451.22 440.828 1451.3C440.449 1451.39 440.082 1451.43 439.727 1451.43C438.707 1451.43 437.91 1451.12 437.336 1450.51C436.762 1449.9 436.475 1449.06 436.475 1447.98C436.475 1446.94 436.756 1446.1 437.318 1445.48C437.881 1444.85 438.631 1444.54 439.568 1444.54C440.404 1444.54 441.062 1444.82 441.543 1445.39C442.027 1445.95 442.285 1446.64 442.316 1447.44ZM441.238 1447.12C441.191 1446.67 441.025 1446.28 440.74 1445.95C440.459 1445.62 440.053 1445.45 439.521 1445.45C439.002 1445.45 438.574 1445.62 438.238 1445.97C437.902 1446.31 437.719 1446.7 437.688 1447.13L441.238 1447.12ZM449.143 1447.19V1451.26H448.059V1447.19C448.059 1446.6 447.955 1446.17 447.748 1445.89C447.541 1445.61 447.217 1445.48 446.775 1445.48C446.271 1445.48 445.883 1445.66 445.609 1446.01C445.34 1446.37 445.205 1446.88 445.205 1447.55V1451.26H444.127V1444.7H445.205V1445.68C445.396 1445.31 445.656 1445.02 445.984 1444.83C446.312 1444.64 446.701 1444.54 447.15 1444.54C447.818 1444.54 448.316 1444.76 448.645 1445.2C448.977 1445.64 449.143 1446.3 449.143 1447.19ZM453.812 1442.83V1444.7H456.262V1445.53H453.812V1449.1C453.812 1449.58 453.904 1449.92 454.088 1450.11C454.271 1450.3 454.592 1450.4 455.049 1450.4H456.262V1451.26H454.943C454.135 1451.26 453.564 1451.1 453.232 1450.77C452.9 1450.45 452.734 1449.89 452.734 1449.1V1445.53H450.982V1444.7H452.734V1442.83H453.812ZM464.676 1444.7H465.742L466.885 1450L467.822 1446.61H468.742L469.691 1450L470.834 1444.7H471.9L470.365 1451.26H469.334L468.285 1447.66L467.242 1451.26H466.211L464.676 1444.7ZM475.516 1445.45C474.969 1445.45 474.555 1445.67 474.273 1446.09C473.992 1446.52 473.852 1447.15 473.852 1447.98C473.852 1448.82 473.992 1449.45 474.273 1449.88C474.555 1450.3 474.969 1450.51 475.516 1450.51C476.066 1450.51 476.482 1450.3 476.764 1449.88C477.045 1449.45 477.186 1448.82 477.186 1447.98C477.186 1447.15 477.045 1446.52 476.764 1446.09C476.482 1445.67 476.066 1445.45 475.516 1445.45ZM475.516 1444.54C476.426 1444.54 477.121 1444.83 477.602 1445.42C478.086 1446.01 478.328 1446.87 478.328 1447.98C478.328 1449.1 478.088 1449.96 477.607 1450.55C477.127 1451.14 476.43 1451.43 475.516 1451.43C474.605 1451.43 473.91 1451.14 473.43 1450.55C472.949 1449.96 472.709 1449.1 472.709 1447.98C472.709 1446.87 472.949 1446.01 473.43 1445.42C473.91 1444.83 474.605 1444.54 475.516 1444.54ZM485.904 1446.05C485.674 1445.87 485.439 1445.74 485.201 1445.66C484.963 1445.58 484.701 1445.53 484.416 1445.53C483.744 1445.53 483.23 1445.75 482.875 1446.17C482.52 1446.59 482.342 1447.2 482.342 1448V1451.26H481.258V1444.7H482.342V1445.98C482.521 1445.51 482.797 1445.16 483.168 1444.91C483.543 1444.66 483.986 1444.54 484.498 1444.54C484.764 1444.54 485.012 1444.57 485.242 1444.64C485.473 1444.7 485.693 1444.81 485.904 1444.95V1446.05ZM487.75 1442.14H488.863V1447.42L491.693 1444.7H493.006L490.422 1447.17L493.41 1451.26H492.092L489.666 1447.87L488.863 1448.63V1451.26H487.75V1442.14ZM497.811 1448.89C497.811 1449.37 497.898 1449.74 498.074 1449.98C498.254 1450.23 498.518 1450.35 498.865 1450.35H500.125V1451.26H498.76C498.115 1451.26 497.615 1451.05 497.26 1450.64C496.908 1450.23 496.732 1449.64 496.732 1448.89V1442.95H495.004V1442.11H497.811V1448.89ZM504.438 1445.45C503.891 1445.45 503.477 1445.67 503.195 1446.09C502.914 1446.52 502.773 1447.15 502.773 1447.98C502.773 1448.82 502.914 1449.45 503.195 1449.88C503.477 1450.3 503.891 1450.51 504.438 1450.51C504.988 1450.51 505.404 1450.3 505.686 1449.88C505.967 1449.45 506.107 1448.82 506.107 1447.98C506.107 1447.15 505.967 1446.52 505.686 1446.09C505.404 1445.67 504.988 1445.45 504.438 1445.45ZM504.438 1444.54C505.348 1444.54 506.043 1444.83 506.523 1445.42C507.008 1446.01 507.25 1446.87 507.25 1447.98C507.25 1449.1 507.01 1449.96 506.529 1450.55C506.049 1451.14 505.352 1451.43 504.438 1451.43C503.527 1451.43 502.832 1451.14 502.352 1450.55C501.871 1449.96 501.631 1449.1 501.631 1447.98C501.631 1446.87 501.871 1446.01 502.352 1445.42C502.832 1444.83 503.527 1444.54 504.438 1444.54ZM512.172 1447.96H511.814C511.186 1447.96 510.711 1448.07 510.391 1448.29C510.074 1448.51 509.916 1448.84 509.916 1449.28C509.916 1449.67 510.035 1449.98 510.273 1450.2C510.512 1450.42 510.842 1450.53 511.264 1450.53C511.857 1450.53 512.324 1450.32 512.664 1449.91C513.004 1449.5 513.176 1448.93 513.18 1448.2V1447.96H512.172ZM514.264 1447.51V1451.26H513.18V1450.29C512.949 1450.68 512.658 1450.97 512.307 1451.15C511.959 1451.34 511.535 1451.43 511.035 1451.43C510.367 1451.43 509.834 1451.24 509.436 1450.87C509.037 1450.49 508.838 1449.98 508.838 1449.35C508.838 1448.62 509.082 1448.06 509.57 1447.68C510.062 1447.31 510.783 1447.12 511.732 1447.12H513.18V1446.95C513.176 1446.42 513.043 1446.04 512.781 1445.81C512.52 1445.57 512.102 1445.45 511.527 1445.45C511.16 1445.45 510.789 1445.51 510.414 1445.61C510.039 1445.72 509.674 1445.87 509.318 1446.07V1445C509.717 1444.84 510.098 1444.73 510.461 1444.66C510.828 1444.58 511.184 1444.54 511.527 1444.54C512.07 1444.54 512.533 1444.62 512.916 1444.78C513.303 1444.94 513.615 1445.18 513.854 1445.5C514.002 1445.69 514.107 1445.94 514.17 1446.23C514.232 1446.51 514.264 1446.94 514.264 1447.51ZM520.316 1445.53V1442.14H521.395V1451.26H520.316V1450.43C520.137 1450.76 519.896 1451.01 519.596 1451.18C519.299 1451.34 518.955 1451.43 518.564 1451.43C517.771 1451.43 517.146 1451.12 516.689 1450.51C516.236 1449.89 516.01 1449.04 516.01 1447.96C516.01 1446.89 516.238 1446.06 516.695 1445.45C517.152 1444.84 517.775 1444.54 518.564 1444.54C518.959 1444.54 519.307 1444.62 519.607 1444.8C519.908 1444.96 520.145 1445.21 520.316 1445.53ZM517.146 1447.98C517.146 1448.82 517.279 1449.45 517.545 1449.88C517.811 1450.3 518.203 1450.51 518.723 1450.51C519.242 1450.51 519.637 1450.3 519.906 1449.87C520.18 1449.44 520.316 1448.81 520.316 1447.98C520.316 1447.15 520.18 1446.52 519.906 1446.1C519.637 1445.67 519.242 1445.45 518.723 1445.45C518.203 1445.45 517.811 1445.67 517.545 1446.09C517.279 1446.52 517.146 1447.15 517.146 1447.98ZM528.221 1444.92V1445.98C527.912 1445.8 527.602 1445.67 527.289 1445.58C526.977 1445.49 526.658 1445.44 526.334 1445.44C525.846 1445.44 525.48 1445.52 525.238 1445.68C525 1445.84 524.881 1446.08 524.881 1446.4C524.881 1446.69 524.971 1446.91 525.15 1447.06C525.33 1447.2 525.777 1447.34 526.492 1447.48L526.926 1447.56C527.461 1447.66 527.865 1447.87 528.139 1448.17C528.416 1448.48 528.555 1448.87 528.555 1449.36C528.555 1450.01 528.324 1450.52 527.863 1450.88C527.402 1451.25 526.762 1451.43 525.941 1451.43C525.617 1451.43 525.277 1451.39 524.922 1451.32C524.566 1451.26 524.182 1451.16 523.768 1451.02V1449.91C524.17 1450.11 524.555 1450.27 524.922 1450.37C525.289 1450.48 525.637 1450.53 525.965 1450.53C526.441 1450.53 526.811 1450.43 527.072 1450.24C527.334 1450.04 527.465 1449.77 527.465 1449.42C527.465 1448.92 526.986 1448.58 526.029 1448.39L525.982 1448.38L525.578 1448.29C524.957 1448.17 524.504 1447.97 524.219 1447.68C523.934 1447.4 523.791 1447 523.791 1446.51C523.791 1445.88 524.004 1445.39 524.43 1445.05C524.855 1444.71 525.463 1444.54 526.252 1444.54C526.604 1444.54 526.941 1444.57 527.266 1444.64C527.59 1444.7 527.908 1444.8 528.221 1444.92ZM535.287 1442.19V1445.78H533.975V1442.19H535.287ZM532.164 1442.19V1445.78H530.852V1442.19H532.164ZM209.916 1460.19V1463.78H208.604V1460.19H209.916ZM206.793 1460.19V1463.78H205.48V1460.19H206.793ZM216.818 1460.51H217.932L213.326 1470.37H212.207L216.818 1460.51ZM220.691 1462.72H223.451V1468.42H225.59V1469.26H220.234V1468.42H222.373V1463.56H220.691V1462.72ZM222.373 1460.17H223.451V1461.53H222.373V1460.17ZM230.031 1463.36C230.164 1463.08 230.332 1462.88 230.535 1462.74C230.742 1462.61 230.99 1462.54 231.279 1462.54C231.807 1462.54 232.178 1462.74 232.393 1463.15C232.611 1463.56 232.721 1464.33 232.721 1465.46V1469.26H231.736V1465.5C231.736 1464.58 231.684 1464 231.578 1463.78C231.477 1463.55 231.289 1463.44 231.016 1463.44C230.703 1463.44 230.488 1463.56 230.371 1463.8C230.258 1464.04 230.201 1464.61 230.201 1465.5V1469.26H229.217V1465.5C229.217 1464.57 229.16 1463.99 229.047 1463.77C228.938 1463.55 228.738 1463.44 228.449 1463.44C228.164 1463.44 227.965 1463.56 227.852 1463.8C227.742 1464.04 227.688 1464.61 227.688 1465.5V1469.26H226.709V1462.7H227.688V1463.26C227.816 1463.02 227.977 1462.85 228.168 1462.73C228.363 1462.6 228.584 1462.54 228.83 1462.54C229.127 1462.54 229.373 1462.61 229.568 1462.74C229.768 1462.88 229.922 1463.09 230.031 1463.36ZM237.414 1465.96H237.057C236.428 1465.96 235.953 1466.07 235.633 1466.29C235.316 1466.51 235.158 1466.84 235.158 1467.28C235.158 1467.67 235.277 1467.98 235.516 1468.2C235.754 1468.42 236.084 1468.53 236.506 1468.53C237.1 1468.53 237.566 1468.32 237.906 1467.91C238.246 1467.5 238.418 1466.93 238.422 1466.2V1465.96H237.414ZM239.506 1465.51V1469.26H238.422V1468.29C238.191 1468.68 237.9 1468.97 237.549 1469.15C237.201 1469.34 236.777 1469.43 236.277 1469.43C235.609 1469.43 235.076 1469.24 234.678 1468.87C234.279 1468.49 234.08 1467.98 234.08 1467.35C234.08 1466.62 234.324 1466.06 234.812 1465.68C235.305 1465.31 236.025 1465.12 236.975 1465.12H238.422V1464.95C238.418 1464.42 238.285 1464.04 238.023 1463.81C237.762 1463.57 237.344 1463.45 236.77 1463.45C236.402 1463.45 236.031 1463.51 235.656 1463.61C235.281 1463.72 234.916 1463.87 234.561 1464.07V1463C234.959 1462.84 235.34 1462.73 235.703 1462.66C236.07 1462.58 236.426 1462.54 236.77 1462.54C237.312 1462.54 237.775 1462.62 238.158 1462.78C238.545 1462.94 238.857 1463.18 239.096 1463.5C239.244 1463.69 239.35 1463.94 239.412 1464.23C239.475 1464.51 239.506 1464.94 239.506 1465.51ZM245.559 1465.92C245.559 1465.12 245.426 1464.5 245.16 1464.09C244.898 1463.66 244.516 1463.45 244.012 1463.45C243.484 1463.45 243.082 1463.66 242.805 1464.09C242.527 1464.5 242.389 1465.12 242.389 1465.92C242.389 1466.73 242.527 1467.35 242.805 1467.78C243.086 1468.2 243.492 1468.41 244.023 1468.41C244.52 1468.41 244.898 1468.2 245.16 1467.77C245.426 1467.34 245.559 1466.73 245.559 1465.92ZM246.637 1468.84C246.637 1469.82 246.404 1470.57 245.939 1471.08C245.475 1471.58 244.791 1471.84 243.889 1471.84C243.592 1471.84 243.281 1471.81 242.957 1471.76C242.633 1471.7 242.309 1471.62 241.984 1471.51V1470.45C242.367 1470.63 242.715 1470.76 243.027 1470.85C243.34 1470.93 243.627 1470.98 243.889 1470.98C244.471 1470.98 244.895 1470.82 245.16 1470.5C245.426 1470.18 245.559 1469.68 245.559 1469V1468.95V1468.22C245.387 1468.58 245.152 1468.86 244.855 1469.04C244.559 1469.22 244.197 1469.31 243.771 1469.31C243.006 1469.31 242.395 1469 241.938 1468.39C241.48 1467.77 241.252 1466.95 241.252 1465.92C241.252 1464.89 241.48 1464.07 241.938 1463.46C242.395 1462.84 243.006 1462.54 243.771 1462.54C244.193 1462.54 244.551 1462.62 244.844 1462.79C245.137 1462.96 245.375 1463.22 245.559 1463.57V1462.72H246.637V1468.84ZM254.324 1465.44V1465.97H249.654V1466C249.623 1466.9 249.793 1467.54 250.164 1467.93C250.539 1468.32 251.066 1468.51 251.746 1468.51C252.09 1468.51 252.449 1468.46 252.824 1468.35C253.199 1468.24 253.6 1468.08 254.025 1467.85V1468.92C253.615 1469.09 253.219 1469.22 252.836 1469.3C252.457 1469.39 252.09 1469.43 251.734 1469.43C250.715 1469.43 249.918 1469.12 249.344 1468.51C248.77 1467.9 248.482 1467.06 248.482 1465.98C248.482 1464.94 248.764 1464.1 249.326 1463.48C249.889 1462.85 250.639 1462.54 251.576 1462.54C252.412 1462.54 253.07 1462.82 253.551 1463.39C254.035 1463.95 254.293 1464.64 254.324 1465.44ZM253.246 1465.12C253.199 1464.67 253.033 1464.28 252.748 1463.95C252.467 1463.62 252.061 1463.45 251.529 1463.45C251.01 1463.45 250.582 1463.62 250.246 1463.97C249.91 1464.31 249.727 1464.7 249.695 1465.13L253.246 1465.12ZM260.693 1462.92V1463.98C260.385 1463.8 260.074 1463.67 259.762 1463.58C259.449 1463.49 259.131 1463.44 258.807 1463.44C258.318 1463.44 257.953 1463.52 257.711 1463.68C257.473 1463.84 257.354 1464.08 257.354 1464.4C257.354 1464.69 257.443 1464.91 257.623 1465.06C257.803 1465.2 258.25 1465.34 258.965 1465.48L259.398 1465.56C259.934 1465.66 260.338 1465.87 260.611 1466.17C260.889 1466.48 261.027 1466.87 261.027 1467.36C261.027 1468.01 260.797 1468.52 260.336 1468.88C259.875 1469.25 259.234 1469.43 258.414 1469.43C258.09 1469.43 257.75 1469.39 257.395 1469.32C257.039 1469.26 256.654 1469.16 256.24 1469.02V1467.91C256.643 1468.11 257.027 1468.27 257.395 1468.37C257.762 1468.48 258.109 1468.53 258.438 1468.53C258.914 1468.53 259.283 1468.43 259.545 1468.24C259.807 1468.04 259.938 1467.77 259.938 1467.42C259.938 1466.92 259.459 1466.58 258.502 1466.39L258.455 1466.38L258.051 1466.29C257.43 1466.17 256.977 1465.97 256.691 1465.68C256.406 1465.4 256.264 1465 256.264 1464.51C256.264 1463.88 256.477 1463.39 256.902 1463.05C257.328 1462.71 257.936 1462.54 258.725 1462.54C259.076 1462.54 259.414 1462.57 259.738 1462.64C260.062 1462.7 260.381 1462.8 260.693 1462.92ZM267.432 1460.51H268.545L263.939 1470.37H262.82L267.432 1460.51ZM270.039 1462.7H271.158L273.062 1468.2L274.973 1462.7H276.092L273.76 1469.26H272.371L270.039 1462.7ZM282.385 1462.92V1463.98C282.076 1463.8 281.766 1463.67 281.453 1463.58C281.141 1463.49 280.822 1463.44 280.498 1463.44C280.01 1463.44 279.645 1463.52 279.402 1463.68C279.164 1463.84 279.045 1464.08 279.045 1464.4C279.045 1464.69 279.135 1464.91 279.314 1465.06C279.494 1465.2 279.941 1465.34 280.656 1465.48L281.09 1465.56C281.625 1465.66 282.029 1465.87 282.303 1466.17C282.58 1466.48 282.719 1466.87 282.719 1467.36C282.719 1468.01 282.488 1468.52 282.027 1468.88C281.566 1469.25 280.926 1469.43 280.105 1469.43C279.781 1469.43 279.441 1469.39 279.086 1469.32C278.73 1469.26 278.346 1469.16 277.932 1469.02V1467.91C278.334 1468.11 278.719 1468.27 279.086 1468.37C279.453 1468.48 279.801 1468.53 280.129 1468.53C280.605 1468.53 280.975 1468.43 281.236 1468.24C281.498 1468.04 281.629 1467.77 281.629 1467.42C281.629 1466.92 281.15 1466.58 280.193 1466.39L280.146 1466.38L279.742 1466.29C279.121 1466.17 278.668 1465.97 278.383 1465.68C278.098 1465.4 277.955 1465 277.955 1464.51C277.955 1463.88 278.168 1463.39 278.594 1463.05C279.02 1462.71 279.627 1462.54 280.416 1462.54C280.768 1462.54 281.105 1462.57 281.43 1462.64C281.754 1462.7 282.072 1462.8 282.385 1462.92ZM290.131 1468.92C289.842 1469.09 289.543 1469.22 289.234 1469.3C288.93 1469.39 288.617 1469.43 288.297 1469.43C287.281 1469.43 286.486 1469.12 285.912 1468.51C285.342 1467.91 285.057 1467.06 285.057 1465.98C285.057 1464.91 285.342 1464.06 285.912 1463.45C286.486 1462.84 287.281 1462.54 288.297 1462.54C288.613 1462.54 288.922 1462.58 289.223 1462.66C289.523 1462.74 289.826 1462.87 290.131 1463.04V1464.17C289.846 1463.92 289.559 1463.74 289.27 1463.62C288.984 1463.51 288.66 1463.45 288.297 1463.45C287.621 1463.45 287.102 1463.67 286.738 1464.11C286.375 1464.55 286.193 1465.17 286.193 1465.98C286.193 1466.79 286.375 1467.42 286.738 1467.86C287.105 1468.3 287.625 1468.51 288.297 1468.51C288.672 1468.51 289.008 1468.46 289.305 1468.34C289.602 1468.23 289.877 1468.05 290.131 1467.81V1468.92ZM294.754 1463.45C294.207 1463.45 293.793 1463.67 293.512 1464.09C293.23 1464.52 293.09 1465.15 293.09 1465.98C293.09 1466.82 293.23 1467.45 293.512 1467.88C293.793 1468.3 294.207 1468.51 294.754 1468.51C295.305 1468.51 295.721 1468.3 296.002 1467.88C296.283 1467.45 296.424 1466.82 296.424 1465.98C296.424 1465.15 296.283 1464.52 296.002 1464.09C295.721 1463.67 295.305 1463.45 294.754 1463.45ZM294.754 1462.54C295.664 1462.54 296.359 1462.83 296.84 1463.42C297.324 1464.01 297.566 1464.87 297.566 1465.98C297.566 1467.1 297.326 1467.96 296.846 1468.55C296.365 1469.14 295.668 1469.43 294.754 1469.43C293.844 1469.43 293.148 1469.14 292.668 1468.55C292.188 1467.96 291.947 1467.1 291.947 1465.98C291.947 1464.87 292.188 1464.01 292.668 1463.42C293.148 1462.83 293.844 1462.54 294.754 1462.54ZM303.402 1463.53V1460.14H304.48V1469.26H303.402V1468.43C303.223 1468.76 302.982 1469.01 302.682 1469.18C302.385 1469.34 302.041 1469.43 301.65 1469.43C300.857 1469.43 300.232 1469.12 299.775 1468.51C299.322 1467.89 299.096 1467.04 299.096 1465.96C299.096 1464.89 299.324 1464.06 299.781 1463.45C300.238 1462.84 300.861 1462.54 301.65 1462.54C302.045 1462.54 302.393 1462.62 302.693 1462.8C302.994 1462.96 303.23 1463.21 303.402 1463.53ZM300.232 1465.98C300.232 1466.82 300.365 1467.45 300.631 1467.88C300.896 1468.3 301.289 1468.51 301.809 1468.51C302.328 1468.51 302.723 1468.3 302.992 1467.87C303.266 1467.44 303.402 1466.81 303.402 1465.98C303.402 1465.15 303.266 1464.52 302.992 1464.1C302.723 1463.67 302.328 1463.45 301.809 1463.45C301.289 1463.45 300.896 1463.67 300.631 1464.09C300.365 1464.52 300.232 1465.15 300.232 1465.98ZM312.168 1465.44V1465.97H307.498V1466C307.467 1466.9 307.637 1467.54 308.008 1467.93C308.383 1468.32 308.91 1468.51 309.59 1468.51C309.934 1468.51 310.293 1468.46 310.668 1468.35C311.043 1468.24 311.443 1468.08 311.869 1467.85V1468.92C311.459 1469.09 311.062 1469.22 310.68 1469.3C310.301 1469.39 309.934 1469.43 309.578 1469.43C308.559 1469.43 307.762 1469.12 307.188 1468.51C306.613 1467.9 306.326 1467.06 306.326 1465.98C306.326 1464.94 306.607 1464.1 307.17 1463.48C307.732 1462.85 308.482 1462.54 309.42 1462.54C310.256 1462.54 310.914 1462.82 311.395 1463.39C311.879 1463.95 312.137 1464.64 312.168 1465.44ZM311.09 1465.12C311.043 1464.67 310.877 1464.28 310.592 1463.95C310.311 1463.62 309.904 1463.45 309.373 1463.45C308.854 1463.45 308.426 1463.62 308.09 1463.97C307.754 1464.31 307.57 1464.7 307.539 1465.13L311.09 1465.12ZM313.434 1465.02H319.645V1466.01H313.434V1465.02ZM322.264 1468.43V1471.76H321.18V1462.7H322.264V1463.53C322.443 1463.21 322.682 1462.96 322.979 1462.8C323.279 1462.62 323.625 1462.54 324.016 1462.54C324.809 1462.54 325.43 1462.84 325.879 1463.46C326.332 1464.07 326.559 1464.92 326.559 1466.01C326.559 1467.07 326.332 1467.91 325.879 1468.52C325.426 1469.13 324.805 1469.43 324.016 1469.43C323.617 1469.43 323.268 1469.34 322.967 1469.18C322.67 1469.01 322.436 1468.76 322.264 1468.43ZM325.428 1465.98C325.428 1465.15 325.295 1464.52 325.029 1464.09C324.768 1463.67 324.377 1463.45 323.857 1463.45C323.334 1463.45 322.938 1463.67 322.668 1464.1C322.398 1464.52 322.264 1465.15 322.264 1465.98C322.264 1466.81 322.398 1467.44 322.668 1467.87C322.938 1468.3 323.334 1468.51 323.857 1468.51C324.377 1468.51 324.768 1468.3 325.029 1467.88C325.295 1467.45 325.428 1466.82 325.428 1465.98ZM334.064 1464.05C333.834 1463.87 333.6 1463.74 333.361 1463.66C333.123 1463.58 332.861 1463.53 332.576 1463.53C331.904 1463.53 331.391 1463.75 331.035 1464.17C330.68 1464.59 330.502 1465.2 330.502 1466V1469.26H329.418V1462.7H330.502V1463.98C330.682 1463.51 330.957 1463.16 331.328 1462.91C331.703 1462.66 332.146 1462.54 332.658 1462.54C332.924 1462.54 333.172 1462.57 333.402 1462.64C333.633 1462.7 333.854 1462.81 334.064 1462.95V1464.05ZM338.137 1463.45C337.59 1463.45 337.176 1463.67 336.895 1464.09C336.613 1464.52 336.473 1465.15 336.473 1465.98C336.473 1466.82 336.613 1467.45 336.895 1467.88C337.176 1468.3 337.59 1468.51 338.137 1468.51C338.688 1468.51 339.104 1468.3 339.385 1467.88C339.666 1467.45 339.807 1466.82 339.807 1465.98C339.807 1465.15 339.666 1464.52 339.385 1464.09C339.104 1463.67 338.688 1463.45 338.137 1463.45ZM338.137 1462.54C339.047 1462.54 339.742 1462.83 340.223 1463.42C340.707 1464.01 340.949 1464.87 340.949 1465.98C340.949 1467.1 340.709 1467.96 340.229 1468.55C339.748 1469.14 339.051 1469.43 338.137 1469.43C337.227 1469.43 336.531 1469.14 336.051 1468.55C335.57 1467.96 335.33 1467.1 335.33 1465.98C335.33 1464.87 335.57 1464.01 336.051 1463.42C336.531 1462.83 337.227 1462.54 338.137 1462.54ZM347.986 1460.14V1461.04H346.762C346.375 1461.04 346.105 1461.12 345.953 1461.28C345.805 1461.43 345.73 1461.71 345.73 1462.12V1462.7H347.986V1463.53H345.73V1469.26H344.652V1463.53H342.9V1462.7H344.652V1462.24C344.652 1461.52 344.816 1460.99 345.145 1460.65C345.477 1460.31 345.992 1460.14 346.691 1460.14H347.986ZM350.84 1462.72H353.6V1468.42H355.738V1469.26H350.383V1468.42H352.521V1463.56H350.84V1462.72ZM352.521 1460.17H353.6V1461.53H352.521V1460.17ZM360.432 1466.89C360.432 1467.37 360.52 1467.74 360.695 1467.98C360.875 1468.23 361.139 1468.35 361.486 1468.35H362.746V1469.26H361.381C360.736 1469.26 360.236 1469.05 359.881 1468.64C359.529 1468.23 359.354 1467.64 359.354 1466.89V1460.95H357.625V1460.11H360.432V1466.89ZM370.012 1465.44V1465.97H365.342V1466C365.311 1466.9 365.48 1467.54 365.852 1467.93C366.227 1468.32 366.754 1468.51 367.434 1468.51C367.777 1468.51 368.137 1468.46 368.512 1468.35C368.887 1468.24 369.287 1468.08 369.713 1467.85V1468.92C369.303 1469.09 368.906 1469.22 368.523 1469.3C368.145 1469.39 367.777 1469.43 367.422 1469.43C366.402 1469.43 365.605 1469.12 365.031 1468.51C364.457 1467.9 364.17 1467.06 364.17 1465.98C364.17 1464.94 364.451 1464.1 365.014 1463.48C365.576 1462.85 366.326 1462.54 367.264 1462.54C368.1 1462.54 368.758 1462.82 369.238 1463.39C369.723 1463.95 369.98 1464.64 370.012 1465.44ZM368.934 1465.12C368.887 1464.67 368.721 1464.28 368.436 1463.95C368.154 1463.62 367.748 1463.45 367.217 1463.45C366.697 1463.45 366.27 1463.62 365.934 1463.97C365.598 1464.31 365.414 1464.7 365.383 1465.13L368.934 1465.12ZM376.381 1462.92V1463.98C376.072 1463.8 375.762 1463.67 375.449 1463.58C375.137 1463.49 374.818 1463.44 374.494 1463.44C374.006 1463.44 373.641 1463.52 373.398 1463.68C373.16 1463.84 373.041 1464.08 373.041 1464.4C373.041 1464.69 373.131 1464.91 373.311 1465.06C373.49 1465.2 373.938 1465.34 374.652 1465.48L375.086 1465.56C375.621 1465.66 376.025 1465.87 376.299 1466.17C376.576 1466.48 376.715 1466.87 376.715 1467.36C376.715 1468.01 376.484 1468.52 376.023 1468.88C375.562 1469.25 374.922 1469.43 374.102 1469.43C373.777 1469.43 373.438 1469.39 373.082 1469.32C372.727 1469.26 372.342 1469.16 371.928 1469.02V1467.91C372.33 1468.11 372.715 1468.27 373.082 1468.37C373.449 1468.48 373.797 1468.53 374.125 1468.53C374.602 1468.53 374.971 1468.43 375.232 1468.24C375.494 1468.04 375.625 1467.77 375.625 1467.42C375.625 1466.92 375.146 1466.58 374.189 1466.39L374.143 1466.38L373.738 1466.29C373.117 1466.17 372.664 1465.97 372.379 1465.68C372.094 1465.4 371.951 1465 371.951 1464.51C371.951 1463.88 372.164 1463.39 372.59 1463.05C373.016 1462.71 373.623 1462.54 374.412 1462.54C374.764 1462.54 375.102 1462.57 375.426 1462.64C375.75 1462.7 376.068 1462.8 376.381 1462.92ZM380.189 1466.89H382.252V1469.26H380.189V1466.89ZM387.338 1468.43V1471.76H386.254V1462.7H387.338V1463.53C387.518 1463.21 387.756 1462.96 388.053 1462.8C388.354 1462.62 388.699 1462.54 389.09 1462.54C389.883 1462.54 390.504 1462.84 390.953 1463.46C391.406 1464.07 391.633 1464.92 391.633 1466.01C391.633 1467.07 391.406 1467.91 390.953 1468.52C390.5 1469.13 389.879 1469.43 389.09 1469.43C388.691 1469.43 388.342 1469.34 388.041 1469.18C387.744 1469.01 387.51 1468.76 387.338 1468.43ZM390.502 1465.98C390.502 1465.15 390.369 1464.52 390.104 1464.09C389.842 1463.67 389.451 1463.45 388.932 1463.45C388.408 1463.45 388.012 1463.67 387.742 1464.1C387.473 1464.52 387.338 1465.15 387.338 1465.98C387.338 1466.81 387.473 1467.44 387.742 1467.87C388.012 1468.3 388.408 1468.51 388.932 1468.51C389.451 1468.51 389.842 1468.3 390.104 1467.88C390.369 1467.45 390.502 1466.82 390.502 1465.98ZM398.529 1465.19V1469.26H397.445V1465.19C397.445 1464.6 397.342 1464.17 397.135 1463.89C396.928 1463.61 396.604 1463.48 396.162 1463.48C395.658 1463.48 395.27 1463.66 394.996 1464.01C394.727 1464.37 394.592 1464.88 394.592 1465.55V1469.26H393.514V1462.7H394.592V1463.68C394.783 1463.31 395.043 1463.02 395.371 1462.83C395.699 1462.64 396.088 1462.54 396.537 1462.54C397.205 1462.54 397.703 1462.76 398.031 1463.2C398.363 1463.64 398.529 1464.3 398.529 1465.19ZM404.629 1465.92C404.629 1465.12 404.496 1464.5 404.23 1464.09C403.969 1463.66 403.586 1463.45 403.082 1463.45C402.555 1463.45 402.152 1463.66 401.875 1464.09C401.598 1464.5 401.459 1465.12 401.459 1465.92C401.459 1466.73 401.598 1467.35 401.875 1467.78C402.156 1468.2 402.562 1468.41 403.094 1468.41C403.59 1468.41 403.969 1468.2 404.23 1467.77C404.496 1467.34 404.629 1466.73 404.629 1465.92ZM405.707 1468.84C405.707 1469.82 405.475 1470.57 405.01 1471.08C404.545 1471.58 403.861 1471.84 402.959 1471.84C402.662 1471.84 402.352 1471.81 402.027 1471.76C401.703 1471.7 401.379 1471.62 401.055 1471.51V1470.45C401.438 1470.63 401.785 1470.76 402.098 1470.85C402.41 1470.93 402.697 1470.98 402.959 1470.98C403.541 1470.98 403.965 1470.82 404.23 1470.5C404.496 1470.18 404.629 1469.68 404.629 1469V1468.95V1468.22C404.457 1468.58 404.223 1468.86 403.926 1469.04C403.629 1469.22 403.268 1469.31 402.842 1469.31C402.076 1469.31 401.465 1469 401.008 1468.39C400.551 1467.77 400.322 1466.95 400.322 1465.92C400.322 1464.89 400.551 1464.07 401.008 1463.46C401.465 1462.84 402.076 1462.54 402.842 1462.54C403.264 1462.54 403.621 1462.62 403.914 1462.79C404.207 1462.96 404.445 1463.22 404.629 1463.57V1462.72H405.707V1468.84ZM412.369 1460.19V1463.78H411.057V1460.19H412.369ZM409.246 1460.19V1463.78H407.934V1460.19H409.246ZM188.225 1514.19V1517.78H186.912V1514.19H188.225ZM185.102 1514.19V1517.78H183.789V1514.19H185.102ZM193.527 1522.26L195.584 1514.51H196.809L194.248 1523.26H192.812L190.252 1514.51H191.477L193.527 1522.26ZM203.078 1514.81V1516.01C202.719 1515.78 202.357 1515.61 201.994 1515.49C201.635 1515.37 201.271 1515.31 200.904 1515.31C200.346 1515.31 199.904 1515.44 199.58 1515.71C199.256 1515.96 199.094 1516.31 199.094 1516.76C199.094 1517.14 199.199 1517.44 199.41 1517.64C199.625 1517.84 200.023 1518.01 200.605 1518.15L201.227 1518.29C202.047 1518.48 202.645 1518.78 203.02 1519.19C203.395 1519.6 203.582 1520.16 203.582 1520.87C203.582 1521.7 203.324 1522.34 202.809 1522.77C202.293 1523.21 201.543 1523.43 200.559 1523.43C200.148 1523.43 199.736 1523.38 199.322 1523.29C198.908 1523.21 198.492 1523.08 198.074 1522.9V1521.64C198.523 1521.93 198.947 1522.14 199.346 1522.27C199.748 1522.4 200.152 1522.47 200.559 1522.47C201.156 1522.47 201.621 1522.34 201.953 1522.07C202.285 1521.8 202.451 1521.42 202.451 1520.94C202.451 1520.51 202.336 1520.17 202.105 1519.94C201.879 1519.71 201.482 1519.53 200.916 1519.41L200.283 1519.26C199.471 1519.08 198.881 1518.8 198.514 1518.43C198.146 1518.06 197.963 1517.56 197.963 1516.94C197.963 1516.16 198.225 1515.53 198.748 1515.06C199.275 1514.59 199.975 1514.35 200.846 1514.35C201.182 1514.35 201.535 1514.39 201.906 1514.47C202.277 1514.54 202.668 1514.66 203.078 1514.81ZM217.896 1522.95C217.596 1523.11 217.287 1523.23 216.971 1523.31C216.654 1523.39 216.318 1523.43 215.963 1523.43C214.842 1523.43 213.971 1523.03 213.35 1522.24C212.732 1521.45 212.424 1520.33 212.424 1518.89C212.424 1517.46 212.734 1516.35 213.355 1515.55C213.98 1514.75 214.85 1514.35 215.963 1514.35C216.318 1514.35 216.654 1514.39 216.971 1514.48C217.287 1514.55 217.596 1514.67 217.896 1514.83V1516.05C217.607 1515.81 217.297 1515.63 216.965 1515.5C216.633 1515.38 216.299 1515.31 215.963 1515.31C215.193 1515.31 214.617 1515.61 214.234 1516.2C213.852 1516.8 213.66 1517.69 213.66 1518.89C213.66 1520.09 213.852 1520.98 214.234 1521.58C214.617 1522.17 215.193 1522.47 215.963 1522.47C216.307 1522.47 216.643 1522.41 216.971 1522.28C217.303 1522.16 217.611 1521.97 217.896 1521.74V1522.95ZM222.449 1517.45C221.902 1517.45 221.488 1517.67 221.207 1518.09C220.926 1518.52 220.785 1519.15 220.785 1519.98C220.785 1520.82 220.926 1521.45 221.207 1521.88C221.488 1522.3 221.902 1522.51 222.449 1522.51C223 1522.51 223.416 1522.3 223.697 1521.88C223.979 1521.45 224.119 1520.82 224.119 1519.98C224.119 1519.15 223.979 1518.52 223.697 1518.09C223.416 1517.67 223 1517.45 222.449 1517.45ZM222.449 1516.54C223.359 1516.54 224.055 1516.83 224.535 1517.42C225.02 1518.01 225.262 1518.87 225.262 1519.98C225.262 1521.1 225.021 1521.96 224.541 1522.55C224.061 1523.14 223.363 1523.43 222.449 1523.43C221.539 1523.43 220.844 1523.14 220.363 1522.55C219.883 1521.96 219.643 1521.1 219.643 1519.98C219.643 1518.87 219.883 1518.01 220.363 1517.42C220.844 1516.83 221.539 1516.54 222.449 1516.54ZM231.098 1517.53V1514.14H232.176V1523.26H231.098V1522.43C230.918 1522.76 230.678 1523.01 230.377 1523.18C230.08 1523.34 229.736 1523.43 229.346 1523.43C228.553 1523.43 227.928 1523.12 227.471 1522.51C227.018 1521.89 226.791 1521.04 226.791 1519.96C226.791 1518.89 227.02 1518.06 227.477 1517.45C227.934 1516.84 228.557 1516.54 229.346 1516.54C229.74 1516.54 230.088 1516.62 230.389 1516.8C230.689 1516.96 230.926 1517.21 231.098 1517.53ZM227.928 1519.98C227.928 1520.82 228.061 1521.45 228.326 1521.88C228.592 1522.3 228.984 1522.51 229.504 1522.51C230.023 1522.51 230.418 1522.3 230.688 1521.87C230.961 1521.44 231.098 1520.81 231.098 1519.98C231.098 1519.15 230.961 1518.52 230.688 1518.1C230.418 1517.67 230.023 1517.45 229.504 1517.45C228.984 1517.45 228.592 1517.67 228.326 1518.09C228.061 1518.52 227.928 1519.15 227.928 1519.98ZM239.863 1519.44V1519.97H235.193V1520C235.162 1520.9 235.332 1521.54 235.703 1521.93C236.078 1522.32 236.605 1522.51 237.285 1522.51C237.629 1522.51 237.988 1522.46 238.363 1522.35C238.738 1522.24 239.139 1522.08 239.564 1521.85V1522.92C239.154 1523.09 238.758 1523.22 238.375 1523.3C237.996 1523.39 237.629 1523.43 237.273 1523.43C236.254 1523.43 235.457 1523.12 234.883 1522.51C234.309 1521.9 234.021 1521.06 234.021 1519.98C234.021 1518.94 234.303 1518.1 234.865 1517.48C235.428 1516.85 236.178 1516.54 237.115 1516.54C237.951 1516.54 238.609 1516.82 239.09 1517.39C239.574 1517.95 239.832 1518.64 239.863 1519.44ZM238.785 1519.12C238.738 1518.67 238.572 1518.28 238.287 1517.95C238.006 1517.62 237.6 1517.45 237.068 1517.45C236.549 1517.45 236.121 1517.62 235.785 1517.97C235.449 1518.31 235.266 1518.7 235.234 1519.13L238.785 1519.12ZM247.762 1514.51H248.916L249.754 1521.61L250.75 1516.91H251.986L252.994 1521.62L253.832 1514.51H254.986L253.68 1523.26H252.561L251.371 1518.06L250.188 1523.26H249.068L247.762 1514.51ZM261.555 1519.44V1519.97H256.885V1520C256.854 1520.9 257.023 1521.54 257.395 1521.93C257.77 1522.32 258.297 1522.51 258.977 1522.51C259.32 1522.51 259.68 1522.46 260.055 1522.35C260.43 1522.24 260.83 1522.08 261.256 1521.85V1522.92C260.846 1523.09 260.449 1523.22 260.066 1523.3C259.688 1523.39 259.32 1523.43 258.965 1523.43C257.945 1523.43 257.148 1523.12 256.574 1522.51C256 1521.9 255.713 1521.06 255.713 1519.98C255.713 1518.94 255.994 1518.1 256.557 1517.48C257.119 1516.85 257.869 1516.54 258.807 1516.54C259.643 1516.54 260.301 1516.82 260.781 1517.39C261.266 1517.95 261.523 1518.64 261.555 1519.44ZM260.477 1519.12C260.43 1518.67 260.264 1518.28 259.979 1517.95C259.697 1517.62 259.291 1517.45 258.76 1517.45C258.24 1517.45 257.812 1517.62 257.477 1517.97C257.141 1518.31 256.957 1518.7 256.926 1519.13L260.477 1519.12ZM267.602 1519.98C267.602 1519.15 267.469 1518.52 267.203 1518.09C266.938 1517.67 266.545 1517.45 266.025 1517.45C265.502 1517.45 265.105 1517.67 264.836 1518.1C264.566 1518.52 264.432 1519.15 264.432 1519.98C264.432 1520.81 264.566 1521.44 264.836 1521.87C265.105 1522.3 265.502 1522.51 266.025 1522.51C266.545 1522.51 266.938 1522.3 267.203 1521.88C267.469 1521.45 267.602 1520.82 267.602 1519.98ZM264.432 1517.53C264.604 1517.21 264.84 1516.97 265.141 1516.8C265.445 1516.62 265.797 1516.54 266.195 1516.54C266.984 1516.54 267.605 1516.84 268.059 1517.45C268.512 1518.06 268.738 1518.89 268.738 1519.96C268.738 1521.04 268.51 1521.89 268.053 1522.51C267.6 1523.12 266.977 1523.43 266.184 1523.43C265.793 1523.43 265.447 1523.34 265.146 1523.18C264.85 1523.01 264.611 1522.76 264.432 1522.43V1523.26H263.354V1514.14H264.432V1517.53ZM275.154 1516.92V1517.98C274.846 1517.8 274.535 1517.67 274.223 1517.58C273.91 1517.49 273.592 1517.44 273.268 1517.44C272.779 1517.44 272.414 1517.52 272.172 1517.68C271.934 1517.84 271.814 1518.08 271.814 1518.4C271.814 1518.69 271.904 1518.91 272.084 1519.06C272.264 1519.2 272.711 1519.34 273.426 1519.48L273.859 1519.56C274.395 1519.66 274.799 1519.87 275.072 1520.17C275.35 1520.48 275.488 1520.87 275.488 1521.36C275.488 1522.01 275.258 1522.52 274.797 1522.88C274.336 1523.25 273.695 1523.43 272.875 1523.43C272.551 1523.43 272.211 1523.39 271.855 1523.32C271.5 1523.26 271.115 1523.16 270.701 1523.02V1521.91C271.104 1522.11 271.488 1522.27 271.855 1522.37C272.223 1522.48 272.57 1522.53 272.898 1522.53C273.375 1522.53 273.744 1522.43 274.006 1522.24C274.268 1522.04 274.398 1521.77 274.398 1521.42C274.398 1520.92 273.92 1520.58 272.963 1520.39L272.916 1520.38L272.512 1520.29C271.891 1520.17 271.438 1519.97 271.152 1519.68C270.867 1519.4 270.725 1519 270.725 1518.51C270.725 1517.88 270.938 1517.39 271.363 1517.05C271.789 1516.71 272.396 1516.54 273.186 1516.54C273.537 1516.54 273.875 1516.57 274.199 1516.64C274.523 1516.7 274.842 1516.8 275.154 1516.92ZM278.535 1516.72H281.295V1522.42H283.434V1523.26H278.078V1522.42H280.217V1517.56H278.535V1516.72ZM280.217 1514.17H281.295V1515.53H280.217V1514.17ZM287.512 1514.83V1516.7H289.961V1517.53H287.512V1521.1C287.512 1521.58 287.604 1521.92 287.787 1522.11C287.971 1522.3 288.291 1522.4 288.748 1522.4H289.961V1523.26H288.643C287.834 1523.26 287.264 1523.1 286.932 1522.77C286.6 1522.45 286.434 1521.89 286.434 1521.1V1517.53H284.682V1516.7H286.434V1514.83H287.512ZM297.707 1519.44V1519.97H293.037V1520C293.006 1520.9 293.176 1521.54 293.547 1521.93C293.922 1522.32 294.449 1522.51 295.129 1522.51C295.473 1522.51 295.832 1522.46 296.207 1522.35C296.582 1522.24 296.982 1522.08 297.408 1521.85V1522.92C296.998 1523.09 296.602 1523.22 296.219 1523.3C295.84 1523.39 295.473 1523.43 295.117 1523.43C294.098 1523.43 293.301 1523.12 292.727 1522.51C292.152 1521.9 291.865 1521.06 291.865 1519.98C291.865 1518.94 292.146 1518.1 292.709 1517.48C293.271 1516.85 294.021 1516.54 294.959 1516.54C295.795 1516.54 296.453 1516.82 296.934 1517.39C297.418 1517.95 297.676 1518.64 297.707 1519.44ZM296.629 1519.12C296.582 1518.67 296.416 1518.28 296.131 1517.95C295.85 1517.62 295.443 1517.45 294.912 1517.45C294.393 1517.45 293.965 1517.62 293.629 1517.97C293.293 1518.31 293.109 1518.7 293.078 1519.13L296.629 1519.12ZM303.912 1514.19V1517.78H302.6V1514.19H303.912ZM300.789 1514.19V1517.78H299.477V1514.19H300.789ZM231.607 1532.19V1535.78H230.295V1532.19H231.607ZM228.484 1532.19V1535.78H227.172V1532.19H228.484ZM237.754 1537.13C238.059 1537.21 238.318 1537.35 238.533 1537.57C238.748 1537.79 239.016 1538.22 239.336 1538.87L240.525 1541.26H239.254L238.211 1539.05C237.91 1538.42 237.639 1538.02 237.396 1537.84C237.158 1537.65 236.846 1537.56 236.459 1537.56H235.328V1541.26H234.139V1532.51H236.576C237.537 1532.51 238.273 1532.73 238.785 1533.16C239.297 1533.59 239.553 1534.22 239.553 1535.04C239.553 1535.62 239.395 1536.09 239.078 1536.46C238.766 1536.82 238.324 1537.05 237.754 1537.13ZM235.328 1533.48V1536.59H236.623C237.189 1536.59 237.611 1536.46 237.889 1536.21C238.166 1535.95 238.305 1535.57 238.305 1535.04C238.305 1534.54 238.156 1534.15 237.859 1533.89C237.566 1533.62 237.139 1533.48 236.576 1533.48H235.328ZM247.094 1537.44V1537.97H242.424V1538C242.393 1538.9 242.562 1539.54 242.934 1539.93C243.309 1540.32 243.836 1540.51 244.516 1540.51C244.859 1540.51 245.219 1540.46 245.594 1540.35C245.969 1540.24 246.369 1540.08 246.795 1539.85V1540.92C246.385 1541.09 245.988 1541.22 245.605 1541.3C245.227 1541.39 244.859 1541.43 244.504 1541.43C243.484 1541.43 242.688 1541.12 242.113 1540.51C241.539 1539.9 241.252 1539.06 241.252 1537.98C241.252 1536.94 241.533 1536.1 242.096 1535.48C242.658 1534.85 243.408 1534.54 244.346 1534.54C245.182 1534.54 245.84 1534.82 246.32 1535.39C246.805 1535.95 247.062 1536.64 247.094 1537.44ZM246.016 1537.12C245.969 1536.67 245.803 1536.28 245.518 1535.95C245.236 1535.62 244.83 1535.45 244.299 1535.45C243.779 1535.45 243.352 1535.62 243.016 1535.97C242.68 1536.31 242.496 1536.7 242.465 1537.13L246.016 1537.12ZM253.99 1532.14V1533.04H252.766C252.379 1533.04 252.109 1533.12 251.957 1533.28C251.809 1533.43 251.734 1533.71 251.734 1534.12V1534.7H253.99V1535.53H251.734V1541.26H250.656V1535.53H248.904V1534.7H250.656V1534.24C250.656 1533.52 250.82 1532.99 251.148 1532.65C251.48 1532.31 251.996 1532.14 252.695 1532.14H253.99ZM261.76 1536.05C261.529 1535.87 261.295 1535.74 261.057 1535.66C260.818 1535.58 260.557 1535.53 260.271 1535.53C259.6 1535.53 259.086 1535.75 258.73 1536.17C258.375 1536.59 258.197 1537.2 258.197 1538V1541.26H257.113V1534.7H258.197V1535.98C258.377 1535.51 258.652 1535.16 259.023 1534.91C259.398 1534.66 259.842 1534.54 260.354 1534.54C260.619 1534.54 260.867 1534.57 261.098 1534.64C261.328 1534.7 261.549 1534.81 261.76 1534.95V1536.05ZM268.785 1537.44V1537.97H264.115V1538C264.084 1538.9 264.254 1539.54 264.625 1539.93C265 1540.32 265.527 1540.51 266.207 1540.51C266.551 1540.51 266.91 1540.46 267.285 1540.35C267.66 1540.24 268.061 1540.08 268.486 1539.85V1540.92C268.076 1541.09 267.68 1541.22 267.297 1541.3C266.918 1541.39 266.551 1541.43 266.195 1541.43C265.176 1541.43 264.379 1541.12 263.805 1540.51C263.23 1539.9 262.943 1539.06 262.943 1537.98C262.943 1536.94 263.225 1536.1 263.787 1535.48C264.35 1534.85 265.1 1534.54 266.037 1534.54C266.873 1534.54 267.531 1534.82 268.012 1535.39C268.496 1535.95 268.754 1536.64 268.785 1537.44ZM267.707 1537.12C267.66 1536.67 267.494 1536.28 267.209 1535.95C266.928 1535.62 266.521 1535.45 265.99 1535.45C265.471 1535.45 265.043 1535.62 264.707 1535.97C264.371 1536.31 264.188 1536.7 264.156 1537.13L267.707 1537.12ZM275.154 1534.92V1535.98C274.846 1535.8 274.535 1535.67 274.223 1535.58C273.91 1535.49 273.592 1535.44 273.268 1535.44C272.779 1535.44 272.414 1535.52 272.172 1535.68C271.934 1535.84 271.814 1536.08 271.814 1536.4C271.814 1536.69 271.904 1536.91 272.084 1537.06C272.264 1537.2 272.711 1537.34 273.426 1537.48L273.859 1537.56C274.395 1537.66 274.799 1537.87 275.072 1538.17C275.35 1538.48 275.488 1538.87 275.488 1539.36C275.488 1540.01 275.258 1540.52 274.797 1540.88C274.336 1541.25 273.695 1541.43 272.875 1541.43C272.551 1541.43 272.211 1541.39 271.855 1541.32C271.5 1541.26 271.115 1541.16 270.701 1541.02V1539.91C271.104 1540.11 271.488 1540.27 271.855 1540.37C272.223 1540.48 272.57 1540.53 272.898 1540.53C273.375 1540.53 273.744 1540.43 274.006 1540.24C274.268 1540.04 274.398 1539.77 274.398 1539.42C274.398 1538.92 273.92 1538.58 272.963 1538.39L272.916 1538.38L272.512 1538.29C271.891 1538.17 271.438 1537.97 271.152 1537.68C270.867 1537.4 270.725 1537 270.725 1536.51C270.725 1535.88 270.938 1535.39 271.363 1535.05C271.789 1534.71 272.396 1534.54 273.186 1534.54C273.537 1534.54 273.875 1534.57 274.199 1534.64C274.523 1534.7 274.842 1534.8 275.154 1534.92ZM282.842 1537.19V1541.26H281.758V1537.19C281.758 1536.6 281.654 1536.17 281.447 1535.89C281.24 1535.61 280.916 1535.48 280.475 1535.48C279.971 1535.48 279.582 1535.66 279.309 1536.01C279.039 1536.37 278.904 1536.88 278.904 1537.55V1541.26H277.826V1532.14H278.904V1535.68C279.096 1535.31 279.355 1535.02 279.684 1534.83C280.012 1534.64 280.4 1534.54 280.85 1534.54C281.518 1534.54 282.016 1534.76 282.344 1535.2C282.676 1535.64 282.842 1536.3 282.842 1537.19ZM290.477 1537.44V1537.97H285.807V1538C285.775 1538.9 285.945 1539.54 286.316 1539.93C286.691 1540.32 287.219 1540.51 287.898 1540.51C288.242 1540.51 288.602 1540.46 288.977 1540.35C289.352 1540.24 289.752 1540.08 290.178 1539.85V1540.92C289.768 1541.09 289.371 1541.22 288.988 1541.3C288.609 1541.39 288.242 1541.43 287.887 1541.43C286.867 1541.43 286.07 1541.12 285.496 1540.51C284.922 1539.9 284.635 1539.06 284.635 1537.98C284.635 1536.94 284.916 1536.1 285.479 1535.48C286.041 1534.85 286.791 1534.54 287.729 1534.54C288.564 1534.54 289.223 1534.82 289.703 1535.39C290.188 1535.95 290.445 1536.64 290.477 1537.44ZM289.398 1537.12C289.352 1536.67 289.186 1536.28 288.9 1535.95C288.619 1535.62 288.213 1535.45 287.682 1535.45C287.162 1535.45 286.734 1535.62 286.398 1535.97C286.062 1536.31 285.879 1536.7 285.848 1537.13L289.398 1537.12ZM296.172 1535.53V1532.14H297.25V1541.26H296.172V1540.43C295.992 1540.76 295.752 1541.01 295.451 1541.18C295.154 1541.34 294.811 1541.43 294.42 1541.43C293.627 1541.43 293.002 1541.12 292.545 1540.51C292.092 1539.89 291.865 1539.04 291.865 1537.96C291.865 1536.89 292.094 1536.06 292.551 1535.45C293.008 1534.84 293.631 1534.54 294.42 1534.54C294.814 1534.54 295.162 1534.62 295.463 1534.8C295.764 1534.96 296 1535.21 296.172 1535.53ZM293.002 1537.98C293.002 1538.82 293.135 1539.45 293.4 1539.88C293.666 1540.3 294.059 1540.51 294.578 1540.51C295.098 1540.51 295.492 1540.3 295.762 1539.87C296.035 1539.44 296.172 1538.81 296.172 1537.98C296.172 1537.15 296.035 1536.52 295.762 1536.1C295.492 1535.67 295.098 1535.45 294.578 1535.45C294.059 1535.45 293.666 1535.67 293.4 1536.09C293.135 1536.52 293.002 1537.15 293.002 1537.98ZM309.215 1540.26L311.271 1532.51H312.496L309.936 1541.26H308.5L305.939 1532.51H307.164L309.215 1540.26ZM318.766 1532.81V1534.01C318.406 1533.78 318.045 1533.61 317.682 1533.49C317.322 1533.37 316.959 1533.31 316.592 1533.31C316.033 1533.31 315.592 1533.44 315.268 1533.71C314.943 1533.96 314.781 1534.31 314.781 1534.76C314.781 1535.14 314.887 1535.44 315.098 1535.64C315.312 1535.84 315.711 1536.01 316.293 1536.15L316.914 1536.29C317.734 1536.48 318.332 1536.78 318.707 1537.19C319.082 1537.6 319.27 1538.16 319.27 1538.87C319.27 1539.7 319.012 1540.34 318.496 1540.77C317.98 1541.21 317.23 1541.43 316.246 1541.43C315.836 1541.43 315.424 1541.38 315.01 1541.29C314.596 1541.21 314.18 1541.08 313.762 1540.9V1539.64C314.211 1539.93 314.635 1540.14 315.033 1540.27C315.436 1540.4 315.84 1540.47 316.246 1540.47C316.844 1540.47 317.309 1540.34 317.641 1540.07C317.973 1539.8 318.139 1539.42 318.139 1538.94C318.139 1538.51 318.023 1538.17 317.793 1537.94C317.566 1537.71 317.17 1537.53 316.604 1537.41L315.971 1537.26C315.158 1537.08 314.568 1536.8 314.201 1536.43C313.834 1536.06 313.65 1535.56 313.65 1534.94C313.65 1534.16 313.912 1533.53 314.436 1533.06C314.963 1532.59 315.662 1532.35 316.533 1532.35C316.869 1532.35 317.223 1532.39 317.594 1532.47C317.965 1532.54 318.355 1532.66 318.766 1532.81ZM333.584 1540.95C333.283 1541.11 332.975 1541.23 332.658 1541.31C332.342 1541.39 332.006 1541.43 331.65 1541.43C330.529 1541.43 329.658 1541.03 329.037 1540.24C328.42 1539.45 328.111 1538.33 328.111 1536.89C328.111 1535.46 328.422 1534.35 329.043 1533.55C329.668 1532.75 330.537 1532.35 331.65 1532.35C332.006 1532.35 332.342 1532.39 332.658 1532.48C332.975 1532.55 333.283 1532.67 333.584 1532.83V1534.05C333.295 1533.81 332.984 1533.63 332.652 1533.5C332.32 1533.38 331.986 1533.31 331.65 1533.31C330.881 1533.31 330.305 1533.61 329.922 1534.2C329.539 1534.8 329.348 1535.69 329.348 1536.89C329.348 1538.09 329.539 1538.98 329.922 1539.58C330.305 1540.17 330.881 1540.47 331.65 1540.47C331.994 1540.47 332.33 1540.41 332.658 1540.28C332.99 1540.16 333.299 1539.97 333.584 1539.74V1540.95ZM338.137 1535.45C337.59 1535.45 337.176 1535.67 336.895 1536.09C336.613 1536.52 336.473 1537.15 336.473 1537.98C336.473 1538.82 336.613 1539.45 336.895 1539.88C337.176 1540.3 337.59 1540.51 338.137 1540.51C338.688 1540.51 339.104 1540.3 339.385 1539.88C339.666 1539.45 339.807 1538.82 339.807 1537.98C339.807 1537.15 339.666 1536.52 339.385 1536.09C339.104 1535.67 338.688 1535.45 338.137 1535.45ZM338.137 1534.54C339.047 1534.54 339.742 1534.83 340.223 1535.42C340.707 1536.01 340.949 1536.87 340.949 1537.98C340.949 1539.1 340.709 1539.96 340.229 1540.55C339.748 1541.14 339.051 1541.43 338.137 1541.43C337.227 1541.43 336.531 1541.14 336.051 1540.55C335.57 1539.96 335.33 1539.1 335.33 1537.98C335.33 1536.87 335.57 1536.01 336.051 1535.42C336.531 1534.83 337.227 1534.54 338.137 1534.54ZM346.785 1535.53V1532.14H347.863V1541.26H346.785V1540.43C346.605 1540.76 346.365 1541.01 346.064 1541.18C345.768 1541.34 345.424 1541.43 345.033 1541.43C344.24 1541.43 343.615 1541.12 343.158 1540.51C342.705 1539.89 342.479 1539.04 342.479 1537.96C342.479 1536.89 342.707 1536.06 343.164 1535.45C343.621 1534.84 344.244 1534.54 345.033 1534.54C345.428 1534.54 345.775 1534.62 346.076 1534.8C346.377 1534.96 346.613 1535.21 346.785 1535.53ZM343.615 1537.98C343.615 1538.82 343.748 1539.45 344.014 1539.88C344.279 1540.3 344.672 1540.51 345.191 1540.51C345.711 1540.51 346.105 1540.3 346.375 1539.87C346.648 1539.44 346.785 1538.81 346.785 1537.98C346.785 1537.15 346.648 1536.52 346.375 1536.1C346.105 1535.67 345.711 1535.45 345.191 1535.45C344.672 1535.45 344.279 1535.67 344.014 1536.09C343.748 1536.52 343.615 1537.15 343.615 1537.98ZM355.551 1537.44V1537.97H350.881V1538C350.85 1538.9 351.02 1539.54 351.391 1539.93C351.766 1540.32 352.293 1540.51 352.973 1540.51C353.316 1540.51 353.676 1540.46 354.051 1540.35C354.426 1540.24 354.826 1540.08 355.252 1539.85V1540.92C354.842 1541.09 354.445 1541.22 354.062 1541.3C353.684 1541.39 353.316 1541.43 352.961 1541.43C351.941 1541.43 351.145 1541.12 350.57 1540.51C349.996 1539.9 349.709 1539.06 349.709 1537.98C349.709 1536.94 349.99 1536.1 350.553 1535.48C351.115 1534.85 351.865 1534.54 352.803 1534.54C353.639 1534.54 354.297 1534.82 354.777 1535.39C355.262 1535.95 355.52 1536.64 355.551 1537.44ZM354.473 1537.12C354.426 1536.67 354.26 1536.28 353.975 1535.95C353.693 1535.62 353.287 1535.45 352.756 1535.45C352.236 1535.45 351.809 1535.62 351.473 1535.97C351.137 1536.31 350.953 1536.7 350.922 1537.13L354.473 1537.12ZM363.449 1534.7H364.516L365.658 1540L366.596 1536.61H367.516L368.465 1540L369.607 1534.7H370.674L369.139 1541.26H368.107L367.059 1537.66L366.016 1541.26H364.984L363.449 1534.7ZM377.242 1537.44V1537.97H372.572V1538C372.541 1538.9 372.711 1539.54 373.082 1539.93C373.457 1540.32 373.984 1540.51 374.664 1540.51C375.008 1540.51 375.367 1540.46 375.742 1540.35C376.117 1540.24 376.518 1540.08 376.943 1539.85V1540.92C376.533 1541.09 376.137 1541.22 375.754 1541.3C375.375 1541.39 375.008 1541.43 374.652 1541.43C373.633 1541.43 372.836 1541.12 372.262 1540.51C371.688 1539.9 371.4 1539.06 371.4 1537.98C371.4 1536.94 371.682 1536.1 372.244 1535.48C372.807 1534.85 373.557 1534.54 374.494 1534.54C375.33 1534.54 375.988 1534.82 376.469 1535.39C376.953 1535.95 377.211 1536.64 377.242 1537.44ZM376.164 1537.12C376.117 1536.67 375.951 1536.28 375.666 1535.95C375.385 1535.62 374.979 1535.45 374.447 1535.45C373.928 1535.45 373.5 1535.62 373.164 1535.97C372.828 1536.31 372.645 1536.7 372.613 1537.13L376.164 1537.12ZM383.289 1537.98C383.289 1537.15 383.156 1536.52 382.891 1536.09C382.625 1535.67 382.232 1535.45 381.713 1535.45C381.189 1535.45 380.793 1535.67 380.523 1536.1C380.254 1536.52 380.119 1537.15 380.119 1537.98C380.119 1538.81 380.254 1539.44 380.523 1539.87C380.793 1540.3 381.189 1540.51 381.713 1540.51C382.232 1540.51 382.625 1540.3 382.891 1539.88C383.156 1539.45 383.289 1538.82 383.289 1537.98ZM380.119 1535.53C380.291 1535.21 380.527 1534.97 380.828 1534.8C381.133 1534.62 381.484 1534.54 381.883 1534.54C382.672 1534.54 383.293 1534.84 383.746 1535.45C384.199 1536.06 384.426 1536.89 384.426 1537.96C384.426 1539.04 384.197 1539.89 383.74 1540.51C383.287 1541.12 382.664 1541.43 381.871 1541.43C381.48 1541.43 381.135 1541.34 380.834 1541.18C380.537 1541.01 380.299 1540.76 380.119 1540.43V1541.26H379.041V1532.14H380.119V1535.53ZM390.842 1534.92V1535.98C390.533 1535.8 390.223 1535.67 389.91 1535.58C389.598 1535.49 389.279 1535.44 388.955 1535.44C388.467 1535.44 388.102 1535.52 387.859 1535.68C387.621 1535.84 387.502 1536.08 387.502 1536.4C387.502 1536.69 387.592 1536.91 387.771 1537.06C387.951 1537.2 388.398 1537.34 389.113 1537.48L389.547 1537.56C390.082 1537.66 390.486 1537.87 390.76 1538.17C391.037 1538.48 391.176 1538.87 391.176 1539.36C391.176 1540.01 390.945 1540.52 390.484 1540.88C390.023 1541.25 389.383 1541.43 388.562 1541.43C388.238 1541.43 387.898 1541.39 387.543 1541.32C387.188 1541.26 386.803 1541.16 386.389 1541.02V1539.91C386.791 1540.11 387.176 1540.27 387.543 1540.37C387.91 1540.48 388.258 1540.53 388.586 1540.53C389.062 1540.53 389.432 1540.43 389.693 1540.24C389.955 1540.04 390.086 1539.77 390.086 1539.42C390.086 1538.92 389.607 1538.58 388.65 1538.39L388.604 1538.38L388.199 1538.29C387.578 1538.17 387.125 1537.97 386.84 1537.68C386.555 1537.4 386.412 1537 386.412 1536.51C386.412 1535.88 386.625 1535.39 387.051 1535.05C387.477 1534.71 388.084 1534.54 388.873 1534.54C389.225 1534.54 389.562 1534.57 389.887 1534.64C390.211 1534.7 390.529 1534.8 390.842 1534.92ZM394.223 1534.72H396.982V1540.42H399.121V1541.26H393.766V1540.42H395.904V1535.56H394.223V1534.72ZM395.904 1532.17H396.982V1533.53H395.904V1532.17ZM403.199 1532.83V1534.7H405.648V1535.53H403.199V1539.1C403.199 1539.58 403.291 1539.92 403.475 1540.11C403.658 1540.3 403.979 1540.4 404.436 1540.4H405.648V1541.26H404.33C403.521 1541.26 402.951 1541.1 402.619 1540.77C402.287 1540.45 402.121 1539.89 402.121 1539.1V1535.53H400.369V1534.7H402.121V1532.83H403.199ZM413.395 1537.44V1537.97H408.725V1538C408.693 1538.9 408.863 1539.54 409.234 1539.93C409.609 1540.32 410.137 1540.51 410.816 1540.51C411.16 1540.51 411.52 1540.46 411.895 1540.35C412.27 1540.24 412.67 1540.08 413.096 1539.85V1540.92C412.686 1541.09 412.289 1541.22 411.906 1541.3C411.527 1541.39 411.16 1541.43 410.805 1541.43C409.785 1541.43 408.988 1541.12 408.414 1540.51C407.84 1539.9 407.553 1539.06 407.553 1537.98C407.553 1536.94 407.834 1536.1 408.396 1535.48C408.959 1534.85 409.709 1534.54 410.646 1534.54C411.482 1534.54 412.141 1534.82 412.621 1535.39C413.105 1535.95 413.363 1536.64 413.395 1537.44ZM412.316 1537.12C412.27 1536.67 412.104 1536.28 411.818 1535.95C411.537 1535.62 411.131 1535.45 410.6 1535.45C410.08 1535.45 409.652 1535.62 409.316 1535.97C408.98 1536.31 408.797 1536.7 408.766 1537.13L412.316 1537.12ZM425.406 1537.96H425.049C424.42 1537.96 423.945 1538.07 423.625 1538.29C423.309 1538.51 423.15 1538.84 423.15 1539.28C423.15 1539.67 423.27 1539.98 423.508 1540.2C423.746 1540.42 424.076 1540.53 424.498 1540.53C425.092 1540.53 425.559 1540.32 425.898 1539.91C426.238 1539.5 426.41 1538.93 426.414 1538.2V1537.96H425.406ZM427.498 1537.51V1541.26H426.414V1540.29C426.184 1540.68 425.893 1540.97 425.541 1541.15C425.193 1541.34 424.77 1541.43 424.27 1541.43C423.602 1541.43 423.068 1541.24 422.67 1540.87C422.271 1540.49 422.072 1539.98 422.072 1539.35C422.072 1538.62 422.316 1538.06 422.805 1537.68C423.297 1537.31 424.018 1537.12 424.967 1537.12H426.414V1536.95C426.41 1536.42 426.277 1536.04 426.016 1535.81C425.754 1535.57 425.336 1535.45 424.762 1535.45C424.395 1535.45 424.023 1535.51 423.648 1535.61C423.273 1535.72 422.908 1535.87 422.553 1536.07V1535C422.951 1534.84 423.332 1534.73 423.695 1534.66C424.062 1534.58 424.418 1534.54 424.762 1534.54C425.305 1534.54 425.768 1534.62 426.15 1534.78C426.537 1534.94 426.85 1535.18 427.088 1535.5C427.236 1535.69 427.342 1535.94 427.404 1536.23C427.467 1536.51 427.498 1536.94 427.498 1537.51ZM434.682 1537.19V1541.26H433.598V1537.19C433.598 1536.6 433.494 1536.17 433.287 1535.89C433.08 1535.61 432.756 1535.48 432.314 1535.48C431.811 1535.48 431.422 1535.66 431.148 1536.01C430.879 1536.37 430.744 1536.88 430.744 1537.55V1541.26H429.666V1534.7H430.744V1535.68C430.936 1535.31 431.195 1535.02 431.523 1534.83C431.852 1534.64 432.24 1534.54 432.689 1534.54C433.357 1534.54 433.855 1534.76 434.184 1535.2C434.516 1535.64 434.682 1536.3 434.682 1537.19ZM440.781 1535.53V1532.14H441.859V1541.26H440.781V1540.43C440.602 1540.76 440.361 1541.01 440.061 1541.18C439.764 1541.34 439.42 1541.43 439.029 1541.43C438.236 1541.43 437.611 1541.12 437.154 1540.51C436.701 1539.89 436.475 1539.04 436.475 1537.96C436.475 1536.89 436.703 1536.06 437.16 1535.45C437.617 1534.84 438.24 1534.54 439.029 1534.54C439.424 1534.54 439.771 1534.62 440.072 1534.8C440.373 1534.96 440.609 1535.21 440.781 1535.53ZM437.611 1537.98C437.611 1538.82 437.744 1539.45 438.01 1539.88C438.275 1540.3 438.668 1540.51 439.188 1540.51C439.707 1540.51 440.102 1540.3 440.371 1539.87C440.645 1539.44 440.781 1538.81 440.781 1537.98C440.781 1537.15 440.645 1536.52 440.371 1536.1C440.102 1535.67 439.707 1535.45 439.188 1535.45C438.668 1535.45 438.275 1535.67 438.01 1536.09C437.744 1536.52 437.611 1537.15 437.611 1537.98ZM455.242 1535.53V1532.14H456.32V1541.26H455.242V1540.43C455.062 1540.76 454.822 1541.01 454.521 1541.18C454.225 1541.34 453.881 1541.43 453.49 1541.43C452.697 1541.43 452.072 1541.12 451.615 1540.51C451.162 1539.89 450.936 1539.04 450.936 1537.96C450.936 1536.89 451.164 1536.06 451.621 1535.45C452.078 1534.84 452.701 1534.54 453.49 1534.54C453.885 1534.54 454.232 1534.62 454.533 1534.8C454.834 1534.96 455.07 1535.21 455.242 1535.53ZM452.072 1537.98C452.072 1538.82 452.205 1539.45 452.471 1539.88C452.736 1540.3 453.129 1540.51 453.648 1540.51C454.168 1540.51 454.562 1540.3 454.832 1539.87C455.105 1539.44 455.242 1538.81 455.242 1537.98C455.242 1537.15 455.105 1536.52 454.832 1536.1C454.562 1535.67 454.168 1535.45 453.648 1535.45C453.129 1535.45 452.736 1535.67 452.471 1536.09C452.205 1536.52 452.072 1537.15 452.072 1537.98ZM461.055 1535.45C460.508 1535.45 460.094 1535.67 459.812 1536.09C459.531 1536.52 459.391 1537.15 459.391 1537.98C459.391 1538.82 459.531 1539.45 459.812 1539.88C460.094 1540.3 460.508 1540.51 461.055 1540.51C461.605 1540.51 462.021 1540.3 462.303 1539.88C462.584 1539.45 462.725 1538.82 462.725 1537.98C462.725 1537.15 462.584 1536.52 462.303 1536.09C462.021 1535.67 461.605 1535.45 461.055 1535.45ZM461.055 1534.54C461.965 1534.54 462.66 1534.83 463.141 1535.42C463.625 1536.01 463.867 1536.87 463.867 1537.98C463.867 1539.1 463.627 1539.96 463.146 1540.55C462.666 1541.14 461.969 1541.43 461.055 1541.43C460.145 1541.43 459.449 1541.14 458.969 1540.55C458.488 1539.96 458.248 1539.1 458.248 1537.98C458.248 1536.87 458.488 1536.01 458.969 1535.42C459.449 1534.83 460.145 1534.54 461.055 1534.54ZM470.893 1540.92C470.604 1541.09 470.305 1541.22 469.996 1541.3C469.691 1541.39 469.379 1541.43 469.059 1541.43C468.043 1541.43 467.248 1541.12 466.674 1540.51C466.104 1539.91 465.818 1539.06 465.818 1537.98C465.818 1536.91 466.104 1536.06 466.674 1535.45C467.248 1534.84 468.043 1534.54 469.059 1534.54C469.375 1534.54 469.684 1534.58 469.984 1534.66C470.285 1534.74 470.588 1534.87 470.893 1535.04V1536.17C470.607 1535.92 470.32 1535.74 470.031 1535.62C469.746 1535.51 469.422 1535.45 469.059 1535.45C468.383 1535.45 467.863 1535.67 467.5 1536.11C467.137 1536.55 466.955 1537.17 466.955 1537.98C466.955 1538.79 467.137 1539.42 467.5 1539.86C467.867 1540.3 468.387 1540.51 469.059 1540.51C469.434 1540.51 469.77 1540.46 470.066 1540.34C470.363 1540.23 470.639 1540.05 470.893 1539.81V1540.92ZM477.607 1534.92V1535.98C477.299 1535.8 476.988 1535.67 476.676 1535.58C476.363 1535.49 476.045 1535.44 475.721 1535.44C475.232 1535.44 474.867 1535.52 474.625 1535.68C474.387 1535.84 474.268 1536.08 474.268 1536.4C474.268 1536.69 474.357 1536.91 474.537 1537.06C474.717 1537.2 475.164 1537.34 475.879 1537.48L476.312 1537.56C476.848 1537.66 477.252 1537.87 477.525 1538.17C477.803 1538.48 477.941 1538.87 477.941 1539.36C477.941 1540.01 477.711 1540.52 477.25 1540.88C476.789 1541.25 476.148 1541.43 475.328 1541.43C475.004 1541.43 474.664 1541.39 474.309 1541.32C473.953 1541.26 473.568 1541.16 473.154 1541.02V1539.91C473.557 1540.11 473.941 1540.27 474.309 1540.37C474.676 1540.48 475.023 1540.53 475.352 1540.53C475.828 1540.53 476.197 1540.43 476.459 1540.24C476.721 1540.04 476.852 1539.77 476.852 1539.42C476.852 1538.92 476.373 1538.58 475.416 1538.39L475.369 1538.38L474.965 1538.29C474.344 1538.17 473.891 1537.97 473.605 1537.68C473.32 1537.4 473.178 1537 473.178 1536.51C473.178 1535.88 473.391 1535.39 473.816 1535.05C474.242 1534.71 474.85 1534.54 475.639 1534.54C475.99 1534.54 476.328 1534.57 476.652 1534.64C476.977 1534.7 477.295 1534.8 477.607 1534.92ZM484.674 1532.19V1535.78H483.361V1532.19H484.674ZM481.551 1532.19V1535.78H480.238V1532.19H481.551ZM209.916 1550.19V1553.78H208.604V1550.19H209.916ZM206.793 1550.19V1553.78H205.48V1550.19H206.793ZM216.818 1550.51H217.932L213.326 1560.37H212.207L216.818 1550.51ZM220.691 1552.72H223.451V1558.42H225.59V1559.26H220.234V1558.42H222.373V1553.56H220.691V1552.72ZM222.373 1550.17H223.451V1551.53H222.373V1550.17ZM230.031 1553.36C230.164 1553.08 230.332 1552.88 230.535 1552.74C230.742 1552.61 230.99 1552.54 231.279 1552.54C231.807 1552.54 232.178 1552.74 232.393 1553.15C232.611 1553.56 232.721 1554.33 232.721 1555.46V1559.26H231.736V1555.5C231.736 1554.58 231.684 1554 231.578 1553.78C231.477 1553.55 231.289 1553.44 231.016 1553.44C230.703 1553.44 230.488 1553.56 230.371 1553.8C230.258 1554.04 230.201 1554.61 230.201 1555.5V1559.26H229.217V1555.5C229.217 1554.57 229.16 1553.99 229.047 1553.77C228.938 1553.55 228.738 1553.44 228.449 1553.44C228.164 1553.44 227.965 1553.56 227.852 1553.8C227.742 1554.04 227.688 1554.61 227.688 1555.5V1559.26H226.709V1552.7H227.688V1553.26C227.816 1553.02 227.977 1552.85 228.168 1552.73C228.363 1552.6 228.584 1552.54 228.83 1552.54C229.127 1552.54 229.373 1552.61 229.568 1552.74C229.768 1552.88 229.922 1553.09 230.031 1553.36ZM237.414 1555.96H237.057C236.428 1555.96 235.953 1556.07 235.633 1556.29C235.316 1556.51 235.158 1556.84 235.158 1557.28C235.158 1557.67 235.277 1557.98 235.516 1558.2C235.754 1558.42 236.084 1558.53 236.506 1558.53C237.1 1558.53 237.566 1558.32 237.906 1557.91C238.246 1557.5 238.418 1556.93 238.422 1556.2V1555.96H237.414ZM239.506 1555.51V1559.26H238.422V1558.29C238.191 1558.68 237.9 1558.97 237.549 1559.15C237.201 1559.34 236.777 1559.43 236.277 1559.43C235.609 1559.43 235.076 1559.24 234.678 1558.87C234.279 1558.49 234.08 1557.98 234.08 1557.35C234.08 1556.62 234.324 1556.06 234.812 1555.68C235.305 1555.31 236.025 1555.12 236.975 1555.12H238.422V1554.95C238.418 1554.42 238.285 1554.04 238.023 1553.81C237.762 1553.57 237.344 1553.45 236.77 1553.45C236.402 1553.45 236.031 1553.51 235.656 1553.61C235.281 1553.72 234.916 1553.87 234.561 1554.07V1553C234.959 1552.84 235.34 1552.73 235.703 1552.66C236.07 1552.58 236.426 1552.54 236.77 1552.54C237.312 1552.54 237.775 1552.62 238.158 1552.78C238.545 1552.94 238.857 1553.18 239.096 1553.5C239.244 1553.69 239.35 1553.94 239.412 1554.23C239.475 1554.51 239.506 1554.94 239.506 1555.51ZM245.559 1555.92C245.559 1555.12 245.426 1554.5 245.16 1554.09C244.898 1553.66 244.516 1553.45 244.012 1553.45C243.484 1553.45 243.082 1553.66 242.805 1554.09C242.527 1554.5 242.389 1555.12 242.389 1555.92C242.389 1556.73 242.527 1557.35 242.805 1557.78C243.086 1558.2 243.492 1558.41 244.023 1558.41C244.52 1558.41 244.898 1558.2 245.16 1557.77C245.426 1557.34 245.559 1556.73 245.559 1555.92ZM246.637 1558.84C246.637 1559.82 246.404 1560.57 245.939 1561.08C245.475 1561.58 244.791 1561.84 243.889 1561.84C243.592 1561.84 243.281 1561.81 242.957 1561.76C242.633 1561.7 242.309 1561.62 241.984 1561.51V1560.45C242.367 1560.63 242.715 1560.76 243.027 1560.85C243.34 1560.93 243.627 1560.98 243.889 1560.98C244.471 1560.98 244.895 1560.82 245.16 1560.5C245.426 1560.18 245.559 1559.68 245.559 1559V1558.95V1558.22C245.387 1558.58 245.152 1558.86 244.855 1559.04C244.559 1559.22 244.197 1559.31 243.771 1559.31C243.006 1559.31 242.395 1559 241.938 1558.39C241.48 1557.77 241.252 1556.95 241.252 1555.92C241.252 1554.89 241.48 1554.07 241.938 1553.46C242.395 1552.84 243.006 1552.54 243.771 1552.54C244.193 1552.54 244.551 1552.62 244.844 1552.79C245.137 1552.96 245.375 1553.22 245.559 1553.57V1552.72H246.637V1558.84ZM254.324 1555.44V1555.97H249.654V1556C249.623 1556.9 249.793 1557.54 250.164 1557.93C250.539 1558.32 251.066 1558.51 251.746 1558.51C252.09 1558.51 252.449 1558.46 252.824 1558.35C253.199 1558.24 253.6 1558.08 254.025 1557.85V1558.92C253.615 1559.09 253.219 1559.22 252.836 1559.3C252.457 1559.39 252.09 1559.43 251.734 1559.43C250.715 1559.43 249.918 1559.12 249.344 1558.51C248.77 1557.9 248.482 1557.06 248.482 1555.98C248.482 1554.94 248.764 1554.1 249.326 1553.48C249.889 1552.85 250.639 1552.54 251.576 1552.54C252.412 1552.54 253.07 1552.82 253.551 1553.39C254.035 1553.95 254.293 1554.64 254.324 1555.44ZM253.246 1555.12C253.199 1554.67 253.033 1554.28 252.748 1553.95C252.467 1553.62 252.061 1553.45 251.529 1553.45C251.01 1553.45 250.582 1553.62 250.246 1553.97C249.91 1554.31 249.727 1554.7 249.695 1555.13L253.246 1555.12ZM260.693 1552.92V1553.98C260.385 1553.8 260.074 1553.67 259.762 1553.58C259.449 1553.49 259.131 1553.44 258.807 1553.44C258.318 1553.44 257.953 1553.52 257.711 1553.68C257.473 1553.84 257.354 1554.08 257.354 1554.4C257.354 1554.69 257.443 1554.91 257.623 1555.06C257.803 1555.2 258.25 1555.34 258.965 1555.48L259.398 1555.56C259.934 1555.66 260.338 1555.87 260.611 1556.17C260.889 1556.48 261.027 1556.87 261.027 1557.36C261.027 1558.01 260.797 1558.52 260.336 1558.88C259.875 1559.25 259.234 1559.43 258.414 1559.43C258.09 1559.43 257.75 1559.39 257.395 1559.32C257.039 1559.26 256.654 1559.16 256.24 1559.02V1557.91C256.643 1558.11 257.027 1558.27 257.395 1558.37C257.762 1558.48 258.109 1558.53 258.438 1558.53C258.914 1558.53 259.283 1558.43 259.545 1558.24C259.807 1558.04 259.938 1557.77 259.938 1557.42C259.938 1556.92 259.459 1556.58 258.502 1556.39L258.455 1556.38L258.051 1556.29C257.43 1556.17 256.977 1555.97 256.691 1555.68C256.406 1555.4 256.264 1555 256.264 1554.51C256.264 1553.88 256.477 1553.39 256.902 1553.05C257.328 1552.71 257.936 1552.54 258.725 1552.54C259.076 1552.54 259.414 1552.57 259.738 1552.64C260.062 1552.7 260.381 1552.8 260.693 1552.92ZM267.432 1550.51H268.545L263.939 1560.37H262.82L267.432 1550.51ZM270.039 1552.7H271.158L273.062 1558.2L274.973 1552.7H276.092L273.76 1559.26H272.371L270.039 1552.7ZM282.385 1552.92V1553.98C282.076 1553.8 281.766 1553.67 281.453 1553.58C281.141 1553.49 280.822 1553.44 280.498 1553.44C280.01 1553.44 279.645 1553.52 279.402 1553.68C279.164 1553.84 279.045 1554.08 279.045 1554.4C279.045 1554.69 279.135 1554.91 279.314 1555.06C279.494 1555.2 279.941 1555.34 280.656 1555.48L281.09 1555.56C281.625 1555.66 282.029 1555.87 282.303 1556.17C282.58 1556.48 282.719 1556.87 282.719 1557.36C282.719 1558.01 282.488 1558.52 282.027 1558.88C281.566 1559.25 280.926 1559.43 280.105 1559.43C279.781 1559.43 279.441 1559.39 279.086 1559.32C278.73 1559.26 278.346 1559.16 277.932 1559.02V1557.91C278.334 1558.11 278.719 1558.27 279.086 1558.37C279.453 1558.48 279.801 1558.53 280.129 1558.53C280.605 1558.53 280.975 1558.43 281.236 1558.24C281.498 1558.04 281.629 1557.77 281.629 1557.42C281.629 1556.92 281.15 1556.58 280.193 1556.39L280.146 1556.38L279.742 1556.29C279.121 1556.17 278.668 1555.97 278.383 1555.68C278.098 1555.4 277.955 1555 277.955 1554.51C277.955 1553.88 278.168 1553.39 278.594 1553.05C279.02 1552.71 279.627 1552.54 280.416 1552.54C280.768 1552.54 281.105 1552.57 281.43 1552.64C281.754 1552.7 282.072 1552.8 282.385 1552.92ZM290.131 1558.92C289.842 1559.09 289.543 1559.22 289.234 1559.3C288.93 1559.39 288.617 1559.43 288.297 1559.43C287.281 1559.43 286.486 1559.12 285.912 1558.51C285.342 1557.91 285.057 1557.06 285.057 1555.98C285.057 1554.91 285.342 1554.06 285.912 1553.45C286.486 1552.84 287.281 1552.54 288.297 1552.54C288.613 1552.54 288.922 1552.58 289.223 1552.66C289.523 1552.74 289.826 1552.87 290.131 1553.04V1554.17C289.846 1553.92 289.559 1553.74 289.27 1553.62C288.984 1553.51 288.66 1553.45 288.297 1553.45C287.621 1553.45 287.102 1553.67 286.738 1554.11C286.375 1554.55 286.193 1555.17 286.193 1555.98C286.193 1556.79 286.375 1557.42 286.738 1557.86C287.105 1558.3 287.625 1558.51 288.297 1558.51C288.672 1558.51 289.008 1558.46 289.305 1558.34C289.602 1558.23 289.877 1558.05 290.131 1557.81V1558.92ZM294.754 1553.45C294.207 1553.45 293.793 1553.67 293.512 1554.09C293.23 1554.52 293.09 1555.15 293.09 1555.98C293.09 1556.82 293.23 1557.45 293.512 1557.88C293.793 1558.3 294.207 1558.51 294.754 1558.51C295.305 1558.51 295.721 1558.3 296.002 1557.88C296.283 1557.45 296.424 1556.82 296.424 1555.98C296.424 1555.15 296.283 1554.52 296.002 1554.09C295.721 1553.67 295.305 1553.45 294.754 1553.45ZM294.754 1552.54C295.664 1552.54 296.359 1552.83 296.84 1553.42C297.324 1554.01 297.566 1554.87 297.566 1555.98C297.566 1557.1 297.326 1557.96 296.846 1558.55C296.365 1559.14 295.668 1559.43 294.754 1559.43C293.844 1559.43 293.148 1559.14 292.668 1558.55C292.188 1557.96 291.947 1557.1 291.947 1555.98C291.947 1554.87 292.188 1554.01 292.668 1553.42C293.148 1552.83 293.844 1552.54 294.754 1552.54ZM303.402 1553.53V1550.14H304.48V1559.26H303.402V1558.43C303.223 1558.76 302.982 1559.01 302.682 1559.18C302.385 1559.34 302.041 1559.43 301.65 1559.43C300.857 1559.43 300.232 1559.12 299.775 1558.51C299.322 1557.89 299.096 1557.04 299.096 1555.96C299.096 1554.89 299.324 1554.06 299.781 1553.45C300.238 1552.84 300.861 1552.54 301.65 1552.54C302.045 1552.54 302.393 1552.62 302.693 1552.8C302.994 1552.96 303.23 1553.21 303.402 1553.53ZM300.232 1555.98C300.232 1556.82 300.365 1557.45 300.631 1557.88C300.896 1558.3 301.289 1558.51 301.809 1558.51C302.328 1558.51 302.723 1558.3 302.992 1557.87C303.266 1557.44 303.402 1556.81 303.402 1555.98C303.402 1555.15 303.266 1554.52 302.992 1554.1C302.723 1553.67 302.328 1553.45 301.809 1553.45C301.289 1553.45 300.896 1553.67 300.631 1554.09C300.365 1554.52 300.232 1555.15 300.232 1555.98ZM312.168 1555.44V1555.97H307.498V1556C307.467 1556.9 307.637 1557.54 308.008 1557.93C308.383 1558.32 308.91 1558.51 309.59 1558.51C309.934 1558.51 310.293 1558.46 310.668 1558.35C311.043 1558.24 311.443 1558.08 311.869 1557.85V1558.92C311.459 1559.09 311.062 1559.22 310.68 1559.3C310.301 1559.39 309.934 1559.43 309.578 1559.43C308.559 1559.43 307.762 1559.12 307.188 1558.51C306.613 1557.9 306.326 1557.06 306.326 1555.98C306.326 1554.94 306.607 1554.1 307.17 1553.48C307.732 1552.85 308.482 1552.54 309.42 1552.54C310.256 1552.54 310.914 1552.82 311.395 1553.39C311.879 1553.95 312.137 1554.64 312.168 1555.44ZM311.09 1555.12C311.043 1554.67 310.877 1554.28 310.592 1553.95C310.311 1553.62 309.904 1553.45 309.373 1553.45C308.854 1553.45 308.426 1553.62 308.09 1553.97C307.754 1554.31 307.57 1554.7 307.539 1555.13L311.09 1555.12ZM313.434 1555.02H319.645V1556.01H313.434V1555.02ZM320.066 1552.7H321.133L322.275 1558L323.213 1554.61H324.133L325.082 1558L326.225 1552.7H327.291L325.756 1559.26H324.725L323.676 1555.66L322.633 1559.26H321.602L320.066 1552.7ZM333.859 1555.44V1555.97H329.189V1556C329.158 1556.9 329.328 1557.54 329.699 1557.93C330.074 1558.32 330.602 1558.51 331.281 1558.51C331.625 1558.51 331.984 1558.46 332.359 1558.35C332.734 1558.24 333.135 1558.08 333.561 1557.85V1558.92C333.15 1559.09 332.754 1559.22 332.371 1559.3C331.992 1559.39 331.625 1559.43 331.27 1559.43C330.25 1559.43 329.453 1559.12 328.879 1558.51C328.305 1557.9 328.018 1557.06 328.018 1555.98C328.018 1554.94 328.299 1554.1 328.861 1553.48C329.424 1552.85 330.174 1552.54 331.111 1552.54C331.947 1552.54 332.605 1552.82 333.086 1553.39C333.57 1553.95 333.828 1554.64 333.859 1555.44ZM332.781 1555.12C332.734 1554.67 332.568 1554.28 332.283 1553.95C332.002 1553.62 331.596 1553.45 331.064 1553.45C330.545 1553.45 330.117 1553.62 329.781 1553.97C329.445 1554.31 329.262 1554.7 329.23 1555.13L332.781 1555.12ZM339.906 1555.98C339.906 1555.15 339.773 1554.52 339.508 1554.09C339.242 1553.67 338.85 1553.45 338.33 1553.45C337.807 1553.45 337.41 1553.67 337.141 1554.1C336.871 1554.52 336.736 1555.15 336.736 1555.98C336.736 1556.81 336.871 1557.44 337.141 1557.87C337.41 1558.3 337.807 1558.51 338.33 1558.51C338.85 1558.51 339.242 1558.3 339.508 1557.88C339.773 1557.45 339.906 1556.82 339.906 1555.98ZM336.736 1553.53C336.908 1553.21 337.145 1552.97 337.445 1552.8C337.75 1552.62 338.102 1552.54 338.5 1552.54C339.289 1552.54 339.91 1552.84 340.363 1553.45C340.816 1554.06 341.043 1554.89 341.043 1555.96C341.043 1557.04 340.814 1557.89 340.357 1558.51C339.904 1559.12 339.281 1559.43 338.488 1559.43C338.098 1559.43 337.752 1559.34 337.451 1559.18C337.154 1559.01 336.916 1558.76 336.736 1558.43V1559.26H335.658V1550.14H336.736V1553.53ZM347.459 1552.92V1553.98C347.15 1553.8 346.84 1553.67 346.527 1553.58C346.215 1553.49 345.896 1553.44 345.572 1553.44C345.084 1553.44 344.719 1553.52 344.477 1553.68C344.238 1553.84 344.119 1554.08 344.119 1554.4C344.119 1554.69 344.209 1554.91 344.389 1555.06C344.568 1555.2 345.016 1555.34 345.73 1555.48L346.164 1555.56C346.699 1555.66 347.104 1555.87 347.377 1556.17C347.654 1556.48 347.793 1556.87 347.793 1557.36C347.793 1558.01 347.562 1558.52 347.102 1558.88C346.641 1559.25 346 1559.43 345.18 1559.43C344.855 1559.43 344.516 1559.39 344.16 1559.32C343.805 1559.26 343.42 1559.16 343.006 1559.02V1557.91C343.408 1558.11 343.793 1558.27 344.16 1558.37C344.527 1558.48 344.875 1558.53 345.203 1558.53C345.68 1558.53 346.049 1558.43 346.311 1558.24C346.572 1558.04 346.703 1557.77 346.703 1557.42C346.703 1556.92 346.225 1556.58 345.268 1556.39L345.221 1556.38L344.816 1556.29C344.195 1556.17 343.742 1555.97 343.457 1555.68C343.172 1555.4 343.029 1555 343.029 1554.51C343.029 1553.88 343.242 1553.39 343.668 1553.05C344.094 1552.71 344.701 1552.54 345.49 1552.54C345.842 1552.54 346.18 1552.57 346.504 1552.64C346.828 1552.7 347.146 1552.8 347.459 1552.92ZM350.84 1552.72H353.6V1558.42H355.738V1559.26H350.383V1558.42H352.521V1553.56H350.84V1552.72ZM352.521 1550.17H353.6V1551.53H352.521V1550.17ZM359.816 1550.83V1552.7H362.266V1553.53H359.816V1557.1C359.816 1557.58 359.908 1557.92 360.092 1558.11C360.275 1558.3 360.596 1558.4 361.053 1558.4H362.266V1559.26H360.947C360.139 1559.26 359.568 1559.1 359.236 1558.77C358.904 1558.45 358.738 1557.89 358.738 1557.1V1553.53H356.986V1552.7H358.738V1550.83H359.816ZM370.012 1555.44V1555.97H365.342V1556C365.311 1556.9 365.48 1557.54 365.852 1557.93C366.227 1558.32 366.754 1558.51 367.434 1558.51C367.777 1558.51 368.137 1558.46 368.512 1558.35C368.887 1558.24 369.287 1558.08 369.713 1557.85V1558.92C369.303 1559.09 368.906 1559.22 368.523 1559.3C368.145 1559.39 367.777 1559.43 367.422 1559.43C366.402 1559.43 365.605 1559.12 365.031 1558.51C364.457 1557.9 364.17 1557.06 364.17 1555.98C364.17 1554.94 364.451 1554.1 365.014 1553.48C365.576 1552.85 366.326 1552.54 367.264 1552.54C368.1 1552.54 368.758 1552.82 369.238 1553.39C369.723 1553.95 369.98 1554.64 370.012 1555.44ZM368.934 1555.12C368.887 1554.67 368.721 1554.28 368.436 1553.95C368.154 1553.62 367.748 1553.45 367.217 1553.45C366.697 1553.45 366.27 1553.62 365.934 1553.97C365.598 1554.31 365.414 1554.7 365.383 1555.13L368.934 1555.12ZM372.959 1556.89H375.021V1559.26H372.959V1556.89ZM380.107 1558.43V1561.76H379.023V1552.7H380.107V1553.53C380.287 1553.21 380.525 1552.96 380.822 1552.8C381.123 1552.62 381.469 1552.54 381.859 1552.54C382.652 1552.54 383.273 1552.84 383.723 1553.46C384.176 1554.07 384.402 1554.92 384.402 1556.01C384.402 1557.07 384.176 1557.91 383.723 1558.52C383.27 1559.13 382.648 1559.43 381.859 1559.43C381.461 1559.43 381.111 1559.34 380.811 1559.18C380.514 1559.01 380.279 1558.76 380.107 1558.43ZM383.271 1555.98C383.271 1555.15 383.139 1554.52 382.873 1554.09C382.611 1553.67 382.221 1553.45 381.701 1553.45C381.178 1553.45 380.781 1553.67 380.512 1554.1C380.242 1554.52 380.107 1555.15 380.107 1555.98C380.107 1556.81 380.242 1557.44 380.512 1557.87C380.781 1558.3 381.178 1558.51 381.701 1558.51C382.221 1558.51 382.611 1558.3 382.873 1557.88C383.139 1557.45 383.271 1556.82 383.271 1555.98ZM391.299 1555.19V1559.26H390.215V1555.19C390.215 1554.6 390.111 1554.17 389.904 1553.89C389.697 1553.61 389.373 1553.48 388.932 1553.48C388.428 1553.48 388.039 1553.66 387.766 1554.01C387.496 1554.37 387.361 1554.88 387.361 1555.55V1559.26H386.283V1552.7H387.361V1553.68C387.553 1553.31 387.812 1553.02 388.141 1552.83C388.469 1552.64 388.857 1552.54 389.307 1552.54C389.975 1552.54 390.473 1552.76 390.801 1553.2C391.133 1553.64 391.299 1554.3 391.299 1555.19ZM397.398 1555.92C397.398 1555.12 397.266 1554.5 397 1554.09C396.738 1553.66 396.355 1553.45 395.852 1553.45C395.324 1553.45 394.922 1553.66 394.645 1554.09C394.367 1554.5 394.229 1555.12 394.229 1555.92C394.229 1556.73 394.367 1557.35 394.645 1557.78C394.926 1558.2 395.332 1558.41 395.863 1558.41C396.359 1558.41 396.738 1558.2 397 1557.77C397.266 1557.34 397.398 1556.73 397.398 1555.92ZM398.477 1558.84C398.477 1559.82 398.244 1560.57 397.779 1561.08C397.314 1561.58 396.631 1561.84 395.729 1561.84C395.432 1561.84 395.121 1561.81 394.797 1561.76C394.473 1561.7 394.148 1561.62 393.824 1561.51V1560.45C394.207 1560.63 394.555 1560.76 394.867 1560.85C395.18 1560.93 395.467 1560.98 395.729 1560.98C396.311 1560.98 396.734 1560.82 397 1560.5C397.266 1560.18 397.398 1559.68 397.398 1559V1558.95V1558.22C397.227 1558.58 396.992 1558.86 396.695 1559.04C396.398 1559.22 396.037 1559.31 395.611 1559.31C394.846 1559.31 394.234 1559 393.777 1558.39C393.32 1557.77 393.092 1556.95 393.092 1555.92C393.092 1554.89 393.32 1554.07 393.777 1553.46C394.234 1552.84 394.846 1552.54 395.611 1552.54C396.033 1552.54 396.391 1552.62 396.684 1552.79C396.977 1552.96 397.215 1553.22 397.398 1553.57V1552.72H398.477V1558.84ZM405.139 1550.19V1553.78H403.826V1550.19H405.139ZM402.016 1550.19V1553.78H400.703V1550.19H402.016ZM188.225 1604.19V1607.78H186.912V1604.19H188.225ZM185.102 1604.19V1607.78H183.789V1604.19H185.102ZM192.473 1612.29C193.469 1612.29 194.164 1612.04 194.559 1611.55C194.953 1611.06 195.15 1610.17 195.15 1608.89C195.15 1607.6 194.953 1606.71 194.559 1606.22C194.168 1605.73 193.473 1605.48 192.473 1605.48H191.91V1612.29H192.473ZM192.496 1604.51C193.832 1604.51 194.816 1604.87 195.449 1605.58C196.082 1606.29 196.398 1607.39 196.398 1608.89C196.398 1610.39 196.082 1611.49 195.449 1612.2C194.816 1612.91 193.832 1613.26 192.496 1613.26H190.721V1604.51H192.496ZM203.711 1609.44V1609.97H199.041V1610C199.01 1610.9 199.18 1611.54 199.551 1611.93C199.926 1612.32 200.453 1612.51 201.133 1612.51C201.477 1612.51 201.836 1612.46 202.211 1612.35C202.586 1612.24 202.986 1612.08 203.412 1611.85V1612.92C203.002 1613.09 202.605 1613.22 202.223 1613.3C201.844 1613.39 201.477 1613.43 201.121 1613.43C200.102 1613.43 199.305 1613.12 198.73 1612.51C198.156 1611.9 197.869 1611.06 197.869 1609.98C197.869 1608.94 198.15 1608.1 198.713 1607.48C199.275 1606.85 200.025 1606.54 200.963 1606.54C201.799 1606.54 202.457 1606.82 202.938 1607.39C203.422 1607.95 203.68 1608.64 203.711 1609.44ZM202.633 1609.12C202.586 1608.67 202.42 1608.28 202.135 1607.95C201.854 1607.62 201.447 1607.45 200.916 1607.45C200.396 1607.45 199.969 1607.62 199.633 1607.97C199.297 1608.31 199.113 1608.7 199.082 1609.13L202.633 1609.12ZM210.607 1604.14V1605.04H209.383C208.996 1605.04 208.727 1605.12 208.574 1605.28C208.426 1605.43 208.352 1605.71 208.352 1606.12V1606.7H210.607V1607.53H208.352V1613.26H207.273V1607.53H205.521V1606.7H207.273V1606.24C207.273 1605.52 207.438 1604.99 207.766 1604.65C208.098 1604.31 208.613 1604.14 209.312 1604.14H210.607ZM215.723 1609.96H215.365C214.736 1609.96 214.262 1610.07 213.941 1610.29C213.625 1610.51 213.467 1610.84 213.467 1611.28C213.467 1611.67 213.586 1611.98 213.824 1612.2C214.062 1612.42 214.393 1612.53 214.814 1612.53C215.408 1612.53 215.875 1612.32 216.215 1611.91C216.555 1611.5 216.727 1610.93 216.73 1610.2V1609.96H215.723ZM217.814 1609.51V1613.26H216.73V1612.29C216.5 1612.68 216.209 1612.97 215.857 1613.15C215.51 1613.34 215.086 1613.43 214.586 1613.43C213.918 1613.43 213.385 1613.24 212.986 1612.87C212.588 1612.49 212.389 1611.98 212.389 1611.35C212.389 1610.62 212.633 1610.06 213.121 1609.68C213.613 1609.31 214.334 1609.12 215.283 1609.12H216.73V1608.95C216.727 1608.42 216.594 1608.04 216.332 1607.81C216.07 1607.57 215.652 1607.45 215.078 1607.45C214.711 1607.45 214.34 1607.51 213.965 1607.61C213.59 1607.72 213.225 1607.87 212.869 1608.07V1607C213.268 1606.84 213.648 1606.73 214.012 1606.66C214.379 1606.58 214.734 1606.54 215.078 1606.54C215.621 1606.54 216.084 1606.62 216.467 1606.78C216.854 1606.94 217.166 1607.18 217.404 1607.5C217.553 1607.69 217.658 1607.94 217.721 1608.23C217.783 1608.51 217.814 1608.94 217.814 1609.51ZM219.982 1610.77V1606.71H221.061V1610.77C221.061 1611.36 221.164 1611.8 221.371 1612.08C221.582 1612.35 221.906 1612.49 222.344 1612.49C222.852 1612.49 223.24 1612.31 223.51 1611.96C223.779 1611.6 223.914 1611.09 223.914 1610.42V1606.71H224.998V1613.26H223.914V1612.27C223.723 1612.65 223.461 1612.94 223.129 1613.14C222.801 1613.33 222.416 1613.43 221.975 1613.43C221.303 1613.43 220.803 1613.21 220.475 1612.77C220.146 1612.33 219.982 1611.67 219.982 1610.77ZM230.283 1610.89C230.283 1611.37 230.371 1611.74 230.547 1611.98C230.727 1612.23 230.99 1612.35 231.338 1612.35H232.598V1613.26H231.232C230.588 1613.26 230.088 1613.05 229.732 1612.64C229.381 1612.23 229.205 1611.64 229.205 1610.89V1604.95H227.477V1604.11H230.283V1610.89ZM236.898 1604.83V1606.7H239.348V1607.53H236.898V1611.1C236.898 1611.58 236.99 1611.92 237.174 1612.11C237.357 1612.3 237.678 1612.4 238.135 1612.4H239.348V1613.26H238.029C237.221 1613.26 236.65 1613.1 236.318 1612.77C235.986 1612.45 235.82 1611.89 235.82 1611.1V1607.53H234.068V1606.7H235.82V1604.83H236.898ZM248.037 1604.51H254.711V1605.51H251.975V1613.26H250.785V1605.51H248.037V1604.51ZM261.15 1609.19V1613.26H260.066V1609.19C260.066 1608.6 259.963 1608.17 259.756 1607.89C259.549 1607.61 259.225 1607.48 258.783 1607.48C258.279 1607.48 257.891 1607.66 257.617 1608.01C257.348 1608.37 257.213 1608.88 257.213 1609.55V1613.26H256.135V1604.14H257.213V1607.68C257.404 1607.31 257.664 1607.02 257.992 1606.83C258.32 1606.64 258.709 1606.54 259.158 1606.54C259.826 1606.54 260.324 1606.76 260.652 1607.2C260.984 1607.64 261.15 1608.3 261.15 1609.19ZM268.785 1609.44V1609.97H264.115V1610C264.084 1610.9 264.254 1611.54 264.625 1611.93C265 1612.32 265.527 1612.51 266.207 1612.51C266.551 1612.51 266.91 1612.46 267.285 1612.35C267.66 1612.24 268.061 1612.08 268.486 1611.85V1612.92C268.076 1613.09 267.68 1613.22 267.297 1613.3C266.918 1613.39 266.551 1613.43 266.195 1613.43C265.176 1613.43 264.379 1613.12 263.805 1612.51C263.23 1611.9 262.943 1611.06 262.943 1609.98C262.943 1608.94 263.225 1608.1 263.787 1607.48C264.35 1606.85 265.1 1606.54 266.037 1606.54C266.873 1606.54 267.531 1606.82 268.012 1607.39C268.496 1607.95 268.754 1608.64 268.785 1609.44ZM267.707 1609.12C267.66 1608.67 267.494 1608.28 267.209 1607.95C266.928 1607.62 266.521 1607.45 265.99 1607.45C265.471 1607.45 265.043 1607.62 264.707 1607.97C264.371 1608.31 264.188 1608.7 264.156 1609.13L267.707 1609.12ZM273.414 1607.36C273.547 1607.08 273.715 1606.88 273.918 1606.74C274.125 1606.61 274.373 1606.54 274.662 1606.54C275.189 1606.54 275.561 1606.74 275.775 1607.15C275.994 1607.56 276.104 1608.33 276.104 1609.46V1613.26H275.119V1609.5C275.119 1608.58 275.066 1608 274.961 1607.78C274.859 1607.55 274.672 1607.44 274.398 1607.44C274.086 1607.44 273.871 1607.56 273.754 1607.8C273.641 1608.04 273.584 1608.61 273.584 1609.5V1613.26H272.6V1609.5C272.6 1608.57 272.543 1607.99 272.43 1607.77C272.32 1607.55 272.121 1607.44 271.832 1607.44C271.547 1607.44 271.348 1607.56 271.234 1607.8C271.125 1608.04 271.07 1608.61 271.07 1609.5V1613.26H270.092V1606.7H271.07V1607.26C271.199 1607.02 271.359 1606.85 271.551 1606.73C271.746 1606.6 271.967 1606.54 272.213 1606.54C272.51 1606.54 272.756 1606.61 272.951 1606.74C273.15 1606.88 273.305 1607.09 273.414 1607.36ZM283.246 1609.44V1609.97H278.576V1610C278.545 1610.9 278.715 1611.54 279.086 1611.93C279.461 1612.32 279.988 1612.51 280.668 1612.51C281.012 1612.51 281.371 1612.46 281.746 1612.35C282.121 1612.24 282.521 1612.08 282.947 1611.85V1612.92C282.537 1613.09 282.141 1613.22 281.758 1613.3C281.379 1613.39 281.012 1613.43 280.656 1613.43C279.637 1613.43 278.84 1613.12 278.266 1612.51C277.691 1611.9 277.404 1611.06 277.404 1609.98C277.404 1608.94 277.686 1608.1 278.248 1607.48C278.811 1606.85 279.561 1606.54 280.498 1606.54C281.334 1606.54 281.992 1606.82 282.473 1607.39C282.957 1607.95 283.215 1608.64 283.246 1609.44ZM282.168 1609.12C282.121 1608.67 281.955 1608.28 281.67 1607.95C281.389 1607.62 280.982 1607.45 280.451 1607.45C279.932 1607.45 279.504 1607.62 279.168 1607.97C278.832 1608.31 278.648 1608.7 278.617 1609.13L282.168 1609.12ZM289.615 1606.92V1607.98C289.307 1607.8 288.996 1607.67 288.684 1607.58C288.371 1607.49 288.053 1607.44 287.729 1607.44C287.24 1607.44 286.875 1607.52 286.633 1607.68C286.395 1607.84 286.275 1608.08 286.275 1608.4C286.275 1608.69 286.365 1608.91 286.545 1609.06C286.725 1609.2 287.172 1609.34 287.887 1609.48L288.32 1609.56C288.855 1609.66 289.26 1609.87 289.533 1610.17C289.811 1610.48 289.949 1610.87 289.949 1611.36C289.949 1612.01 289.719 1612.52 289.258 1612.88C288.797 1613.25 288.156 1613.43 287.336 1613.43C287.012 1613.43 286.672 1613.39 286.316 1613.32C285.961 1613.26 285.576 1613.16 285.162 1613.02V1611.91C285.564 1612.11 285.949 1612.27 286.316 1612.37C286.684 1612.48 287.031 1612.53 287.359 1612.53C287.836 1612.53 288.205 1612.43 288.467 1612.24C288.729 1612.04 288.859 1611.77 288.859 1611.42C288.859 1610.92 288.381 1610.58 287.424 1610.39L287.377 1610.38L286.973 1610.29C286.352 1610.17 285.898 1609.97 285.613 1609.68C285.328 1609.4 285.186 1609 285.186 1608.51C285.186 1607.88 285.398 1607.39 285.824 1607.05C286.25 1606.71 286.857 1606.54 287.646 1606.54C287.998 1606.54 288.336 1606.57 288.66 1606.64C288.984 1606.7 289.303 1606.8 289.615 1606.92ZM296.682 1604.19V1607.78H295.369V1604.19H296.682ZM293.559 1604.19V1607.78H292.246V1604.19H293.559ZM231.607 1622.19V1625.78H230.295V1622.19H231.607ZM228.484 1622.19V1625.78H227.172V1622.19H228.484ZM233.512 1622.54H235.094L236.605 1626.98L238.129 1622.54H239.717V1631.26H238.621V1623.55L237.062 1628.15H236.166L234.602 1623.55V1631.26H233.512V1622.54ZM244.141 1625.45C243.594 1625.45 243.18 1625.67 242.898 1626.09C242.617 1626.52 242.477 1627.15 242.477 1627.98C242.477 1628.82 242.617 1629.45 242.898 1629.88C243.18 1630.3 243.594 1630.51 244.141 1630.51C244.691 1630.51 245.107 1630.3 245.389 1629.88C245.67 1629.45 245.811 1628.82 245.811 1627.98C245.811 1627.15 245.67 1626.52 245.389 1626.09C245.107 1625.67 244.691 1625.45 244.141 1625.45ZM244.141 1624.54C245.051 1624.54 245.746 1624.83 246.227 1625.42C246.711 1626.01 246.953 1626.87 246.953 1627.98C246.953 1629.1 246.713 1629.96 246.232 1630.55C245.752 1631.14 245.055 1631.43 244.141 1631.43C243.23 1631.43 242.535 1631.14 242.055 1630.55C241.574 1629.96 241.334 1629.1 241.334 1627.98C241.334 1626.87 241.574 1626.01 242.055 1625.42C242.535 1624.83 243.23 1624.54 244.141 1624.54ZM252.789 1625.53V1622.14H253.867V1631.26H252.789V1630.43C252.609 1630.76 252.369 1631.01 252.068 1631.18C251.771 1631.34 251.428 1631.43 251.037 1631.43C250.244 1631.43 249.619 1631.12 249.162 1630.51C248.709 1629.89 248.482 1629.04 248.482 1627.96C248.482 1626.89 248.711 1626.06 249.168 1625.45C249.625 1624.84 250.248 1624.54 251.037 1624.54C251.432 1624.54 251.779 1624.62 252.08 1624.8C252.381 1624.96 252.617 1625.21 252.789 1625.53ZM249.619 1627.98C249.619 1628.82 249.752 1629.45 250.018 1629.88C250.283 1630.3 250.676 1630.51 251.195 1630.51C251.715 1630.51 252.109 1630.3 252.379 1629.87C252.652 1629.44 252.789 1628.81 252.789 1627.98C252.789 1627.15 252.652 1626.52 252.379 1626.1C252.109 1625.67 251.715 1625.45 251.195 1625.45C250.676 1625.45 250.283 1625.67 250.018 1626.09C249.752 1626.52 249.619 1627.15 249.619 1627.98ZM261.555 1627.44V1627.97H256.885V1628C256.854 1628.9 257.023 1629.54 257.395 1629.93C257.77 1630.32 258.297 1630.51 258.977 1630.51C259.32 1630.51 259.68 1630.46 260.055 1630.35C260.43 1630.24 260.83 1630.08 261.256 1629.85V1630.92C260.846 1631.09 260.449 1631.22 260.066 1631.3C259.688 1631.39 259.32 1631.43 258.965 1631.43C257.945 1631.43 257.148 1631.12 256.574 1630.51C256 1629.9 255.713 1629.06 255.713 1627.98C255.713 1626.94 255.994 1626.1 256.557 1625.48C257.119 1624.85 257.869 1624.54 258.807 1624.54C259.643 1624.54 260.301 1624.82 260.781 1625.39C261.266 1625.95 261.523 1626.64 261.555 1627.44ZM260.477 1627.12C260.43 1626.67 260.264 1626.28 259.979 1625.95C259.697 1625.62 259.291 1625.45 258.76 1625.45C258.24 1625.45 257.812 1625.62 257.477 1625.97C257.141 1626.31 256.957 1626.7 256.926 1627.13L260.477 1627.12ZM268.99 1626.05C268.76 1625.87 268.525 1625.74 268.287 1625.66C268.049 1625.58 267.787 1625.53 267.502 1625.53C266.83 1625.53 266.316 1625.75 265.961 1626.17C265.605 1626.59 265.428 1627.2 265.428 1628V1631.26H264.344V1624.7H265.428V1625.98C265.607 1625.51 265.883 1625.16 266.254 1624.91C266.629 1624.66 267.072 1624.54 267.584 1624.54C267.85 1624.54 268.098 1624.57 268.328 1624.64C268.559 1624.7 268.779 1624.81 268.99 1624.95V1626.05ZM275.611 1627.19V1631.26H274.527V1627.19C274.527 1626.6 274.424 1626.17 274.217 1625.89C274.01 1625.61 273.686 1625.48 273.244 1625.48C272.74 1625.48 272.352 1625.66 272.078 1626.01C271.809 1626.37 271.674 1626.88 271.674 1627.55V1631.26H270.596V1624.7H271.674V1625.68C271.865 1625.31 272.125 1625.02 272.453 1624.83C272.781 1624.64 273.17 1624.54 273.619 1624.54C274.287 1624.54 274.785 1624.76 275.113 1625.2C275.445 1625.64 275.611 1626.3 275.611 1627.19ZM278.535 1624.72H281.295V1630.42H283.434V1631.26H278.078V1630.42H280.217V1625.56H278.535V1624.72ZM280.217 1622.17H281.295V1623.53H280.217V1622.17ZM285.244 1624.68H290.008V1625.67L286.24 1630.38H290.008V1631.26H285.104V1630.26L288.871 1625.55H285.244V1624.68ZM297.707 1627.44V1627.97H293.037V1628C293.006 1628.9 293.176 1629.54 293.547 1629.93C293.922 1630.32 294.449 1630.51 295.129 1630.51C295.473 1630.51 295.832 1630.46 296.207 1630.35C296.582 1630.24 296.982 1630.08 297.408 1629.85V1630.92C296.998 1631.09 296.602 1631.22 296.219 1631.3C295.84 1631.39 295.473 1631.43 295.117 1631.43C294.098 1631.43 293.301 1631.12 292.727 1630.51C292.152 1629.9 291.865 1629.06 291.865 1627.98C291.865 1626.94 292.146 1626.1 292.709 1625.48C293.271 1624.85 294.021 1624.54 294.959 1624.54C295.795 1624.54 296.453 1624.82 296.934 1625.39C297.418 1625.95 297.676 1626.64 297.707 1627.44ZM296.629 1627.12C296.582 1626.67 296.416 1626.28 296.131 1625.95C295.85 1625.62 295.443 1625.45 294.912 1625.45C294.393 1625.45 293.965 1625.62 293.629 1625.97C293.293 1626.31 293.109 1626.7 293.078 1627.13L296.629 1627.12ZM303.402 1625.53V1622.14H304.48V1631.26H303.402V1630.43C303.223 1630.76 302.982 1631.01 302.682 1631.18C302.385 1631.34 302.041 1631.43 301.65 1631.43C300.857 1631.43 300.232 1631.12 299.775 1630.51C299.322 1629.89 299.096 1629.04 299.096 1627.96C299.096 1626.89 299.324 1626.06 299.781 1625.45C300.238 1624.84 300.861 1624.54 301.65 1624.54C302.045 1624.54 302.393 1624.62 302.693 1624.8C302.994 1624.96 303.23 1625.21 303.402 1625.53ZM300.232 1627.98C300.232 1628.82 300.365 1629.45 300.631 1629.88C300.896 1630.3 301.289 1630.51 301.809 1630.51C302.328 1630.51 302.723 1630.3 302.992 1629.87C303.266 1629.44 303.402 1628.81 303.402 1627.98C303.402 1627.15 303.266 1626.52 302.992 1626.1C302.723 1625.67 302.328 1625.45 301.809 1625.45C301.289 1625.45 300.896 1625.67 300.631 1626.09C300.365 1626.52 300.232 1627.15 300.232 1627.98ZM308.195 1629.14H310.023V1630.7L308.723 1633.22L307.551 1633.23L308.195 1630.7V1629.14ZM324.18 1627.96H323.822C323.193 1627.96 322.719 1628.07 322.398 1628.29C322.082 1628.51 321.924 1628.84 321.924 1629.28C321.924 1629.67 322.043 1629.98 322.281 1630.2C322.52 1630.42 322.85 1630.53 323.271 1630.53C323.865 1630.53 324.332 1630.32 324.672 1629.91C325.012 1629.5 325.184 1628.93 325.188 1628.2V1627.96H324.18ZM326.271 1627.51V1631.26H325.188V1630.29C324.957 1630.68 324.666 1630.97 324.314 1631.15C323.967 1631.34 323.543 1631.43 323.043 1631.43C322.375 1631.43 321.842 1631.24 321.443 1630.87C321.045 1630.49 320.846 1629.98 320.846 1629.35C320.846 1628.62 321.09 1628.06 321.578 1627.68C322.07 1627.31 322.791 1627.12 323.74 1627.12H325.188V1626.95C325.184 1626.42 325.051 1626.04 324.789 1625.81C324.527 1625.57 324.109 1625.45 323.535 1625.45C323.168 1625.45 322.797 1625.51 322.422 1625.61C322.047 1625.72 321.682 1625.87 321.326 1626.07V1625C321.725 1624.84 322.105 1624.73 322.469 1624.66C322.836 1624.58 323.191 1624.54 323.535 1624.54C324.078 1624.54 324.541 1624.62 324.924 1624.78C325.311 1624.94 325.623 1625.18 325.861 1625.5C326.01 1625.69 326.115 1625.94 326.178 1626.23C326.24 1626.51 326.271 1626.94 326.271 1627.51ZM333.514 1630.92C333.225 1631.09 332.926 1631.22 332.617 1631.3C332.312 1631.39 332 1631.43 331.68 1631.43C330.664 1631.43 329.869 1631.12 329.295 1630.51C328.725 1629.91 328.439 1629.06 328.439 1627.98C328.439 1626.91 328.725 1626.06 329.295 1625.45C329.869 1624.84 330.664 1624.54 331.68 1624.54C331.996 1624.54 332.305 1624.58 332.605 1624.66C332.906 1624.74 333.209 1624.87 333.514 1625.04V1626.17C333.229 1625.92 332.941 1625.74 332.652 1625.62C332.367 1625.51 332.043 1625.45 331.68 1625.45C331.004 1625.45 330.484 1625.67 330.121 1626.11C329.758 1626.55 329.576 1627.17 329.576 1627.98C329.576 1628.79 329.758 1629.42 330.121 1629.86C330.488 1630.3 331.008 1630.51 331.68 1630.51C332.055 1630.51 332.391 1630.46 332.688 1630.34C332.984 1630.23 333.26 1630.05 333.514 1629.81V1630.92ZM340.744 1630.92C340.455 1631.09 340.156 1631.22 339.848 1631.3C339.543 1631.39 339.23 1631.43 338.91 1631.43C337.895 1631.43 337.1 1631.12 336.525 1630.51C335.955 1629.91 335.67 1629.06 335.67 1627.98C335.67 1626.91 335.955 1626.06 336.525 1625.45C337.1 1624.84 337.895 1624.54 338.91 1624.54C339.227 1624.54 339.535 1624.58 339.836 1624.66C340.137 1624.74 340.439 1624.87 340.744 1625.04V1626.17C340.459 1625.92 340.172 1625.74 339.883 1625.62C339.598 1625.51 339.273 1625.45 338.91 1625.45C338.234 1625.45 337.715 1625.67 337.352 1626.11C336.988 1626.55 336.807 1627.17 336.807 1627.98C336.807 1628.79 336.988 1629.42 337.352 1629.86C337.719 1630.3 338.238 1630.51 338.91 1630.51C339.285 1630.51 339.621 1630.46 339.918 1630.34C340.215 1630.23 340.49 1630.05 340.744 1629.81V1630.92ZM348.32 1627.44V1627.97H343.65V1628C343.619 1628.9 343.789 1629.54 344.16 1629.93C344.535 1630.32 345.062 1630.51 345.742 1630.51C346.086 1630.51 346.445 1630.46 346.82 1630.35C347.195 1630.24 347.596 1630.08 348.021 1629.85V1630.92C347.611 1631.09 347.215 1631.22 346.832 1631.3C346.453 1631.39 346.086 1631.43 345.73 1631.43C344.711 1631.43 343.914 1631.12 343.34 1630.51C342.766 1629.9 342.479 1629.06 342.479 1627.98C342.479 1626.94 342.76 1626.1 343.322 1625.48C343.885 1624.85 344.635 1624.54 345.572 1624.54C346.408 1624.54 347.066 1624.82 347.547 1625.39C348.031 1625.95 348.289 1626.64 348.32 1627.44ZM347.242 1627.12C347.195 1626.67 347.029 1626.28 346.744 1625.95C346.463 1625.62 346.057 1625.45 345.525 1625.45C345.006 1625.45 344.578 1625.62 344.242 1625.97C343.906 1626.31 343.723 1626.7 343.691 1627.13L347.242 1627.12ZM354.689 1624.92V1625.98C354.381 1625.8 354.07 1625.67 353.758 1625.58C353.445 1625.49 353.127 1625.44 352.803 1625.44C352.314 1625.44 351.949 1625.52 351.707 1625.68C351.469 1625.84 351.35 1626.08 351.35 1626.4C351.35 1626.69 351.439 1626.91 351.619 1627.06C351.799 1627.2 352.246 1627.34 352.961 1627.48L353.395 1627.56C353.93 1627.66 354.334 1627.87 354.607 1628.17C354.885 1628.48 355.023 1628.87 355.023 1629.36C355.023 1630.01 354.793 1630.52 354.332 1630.88C353.871 1631.25 353.23 1631.43 352.41 1631.43C352.086 1631.43 351.746 1631.39 351.391 1631.32C351.035 1631.26 350.65 1631.16 350.236 1631.02V1629.91C350.639 1630.11 351.023 1630.27 351.391 1630.37C351.758 1630.48 352.105 1630.53 352.434 1630.53C352.91 1630.53 353.279 1630.43 353.541 1630.24C353.803 1630.04 353.934 1629.77 353.934 1629.42C353.934 1628.92 353.455 1628.58 352.498 1628.39L352.451 1628.38L352.047 1628.29C351.426 1628.17 350.973 1627.97 350.688 1627.68C350.402 1627.4 350.26 1627 350.26 1626.51C350.26 1625.88 350.473 1625.39 350.898 1625.05C351.324 1624.71 351.932 1624.54 352.721 1624.54C353.072 1624.54 353.41 1624.57 353.734 1624.64C354.059 1624.7 354.377 1624.8 354.689 1624.92ZM361.92 1624.92V1625.98C361.611 1625.8 361.301 1625.67 360.988 1625.58C360.676 1625.49 360.357 1625.44 360.033 1625.44C359.545 1625.44 359.18 1625.52 358.938 1625.68C358.699 1625.84 358.58 1626.08 358.58 1626.4C358.58 1626.69 358.67 1626.91 358.85 1627.06C359.029 1627.2 359.477 1627.34 360.191 1627.48L360.625 1627.56C361.16 1627.66 361.564 1627.87 361.838 1628.17C362.115 1628.48 362.254 1628.87 362.254 1629.36C362.254 1630.01 362.023 1630.52 361.562 1630.88C361.102 1631.25 360.461 1631.43 359.641 1631.43C359.316 1631.43 358.977 1631.39 358.621 1631.32C358.266 1631.26 357.881 1631.16 357.467 1631.02V1629.91C357.869 1630.11 358.254 1630.27 358.621 1630.37C358.988 1630.48 359.336 1630.53 359.664 1630.53C360.141 1630.53 360.51 1630.43 360.771 1630.24C361.033 1630.04 361.164 1629.77 361.164 1629.42C361.164 1628.92 360.686 1628.58 359.729 1628.39L359.682 1628.38L359.277 1628.29C358.656 1628.17 358.203 1627.97 357.918 1627.68C357.633 1627.4 357.49 1627 357.49 1626.51C357.49 1625.88 357.703 1625.39 358.129 1625.05C358.555 1624.71 359.162 1624.54 359.951 1624.54C360.303 1624.54 360.641 1624.57 360.965 1624.64C361.289 1624.7 361.607 1624.8 361.92 1624.92ZM365.301 1624.72H368.061V1630.42H370.199V1631.26H364.844V1630.42H366.982V1625.56H365.301V1624.72ZM366.982 1622.17H368.061V1623.53H366.982V1622.17ZM376.059 1627.98C376.059 1627.15 375.926 1626.52 375.66 1626.09C375.395 1625.67 375.002 1625.45 374.482 1625.45C373.959 1625.45 373.562 1625.67 373.293 1626.1C373.023 1626.52 372.889 1627.15 372.889 1627.98C372.889 1628.81 373.023 1629.44 373.293 1629.87C373.562 1630.3 373.959 1630.51 374.482 1630.51C375.002 1630.51 375.395 1630.3 375.66 1629.88C375.926 1629.45 376.059 1628.82 376.059 1627.98ZM372.889 1625.53C373.061 1625.21 373.297 1624.97 373.598 1624.8C373.902 1624.62 374.254 1624.54 374.652 1624.54C375.441 1624.54 376.062 1624.84 376.516 1625.45C376.969 1626.06 377.195 1626.89 377.195 1627.96C377.195 1629.04 376.967 1629.89 376.51 1630.51C376.057 1631.12 375.434 1631.43 374.641 1631.43C374.25 1631.43 373.904 1631.34 373.604 1631.18C373.307 1631.01 373.068 1630.76 372.889 1630.43V1631.26H371.811V1622.14H372.889V1625.53ZM382.123 1628.89C382.123 1629.37 382.211 1629.74 382.387 1629.98C382.566 1630.23 382.83 1630.35 383.178 1630.35H384.438V1631.26H383.072C382.428 1631.26 381.928 1631.05 381.572 1630.64C381.221 1630.23 381.045 1629.64 381.045 1628.89V1622.95H379.316V1622.11H382.123V1628.89ZM391.703 1627.44V1627.97H387.033V1628C387.002 1628.9 387.172 1629.54 387.543 1629.93C387.918 1630.32 388.445 1630.51 389.125 1630.51C389.469 1630.51 389.828 1630.46 390.203 1630.35C390.578 1630.24 390.979 1630.08 391.404 1629.85V1630.92C390.994 1631.09 390.598 1631.22 390.215 1631.3C389.836 1631.39 389.469 1631.43 389.113 1631.43C388.094 1631.43 387.297 1631.12 386.723 1630.51C386.148 1629.9 385.861 1629.06 385.861 1627.98C385.861 1626.94 386.143 1626.1 386.705 1625.48C387.268 1624.85 388.018 1624.54 388.955 1624.54C389.791 1624.54 390.449 1624.82 390.93 1625.39C391.414 1625.95 391.672 1626.64 391.703 1627.44ZM390.625 1627.12C390.578 1626.67 390.412 1626.28 390.127 1625.95C389.846 1625.62 389.439 1625.45 388.908 1625.45C388.389 1625.45 387.961 1625.62 387.625 1625.97C387.289 1626.31 387.105 1626.7 387.074 1627.13L390.625 1627.12ZM394.961 1629.14H396.789V1630.7L395.488 1633.22L394.316 1633.23L394.961 1630.7V1629.14ZM411.859 1625.53V1622.14H412.938V1631.26H411.859V1630.43C411.68 1630.76 411.439 1631.01 411.139 1631.18C410.842 1631.34 410.498 1631.43 410.107 1631.43C409.314 1631.43 408.689 1631.12 408.232 1630.51C407.779 1629.89 407.553 1629.04 407.553 1627.96C407.553 1626.89 407.781 1626.06 408.238 1625.45C408.695 1624.84 409.318 1624.54 410.107 1624.54C410.502 1624.54 410.85 1624.62 411.15 1624.8C411.451 1624.96 411.688 1625.21 411.859 1625.53ZM408.689 1627.98C408.689 1628.82 408.822 1629.45 409.088 1629.88C409.354 1630.3 409.746 1630.51 410.266 1630.51C410.785 1630.51 411.18 1630.3 411.449 1629.87C411.723 1629.44 411.859 1628.81 411.859 1627.98C411.859 1627.15 411.723 1626.52 411.449 1626.1C411.18 1625.67 410.785 1625.45 410.266 1625.45C409.746 1625.45 409.354 1625.67 409.088 1626.09C408.822 1626.52 408.689 1627.15 408.689 1627.98ZM418.176 1627.96H417.818C417.189 1627.96 416.715 1628.07 416.395 1628.29C416.078 1628.51 415.92 1628.84 415.92 1629.28C415.92 1629.67 416.039 1629.98 416.277 1630.2C416.516 1630.42 416.846 1630.53 417.268 1630.53C417.861 1630.53 418.328 1630.32 418.668 1629.91C419.008 1629.5 419.18 1628.93 419.184 1628.2V1627.96H418.176ZM420.268 1627.51V1631.26H419.184V1630.29C418.953 1630.68 418.662 1630.97 418.311 1631.15C417.963 1631.34 417.539 1631.43 417.039 1631.43C416.371 1631.43 415.838 1631.24 415.439 1630.87C415.041 1630.49 414.842 1629.98 414.842 1629.35C414.842 1628.62 415.086 1628.06 415.574 1627.68C416.066 1627.31 416.787 1627.12 417.736 1627.12H419.184V1626.95C419.18 1626.42 419.047 1626.04 418.785 1625.81C418.523 1625.57 418.105 1625.45 417.531 1625.45C417.164 1625.45 416.793 1625.51 416.418 1625.61C416.043 1625.72 415.678 1625.87 415.322 1626.07V1625C415.721 1624.84 416.102 1624.73 416.465 1624.66C416.832 1624.58 417.188 1624.54 417.531 1624.54C418.074 1624.54 418.537 1624.62 418.92 1624.78C419.307 1624.94 419.619 1625.18 419.857 1625.5C420.006 1625.69 420.111 1625.94 420.174 1626.23C420.236 1626.51 420.268 1626.94 420.268 1627.51ZM428.061 1626.05C427.83 1625.87 427.596 1625.74 427.357 1625.66C427.119 1625.58 426.857 1625.53 426.572 1625.53C425.9 1625.53 425.387 1625.75 425.031 1626.17C424.676 1626.59 424.498 1627.2 424.498 1628V1631.26H423.414V1624.7H424.498V1625.98C424.678 1625.51 424.953 1625.16 425.324 1624.91C425.699 1624.66 426.143 1624.54 426.654 1624.54C426.92 1624.54 427.168 1624.57 427.398 1624.64C427.629 1624.7 427.85 1624.81 428.061 1624.95V1626.05ZM429.906 1622.14H431.02V1627.42L433.85 1624.7H435.162L432.578 1627.17L435.566 1631.26H434.248L431.822 1627.87L431.02 1628.63V1631.26H429.906V1622.14ZM438.344 1629.14H440.172V1630.7L438.871 1633.22L437.699 1633.23L438.344 1630.7V1629.14ZM454.428 1628.89C454.428 1629.37 454.516 1629.74 454.691 1629.98C454.871 1630.23 455.135 1630.35 455.482 1630.35H456.742V1631.26H455.377C454.732 1631.26 454.232 1631.05 453.877 1630.64C453.525 1630.23 453.35 1629.64 453.35 1628.89V1622.95H451.621V1622.11H454.428V1628.89ZM459.297 1624.72H462.057V1630.42H464.195V1631.26H458.84V1630.42H460.979V1625.56H459.297V1624.72ZM460.979 1622.17H462.057V1623.53H460.979V1622.17ZM469.703 1627.92C469.703 1627.12 469.57 1626.5 469.305 1626.09C469.043 1625.66 468.66 1625.45 468.156 1625.45C467.629 1625.45 467.227 1625.66 466.949 1626.09C466.672 1626.5 466.533 1627.12 466.533 1627.92C466.533 1628.73 466.672 1629.35 466.949 1629.78C467.23 1630.2 467.637 1630.41 468.168 1630.41C468.664 1630.41 469.043 1630.2 469.305 1629.77C469.57 1629.34 469.703 1628.73 469.703 1627.92ZM470.781 1630.84C470.781 1631.82 470.549 1632.57 470.084 1633.08C469.619 1633.58 468.936 1633.84 468.033 1633.84C467.736 1633.84 467.426 1633.81 467.102 1633.76C466.777 1633.7 466.453 1633.62 466.129 1633.51V1632.45C466.512 1632.63 466.859 1632.76 467.172 1632.85C467.484 1632.93 467.771 1632.98 468.033 1632.98C468.615 1632.98 469.039 1632.82 469.305 1632.5C469.57 1632.18 469.703 1631.68 469.703 1631V1630.95V1630.22C469.531 1630.58 469.297 1630.86 469 1631.04C468.703 1631.22 468.342 1631.31 467.916 1631.31C467.15 1631.31 466.539 1631 466.082 1630.39C465.625 1629.77 465.396 1628.95 465.396 1627.92C465.396 1626.89 465.625 1626.07 466.082 1625.46C466.539 1624.84 467.15 1624.54 467.916 1624.54C468.338 1624.54 468.695 1624.62 468.988 1624.79C469.281 1624.96 469.52 1625.22 469.703 1625.57V1624.72H470.781V1630.84ZM478.064 1627.19V1631.26H476.98V1627.19C476.98 1626.6 476.877 1626.17 476.67 1625.89C476.463 1625.61 476.139 1625.48 475.697 1625.48C475.193 1625.48 474.805 1625.66 474.531 1626.01C474.262 1626.37 474.127 1626.88 474.127 1627.55V1631.26H473.049V1622.14H474.127V1625.68C474.318 1625.31 474.578 1625.02 474.906 1624.83C475.234 1624.64 475.623 1624.54 476.072 1624.54C476.74 1624.54 477.238 1624.76 477.566 1625.2C477.898 1625.64 478.064 1626.3 478.064 1627.19ZM482.734 1622.83V1624.7H485.184V1625.53H482.734V1629.1C482.734 1629.58 482.826 1629.92 483.01 1630.11C483.193 1630.3 483.514 1630.4 483.971 1630.4H485.184V1631.26H483.865C483.057 1631.26 482.486 1631.1 482.154 1630.77C481.822 1630.45 481.656 1629.89 481.656 1629.1V1625.53H479.904V1624.7H481.656V1622.83H482.734ZM488.957 1629.14H490.785V1630.7L489.484 1633.22L488.312 1633.23L488.957 1630.7V1629.14ZM504.941 1627.96H504.584C503.955 1627.96 503.48 1628.07 503.16 1628.29C502.844 1628.51 502.686 1628.84 502.686 1629.28C502.686 1629.67 502.805 1629.98 503.043 1630.2C503.281 1630.42 503.611 1630.53 504.033 1630.53C504.627 1630.53 505.094 1630.32 505.434 1629.91C505.773 1629.5 505.945 1628.93 505.949 1628.2V1627.96H504.941ZM507.033 1627.51V1631.26H505.949V1630.29C505.719 1630.68 505.428 1630.97 505.076 1631.15C504.729 1631.34 504.305 1631.43 503.805 1631.43C503.137 1631.43 502.604 1631.24 502.205 1630.87C501.807 1630.49 501.607 1629.98 501.607 1629.35C501.607 1628.62 501.852 1628.06 502.34 1627.68C502.832 1627.31 503.553 1627.12 504.502 1627.12H505.949V1626.95C505.945 1626.42 505.812 1626.04 505.551 1625.81C505.289 1625.57 504.871 1625.45 504.297 1625.45C503.93 1625.45 503.559 1625.51 503.184 1625.61C502.809 1625.72 502.443 1625.87 502.088 1626.07V1625C502.486 1624.84 502.867 1624.73 503.23 1624.66C503.598 1624.58 503.953 1624.54 504.297 1624.54C504.84 1624.54 505.303 1624.62 505.686 1624.78C506.072 1624.94 506.385 1625.18 506.623 1625.5C506.771 1625.69 506.877 1625.94 506.939 1626.23C507.002 1626.51 507.033 1626.94 507.033 1627.51ZM514.217 1627.19V1631.26H513.133V1627.19C513.133 1626.6 513.029 1626.17 512.822 1625.89C512.615 1625.61 512.291 1625.48 511.85 1625.48C511.346 1625.48 510.957 1625.66 510.684 1626.01C510.414 1626.37 510.279 1626.88 510.279 1627.55V1631.26H509.201V1624.7H510.279V1625.68C510.471 1625.31 510.73 1625.02 511.059 1624.83C511.387 1624.64 511.775 1624.54 512.225 1624.54C512.893 1624.54 513.391 1624.76 513.719 1625.2C514.051 1625.64 514.217 1626.3 514.217 1627.19ZM520.316 1625.53V1622.14H521.395V1631.26H520.316V1630.43C520.137 1630.76 519.896 1631.01 519.596 1631.18C519.299 1631.34 518.955 1631.43 518.564 1631.43C517.771 1631.43 517.146 1631.12 516.689 1630.51C516.236 1629.89 516.01 1629.04 516.01 1627.96C516.01 1626.89 516.238 1626.06 516.695 1625.45C517.152 1624.84 517.775 1624.54 518.564 1624.54C518.959 1624.54 519.307 1624.62 519.607 1624.8C519.908 1624.96 520.145 1625.21 520.316 1625.53ZM517.146 1627.98C517.146 1628.82 517.279 1629.45 517.545 1629.88C517.811 1630.3 518.203 1630.51 518.723 1630.51C519.242 1630.51 519.637 1630.3 519.906 1629.87C520.18 1629.44 520.316 1628.81 520.316 1627.98C520.316 1627.15 520.18 1626.52 519.906 1626.1C519.637 1625.67 519.242 1625.45 518.723 1625.45C518.203 1625.45 517.811 1625.67 517.545 1626.09C517.279 1626.52 517.146 1627.15 517.146 1627.98ZM535.908 1627.19V1631.26H534.824V1627.19C534.824 1626.6 534.721 1626.17 534.514 1625.89C534.307 1625.61 533.982 1625.48 533.541 1625.48C533.037 1625.48 532.648 1625.66 532.375 1626.01C532.105 1626.37 531.971 1626.88 531.971 1627.55V1631.26H530.893V1622.14H531.971V1625.68C532.162 1625.31 532.422 1625.02 532.75 1624.83C533.078 1624.64 533.467 1624.54 533.916 1624.54C534.584 1624.54 535.082 1624.76 535.41 1625.2C535.742 1625.64 535.908 1626.3 535.908 1627.19ZM538.832 1624.72H541.592V1630.42H543.73V1631.26H538.375V1630.42H540.514V1625.56H538.832V1624.72ZM540.514 1622.17H541.592V1623.53H540.514V1622.17ZM549.238 1627.92C549.238 1627.12 549.105 1626.5 548.84 1626.09C548.578 1625.66 548.195 1625.45 547.691 1625.45C547.164 1625.45 546.762 1625.66 546.484 1626.09C546.207 1626.5 546.068 1627.12 546.068 1627.92C546.068 1628.73 546.207 1629.35 546.484 1629.78C546.766 1630.2 547.172 1630.41 547.703 1630.41C548.199 1630.41 548.578 1630.2 548.84 1629.77C549.105 1629.34 549.238 1628.73 549.238 1627.92ZM550.316 1630.84C550.316 1631.82 550.084 1632.57 549.619 1633.08C549.154 1633.58 548.471 1633.84 547.568 1633.84C547.271 1633.84 546.961 1633.81 546.637 1633.76C546.312 1633.7 545.988 1633.62 545.664 1633.51V1632.45C546.047 1632.63 546.395 1632.76 546.707 1632.85C547.02 1632.93 547.307 1632.98 547.568 1632.98C548.15 1632.98 548.574 1632.82 548.84 1632.5C549.105 1632.18 549.238 1631.68 549.238 1631V1630.95V1630.22C549.066 1630.58 548.832 1630.86 548.535 1631.04C548.238 1631.22 547.877 1631.31 547.451 1631.31C546.686 1631.31 546.074 1631 545.617 1630.39C545.16 1629.77 544.932 1628.95 544.932 1627.92C544.932 1626.89 545.16 1626.07 545.617 1625.46C546.074 1624.84 546.686 1624.54 547.451 1624.54C547.873 1624.54 548.23 1624.62 548.523 1624.79C548.816 1624.96 549.055 1625.22 549.238 1625.57V1624.72H550.316V1630.84ZM557.6 1627.19V1631.26H556.516V1627.19C556.516 1626.6 556.412 1626.17 556.205 1625.89C555.998 1625.61 555.674 1625.48 555.232 1625.48C554.729 1625.48 554.34 1625.66 554.066 1626.01C553.797 1626.37 553.662 1626.88 553.662 1627.55V1631.26H552.584V1622.14H553.662V1625.68C553.854 1625.31 554.113 1625.02 554.441 1624.83C554.77 1624.64 555.158 1624.54 555.607 1624.54C556.275 1624.54 556.773 1624.76 557.102 1625.2C557.434 1625.64 557.6 1626.3 557.6 1627.19ZM572.119 1630.92C571.83 1631.09 571.531 1631.22 571.223 1631.3C570.918 1631.39 570.605 1631.43 570.285 1631.43C569.27 1631.43 568.475 1631.12 567.9 1630.51C567.33 1629.91 567.045 1629.06 567.045 1627.98C567.045 1626.91 567.33 1626.06 567.9 1625.45C568.475 1624.84 569.27 1624.54 570.285 1624.54C570.602 1624.54 570.91 1624.58 571.211 1624.66C571.512 1624.74 571.814 1624.87 572.119 1625.04V1626.17C571.834 1625.92 571.547 1625.74 571.258 1625.62C570.973 1625.51 570.648 1625.45 570.285 1625.45C569.609 1625.45 569.09 1625.67 568.727 1626.11C568.363 1626.55 568.182 1627.17 568.182 1627.98C568.182 1628.79 568.363 1629.42 568.727 1629.86C569.094 1630.3 569.613 1630.51 570.285 1630.51C570.66 1630.51 570.996 1630.46 571.293 1630.34C571.59 1630.23 571.865 1630.05 572.119 1629.81V1630.92ZM576.742 1625.45C576.195 1625.45 575.781 1625.67 575.5 1626.09C575.219 1626.52 575.078 1627.15 575.078 1627.98C575.078 1628.82 575.219 1629.45 575.5 1629.88C575.781 1630.3 576.195 1630.51 576.742 1630.51C577.293 1630.51 577.709 1630.3 577.99 1629.88C578.271 1629.45 578.412 1628.82 578.412 1627.98C578.412 1627.15 578.271 1626.52 577.99 1626.09C577.709 1625.67 577.293 1625.45 576.742 1625.45ZM576.742 1624.54C577.652 1624.54 578.348 1624.83 578.828 1625.42C579.312 1626.01 579.555 1626.87 579.555 1627.98C579.555 1629.1 579.314 1629.96 578.834 1630.55C578.354 1631.14 577.656 1631.43 576.742 1631.43C575.832 1631.43 575.137 1631.14 574.656 1630.55C574.176 1629.96 573.936 1629.1 573.936 1627.98C573.936 1626.87 574.176 1626.01 574.656 1625.42C575.137 1624.83 575.832 1624.54 576.742 1624.54ZM586.521 1627.19V1631.26H585.438V1627.19C585.438 1626.6 585.334 1626.17 585.127 1625.89C584.92 1625.61 584.596 1625.48 584.154 1625.48C583.65 1625.48 583.262 1625.66 582.988 1626.01C582.719 1626.37 582.584 1626.88 582.584 1627.55V1631.26H581.506V1624.7H582.584V1625.68C582.775 1625.31 583.035 1625.02 583.363 1624.83C583.691 1624.64 584.08 1624.54 584.529 1624.54C585.197 1624.54 585.695 1624.76 586.023 1625.2C586.355 1625.64 586.521 1626.3 586.521 1627.19ZM591.191 1622.83V1624.7H593.641V1625.53H591.191V1629.1C591.191 1629.58 591.283 1629.92 591.467 1630.11C591.65 1630.3 591.971 1630.4 592.428 1630.4H593.641V1631.26H592.322C591.514 1631.26 590.943 1631.1 590.611 1630.77C590.279 1630.45 590.113 1629.89 590.113 1629.1V1625.53H588.361V1624.7H590.113V1622.83H591.191ZM601.592 1626.05C601.361 1625.87 601.127 1625.74 600.889 1625.66C600.65 1625.58 600.389 1625.53 600.104 1625.53C599.432 1625.53 598.918 1625.75 598.562 1626.17C598.207 1626.59 598.029 1627.2 598.029 1628V1631.26H596.945V1624.7H598.029V1625.98C598.209 1625.51 598.484 1625.16 598.855 1624.91C599.23 1624.66 599.674 1624.54 600.186 1624.54C600.451 1624.54 600.699 1624.57 600.93 1624.64C601.16 1624.7 601.381 1624.81 601.592 1624.95V1626.05ZM606.168 1627.96H605.811C605.182 1627.96 604.707 1628.07 604.387 1628.29C604.07 1628.51 603.912 1628.84 603.912 1629.28C603.912 1629.67 604.031 1629.98 604.27 1630.2C604.508 1630.42 604.838 1630.53 605.26 1630.53C605.854 1630.53 606.32 1630.32 606.66 1629.91C607 1629.5 607.172 1628.93 607.176 1628.2V1627.96H606.168ZM608.26 1627.51V1631.26H607.176V1630.29C606.945 1630.68 606.654 1630.97 606.303 1631.15C605.955 1631.34 605.531 1631.43 605.031 1631.43C604.363 1631.43 603.83 1631.24 603.432 1630.87C603.033 1630.49 602.834 1629.98 602.834 1629.35C602.834 1628.62 603.078 1628.06 603.566 1627.68C604.059 1627.31 604.779 1627.12 605.729 1627.12H607.176V1626.95C607.172 1626.42 607.039 1626.04 606.777 1625.81C606.516 1625.57 606.098 1625.45 605.523 1625.45C605.156 1625.45 604.785 1625.51 604.41 1625.61C604.035 1625.72 603.67 1625.87 603.314 1626.07V1625C603.713 1624.84 604.094 1624.73 604.457 1624.66C604.824 1624.58 605.18 1624.54 605.523 1624.54C606.066 1624.54 606.529 1624.62 606.912 1624.78C607.299 1624.94 607.611 1625.18 607.85 1625.5C607.998 1625.69 608.104 1625.94 608.166 1626.23C608.229 1626.51 608.26 1626.94 608.26 1627.51ZM614.986 1624.92V1625.98C614.678 1625.8 614.367 1625.67 614.055 1625.58C613.742 1625.49 613.424 1625.44 613.1 1625.44C612.611 1625.44 612.246 1625.52 612.004 1625.68C611.766 1625.84 611.646 1626.08 611.646 1626.4C611.646 1626.69 611.736 1626.91 611.916 1627.06C612.096 1627.2 612.543 1627.34 613.258 1627.48L613.691 1627.56C614.227 1627.66 614.631 1627.87 614.904 1628.17C615.182 1628.48 615.32 1628.87 615.32 1629.36C615.32 1630.01 615.09 1630.52 614.629 1630.88C614.168 1631.25 613.527 1631.43 612.707 1631.43C612.383 1631.43 612.043 1631.39 611.688 1631.32C611.332 1631.26 610.947 1631.16 610.533 1631.02V1629.91C610.936 1630.11 611.32 1630.27 611.688 1630.37C612.055 1630.48 612.402 1630.53 612.73 1630.53C613.207 1630.53 613.576 1630.43 613.838 1630.24C614.1 1630.04 614.23 1629.77 614.23 1629.42C614.23 1628.92 613.752 1628.58 612.795 1628.39L612.748 1628.38L612.344 1628.29C611.723 1628.17 611.27 1627.97 610.984 1627.68C610.699 1627.4 610.557 1627 610.557 1626.51C610.557 1625.88 610.77 1625.39 611.195 1625.05C611.621 1624.71 612.229 1624.54 613.018 1624.54C613.369 1624.54 613.707 1624.57 614.031 1624.64C614.355 1624.7 614.674 1624.8 614.986 1624.92ZM620.113 1622.83V1624.7H622.562V1625.53H620.113V1629.1C620.113 1629.58 620.205 1629.92 620.389 1630.11C620.572 1630.3 620.893 1630.4 621.35 1630.4H622.562V1631.26H621.244C620.436 1631.26 619.865 1631.1 619.533 1630.77C619.201 1630.45 619.035 1629.89 619.035 1629.1V1625.53H617.283V1624.7H619.035V1622.83H620.113ZM634.574 1622.83V1624.7H637.023V1625.53H634.574V1629.1C634.574 1629.58 634.666 1629.92 634.85 1630.11C635.033 1630.3 635.354 1630.4 635.811 1630.4H637.023V1631.26H635.705C634.896 1631.26 634.326 1631.1 633.994 1630.77C633.662 1630.45 633.496 1629.89 633.496 1629.1V1625.53H631.744V1624.7H633.496V1622.83H634.574ZM644.365 1627.19V1631.26H643.281V1627.19C643.281 1626.6 643.178 1626.17 642.971 1625.89C642.764 1625.61 642.439 1625.48 641.998 1625.48C641.494 1625.48 641.105 1625.66 640.832 1626.01C640.562 1626.37 640.428 1626.88 640.428 1627.55V1631.26H639.35V1622.14H640.428V1625.68C640.619 1625.31 640.879 1625.02 641.207 1624.83C641.535 1624.64 641.924 1624.54 642.373 1624.54C643.041 1624.54 643.539 1624.76 643.867 1625.2C644.199 1625.64 644.365 1626.3 644.365 1627.19ZM652 1627.44V1627.97H647.33V1628C647.299 1628.9 647.469 1629.54 647.84 1629.93C648.215 1630.32 648.742 1630.51 649.422 1630.51C649.766 1630.51 650.125 1630.46 650.5 1630.35C650.875 1630.24 651.275 1630.08 651.701 1629.85V1630.92C651.291 1631.09 650.895 1631.22 650.512 1631.3C650.133 1631.39 649.766 1631.43 649.41 1631.43C648.391 1631.43 647.594 1631.12 647.02 1630.51C646.445 1629.9 646.158 1629.06 646.158 1627.98C646.158 1626.94 646.439 1626.1 647.002 1625.48C647.564 1624.85 648.314 1624.54 649.252 1624.54C650.088 1624.54 650.746 1624.82 651.227 1625.39C651.711 1625.95 651.969 1626.64 652 1627.44ZM650.922 1627.12C650.875 1626.67 650.709 1626.28 650.424 1625.95C650.143 1625.62 649.736 1625.45 649.205 1625.45C648.686 1625.45 648.258 1625.62 647.922 1625.97C647.586 1626.31 647.402 1626.7 647.371 1627.13L650.922 1627.12ZM656.629 1625.36C656.762 1625.08 656.93 1624.88 657.133 1624.74C657.34 1624.61 657.588 1624.54 657.877 1624.54C658.404 1624.54 658.775 1624.74 658.99 1625.15C659.209 1625.56 659.318 1626.33 659.318 1627.46V1631.26H658.334V1627.5C658.334 1626.58 658.281 1626 658.176 1625.78C658.074 1625.55 657.887 1625.44 657.613 1625.44C657.301 1625.44 657.086 1625.56 656.969 1625.8C656.855 1626.04 656.799 1626.61 656.799 1627.5V1631.26H655.814V1627.5C655.814 1626.57 655.758 1625.99 655.645 1625.77C655.535 1625.55 655.336 1625.44 655.047 1625.44C654.762 1625.44 654.562 1625.56 654.449 1625.8C654.34 1626.04 654.285 1626.61 654.285 1627.5V1631.26H653.307V1624.7H654.285V1625.26C654.414 1625.02 654.574 1624.85 654.766 1624.73C654.961 1624.6 655.182 1624.54 655.428 1624.54C655.725 1624.54 655.971 1624.61 656.166 1624.74C656.365 1624.88 656.52 1625.09 656.629 1625.36ZM666.461 1627.44V1627.97H661.791V1628C661.76 1628.9 661.93 1629.54 662.301 1629.93C662.676 1630.32 663.203 1630.51 663.883 1630.51C664.227 1630.51 664.586 1630.46 664.961 1630.35C665.336 1630.24 665.736 1630.08 666.162 1629.85V1630.92C665.752 1631.09 665.355 1631.22 664.973 1631.3C664.594 1631.39 664.227 1631.43 663.871 1631.43C662.852 1631.43 662.055 1631.12 661.48 1630.51C660.906 1629.9 660.619 1629.06 660.619 1627.98C660.619 1626.94 660.9 1626.1 661.463 1625.48C662.025 1624.85 662.775 1624.54 663.713 1624.54C664.549 1624.54 665.207 1624.82 665.688 1625.39C666.172 1625.95 666.43 1626.64 666.461 1627.44ZM665.383 1627.12C665.336 1626.67 665.17 1626.28 664.885 1625.95C664.604 1625.62 664.197 1625.45 663.666 1625.45C663.146 1625.45 662.719 1625.62 662.383 1625.97C662.047 1626.31 661.863 1626.7 661.832 1627.13L665.383 1627.12ZM672.83 1624.92V1625.98C672.521 1625.8 672.211 1625.67 671.898 1625.58C671.586 1625.49 671.268 1625.44 670.943 1625.44C670.455 1625.44 670.09 1625.52 669.848 1625.68C669.609 1625.84 669.49 1626.08 669.49 1626.4C669.49 1626.69 669.58 1626.91 669.76 1627.06C669.939 1627.2 670.387 1627.34 671.102 1627.48L671.535 1627.56C672.07 1627.66 672.475 1627.87 672.748 1628.17C673.025 1628.48 673.164 1628.87 673.164 1629.36C673.164 1630.01 672.934 1630.52 672.473 1630.88C672.012 1631.25 671.371 1631.43 670.551 1631.43C670.227 1631.43 669.887 1631.39 669.531 1631.32C669.176 1631.26 668.791 1631.16 668.377 1631.02V1629.91C668.779 1630.11 669.164 1630.27 669.531 1630.37C669.898 1630.48 670.246 1630.53 670.574 1630.53C671.051 1630.53 671.42 1630.43 671.682 1630.24C671.943 1630.04 672.074 1629.77 672.074 1629.42C672.074 1628.92 671.596 1628.58 670.639 1628.39L670.592 1628.38L670.188 1628.29C669.566 1628.17 669.113 1627.97 668.828 1627.68C668.543 1627.4 668.4 1627 668.4 1626.51C668.4 1625.88 668.613 1625.39 669.039 1625.05C669.465 1624.71 670.072 1624.54 670.861 1624.54C671.213 1624.54 671.551 1624.57 671.875 1624.64C672.199 1624.7 672.518 1624.8 672.83 1624.92ZM679.896 1622.19V1625.78H678.584V1622.19H679.896ZM676.773 1622.19V1625.78H675.461V1622.19H676.773ZM209.916 1640.19V1643.78H208.604V1640.19H209.916ZM206.793 1640.19V1643.78H205.48V1640.19H206.793ZM216.818 1640.51H217.932L213.326 1650.37H212.207L216.818 1640.51ZM220.691 1642.72H223.451V1648.42H225.59V1649.26H220.234V1648.42H222.373V1643.56H220.691V1642.72ZM222.373 1640.17H223.451V1641.53H222.373V1640.17ZM230.031 1643.36C230.164 1643.08 230.332 1642.88 230.535 1642.74C230.742 1642.61 230.99 1642.54 231.279 1642.54C231.807 1642.54 232.178 1642.74 232.393 1643.15C232.611 1643.56 232.721 1644.33 232.721 1645.46V1649.26H231.736V1645.5C231.736 1644.58 231.684 1644 231.578 1643.78C231.477 1643.55 231.289 1643.44 231.016 1643.44C230.703 1643.44 230.488 1643.56 230.371 1643.8C230.258 1644.04 230.201 1644.61 230.201 1645.5V1649.26H229.217V1645.5C229.217 1644.57 229.16 1643.99 229.047 1643.77C228.938 1643.55 228.738 1643.44 228.449 1643.44C228.164 1643.44 227.965 1643.56 227.852 1643.8C227.742 1644.04 227.688 1644.61 227.688 1645.5V1649.26H226.709V1642.7H227.688V1643.26C227.816 1643.02 227.977 1642.85 228.168 1642.73C228.363 1642.6 228.584 1642.54 228.83 1642.54C229.127 1642.54 229.373 1642.61 229.568 1642.74C229.768 1642.88 229.922 1643.09 230.031 1643.36ZM237.414 1645.96H237.057C236.428 1645.96 235.953 1646.07 235.633 1646.29C235.316 1646.51 235.158 1646.84 235.158 1647.28C235.158 1647.67 235.277 1647.98 235.516 1648.2C235.754 1648.42 236.084 1648.53 236.506 1648.53C237.1 1648.53 237.566 1648.32 237.906 1647.91C238.246 1647.5 238.418 1646.93 238.422 1646.2V1645.96H237.414ZM239.506 1645.51V1649.26H238.422V1648.29C238.191 1648.68 237.9 1648.97 237.549 1649.15C237.201 1649.34 236.777 1649.43 236.277 1649.43C235.609 1649.43 235.076 1649.24 234.678 1648.87C234.279 1648.49 234.08 1647.98 234.08 1647.35C234.08 1646.62 234.324 1646.06 234.812 1645.68C235.305 1645.31 236.025 1645.12 236.975 1645.12H238.422V1644.95C238.418 1644.42 238.285 1644.04 238.023 1643.81C237.762 1643.57 237.344 1643.45 236.77 1643.45C236.402 1643.45 236.031 1643.51 235.656 1643.61C235.281 1643.72 234.916 1643.87 234.561 1644.07V1643C234.959 1642.84 235.34 1642.73 235.703 1642.66C236.07 1642.58 236.426 1642.54 236.77 1642.54C237.312 1642.54 237.775 1642.62 238.158 1642.78C238.545 1642.94 238.857 1643.18 239.096 1643.5C239.244 1643.69 239.35 1643.94 239.412 1644.23C239.475 1644.51 239.506 1644.94 239.506 1645.51ZM245.559 1645.92C245.559 1645.12 245.426 1644.5 245.16 1644.09C244.898 1643.66 244.516 1643.45 244.012 1643.45C243.484 1643.45 243.082 1643.66 242.805 1644.09C242.527 1644.5 242.389 1645.12 242.389 1645.92C242.389 1646.73 242.527 1647.35 242.805 1647.78C243.086 1648.2 243.492 1648.41 244.023 1648.41C244.52 1648.41 244.898 1648.2 245.16 1647.77C245.426 1647.34 245.559 1646.73 245.559 1645.92ZM246.637 1648.84C246.637 1649.82 246.404 1650.57 245.939 1651.08C245.475 1651.58 244.791 1651.84 243.889 1651.84C243.592 1651.84 243.281 1651.81 242.957 1651.76C242.633 1651.7 242.309 1651.62 241.984 1651.51V1650.45C242.367 1650.63 242.715 1650.76 243.027 1650.85C243.34 1650.93 243.627 1650.98 243.889 1650.98C244.471 1650.98 244.895 1650.82 245.16 1650.5C245.426 1650.18 245.559 1649.68 245.559 1649V1648.95V1648.22C245.387 1648.58 245.152 1648.86 244.855 1649.04C244.559 1649.22 244.197 1649.31 243.771 1649.31C243.006 1649.31 242.395 1649 241.938 1648.39C241.48 1647.77 241.252 1646.95 241.252 1645.92C241.252 1644.89 241.48 1644.07 241.938 1643.46C242.395 1642.84 243.006 1642.54 243.771 1642.54C244.193 1642.54 244.551 1642.62 244.844 1642.79C245.137 1642.96 245.375 1643.22 245.559 1643.57V1642.72H246.637V1648.84ZM254.324 1645.44V1645.97H249.654V1646C249.623 1646.9 249.793 1647.54 250.164 1647.93C250.539 1648.32 251.066 1648.51 251.746 1648.51C252.09 1648.51 252.449 1648.46 252.824 1648.35C253.199 1648.24 253.6 1648.08 254.025 1647.85V1648.92C253.615 1649.09 253.219 1649.22 252.836 1649.3C252.457 1649.39 252.09 1649.43 251.734 1649.43C250.715 1649.43 249.918 1649.12 249.344 1648.51C248.77 1647.9 248.482 1647.06 248.482 1645.98C248.482 1644.94 248.764 1644.1 249.326 1643.48C249.889 1642.85 250.639 1642.54 251.576 1642.54C252.412 1642.54 253.07 1642.82 253.551 1643.39C254.035 1643.95 254.293 1644.64 254.324 1645.44ZM253.246 1645.12C253.199 1644.67 253.033 1644.28 252.748 1643.95C252.467 1643.62 252.061 1643.45 251.529 1643.45C251.01 1643.45 250.582 1643.62 250.246 1643.97C249.91 1644.31 249.727 1644.7 249.695 1645.13L253.246 1645.12ZM260.693 1642.92V1643.98C260.385 1643.8 260.074 1643.67 259.762 1643.58C259.449 1643.49 259.131 1643.44 258.807 1643.44C258.318 1643.44 257.953 1643.52 257.711 1643.68C257.473 1643.84 257.354 1644.08 257.354 1644.4C257.354 1644.69 257.443 1644.91 257.623 1645.06C257.803 1645.2 258.25 1645.34 258.965 1645.48L259.398 1645.56C259.934 1645.66 260.338 1645.87 260.611 1646.17C260.889 1646.48 261.027 1646.87 261.027 1647.36C261.027 1648.01 260.797 1648.52 260.336 1648.88C259.875 1649.25 259.234 1649.43 258.414 1649.43C258.09 1649.43 257.75 1649.39 257.395 1649.32C257.039 1649.26 256.654 1649.16 256.24 1649.02V1647.91C256.643 1648.11 257.027 1648.27 257.395 1648.37C257.762 1648.48 258.109 1648.53 258.438 1648.53C258.914 1648.53 259.283 1648.43 259.545 1648.24C259.807 1648.04 259.938 1647.77 259.938 1647.42C259.938 1646.92 259.459 1646.58 258.502 1646.39L258.455 1646.38L258.051 1646.29C257.43 1646.17 256.977 1645.97 256.691 1645.68C256.406 1645.4 256.264 1645 256.264 1644.51C256.264 1643.88 256.477 1643.39 256.902 1643.05C257.328 1642.71 257.936 1642.54 258.725 1642.54C259.076 1642.54 259.414 1642.57 259.738 1642.64C260.062 1642.7 260.381 1642.8 260.693 1642.92ZM267.432 1640.51H268.545L263.939 1650.37H262.82L267.432 1640.51ZM270.039 1642.7H271.158L273.062 1648.2L274.973 1642.7H276.092L273.76 1649.26H272.371L270.039 1642.7ZM282.385 1642.92V1643.98C282.076 1643.8 281.766 1643.67 281.453 1643.58C281.141 1643.49 280.822 1643.44 280.498 1643.44C280.01 1643.44 279.645 1643.52 279.402 1643.68C279.164 1643.84 279.045 1644.08 279.045 1644.4C279.045 1644.69 279.135 1644.91 279.314 1645.06C279.494 1645.2 279.941 1645.34 280.656 1645.48L281.09 1645.56C281.625 1645.66 282.029 1645.87 282.303 1646.17C282.58 1646.48 282.719 1646.87 282.719 1647.36C282.719 1648.01 282.488 1648.52 282.027 1648.88C281.566 1649.25 280.926 1649.43 280.105 1649.43C279.781 1649.43 279.441 1649.39 279.086 1649.32C278.73 1649.26 278.346 1649.16 277.932 1649.02V1647.91C278.334 1648.11 278.719 1648.27 279.086 1648.37C279.453 1648.48 279.801 1648.53 280.129 1648.53C280.605 1648.53 280.975 1648.43 281.236 1648.24C281.498 1648.04 281.629 1647.77 281.629 1647.42C281.629 1646.92 281.15 1646.58 280.193 1646.39L280.146 1646.38L279.742 1646.29C279.121 1646.17 278.668 1645.97 278.383 1645.68C278.098 1645.4 277.955 1645 277.955 1644.51C277.955 1643.88 278.168 1643.39 278.594 1643.05C279.02 1642.71 279.627 1642.54 280.416 1642.54C280.768 1642.54 281.105 1642.57 281.43 1642.64C281.754 1642.7 282.072 1642.8 282.385 1642.92ZM290.131 1648.92C289.842 1649.09 289.543 1649.22 289.234 1649.3C288.93 1649.39 288.617 1649.43 288.297 1649.43C287.281 1649.43 286.486 1649.12 285.912 1648.51C285.342 1647.91 285.057 1647.06 285.057 1645.98C285.057 1644.91 285.342 1644.06 285.912 1643.45C286.486 1642.84 287.281 1642.54 288.297 1642.54C288.613 1642.54 288.922 1642.58 289.223 1642.66C289.523 1642.74 289.826 1642.87 290.131 1643.04V1644.17C289.846 1643.92 289.559 1643.74 289.27 1643.62C288.984 1643.51 288.66 1643.45 288.297 1643.45C287.621 1643.45 287.102 1643.67 286.738 1644.11C286.375 1644.55 286.193 1645.17 286.193 1645.98C286.193 1646.79 286.375 1647.42 286.738 1647.86C287.105 1648.3 287.625 1648.51 288.297 1648.51C288.672 1648.51 289.008 1648.46 289.305 1648.34C289.602 1648.23 289.877 1648.05 290.131 1647.81V1648.92ZM294.754 1643.45C294.207 1643.45 293.793 1643.67 293.512 1644.09C293.23 1644.52 293.09 1645.15 293.09 1645.98C293.09 1646.82 293.23 1647.45 293.512 1647.88C293.793 1648.3 294.207 1648.51 294.754 1648.51C295.305 1648.51 295.721 1648.3 296.002 1647.88C296.283 1647.45 296.424 1646.82 296.424 1645.98C296.424 1645.15 296.283 1644.52 296.002 1644.09C295.721 1643.67 295.305 1643.45 294.754 1643.45ZM294.754 1642.54C295.664 1642.54 296.359 1642.83 296.84 1643.42C297.324 1644.01 297.566 1644.87 297.566 1645.98C297.566 1647.1 297.326 1647.96 296.846 1648.55C296.365 1649.14 295.668 1649.43 294.754 1649.43C293.844 1649.43 293.148 1649.14 292.668 1648.55C292.188 1647.96 291.947 1647.1 291.947 1645.98C291.947 1644.87 292.188 1644.01 292.668 1643.42C293.148 1642.83 293.844 1642.54 294.754 1642.54ZM303.402 1643.53V1640.14H304.48V1649.26H303.402V1648.43C303.223 1648.76 302.982 1649.01 302.682 1649.18C302.385 1649.34 302.041 1649.43 301.65 1649.43C300.857 1649.43 300.232 1649.12 299.775 1648.51C299.322 1647.89 299.096 1647.04 299.096 1645.96C299.096 1644.89 299.324 1644.06 299.781 1643.45C300.238 1642.84 300.861 1642.54 301.65 1642.54C302.045 1642.54 302.393 1642.62 302.693 1642.8C302.994 1642.96 303.23 1643.21 303.402 1643.53ZM300.232 1645.98C300.232 1646.82 300.365 1647.45 300.631 1647.88C300.896 1648.3 301.289 1648.51 301.809 1648.51C302.328 1648.51 302.723 1648.3 302.992 1647.87C303.266 1647.44 303.402 1646.81 303.402 1645.98C303.402 1645.15 303.266 1644.52 302.992 1644.1C302.723 1643.67 302.328 1643.45 301.809 1643.45C301.289 1643.45 300.896 1643.67 300.631 1644.09C300.365 1644.52 300.232 1645.15 300.232 1645.98ZM312.168 1645.44V1645.97H307.498V1646C307.467 1646.9 307.637 1647.54 308.008 1647.93C308.383 1648.32 308.91 1648.51 309.59 1648.51C309.934 1648.51 310.293 1648.46 310.668 1648.35C311.043 1648.24 311.443 1648.08 311.869 1647.85V1648.92C311.459 1649.09 311.062 1649.22 310.68 1649.3C310.301 1649.39 309.934 1649.43 309.578 1649.43C308.559 1649.43 307.762 1649.12 307.188 1648.51C306.613 1647.9 306.326 1647.06 306.326 1645.98C306.326 1644.94 306.607 1644.1 307.17 1643.48C307.732 1642.85 308.482 1642.54 309.42 1642.54C310.256 1642.54 310.914 1642.82 311.395 1643.39C311.879 1643.95 312.137 1644.64 312.168 1645.44ZM311.09 1645.12C311.043 1644.67 310.877 1644.28 310.592 1643.95C310.311 1643.62 309.904 1643.45 309.373 1643.45C308.854 1643.45 308.426 1643.62 308.09 1643.97C307.754 1644.31 307.57 1644.7 307.539 1645.13L311.09 1645.12ZM313.434 1645.02H319.645V1646.01H313.434V1645.02ZM323.664 1640.83V1642.7H326.113V1643.53H323.664V1647.1C323.664 1647.58 323.756 1647.92 323.939 1648.11C324.123 1648.3 324.443 1648.4 324.9 1648.4H326.113V1649.26H324.795C323.986 1649.26 323.416 1649.1 323.084 1648.77C322.752 1648.45 322.586 1647.89 322.586 1647.1V1643.53H320.834V1642.7H322.586V1640.83H323.664ZM333.455 1645.19V1649.26H332.371V1645.19C332.371 1644.6 332.268 1644.17 332.061 1643.89C331.854 1643.61 331.529 1643.48 331.088 1643.48C330.584 1643.48 330.195 1643.66 329.922 1644.01C329.652 1644.37 329.518 1644.88 329.518 1645.55V1649.26H328.439V1640.14H329.518V1643.68C329.709 1643.31 329.969 1643.02 330.297 1642.83C330.625 1642.64 331.014 1642.54 331.463 1642.54C332.131 1642.54 332.629 1642.76 332.957 1643.2C333.289 1643.64 333.455 1644.3 333.455 1645.19ZM341.09 1645.44V1645.97H336.42V1646C336.389 1646.9 336.559 1647.54 336.93 1647.93C337.305 1648.32 337.832 1648.51 338.512 1648.51C338.855 1648.51 339.215 1648.46 339.59 1648.35C339.965 1648.24 340.365 1648.08 340.791 1647.85V1648.92C340.381 1649.09 339.984 1649.22 339.602 1649.3C339.223 1649.39 338.855 1649.43 338.5 1649.43C337.48 1649.43 336.684 1649.12 336.109 1648.51C335.535 1647.9 335.248 1647.06 335.248 1645.98C335.248 1644.94 335.529 1644.1 336.092 1643.48C336.654 1642.85 337.404 1642.54 338.342 1642.54C339.178 1642.54 339.836 1642.82 340.316 1643.39C340.801 1643.95 341.059 1644.64 341.09 1645.44ZM340.012 1645.12C339.965 1644.67 339.799 1644.28 339.514 1643.95C339.232 1643.62 338.826 1643.45 338.295 1643.45C337.775 1643.45 337.348 1643.62 337.012 1643.97C336.676 1644.31 336.492 1644.7 336.461 1645.13L340.012 1645.12ZM345.719 1643.36C345.852 1643.08 346.02 1642.88 346.223 1642.74C346.43 1642.61 346.678 1642.54 346.967 1642.54C347.494 1642.54 347.865 1642.74 348.08 1643.15C348.299 1643.56 348.408 1644.33 348.408 1645.46V1649.26H347.424V1645.5C347.424 1644.58 347.371 1644 347.266 1643.78C347.164 1643.55 346.977 1643.44 346.703 1643.44C346.391 1643.44 346.176 1643.56 346.059 1643.8C345.945 1644.04 345.889 1644.61 345.889 1645.5V1649.26H344.904V1645.5C344.904 1644.57 344.848 1643.99 344.734 1643.77C344.625 1643.55 344.426 1643.44 344.137 1643.44C343.852 1643.44 343.652 1643.56 343.539 1643.8C343.43 1644.04 343.375 1644.61 343.375 1645.5V1649.26H342.396V1642.7H343.375V1643.26C343.504 1643.02 343.664 1642.85 343.855 1642.73C344.051 1642.6 344.271 1642.54 344.518 1642.54C344.814 1642.54 345.061 1642.61 345.256 1642.74C345.455 1642.88 345.609 1643.09 345.719 1643.36ZM355.551 1645.44V1645.97H350.881V1646C350.85 1646.9 351.02 1647.54 351.391 1647.93C351.766 1648.32 352.293 1648.51 352.973 1648.51C353.316 1648.51 353.676 1648.46 354.051 1648.35C354.426 1648.24 354.826 1648.08 355.252 1647.85V1648.92C354.842 1649.09 354.445 1649.22 354.062 1649.3C353.684 1649.39 353.316 1649.43 352.961 1649.43C351.941 1649.43 351.145 1649.12 350.57 1648.51C349.996 1647.9 349.709 1647.06 349.709 1645.98C349.709 1644.94 349.99 1644.1 350.553 1643.48C351.115 1642.85 351.865 1642.54 352.803 1642.54C353.639 1642.54 354.297 1642.82 354.777 1643.39C355.262 1643.95 355.52 1644.64 355.551 1645.44ZM354.473 1645.12C354.426 1644.67 354.26 1644.28 353.975 1643.95C353.693 1643.62 353.287 1643.45 352.756 1643.45C352.236 1643.45 351.809 1643.62 351.473 1643.97C351.137 1644.31 350.953 1644.7 350.922 1645.13L354.473 1645.12ZM356.816 1645.02H363.027V1646.01H356.816V1645.02ZM368.477 1643.53V1640.14H369.555V1649.26H368.477V1648.43C368.297 1648.76 368.057 1649.01 367.756 1649.18C367.459 1649.34 367.115 1649.43 366.725 1649.43C365.932 1649.43 365.307 1649.12 364.85 1648.51C364.396 1647.89 364.17 1647.04 364.17 1645.96C364.17 1644.89 364.398 1644.06 364.855 1643.45C365.312 1642.84 365.936 1642.54 366.725 1642.54C367.119 1642.54 367.467 1642.62 367.768 1642.8C368.068 1642.96 368.305 1643.21 368.477 1643.53ZM365.307 1645.98C365.307 1646.82 365.439 1647.45 365.705 1647.88C365.971 1648.3 366.363 1648.51 366.883 1648.51C367.402 1648.51 367.797 1648.3 368.066 1647.87C368.34 1647.44 368.477 1646.81 368.477 1645.98C368.477 1645.15 368.34 1644.52 368.066 1644.1C367.797 1643.67 367.402 1643.45 366.883 1643.45C366.363 1643.45 365.971 1643.67 365.705 1644.09C365.439 1644.52 365.307 1645.15 365.307 1645.98ZM374.793 1645.96H374.436C373.807 1645.96 373.332 1646.07 373.012 1646.29C372.695 1646.51 372.537 1646.84 372.537 1647.28C372.537 1647.67 372.656 1647.98 372.895 1648.2C373.133 1648.42 373.463 1648.53 373.885 1648.53C374.479 1648.53 374.945 1648.32 375.285 1647.91C375.625 1647.5 375.797 1646.93 375.801 1646.2V1645.96H374.793ZM376.885 1645.51V1649.26H375.801V1648.29C375.57 1648.68 375.279 1648.97 374.928 1649.15C374.58 1649.34 374.156 1649.43 373.656 1649.43C372.988 1649.43 372.455 1649.24 372.057 1648.87C371.658 1648.49 371.459 1647.98 371.459 1647.35C371.459 1646.62 371.703 1646.06 372.191 1645.68C372.684 1645.31 373.404 1645.12 374.354 1645.12H375.801V1644.95C375.797 1644.42 375.664 1644.04 375.402 1643.81C375.141 1643.57 374.723 1643.45 374.148 1643.45C373.781 1643.45 373.41 1643.51 373.035 1643.61C372.66 1643.72 372.295 1643.87 371.939 1644.07V1643C372.338 1642.84 372.719 1642.73 373.082 1642.66C373.449 1642.58 373.805 1642.54 374.148 1642.54C374.691 1642.54 375.154 1642.62 375.537 1642.78C375.924 1642.94 376.236 1643.18 376.475 1643.5C376.623 1643.69 376.729 1643.94 376.791 1644.23C376.854 1644.51 376.885 1644.94 376.885 1645.51ZM384.678 1644.05C384.447 1643.87 384.213 1643.74 383.975 1643.66C383.736 1643.58 383.475 1643.53 383.189 1643.53C382.518 1643.53 382.004 1643.75 381.648 1644.17C381.293 1644.59 381.115 1645.2 381.115 1646V1649.26H380.031V1642.7H381.115V1643.98C381.295 1643.51 381.57 1643.16 381.941 1642.91C382.316 1642.66 382.76 1642.54 383.271 1642.54C383.537 1642.54 383.785 1642.57 384.016 1642.64C384.246 1642.7 384.467 1642.81 384.678 1642.95V1644.05ZM386.523 1640.14H387.637V1645.42L390.467 1642.7H391.779L389.195 1645.17L392.184 1649.26H390.865L388.439 1645.87L387.637 1646.63V1649.26H386.523V1640.14ZM394.65 1646.89H396.713V1649.26H394.65V1646.89ZM401.799 1648.43V1651.76H400.715V1642.7H401.799V1643.53C401.979 1643.21 402.217 1642.96 402.514 1642.8C402.814 1642.62 403.16 1642.54 403.551 1642.54C404.344 1642.54 404.965 1642.84 405.414 1643.46C405.867 1644.07 406.094 1644.92 406.094 1646.01C406.094 1647.07 405.867 1647.91 405.414 1648.52C404.961 1649.13 404.34 1649.43 403.551 1649.43C403.152 1649.43 402.803 1649.34 402.502 1649.18C402.205 1649.01 401.971 1648.76 401.799 1648.43ZM404.963 1645.98C404.963 1645.15 404.83 1644.52 404.564 1644.09C404.303 1643.67 403.912 1643.45 403.393 1643.45C402.869 1643.45 402.473 1643.67 402.203 1644.1C401.934 1644.52 401.799 1645.15 401.799 1645.98C401.799 1646.81 401.934 1647.44 402.203 1647.87C402.473 1648.3 402.869 1648.51 403.393 1648.51C403.912 1648.51 404.303 1648.3 404.564 1647.88C404.83 1647.45 404.963 1646.82 404.963 1645.98ZM412.99 1645.19V1649.26H411.906V1645.19C411.906 1644.6 411.803 1644.17 411.596 1643.89C411.389 1643.61 411.064 1643.48 410.623 1643.48C410.119 1643.48 409.73 1643.66 409.457 1644.01C409.188 1644.37 409.053 1644.88 409.053 1645.55V1649.26H407.975V1642.7H409.053V1643.68C409.244 1643.31 409.504 1643.02 409.832 1642.83C410.16 1642.64 410.549 1642.54 410.998 1642.54C411.666 1642.54 412.164 1642.76 412.492 1643.2C412.824 1643.64 412.99 1644.3 412.99 1645.19ZM419.09 1645.92C419.09 1645.12 418.957 1644.5 418.691 1644.09C418.43 1643.66 418.047 1643.45 417.543 1643.45C417.016 1643.45 416.613 1643.66 416.336 1644.09C416.059 1644.5 415.92 1645.12 415.92 1645.92C415.92 1646.73 416.059 1647.35 416.336 1647.78C416.617 1648.2 417.023 1648.41 417.555 1648.41C418.051 1648.41 418.43 1648.2 418.691 1647.77C418.957 1647.34 419.09 1646.73 419.09 1645.92ZM420.168 1648.84C420.168 1649.82 419.936 1650.57 419.471 1651.08C419.006 1651.58 418.322 1651.84 417.42 1651.84C417.123 1651.84 416.812 1651.81 416.488 1651.76C416.164 1651.7 415.84 1651.62 415.516 1651.51V1650.45C415.898 1650.63 416.246 1650.76 416.559 1650.85C416.871 1650.93 417.158 1650.98 417.42 1650.98C418.002 1650.98 418.426 1650.82 418.691 1650.5C418.957 1650.18 419.09 1649.68 419.09 1649V1648.95V1648.22C418.918 1648.58 418.684 1648.86 418.387 1649.04C418.09 1649.22 417.729 1649.31 417.303 1649.31C416.537 1649.31 415.926 1649 415.469 1648.39C415.012 1647.77 414.783 1646.95 414.783 1645.92C414.783 1644.89 415.012 1644.07 415.469 1643.46C415.926 1642.84 416.537 1642.54 417.303 1642.54C417.725 1642.54 418.082 1642.62 418.375 1642.79C418.668 1642.96 418.906 1643.22 419.09 1643.57V1642.72H420.168V1648.84ZM426.83 1640.19V1643.78H425.518V1640.19H426.83ZM423.707 1640.19V1643.78H422.395V1640.19H423.707ZM448.521 1640.19V1643.78H447.209V1640.19H448.521ZM445.398 1640.19V1643.78H444.086V1640.19H445.398ZM455.424 1640.51H456.537L451.932 1650.37H450.812L455.424 1640.51ZM459.297 1642.72H462.057V1648.42H464.195V1649.26H458.84V1648.42H460.979V1643.56H459.297V1642.72ZM460.979 1640.17H462.057V1641.53H460.979V1640.17ZM468.637 1643.36C468.77 1643.08 468.938 1642.88 469.141 1642.74C469.348 1642.61 469.596 1642.54 469.885 1642.54C470.412 1642.54 470.783 1642.74 470.998 1643.15C471.217 1643.56 471.326 1644.33 471.326 1645.46V1649.26H470.342V1645.5C470.342 1644.58 470.289 1644 470.184 1643.78C470.082 1643.55 469.895 1643.44 469.621 1643.44C469.309 1643.44 469.094 1643.56 468.977 1643.8C468.863 1644.04 468.807 1644.61 468.807 1645.5V1649.26H467.822V1645.5C467.822 1644.57 467.766 1643.99 467.652 1643.77C467.543 1643.55 467.344 1643.44 467.055 1643.44C466.77 1643.44 466.57 1643.56 466.457 1643.8C466.348 1644.04 466.293 1644.61 466.293 1645.5V1649.26H465.314V1642.7H466.293V1643.26C466.422 1643.02 466.582 1642.85 466.773 1642.73C466.969 1642.6 467.189 1642.54 467.436 1642.54C467.732 1642.54 467.979 1642.61 468.174 1642.74C468.373 1642.88 468.527 1643.09 468.637 1643.36ZM476.02 1645.96H475.662C475.033 1645.96 474.559 1646.07 474.238 1646.29C473.922 1646.51 473.764 1646.84 473.764 1647.28C473.764 1647.67 473.883 1647.98 474.121 1648.2C474.359 1648.42 474.689 1648.53 475.111 1648.53C475.705 1648.53 476.172 1648.32 476.512 1647.91C476.852 1647.5 477.023 1646.93 477.027 1646.2V1645.96H476.02ZM478.111 1645.51V1649.26H477.027V1648.29C476.797 1648.68 476.506 1648.97 476.154 1649.15C475.807 1649.34 475.383 1649.43 474.883 1649.43C474.215 1649.43 473.682 1649.24 473.283 1648.87C472.885 1648.49 472.686 1647.98 472.686 1647.35C472.686 1646.62 472.93 1646.06 473.418 1645.68C473.91 1645.31 474.631 1645.12 475.58 1645.12H477.027V1644.95C477.023 1644.42 476.891 1644.04 476.629 1643.81C476.367 1643.57 475.949 1643.45 475.375 1643.45C475.008 1643.45 474.637 1643.51 474.262 1643.61C473.887 1643.72 473.521 1643.87 473.166 1644.07V1643C473.564 1642.84 473.945 1642.73 474.309 1642.66C474.676 1642.58 475.031 1642.54 475.375 1642.54C475.918 1642.54 476.381 1642.62 476.764 1642.78C477.15 1642.94 477.463 1643.18 477.701 1643.5C477.85 1643.69 477.955 1643.94 478.018 1644.23C478.08 1644.51 478.111 1644.94 478.111 1645.51ZM484.164 1645.92C484.164 1645.12 484.031 1644.5 483.766 1644.09C483.504 1643.66 483.121 1643.45 482.617 1643.45C482.09 1643.45 481.688 1643.66 481.41 1644.09C481.133 1644.5 480.994 1645.12 480.994 1645.92C480.994 1646.73 481.133 1647.35 481.41 1647.78C481.691 1648.2 482.098 1648.41 482.629 1648.41C483.125 1648.41 483.504 1648.2 483.766 1647.77C484.031 1647.34 484.164 1646.73 484.164 1645.92ZM485.242 1648.84C485.242 1649.82 485.01 1650.57 484.545 1651.08C484.08 1651.58 483.396 1651.84 482.494 1651.84C482.197 1651.84 481.887 1651.81 481.562 1651.76C481.238 1651.7 480.914 1651.62 480.59 1651.51V1650.45C480.973 1650.63 481.32 1650.76 481.633 1650.85C481.945 1650.93 482.232 1650.98 482.494 1650.98C483.076 1650.98 483.5 1650.82 483.766 1650.5C484.031 1650.18 484.164 1649.68 484.164 1649V1648.95V1648.22C483.992 1648.58 483.758 1648.86 483.461 1649.04C483.164 1649.22 482.803 1649.31 482.377 1649.31C481.611 1649.31 481 1649 480.543 1648.39C480.086 1647.77 479.857 1646.95 479.857 1645.92C479.857 1644.89 480.086 1644.07 480.543 1643.46C481 1642.84 481.611 1642.54 482.377 1642.54C482.799 1642.54 483.156 1642.62 483.449 1642.79C483.742 1642.96 483.98 1643.22 484.164 1643.57V1642.72H485.242V1648.84ZM492.93 1645.44V1645.97H488.26V1646C488.229 1646.9 488.398 1647.54 488.77 1647.93C489.145 1648.32 489.672 1648.51 490.352 1648.51C490.695 1648.51 491.055 1648.46 491.43 1648.35C491.805 1648.24 492.205 1648.08 492.631 1647.85V1648.92C492.221 1649.09 491.824 1649.22 491.441 1649.3C491.062 1649.39 490.695 1649.43 490.34 1649.43C489.32 1649.43 488.523 1649.12 487.949 1648.51C487.375 1647.9 487.088 1647.06 487.088 1645.98C487.088 1644.94 487.369 1644.1 487.932 1643.48C488.494 1642.85 489.244 1642.54 490.182 1642.54C491.018 1642.54 491.676 1642.82 492.156 1643.39C492.641 1643.95 492.898 1644.64 492.93 1645.44ZM491.852 1645.12C491.805 1644.67 491.639 1644.28 491.354 1643.95C491.072 1643.62 490.666 1643.45 490.135 1643.45C489.615 1643.45 489.188 1643.62 488.852 1643.97C488.516 1644.31 488.332 1644.7 488.301 1645.13L491.852 1645.12ZM499.299 1642.92V1643.98C498.99 1643.8 498.68 1643.67 498.367 1643.58C498.055 1643.49 497.736 1643.44 497.412 1643.44C496.924 1643.44 496.559 1643.52 496.316 1643.68C496.078 1643.84 495.959 1644.08 495.959 1644.4C495.959 1644.69 496.049 1644.91 496.229 1645.06C496.408 1645.2 496.855 1645.34 497.57 1645.48L498.004 1645.56C498.539 1645.66 498.943 1645.87 499.217 1646.17C499.494 1646.48 499.633 1646.87 499.633 1647.36C499.633 1648.01 499.402 1648.52 498.941 1648.88C498.48 1649.25 497.84 1649.43 497.02 1649.43C496.695 1649.43 496.355 1649.39 496 1649.32C495.645 1649.26 495.26 1649.16 494.846 1649.02V1647.91C495.248 1648.11 495.633 1648.27 496 1648.37C496.367 1648.48 496.715 1648.53 497.043 1648.53C497.52 1648.53 497.889 1648.43 498.15 1648.24C498.412 1648.04 498.543 1647.77 498.543 1647.42C498.543 1646.92 498.064 1646.58 497.107 1646.39L497.061 1646.38L496.656 1646.29C496.035 1646.17 495.582 1645.97 495.297 1645.68C495.012 1645.4 494.869 1645 494.869 1644.51C494.869 1643.88 495.082 1643.39 495.508 1643.05C495.934 1642.71 496.541 1642.54 497.33 1642.54C497.682 1642.54 498.02 1642.57 498.344 1642.64C498.668 1642.7 498.986 1642.8 499.299 1642.92ZM506.037 1640.51H507.15L502.545 1650.37H501.426L506.037 1640.51ZM508.645 1642.7H509.764L511.668 1648.2L513.578 1642.7H514.697L512.365 1649.26H510.977L508.645 1642.7ZM520.99 1642.92V1643.98C520.682 1643.8 520.371 1643.67 520.059 1643.58C519.746 1643.49 519.428 1643.44 519.104 1643.44C518.615 1643.44 518.25 1643.52 518.008 1643.68C517.77 1643.84 517.65 1644.08 517.65 1644.4C517.65 1644.69 517.74 1644.91 517.92 1645.06C518.1 1645.2 518.547 1645.34 519.262 1645.48L519.695 1645.56C520.23 1645.66 520.635 1645.87 520.908 1646.17C521.186 1646.48 521.324 1646.87 521.324 1647.36C521.324 1648.01 521.094 1648.52 520.633 1648.88C520.172 1649.25 519.531 1649.43 518.711 1649.43C518.387 1649.43 518.047 1649.39 517.691 1649.32C517.336 1649.26 516.951 1649.16 516.537 1649.02V1647.91C516.939 1648.11 517.324 1648.27 517.691 1648.37C518.059 1648.48 518.406 1648.53 518.734 1648.53C519.211 1648.53 519.58 1648.43 519.842 1648.24C520.104 1648.04 520.234 1647.77 520.234 1647.42C520.234 1646.92 519.756 1646.58 518.799 1646.39L518.752 1646.38L518.348 1646.29C517.727 1646.17 517.273 1645.97 516.988 1645.68C516.703 1645.4 516.561 1645 516.561 1644.51C516.561 1643.88 516.773 1643.39 517.199 1643.05C517.625 1642.71 518.232 1642.54 519.021 1642.54C519.373 1642.54 519.711 1642.57 520.035 1642.64C520.359 1642.7 520.678 1642.8 520.99 1642.92ZM528.736 1648.92C528.447 1649.09 528.148 1649.22 527.84 1649.3C527.535 1649.39 527.223 1649.43 526.902 1649.43C525.887 1649.43 525.092 1649.12 524.518 1648.51C523.947 1647.91 523.662 1647.06 523.662 1645.98C523.662 1644.91 523.947 1644.06 524.518 1643.45C525.092 1642.84 525.887 1642.54 526.902 1642.54C527.219 1642.54 527.527 1642.58 527.828 1642.66C528.129 1642.74 528.432 1642.87 528.736 1643.04V1644.17C528.451 1643.92 528.164 1643.74 527.875 1643.62C527.59 1643.51 527.266 1643.45 526.902 1643.45C526.227 1643.45 525.707 1643.67 525.344 1644.11C524.98 1644.55 524.799 1645.17 524.799 1645.98C524.799 1646.79 524.98 1647.42 525.344 1647.86C525.711 1648.3 526.23 1648.51 526.902 1648.51C527.277 1648.51 527.613 1648.46 527.91 1648.34C528.207 1648.23 528.482 1648.05 528.736 1647.81V1648.92ZM533.359 1643.45C532.812 1643.45 532.398 1643.67 532.117 1644.09C531.836 1644.52 531.695 1645.15 531.695 1645.98C531.695 1646.82 531.836 1647.45 532.117 1647.88C532.398 1648.3 532.812 1648.51 533.359 1648.51C533.91 1648.51 534.326 1648.3 534.607 1647.88C534.889 1647.45 535.029 1646.82 535.029 1645.98C535.029 1645.15 534.889 1644.52 534.607 1644.09C534.326 1643.67 533.91 1643.45 533.359 1643.45ZM533.359 1642.54C534.27 1642.54 534.965 1642.83 535.445 1643.42C535.93 1644.01 536.172 1644.87 536.172 1645.98C536.172 1647.1 535.932 1647.96 535.451 1648.55C534.971 1649.14 534.273 1649.43 533.359 1649.43C532.449 1649.43 531.754 1649.14 531.273 1648.55C530.793 1647.96 530.553 1647.1 530.553 1645.98C530.553 1644.87 530.793 1644.01 531.273 1643.42C531.754 1642.83 532.449 1642.54 533.359 1642.54ZM542.008 1643.53V1640.14H543.086V1649.26H542.008V1648.43C541.828 1648.76 541.588 1649.01 541.287 1649.18C540.99 1649.34 540.646 1649.43 540.256 1649.43C539.463 1649.43 538.838 1649.12 538.381 1648.51C537.928 1647.89 537.701 1647.04 537.701 1645.96C537.701 1644.89 537.93 1644.06 538.387 1643.45C538.844 1642.84 539.467 1642.54 540.256 1642.54C540.65 1642.54 540.998 1642.62 541.299 1642.8C541.6 1642.96 541.836 1643.21 542.008 1643.53ZM538.838 1645.98C538.838 1646.82 538.971 1647.45 539.236 1647.88C539.502 1648.3 539.895 1648.51 540.414 1648.51C540.934 1648.51 541.328 1648.3 541.598 1647.87C541.871 1647.44 542.008 1646.81 542.008 1645.98C542.008 1645.15 541.871 1644.52 541.598 1644.1C541.328 1643.67 540.934 1643.45 540.414 1643.45C539.895 1643.45 539.502 1643.67 539.236 1644.09C538.971 1644.52 538.838 1645.15 538.838 1645.98ZM550.773 1645.44V1645.97H546.104V1646C546.072 1646.9 546.242 1647.54 546.613 1647.93C546.988 1648.32 547.516 1648.51 548.195 1648.51C548.539 1648.51 548.898 1648.46 549.273 1648.35C549.648 1648.24 550.049 1648.08 550.475 1647.85V1648.92C550.064 1649.09 549.668 1649.22 549.285 1649.3C548.906 1649.39 548.539 1649.43 548.184 1649.43C547.164 1649.43 546.367 1649.12 545.793 1648.51C545.219 1647.9 544.932 1647.06 544.932 1645.98C544.932 1644.94 545.213 1644.1 545.775 1643.48C546.338 1642.85 547.088 1642.54 548.025 1642.54C548.861 1642.54 549.52 1642.82 550 1643.39C550.484 1643.95 550.742 1644.64 550.773 1645.44ZM549.695 1645.12C549.648 1644.67 549.482 1644.28 549.197 1643.95C548.916 1643.62 548.51 1643.45 547.979 1643.45C547.459 1643.45 547.031 1643.62 546.695 1643.97C546.359 1644.31 546.176 1644.7 546.145 1645.13L549.695 1645.12ZM552.039 1645.02H558.25V1646.01H552.039V1645.02ZM562.27 1640.83V1642.7H564.719V1643.53H562.27V1647.1C562.27 1647.58 562.361 1647.92 562.545 1648.11C562.729 1648.3 563.049 1648.4 563.506 1648.4H564.719V1649.26H563.4C562.592 1649.26 562.021 1649.1 561.689 1648.77C561.357 1648.45 561.191 1647.89 561.191 1647.1V1643.53H559.439V1642.7H561.191V1640.83H562.27ZM572.061 1645.19V1649.26H570.977V1645.19C570.977 1644.6 570.873 1644.17 570.666 1643.89C570.459 1643.61 570.135 1643.48 569.693 1643.48C569.189 1643.48 568.801 1643.66 568.527 1644.01C568.258 1644.37 568.123 1644.88 568.123 1645.55V1649.26H567.045V1640.14H568.123V1643.68C568.314 1643.31 568.574 1643.02 568.902 1642.83C569.23 1642.64 569.619 1642.54 570.068 1642.54C570.736 1642.54 571.234 1642.76 571.562 1643.2C571.895 1643.64 572.061 1644.3 572.061 1645.19ZM579.695 1645.44V1645.97H575.025V1646C574.994 1646.9 575.164 1647.54 575.535 1647.93C575.91 1648.32 576.438 1648.51 577.117 1648.51C577.461 1648.51 577.82 1648.46 578.195 1648.35C578.57 1648.24 578.971 1648.08 579.396 1647.85V1648.92C578.986 1649.09 578.59 1649.22 578.207 1649.3C577.828 1649.39 577.461 1649.43 577.105 1649.43C576.086 1649.43 575.289 1649.12 574.715 1648.51C574.141 1647.9 573.854 1647.06 573.854 1645.98C573.854 1644.94 574.135 1644.1 574.697 1643.48C575.26 1642.85 576.01 1642.54 576.947 1642.54C577.783 1642.54 578.441 1642.82 578.922 1643.39C579.406 1643.95 579.664 1644.64 579.695 1645.44ZM578.617 1645.12C578.57 1644.67 578.404 1644.28 578.119 1643.95C577.838 1643.62 577.432 1643.45 576.9 1643.45C576.381 1643.45 575.953 1643.62 575.617 1643.97C575.281 1644.31 575.098 1644.7 575.066 1645.13L578.617 1645.12ZM584.324 1643.36C584.457 1643.08 584.625 1642.88 584.828 1642.74C585.035 1642.61 585.283 1642.54 585.572 1642.54C586.1 1642.54 586.471 1642.74 586.686 1643.15C586.904 1643.56 587.014 1644.33 587.014 1645.46V1649.26H586.029V1645.5C586.029 1644.58 585.977 1644 585.871 1643.78C585.77 1643.55 585.582 1643.44 585.309 1643.44C584.996 1643.44 584.781 1643.56 584.664 1643.8C584.551 1644.04 584.494 1644.61 584.494 1645.5V1649.26H583.51V1645.5C583.51 1644.57 583.453 1643.99 583.34 1643.77C583.23 1643.55 583.031 1643.44 582.742 1643.44C582.457 1643.44 582.258 1643.56 582.145 1643.8C582.035 1644.04 581.98 1644.61 581.98 1645.5V1649.26H581.002V1642.7H581.98V1643.26C582.109 1643.02 582.27 1642.85 582.461 1642.73C582.656 1642.6 582.877 1642.54 583.123 1642.54C583.42 1642.54 583.666 1642.61 583.861 1642.74C584.061 1642.88 584.215 1643.09 584.324 1643.36ZM594.156 1645.44V1645.97H589.486V1646C589.455 1646.9 589.625 1647.54 589.996 1647.93C590.371 1648.32 590.898 1648.51 591.578 1648.51C591.922 1648.51 592.281 1648.46 592.656 1648.35C593.031 1648.24 593.432 1648.08 593.857 1647.85V1648.92C593.447 1649.09 593.051 1649.22 592.668 1649.3C592.289 1649.39 591.922 1649.43 591.566 1649.43C590.547 1649.43 589.75 1649.12 589.176 1648.51C588.602 1647.9 588.314 1647.06 588.314 1645.98C588.314 1644.94 588.596 1644.1 589.158 1643.48C589.721 1642.85 590.471 1642.54 591.408 1642.54C592.244 1642.54 592.902 1642.82 593.383 1643.39C593.867 1643.95 594.125 1644.64 594.156 1645.44ZM593.078 1645.12C593.031 1644.67 592.865 1644.28 592.58 1643.95C592.299 1643.62 591.893 1643.45 591.361 1643.45C590.842 1643.45 590.414 1643.62 590.078 1643.97C589.742 1644.31 589.559 1644.7 589.527 1645.13L593.078 1645.12ZM595.422 1645.02H601.633V1646.01H595.422V1645.02ZM606.268 1646.89C606.268 1647.37 606.355 1647.74 606.531 1647.98C606.711 1648.23 606.975 1648.35 607.322 1648.35H608.582V1649.26H607.217C606.572 1649.26 606.072 1649.05 605.717 1648.64C605.365 1648.23 605.189 1647.64 605.189 1646.89V1640.95H603.461V1640.11H606.268V1646.89ZM611.137 1642.72H613.896V1648.42H616.035V1649.26H610.68V1648.42H612.818V1643.56H611.137V1642.72ZM612.818 1640.17H613.896V1641.53H612.818V1640.17ZM621.543 1645.92C621.543 1645.12 621.41 1644.5 621.145 1644.09C620.883 1643.66 620.5 1643.45 619.996 1643.45C619.469 1643.45 619.066 1643.66 618.789 1644.09C618.512 1644.5 618.373 1645.12 618.373 1645.92C618.373 1646.73 618.512 1647.35 618.789 1647.78C619.07 1648.2 619.477 1648.41 620.008 1648.41C620.504 1648.41 620.883 1648.2 621.145 1647.77C621.41 1647.34 621.543 1646.73 621.543 1645.92ZM622.621 1648.84C622.621 1649.82 622.389 1650.57 621.924 1651.08C621.459 1651.58 620.775 1651.84 619.873 1651.84C619.576 1651.84 619.266 1651.81 618.941 1651.76C618.617 1651.7 618.293 1651.62 617.969 1651.51V1650.45C618.352 1650.63 618.699 1650.76 619.012 1650.85C619.324 1650.93 619.611 1650.98 619.873 1650.98C620.455 1650.98 620.879 1650.82 621.145 1650.5C621.41 1650.18 621.543 1649.68 621.543 1649V1648.95V1648.22C621.371 1648.58 621.137 1648.86 620.84 1649.04C620.543 1649.22 620.182 1649.31 619.756 1649.31C618.99 1649.31 618.379 1649 617.922 1648.39C617.465 1647.77 617.236 1646.95 617.236 1645.92C617.236 1644.89 617.465 1644.07 617.922 1643.46C618.379 1642.84 618.99 1642.54 619.756 1642.54C620.178 1642.54 620.535 1642.62 620.828 1642.79C621.121 1642.96 621.359 1643.22 621.543 1643.57V1642.72H622.621V1648.84ZM629.904 1645.19V1649.26H628.82V1645.19C628.82 1644.6 628.717 1644.17 628.51 1643.89C628.303 1643.61 627.979 1643.48 627.537 1643.48C627.033 1643.48 626.645 1643.66 626.371 1644.01C626.102 1644.37 625.967 1644.88 625.967 1645.55V1649.26H624.889V1640.14H625.967V1643.68C626.158 1643.31 626.418 1643.02 626.746 1642.83C627.074 1642.64 627.463 1642.54 627.912 1642.54C628.58 1642.54 629.078 1642.76 629.406 1643.2C629.738 1643.64 629.904 1644.3 629.904 1645.19ZM634.574 1640.83V1642.7H637.023V1643.53H634.574V1647.1C634.574 1647.58 634.666 1647.92 634.85 1648.11C635.033 1648.3 635.354 1648.4 635.811 1648.4H637.023V1649.26H635.705C634.896 1649.26 634.326 1649.1 633.994 1648.77C633.662 1648.45 633.496 1647.89 633.496 1647.1V1643.53H631.744V1642.7H633.496V1640.83H634.574ZM640.486 1646.89H642.549V1649.26H640.486V1646.89ZM647.635 1648.43V1651.76H646.551V1642.7H647.635V1643.53C647.814 1643.21 648.053 1642.96 648.35 1642.8C648.65 1642.62 648.996 1642.54 649.387 1642.54C650.18 1642.54 650.801 1642.84 651.25 1643.46C651.703 1644.07 651.93 1644.92 651.93 1646.01C651.93 1647.07 651.703 1647.91 651.25 1648.52C650.797 1649.13 650.176 1649.43 649.387 1649.43C648.988 1649.43 648.639 1649.34 648.338 1649.18C648.041 1649.01 647.807 1648.76 647.635 1648.43ZM650.799 1645.98C650.799 1645.15 650.666 1644.52 650.4 1644.09C650.139 1643.67 649.748 1643.45 649.229 1643.45C648.705 1643.45 648.309 1643.67 648.039 1644.1C647.77 1644.52 647.635 1645.15 647.635 1645.98C647.635 1646.81 647.77 1647.44 648.039 1647.87C648.309 1648.3 648.705 1648.51 649.229 1648.51C649.748 1648.51 650.139 1648.3 650.4 1647.88C650.666 1647.45 650.799 1646.82 650.799 1645.98ZM658.826 1645.19V1649.26H657.742V1645.19C657.742 1644.6 657.639 1644.17 657.432 1643.89C657.225 1643.61 656.9 1643.48 656.459 1643.48C655.955 1643.48 655.566 1643.66 655.293 1644.01C655.023 1644.37 654.889 1644.88 654.889 1645.55V1649.26H653.811V1642.7H654.889V1643.68C655.08 1643.31 655.34 1643.02 655.668 1642.83C655.996 1642.64 656.385 1642.54 656.834 1642.54C657.502 1642.54 658 1642.76 658.328 1643.2C658.66 1643.64 658.826 1644.3 658.826 1645.19ZM664.926 1645.92C664.926 1645.12 664.793 1644.5 664.527 1644.09C664.266 1643.66 663.883 1643.45 663.379 1643.45C662.852 1643.45 662.449 1643.66 662.172 1644.09C661.895 1644.5 661.756 1645.12 661.756 1645.92C661.756 1646.73 661.895 1647.35 662.172 1647.78C662.453 1648.2 662.859 1648.41 663.391 1648.41C663.887 1648.41 664.266 1648.2 664.527 1647.77C664.793 1647.34 664.926 1646.73 664.926 1645.92ZM666.004 1648.84C666.004 1649.82 665.771 1650.57 665.307 1651.08C664.842 1651.58 664.158 1651.84 663.256 1651.84C662.959 1651.84 662.648 1651.81 662.324 1651.76C662 1651.7 661.676 1651.62 661.352 1651.51V1650.45C661.734 1650.63 662.082 1650.76 662.395 1650.85C662.707 1650.93 662.994 1650.98 663.256 1650.98C663.838 1650.98 664.262 1650.82 664.527 1650.5C664.793 1650.18 664.926 1649.68 664.926 1649V1648.95V1648.22C664.754 1648.58 664.52 1648.86 664.223 1649.04C663.926 1649.22 663.564 1649.31 663.139 1649.31C662.373 1649.31 661.762 1649 661.305 1648.39C660.848 1647.77 660.619 1646.95 660.619 1645.92C660.619 1644.89 660.848 1644.07 661.305 1643.46C661.762 1642.84 662.373 1642.54 663.139 1642.54C663.561 1642.54 663.918 1642.62 664.211 1642.79C664.504 1642.96 664.742 1643.22 664.926 1643.57V1642.72H666.004V1648.84ZM672.666 1640.19V1643.78H671.354V1640.19H672.666ZM669.543 1640.19V1643.78H668.23V1640.19H669.543ZM693.168 1640.13V1643.78H691.855V1640.13H693.168ZM701.26 1640.51H702.373L697.768 1650.37H696.648L701.26 1640.51ZM705.133 1642.72H707.893V1648.42H710.031V1649.26H704.676V1648.42H706.814V1643.56H705.133V1642.72ZM706.814 1640.17H707.893V1641.53H706.814V1640.17ZM714.473 1643.36C714.605 1643.08 714.773 1642.88 714.977 1642.74C715.184 1642.61 715.432 1642.54 715.721 1642.54C716.248 1642.54 716.619 1642.74 716.834 1643.15C717.053 1643.56 717.162 1644.33 717.162 1645.46V1649.26H716.178V1645.5C716.178 1644.58 716.125 1644 716.02 1643.78C715.918 1643.55 715.73 1643.44 715.457 1643.44C715.145 1643.44 714.93 1643.56 714.812 1643.8C714.699 1644.04 714.643 1644.61 714.643 1645.5V1649.26H713.658V1645.5C713.658 1644.57 713.602 1643.99 713.488 1643.77C713.379 1643.55 713.18 1643.44 712.891 1643.44C712.605 1643.44 712.406 1643.56 712.293 1643.8C712.184 1644.04 712.129 1644.61 712.129 1645.5V1649.26H711.15V1642.7H712.129V1643.26C712.258 1643.02 712.418 1642.85 712.609 1642.73C712.805 1642.6 713.025 1642.54 713.271 1642.54C713.568 1642.54 713.814 1642.61 714.01 1642.74C714.209 1642.88 714.363 1643.09 714.473 1643.36ZM721.855 1645.96H721.498C720.869 1645.96 720.395 1646.07 720.074 1646.29C719.758 1646.51 719.6 1646.84 719.6 1647.28C719.6 1647.67 719.719 1647.98 719.957 1648.2C720.195 1648.42 720.525 1648.53 720.947 1648.53C721.541 1648.53 722.008 1648.32 722.348 1647.91C722.688 1647.5 722.859 1646.93 722.863 1646.2V1645.96H721.855ZM723.947 1645.51V1649.26H722.863V1648.29C722.633 1648.68 722.342 1648.97 721.99 1649.15C721.643 1649.34 721.219 1649.43 720.719 1649.43C720.051 1649.43 719.518 1649.24 719.119 1648.87C718.721 1648.49 718.521 1647.98 718.521 1647.35C718.521 1646.62 718.766 1646.06 719.254 1645.68C719.746 1645.31 720.467 1645.12 721.416 1645.12H722.863V1644.95C722.859 1644.42 722.727 1644.04 722.465 1643.81C722.203 1643.57 721.785 1643.45 721.211 1643.45C720.844 1643.45 720.473 1643.51 720.098 1643.61C719.723 1643.72 719.357 1643.87 719.002 1644.07V1643C719.4 1642.84 719.781 1642.73 720.145 1642.66C720.512 1642.58 720.867 1642.54 721.211 1642.54C721.754 1642.54 722.217 1642.62 722.6 1642.78C722.986 1642.94 723.299 1643.18 723.537 1643.5C723.686 1643.69 723.791 1643.94 723.854 1644.23C723.916 1644.51 723.947 1644.94 723.947 1645.51ZM730 1645.92C730 1645.12 729.867 1644.5 729.602 1644.09C729.34 1643.66 728.957 1643.45 728.453 1643.45C727.926 1643.45 727.523 1643.66 727.246 1644.09C726.969 1644.5 726.83 1645.12 726.83 1645.92C726.83 1646.73 726.969 1647.35 727.246 1647.78C727.527 1648.2 727.934 1648.41 728.465 1648.41C728.961 1648.41 729.34 1648.2 729.602 1647.77C729.867 1647.34 730 1646.73 730 1645.92ZM731.078 1648.84C731.078 1649.82 730.846 1650.57 730.381 1651.08C729.916 1651.58 729.232 1651.84 728.33 1651.84C728.033 1651.84 727.723 1651.81 727.398 1651.76C727.074 1651.7 726.75 1651.62 726.426 1651.51V1650.45C726.809 1650.63 727.156 1650.76 727.469 1650.85C727.781 1650.93 728.068 1650.98 728.33 1650.98C728.912 1650.98 729.336 1650.82 729.602 1650.5C729.867 1650.18 730 1649.68 730 1649V1648.95V1648.22C729.828 1648.58 729.594 1648.86 729.297 1649.04C729 1649.22 728.639 1649.31 728.213 1649.31C727.447 1649.31 726.836 1649 726.379 1648.39C725.922 1647.77 725.693 1646.95 725.693 1645.92C725.693 1644.89 725.922 1644.07 726.379 1643.46C726.836 1642.84 727.447 1642.54 728.213 1642.54C728.635 1642.54 728.992 1642.62 729.285 1642.79C729.578 1642.96 729.816 1643.22 730 1643.57V1642.72H731.078V1648.84ZM738.766 1645.44V1645.97H734.096V1646C734.064 1646.9 734.234 1647.54 734.605 1647.93C734.98 1648.32 735.508 1648.51 736.188 1648.51C736.531 1648.51 736.891 1648.46 737.266 1648.35C737.641 1648.24 738.041 1648.08 738.467 1647.85V1648.92C738.057 1649.09 737.66 1649.22 737.277 1649.3C736.898 1649.39 736.531 1649.43 736.176 1649.43C735.156 1649.43 734.359 1649.12 733.785 1648.51C733.211 1647.9 732.924 1647.06 732.924 1645.98C732.924 1644.94 733.205 1644.1 733.768 1643.48C734.33 1642.85 735.08 1642.54 736.018 1642.54C736.854 1642.54 737.512 1642.82 737.992 1643.39C738.477 1643.95 738.734 1644.64 738.766 1645.44ZM737.688 1645.12C737.641 1644.67 737.475 1644.28 737.189 1643.95C736.908 1643.62 736.502 1643.45 735.971 1643.45C735.451 1643.45 735.023 1643.62 734.688 1643.97C734.352 1644.31 734.168 1644.7 734.137 1645.13L737.688 1645.12ZM745.135 1642.92V1643.98C744.826 1643.8 744.516 1643.67 744.203 1643.58C743.891 1643.49 743.572 1643.44 743.248 1643.44C742.76 1643.44 742.395 1643.52 742.152 1643.68C741.914 1643.84 741.795 1644.08 741.795 1644.4C741.795 1644.69 741.885 1644.91 742.064 1645.06C742.244 1645.2 742.691 1645.34 743.406 1645.48L743.84 1645.56C744.375 1645.66 744.779 1645.87 745.053 1646.17C745.33 1646.48 745.469 1646.87 745.469 1647.36C745.469 1648.01 745.238 1648.52 744.777 1648.88C744.316 1649.25 743.676 1649.43 742.855 1649.43C742.531 1649.43 742.191 1649.39 741.836 1649.32C741.48 1649.26 741.096 1649.16 740.682 1649.02V1647.91C741.084 1648.11 741.469 1648.27 741.836 1648.37C742.203 1648.48 742.551 1648.53 742.879 1648.53C743.355 1648.53 743.725 1648.43 743.986 1648.24C744.248 1648.04 744.379 1647.77 744.379 1647.42C744.379 1646.92 743.9 1646.58 742.943 1646.39L742.896 1646.38L742.492 1646.29C741.871 1646.17 741.418 1645.97 741.133 1645.68C740.848 1645.4 740.705 1645 740.705 1644.51C740.705 1643.88 740.918 1643.39 741.344 1643.05C741.77 1642.71 742.377 1642.54 743.166 1642.54C743.518 1642.54 743.855 1642.57 744.18 1642.64C744.504 1642.7 744.822 1642.8 745.135 1642.92ZM751.873 1640.51H752.986L748.381 1650.37H747.262L751.873 1640.51ZM754.48 1642.7H755.6L757.504 1648.2L759.414 1642.7H760.533L758.201 1649.26H756.812L754.48 1642.7ZM766.826 1642.92V1643.98C766.518 1643.8 766.207 1643.67 765.895 1643.58C765.582 1643.49 765.264 1643.44 764.939 1643.44C764.451 1643.44 764.086 1643.52 763.844 1643.68C763.605 1643.84 763.486 1644.08 763.486 1644.4C763.486 1644.69 763.576 1644.91 763.756 1645.06C763.936 1645.2 764.383 1645.34 765.098 1645.48L765.531 1645.56C766.066 1645.66 766.471 1645.87 766.744 1646.17C767.021 1646.48 767.16 1646.87 767.16 1647.36C767.16 1648.01 766.93 1648.52 766.469 1648.88C766.008 1649.25 765.367 1649.43 764.547 1649.43C764.223 1649.43 763.883 1649.39 763.527 1649.32C763.172 1649.26 762.787 1649.16 762.373 1649.02V1647.91C762.775 1648.11 763.16 1648.27 763.527 1648.37C763.895 1648.48 764.242 1648.53 764.57 1648.53C765.047 1648.53 765.416 1648.43 765.678 1648.24C765.939 1648.04 766.07 1647.77 766.07 1647.42C766.07 1646.92 765.592 1646.58 764.635 1646.39L764.588 1646.38L764.184 1646.29C763.562 1646.17 763.109 1645.97 762.824 1645.68C762.539 1645.4 762.396 1645 762.396 1644.51C762.396 1643.88 762.609 1643.39 763.035 1643.05C763.461 1642.71 764.068 1642.54 764.857 1642.54C765.209 1642.54 765.547 1642.57 765.871 1642.64C766.195 1642.7 766.514 1642.8 766.826 1642.92ZM774.572 1648.92C774.283 1649.09 773.984 1649.22 773.676 1649.3C773.371 1649.39 773.059 1649.43 772.738 1649.43C771.723 1649.43 770.928 1649.12 770.354 1648.51C769.783 1647.91 769.498 1647.06 769.498 1645.98C769.498 1644.91 769.783 1644.06 770.354 1643.45C770.928 1642.84 771.723 1642.54 772.738 1642.54C773.055 1642.54 773.363 1642.58 773.664 1642.66C773.965 1642.74 774.268 1642.87 774.572 1643.04V1644.17C774.287 1643.92 774 1643.74 773.711 1643.62C773.426 1643.51 773.102 1643.45 772.738 1643.45C772.062 1643.45 771.543 1643.67 771.18 1644.11C770.816 1644.55 770.635 1645.17 770.635 1645.98C770.635 1646.79 770.816 1647.42 771.18 1647.86C771.547 1648.3 772.066 1648.51 772.738 1648.51C773.113 1648.51 773.449 1648.46 773.746 1648.34C774.043 1648.23 774.318 1648.05 774.572 1647.81V1648.92ZM779.195 1643.45C778.648 1643.45 778.234 1643.67 777.953 1644.09C777.672 1644.52 777.531 1645.15 777.531 1645.98C777.531 1646.82 777.672 1647.45 777.953 1647.88C778.234 1648.3 778.648 1648.51 779.195 1648.51C779.746 1648.51 780.162 1648.3 780.443 1647.88C780.725 1647.45 780.865 1646.82 780.865 1645.98C780.865 1645.15 780.725 1644.52 780.443 1644.09C780.162 1643.67 779.746 1643.45 779.195 1643.45ZM779.195 1642.54C780.105 1642.54 780.801 1642.83 781.281 1643.42C781.766 1644.01 782.008 1644.87 782.008 1645.98C782.008 1647.1 781.768 1647.96 781.287 1648.55C780.807 1649.14 780.109 1649.43 779.195 1649.43C778.285 1649.43 777.59 1649.14 777.109 1648.55C776.629 1647.96 776.389 1647.1 776.389 1645.98C776.389 1644.87 776.629 1644.01 777.109 1643.42C777.59 1642.83 778.285 1642.54 779.195 1642.54ZM787.844 1643.53V1640.14H788.922V1649.26H787.844V1648.43C787.664 1648.76 787.424 1649.01 787.123 1649.18C786.826 1649.34 786.482 1649.43 786.092 1649.43C785.299 1649.43 784.674 1649.12 784.217 1648.51C783.764 1647.89 783.537 1647.04 783.537 1645.96C783.537 1644.89 783.766 1644.06 784.223 1643.45C784.68 1642.84 785.303 1642.54 786.092 1642.54C786.486 1642.54 786.834 1642.62 787.135 1642.8C787.436 1642.96 787.672 1643.21 787.844 1643.53ZM784.674 1645.98C784.674 1646.82 784.807 1647.45 785.072 1647.88C785.338 1648.3 785.73 1648.51 786.25 1648.51C786.77 1648.51 787.164 1648.3 787.434 1647.87C787.707 1647.44 787.844 1646.81 787.844 1645.98C787.844 1645.15 787.707 1644.52 787.434 1644.1C787.164 1643.67 786.77 1643.45 786.25 1643.45C785.73 1643.45 785.338 1643.67 785.072 1644.09C784.807 1644.52 784.674 1645.15 784.674 1645.98ZM796.609 1645.44V1645.97H791.939V1646C791.908 1646.9 792.078 1647.54 792.449 1647.93C792.824 1648.32 793.352 1648.51 794.031 1648.51C794.375 1648.51 794.734 1648.46 795.109 1648.35C795.484 1648.24 795.885 1648.08 796.311 1647.85V1648.92C795.9 1649.09 795.504 1649.22 795.121 1649.3C794.742 1649.39 794.375 1649.43 794.02 1649.43C793 1649.43 792.203 1649.12 791.629 1648.51C791.055 1647.9 790.768 1647.06 790.768 1645.98C790.768 1644.94 791.049 1644.1 791.611 1643.48C792.174 1642.85 792.924 1642.54 793.861 1642.54C794.697 1642.54 795.355 1642.82 795.836 1643.39C796.32 1643.95 796.578 1644.64 796.609 1645.44ZM795.531 1645.12C795.484 1644.67 795.318 1644.28 795.033 1643.95C794.752 1643.62 794.346 1643.45 793.814 1643.45C793.295 1643.45 792.867 1643.62 792.531 1643.97C792.195 1644.31 792.012 1644.7 791.98 1645.13L795.531 1645.12ZM797.875 1645.02H804.086V1646.01H797.875V1645.02ZM808.721 1646.89C808.721 1647.37 808.809 1647.74 808.984 1647.98C809.164 1648.23 809.428 1648.35 809.775 1648.35H811.035V1649.26H809.67C809.025 1649.26 808.525 1649.05 808.17 1648.64C807.818 1648.23 807.643 1647.64 807.643 1646.89V1640.95H805.914V1640.11H808.721V1646.89ZM813.59 1642.72H816.35V1648.42H818.488V1649.26H813.133V1648.42H815.271V1643.56H813.59V1642.72ZM815.271 1640.17H816.35V1641.53H815.271V1640.17ZM823.996 1645.92C823.996 1645.12 823.863 1644.5 823.598 1644.09C823.336 1643.66 822.953 1643.45 822.449 1643.45C821.922 1643.45 821.52 1643.66 821.242 1644.09C820.965 1644.5 820.826 1645.12 820.826 1645.92C820.826 1646.73 820.965 1647.35 821.242 1647.78C821.523 1648.2 821.93 1648.41 822.461 1648.41C822.957 1648.41 823.336 1648.2 823.598 1647.77C823.863 1647.34 823.996 1646.73 823.996 1645.92ZM825.074 1648.84C825.074 1649.82 824.842 1650.57 824.377 1651.08C823.912 1651.58 823.229 1651.84 822.326 1651.84C822.029 1651.84 821.719 1651.81 821.395 1651.76C821.07 1651.7 820.746 1651.62 820.422 1651.51V1650.45C820.805 1650.63 821.152 1650.76 821.465 1650.85C821.777 1650.93 822.064 1650.98 822.326 1650.98C822.908 1650.98 823.332 1650.82 823.598 1650.5C823.863 1650.18 823.996 1649.68 823.996 1649V1648.95V1648.22C823.824 1648.58 823.59 1648.86 823.293 1649.04C822.996 1649.22 822.635 1649.31 822.209 1649.31C821.443 1649.31 820.832 1649 820.375 1648.39C819.918 1647.77 819.689 1646.95 819.689 1645.92C819.689 1644.89 819.918 1644.07 820.375 1643.46C820.832 1642.84 821.443 1642.54 822.209 1642.54C822.631 1642.54 822.988 1642.62 823.281 1642.79C823.574 1642.96 823.812 1643.22 823.996 1643.57V1642.72H825.074V1648.84ZM832.357 1645.19V1649.26H831.273V1645.19C831.273 1644.6 831.17 1644.17 830.963 1643.89C830.756 1643.61 830.432 1643.48 829.99 1643.48C829.486 1643.48 829.098 1643.66 828.824 1644.01C828.555 1644.37 828.42 1644.88 828.42 1645.55V1649.26H827.342V1640.14H828.42V1643.68C828.611 1643.31 828.871 1643.02 829.199 1642.83C829.527 1642.64 829.916 1642.54 830.365 1642.54C831.033 1642.54 831.531 1642.76 831.859 1643.2C832.191 1643.64 832.357 1644.3 832.357 1645.19ZM837.027 1640.83V1642.7H839.477V1643.53H837.027V1647.1C837.027 1647.58 837.119 1647.92 837.303 1648.11C837.486 1648.3 837.807 1648.4 838.264 1648.4H839.477V1649.26H838.158C837.35 1649.26 836.779 1649.1 836.447 1648.77C836.115 1648.45 835.949 1647.89 835.949 1647.1V1643.53H834.197V1642.7H835.949V1640.83H837.027ZM841.258 1645.02H847.469V1646.01H841.258V1645.02ZM854.049 1645.19V1649.26H852.965V1645.19C852.965 1644.6 852.861 1644.17 852.654 1643.89C852.447 1643.61 852.123 1643.48 851.682 1643.48C851.178 1643.48 850.789 1643.66 850.516 1644.01C850.246 1644.37 850.111 1644.88 850.111 1645.55V1649.26H849.033V1640.14H850.111V1643.68C850.303 1643.31 850.562 1643.02 850.891 1642.83C851.219 1642.64 851.607 1642.54 852.057 1642.54C852.725 1642.54 853.223 1642.76 853.551 1643.2C853.883 1643.64 854.049 1644.3 854.049 1645.19ZM861.338 1648.92C861.049 1649.09 860.75 1649.22 860.441 1649.3C860.137 1649.39 859.824 1649.43 859.504 1649.43C858.488 1649.43 857.693 1649.12 857.119 1648.51C856.549 1647.91 856.264 1647.06 856.264 1645.98C856.264 1644.91 856.549 1644.06 857.119 1643.45C857.693 1642.84 858.488 1642.54 859.504 1642.54C859.82 1642.54 860.129 1642.58 860.43 1642.66C860.73 1642.74 861.033 1642.87 861.338 1643.04V1644.17C861.053 1643.92 860.766 1643.74 860.477 1643.62C860.191 1643.51 859.867 1643.45 859.504 1643.45C858.828 1643.45 858.309 1643.67 857.945 1644.11C857.582 1644.55 857.4 1645.17 857.4 1645.98C857.4 1646.79 857.582 1647.42 857.945 1647.86C858.312 1648.3 858.832 1648.51 859.504 1648.51C859.879 1648.51 860.215 1648.46 860.512 1648.34C860.809 1648.23 861.084 1648.05 861.338 1647.81V1648.92ZM862.949 1645.02H869.16V1646.01H862.949V1645.02ZM873.18 1640.83V1642.7H875.629V1643.53H873.18V1647.1C873.18 1647.58 873.271 1647.92 873.455 1648.11C873.639 1648.3 873.959 1648.4 874.416 1648.4H875.629V1649.26H874.311C873.502 1649.26 872.932 1649.1 872.6 1648.77C872.268 1648.45 872.102 1647.89 872.102 1647.1V1643.53H870.35V1642.7H872.102V1640.83H873.18ZM882.971 1645.19V1649.26H881.887V1645.19C881.887 1644.6 881.783 1644.17 881.576 1643.89C881.369 1643.61 881.045 1643.48 880.604 1643.48C880.1 1643.48 879.711 1643.66 879.438 1644.01C879.168 1644.37 879.033 1644.88 879.033 1645.55V1649.26H877.955V1640.14H879.033V1643.68C879.225 1643.31 879.484 1643.02 879.812 1642.83C880.141 1642.64 880.529 1642.54 880.979 1642.54C881.646 1642.54 882.145 1642.76 882.473 1643.2C882.805 1643.64 882.971 1644.3 882.971 1645.19ZM890.605 1645.44V1645.97H885.936V1646C885.904 1646.9 886.074 1647.54 886.445 1647.93C886.82 1648.32 887.348 1648.51 888.027 1648.51C888.371 1648.51 888.73 1648.46 889.105 1648.35C889.48 1648.24 889.881 1648.08 890.307 1647.85V1648.92C889.896 1649.09 889.5 1649.22 889.117 1649.3C888.738 1649.39 888.371 1649.43 888.016 1649.43C886.996 1649.43 886.199 1649.12 885.625 1648.51C885.051 1647.9 884.764 1647.06 884.764 1645.98C884.764 1644.94 885.045 1644.1 885.607 1643.48C886.17 1642.85 886.92 1642.54 887.857 1642.54C888.693 1642.54 889.352 1642.82 889.832 1643.39C890.316 1643.95 890.574 1644.64 890.605 1645.44ZM889.527 1645.12C889.48 1644.67 889.314 1644.28 889.029 1643.95C888.748 1643.62 888.342 1643.45 887.811 1643.45C887.291 1643.45 886.863 1643.62 886.527 1643.97C886.191 1644.31 886.008 1644.7 885.977 1645.13L889.527 1645.12ZM895.234 1643.36C895.367 1643.08 895.535 1642.88 895.738 1642.74C895.945 1642.61 896.193 1642.54 896.482 1642.54C897.01 1642.54 897.381 1642.74 897.596 1643.15C897.814 1643.56 897.924 1644.33 897.924 1645.46V1649.26H896.939V1645.5C896.939 1644.58 896.887 1644 896.781 1643.78C896.68 1643.55 896.492 1643.44 896.219 1643.44C895.906 1643.44 895.691 1643.56 895.574 1643.8C895.461 1644.04 895.404 1644.61 895.404 1645.5V1649.26H894.42V1645.5C894.42 1644.57 894.363 1643.99 894.25 1643.77C894.141 1643.55 893.941 1643.44 893.652 1643.44C893.367 1643.44 893.168 1643.56 893.055 1643.8C892.945 1644.04 892.891 1644.61 892.891 1645.5V1649.26H891.912V1642.7H892.891V1643.26C893.02 1643.02 893.18 1642.85 893.371 1642.73C893.566 1642.6 893.787 1642.54 894.033 1642.54C894.33 1642.54 894.576 1642.61 894.771 1642.74C894.971 1642.88 895.125 1643.09 895.234 1643.36ZM905.066 1645.44V1645.97H900.396V1646C900.365 1646.9 900.535 1647.54 900.906 1647.93C901.281 1648.32 901.809 1648.51 902.488 1648.51C902.832 1648.51 903.191 1648.46 903.566 1648.35C903.941 1648.24 904.342 1648.08 904.768 1647.85V1648.92C904.357 1649.09 903.961 1649.22 903.578 1649.3C903.199 1649.39 902.832 1649.43 902.477 1649.43C901.457 1649.43 900.66 1649.12 900.086 1648.51C899.512 1647.9 899.225 1647.06 899.225 1645.98C899.225 1644.94 899.506 1644.1 900.068 1643.48C900.631 1642.85 901.381 1642.54 902.318 1642.54C903.154 1642.54 903.812 1642.82 904.293 1643.39C904.777 1643.95 905.035 1644.64 905.066 1645.44ZM903.988 1645.12C903.941 1644.67 903.775 1644.28 903.49 1643.95C903.209 1643.62 902.803 1643.45 902.271 1643.45C901.752 1643.45 901.324 1643.62 900.988 1643.97C900.652 1644.31 900.469 1644.7 900.438 1645.13L903.988 1645.12ZM908.014 1646.89H910.076V1649.26H908.014V1646.89ZM915.162 1648.43V1651.76H914.078V1642.7H915.162V1643.53C915.342 1643.21 915.58 1642.96 915.877 1642.8C916.178 1642.62 916.523 1642.54 916.914 1642.54C917.707 1642.54 918.328 1642.84 918.777 1643.46C919.23 1644.07 919.457 1644.92 919.457 1646.01C919.457 1647.07 919.23 1647.91 918.777 1648.52C918.324 1649.13 917.703 1649.43 916.914 1649.43C916.516 1649.43 916.166 1649.34 915.865 1649.18C915.568 1649.01 915.334 1648.76 915.162 1648.43ZM918.326 1645.98C918.326 1645.15 918.193 1644.52 917.928 1644.09C917.666 1643.67 917.275 1643.45 916.756 1643.45C916.232 1643.45 915.836 1643.67 915.566 1644.1C915.297 1644.52 915.162 1645.15 915.162 1645.98C915.162 1646.81 915.297 1647.44 915.566 1647.87C915.836 1648.3 916.232 1648.51 916.756 1648.51C917.275 1648.51 917.666 1648.3 917.928 1647.88C918.193 1647.45 918.326 1646.82 918.326 1645.98ZM926.354 1645.19V1649.26H925.27V1645.19C925.27 1644.6 925.166 1644.17 924.959 1643.89C924.752 1643.61 924.428 1643.48 923.986 1643.48C923.482 1643.48 923.094 1643.66 922.82 1644.01C922.551 1644.37 922.416 1644.88 922.416 1645.55V1649.26H921.338V1642.7H922.416V1643.68C922.607 1643.31 922.867 1643.02 923.195 1642.83C923.523 1642.64 923.912 1642.54 924.361 1642.54C925.029 1642.54 925.527 1642.76 925.855 1643.2C926.188 1643.64 926.354 1644.3 926.354 1645.19ZM932.453 1645.92C932.453 1645.12 932.32 1644.5 932.055 1644.09C931.793 1643.66 931.41 1643.45 930.906 1643.45C930.379 1643.45 929.977 1643.66 929.699 1644.09C929.422 1644.5 929.283 1645.12 929.283 1645.92C929.283 1646.73 929.422 1647.35 929.699 1647.78C929.98 1648.2 930.387 1648.41 930.918 1648.41C931.414 1648.41 931.793 1648.2 932.055 1647.77C932.32 1647.34 932.453 1646.73 932.453 1645.92ZM933.531 1648.84C933.531 1649.82 933.299 1650.57 932.834 1651.08C932.369 1651.58 931.686 1651.84 930.783 1651.84C930.486 1651.84 930.176 1651.81 929.852 1651.76C929.527 1651.7 929.203 1651.62 928.879 1651.51V1650.45C929.262 1650.63 929.609 1650.76 929.922 1650.85C930.234 1650.93 930.521 1650.98 930.783 1650.98C931.365 1650.98 931.789 1650.82 932.055 1650.5C932.32 1650.18 932.453 1649.68 932.453 1649V1648.95V1648.22C932.281 1648.58 932.047 1648.86 931.75 1649.04C931.453 1649.22 931.092 1649.31 930.666 1649.31C929.9 1649.31 929.289 1649 928.832 1648.39C928.375 1647.77 928.146 1646.95 928.146 1645.92C928.146 1644.89 928.375 1644.07 928.832 1643.46C929.289 1642.84 929.9 1642.54 930.666 1642.54C931.088 1642.54 931.445 1642.62 931.738 1642.79C932.031 1642.96 932.27 1643.22 932.453 1643.57V1642.72H933.531V1648.84ZM939.004 1640.13V1643.78H937.691V1640.13H939.004ZM188.225 1694.19V1697.78H186.912V1694.19H188.225ZM185.102 1694.19V1697.78H183.789V1694.19H185.102ZM196.387 1702.54C196.07 1702.83 195.713 1703.05 195.314 1703.21C194.92 1703.35 194.492 1703.43 194.031 1703.43C192.922 1703.43 192.059 1703.03 191.441 1702.24C190.824 1701.44 190.516 1700.33 190.516 1698.89C190.516 1697.46 190.828 1696.35 191.453 1695.55C192.078 1694.75 192.947 1694.35 194.061 1694.35C194.428 1694.35 194.779 1694.41 195.115 1694.51C195.451 1694.61 195.775 1694.77 196.088 1694.98V1696.19C195.771 1695.89 195.447 1695.67 195.115 1695.53C194.783 1695.39 194.432 1695.31 194.061 1695.31C193.291 1695.31 192.713 1695.61 192.326 1696.21C191.943 1696.8 191.752 1697.7 191.752 1698.89C191.752 1700.11 191.938 1701.01 192.309 1701.59C192.684 1702.18 193.258 1702.47 194.031 1702.47C194.293 1702.47 194.521 1702.44 194.717 1702.38C194.916 1702.32 195.096 1702.22 195.256 1702.09V1699.74H193.984V1698.77H196.387V1702.54ZM199 1696.72H201.76V1702.42H203.898V1703.26H198.543V1702.42H200.682V1697.56H199V1696.72ZM200.682 1694.17H201.76V1695.53H200.682V1694.17ZM207.977 1694.83V1696.7H210.426V1697.53H207.977V1701.1C207.977 1701.58 208.068 1701.92 208.252 1702.11C208.436 1702.3 208.756 1702.4 209.213 1702.4H210.426V1703.26H209.107C208.299 1703.26 207.729 1703.1 207.396 1702.77C207.064 1702.45 206.898 1701.89 206.898 1701.1V1697.53H205.146V1696.7H206.898V1694.83H207.977ZM212.412 1694.51H213.602V1697.86H216.842V1694.51H218.031V1703.26H216.842V1698.86H213.602V1703.26H212.412V1694.51ZM219.982 1700.77V1696.71H221.061V1700.77C221.061 1701.36 221.164 1701.8 221.371 1702.08C221.582 1702.35 221.906 1702.49 222.344 1702.49C222.852 1702.49 223.24 1702.31 223.51 1701.96C223.779 1701.6 223.914 1701.09 223.914 1700.42V1696.71H224.998V1703.26H223.914V1702.27C223.723 1702.65 223.461 1702.94 223.129 1703.14C222.801 1703.33 222.416 1703.43 221.975 1703.43C221.303 1703.43 220.803 1703.21 220.475 1702.77C220.146 1702.33 219.982 1701.67 219.982 1700.77ZM231.449 1699.98C231.449 1699.15 231.316 1698.52 231.051 1698.09C230.785 1697.67 230.393 1697.45 229.873 1697.45C229.35 1697.45 228.953 1697.67 228.684 1698.1C228.414 1698.52 228.279 1699.15 228.279 1699.98C228.279 1700.81 228.414 1701.44 228.684 1701.87C228.953 1702.3 229.35 1702.51 229.873 1702.51C230.393 1702.51 230.785 1702.3 231.051 1701.88C231.316 1701.45 231.449 1700.82 231.449 1699.98ZM228.279 1697.53C228.451 1697.21 228.688 1696.97 228.988 1696.8C229.293 1696.62 229.645 1696.54 230.043 1696.54C230.832 1696.54 231.453 1696.84 231.906 1697.45C232.359 1698.06 232.586 1698.89 232.586 1699.96C232.586 1701.04 232.357 1701.89 231.9 1702.51C231.447 1703.12 230.824 1703.43 230.031 1703.43C229.641 1703.43 229.295 1703.34 228.994 1703.18C228.697 1703.01 228.459 1702.76 228.279 1702.43V1703.26H227.201V1694.14H228.279V1697.53ZM242.869 1695.48V1698.77H244.24C244.787 1698.77 245.213 1698.63 245.518 1698.34C245.826 1698.05 245.98 1697.64 245.98 1697.12C245.98 1696.6 245.828 1696.2 245.523 1695.92C245.219 1695.63 244.791 1695.48 244.24 1695.48H242.869ZM241.686 1694.51H244.24C245.217 1694.51 245.957 1694.73 246.461 1695.18C246.965 1695.62 247.217 1696.27 247.217 1697.12C247.217 1697.99 246.965 1698.64 246.461 1699.08C245.961 1699.52 245.221 1699.74 244.24 1699.74H242.869V1703.26H241.686V1694.51ZM248.904 1700.77V1696.71H249.982V1700.77C249.982 1701.36 250.086 1701.8 250.293 1702.08C250.504 1702.35 250.828 1702.49 251.266 1702.49C251.773 1702.49 252.162 1702.31 252.432 1701.96C252.701 1701.6 252.836 1701.09 252.836 1700.42V1696.71H253.92V1703.26H252.836V1702.27C252.645 1702.65 252.383 1702.94 252.051 1703.14C251.723 1703.33 251.338 1703.43 250.896 1703.43C250.225 1703.43 249.725 1703.21 249.396 1702.77C249.068 1702.33 248.904 1701.67 248.904 1700.77ZM259.205 1700.89C259.205 1701.37 259.293 1701.74 259.469 1701.98C259.648 1702.23 259.912 1702.35 260.26 1702.35H261.52V1703.26H260.154C259.51 1703.26 259.01 1703.05 258.654 1702.64C258.303 1702.23 258.127 1701.64 258.127 1700.89V1694.95H256.398V1694.11H259.205V1700.89ZM266.436 1700.89C266.436 1701.37 266.523 1701.74 266.699 1701.98C266.879 1702.23 267.143 1702.35 267.49 1702.35H268.75V1703.26H267.385C266.74 1703.26 266.24 1703.05 265.885 1702.64C265.533 1702.23 265.357 1701.64 265.357 1700.89V1694.95H263.629V1694.11H266.436V1700.89ZM281.137 1699.13C281.441 1699.21 281.701 1699.35 281.916 1699.57C282.131 1699.79 282.398 1700.22 282.719 1700.87L283.908 1703.26H282.637L281.594 1701.05C281.293 1700.42 281.021 1700.02 280.779 1699.84C280.541 1699.65 280.229 1699.56 279.842 1699.56H278.711V1703.26H277.521V1694.51H279.959C280.92 1694.51 281.656 1694.73 282.168 1695.16C282.68 1695.59 282.936 1696.22 282.936 1697.04C282.936 1697.62 282.777 1698.09 282.461 1698.46C282.148 1698.82 281.707 1699.05 281.137 1699.13ZM278.711 1695.48V1698.59H280.006C280.572 1698.59 280.994 1698.46 281.271 1698.21C281.549 1697.95 281.688 1697.57 281.688 1697.04C281.688 1696.54 281.539 1696.15 281.242 1695.89C280.949 1695.62 280.521 1695.48 279.959 1695.48H278.711ZM290.477 1699.44V1699.97H285.807V1700C285.775 1700.9 285.945 1701.54 286.316 1701.93C286.691 1702.32 287.219 1702.51 287.898 1702.51C288.242 1702.51 288.602 1702.46 288.977 1702.35C289.352 1702.24 289.752 1702.08 290.178 1701.85V1702.92C289.768 1703.09 289.371 1703.22 288.988 1703.3C288.609 1703.39 288.242 1703.43 287.887 1703.43C286.867 1703.43 286.07 1703.12 285.496 1702.51C284.922 1701.9 284.635 1701.06 284.635 1699.98C284.635 1698.94 284.916 1698.1 285.479 1697.48C286.041 1696.85 286.791 1696.54 287.729 1696.54C288.564 1696.54 289.223 1696.82 289.703 1697.39C290.188 1697.95 290.445 1698.64 290.477 1699.44ZM289.398 1699.12C289.352 1698.67 289.186 1698.28 288.9 1697.95C288.619 1697.62 288.213 1697.45 287.682 1697.45C287.162 1697.45 286.734 1697.62 286.398 1697.97C286.062 1698.31 285.879 1698.7 285.848 1699.13L289.398 1699.12ZM293.09 1700.01C293.09 1700.84 293.221 1701.47 293.482 1701.9C293.748 1702.33 294.141 1702.54 294.66 1702.54C295.18 1702.54 295.572 1702.33 295.838 1701.9C296.107 1701.47 296.242 1700.84 296.242 1700.01C296.242 1699.17 296.107 1698.55 295.838 1698.12C295.572 1697.69 295.18 1697.48 294.66 1697.48C294.141 1697.48 293.748 1697.69 293.482 1698.11C293.221 1698.54 293.09 1699.17 293.09 1700.01ZM296.242 1702.44C296.066 1702.77 295.828 1703.02 295.527 1703.19C295.23 1703.37 294.885 1703.45 294.49 1703.45C293.705 1703.45 293.084 1703.15 292.627 1702.54C292.174 1701.93 291.947 1701.1 291.947 1700.03C291.947 1698.94 292.174 1698.09 292.627 1697.48C293.08 1696.87 293.701 1696.56 294.49 1696.56C294.881 1696.56 295.225 1696.65 295.521 1696.82C295.822 1696.99 296.062 1697.23 296.242 1697.56V1696.72H297.326V1705.78H296.242V1702.44ZM299.518 1700.77V1696.71H300.596V1700.77C300.596 1701.36 300.699 1701.8 300.906 1702.08C301.117 1702.35 301.441 1702.49 301.879 1702.49C302.387 1702.49 302.775 1702.31 303.045 1701.96C303.314 1701.6 303.449 1701.09 303.449 1700.42V1696.71H304.533V1703.26H303.449V1702.27C303.258 1702.65 302.996 1702.94 302.664 1703.14C302.336 1703.33 301.951 1703.43 301.51 1703.43C300.838 1703.43 300.338 1703.21 300.01 1702.77C299.682 1702.33 299.518 1701.67 299.518 1700.77ZM312.168 1699.44V1699.97H307.498V1700C307.467 1700.9 307.637 1701.54 308.008 1701.93C308.383 1702.32 308.91 1702.51 309.59 1702.51C309.934 1702.51 310.293 1702.46 310.668 1702.35C311.043 1702.24 311.443 1702.08 311.869 1701.85V1702.92C311.459 1703.09 311.062 1703.22 310.68 1703.3C310.301 1703.39 309.934 1703.43 309.578 1703.43C308.559 1703.43 307.762 1703.12 307.188 1702.51C306.613 1701.9 306.326 1701.06 306.326 1699.98C306.326 1698.94 306.607 1698.1 307.17 1697.48C307.732 1696.85 308.482 1696.54 309.42 1696.54C310.256 1696.54 310.914 1696.82 311.395 1697.39C311.879 1697.95 312.137 1698.64 312.168 1699.44ZM311.09 1699.12C311.043 1698.67 310.877 1698.28 310.592 1697.95C310.311 1697.62 309.904 1697.45 309.373 1697.45C308.854 1697.45 308.426 1697.62 308.09 1697.97C307.754 1698.31 307.57 1698.7 307.539 1699.13L311.09 1699.12ZM318.537 1696.92V1697.98C318.229 1697.8 317.918 1697.67 317.605 1697.58C317.293 1697.49 316.975 1697.44 316.65 1697.44C316.162 1697.44 315.797 1697.52 315.555 1697.68C315.316 1697.84 315.197 1698.08 315.197 1698.4C315.197 1698.69 315.287 1698.91 315.467 1699.06C315.646 1699.2 316.094 1699.34 316.809 1699.48L317.242 1699.56C317.777 1699.66 318.182 1699.87 318.455 1700.17C318.732 1700.48 318.871 1700.87 318.871 1701.36C318.871 1702.01 318.641 1702.52 318.18 1702.88C317.719 1703.25 317.078 1703.43 316.258 1703.43C315.934 1703.43 315.594 1703.39 315.238 1703.32C314.883 1703.26 314.498 1703.16 314.084 1703.02V1701.91C314.486 1702.11 314.871 1702.27 315.238 1702.37C315.605 1702.48 315.953 1702.53 316.281 1702.53C316.758 1702.53 317.127 1702.43 317.389 1702.24C317.65 1702.04 317.781 1701.77 317.781 1701.42C317.781 1700.92 317.303 1700.58 316.346 1700.39L316.299 1700.38L315.895 1700.29C315.273 1700.17 314.82 1699.97 314.535 1699.68C314.25 1699.4 314.107 1699 314.107 1698.51C314.107 1697.88 314.32 1697.39 314.746 1697.05C315.172 1696.71 315.779 1696.54 316.568 1696.54C316.92 1696.54 317.258 1696.57 317.582 1696.64C317.906 1696.7 318.225 1696.8 318.537 1696.92ZM323.664 1694.83V1696.7H326.113V1697.53H323.664V1701.1C323.664 1701.58 323.756 1701.92 323.939 1702.11C324.123 1702.3 324.443 1702.4 324.9 1702.4H326.113V1703.26H324.795C323.986 1703.26 323.416 1703.1 323.084 1702.77C322.752 1702.45 322.586 1701.89 322.586 1701.1V1697.53H320.834V1696.7H322.586V1694.83H323.664ZM332.998 1696.92V1697.98C332.689 1697.8 332.379 1697.67 332.066 1697.58C331.754 1697.49 331.436 1697.44 331.111 1697.44C330.623 1697.44 330.258 1697.52 330.016 1697.68C329.777 1697.84 329.658 1698.08 329.658 1698.4C329.658 1698.69 329.748 1698.91 329.928 1699.06C330.107 1699.2 330.555 1699.34 331.27 1699.48L331.703 1699.56C332.238 1699.66 332.643 1699.87 332.916 1700.17C333.193 1700.48 333.332 1700.87 333.332 1701.36C333.332 1702.01 333.102 1702.52 332.641 1702.88C332.18 1703.25 331.539 1703.43 330.719 1703.43C330.395 1703.43 330.055 1703.39 329.699 1703.32C329.344 1703.26 328.959 1703.16 328.545 1703.02V1701.91C328.947 1702.11 329.332 1702.27 329.699 1702.37C330.066 1702.48 330.414 1702.53 330.742 1702.53C331.219 1702.53 331.588 1702.43 331.85 1702.24C332.111 1702.04 332.242 1701.77 332.242 1701.42C332.242 1700.92 331.764 1700.58 330.807 1700.39L330.76 1700.38L330.355 1700.29C329.734 1700.17 329.281 1699.97 328.996 1699.68C328.711 1699.4 328.568 1699 328.568 1698.51C328.568 1697.88 328.781 1697.39 329.207 1697.05C329.633 1696.71 330.24 1696.54 331.029 1696.54C331.381 1696.54 331.719 1696.57 332.043 1696.64C332.367 1696.7 332.686 1696.8 332.998 1696.92ZM344.963 1697.94L347.4 1701.22C347.553 1701.03 347.666 1700.79 347.74 1700.49C347.814 1700.2 347.852 1699.85 347.852 1699.44C347.852 1699.32 347.846 1699.12 347.834 1698.85L347.828 1698.81H348.789V1699.03C348.789 1699.66 348.717 1700.22 348.572 1700.69C348.428 1701.17 348.209 1701.57 347.916 1701.92L348.912 1703.26H347.664L347.207 1702.62C346.883 1702.89 346.539 1703.1 346.176 1703.23C345.812 1703.36 345.424 1703.43 345.01 1703.43C344.166 1703.43 343.469 1703.17 342.918 1702.64C342.367 1702.12 342.092 1701.45 342.092 1700.66C342.092 1700.12 342.227 1699.63 342.496 1699.17C342.766 1698.71 343.172 1698.29 343.715 1697.9C343.52 1697.62 343.375 1697.34 343.281 1697.07C343.188 1696.8 343.141 1696.53 343.141 1696.25C343.141 1695.67 343.334 1695.2 343.721 1694.86C344.111 1694.52 344.645 1694.35 345.32 1694.35C345.574 1694.35 345.828 1694.38 346.082 1694.42C346.34 1694.47 346.605 1694.54 346.879 1694.63V1695.7C346.648 1695.55 346.41 1695.44 346.164 1695.37C345.922 1695.29 345.666 1695.26 345.396 1695.26C345.018 1695.26 344.719 1695.34 344.5 1695.52C344.281 1695.7 344.172 1695.94 344.172 1696.24C344.172 1696.47 344.229 1696.71 344.342 1696.97C344.455 1697.22 344.662 1697.54 344.963 1697.94ZM344.195 1698.55C343.836 1698.84 343.566 1699.14 343.387 1699.46C343.211 1699.78 343.123 1700.12 343.123 1700.48C343.123 1701.07 343.318 1701.56 343.709 1701.95C344.1 1702.33 344.598 1702.53 345.203 1702.53C345.367 1702.53 345.539 1702.5 345.719 1702.46C345.898 1702.41 346.074 1702.34 346.246 1702.25C346.352 1702.19 346.438 1702.14 346.504 1702.1C346.574 1702.05 346.641 1702 346.703 1701.95L344.195 1698.55ZM357.396 1694.51H362.254V1695.51H360.42V1702.26H362.254V1703.26H357.396V1702.26H359.23V1695.51H357.396V1694.51ZM369.15 1696.92V1697.98C368.842 1697.8 368.531 1697.67 368.219 1697.58C367.906 1697.49 367.588 1697.44 367.264 1697.44C366.775 1697.44 366.41 1697.52 366.168 1697.68C365.93 1697.84 365.811 1698.08 365.811 1698.4C365.811 1698.69 365.9 1698.91 366.08 1699.06C366.26 1699.2 366.707 1699.34 367.422 1699.48L367.855 1699.56C368.391 1699.66 368.795 1699.87 369.068 1700.17C369.346 1700.48 369.484 1700.87 369.484 1701.36C369.484 1702.01 369.254 1702.52 368.793 1702.88C368.332 1703.25 367.691 1703.43 366.871 1703.43C366.547 1703.43 366.207 1703.39 365.852 1703.32C365.496 1703.26 365.111 1703.16 364.697 1703.02V1701.91C365.1 1702.11 365.484 1702.27 365.852 1702.37C366.219 1702.48 366.566 1702.53 366.895 1702.53C367.371 1702.53 367.74 1702.43 368.002 1702.24C368.264 1702.04 368.395 1701.77 368.395 1701.42C368.395 1700.92 367.916 1700.58 366.959 1700.39L366.912 1700.38L366.508 1700.29C365.887 1700.17 365.434 1699.97 365.148 1699.68C364.863 1699.4 364.721 1699 364.721 1698.51C364.721 1697.88 364.934 1697.39 365.359 1697.05C365.785 1696.71 366.393 1696.54 367.182 1696.54C367.533 1696.54 367.871 1696.57 368.195 1696.64C368.52 1696.7 368.838 1696.8 369.15 1696.92ZM376.381 1696.92V1697.98C376.072 1697.8 375.762 1697.67 375.449 1697.58C375.137 1697.49 374.818 1697.44 374.494 1697.44C374.006 1697.44 373.641 1697.52 373.398 1697.68C373.16 1697.84 373.041 1698.08 373.041 1698.4C373.041 1698.69 373.131 1698.91 373.311 1699.06C373.49 1699.2 373.938 1699.34 374.652 1699.48L375.086 1699.56C375.621 1699.66 376.025 1699.87 376.299 1700.17C376.576 1700.48 376.715 1700.87 376.715 1701.36C376.715 1702.01 376.484 1702.52 376.023 1702.88C375.562 1703.25 374.922 1703.43 374.102 1703.43C373.777 1703.43 373.438 1703.39 373.082 1703.32C372.727 1703.26 372.342 1703.16 371.928 1703.02V1701.91C372.33 1702.11 372.715 1702.27 373.082 1702.37C373.449 1702.48 373.797 1702.53 374.125 1702.53C374.602 1702.53 374.971 1702.43 375.232 1702.24C375.494 1702.04 375.625 1701.77 375.625 1701.42C375.625 1700.92 375.146 1700.58 374.189 1700.39L374.143 1700.38L373.738 1700.29C373.117 1700.17 372.664 1699.97 372.379 1699.68C372.094 1699.4 371.951 1699 371.951 1698.51C371.951 1697.88 372.164 1697.39 372.59 1697.05C373.016 1696.71 373.623 1696.54 374.412 1696.54C374.764 1696.54 375.102 1696.57 375.426 1696.64C375.75 1696.7 376.068 1696.8 376.381 1696.92ZM379.053 1700.77V1696.71H380.131V1700.77C380.131 1701.36 380.234 1701.8 380.441 1702.08C380.652 1702.35 380.977 1702.49 381.414 1702.49C381.922 1702.49 382.311 1702.31 382.58 1701.96C382.85 1701.6 382.984 1701.09 382.984 1700.42V1696.71H384.068V1703.26H382.984V1702.27C382.793 1702.65 382.531 1702.94 382.199 1703.14C381.871 1703.33 381.486 1703.43 381.045 1703.43C380.373 1703.43 379.873 1703.21 379.545 1702.77C379.217 1702.33 379.053 1701.67 379.053 1700.77ZM391.703 1699.44V1699.97H387.033V1700C387.002 1700.9 387.172 1701.54 387.543 1701.93C387.918 1702.32 388.445 1702.51 389.125 1702.51C389.469 1702.51 389.828 1702.46 390.203 1702.35C390.578 1702.24 390.979 1702.08 391.404 1701.85V1702.92C390.994 1703.09 390.598 1703.22 390.215 1703.3C389.836 1703.39 389.469 1703.43 389.113 1703.43C388.094 1703.43 387.297 1703.12 386.723 1702.51C386.148 1701.9 385.861 1701.06 385.861 1699.98C385.861 1698.94 386.143 1698.1 386.705 1697.48C387.268 1696.85 388.018 1696.54 388.955 1696.54C389.791 1696.54 390.449 1696.82 390.93 1697.39C391.414 1697.95 391.672 1698.64 391.703 1699.44ZM390.625 1699.12C390.578 1698.67 390.412 1698.28 390.127 1697.95C389.846 1697.62 389.439 1697.45 388.908 1697.45C388.389 1697.45 387.961 1697.62 387.625 1697.97C387.289 1698.31 387.105 1698.7 387.074 1699.13L390.625 1699.12ZM398.072 1696.92V1697.98C397.764 1697.8 397.453 1697.67 397.141 1697.58C396.828 1697.49 396.51 1697.44 396.186 1697.44C395.697 1697.44 395.332 1697.52 395.09 1697.68C394.852 1697.84 394.732 1698.08 394.732 1698.4C394.732 1698.69 394.822 1698.91 395.002 1699.06C395.182 1699.2 395.629 1699.34 396.344 1699.48L396.777 1699.56C397.312 1699.66 397.717 1699.87 397.99 1700.17C398.268 1700.48 398.406 1700.87 398.406 1701.36C398.406 1702.01 398.176 1702.52 397.715 1702.88C397.254 1703.25 396.613 1703.43 395.793 1703.43C395.469 1703.43 395.129 1703.39 394.773 1703.32C394.418 1703.26 394.033 1703.16 393.619 1703.02V1701.91C394.021 1702.11 394.406 1702.27 394.773 1702.37C395.141 1702.48 395.488 1702.53 395.816 1702.53C396.293 1702.53 396.662 1702.43 396.924 1702.24C397.186 1702.04 397.316 1701.77 397.316 1701.42C397.316 1700.92 396.838 1700.58 395.881 1700.39L395.834 1700.38L395.43 1700.29C394.809 1700.17 394.355 1699.97 394.07 1699.68C393.785 1699.4 393.643 1699 393.643 1698.51C393.643 1697.88 393.855 1697.39 394.281 1697.05C394.707 1696.71 395.314 1696.54 396.104 1696.54C396.455 1696.54 396.793 1696.57 397.117 1696.64C397.441 1696.7 397.76 1696.8 398.072 1696.92ZM407.986 1694.51H413.178V1695.51H409.17V1697.86H413.002V1698.86H409.17V1702.26H413.289V1703.26H407.986V1694.51ZM420.613 1696.7L418.264 1699.84L420.842 1703.26H419.594L417.672 1700.63L415.756 1703.26H414.508L417.086 1699.84L414.736 1696.7H415.932L417.672 1699.07L419.4 1696.7H420.613ZM424.891 1694.83V1696.7H427.34V1697.53H424.891V1701.1C424.891 1701.58 424.982 1701.92 425.166 1702.11C425.35 1702.3 425.67 1702.4 426.127 1702.4H427.34V1703.26H426.021C425.213 1703.26 424.643 1703.1 424.311 1702.77C423.979 1702.45 423.812 1701.89 423.812 1701.1V1697.53H422.061V1696.7H423.812V1694.83H424.891ZM435.086 1699.44V1699.97H430.416V1700C430.385 1700.9 430.555 1701.54 430.926 1701.93C431.301 1702.32 431.828 1702.51 432.508 1702.51C432.852 1702.51 433.211 1702.46 433.586 1702.35C433.961 1702.24 434.361 1702.08 434.787 1701.85V1702.92C434.377 1703.09 433.98 1703.22 433.598 1703.3C433.219 1703.39 432.852 1703.43 432.496 1703.43C431.477 1703.43 430.68 1703.12 430.105 1702.51C429.531 1701.9 429.244 1701.06 429.244 1699.98C429.244 1698.94 429.525 1698.1 430.088 1697.48C430.65 1696.85 431.4 1696.54 432.338 1696.54C433.174 1696.54 433.832 1696.82 434.312 1697.39C434.797 1697.95 435.055 1698.64 435.086 1699.44ZM434.008 1699.12C433.961 1698.67 433.795 1698.28 433.51 1697.95C433.229 1697.62 432.822 1697.45 432.291 1697.45C431.771 1697.45 431.344 1697.62 431.008 1697.97C430.672 1698.31 430.488 1698.7 430.457 1699.13L434.008 1699.12ZM441.912 1699.19V1703.26H440.828V1699.19C440.828 1698.6 440.725 1698.17 440.518 1697.89C440.311 1697.61 439.986 1697.48 439.545 1697.48C439.041 1697.48 438.652 1697.66 438.379 1698.01C438.109 1698.37 437.975 1698.88 437.975 1699.55V1703.26H436.896V1696.7H437.975V1697.68C438.166 1697.31 438.426 1697.02 438.754 1696.83C439.082 1696.64 439.471 1696.54 439.92 1696.54C440.588 1696.54 441.086 1696.76 441.414 1697.2C441.746 1697.64 441.912 1698.3 441.912 1699.19ZM448.686 1696.92V1697.98C448.377 1697.8 448.066 1697.67 447.754 1697.58C447.441 1697.49 447.123 1697.44 446.799 1697.44C446.311 1697.44 445.945 1697.52 445.703 1697.68C445.465 1697.84 445.346 1698.08 445.346 1698.4C445.346 1698.69 445.436 1698.91 445.615 1699.06C445.795 1699.2 446.242 1699.34 446.957 1699.48L447.391 1699.56C447.926 1699.66 448.33 1699.87 448.604 1700.17C448.881 1700.48 449.02 1700.87 449.02 1701.36C449.02 1702.01 448.789 1702.52 448.328 1702.88C447.867 1703.25 447.227 1703.43 446.406 1703.43C446.082 1703.43 445.742 1703.39 445.387 1703.32C445.031 1703.26 444.646 1703.16 444.232 1703.02V1701.91C444.635 1702.11 445.02 1702.27 445.387 1702.37C445.754 1702.48 446.102 1702.53 446.43 1702.53C446.906 1702.53 447.275 1702.43 447.537 1702.24C447.799 1702.04 447.93 1701.77 447.93 1701.42C447.93 1700.92 447.451 1700.58 446.494 1700.39L446.447 1700.38L446.043 1700.29C445.422 1700.17 444.969 1699.97 444.684 1699.68C444.398 1699.4 444.256 1699 444.256 1698.51C444.256 1697.88 444.469 1697.39 444.895 1697.05C445.32 1696.71 445.928 1696.54 446.717 1696.54C447.068 1696.54 447.406 1696.57 447.73 1696.64C448.055 1696.7 448.373 1696.8 448.686 1696.92ZM452.066 1696.72H454.826V1702.42H456.965V1703.26H451.609V1702.42H453.748V1697.56H452.066V1696.72ZM453.748 1694.17H454.826V1695.53H453.748V1694.17ZM461.055 1697.45C460.508 1697.45 460.094 1697.67 459.812 1698.09C459.531 1698.52 459.391 1699.15 459.391 1699.98C459.391 1700.82 459.531 1701.45 459.812 1701.88C460.094 1702.3 460.508 1702.51 461.055 1702.51C461.605 1702.51 462.021 1702.3 462.303 1701.88C462.584 1701.45 462.725 1700.82 462.725 1699.98C462.725 1699.15 462.584 1698.52 462.303 1698.09C462.021 1697.67 461.605 1697.45 461.055 1697.45ZM461.055 1696.54C461.965 1696.54 462.66 1696.83 463.141 1697.42C463.625 1698.01 463.867 1698.87 463.867 1699.98C463.867 1701.1 463.627 1701.96 463.146 1702.55C462.666 1703.14 461.969 1703.43 461.055 1703.43C460.145 1703.43 459.449 1703.14 458.969 1702.55C458.488 1701.96 458.248 1701.1 458.248 1699.98C458.248 1698.87 458.488 1698.01 458.969 1697.42C459.449 1696.83 460.145 1696.54 461.055 1696.54ZM470.834 1699.19V1703.26H469.75V1699.19C469.75 1698.6 469.646 1698.17 469.439 1697.89C469.232 1697.61 468.908 1697.48 468.467 1697.48C467.963 1697.48 467.574 1697.66 467.301 1698.01C467.031 1698.37 466.896 1698.88 466.896 1699.55V1703.26H465.818V1696.7H466.896V1697.68C467.088 1697.31 467.348 1697.02 467.676 1696.83C468.004 1696.64 468.393 1696.54 468.842 1696.54C469.51 1696.54 470.008 1696.76 470.336 1697.2C470.668 1697.64 470.834 1698.3 470.834 1699.19ZM477.443 1694.19V1697.78H476.131V1694.19H477.443ZM474.32 1694.19V1697.78H473.008V1694.19H474.32ZM231.607 1712.19V1715.78H230.295V1712.19H231.607ZM228.484 1712.19V1715.78H227.172V1712.19H228.484ZM237.754 1717.13C238.059 1717.21 238.318 1717.35 238.533 1717.57C238.748 1717.79 239.016 1718.22 239.336 1718.87L240.525 1721.26H239.254L238.211 1719.05C237.91 1718.42 237.639 1718.02 237.396 1717.84C237.158 1717.65 236.846 1717.56 236.459 1717.56H235.328V1721.26H234.139V1712.51H236.576C237.537 1712.51 238.273 1712.73 238.785 1713.16C239.297 1713.59 239.553 1714.22 239.553 1715.04C239.553 1715.62 239.395 1716.09 239.078 1716.46C238.766 1716.82 238.324 1717.05 237.754 1717.13ZM235.328 1713.48V1716.59H236.623C237.189 1716.59 237.611 1716.46 237.889 1716.21C238.166 1715.95 238.305 1715.57 238.305 1715.04C238.305 1714.54 238.156 1714.15 237.859 1713.89C237.566 1713.62 237.139 1713.48 236.576 1713.48H235.328ZM247.094 1717.44V1717.97H242.424V1718C242.393 1718.9 242.562 1719.54 242.934 1719.93C243.309 1720.32 243.836 1720.51 244.516 1720.51C244.859 1720.51 245.219 1720.46 245.594 1720.35C245.969 1720.24 246.369 1720.08 246.795 1719.85V1720.92C246.385 1721.09 245.988 1721.22 245.605 1721.3C245.227 1721.39 244.859 1721.43 244.504 1721.43C243.484 1721.43 242.688 1721.12 242.113 1720.51C241.539 1719.9 241.252 1719.06 241.252 1717.98C241.252 1716.94 241.533 1716.1 242.096 1715.48C242.658 1714.85 243.408 1714.54 244.346 1714.54C245.182 1714.54 245.84 1714.82 246.32 1715.39C246.805 1715.95 247.062 1716.64 247.094 1717.44ZM246.016 1717.12C245.969 1716.67 245.803 1716.28 245.518 1715.95C245.236 1715.62 244.83 1715.45 244.299 1715.45C243.779 1715.45 243.352 1715.62 243.016 1715.97C242.68 1716.31 242.496 1716.7 242.465 1717.13L246.016 1717.12ZM248.348 1714.7H249.467L251.371 1720.2L253.281 1714.7H254.4L252.068 1721.26H250.68L248.348 1714.7ZM259.105 1717.96H258.748C258.119 1717.96 257.645 1718.07 257.324 1718.29C257.008 1718.51 256.85 1718.84 256.85 1719.28C256.85 1719.67 256.969 1719.98 257.207 1720.2C257.445 1720.42 257.775 1720.53 258.197 1720.53C258.791 1720.53 259.258 1720.32 259.598 1719.91C259.938 1719.5 260.109 1718.93 260.113 1718.2V1717.96H259.105ZM261.197 1717.51V1721.26H260.113V1720.29C259.883 1720.68 259.592 1720.97 259.24 1721.15C258.893 1721.34 258.469 1721.43 257.969 1721.43C257.301 1721.43 256.768 1721.24 256.369 1720.87C255.971 1720.49 255.771 1719.98 255.771 1719.35C255.771 1718.62 256.016 1718.06 256.504 1717.68C256.996 1717.31 257.717 1717.12 258.666 1717.12H260.113V1716.95C260.109 1716.42 259.977 1716.04 259.715 1715.81C259.453 1715.57 259.035 1715.45 258.461 1715.45C258.094 1715.45 257.723 1715.51 257.348 1715.61C256.973 1715.72 256.607 1715.87 256.252 1716.07V1715C256.65 1714.84 257.031 1714.73 257.395 1714.66C257.762 1714.58 258.117 1714.54 258.461 1714.54C259.004 1714.54 259.467 1714.62 259.85 1714.78C260.236 1714.94 260.549 1715.18 260.787 1715.5C260.936 1715.69 261.041 1715.94 261.104 1716.23C261.166 1716.51 261.197 1716.94 261.197 1717.51ZM266.184 1715.36C266.316 1715.08 266.484 1714.88 266.688 1714.74C266.895 1714.61 267.143 1714.54 267.432 1714.54C267.959 1714.54 268.33 1714.74 268.545 1715.15C268.764 1715.56 268.873 1716.33 268.873 1717.46V1721.26H267.889V1717.5C267.889 1716.58 267.836 1716 267.73 1715.78C267.629 1715.55 267.441 1715.44 267.168 1715.44C266.855 1715.44 266.641 1715.56 266.523 1715.8C266.41 1716.04 266.354 1716.61 266.354 1717.5V1721.26H265.369V1717.5C265.369 1716.57 265.312 1715.99 265.199 1715.77C265.09 1715.55 264.891 1715.44 264.602 1715.44C264.316 1715.44 264.117 1715.56 264.004 1715.8C263.895 1716.04 263.84 1716.61 263.84 1717.5V1721.26H262.861V1714.7H263.84V1715.26C263.969 1715.02 264.129 1714.85 264.32 1714.73C264.516 1714.6 264.736 1714.54 264.982 1714.54C265.279 1714.54 265.525 1714.61 265.721 1714.74C265.92 1714.88 266.074 1715.09 266.184 1715.36ZM271.65 1720.43V1723.76H270.566V1714.7H271.65V1715.53C271.83 1715.21 272.068 1714.96 272.365 1714.8C272.666 1714.62 273.012 1714.54 273.402 1714.54C274.195 1714.54 274.816 1714.84 275.266 1715.46C275.719 1716.07 275.945 1716.92 275.945 1718.01C275.945 1719.07 275.719 1719.91 275.266 1720.52C274.812 1721.13 274.191 1721.43 273.402 1721.43C273.004 1721.43 272.654 1721.34 272.354 1721.18C272.057 1721.01 271.822 1720.76 271.65 1720.43ZM274.814 1717.98C274.814 1717.15 274.682 1716.52 274.416 1716.09C274.154 1715.67 273.764 1715.45 273.244 1715.45C272.721 1715.45 272.324 1715.67 272.055 1716.1C271.785 1716.52 271.65 1717.15 271.65 1717.98C271.65 1718.81 271.785 1719.44 272.055 1719.87C272.324 1720.3 272.721 1720.51 273.244 1720.51C273.764 1720.51 274.154 1720.3 274.416 1719.88C274.682 1719.45 274.814 1718.82 274.814 1717.98ZM283.246 1717.44V1717.97H278.576V1718C278.545 1718.9 278.715 1719.54 279.086 1719.93C279.461 1720.32 279.988 1720.51 280.668 1720.51C281.012 1720.51 281.371 1720.46 281.746 1720.35C282.121 1720.24 282.521 1720.08 282.947 1719.85V1720.92C282.537 1721.09 282.141 1721.22 281.758 1721.3C281.379 1721.39 281.012 1721.43 280.656 1721.43C279.637 1721.43 278.84 1721.12 278.266 1720.51C277.691 1719.9 277.404 1719.06 277.404 1717.98C277.404 1716.94 277.686 1716.1 278.248 1715.48C278.811 1714.85 279.561 1714.54 280.498 1714.54C281.334 1714.54 281.992 1714.82 282.473 1715.39C282.957 1715.95 283.215 1716.64 283.246 1717.44ZM282.168 1717.12C282.121 1716.67 281.955 1716.28 281.67 1715.95C281.389 1715.62 280.982 1715.45 280.451 1715.45C279.932 1715.45 279.504 1715.62 279.168 1715.97C278.832 1716.31 278.648 1716.7 278.617 1717.13L282.168 1717.12ZM288.941 1715.53V1712.14H290.02V1721.26H288.941V1720.43C288.762 1720.76 288.521 1721.01 288.221 1721.18C287.924 1721.34 287.58 1721.43 287.189 1721.43C286.396 1721.43 285.771 1721.12 285.314 1720.51C284.861 1719.89 284.635 1719.04 284.635 1717.96C284.635 1716.89 284.863 1716.06 285.32 1715.45C285.777 1714.84 286.4 1714.54 287.189 1714.54C287.584 1714.54 287.932 1714.62 288.232 1714.8C288.533 1714.96 288.77 1715.21 288.941 1715.53ZM285.771 1717.98C285.771 1718.82 285.904 1719.45 286.17 1719.88C286.436 1720.3 286.828 1720.51 287.348 1720.51C287.867 1720.51 288.262 1720.3 288.531 1719.87C288.805 1719.44 288.941 1718.81 288.941 1717.98C288.941 1717.15 288.805 1716.52 288.531 1716.1C288.262 1715.67 287.867 1715.45 287.348 1715.45C286.828 1715.45 286.436 1715.67 286.17 1716.09C285.904 1716.52 285.771 1717.15 285.771 1717.98ZM299.236 1717.9V1712.51H300.426V1718.44C300.426 1718.87 300.438 1719.17 300.461 1719.35C300.484 1719.53 300.525 1719.67 300.584 1719.77C300.709 1720 300.889 1720.17 301.123 1720.29C301.361 1720.41 301.648 1720.47 301.984 1720.47C302.324 1720.47 302.611 1720.41 302.846 1720.29C303.08 1720.17 303.262 1720 303.391 1719.77C303.449 1719.67 303.49 1719.53 303.514 1719.35C303.537 1719.17 303.549 1718.87 303.549 1718.45V1712.51H304.732V1717.9C304.732 1718.8 304.676 1719.43 304.562 1719.81C304.453 1720.19 304.262 1720.5 303.988 1720.74C303.73 1720.97 303.436 1721.15 303.104 1721.26C302.771 1721.37 302.398 1721.43 301.984 1721.43C301.574 1721.43 301.203 1721.37 300.871 1721.26C300.539 1721.15 300.242 1720.97 299.98 1720.74C299.711 1720.5 299.52 1720.19 299.406 1719.81C299.293 1719.42 299.236 1718.78 299.236 1717.9ZM306.783 1712.51H311.641V1713.51H309.807V1720.26H311.641V1721.26H306.783V1720.26H308.617V1713.51H306.783V1712.51ZM326.295 1712.14V1713.04H325.07C324.684 1713.04 324.414 1713.12 324.262 1713.28C324.113 1713.43 324.039 1713.71 324.039 1714.12V1714.7H326.295V1715.53H324.039V1721.26H322.961V1715.53H321.209V1714.7H322.961V1714.24C322.961 1713.52 323.125 1712.99 323.453 1712.65C323.785 1712.31 324.301 1712.14 325 1712.14H326.295ZM330.906 1715.45C330.359 1715.45 329.945 1715.67 329.664 1716.09C329.383 1716.52 329.242 1717.15 329.242 1717.98C329.242 1718.82 329.383 1719.45 329.664 1719.88C329.945 1720.3 330.359 1720.51 330.906 1720.51C331.457 1720.51 331.873 1720.3 332.154 1719.88C332.436 1719.45 332.576 1718.82 332.576 1717.98C332.576 1717.15 332.436 1716.52 332.154 1716.09C331.873 1715.67 331.457 1715.45 330.906 1715.45ZM330.906 1714.54C331.816 1714.54 332.512 1714.83 332.992 1715.42C333.477 1716.01 333.719 1716.87 333.719 1717.98C333.719 1719.1 333.479 1719.96 332.998 1720.55C332.518 1721.14 331.82 1721.43 330.906 1721.43C329.996 1721.43 329.301 1721.14 328.82 1720.55C328.34 1719.96 328.1 1719.1 328.1 1717.98C328.1 1716.87 328.34 1716.01 328.82 1715.42C329.301 1714.83 329.996 1714.54 330.906 1714.54ZM341.295 1716.05C341.064 1715.87 340.83 1715.74 340.592 1715.66C340.354 1715.58 340.092 1715.53 339.807 1715.53C339.135 1715.53 338.621 1715.75 338.266 1716.17C337.91 1716.59 337.732 1717.2 337.732 1718V1721.26H336.648V1714.7H337.732V1715.98C337.912 1715.51 338.188 1715.16 338.559 1714.91C338.934 1714.66 339.377 1714.54 339.889 1714.54C340.154 1714.54 340.402 1714.57 340.633 1714.64C340.863 1714.7 341.084 1714.81 341.295 1714.95V1716.05ZM352.586 1712.83V1714.7H355.035V1715.53H352.586V1719.1C352.586 1719.58 352.678 1719.92 352.861 1720.11C353.045 1720.3 353.365 1720.4 353.822 1720.4H355.035V1721.26H353.717C352.908 1721.26 352.338 1721.1 352.006 1720.77C351.674 1720.45 351.508 1719.89 351.508 1719.1V1715.53H349.756V1714.7H351.508V1712.83H352.586ZM362.377 1717.19V1721.26H361.293V1717.19C361.293 1716.6 361.189 1716.17 360.982 1715.89C360.775 1715.61 360.451 1715.48 360.01 1715.48C359.506 1715.48 359.117 1715.66 358.844 1716.01C358.574 1716.37 358.439 1716.88 358.439 1717.55V1721.26H357.361V1712.14H358.439V1715.68C358.631 1715.31 358.891 1715.02 359.219 1714.83C359.547 1714.64 359.936 1714.54 360.385 1714.54C361.053 1714.54 361.551 1714.76 361.879 1715.2C362.211 1715.64 362.377 1716.3 362.377 1717.19ZM370.012 1717.44V1717.97H365.342V1718C365.311 1718.9 365.48 1719.54 365.852 1719.93C366.227 1720.32 366.754 1720.51 367.434 1720.51C367.777 1720.51 368.137 1720.46 368.512 1720.35C368.887 1720.24 369.287 1720.08 369.713 1719.85V1720.92C369.303 1721.09 368.906 1721.22 368.523 1721.3C368.145 1721.39 367.777 1721.43 367.422 1721.43C366.402 1721.43 365.605 1721.12 365.031 1720.51C364.457 1719.9 364.17 1719.06 364.17 1717.98C364.17 1716.94 364.451 1716.1 365.014 1715.48C365.576 1714.85 366.326 1714.54 367.264 1714.54C368.1 1714.54 368.758 1714.82 369.238 1715.39C369.723 1715.95 369.98 1716.64 370.012 1717.44ZM368.934 1717.12C368.887 1716.67 368.721 1716.28 368.436 1715.95C368.154 1715.62 367.748 1715.45 367.217 1715.45C366.697 1715.45 366.27 1715.62 365.934 1715.97C365.598 1716.31 365.414 1716.7 365.383 1717.13L368.934 1717.12ZM381.871 1715.36C382.004 1715.08 382.172 1714.88 382.375 1714.74C382.582 1714.61 382.83 1714.54 383.119 1714.54C383.646 1714.54 384.018 1714.74 384.232 1715.15C384.451 1715.56 384.561 1716.33 384.561 1717.46V1721.26H383.576V1717.5C383.576 1716.58 383.523 1716 383.418 1715.78C383.316 1715.55 383.129 1715.44 382.855 1715.44C382.543 1715.44 382.328 1715.56 382.211 1715.8C382.098 1716.04 382.041 1716.61 382.041 1717.5V1721.26H381.057V1717.5C381.057 1716.57 381 1715.99 380.887 1715.77C380.777 1715.55 380.578 1715.44 380.289 1715.44C380.004 1715.44 379.805 1715.56 379.691 1715.8C379.582 1716.04 379.527 1716.61 379.527 1717.5V1721.26H378.549V1714.7H379.527V1715.26C379.656 1715.02 379.816 1714.85 380.008 1714.73C380.203 1714.6 380.424 1714.54 380.67 1714.54C380.967 1714.54 381.213 1714.61 381.408 1714.74C381.607 1714.88 381.762 1715.09 381.871 1715.36ZM386.283 1718.77V1714.71H387.361V1718.77C387.361 1719.36 387.465 1719.8 387.672 1720.08C387.883 1720.35 388.207 1720.49 388.645 1720.49C389.152 1720.49 389.541 1720.31 389.811 1719.96C390.08 1719.6 390.215 1719.09 390.215 1718.42V1714.71H391.299V1721.26H390.215V1720.27C390.023 1720.65 389.762 1720.94 389.43 1721.14C389.102 1721.33 388.717 1721.43 388.275 1721.43C387.604 1721.43 387.104 1721.21 386.775 1720.77C386.447 1720.33 386.283 1719.67 386.283 1718.77ZM398.588 1720.92C398.299 1721.09 398 1721.22 397.691 1721.3C397.387 1721.39 397.074 1721.43 396.754 1721.43C395.738 1721.43 394.943 1721.12 394.369 1720.51C393.799 1719.91 393.514 1719.06 393.514 1717.98C393.514 1716.91 393.799 1716.06 394.369 1715.45C394.943 1714.84 395.738 1714.54 396.754 1714.54C397.07 1714.54 397.379 1714.58 397.68 1714.66C397.98 1714.74 398.283 1714.87 398.588 1715.04V1716.17C398.303 1715.92 398.016 1715.74 397.727 1715.62C397.441 1715.51 397.117 1715.45 396.754 1715.45C396.078 1715.45 395.559 1715.67 395.195 1716.11C394.832 1716.55 394.65 1717.17 394.65 1717.98C394.65 1718.79 394.832 1719.42 395.195 1719.86C395.562 1720.3 396.082 1720.51 396.754 1720.51C397.129 1720.51 397.465 1720.46 397.762 1720.34C398.059 1720.23 398.334 1720.05 398.588 1719.81V1720.92ZM405.76 1717.19V1721.26H404.676V1717.19C404.676 1716.6 404.572 1716.17 404.365 1715.89C404.158 1715.61 403.834 1715.48 403.393 1715.48C402.889 1715.48 402.5 1715.66 402.227 1716.01C401.957 1716.37 401.822 1716.88 401.822 1717.55V1721.26H400.744V1712.14H401.822V1715.68C402.014 1715.31 402.273 1715.02 402.602 1714.83C402.93 1714.64 403.318 1714.54 403.768 1714.54C404.436 1714.54 404.934 1714.76 405.262 1715.2C405.594 1715.64 405.76 1716.3 405.76 1717.19ZM407.43 1717.02H413.641V1718.01H407.43V1717.02ZM418.275 1718.89C418.275 1719.37 418.363 1719.74 418.539 1719.98C418.719 1720.23 418.982 1720.35 419.33 1720.35H420.59V1721.26H419.225C418.58 1721.26 418.08 1721.05 417.725 1720.64C417.373 1720.23 417.197 1719.64 417.197 1718.89V1712.95H415.469V1712.11H418.275V1718.89ZM424.902 1715.45C424.355 1715.45 423.941 1715.67 423.66 1716.09C423.379 1716.52 423.238 1717.15 423.238 1717.98C423.238 1718.82 423.379 1719.45 423.66 1719.88C423.941 1720.3 424.355 1720.51 424.902 1720.51C425.453 1720.51 425.869 1720.3 426.15 1719.88C426.432 1719.45 426.572 1718.82 426.572 1717.98C426.572 1717.15 426.432 1716.52 426.15 1716.09C425.869 1715.67 425.453 1715.45 424.902 1715.45ZM424.902 1714.54C425.812 1714.54 426.508 1714.83 426.988 1715.42C427.473 1716.01 427.715 1716.87 427.715 1717.98C427.715 1719.1 427.475 1719.96 426.994 1720.55C426.514 1721.14 425.816 1721.43 424.902 1721.43C423.992 1721.43 423.297 1721.14 422.816 1720.55C422.336 1719.96 422.096 1719.1 422.096 1717.98C422.096 1716.87 422.336 1716.01 422.816 1715.42C423.297 1714.83 423.992 1714.54 424.902 1714.54ZM429.109 1714.7H430.229L432.133 1720.2L434.043 1714.7H435.162L432.83 1721.26H431.441L429.109 1714.7ZM442.316 1717.44V1717.97H437.646V1718C437.615 1718.9 437.785 1719.54 438.156 1719.93C438.531 1720.32 439.059 1720.51 439.738 1720.51C440.082 1720.51 440.441 1720.46 440.816 1720.35C441.191 1720.24 441.592 1720.08 442.018 1719.85V1720.92C441.607 1721.09 441.211 1721.22 440.828 1721.3C440.449 1721.39 440.082 1721.43 439.727 1721.43C438.707 1721.43 437.91 1721.12 437.336 1720.51C436.762 1719.9 436.475 1719.06 436.475 1717.98C436.475 1716.94 436.756 1716.1 437.318 1715.48C437.881 1714.85 438.631 1714.54 439.568 1714.54C440.404 1714.54 441.062 1714.82 441.543 1715.39C442.027 1715.95 442.285 1716.64 442.316 1717.44ZM441.238 1717.12C441.191 1716.67 441.025 1716.28 440.74 1715.95C440.459 1715.62 440.053 1715.45 439.521 1715.45C439.002 1715.45 438.574 1715.62 438.238 1715.97C437.902 1716.31 437.719 1716.7 437.688 1717.13L441.238 1717.12ZM448.012 1715.53V1712.14H449.09V1721.26H448.012V1720.43C447.832 1720.76 447.592 1721.01 447.291 1721.18C446.994 1721.34 446.65 1721.43 446.26 1721.43C445.467 1721.43 444.842 1721.12 444.385 1720.51C443.932 1719.89 443.705 1719.04 443.705 1717.96C443.705 1716.89 443.934 1716.06 444.391 1715.45C444.848 1714.84 445.471 1714.54 446.26 1714.54C446.654 1714.54 447.002 1714.62 447.303 1714.8C447.604 1714.96 447.84 1715.21 448.012 1715.53ZM444.842 1717.98C444.842 1718.82 444.975 1719.45 445.24 1719.88C445.506 1720.3 445.898 1720.51 446.418 1720.51C446.938 1720.51 447.332 1720.3 447.602 1719.87C447.875 1719.44 448.012 1718.81 448.012 1717.98C448.012 1717.15 447.875 1716.52 447.602 1716.1C447.332 1715.67 446.938 1715.45 446.418 1715.45C445.898 1715.45 445.506 1715.67 445.24 1716.09C444.975 1716.52 444.842 1717.15 444.842 1717.98ZM463.914 1720.54C463.598 1720.83 463.24 1721.05 462.842 1721.21C462.447 1721.35 462.02 1721.43 461.559 1721.43C460.449 1721.43 459.586 1721.03 458.969 1720.24C458.352 1719.44 458.043 1718.33 458.043 1716.89C458.043 1715.46 458.355 1714.35 458.98 1713.55C459.605 1712.75 460.475 1712.35 461.588 1712.35C461.955 1712.35 462.307 1712.41 462.643 1712.51C462.979 1712.61 463.303 1712.77 463.615 1712.98V1714.19C463.299 1713.89 462.975 1713.67 462.643 1713.53C462.311 1713.39 461.959 1713.31 461.588 1713.31C460.818 1713.31 460.24 1713.61 459.854 1714.21C459.471 1714.8 459.279 1715.7 459.279 1716.89C459.279 1718.11 459.465 1719.01 459.836 1719.59C460.211 1720.18 460.785 1720.47 461.559 1720.47C461.82 1720.47 462.049 1720.44 462.244 1720.38C462.443 1720.32 462.623 1720.22 462.783 1720.09V1717.74H461.512V1716.77H463.914V1720.54ZM466.527 1714.72H469.287V1720.42H471.426V1721.26H466.07V1720.42H468.209V1715.56H466.527V1714.72ZM468.209 1712.17H469.287V1713.53H468.209V1712.17ZM475.504 1712.83V1714.7H477.953V1715.53H475.504V1719.1C475.504 1719.58 475.596 1719.92 475.779 1720.11C475.963 1720.3 476.283 1720.4 476.74 1720.4H477.953V1721.26H476.635C475.826 1721.26 475.256 1721.1 474.924 1720.77C474.592 1720.45 474.426 1719.89 474.426 1719.1V1715.53H472.674V1714.7H474.426V1712.83H475.504ZM479.939 1712.51H481.129V1715.86H484.369V1712.51H485.559V1721.26H484.369V1716.86H481.129V1721.26H479.939V1712.51ZM487.51 1718.77V1714.71H488.588V1718.77C488.588 1719.36 488.691 1719.8 488.898 1720.08C489.109 1720.35 489.434 1720.49 489.871 1720.49C490.379 1720.49 490.768 1720.31 491.037 1719.96C491.307 1719.6 491.441 1719.09 491.441 1718.42V1714.71H492.525V1721.26H491.441V1720.27C491.25 1720.65 490.988 1720.94 490.656 1721.14C490.328 1721.33 489.943 1721.43 489.502 1721.43C488.83 1721.43 488.33 1721.21 488.002 1720.77C487.674 1720.33 487.51 1719.67 487.51 1718.77ZM498.977 1717.98C498.977 1717.15 498.844 1716.52 498.578 1716.09C498.312 1715.67 497.92 1715.45 497.4 1715.45C496.877 1715.45 496.48 1715.67 496.211 1716.1C495.941 1716.52 495.807 1717.15 495.807 1717.98C495.807 1718.81 495.941 1719.44 496.211 1719.87C496.48 1720.3 496.877 1720.51 497.4 1720.51C497.92 1720.51 498.312 1720.3 498.578 1719.88C498.844 1719.45 498.977 1718.82 498.977 1717.98ZM495.807 1715.53C495.979 1715.21 496.215 1714.97 496.516 1714.8C496.82 1714.62 497.172 1714.54 497.57 1714.54C498.359 1714.54 498.98 1714.84 499.434 1715.45C499.887 1716.06 500.113 1716.89 500.113 1717.96C500.113 1719.04 499.885 1719.89 499.428 1720.51C498.975 1721.12 498.352 1721.43 497.559 1721.43C497.168 1721.43 496.822 1721.34 496.521 1721.18C496.225 1721.01 495.986 1720.76 495.807 1720.43V1721.26H494.729V1712.14H495.807V1715.53ZM514.621 1717.44V1717.97H509.951V1718C509.92 1718.9 510.09 1719.54 510.461 1719.93C510.836 1720.32 511.363 1720.51 512.043 1720.51C512.387 1720.51 512.746 1720.46 513.121 1720.35C513.496 1720.24 513.896 1720.08 514.322 1719.85V1720.92C513.912 1721.09 513.516 1721.22 513.133 1721.3C512.754 1721.39 512.387 1721.43 512.031 1721.43C511.012 1721.43 510.215 1721.12 509.641 1720.51C509.066 1719.9 508.779 1719.06 508.779 1717.98C508.779 1716.94 509.061 1716.1 509.623 1715.48C510.186 1714.85 510.936 1714.54 511.873 1714.54C512.709 1714.54 513.367 1714.82 513.848 1715.39C514.332 1715.95 514.59 1716.64 514.621 1717.44ZM513.543 1717.12C513.496 1716.67 513.33 1716.28 513.045 1715.95C512.764 1715.62 512.357 1715.45 511.826 1715.45C511.307 1715.45 510.879 1715.62 510.543 1715.97C510.207 1716.31 510.023 1716.7 509.992 1717.13L513.543 1717.12ZM521.84 1714.7L519.49 1717.84L522.068 1721.26H520.82L518.898 1718.63L516.982 1721.26H515.734L518.312 1717.84L515.963 1714.7H517.158L518.898 1717.07L520.627 1714.7H521.84ZM526.117 1712.83V1714.7H528.566V1715.53H526.117V1719.1C526.117 1719.58 526.209 1719.92 526.393 1720.11C526.576 1720.3 526.896 1720.4 527.354 1720.4H528.566V1721.26H527.248C526.439 1721.26 525.869 1721.1 525.537 1720.77C525.205 1720.45 525.039 1719.89 525.039 1719.1V1715.53H523.287V1714.7H525.039V1712.83H526.117ZM536.312 1717.44V1717.97H531.643V1718C531.611 1718.9 531.781 1719.54 532.152 1719.93C532.527 1720.32 533.055 1720.51 533.734 1720.51C534.078 1720.51 534.438 1720.46 534.812 1720.35C535.188 1720.24 535.588 1720.08 536.014 1719.85V1720.92C535.604 1721.09 535.207 1721.22 534.824 1721.3C534.445 1721.39 534.078 1721.43 533.723 1721.43C532.703 1721.43 531.906 1721.12 531.332 1720.51C530.758 1719.9 530.471 1719.06 530.471 1717.98C530.471 1716.94 530.752 1716.1 531.314 1715.48C531.877 1714.85 532.627 1714.54 533.564 1714.54C534.4 1714.54 535.059 1714.82 535.539 1715.39C536.023 1715.95 536.281 1716.64 536.312 1717.44ZM535.234 1717.12C535.188 1716.67 535.021 1716.28 534.736 1715.95C534.455 1715.62 534.049 1715.45 533.518 1715.45C532.998 1715.45 532.57 1715.62 532.234 1715.97C531.898 1716.31 531.715 1716.7 531.684 1717.13L535.234 1717.12ZM543.139 1717.19V1721.26H542.055V1717.19C542.055 1716.6 541.951 1716.17 541.744 1715.89C541.537 1715.61 541.213 1715.48 540.771 1715.48C540.268 1715.48 539.879 1715.66 539.605 1716.01C539.336 1716.37 539.201 1716.88 539.201 1717.55V1721.26H538.123V1714.7H539.201V1715.68C539.393 1715.31 539.652 1715.02 539.98 1714.83C540.309 1714.64 540.697 1714.54 541.146 1714.54C541.814 1714.54 542.312 1714.76 542.641 1715.2C542.973 1715.64 543.139 1716.3 543.139 1717.19ZM549.912 1714.92V1715.98C549.604 1715.8 549.293 1715.67 548.98 1715.58C548.668 1715.49 548.35 1715.44 548.025 1715.44C547.537 1715.44 547.172 1715.52 546.93 1715.68C546.691 1715.84 546.572 1716.08 546.572 1716.4C546.572 1716.69 546.662 1716.91 546.842 1717.06C547.021 1717.2 547.469 1717.34 548.184 1717.48L548.617 1717.56C549.152 1717.66 549.557 1717.87 549.83 1718.17C550.107 1718.48 550.246 1718.87 550.246 1719.36C550.246 1720.01 550.016 1720.52 549.555 1720.88C549.094 1721.25 548.453 1721.43 547.633 1721.43C547.309 1721.43 546.969 1721.39 546.613 1721.32C546.258 1721.26 545.873 1721.16 545.459 1721.02V1719.91C545.861 1720.11 546.246 1720.27 546.613 1720.37C546.98 1720.48 547.328 1720.53 547.656 1720.53C548.133 1720.53 548.502 1720.43 548.764 1720.24C549.025 1720.04 549.156 1719.77 549.156 1719.42C549.156 1718.92 548.678 1718.58 547.721 1718.39L547.674 1718.38L547.27 1718.29C546.648 1718.17 546.195 1717.97 545.91 1717.68C545.625 1717.4 545.482 1717 545.482 1716.51C545.482 1715.88 545.695 1715.39 546.121 1715.05C546.547 1714.71 547.154 1714.54 547.943 1714.54C548.295 1714.54 548.633 1714.57 548.957 1714.64C549.281 1714.7 549.6 1714.8 549.912 1714.92ZM553.293 1714.72H556.053V1720.42H558.191V1721.26H552.836V1720.42H554.975V1715.56H553.293V1714.72ZM554.975 1712.17H556.053V1713.53H554.975V1712.17ZM562.281 1715.45C561.734 1715.45 561.32 1715.67 561.039 1716.09C560.758 1716.52 560.617 1717.15 560.617 1717.98C560.617 1718.82 560.758 1719.45 561.039 1719.88C561.32 1720.3 561.734 1720.51 562.281 1720.51C562.832 1720.51 563.248 1720.3 563.529 1719.88C563.811 1719.45 563.951 1718.82 563.951 1717.98C563.951 1717.15 563.811 1716.52 563.529 1716.09C563.248 1715.67 562.832 1715.45 562.281 1715.45ZM562.281 1714.54C563.191 1714.54 563.887 1714.83 564.367 1715.42C564.852 1716.01 565.094 1716.87 565.094 1717.98C565.094 1719.1 564.854 1719.96 564.373 1720.55C563.893 1721.14 563.195 1721.43 562.281 1721.43C561.371 1721.43 560.676 1721.14 560.195 1720.55C559.715 1719.96 559.475 1719.1 559.475 1717.98C559.475 1716.87 559.715 1716.01 560.195 1715.42C560.676 1714.83 561.371 1714.54 562.281 1714.54ZM572.061 1717.19V1721.26H570.977V1717.19C570.977 1716.6 570.873 1716.17 570.666 1715.89C570.459 1715.61 570.135 1715.48 569.693 1715.48C569.189 1715.48 568.801 1715.66 568.527 1716.01C568.258 1716.37 568.123 1716.88 568.123 1717.55V1721.26H567.045V1714.7H568.123V1715.68C568.314 1715.31 568.574 1715.02 568.902 1714.83C569.23 1714.64 569.619 1714.54 570.068 1714.54C570.736 1714.54 571.234 1714.76 571.562 1715.2C571.895 1715.64 572.061 1716.3 572.061 1717.19ZM578.67 1712.19V1715.78H577.357V1712.19H578.67ZM575.547 1712.19V1715.78H574.234V1712.19H575.547ZM209.916 1730.19V1733.78H208.604V1730.19H209.916ZM206.793 1730.19V1733.78H205.48V1730.19H206.793ZM216.818 1730.51H217.932L213.326 1740.37H212.207L216.818 1730.51ZM220.691 1732.72H223.451V1738.42H225.59V1739.26H220.234V1738.42H222.373V1733.56H220.691V1732.72ZM222.373 1730.17H223.451V1731.53H222.373V1730.17ZM230.031 1733.36C230.164 1733.08 230.332 1732.88 230.535 1732.74C230.742 1732.61 230.99 1732.54 231.279 1732.54C231.807 1732.54 232.178 1732.74 232.393 1733.15C232.611 1733.56 232.721 1734.33 232.721 1735.46V1739.26H231.736V1735.5C231.736 1734.58 231.684 1734 231.578 1733.78C231.477 1733.55 231.289 1733.44 231.016 1733.44C230.703 1733.44 230.488 1733.56 230.371 1733.8C230.258 1734.04 230.201 1734.61 230.201 1735.5V1739.26H229.217V1735.5C229.217 1734.57 229.16 1733.99 229.047 1733.77C228.938 1733.55 228.738 1733.44 228.449 1733.44C228.164 1733.44 227.965 1733.56 227.852 1733.8C227.742 1734.04 227.688 1734.61 227.688 1735.5V1739.26H226.709V1732.7H227.688V1733.26C227.816 1733.02 227.977 1732.85 228.168 1732.73C228.363 1732.6 228.584 1732.54 228.83 1732.54C229.127 1732.54 229.373 1732.61 229.568 1732.74C229.768 1732.88 229.922 1733.09 230.031 1733.36ZM237.414 1735.96H237.057C236.428 1735.96 235.953 1736.07 235.633 1736.29C235.316 1736.51 235.158 1736.84 235.158 1737.28C235.158 1737.67 235.277 1737.98 235.516 1738.2C235.754 1738.42 236.084 1738.53 236.506 1738.53C237.1 1738.53 237.566 1738.32 237.906 1737.91C238.246 1737.5 238.418 1736.93 238.422 1736.2V1735.96H237.414ZM239.506 1735.51V1739.26H238.422V1738.29C238.191 1738.68 237.9 1738.97 237.549 1739.15C237.201 1739.34 236.777 1739.43 236.277 1739.43C235.609 1739.43 235.076 1739.24 234.678 1738.87C234.279 1738.49 234.08 1737.98 234.08 1737.35C234.08 1736.62 234.324 1736.06 234.812 1735.68C235.305 1735.31 236.025 1735.12 236.975 1735.12H238.422V1734.95C238.418 1734.42 238.285 1734.04 238.023 1733.81C237.762 1733.57 237.344 1733.45 236.77 1733.45C236.402 1733.45 236.031 1733.51 235.656 1733.61C235.281 1733.72 234.916 1733.87 234.561 1734.07V1733C234.959 1732.84 235.34 1732.73 235.703 1732.66C236.07 1732.58 236.426 1732.54 236.77 1732.54C237.312 1732.54 237.775 1732.62 238.158 1732.78C238.545 1732.94 238.857 1733.18 239.096 1733.5C239.244 1733.69 239.35 1733.94 239.412 1734.23C239.475 1734.51 239.506 1734.94 239.506 1735.51ZM245.559 1735.92C245.559 1735.12 245.426 1734.5 245.16 1734.09C244.898 1733.66 244.516 1733.45 244.012 1733.45C243.484 1733.45 243.082 1733.66 242.805 1734.09C242.527 1734.5 242.389 1735.12 242.389 1735.92C242.389 1736.73 242.527 1737.35 242.805 1737.78C243.086 1738.2 243.492 1738.41 244.023 1738.41C244.52 1738.41 244.898 1738.2 245.16 1737.77C245.426 1737.34 245.559 1736.73 245.559 1735.92ZM246.637 1738.84C246.637 1739.82 246.404 1740.57 245.939 1741.08C245.475 1741.58 244.791 1741.84 243.889 1741.84C243.592 1741.84 243.281 1741.81 242.957 1741.76C242.633 1741.7 242.309 1741.62 241.984 1741.51V1740.45C242.367 1740.63 242.715 1740.76 243.027 1740.85C243.34 1740.93 243.627 1740.98 243.889 1740.98C244.471 1740.98 244.895 1740.82 245.16 1740.5C245.426 1740.18 245.559 1739.68 245.559 1739V1738.95V1738.22C245.387 1738.58 245.152 1738.86 244.855 1739.04C244.559 1739.22 244.197 1739.31 243.771 1739.31C243.006 1739.31 242.395 1739 241.938 1738.39C241.48 1737.77 241.252 1736.95 241.252 1735.92C241.252 1734.89 241.48 1734.07 241.938 1733.46C242.395 1732.84 243.006 1732.54 243.771 1732.54C244.193 1732.54 244.551 1732.62 244.844 1732.79C245.137 1732.96 245.375 1733.22 245.559 1733.57V1732.72H246.637V1738.84ZM254.324 1735.44V1735.97H249.654V1736C249.623 1736.9 249.793 1737.54 250.164 1737.93C250.539 1738.32 251.066 1738.51 251.746 1738.51C252.09 1738.51 252.449 1738.46 252.824 1738.35C253.199 1738.24 253.6 1738.08 254.025 1737.85V1738.92C253.615 1739.09 253.219 1739.22 252.836 1739.3C252.457 1739.39 252.09 1739.43 251.734 1739.43C250.715 1739.43 249.918 1739.12 249.344 1738.51C248.77 1737.9 248.482 1737.06 248.482 1735.98C248.482 1734.94 248.764 1734.1 249.326 1733.48C249.889 1732.85 250.639 1732.54 251.576 1732.54C252.412 1732.54 253.07 1732.82 253.551 1733.39C254.035 1733.95 254.293 1734.64 254.324 1735.44ZM253.246 1735.12C253.199 1734.67 253.033 1734.28 252.748 1733.95C252.467 1733.62 252.061 1733.45 251.529 1733.45C251.01 1733.45 250.582 1733.62 250.246 1733.97C249.91 1734.31 249.727 1734.7 249.695 1735.13L253.246 1735.12ZM260.693 1732.92V1733.98C260.385 1733.8 260.074 1733.67 259.762 1733.58C259.449 1733.49 259.131 1733.44 258.807 1733.44C258.318 1733.44 257.953 1733.52 257.711 1733.68C257.473 1733.84 257.354 1734.08 257.354 1734.4C257.354 1734.69 257.443 1734.91 257.623 1735.06C257.803 1735.2 258.25 1735.34 258.965 1735.48L259.398 1735.56C259.934 1735.66 260.338 1735.87 260.611 1736.17C260.889 1736.48 261.027 1736.87 261.027 1737.36C261.027 1738.01 260.797 1738.52 260.336 1738.88C259.875 1739.25 259.234 1739.43 258.414 1739.43C258.09 1739.43 257.75 1739.39 257.395 1739.32C257.039 1739.26 256.654 1739.16 256.24 1739.02V1737.91C256.643 1738.11 257.027 1738.27 257.395 1738.37C257.762 1738.48 258.109 1738.53 258.438 1738.53C258.914 1738.53 259.283 1738.43 259.545 1738.24C259.807 1738.04 259.938 1737.77 259.938 1737.42C259.938 1736.92 259.459 1736.58 258.502 1736.39L258.455 1736.38L258.051 1736.29C257.43 1736.17 256.977 1735.97 256.691 1735.68C256.406 1735.4 256.264 1735 256.264 1734.51C256.264 1733.88 256.477 1733.39 256.902 1733.05C257.328 1732.71 257.936 1732.54 258.725 1732.54C259.076 1732.54 259.414 1732.57 259.738 1732.64C260.062 1732.7 260.381 1732.8 260.693 1732.92ZM267.432 1730.51H268.545L263.939 1740.37H262.82L267.432 1730.51ZM270.039 1732.7H271.158L273.062 1738.2L274.973 1732.7H276.092L273.76 1739.26H272.371L270.039 1732.7ZM282.385 1732.92V1733.98C282.076 1733.8 281.766 1733.67 281.453 1733.58C281.141 1733.49 280.822 1733.44 280.498 1733.44C280.01 1733.44 279.645 1733.52 279.402 1733.68C279.164 1733.84 279.045 1734.08 279.045 1734.4C279.045 1734.69 279.135 1734.91 279.314 1735.06C279.494 1735.2 279.941 1735.34 280.656 1735.48L281.09 1735.56C281.625 1735.66 282.029 1735.87 282.303 1736.17C282.58 1736.48 282.719 1736.87 282.719 1737.36C282.719 1738.01 282.488 1738.52 282.027 1738.88C281.566 1739.25 280.926 1739.43 280.105 1739.43C279.781 1739.43 279.441 1739.39 279.086 1739.32C278.73 1739.26 278.346 1739.16 277.932 1739.02V1737.91C278.334 1738.11 278.719 1738.27 279.086 1738.37C279.453 1738.48 279.801 1738.53 280.129 1738.53C280.605 1738.53 280.975 1738.43 281.236 1738.24C281.498 1738.04 281.629 1737.77 281.629 1737.42C281.629 1736.92 281.15 1736.58 280.193 1736.39L280.146 1736.38L279.742 1736.29C279.121 1736.17 278.668 1735.97 278.383 1735.68C278.098 1735.4 277.955 1735 277.955 1734.51C277.955 1733.88 278.168 1733.39 278.594 1733.05C279.02 1732.71 279.627 1732.54 280.416 1732.54C280.768 1732.54 281.105 1732.57 281.43 1732.64C281.754 1732.7 282.072 1732.8 282.385 1732.92ZM290.131 1738.92C289.842 1739.09 289.543 1739.22 289.234 1739.3C288.93 1739.39 288.617 1739.43 288.297 1739.43C287.281 1739.43 286.486 1739.12 285.912 1738.51C285.342 1737.91 285.057 1737.06 285.057 1735.98C285.057 1734.91 285.342 1734.06 285.912 1733.45C286.486 1732.84 287.281 1732.54 288.297 1732.54C288.613 1732.54 288.922 1732.58 289.223 1732.66C289.523 1732.74 289.826 1732.87 290.131 1733.04V1734.17C289.846 1733.92 289.559 1733.74 289.27 1733.62C288.984 1733.51 288.66 1733.45 288.297 1733.45C287.621 1733.45 287.102 1733.67 286.738 1734.11C286.375 1734.55 286.193 1735.17 286.193 1735.98C286.193 1736.79 286.375 1737.42 286.738 1737.86C287.105 1738.3 287.625 1738.51 288.297 1738.51C288.672 1738.51 289.008 1738.46 289.305 1738.34C289.602 1738.23 289.877 1738.05 290.131 1737.81V1738.92ZM294.754 1733.45C294.207 1733.45 293.793 1733.67 293.512 1734.09C293.23 1734.52 293.09 1735.15 293.09 1735.98C293.09 1736.82 293.23 1737.45 293.512 1737.88C293.793 1738.3 294.207 1738.51 294.754 1738.51C295.305 1738.51 295.721 1738.3 296.002 1737.88C296.283 1737.45 296.424 1736.82 296.424 1735.98C296.424 1735.15 296.283 1734.52 296.002 1734.09C295.721 1733.67 295.305 1733.45 294.754 1733.45ZM294.754 1732.54C295.664 1732.54 296.359 1732.83 296.84 1733.42C297.324 1734.01 297.566 1734.87 297.566 1735.98C297.566 1737.1 297.326 1737.96 296.846 1738.55C296.365 1739.14 295.668 1739.43 294.754 1739.43C293.844 1739.43 293.148 1739.14 292.668 1738.55C292.188 1737.96 291.947 1737.1 291.947 1735.98C291.947 1734.87 292.188 1734.01 292.668 1733.42C293.148 1732.83 293.844 1732.54 294.754 1732.54ZM303.402 1733.53V1730.14H304.48V1739.26H303.402V1738.43C303.223 1738.76 302.982 1739.01 302.682 1739.18C302.385 1739.34 302.041 1739.43 301.65 1739.43C300.857 1739.43 300.232 1739.12 299.775 1738.51C299.322 1737.89 299.096 1737.04 299.096 1735.96C299.096 1734.89 299.324 1734.06 299.781 1733.45C300.238 1732.84 300.861 1732.54 301.65 1732.54C302.045 1732.54 302.393 1732.62 302.693 1732.8C302.994 1732.96 303.23 1733.21 303.402 1733.53ZM300.232 1735.98C300.232 1736.82 300.365 1737.45 300.631 1737.88C300.896 1738.3 301.289 1738.51 301.809 1738.51C302.328 1738.51 302.723 1738.3 302.992 1737.87C303.266 1737.44 303.402 1736.81 303.402 1735.98C303.402 1735.15 303.266 1734.52 302.992 1734.1C302.723 1733.67 302.328 1733.45 301.809 1733.45C301.289 1733.45 300.896 1733.67 300.631 1734.09C300.365 1734.52 300.232 1735.15 300.232 1735.98ZM312.168 1735.44V1735.97H307.498V1736C307.467 1736.9 307.637 1737.54 308.008 1737.93C308.383 1738.32 308.91 1738.51 309.59 1738.51C309.934 1738.51 310.293 1738.46 310.668 1738.35C311.043 1738.24 311.443 1738.08 311.869 1737.85V1738.92C311.459 1739.09 311.062 1739.22 310.68 1739.3C310.301 1739.39 309.934 1739.43 309.578 1739.43C308.559 1739.43 307.762 1739.12 307.188 1738.51C306.613 1737.9 306.326 1737.06 306.326 1735.98C306.326 1734.94 306.607 1734.1 307.17 1733.48C307.732 1732.85 308.482 1732.54 309.42 1732.54C310.256 1732.54 310.914 1732.82 311.395 1733.39C311.879 1733.95 312.137 1734.64 312.168 1735.44ZM311.09 1735.12C311.043 1734.67 310.877 1734.28 310.592 1733.95C310.311 1733.62 309.904 1733.45 309.373 1733.45C308.854 1733.45 308.426 1733.62 308.09 1733.97C307.754 1734.31 307.57 1734.7 307.539 1735.13L311.09 1735.12ZM313.434 1735.02H319.645V1736.01H313.434V1735.02ZM325.094 1735.92C325.094 1735.12 324.961 1734.5 324.695 1734.09C324.434 1733.66 324.051 1733.45 323.547 1733.45C323.02 1733.45 322.617 1733.66 322.34 1734.09C322.062 1734.5 321.924 1735.12 321.924 1735.92C321.924 1736.73 322.062 1737.35 322.34 1737.78C322.621 1738.2 323.027 1738.41 323.559 1738.41C324.055 1738.41 324.434 1738.2 324.695 1737.77C324.961 1737.34 325.094 1736.73 325.094 1735.92ZM326.172 1738.84C326.172 1739.82 325.939 1740.57 325.475 1741.08C325.01 1741.58 324.326 1741.84 323.424 1741.84C323.127 1741.84 322.816 1741.81 322.492 1741.76C322.168 1741.7 321.844 1741.62 321.52 1741.51V1740.45C321.902 1740.63 322.25 1740.76 322.562 1740.85C322.875 1740.93 323.162 1740.98 323.424 1740.98C324.006 1740.98 324.43 1740.82 324.695 1740.5C324.961 1740.18 325.094 1739.68 325.094 1739V1738.95V1738.22C324.922 1738.58 324.688 1738.86 324.391 1739.04C324.094 1739.22 323.732 1739.31 323.307 1739.31C322.541 1739.31 321.93 1739 321.473 1738.39C321.016 1737.77 320.787 1736.95 320.787 1735.92C320.787 1734.89 321.016 1734.07 321.473 1733.46C321.93 1732.84 322.541 1732.54 323.307 1732.54C323.729 1732.54 324.086 1732.62 324.379 1732.79C324.672 1732.96 324.91 1733.22 325.094 1733.57V1732.72H326.172V1738.84ZM333.455 1735.19V1739.26H332.371V1735.19C332.371 1734.6 332.268 1734.17 332.061 1733.89C331.854 1733.61 331.529 1733.48 331.088 1733.48C330.584 1733.48 330.195 1733.66 329.922 1734.01C329.652 1734.37 329.518 1734.88 329.518 1735.55V1739.26H328.439V1730.14H329.518V1733.68C329.709 1733.31 329.969 1733.02 330.297 1732.83C330.625 1732.64 331.014 1732.54 331.463 1732.54C332.131 1732.54 332.629 1732.76 332.957 1733.2C333.289 1733.64 333.455 1734.3 333.455 1735.19ZM336.725 1738.43V1741.76H335.641V1732.7H336.725V1733.53C336.904 1733.21 337.143 1732.96 337.439 1732.8C337.74 1732.62 338.086 1732.54 338.477 1732.54C339.27 1732.54 339.891 1732.84 340.34 1733.46C340.793 1734.07 341.02 1734.92 341.02 1736.01C341.02 1737.07 340.793 1737.91 340.34 1738.52C339.887 1739.13 339.266 1739.43 338.477 1739.43C338.078 1739.43 337.729 1739.34 337.428 1739.18C337.131 1739.01 336.896 1738.76 336.725 1738.43ZM339.889 1735.98C339.889 1735.15 339.756 1734.52 339.49 1734.09C339.229 1733.67 338.838 1733.45 338.318 1733.45C337.795 1733.45 337.398 1733.67 337.129 1734.1C336.859 1734.52 336.725 1735.15 336.725 1735.98C336.725 1736.81 336.859 1737.44 337.129 1737.87C337.398 1738.3 337.795 1738.51 338.318 1738.51C338.838 1738.51 339.229 1738.3 339.49 1737.88C339.756 1737.45 339.889 1736.82 339.889 1735.98ZM348.525 1734.05C348.295 1733.87 348.061 1733.74 347.822 1733.66C347.584 1733.58 347.322 1733.53 347.037 1733.53C346.365 1733.53 345.852 1733.75 345.496 1734.17C345.141 1734.59 344.963 1735.2 344.963 1736V1739.26H343.879V1732.7H344.963V1733.98C345.143 1733.51 345.418 1733.16 345.789 1732.91C346.164 1732.66 346.607 1732.54 347.119 1732.54C347.385 1732.54 347.633 1732.57 347.863 1732.64C348.094 1732.7 348.314 1732.81 348.525 1732.95V1734.05ZM350.84 1732.72H353.6V1738.42H355.738V1739.26H350.383V1738.42H352.521V1733.56H350.84V1732.72ZM352.521 1730.17H353.6V1731.53H352.521V1730.17ZM358.498 1736.89H360.561V1739.26H358.498V1736.89ZM365.646 1738.43V1741.76H364.562V1732.7H365.646V1733.53C365.826 1733.21 366.064 1732.96 366.361 1732.8C366.662 1732.62 367.008 1732.54 367.398 1732.54C368.191 1732.54 368.812 1732.84 369.262 1733.46C369.715 1734.07 369.941 1734.92 369.941 1736.01C369.941 1737.07 369.715 1737.91 369.262 1738.52C368.809 1739.13 368.188 1739.43 367.398 1739.43C367 1739.43 366.65 1739.34 366.35 1739.18C366.053 1739.01 365.818 1738.76 365.646 1738.43ZM368.811 1735.98C368.811 1735.15 368.678 1734.52 368.412 1734.09C368.15 1733.67 367.76 1733.45 367.24 1733.45C366.717 1733.45 366.32 1733.67 366.051 1734.1C365.781 1734.52 365.646 1735.15 365.646 1735.98C365.646 1736.81 365.781 1737.44 366.051 1737.87C366.32 1738.3 366.717 1738.51 367.24 1738.51C367.76 1738.51 368.15 1738.3 368.412 1737.88C368.678 1737.45 368.811 1736.82 368.811 1735.98ZM376.838 1735.19V1739.26H375.754V1735.19C375.754 1734.6 375.65 1734.17 375.443 1733.89C375.236 1733.61 374.912 1733.48 374.471 1733.48C373.967 1733.48 373.578 1733.66 373.305 1734.01C373.035 1734.37 372.9 1734.88 372.9 1735.55V1739.26H371.822V1732.7H372.9V1733.68C373.092 1733.31 373.352 1733.02 373.68 1732.83C374.008 1732.64 374.396 1732.54 374.846 1732.54C375.514 1732.54 376.012 1732.76 376.34 1733.2C376.672 1733.64 376.838 1734.3 376.838 1735.19ZM382.938 1735.92C382.938 1735.12 382.805 1734.5 382.539 1734.09C382.277 1733.66 381.895 1733.45 381.391 1733.45C380.863 1733.45 380.461 1733.66 380.184 1734.09C379.906 1734.5 379.768 1735.12 379.768 1735.92C379.768 1736.73 379.906 1737.35 380.184 1737.78C380.465 1738.2 380.871 1738.41 381.402 1738.41C381.898 1738.41 382.277 1738.2 382.539 1737.77C382.805 1737.34 382.938 1736.73 382.938 1735.92ZM384.016 1738.84C384.016 1739.82 383.783 1740.57 383.318 1741.08C382.854 1741.58 382.17 1741.84 381.268 1741.84C380.971 1741.84 380.66 1741.81 380.336 1741.76C380.012 1741.7 379.688 1741.62 379.363 1741.51V1740.45C379.746 1740.63 380.094 1740.76 380.406 1740.85C380.719 1740.93 381.006 1740.98 381.268 1740.98C381.85 1740.98 382.273 1740.82 382.539 1740.5C382.805 1740.18 382.938 1739.68 382.938 1739V1738.95V1738.22C382.766 1738.58 382.531 1738.86 382.234 1739.04C381.938 1739.22 381.576 1739.31 381.15 1739.31C380.385 1739.31 379.773 1739 379.316 1738.39C378.859 1737.77 378.631 1736.95 378.631 1735.92C378.631 1734.89 378.859 1734.07 379.316 1733.46C379.773 1732.84 380.385 1732.54 381.15 1732.54C381.572 1732.54 381.93 1732.62 382.223 1732.79C382.516 1732.96 382.754 1733.22 382.938 1733.57V1732.72H384.016V1738.84ZM390.678 1730.19V1733.78H389.365V1730.19H390.678ZM387.555 1730.19V1733.78H386.242V1730.19H387.555ZM188.225 1784.19V1787.78H186.912V1784.19H188.225ZM185.102 1784.19V1787.78H183.789V1784.19H185.102ZM189.918 1784.51H191.072L191.91 1791.61L192.906 1786.91H194.143L195.15 1791.62L195.988 1784.51H197.143L195.836 1793.26H194.717L193.527 1788.06L192.344 1793.26H191.225L189.918 1784.51ZM203.711 1789.44V1789.97H199.041V1790C199.01 1790.9 199.18 1791.54 199.551 1791.93C199.926 1792.32 200.453 1792.51 201.133 1792.51C201.477 1792.51 201.836 1792.46 202.211 1792.35C202.586 1792.24 202.986 1792.08 203.412 1791.85V1792.92C203.002 1793.09 202.605 1793.22 202.223 1793.3C201.844 1793.39 201.477 1793.43 201.121 1793.43C200.102 1793.43 199.305 1793.12 198.73 1792.51C198.156 1791.9 197.869 1791.06 197.869 1789.98C197.869 1788.94 198.15 1788.1 198.713 1787.48C199.275 1786.85 200.025 1786.54 200.963 1786.54C201.799 1786.54 202.457 1786.82 202.938 1787.39C203.422 1787.95 203.68 1788.64 203.711 1789.44ZM202.633 1789.12C202.586 1788.67 202.42 1788.28 202.135 1787.95C201.854 1787.62 201.447 1787.45 200.916 1787.45C200.396 1787.45 199.969 1787.62 199.633 1787.97C199.297 1788.31 199.113 1788.7 199.082 1789.13L202.633 1789.12ZM209.758 1789.98C209.758 1789.15 209.625 1788.52 209.359 1788.09C209.094 1787.67 208.701 1787.45 208.182 1787.45C207.658 1787.45 207.262 1787.67 206.992 1788.1C206.723 1788.52 206.588 1789.15 206.588 1789.98C206.588 1790.81 206.723 1791.44 206.992 1791.87C207.262 1792.3 207.658 1792.51 208.182 1792.51C208.701 1792.51 209.094 1792.3 209.359 1791.88C209.625 1791.45 209.758 1790.82 209.758 1789.98ZM206.588 1787.53C206.76 1787.21 206.996 1786.97 207.297 1786.8C207.602 1786.62 207.953 1786.54 208.352 1786.54C209.141 1786.54 209.762 1786.84 210.215 1787.45C210.668 1788.06 210.895 1788.89 210.895 1789.96C210.895 1791.04 210.666 1791.89 210.209 1792.51C209.756 1793.12 209.133 1793.43 208.34 1793.43C207.949 1793.43 207.604 1793.34 207.303 1793.18C207.006 1793.01 206.768 1792.76 206.588 1792.43V1793.26H205.51V1784.14H206.588V1787.53ZM212.195 1786.7H213.314L215.219 1792.2L217.129 1786.7H218.248L215.916 1793.26H214.527L212.195 1786.7ZM220.691 1786.72H223.451V1792.42H225.59V1793.26H220.234V1792.42H222.373V1787.56H220.691V1786.72ZM222.373 1784.17H223.451V1785.53H222.373V1784.17ZM232.633 1789.44V1789.97H227.963V1790C227.932 1790.9 228.102 1791.54 228.473 1791.93C228.848 1792.32 229.375 1792.51 230.055 1792.51C230.398 1792.51 230.758 1792.46 231.133 1792.35C231.508 1792.24 231.908 1792.08 232.334 1791.85V1792.92C231.924 1793.09 231.527 1793.22 231.145 1793.3C230.766 1793.39 230.398 1793.43 230.043 1793.43C229.023 1793.43 228.227 1793.12 227.652 1792.51C227.078 1791.9 226.791 1791.06 226.791 1789.98C226.791 1788.94 227.072 1788.1 227.635 1787.48C228.197 1786.85 228.947 1786.54 229.885 1786.54C230.721 1786.54 231.379 1786.82 231.859 1787.39C232.344 1787.95 232.602 1788.64 232.633 1789.44ZM231.555 1789.12C231.508 1788.67 231.342 1788.28 231.057 1787.95C230.775 1787.62 230.369 1787.45 229.838 1787.45C229.318 1787.45 228.891 1787.62 228.555 1787.97C228.219 1788.31 228.035 1788.7 228.004 1789.13L231.555 1789.12ZM233.301 1786.7H234.367L235.51 1792L236.447 1788.61H237.367L238.316 1792L239.459 1786.7H240.525L238.99 1793.26H237.959L236.91 1789.66L235.867 1793.26H234.836L233.301 1786.7ZM248.037 1784.51H254.711V1785.51H251.975V1793.26H250.785V1785.51H248.037V1784.51ZM258.602 1787.45C258.055 1787.45 257.641 1787.67 257.359 1788.09C257.078 1788.52 256.938 1789.15 256.938 1789.98C256.938 1790.82 257.078 1791.45 257.359 1791.88C257.641 1792.3 258.055 1792.51 258.602 1792.51C259.152 1792.51 259.568 1792.3 259.85 1791.88C260.131 1791.45 260.271 1790.82 260.271 1789.98C260.271 1789.15 260.131 1788.52 259.85 1788.09C259.568 1787.67 259.152 1787.45 258.602 1787.45ZM258.602 1786.54C259.512 1786.54 260.207 1786.83 260.688 1787.42C261.172 1788.01 261.414 1788.87 261.414 1789.98C261.414 1791.1 261.174 1791.96 260.693 1792.55C260.213 1793.14 259.516 1793.43 258.602 1793.43C257.691 1793.43 256.996 1793.14 256.516 1792.55C256.035 1791.96 255.795 1791.1 255.795 1789.98C255.795 1788.87 256.035 1788.01 256.516 1787.42C256.996 1786.83 257.691 1786.54 258.602 1786.54ZM265.832 1787.45C265.285 1787.45 264.871 1787.67 264.59 1788.09C264.309 1788.52 264.168 1789.15 264.168 1789.98C264.168 1790.82 264.309 1791.45 264.59 1791.88C264.871 1792.3 265.285 1792.51 265.832 1792.51C266.383 1792.51 266.799 1792.3 267.08 1791.88C267.361 1791.45 267.502 1790.82 267.502 1789.98C267.502 1789.15 267.361 1788.52 267.08 1788.09C266.799 1787.67 266.383 1787.45 265.832 1787.45ZM265.832 1786.54C266.742 1786.54 267.438 1786.83 267.918 1787.42C268.402 1788.01 268.645 1788.87 268.645 1789.98C268.645 1791.1 268.404 1791.96 267.924 1792.55C267.443 1793.14 266.746 1793.43 265.832 1793.43C264.922 1793.43 264.227 1793.14 263.746 1792.55C263.266 1791.96 263.025 1791.1 263.025 1789.98C263.025 1788.87 263.266 1788.01 263.746 1787.42C264.227 1786.83 264.922 1786.54 265.832 1786.54ZM273.666 1790.89C273.666 1791.37 273.754 1791.74 273.93 1791.98C274.109 1792.23 274.373 1792.35 274.721 1792.35H275.98V1793.26H274.615C273.971 1793.26 273.471 1793.05 273.115 1792.64C272.764 1792.23 272.588 1791.64 272.588 1790.89V1784.95H270.859V1784.11H273.666V1790.89ZM278.066 1784.14H279.18V1789.42L282.01 1786.7H283.322L280.738 1789.17L283.727 1793.26H282.408L279.982 1789.87L279.18 1790.63V1793.26H278.066V1784.14ZM285.766 1786.72H288.525V1792.42H290.664V1793.26H285.309V1792.42H287.447V1787.56H285.766V1786.72ZM287.447 1784.17H288.525V1785.53H287.447V1784.17ZM294.742 1784.83V1786.7H297.191V1787.53H294.742V1791.1C294.742 1791.58 294.834 1791.92 295.018 1792.11C295.201 1792.3 295.521 1792.4 295.979 1792.4H297.191V1793.26H295.873C295.064 1793.26 294.494 1793.1 294.162 1792.77C293.83 1792.45 293.664 1791.89 293.664 1791.1V1787.53H291.912V1786.7H293.664V1784.83H294.742ZM311.834 1784.14V1785.04H310.609C310.223 1785.04 309.953 1785.12 309.801 1785.28C309.652 1785.43 309.578 1785.71 309.578 1786.12V1786.7H311.834V1787.53H309.578V1793.26H308.5V1787.53H306.748V1786.7H308.5V1786.24C308.5 1785.52 308.664 1784.99 308.992 1784.65C309.324 1784.31 309.84 1784.14 310.539 1784.14H311.834ZM316.445 1787.45C315.898 1787.45 315.484 1787.67 315.203 1788.09C314.922 1788.52 314.781 1789.15 314.781 1789.98C314.781 1790.82 314.922 1791.45 315.203 1791.88C315.484 1792.3 315.898 1792.51 316.445 1792.51C316.996 1792.51 317.412 1792.3 317.693 1791.88C317.975 1791.45 318.115 1790.82 318.115 1789.98C318.115 1789.15 317.975 1788.52 317.693 1788.09C317.412 1787.67 316.996 1787.45 316.445 1787.45ZM316.445 1786.54C317.355 1786.54 318.051 1786.83 318.531 1787.42C319.016 1788.01 319.258 1788.87 319.258 1789.98C319.258 1791.1 319.018 1791.96 318.537 1792.55C318.057 1793.14 317.359 1793.43 316.445 1793.43C315.535 1793.43 314.84 1793.14 314.359 1792.55C313.879 1791.96 313.639 1791.1 313.639 1789.98C313.639 1788.87 313.879 1788.01 314.359 1787.42C314.84 1786.83 315.535 1786.54 316.445 1786.54ZM326.834 1788.05C326.604 1787.87 326.369 1787.74 326.131 1787.66C325.893 1787.58 325.631 1787.53 325.346 1787.53C324.674 1787.53 324.16 1787.75 323.805 1788.17C323.449 1788.59 323.271 1789.2 323.271 1790V1793.26H322.188V1786.7H323.271V1787.98C323.451 1787.51 323.727 1787.16 324.098 1786.91C324.473 1786.66 324.916 1786.54 325.428 1786.54C325.693 1786.54 325.941 1786.57 326.172 1786.64C326.402 1786.7 326.623 1786.81 326.834 1786.95V1788.05ZM338.137 1792.26L340.193 1784.51H341.418L338.857 1793.26H337.422L334.861 1784.51H336.086L338.137 1792.26ZM343.609 1786.72H346.369V1792.42H348.508V1793.26H343.152V1792.42H345.291V1787.56H343.609V1786.72ZM345.291 1784.17H346.369V1785.53H345.291V1784.17ZM354.689 1786.92V1787.98C354.381 1787.8 354.07 1787.67 353.758 1787.58C353.445 1787.49 353.127 1787.44 352.803 1787.44C352.314 1787.44 351.949 1787.52 351.707 1787.68C351.469 1787.84 351.35 1788.08 351.35 1788.4C351.35 1788.69 351.439 1788.91 351.619 1789.06C351.799 1789.2 352.246 1789.34 352.961 1789.48L353.395 1789.56C353.93 1789.66 354.334 1789.87 354.607 1790.17C354.885 1790.48 355.023 1790.87 355.023 1791.36C355.023 1792.01 354.793 1792.52 354.332 1792.88C353.871 1793.25 353.23 1793.43 352.41 1793.43C352.086 1793.43 351.746 1793.39 351.391 1793.32C351.035 1793.26 350.65 1793.16 350.236 1793.02V1791.91C350.639 1792.11 351.023 1792.27 351.391 1792.37C351.758 1792.48 352.105 1792.53 352.434 1792.53C352.91 1792.53 353.279 1792.43 353.541 1792.24C353.803 1792.04 353.934 1791.77 353.934 1791.42C353.934 1790.92 353.455 1790.58 352.498 1790.39L352.451 1790.38L352.047 1790.29C351.426 1790.17 350.973 1789.97 350.688 1789.68C350.402 1789.4 350.26 1789 350.26 1788.51C350.26 1787.88 350.473 1787.39 350.898 1787.05C351.324 1786.71 351.932 1786.54 352.721 1786.54C353.072 1786.54 353.41 1786.57 353.734 1786.64C354.059 1786.7 354.377 1786.8 354.689 1786.92ZM357.361 1790.77V1786.71H358.439V1790.77C358.439 1791.36 358.543 1791.8 358.75 1792.08C358.961 1792.35 359.285 1792.49 359.723 1792.49C360.23 1792.49 360.619 1792.31 360.889 1791.96C361.158 1791.6 361.293 1791.09 361.293 1790.42V1786.71H362.377V1793.26H361.293V1792.27C361.102 1792.65 360.84 1792.94 360.508 1793.14C360.18 1793.33 359.795 1793.43 359.354 1793.43C358.682 1793.43 358.182 1793.21 357.854 1792.77C357.525 1792.33 357.361 1791.67 357.361 1790.77ZM367.562 1789.96H367.205C366.576 1789.96 366.102 1790.07 365.781 1790.29C365.465 1790.51 365.307 1790.84 365.307 1791.28C365.307 1791.67 365.426 1791.98 365.664 1792.2C365.902 1792.42 366.232 1792.53 366.654 1792.53C367.248 1792.53 367.715 1792.32 368.055 1791.91C368.395 1791.5 368.566 1790.93 368.57 1790.2V1789.96H367.562ZM369.654 1789.51V1793.26H368.57V1792.29C368.34 1792.68 368.049 1792.97 367.697 1793.15C367.35 1793.34 366.926 1793.43 366.426 1793.43C365.758 1793.43 365.225 1793.24 364.826 1792.87C364.428 1792.49 364.229 1791.98 364.229 1791.35C364.229 1790.62 364.473 1790.06 364.961 1789.68C365.453 1789.31 366.174 1789.12 367.123 1789.12H368.57V1788.95C368.566 1788.42 368.434 1788.04 368.172 1787.81C367.91 1787.57 367.492 1787.45 366.918 1787.45C366.551 1787.45 366.18 1787.51 365.805 1787.61C365.43 1787.72 365.064 1787.87 364.709 1788.07V1787C365.107 1786.84 365.488 1786.73 365.852 1786.66C366.219 1786.58 366.574 1786.54 366.918 1786.54C367.461 1786.54 367.924 1786.62 368.307 1786.78C368.693 1786.94 369.006 1787.18 369.244 1787.5C369.393 1787.69 369.498 1787.94 369.561 1788.23C369.623 1788.51 369.654 1788.94 369.654 1789.51ZM374.893 1790.89C374.893 1791.37 374.98 1791.74 375.156 1791.98C375.336 1792.23 375.6 1792.35 375.947 1792.35H377.207V1793.26H375.842C375.197 1793.26 374.697 1793.05 374.342 1792.64C373.99 1792.23 373.814 1791.64 373.814 1790.89V1784.95H372.086V1784.11H374.893V1790.89ZM391.07 1784.81V1786.01C390.711 1785.78 390.35 1785.61 389.986 1785.49C389.627 1785.37 389.264 1785.31 388.896 1785.31C388.338 1785.31 387.896 1785.44 387.572 1785.71C387.248 1785.96 387.086 1786.31 387.086 1786.76C387.086 1787.14 387.191 1787.44 387.402 1787.64C387.617 1787.84 388.016 1788.01 388.598 1788.15L389.219 1788.29C390.039 1788.48 390.637 1788.78 391.012 1789.19C391.387 1789.6 391.574 1790.16 391.574 1790.87C391.574 1791.7 391.316 1792.34 390.801 1792.77C390.285 1793.21 389.535 1793.43 388.551 1793.43C388.141 1793.43 387.729 1793.38 387.314 1793.29C386.9 1793.21 386.484 1793.08 386.066 1792.9V1791.64C386.516 1791.93 386.939 1792.14 387.338 1792.27C387.74 1792.4 388.145 1792.47 388.551 1792.47C389.148 1792.47 389.613 1792.34 389.945 1792.07C390.277 1791.8 390.443 1791.42 390.443 1790.94C390.443 1790.51 390.328 1790.17 390.098 1789.94C389.871 1789.71 389.475 1789.53 388.908 1789.41L388.275 1789.26C387.463 1789.08 386.873 1788.8 386.506 1788.43C386.139 1788.06 385.955 1787.56 385.955 1786.94C385.955 1786.16 386.217 1785.53 386.74 1785.06C387.268 1784.59 387.967 1784.35 388.838 1784.35C389.174 1784.35 389.527 1784.39 389.898 1784.47C390.27 1784.54 390.66 1784.66 391.07 1784.81ZM395.969 1784.83V1786.7H398.418V1787.53H395.969V1791.1C395.969 1791.58 396.061 1791.92 396.244 1792.11C396.428 1792.3 396.748 1792.4 397.205 1792.4H398.418V1793.26H397.1C396.291 1793.26 395.721 1793.1 395.389 1792.77C395.057 1792.45 394.891 1791.89 394.891 1791.1V1787.53H393.139V1786.7H394.891V1784.83H395.969ZM400.744 1790.77V1786.71H401.822V1790.77C401.822 1791.36 401.926 1791.8 402.133 1792.08C402.344 1792.35 402.668 1792.49 403.105 1792.49C403.613 1792.49 404.002 1792.31 404.271 1791.96C404.541 1791.6 404.676 1791.09 404.676 1790.42V1786.71H405.76V1793.26H404.676V1792.27C404.484 1792.65 404.223 1792.94 403.891 1793.14C403.562 1793.33 403.178 1793.43 402.736 1793.43C402.064 1793.43 401.564 1793.21 401.236 1792.77C400.908 1792.33 400.744 1791.67 400.744 1790.77ZM411.859 1787.53V1784.14H412.938V1793.26H411.859V1792.43C411.68 1792.76 411.439 1793.01 411.139 1793.18C410.842 1793.34 410.498 1793.43 410.107 1793.43C409.314 1793.43 408.689 1793.12 408.232 1792.51C407.779 1791.89 407.553 1791.04 407.553 1789.96C407.553 1788.89 407.781 1788.06 408.238 1787.45C408.695 1786.84 409.318 1786.54 410.107 1786.54C410.502 1786.54 410.85 1786.62 411.15 1786.8C411.451 1786.96 411.688 1787.21 411.859 1787.53ZM408.689 1789.98C408.689 1790.82 408.822 1791.45 409.088 1791.88C409.354 1792.3 409.746 1792.51 410.266 1792.51C410.785 1792.51 411.18 1792.3 411.449 1791.87C411.723 1791.44 411.859 1790.81 411.859 1789.98C411.859 1789.15 411.723 1788.52 411.449 1788.1C411.18 1787.67 410.785 1787.45 410.266 1787.45C409.746 1787.45 409.354 1787.67 409.088 1788.09C408.822 1788.52 408.689 1789.15 408.689 1789.98ZM415.914 1786.72H418.674V1792.42H420.812V1793.26H415.457V1792.42H417.596V1787.56H415.914V1786.72ZM417.596 1784.17H418.674V1785.53H417.596V1784.17ZM424.902 1787.45C424.355 1787.45 423.941 1787.67 423.66 1788.09C423.379 1788.52 423.238 1789.15 423.238 1789.98C423.238 1790.82 423.379 1791.45 423.66 1791.88C423.941 1792.3 424.355 1792.51 424.902 1792.51C425.453 1792.51 425.869 1792.3 426.15 1791.88C426.432 1791.45 426.572 1790.82 426.572 1789.98C426.572 1789.15 426.432 1788.52 426.15 1788.09C425.869 1787.67 425.453 1787.45 424.902 1787.45ZM424.902 1786.54C425.812 1786.54 426.508 1786.83 426.988 1787.42C427.473 1788.01 427.715 1788.87 427.715 1789.98C427.715 1791.1 427.475 1791.96 426.994 1792.55C426.514 1793.14 425.816 1793.43 424.902 1793.43C423.992 1793.43 423.297 1793.14 422.816 1792.55C422.336 1791.96 422.096 1791.1 422.096 1789.98C422.096 1788.87 422.336 1788.01 422.816 1787.42C423.297 1786.83 423.992 1786.54 424.902 1786.54ZM442.041 1792.95C441.74 1793.11 441.432 1793.23 441.115 1793.31C440.799 1793.39 440.463 1793.43 440.107 1793.43C438.986 1793.43 438.115 1793.03 437.494 1792.24C436.877 1791.45 436.568 1790.33 436.568 1788.89C436.568 1787.46 436.879 1786.35 437.5 1785.55C438.125 1784.75 438.994 1784.35 440.107 1784.35C440.463 1784.35 440.799 1784.39 441.115 1784.48C441.432 1784.55 441.74 1784.67 442.041 1784.83V1786.05C441.752 1785.81 441.441 1785.63 441.109 1785.5C440.777 1785.38 440.443 1785.31 440.107 1785.31C439.338 1785.31 438.762 1785.61 438.379 1786.2C437.996 1786.8 437.805 1787.69 437.805 1788.89C437.805 1790.09 437.996 1790.98 438.379 1791.58C438.762 1792.17 439.338 1792.47 440.107 1792.47C440.451 1792.47 440.787 1792.41 441.115 1792.28C441.447 1792.16 441.756 1791.97 442.041 1791.74V1792.95ZM446.594 1787.45C446.047 1787.45 445.633 1787.67 445.352 1788.09C445.07 1788.52 444.93 1789.15 444.93 1789.98C444.93 1790.82 445.07 1791.45 445.352 1791.88C445.633 1792.3 446.047 1792.51 446.594 1792.51C447.145 1792.51 447.561 1792.3 447.842 1791.88C448.123 1791.45 448.264 1790.82 448.264 1789.98C448.264 1789.15 448.123 1788.52 447.842 1788.09C447.561 1787.67 447.145 1787.45 446.594 1787.45ZM446.594 1786.54C447.504 1786.54 448.199 1786.83 448.68 1787.42C449.164 1788.01 449.406 1788.87 449.406 1789.98C449.406 1791.1 449.166 1791.96 448.686 1792.55C448.205 1793.14 447.508 1793.43 446.594 1793.43C445.684 1793.43 444.988 1793.14 444.508 1792.55C444.027 1791.96 443.787 1791.1 443.787 1789.98C443.787 1788.87 444.027 1788.01 444.508 1787.42C444.988 1786.83 445.684 1786.54 446.594 1786.54ZM455.242 1787.53V1784.14H456.32V1793.26H455.242V1792.43C455.062 1792.76 454.822 1793.01 454.521 1793.18C454.225 1793.34 453.881 1793.43 453.49 1793.43C452.697 1793.43 452.072 1793.12 451.615 1792.51C451.162 1791.89 450.936 1791.04 450.936 1789.96C450.936 1788.89 451.164 1788.06 451.621 1787.45C452.078 1786.84 452.701 1786.54 453.49 1786.54C453.885 1786.54 454.232 1786.62 454.533 1786.8C454.834 1786.96 455.07 1787.21 455.242 1787.53ZM452.072 1789.98C452.072 1790.82 452.205 1791.45 452.471 1791.88C452.736 1792.3 453.129 1792.51 453.648 1792.51C454.168 1792.51 454.562 1792.3 454.832 1791.87C455.105 1791.44 455.242 1790.81 455.242 1789.98C455.242 1789.15 455.105 1788.52 454.832 1788.1C454.562 1787.67 454.168 1787.45 453.648 1787.45C453.129 1787.45 452.736 1787.67 452.471 1788.09C452.205 1788.52 452.072 1789.15 452.072 1789.98ZM464.008 1789.44V1789.97H459.338V1790C459.307 1790.9 459.477 1791.54 459.848 1791.93C460.223 1792.32 460.75 1792.51 461.43 1792.51C461.773 1792.51 462.133 1792.46 462.508 1792.35C462.883 1792.24 463.283 1792.08 463.709 1791.85V1792.92C463.299 1793.09 462.902 1793.22 462.52 1793.3C462.141 1793.39 461.773 1793.43 461.418 1793.43C460.398 1793.43 459.602 1793.12 459.027 1792.51C458.453 1791.9 458.166 1791.06 458.166 1789.98C458.166 1788.94 458.447 1788.1 459.01 1787.48C459.572 1786.85 460.322 1786.54 461.26 1786.54C462.096 1786.54 462.754 1786.82 463.234 1787.39C463.719 1787.95 463.977 1788.64 464.008 1789.44ZM462.93 1789.12C462.883 1788.67 462.717 1788.28 462.432 1787.95C462.15 1787.62 461.744 1787.45 461.213 1787.45C460.693 1787.45 460.266 1787.62 459.93 1787.97C459.594 1788.31 459.41 1788.7 459.379 1789.13L462.93 1789.12ZM470.213 1784.19V1787.78H468.9V1784.19H470.213ZM467.09 1784.19V1787.78H465.777V1784.19H467.09ZM231.607 1802.19V1805.78H230.295V1802.19H231.607ZM228.484 1802.19V1805.78H227.172V1802.19H228.484ZM236.91 1803.55L235.662 1808.03H238.158L236.91 1803.55ZM236.195 1802.51H237.631L240.309 1811.26H239.084L238.439 1808.98H235.375L234.742 1811.26H233.518L236.195 1802.51ZM253.979 1810.92C253.689 1811.09 253.391 1811.22 253.082 1811.3C252.777 1811.39 252.465 1811.43 252.145 1811.43C251.129 1811.43 250.334 1811.12 249.76 1810.51C249.189 1809.91 248.904 1809.06 248.904 1807.98C248.904 1806.91 249.189 1806.06 249.76 1805.45C250.334 1804.84 251.129 1804.54 252.145 1804.54C252.461 1804.54 252.77 1804.58 253.07 1804.66C253.371 1804.74 253.674 1804.87 253.979 1805.04V1806.17C253.693 1805.92 253.406 1805.74 253.117 1805.62C252.832 1805.51 252.508 1805.45 252.145 1805.45C251.469 1805.45 250.949 1805.67 250.586 1806.11C250.223 1806.55 250.041 1807.17 250.041 1807.98C250.041 1808.79 250.223 1809.42 250.586 1809.86C250.953 1810.3 251.473 1810.51 252.145 1810.51C252.52 1810.51 252.855 1810.46 253.152 1810.34C253.449 1810.23 253.725 1810.05 253.979 1809.81V1810.92ZM258.602 1805.45C258.055 1805.45 257.641 1805.67 257.359 1806.09C257.078 1806.52 256.938 1807.15 256.938 1807.98C256.938 1808.82 257.078 1809.45 257.359 1809.88C257.641 1810.3 258.055 1810.51 258.602 1810.51C259.152 1810.51 259.568 1810.3 259.85 1809.88C260.131 1809.45 260.271 1808.82 260.271 1807.98C260.271 1807.15 260.131 1806.52 259.85 1806.09C259.568 1805.67 259.152 1805.45 258.602 1805.45ZM258.602 1804.54C259.512 1804.54 260.207 1804.83 260.688 1805.42C261.172 1806.01 261.414 1806.87 261.414 1807.98C261.414 1809.1 261.174 1809.96 260.693 1810.55C260.213 1811.14 259.516 1811.43 258.602 1811.43C257.691 1811.43 256.996 1811.14 256.516 1810.55C256.035 1809.96 255.795 1809.1 255.795 1807.98C255.795 1806.87 256.035 1806.01 256.516 1805.42C256.996 1804.83 257.691 1804.54 258.602 1804.54ZM266.184 1805.36C266.316 1805.08 266.484 1804.88 266.688 1804.74C266.895 1804.61 267.143 1804.54 267.432 1804.54C267.959 1804.54 268.33 1804.74 268.545 1805.15C268.764 1805.56 268.873 1806.33 268.873 1807.46V1811.26H267.889V1807.5C267.889 1806.58 267.836 1806 267.73 1805.78C267.629 1805.55 267.441 1805.44 267.168 1805.44C266.855 1805.44 266.641 1805.56 266.523 1805.8C266.41 1806.04 266.354 1806.61 266.354 1807.5V1811.26H265.369V1807.5C265.369 1806.57 265.312 1805.99 265.199 1805.77C265.09 1805.55 264.891 1805.44 264.602 1805.44C264.316 1805.44 264.117 1805.56 264.004 1805.8C263.895 1806.04 263.84 1806.61 263.84 1807.5V1811.26H262.861V1804.7H263.84V1805.26C263.969 1805.02 264.129 1804.85 264.32 1804.73C264.516 1804.6 264.736 1804.54 264.982 1804.54C265.279 1804.54 265.525 1804.61 265.721 1804.74C265.92 1804.88 266.074 1805.09 266.184 1805.36ZM271.65 1810.43V1813.76H270.566V1804.7H271.65V1805.53C271.83 1805.21 272.068 1804.96 272.365 1804.8C272.666 1804.62 273.012 1804.54 273.402 1804.54C274.195 1804.54 274.816 1804.84 275.266 1805.46C275.719 1806.07 275.945 1806.92 275.945 1808.01C275.945 1809.07 275.719 1809.91 275.266 1810.52C274.812 1811.13 274.191 1811.43 273.402 1811.43C273.004 1811.43 272.654 1811.34 272.354 1811.18C272.057 1811.01 271.822 1810.76 271.65 1810.43ZM274.814 1807.98C274.814 1807.15 274.682 1806.52 274.416 1806.09C274.154 1805.67 273.764 1805.45 273.244 1805.45C272.721 1805.45 272.324 1805.67 272.055 1806.1C271.785 1806.52 271.65 1807.15 271.65 1807.98C271.65 1808.81 271.785 1809.44 272.055 1809.87C272.324 1810.3 272.721 1810.51 273.244 1810.51C273.764 1810.51 274.154 1810.3 274.416 1809.88C274.682 1809.45 274.814 1808.82 274.814 1807.98ZM280.293 1805.45C279.746 1805.45 279.332 1805.67 279.051 1806.09C278.77 1806.52 278.629 1807.15 278.629 1807.98C278.629 1808.82 278.77 1809.45 279.051 1809.88C279.332 1810.3 279.746 1810.51 280.293 1810.51C280.844 1810.51 281.26 1810.3 281.541 1809.88C281.822 1809.45 281.963 1808.82 281.963 1807.98C281.963 1807.15 281.822 1806.52 281.541 1806.09C281.26 1805.67 280.844 1805.45 280.293 1805.45ZM280.293 1804.54C281.203 1804.54 281.898 1804.83 282.379 1805.42C282.863 1806.01 283.105 1806.87 283.105 1807.98C283.105 1809.1 282.865 1809.96 282.385 1810.55C281.904 1811.14 281.207 1811.43 280.293 1811.43C279.383 1811.43 278.688 1811.14 278.207 1810.55C277.727 1809.96 277.486 1809.1 277.486 1807.98C277.486 1806.87 277.727 1806.01 278.207 1805.42C278.688 1804.83 279.383 1804.54 280.293 1804.54ZM290.072 1807.19V1811.26H288.988V1807.19C288.988 1806.6 288.885 1806.17 288.678 1805.89C288.471 1805.61 288.146 1805.48 287.705 1805.48C287.201 1805.48 286.812 1805.66 286.539 1806.01C286.27 1806.37 286.135 1806.88 286.135 1807.55V1811.26H285.057V1804.7H286.135V1805.68C286.326 1805.31 286.586 1805.02 286.914 1804.83C287.242 1804.64 287.631 1804.54 288.08 1804.54C288.748 1804.54 289.246 1804.76 289.574 1805.2C289.906 1805.64 290.072 1806.3 290.072 1807.19ZM297.707 1807.44V1807.97H293.037V1808C293.006 1808.9 293.176 1809.54 293.547 1809.93C293.922 1810.32 294.449 1810.51 295.129 1810.51C295.473 1810.51 295.832 1810.46 296.207 1810.35C296.582 1810.24 296.982 1810.08 297.408 1809.85V1810.92C296.998 1811.09 296.602 1811.22 296.219 1811.3C295.84 1811.39 295.473 1811.43 295.117 1811.43C294.098 1811.43 293.301 1811.12 292.727 1810.51C292.152 1809.9 291.865 1809.06 291.865 1807.98C291.865 1806.94 292.146 1806.1 292.709 1805.48C293.271 1804.85 294.021 1804.54 294.959 1804.54C295.795 1804.54 296.453 1804.82 296.934 1805.39C297.418 1805.95 297.676 1806.64 297.707 1807.44ZM296.629 1807.12C296.582 1806.67 296.416 1806.28 296.131 1805.95C295.85 1805.62 295.443 1805.45 294.912 1805.45C294.393 1805.45 293.965 1805.62 293.629 1805.97C293.293 1806.31 293.109 1806.7 293.078 1807.13L296.629 1807.12ZM304.533 1807.19V1811.26H303.449V1807.19C303.449 1806.6 303.346 1806.17 303.139 1805.89C302.932 1805.61 302.607 1805.48 302.166 1805.48C301.662 1805.48 301.273 1805.66 301 1806.01C300.73 1806.37 300.596 1806.88 300.596 1807.55V1811.26H299.518V1804.7H300.596V1805.68C300.787 1805.31 301.047 1805.02 301.375 1804.83C301.703 1804.64 302.092 1804.54 302.541 1804.54C303.209 1804.54 303.707 1804.76 304.035 1805.2C304.367 1805.64 304.533 1806.3 304.533 1807.19ZM309.203 1802.83V1804.7H311.652V1805.53H309.203V1809.1C309.203 1809.58 309.295 1809.92 309.479 1810.11C309.662 1810.3 309.982 1810.4 310.439 1810.4H311.652V1811.26H310.334C309.525 1811.26 308.955 1811.1 308.623 1810.77C308.291 1810.45 308.125 1809.89 308.125 1809.1V1805.53H306.373V1804.7H308.125V1802.83H309.203ZM324.279 1808.89C324.279 1809.37 324.367 1809.74 324.543 1809.98C324.723 1810.23 324.986 1810.35 325.334 1810.35H326.594V1811.26H325.229C324.584 1811.26 324.084 1811.05 323.729 1810.64C323.377 1810.23 323.201 1809.64 323.201 1808.89V1802.95H321.473V1802.11H324.279V1808.89ZM329.148 1804.72H331.908V1810.42H334.047V1811.26H328.691V1810.42H330.83V1805.56H329.148V1804.72ZM330.83 1802.17H331.908V1803.53H330.83V1802.17ZM339.906 1807.98C339.906 1807.15 339.773 1806.52 339.508 1806.09C339.242 1805.67 338.85 1805.45 338.33 1805.45C337.807 1805.45 337.41 1805.67 337.141 1806.1C336.871 1806.52 336.736 1807.15 336.736 1807.98C336.736 1808.81 336.871 1809.44 337.141 1809.87C337.41 1810.3 337.807 1810.51 338.33 1810.51C338.85 1810.51 339.242 1810.3 339.508 1809.88C339.773 1809.45 339.906 1808.82 339.906 1807.98ZM336.736 1805.53C336.908 1805.21 337.145 1804.97 337.445 1804.8C337.75 1804.62 338.102 1804.54 338.5 1804.54C339.289 1804.54 339.91 1804.84 340.363 1805.45C340.816 1806.06 341.043 1806.89 341.043 1807.96C341.043 1809.04 340.814 1809.89 340.357 1810.51C339.904 1811.12 339.281 1811.43 338.488 1811.43C338.098 1811.43 337.752 1811.34 337.451 1811.18C337.154 1811.01 336.916 1810.76 336.736 1810.43V1811.26H335.658V1802.14H336.736V1805.53ZM348.525 1806.05C348.295 1805.87 348.061 1805.74 347.822 1805.66C347.584 1805.58 347.322 1805.53 347.037 1805.53C346.365 1805.53 345.852 1805.75 345.496 1806.17C345.141 1806.59 344.963 1807.2 344.963 1808V1811.26H343.879V1804.7H344.963V1805.98C345.143 1805.51 345.418 1805.16 345.789 1804.91C346.164 1804.66 346.607 1804.54 347.119 1804.54C347.385 1804.54 347.633 1804.57 347.863 1804.64C348.094 1804.7 348.314 1804.81 348.525 1804.95V1806.05ZM353.102 1807.96H352.744C352.115 1807.96 351.641 1808.07 351.32 1808.29C351.004 1808.51 350.846 1808.84 350.846 1809.28C350.846 1809.67 350.965 1809.98 351.203 1810.2C351.441 1810.42 351.771 1810.53 352.193 1810.53C352.787 1810.53 353.254 1810.32 353.594 1809.91C353.934 1809.5 354.105 1808.93 354.109 1808.2V1807.96H353.102ZM355.193 1807.51V1811.26H354.109V1810.29C353.879 1810.68 353.588 1810.97 353.236 1811.15C352.889 1811.34 352.465 1811.43 351.965 1811.43C351.297 1811.43 350.764 1811.24 350.365 1810.87C349.967 1810.49 349.768 1809.98 349.768 1809.35C349.768 1808.62 350.012 1808.06 350.5 1807.68C350.992 1807.31 351.713 1807.12 352.662 1807.12H354.109V1806.95C354.105 1806.42 353.973 1806.04 353.711 1805.81C353.449 1805.57 353.031 1805.45 352.457 1805.45C352.09 1805.45 351.719 1805.51 351.344 1805.61C350.969 1805.72 350.604 1805.87 350.248 1806.07V1805C350.646 1804.84 351.027 1804.73 351.391 1804.66C351.758 1804.58 352.113 1804.54 352.457 1804.54C353 1804.54 353.463 1804.62 353.846 1804.78C354.232 1804.94 354.545 1805.18 354.783 1805.5C354.932 1805.69 355.037 1805.94 355.1 1806.23C355.162 1806.51 355.193 1806.94 355.193 1807.51ZM362.986 1806.05C362.756 1805.87 362.521 1805.74 362.283 1805.66C362.045 1805.58 361.783 1805.53 361.498 1805.53C360.826 1805.53 360.312 1805.75 359.957 1806.17C359.602 1806.59 359.424 1807.2 359.424 1808V1811.26H358.34V1804.7H359.424V1805.98C359.604 1805.51 359.879 1805.16 360.25 1804.91C360.625 1804.66 361.068 1804.54 361.58 1804.54C361.846 1804.54 362.094 1804.57 362.324 1804.64C362.555 1804.7 362.775 1804.81 362.986 1804.95V1806.05ZM368.477 1809.15C368.297 1809.61 368.068 1810.21 367.791 1810.95C367.404 1811.99 367.145 1812.61 367.012 1812.84C366.832 1813.15 366.607 1813.37 366.338 1813.53C366.068 1813.68 365.754 1813.76 365.395 1813.76H364.527V1812.85H365.166C365.482 1812.85 365.73 1812.76 365.91 1812.58C366.09 1812.39 366.318 1811.92 366.596 1811.15L364.059 1804.7H365.201L367.146 1809.83L369.062 1804.7H370.205L368.477 1809.15ZM384.139 1802.14V1803.04H382.914C382.527 1803.04 382.258 1803.12 382.105 1803.28C381.957 1803.43 381.883 1803.71 381.883 1804.12V1804.7H384.139V1805.53H381.883V1811.26H380.805V1805.53H379.053V1804.7H380.805V1804.24C380.805 1803.52 380.969 1802.99 381.297 1802.65C381.629 1802.31 382.145 1802.14 382.844 1802.14H384.139ZM388.75 1805.45C388.203 1805.45 387.789 1805.67 387.508 1806.09C387.227 1806.52 387.086 1807.15 387.086 1807.98C387.086 1808.82 387.227 1809.45 387.508 1809.88C387.789 1810.3 388.203 1810.51 388.75 1810.51C389.301 1810.51 389.717 1810.3 389.998 1809.88C390.279 1809.45 390.42 1808.82 390.42 1807.98C390.42 1807.15 390.279 1806.52 389.998 1806.09C389.717 1805.67 389.301 1805.45 388.75 1805.45ZM388.75 1804.54C389.66 1804.54 390.355 1804.83 390.836 1805.42C391.32 1806.01 391.562 1806.87 391.562 1807.98C391.562 1809.1 391.322 1809.96 390.842 1810.55C390.361 1811.14 389.664 1811.43 388.75 1811.43C387.84 1811.43 387.145 1811.14 386.664 1810.55C386.184 1809.96 385.943 1809.1 385.943 1807.98C385.943 1806.87 386.184 1806.01 386.664 1805.42C387.145 1804.83 387.84 1804.54 388.75 1804.54ZM399.139 1806.05C398.908 1805.87 398.674 1805.74 398.436 1805.66C398.197 1805.58 397.936 1805.53 397.65 1805.53C396.979 1805.53 396.465 1805.75 396.109 1806.17C395.754 1806.59 395.576 1807.2 395.576 1808V1811.26H394.492V1804.7H395.576V1805.98C395.756 1805.51 396.031 1805.16 396.402 1804.91C396.777 1804.66 397.221 1804.54 397.732 1804.54C397.998 1804.54 398.246 1804.57 398.477 1804.64C398.707 1804.7 398.928 1804.81 399.139 1804.95V1806.05ZM412.211 1807.98C412.211 1807.15 412.078 1806.52 411.812 1806.09C411.547 1805.67 411.154 1805.45 410.635 1805.45C410.111 1805.45 409.715 1805.67 409.445 1806.1C409.176 1806.52 409.041 1807.15 409.041 1807.98C409.041 1808.81 409.176 1809.44 409.445 1809.87C409.715 1810.3 410.111 1810.51 410.635 1810.51C411.154 1810.51 411.547 1810.3 411.812 1809.88C412.078 1809.45 412.211 1808.82 412.211 1807.98ZM409.041 1805.53C409.213 1805.21 409.449 1804.97 409.75 1804.8C410.055 1804.62 410.406 1804.54 410.805 1804.54C411.594 1804.54 412.215 1804.84 412.668 1805.45C413.121 1806.06 413.348 1806.89 413.348 1807.96C413.348 1809.04 413.119 1809.89 412.662 1810.51C412.209 1811.12 411.586 1811.43 410.793 1811.43C410.402 1811.43 410.057 1811.34 409.756 1811.18C409.459 1811.01 409.221 1810.76 409.041 1810.43V1811.26H407.963V1802.14H409.041V1805.53ZM415.205 1808.77V1804.71H416.283V1808.77C416.283 1809.36 416.387 1809.8 416.594 1810.08C416.805 1810.35 417.129 1810.49 417.566 1810.49C418.074 1810.49 418.463 1810.31 418.732 1809.96C419.002 1809.6 419.137 1809.09 419.137 1808.42V1804.71H420.221V1811.26H419.137V1810.27C418.945 1810.65 418.684 1810.94 418.352 1811.14C418.023 1811.33 417.639 1811.43 417.197 1811.43C416.525 1811.43 416.025 1811.21 415.697 1810.77C415.369 1810.33 415.205 1809.67 415.205 1808.77ZM423.145 1804.72H425.904V1810.42H428.043V1811.26H422.688V1810.42H424.826V1805.56H423.145V1804.72ZM424.826 1802.17H425.904V1803.53H424.826V1802.17ZM432.736 1808.89C432.736 1809.37 432.824 1809.74 433 1809.98C433.18 1810.23 433.443 1810.35 433.791 1810.35H435.051V1811.26H433.686C433.041 1811.26 432.541 1811.05 432.186 1810.64C431.834 1810.23 431.658 1809.64 431.658 1808.89V1802.95H429.93V1802.11H432.736V1808.89ZM440.781 1805.53V1802.14H441.859V1811.26H440.781V1810.43C440.602 1810.76 440.361 1811.01 440.061 1811.18C439.764 1811.34 439.42 1811.43 439.029 1811.43C438.236 1811.43 437.611 1811.12 437.154 1810.51C436.701 1809.89 436.475 1809.04 436.475 1807.96C436.475 1806.89 436.703 1806.06 437.16 1805.45C437.617 1804.84 438.24 1804.54 439.029 1804.54C439.424 1804.54 439.771 1804.62 440.072 1804.8C440.373 1804.96 440.609 1805.21 440.781 1805.53ZM437.611 1807.98C437.611 1808.82 437.744 1809.45 438.01 1809.88C438.275 1810.3 438.668 1810.51 439.188 1810.51C439.707 1810.51 440.102 1810.3 440.371 1809.87C440.645 1809.44 440.781 1808.81 440.781 1807.98C440.781 1807.15 440.645 1806.52 440.371 1806.1C440.102 1805.67 439.707 1805.45 439.188 1805.45C438.668 1805.45 438.275 1805.67 438.01 1806.09C437.744 1806.52 437.611 1807.15 437.611 1807.98ZM444.836 1804.72H447.596V1810.42H449.734V1811.26H444.379V1810.42H446.518V1805.56H444.836V1804.72ZM446.518 1802.17H447.596V1803.53H446.518V1802.17ZM456.373 1807.19V1811.26H455.289V1807.19C455.289 1806.6 455.186 1806.17 454.979 1805.89C454.771 1805.61 454.447 1805.48 454.006 1805.48C453.502 1805.48 453.113 1805.66 452.84 1806.01C452.57 1806.37 452.436 1806.88 452.436 1807.55V1811.26H451.357V1804.7H452.436V1805.68C452.627 1805.31 452.887 1805.02 453.215 1804.83C453.543 1804.64 453.932 1804.54 454.381 1804.54C455.049 1804.54 455.547 1804.76 455.875 1805.2C456.207 1805.64 456.373 1806.3 456.373 1807.19ZM462.473 1807.92C462.473 1807.12 462.34 1806.5 462.074 1806.09C461.812 1805.66 461.43 1805.45 460.926 1805.45C460.398 1805.45 459.996 1805.66 459.719 1806.09C459.441 1806.5 459.303 1807.12 459.303 1807.92C459.303 1808.73 459.441 1809.35 459.719 1809.78C460 1810.2 460.406 1810.41 460.938 1810.41C461.434 1810.41 461.812 1810.2 462.074 1809.77C462.34 1809.34 462.473 1808.73 462.473 1807.92ZM463.551 1810.84C463.551 1811.82 463.318 1812.57 462.854 1813.08C462.389 1813.58 461.705 1813.84 460.803 1813.84C460.506 1813.84 460.195 1813.81 459.871 1813.76C459.547 1813.7 459.223 1813.62 458.898 1813.51V1812.45C459.281 1812.63 459.629 1812.76 459.941 1812.85C460.254 1812.93 460.541 1812.98 460.803 1812.98C461.385 1812.98 461.809 1812.82 462.074 1812.5C462.34 1812.18 462.473 1811.68 462.473 1811V1810.95V1810.22C462.301 1810.58 462.066 1810.86 461.77 1811.04C461.473 1811.22 461.111 1811.31 460.686 1811.31C459.92 1811.31 459.309 1811 458.852 1810.39C458.395 1809.77 458.166 1808.95 458.166 1807.92C458.166 1806.89 458.395 1806.07 458.852 1805.46C459.309 1804.84 459.92 1804.54 460.686 1804.54C461.107 1804.54 461.465 1804.62 461.758 1804.79C462.051 1804.96 462.289 1805.22 462.473 1805.57V1804.72H463.551V1810.84ZM471.906 1804.7H472.973L474.115 1810L475.053 1806.61H475.973L476.922 1810L478.064 1804.7H479.131L477.596 1811.26H476.564L475.516 1807.66L474.473 1811.26H473.441L471.906 1804.7ZM485.699 1807.44V1807.97H481.029V1808C480.998 1808.9 481.168 1809.54 481.539 1809.93C481.914 1810.32 482.441 1810.51 483.121 1810.51C483.465 1810.51 483.824 1810.46 484.199 1810.35C484.574 1810.24 484.975 1810.08 485.4 1809.85V1810.92C484.99 1811.09 484.594 1811.22 484.211 1811.3C483.832 1811.39 483.465 1811.43 483.109 1811.43C482.09 1811.43 481.293 1811.12 480.719 1810.51C480.145 1809.9 479.857 1809.06 479.857 1807.98C479.857 1806.94 480.139 1806.1 480.701 1805.48C481.264 1804.85 482.014 1804.54 482.951 1804.54C483.787 1804.54 484.445 1804.82 484.926 1805.39C485.41 1805.95 485.668 1806.64 485.699 1807.44ZM484.621 1807.12C484.574 1806.67 484.408 1806.28 484.123 1805.95C483.842 1805.62 483.436 1805.45 482.904 1805.45C482.385 1805.45 481.957 1805.62 481.621 1805.97C481.285 1806.31 481.102 1806.7 481.07 1807.13L484.621 1807.12ZM491.746 1807.98C491.746 1807.15 491.613 1806.52 491.348 1806.09C491.082 1805.67 490.689 1805.45 490.17 1805.45C489.646 1805.45 489.25 1805.67 488.98 1806.1C488.711 1806.52 488.576 1807.15 488.576 1807.98C488.576 1808.81 488.711 1809.44 488.98 1809.87C489.25 1810.3 489.646 1810.51 490.17 1810.51C490.689 1810.51 491.082 1810.3 491.348 1809.88C491.613 1809.45 491.746 1808.82 491.746 1807.98ZM488.576 1805.53C488.748 1805.21 488.984 1804.97 489.285 1804.8C489.59 1804.62 489.941 1804.54 490.34 1804.54C491.129 1804.54 491.75 1804.84 492.203 1805.45C492.656 1806.06 492.883 1806.89 492.883 1807.96C492.883 1809.04 492.654 1809.89 492.197 1810.51C491.744 1811.12 491.121 1811.43 490.328 1811.43C489.938 1811.43 489.592 1811.34 489.291 1811.18C488.994 1811.01 488.756 1810.76 488.576 1810.43V1811.26H487.498V1802.14H488.576V1805.53ZM494.184 1804.7H495.303L497.207 1810.2L499.117 1804.7H500.236L497.904 1811.26H496.516L494.184 1804.7ZM502.68 1804.72H505.439V1810.42H507.578V1811.26H502.223V1810.42H504.361V1805.56H502.68V1804.72ZM504.361 1802.17H505.439V1803.53H504.361V1802.17ZM514.621 1807.44V1807.97H509.951V1808C509.92 1808.9 510.09 1809.54 510.461 1809.93C510.836 1810.32 511.363 1810.51 512.043 1810.51C512.387 1810.51 512.746 1810.46 513.121 1810.35C513.496 1810.24 513.896 1810.08 514.322 1809.85V1810.92C513.912 1811.09 513.516 1811.22 513.133 1811.3C512.754 1811.39 512.387 1811.43 512.031 1811.43C511.012 1811.43 510.215 1811.12 509.641 1810.51C509.066 1809.9 508.779 1809.06 508.779 1807.98C508.779 1806.94 509.061 1806.1 509.623 1805.48C510.186 1804.85 510.936 1804.54 511.873 1804.54C512.709 1804.54 513.367 1804.82 513.848 1805.39C514.332 1805.95 514.59 1806.64 514.621 1807.44ZM513.543 1807.12C513.496 1806.67 513.33 1806.28 513.045 1805.95C512.764 1805.62 512.357 1805.45 511.826 1805.45C511.307 1805.45 510.879 1805.62 510.543 1805.97C510.207 1806.31 510.023 1806.7 509.992 1807.13L513.543 1807.12ZM515.289 1804.7H516.355L517.498 1810L518.436 1806.61H519.355L520.305 1810L521.447 1804.7H522.514L520.979 1811.26H519.947L518.898 1807.66L517.855 1811.26H516.824L515.289 1804.7ZM523.117 1807.02H529.328V1808.01H523.117V1807.02ZM535.129 1807.98C535.129 1807.15 534.996 1806.52 534.73 1806.09C534.465 1805.67 534.072 1805.45 533.553 1805.45C533.029 1805.45 532.633 1805.67 532.363 1806.1C532.094 1806.52 531.959 1807.15 531.959 1807.98C531.959 1808.81 532.094 1809.44 532.363 1809.87C532.633 1810.3 533.029 1810.51 533.553 1810.51C534.072 1810.51 534.465 1810.3 534.73 1809.88C534.996 1809.45 535.129 1808.82 535.129 1807.98ZM531.959 1805.53C532.131 1805.21 532.367 1804.97 532.668 1804.8C532.973 1804.62 533.324 1804.54 533.723 1804.54C534.512 1804.54 535.133 1804.84 535.586 1805.45C536.039 1806.06 536.266 1806.89 536.266 1807.96C536.266 1809.04 536.037 1809.89 535.58 1810.51C535.127 1811.12 534.504 1811.43 533.711 1811.43C533.32 1811.43 532.975 1811.34 532.674 1811.18C532.377 1811.01 532.139 1810.76 531.959 1810.43V1811.26H530.881V1802.14H531.959V1805.53ZM541.094 1807.96H540.736C540.107 1807.96 539.633 1808.07 539.312 1808.29C538.996 1808.51 538.838 1808.84 538.838 1809.28C538.838 1809.67 538.957 1809.98 539.195 1810.2C539.434 1810.42 539.764 1810.53 540.186 1810.53C540.779 1810.53 541.246 1810.32 541.586 1809.91C541.926 1809.5 542.098 1808.93 542.102 1808.2V1807.96H541.094ZM543.186 1807.51V1811.26H542.102V1810.29C541.871 1810.68 541.58 1810.97 541.229 1811.15C540.881 1811.34 540.457 1811.43 539.957 1811.43C539.289 1811.43 538.756 1811.24 538.357 1810.87C537.959 1810.49 537.76 1809.98 537.76 1809.35C537.76 1808.62 538.004 1808.06 538.492 1807.68C538.984 1807.31 539.705 1807.12 540.654 1807.12H542.102V1806.95C542.098 1806.42 541.965 1806.04 541.703 1805.81C541.441 1805.57 541.023 1805.45 540.449 1805.45C540.082 1805.45 539.711 1805.51 539.336 1805.61C538.961 1805.72 538.596 1805.87 538.24 1806.07V1805C538.639 1804.84 539.02 1804.73 539.383 1804.66C539.75 1804.58 540.105 1804.54 540.449 1804.54C540.992 1804.54 541.455 1804.62 541.838 1804.78C542.225 1804.94 542.537 1805.18 542.775 1805.5C542.924 1805.69 543.029 1805.94 543.092 1806.23C543.154 1806.51 543.186 1806.94 543.186 1807.51ZM549.912 1804.92V1805.98C549.604 1805.8 549.293 1805.67 548.98 1805.58C548.668 1805.49 548.35 1805.44 548.025 1805.44C547.537 1805.44 547.172 1805.52 546.93 1805.68C546.691 1805.84 546.572 1806.08 546.572 1806.4C546.572 1806.69 546.662 1806.91 546.842 1807.06C547.021 1807.2 547.469 1807.34 548.184 1807.48L548.617 1807.56C549.152 1807.66 549.557 1807.87 549.83 1808.17C550.107 1808.48 550.246 1808.87 550.246 1809.36C550.246 1810.01 550.016 1810.52 549.555 1810.88C549.094 1811.25 548.453 1811.43 547.633 1811.43C547.309 1811.43 546.969 1811.39 546.613 1811.32C546.258 1811.26 545.873 1811.16 545.459 1811.02V1809.91C545.861 1810.11 546.246 1810.27 546.613 1810.37C546.98 1810.48 547.328 1810.53 547.656 1810.53C548.133 1810.53 548.502 1810.43 548.764 1810.24C549.025 1810.04 549.156 1809.77 549.156 1809.42C549.156 1808.92 548.678 1808.58 547.721 1808.39L547.674 1808.38L547.27 1808.29C546.648 1808.17 546.195 1807.97 545.91 1807.68C545.625 1807.4 545.482 1807 545.482 1806.51C545.482 1805.88 545.695 1805.39 546.121 1805.05C546.547 1804.71 547.154 1804.54 547.943 1804.54C548.295 1804.54 548.633 1804.57 548.957 1804.64C549.281 1804.7 549.6 1804.8 549.912 1804.92ZM558.004 1807.44V1807.97H553.334V1808C553.303 1808.9 553.473 1809.54 553.844 1809.93C554.219 1810.32 554.746 1810.51 555.426 1810.51C555.77 1810.51 556.129 1810.46 556.504 1810.35C556.879 1810.24 557.279 1810.08 557.705 1809.85V1810.92C557.295 1811.09 556.898 1811.22 556.516 1811.3C556.137 1811.39 555.77 1811.43 555.414 1811.43C554.395 1811.43 553.598 1811.12 553.023 1810.51C552.449 1809.9 552.162 1809.06 552.162 1807.98C552.162 1806.94 552.443 1806.1 553.006 1805.48C553.568 1804.85 554.318 1804.54 555.256 1804.54C556.092 1804.54 556.75 1804.82 557.23 1805.39C557.715 1805.95 557.973 1806.64 558.004 1807.44ZM556.926 1807.12C556.879 1806.67 556.713 1806.28 556.428 1805.95C556.146 1805.62 555.74 1805.45 555.209 1805.45C554.689 1805.45 554.262 1805.62 553.926 1805.97C553.59 1806.31 553.406 1806.7 553.375 1807.13L556.926 1807.12ZM563.699 1805.53V1802.14H564.777V1811.26H563.699V1810.43C563.52 1810.76 563.279 1811.01 562.979 1811.18C562.682 1811.34 562.338 1811.43 561.947 1811.43C561.154 1811.43 560.529 1811.12 560.072 1810.51C559.619 1809.89 559.393 1809.04 559.393 1807.96C559.393 1806.89 559.621 1806.06 560.078 1805.45C560.535 1804.84 561.158 1804.54 561.947 1804.54C562.342 1804.54 562.689 1804.62 562.99 1804.8C563.291 1804.96 563.527 1805.21 563.699 1805.53ZM560.529 1807.98C560.529 1808.82 560.662 1809.45 560.928 1809.88C561.193 1810.3 561.586 1810.51 562.105 1810.51C562.625 1810.51 563.02 1810.3 563.289 1809.87C563.562 1809.44 563.699 1808.81 563.699 1807.98C563.699 1807.15 563.562 1806.52 563.289 1806.1C563.02 1805.67 562.625 1805.45 562.105 1805.45C561.586 1805.45 561.193 1805.67 560.928 1806.09C560.662 1806.52 560.529 1807.15 560.529 1807.98ZM579.695 1807.44V1807.97H575.025V1808C574.994 1808.9 575.164 1809.54 575.535 1809.93C575.91 1810.32 576.438 1810.51 577.117 1810.51C577.461 1810.51 577.82 1810.46 578.195 1810.35C578.57 1810.24 578.971 1810.08 579.396 1809.85V1810.92C578.986 1811.09 578.59 1811.22 578.207 1811.3C577.828 1811.39 577.461 1811.43 577.105 1811.43C576.086 1811.43 575.289 1811.12 574.715 1810.51C574.141 1809.9 573.854 1809.06 573.854 1807.98C573.854 1806.94 574.135 1806.1 574.697 1805.48C575.26 1804.85 576.01 1804.54 576.947 1804.54C577.783 1804.54 578.441 1804.82 578.922 1805.39C579.406 1805.95 579.664 1806.64 579.695 1807.44ZM578.617 1807.12C578.57 1806.67 578.404 1806.28 578.119 1805.95C577.838 1805.62 577.432 1805.45 576.9 1805.45C576.381 1805.45 575.953 1805.62 575.617 1805.97C575.281 1806.31 575.098 1806.7 575.066 1807.13L578.617 1807.12ZM586.914 1804.7L584.564 1807.84L587.143 1811.26H585.895L583.973 1808.63L582.057 1811.26H580.809L583.387 1807.84L581.037 1804.7H582.232L583.973 1807.07L585.701 1804.7H586.914ZM591.191 1802.83V1804.7H593.641V1805.53H591.191V1809.1C591.191 1809.58 591.283 1809.92 591.467 1810.11C591.65 1810.3 591.971 1810.4 592.428 1810.4H593.641V1811.26H592.322C591.514 1811.26 590.943 1811.1 590.611 1810.77C590.279 1810.45 590.113 1809.89 590.113 1809.1V1805.53H588.361V1804.7H590.113V1802.83H591.191ZM601.387 1807.44V1807.97H596.717V1808C596.686 1808.9 596.855 1809.54 597.227 1809.93C597.602 1810.32 598.129 1810.51 598.809 1810.51C599.152 1810.51 599.512 1810.46 599.887 1810.35C600.262 1810.24 600.662 1810.08 601.088 1809.85V1810.92C600.678 1811.09 600.281 1811.22 599.898 1811.3C599.52 1811.39 599.152 1811.43 598.797 1811.43C597.777 1811.43 596.98 1811.12 596.406 1810.51C595.832 1809.9 595.545 1809.06 595.545 1807.98C595.545 1806.94 595.826 1806.1 596.389 1805.48C596.951 1804.85 597.701 1804.54 598.639 1804.54C599.475 1804.54 600.133 1804.82 600.613 1805.39C601.098 1805.95 601.355 1806.64 601.387 1807.44ZM600.309 1807.12C600.262 1806.67 600.096 1806.28 599.811 1805.95C599.529 1805.62 599.123 1805.45 598.592 1805.45C598.072 1805.45 597.645 1805.62 597.309 1805.97C596.973 1806.31 596.789 1806.7 596.758 1807.13L600.309 1807.12ZM608.213 1807.19V1811.26H607.129V1807.19C607.129 1806.6 607.025 1806.17 606.818 1805.89C606.611 1805.61 606.287 1805.48 605.846 1805.48C605.342 1805.48 604.953 1805.66 604.68 1806.01C604.41 1806.37 604.275 1806.88 604.275 1807.55V1811.26H603.197V1804.7H604.275V1805.68C604.467 1805.31 604.727 1805.02 605.055 1804.83C605.383 1804.64 605.771 1804.54 606.221 1804.54C606.889 1804.54 607.387 1804.76 607.715 1805.2C608.047 1805.64 608.213 1806.3 608.213 1807.19ZM614.986 1804.92V1805.98C614.678 1805.8 614.367 1805.67 614.055 1805.58C613.742 1805.49 613.424 1805.44 613.1 1805.44C612.611 1805.44 612.246 1805.52 612.004 1805.68C611.766 1805.84 611.646 1806.08 611.646 1806.4C611.646 1806.69 611.736 1806.91 611.916 1807.06C612.096 1807.2 612.543 1807.34 613.258 1807.48L613.691 1807.56C614.227 1807.66 614.631 1807.87 614.904 1808.17C615.182 1808.48 615.32 1808.87 615.32 1809.36C615.32 1810.01 615.09 1810.52 614.629 1810.88C614.168 1811.25 613.527 1811.43 612.707 1811.43C612.383 1811.43 612.043 1811.39 611.688 1811.32C611.332 1811.26 610.947 1811.16 610.533 1811.02V1809.91C610.936 1810.11 611.32 1810.27 611.688 1810.37C612.055 1810.48 612.402 1810.53 612.73 1810.53C613.207 1810.53 613.576 1810.43 613.838 1810.24C614.1 1810.04 614.23 1809.77 614.23 1809.42C614.23 1808.92 613.752 1808.58 612.795 1808.39L612.748 1808.38L612.344 1808.29C611.723 1808.17 611.27 1807.97 610.984 1807.68C610.699 1807.4 610.557 1807 610.557 1806.51C610.557 1805.88 610.77 1805.39 611.195 1805.05C611.621 1804.71 612.229 1804.54 613.018 1804.54C613.369 1804.54 613.707 1804.57 614.031 1804.64C614.355 1804.7 614.674 1804.8 614.986 1804.92ZM618.367 1804.72H621.127V1810.42H623.266V1811.26H617.91V1810.42H620.049V1805.56H618.367V1804.72ZM620.049 1802.17H621.127V1803.53H620.049V1802.17ZM627.355 1805.45C626.809 1805.45 626.395 1805.67 626.113 1806.09C625.832 1806.52 625.691 1807.15 625.691 1807.98C625.691 1808.82 625.832 1809.45 626.113 1809.88C626.395 1810.3 626.809 1810.51 627.355 1810.51C627.906 1810.51 628.322 1810.3 628.604 1809.88C628.885 1809.45 629.025 1808.82 629.025 1807.98C629.025 1807.15 628.885 1806.52 628.604 1806.09C628.322 1805.67 627.906 1805.45 627.355 1805.45ZM627.355 1804.54C628.266 1804.54 628.961 1804.83 629.441 1805.42C629.926 1806.01 630.168 1806.87 630.168 1807.98C630.168 1809.1 629.928 1809.96 629.447 1810.55C628.967 1811.14 628.27 1811.43 627.355 1811.43C626.445 1811.43 625.75 1811.14 625.27 1810.55C624.789 1809.96 624.549 1809.1 624.549 1807.98C624.549 1806.87 624.789 1806.01 625.27 1805.42C625.75 1804.83 626.445 1804.54 627.355 1804.54ZM637.135 1807.19V1811.26H636.051V1807.19C636.051 1806.6 635.947 1806.17 635.74 1805.89C635.533 1805.61 635.209 1805.48 634.768 1805.48C634.264 1805.48 633.875 1805.66 633.602 1806.01C633.332 1806.37 633.197 1806.88 633.197 1807.55V1811.26H632.119V1804.7H633.197V1805.68C633.389 1805.31 633.648 1805.02 633.977 1804.83C634.305 1804.64 634.693 1804.54 635.143 1804.54C635.811 1804.54 636.309 1804.76 636.637 1805.2C636.969 1805.64 637.135 1806.3 637.135 1807.19ZM643.908 1804.92V1805.98C643.6 1805.8 643.289 1805.67 642.977 1805.58C642.664 1805.49 642.346 1805.44 642.021 1805.44C641.533 1805.44 641.168 1805.52 640.926 1805.68C640.688 1805.84 640.568 1806.08 640.568 1806.4C640.568 1806.69 640.658 1806.91 640.838 1807.06C641.018 1807.2 641.465 1807.34 642.18 1807.48L642.613 1807.56C643.148 1807.66 643.553 1807.87 643.826 1808.17C644.104 1808.48 644.242 1808.87 644.242 1809.36C644.242 1810.01 644.012 1810.52 643.551 1810.88C643.09 1811.25 642.449 1811.43 641.629 1811.43C641.305 1811.43 640.965 1811.39 640.609 1811.32C640.254 1811.26 639.869 1811.16 639.455 1811.02V1809.91C639.857 1810.11 640.242 1810.27 640.609 1810.37C640.977 1810.48 641.324 1810.53 641.652 1810.53C642.129 1810.53 642.498 1810.43 642.76 1810.24C643.021 1810.04 643.152 1809.77 643.152 1809.42C643.152 1808.92 642.674 1808.58 641.717 1808.39L641.67 1808.38L641.266 1808.29C640.645 1808.17 640.191 1807.97 639.906 1807.68C639.621 1807.4 639.479 1807 639.479 1806.51C639.479 1805.88 639.691 1805.39 640.117 1805.05C640.543 1804.71 641.15 1804.54 641.939 1804.54C642.291 1804.54 642.629 1804.57 642.953 1804.64C643.277 1804.7 643.596 1804.8 643.908 1804.92ZM654.52 1804.72H657.279V1810.42H659.418V1811.26H654.062V1810.42H656.201V1805.56H654.52V1804.72ZM656.201 1802.17H657.279V1803.53H656.201V1802.17ZM666.057 1807.19V1811.26H664.973V1807.19C664.973 1806.6 664.869 1806.17 664.662 1805.89C664.455 1805.61 664.131 1805.48 663.689 1805.48C663.186 1805.48 662.797 1805.66 662.523 1806.01C662.254 1806.37 662.119 1806.88 662.119 1807.55V1811.26H661.041V1804.7H662.119V1805.68C662.311 1805.31 662.57 1805.02 662.898 1804.83C663.227 1804.64 663.615 1804.54 664.064 1804.54C664.732 1804.54 665.23 1804.76 665.559 1805.2C665.891 1805.64 666.057 1806.3 666.057 1807.19ZM677.969 1810.26L680.025 1802.51H681.25L678.689 1811.26H677.254L674.693 1802.51H675.918L677.969 1810.26ZM683.441 1804.72H686.201V1810.42H688.34V1811.26H682.984V1810.42H685.123V1805.56H683.441V1804.72ZM685.123 1802.17H686.201V1803.53H685.123V1802.17ZM694.521 1804.92V1805.98C694.213 1805.8 693.902 1805.67 693.59 1805.58C693.277 1805.49 692.959 1805.44 692.635 1805.44C692.146 1805.44 691.781 1805.52 691.539 1805.68C691.301 1805.84 691.182 1806.08 691.182 1806.4C691.182 1806.69 691.271 1806.91 691.451 1807.06C691.631 1807.2 692.078 1807.34 692.793 1807.48L693.227 1807.56C693.762 1807.66 694.166 1807.87 694.439 1808.17C694.717 1808.48 694.855 1808.87 694.855 1809.36C694.855 1810.01 694.625 1810.52 694.164 1810.88C693.703 1811.25 693.062 1811.43 692.242 1811.43C691.918 1811.43 691.578 1811.39 691.223 1811.32C690.867 1811.26 690.482 1811.16 690.068 1811.02V1809.91C690.471 1810.11 690.855 1810.27 691.223 1810.37C691.59 1810.48 691.938 1810.53 692.266 1810.53C692.742 1810.53 693.111 1810.43 693.373 1810.24C693.635 1810.04 693.766 1809.77 693.766 1809.42C693.766 1808.92 693.287 1808.58 692.33 1808.39L692.283 1808.38L691.879 1808.29C691.258 1808.17 690.805 1807.97 690.52 1807.68C690.234 1807.4 690.092 1807 690.092 1806.51C690.092 1805.88 690.305 1805.39 690.73 1805.05C691.156 1804.71 691.764 1804.54 692.553 1804.54C692.904 1804.54 693.242 1804.57 693.566 1804.64C693.891 1804.7 694.209 1804.8 694.521 1804.92ZM697.193 1808.77V1804.71H698.271V1808.77C698.271 1809.36 698.375 1809.8 698.582 1810.08C698.793 1810.35 699.117 1810.49 699.555 1810.49C700.062 1810.49 700.451 1810.31 700.721 1809.96C700.99 1809.6 701.125 1809.09 701.125 1808.42V1804.71H702.209V1811.26H701.125V1810.27C700.934 1810.65 700.672 1810.94 700.34 1811.14C700.012 1811.33 699.627 1811.43 699.186 1811.43C698.514 1811.43 698.014 1811.21 697.686 1810.77C697.357 1810.33 697.193 1809.67 697.193 1808.77ZM707.395 1807.96H707.037C706.408 1807.96 705.934 1808.07 705.613 1808.29C705.297 1808.51 705.139 1808.84 705.139 1809.28C705.139 1809.67 705.258 1809.98 705.496 1810.2C705.734 1810.42 706.064 1810.53 706.486 1810.53C707.08 1810.53 707.547 1810.32 707.887 1809.91C708.227 1809.5 708.398 1808.93 708.402 1808.2V1807.96H707.395ZM709.486 1807.51V1811.26H708.402V1810.29C708.172 1810.68 707.881 1810.97 707.529 1811.15C707.182 1811.34 706.758 1811.43 706.258 1811.43C705.59 1811.43 705.057 1811.24 704.658 1810.87C704.26 1810.49 704.061 1809.98 704.061 1809.35C704.061 1808.62 704.305 1808.06 704.793 1807.68C705.285 1807.31 706.006 1807.12 706.955 1807.12H708.402V1806.95C708.398 1806.42 708.266 1806.04 708.004 1805.81C707.742 1805.57 707.324 1805.45 706.75 1805.45C706.383 1805.45 706.012 1805.51 705.637 1805.61C705.262 1805.72 704.896 1805.87 704.541 1806.07V1805C704.939 1804.84 705.32 1804.73 705.684 1804.66C706.051 1804.58 706.406 1804.54 706.75 1804.54C707.293 1804.54 707.756 1804.62 708.139 1804.78C708.525 1804.94 708.838 1805.18 709.076 1805.5C709.225 1805.69 709.33 1805.94 709.393 1806.23C709.455 1806.51 709.486 1806.94 709.486 1807.51ZM714.725 1808.89C714.725 1809.37 714.812 1809.74 714.988 1809.98C715.168 1810.23 715.432 1810.35 715.779 1810.35H717.039V1811.26H715.674C715.029 1811.26 714.529 1811.05 714.174 1810.64C713.822 1810.23 713.646 1809.64 713.646 1808.89V1802.95H711.918V1802.11H714.725V1808.89ZM730.902 1802.81V1804.01C730.543 1803.78 730.182 1803.61 729.818 1803.49C729.459 1803.37 729.096 1803.31 728.729 1803.31C728.17 1803.31 727.729 1803.44 727.404 1803.71C727.08 1803.96 726.918 1804.31 726.918 1804.76C726.918 1805.14 727.023 1805.44 727.234 1805.64C727.449 1805.84 727.848 1806.01 728.43 1806.15L729.051 1806.29C729.871 1806.48 730.469 1806.78 730.844 1807.19C731.219 1807.6 731.406 1808.16 731.406 1808.87C731.406 1809.7 731.148 1810.34 730.633 1810.77C730.117 1811.21 729.367 1811.43 728.383 1811.43C727.973 1811.43 727.561 1811.38 727.146 1811.29C726.732 1811.21 726.316 1811.08 725.898 1810.9V1809.64C726.348 1809.93 726.771 1810.14 727.17 1810.27C727.572 1810.4 727.977 1810.47 728.383 1810.47C728.98 1810.47 729.445 1810.34 729.777 1810.07C730.109 1809.8 730.275 1809.42 730.275 1808.94C730.275 1808.51 730.16 1808.17 729.93 1807.94C729.703 1807.71 729.307 1807.53 728.74 1807.41L728.107 1807.26C727.295 1807.08 726.705 1806.8 726.338 1806.43C725.971 1806.06 725.787 1805.56 725.787 1804.94C725.787 1804.16 726.049 1803.53 726.572 1803.06C727.1 1802.59 727.799 1802.35 728.67 1802.35C729.006 1802.35 729.359 1802.39 729.73 1802.47C730.102 1802.54 730.492 1802.66 730.902 1802.81ZM735.801 1802.83V1804.7H738.25V1805.53H735.801V1809.1C735.801 1809.58 735.893 1809.92 736.076 1810.11C736.26 1810.3 736.58 1810.4 737.037 1810.4H738.25V1811.26H736.932C736.123 1811.26 735.553 1811.1 735.221 1810.77C734.889 1810.45 734.723 1809.89 734.723 1809.1V1805.53H732.971V1804.7H734.723V1802.83H735.801ZM740.576 1808.77V1804.71H741.654V1808.77C741.654 1809.36 741.758 1809.8 741.965 1810.08C742.176 1810.35 742.5 1810.49 742.938 1810.49C743.445 1810.49 743.834 1810.31 744.104 1809.96C744.373 1809.6 744.508 1809.09 744.508 1808.42V1804.71H745.592V1811.26H744.508V1810.27C744.316 1810.65 744.055 1810.94 743.723 1811.14C743.395 1811.33 743.01 1811.43 742.568 1811.43C741.896 1811.43 741.396 1811.21 741.068 1810.77C740.74 1810.33 740.576 1809.67 740.576 1808.77ZM751.691 1805.53V1802.14H752.77V1811.26H751.691V1810.43C751.512 1810.76 751.271 1811.01 750.971 1811.18C750.674 1811.34 750.33 1811.43 749.939 1811.43C749.146 1811.43 748.521 1811.12 748.064 1810.51C747.611 1809.89 747.385 1809.04 747.385 1807.96C747.385 1806.89 747.613 1806.06 748.07 1805.45C748.527 1804.84 749.15 1804.54 749.939 1804.54C750.334 1804.54 750.682 1804.62 750.982 1804.8C751.283 1804.96 751.52 1805.21 751.691 1805.53ZM748.521 1807.98C748.521 1808.82 748.654 1809.45 748.92 1809.88C749.186 1810.3 749.578 1810.51 750.098 1810.51C750.617 1810.51 751.012 1810.3 751.281 1809.87C751.555 1809.44 751.691 1808.81 751.691 1807.98C751.691 1807.15 751.555 1806.52 751.281 1806.1C751.012 1805.67 750.617 1805.45 750.098 1805.45C749.578 1805.45 749.186 1805.67 748.92 1806.09C748.654 1806.52 748.521 1807.15 748.521 1807.98ZM755.746 1804.72H758.506V1810.42H760.645V1811.26H755.289V1810.42H757.428V1805.56H755.746V1804.72ZM757.428 1802.17H758.506V1803.53H757.428V1802.17ZM764.734 1805.45C764.188 1805.45 763.773 1805.67 763.492 1806.09C763.211 1806.52 763.07 1807.15 763.07 1807.98C763.07 1808.82 763.211 1809.45 763.492 1809.88C763.773 1810.3 764.188 1810.51 764.734 1810.51C765.285 1810.51 765.701 1810.3 765.982 1809.88C766.264 1809.45 766.404 1808.82 766.404 1807.98C766.404 1807.15 766.264 1806.52 765.982 1806.09C765.701 1805.67 765.285 1805.45 764.734 1805.45ZM764.734 1804.54C765.645 1804.54 766.34 1804.83 766.82 1805.42C767.305 1806.01 767.547 1806.87 767.547 1807.98C767.547 1809.1 767.307 1809.96 766.826 1810.55C766.346 1811.14 765.648 1811.43 764.734 1811.43C763.824 1811.43 763.129 1811.14 762.648 1810.55C762.168 1809.96 761.928 1809.1 761.928 1807.98C761.928 1806.87 762.168 1806.01 762.648 1805.42C763.129 1804.83 763.824 1804.54 764.734 1804.54ZM781.873 1810.95C781.572 1811.11 781.264 1811.23 780.947 1811.31C780.631 1811.39 780.295 1811.43 779.939 1811.43C778.818 1811.43 777.947 1811.03 777.326 1810.24C776.709 1809.45 776.4 1808.33 776.4 1806.89C776.4 1805.46 776.711 1804.35 777.332 1803.55C777.957 1802.75 778.826 1802.35 779.939 1802.35C780.295 1802.35 780.631 1802.39 780.947 1802.48C781.264 1802.55 781.572 1802.67 781.873 1802.83V1804.05C781.584 1803.81 781.273 1803.63 780.941 1803.5C780.609 1803.38 780.275 1803.31 779.939 1803.31C779.17 1803.31 778.594 1803.61 778.211 1804.2C777.828 1804.8 777.637 1805.69 777.637 1806.89C777.637 1808.09 777.828 1808.98 778.211 1809.58C778.594 1810.17 779.17 1810.47 779.939 1810.47C780.283 1810.47 780.619 1810.41 780.947 1810.28C781.279 1810.16 781.588 1809.97 781.873 1809.74V1810.95ZM786.426 1805.45C785.879 1805.45 785.465 1805.67 785.184 1806.09C784.902 1806.52 784.762 1807.15 784.762 1807.98C784.762 1808.82 784.902 1809.45 785.184 1809.88C785.465 1810.3 785.879 1810.51 786.426 1810.51C786.977 1810.51 787.393 1810.3 787.674 1809.88C787.955 1809.45 788.096 1808.82 788.096 1807.98C788.096 1807.15 787.955 1806.52 787.674 1806.09C787.393 1805.67 786.977 1805.45 786.426 1805.45ZM786.426 1804.54C787.336 1804.54 788.031 1804.83 788.512 1805.42C788.996 1806.01 789.238 1806.87 789.238 1807.98C789.238 1809.1 788.998 1809.96 788.518 1810.55C788.037 1811.14 787.34 1811.43 786.426 1811.43C785.516 1811.43 784.82 1811.14 784.34 1810.55C783.859 1809.96 783.619 1809.1 783.619 1807.98C783.619 1806.87 783.859 1806.01 784.34 1805.42C784.82 1804.83 785.516 1804.54 786.426 1804.54ZM795.074 1805.53V1802.14H796.152V1811.26H795.074V1810.43C794.895 1810.76 794.654 1811.01 794.354 1811.18C794.057 1811.34 793.713 1811.43 793.322 1811.43C792.529 1811.43 791.904 1811.12 791.447 1810.51C790.994 1809.89 790.768 1809.04 790.768 1807.96C790.768 1806.89 790.996 1806.06 791.453 1805.45C791.91 1804.84 792.533 1804.54 793.322 1804.54C793.717 1804.54 794.064 1804.62 794.365 1804.8C794.666 1804.96 794.902 1805.21 795.074 1805.53ZM791.904 1807.98C791.904 1808.82 792.037 1809.45 792.303 1809.88C792.568 1810.3 792.961 1810.51 793.48 1810.51C794 1810.51 794.395 1810.3 794.664 1809.87C794.938 1809.44 795.074 1808.81 795.074 1807.98C795.074 1807.15 794.938 1806.52 794.664 1806.1C794.395 1805.67 794 1805.45 793.48 1805.45C792.961 1805.45 792.568 1805.67 792.303 1806.09C792.037 1806.52 791.904 1807.15 791.904 1807.98ZM803.84 1807.44V1807.97H799.17V1808C799.139 1808.9 799.309 1809.54 799.68 1809.93C800.055 1810.32 800.582 1810.51 801.262 1810.51C801.605 1810.51 801.965 1810.46 802.34 1810.35C802.715 1810.24 803.115 1810.08 803.541 1809.85V1810.92C803.131 1811.09 802.734 1811.22 802.352 1811.3C801.973 1811.39 801.605 1811.43 801.25 1811.43C800.23 1811.43 799.434 1811.12 798.859 1810.51C798.285 1809.9 797.998 1809.06 797.998 1807.98C797.998 1806.94 798.279 1806.1 798.842 1805.48C799.404 1804.85 800.154 1804.54 801.092 1804.54C801.928 1804.54 802.586 1804.82 803.066 1805.39C803.551 1805.95 803.809 1806.64 803.84 1807.44ZM802.762 1807.12C802.715 1806.67 802.549 1806.28 802.264 1805.95C801.982 1805.62 801.576 1805.45 801.045 1805.45C800.525 1805.45 800.098 1805.62 799.762 1805.97C799.426 1806.31 799.242 1806.7 799.211 1807.13L802.762 1807.12ZM810.045 1802.19V1805.78H808.732V1802.19H810.045ZM806.922 1802.19V1805.78H805.609V1802.19H806.922ZM209.916 1820.19V1823.78H208.604V1820.19H209.916ZM206.793 1820.19V1823.78H205.48V1820.19H206.793ZM216.818 1820.51H217.932L213.326 1830.37H212.207L216.818 1820.51ZM220.691 1822.72H223.451V1828.42H225.59V1829.26H220.234V1828.42H222.373V1823.56H220.691V1822.72ZM222.373 1820.17H223.451V1821.53H222.373V1820.17ZM230.031 1823.36C230.164 1823.08 230.332 1822.88 230.535 1822.74C230.742 1822.61 230.99 1822.54 231.279 1822.54C231.807 1822.54 232.178 1822.74 232.393 1823.15C232.611 1823.56 232.721 1824.33 232.721 1825.46V1829.26H231.736V1825.5C231.736 1824.58 231.684 1824 231.578 1823.78C231.477 1823.55 231.289 1823.44 231.016 1823.44C230.703 1823.44 230.488 1823.56 230.371 1823.8C230.258 1824.04 230.201 1824.61 230.201 1825.5V1829.26H229.217V1825.5C229.217 1824.57 229.16 1823.99 229.047 1823.77C228.938 1823.55 228.738 1823.44 228.449 1823.44C228.164 1823.44 227.965 1823.56 227.852 1823.8C227.742 1824.04 227.688 1824.61 227.688 1825.5V1829.26H226.709V1822.7H227.688V1823.26C227.816 1823.02 227.977 1822.85 228.168 1822.73C228.363 1822.6 228.584 1822.54 228.83 1822.54C229.127 1822.54 229.373 1822.61 229.568 1822.74C229.768 1822.88 229.922 1823.09 230.031 1823.36ZM237.414 1825.96H237.057C236.428 1825.96 235.953 1826.07 235.633 1826.29C235.316 1826.51 235.158 1826.84 235.158 1827.28C235.158 1827.67 235.277 1827.98 235.516 1828.2C235.754 1828.42 236.084 1828.53 236.506 1828.53C237.1 1828.53 237.566 1828.32 237.906 1827.91C238.246 1827.5 238.418 1826.93 238.422 1826.2V1825.96H237.414ZM239.506 1825.51V1829.26H238.422V1828.29C238.191 1828.68 237.9 1828.97 237.549 1829.15C237.201 1829.34 236.777 1829.43 236.277 1829.43C235.609 1829.43 235.076 1829.24 234.678 1828.87C234.279 1828.49 234.08 1827.98 234.08 1827.35C234.08 1826.62 234.324 1826.06 234.812 1825.68C235.305 1825.31 236.025 1825.12 236.975 1825.12H238.422V1824.95C238.418 1824.42 238.285 1824.04 238.023 1823.81C237.762 1823.57 237.344 1823.45 236.77 1823.45C236.402 1823.45 236.031 1823.51 235.656 1823.61C235.281 1823.72 234.916 1823.87 234.561 1824.07V1823C234.959 1822.84 235.34 1822.73 235.703 1822.66C236.07 1822.58 236.426 1822.54 236.77 1822.54C237.312 1822.54 237.775 1822.62 238.158 1822.78C238.545 1822.94 238.857 1823.18 239.096 1823.5C239.244 1823.69 239.35 1823.94 239.412 1824.23C239.475 1824.51 239.506 1824.94 239.506 1825.51ZM245.559 1825.92C245.559 1825.12 245.426 1824.5 245.16 1824.09C244.898 1823.66 244.516 1823.45 244.012 1823.45C243.484 1823.45 243.082 1823.66 242.805 1824.09C242.527 1824.5 242.389 1825.12 242.389 1825.92C242.389 1826.73 242.527 1827.35 242.805 1827.78C243.086 1828.2 243.492 1828.41 244.023 1828.41C244.52 1828.41 244.898 1828.2 245.16 1827.77C245.426 1827.34 245.559 1826.73 245.559 1825.92ZM246.637 1828.84C246.637 1829.82 246.404 1830.57 245.939 1831.08C245.475 1831.58 244.791 1831.84 243.889 1831.84C243.592 1831.84 243.281 1831.81 242.957 1831.76C242.633 1831.7 242.309 1831.62 241.984 1831.51V1830.45C242.367 1830.63 242.715 1830.76 243.027 1830.85C243.34 1830.93 243.627 1830.98 243.889 1830.98C244.471 1830.98 244.895 1830.82 245.16 1830.5C245.426 1830.18 245.559 1829.68 245.559 1829V1828.95V1828.22C245.387 1828.58 245.152 1828.86 244.855 1829.04C244.559 1829.22 244.197 1829.31 243.771 1829.31C243.006 1829.31 242.395 1829 241.938 1828.39C241.48 1827.77 241.252 1826.95 241.252 1825.92C241.252 1824.89 241.48 1824.07 241.938 1823.46C242.395 1822.84 243.006 1822.54 243.771 1822.54C244.193 1822.54 244.551 1822.62 244.844 1822.79C245.137 1822.96 245.375 1823.22 245.559 1823.57V1822.72H246.637V1828.84ZM254.324 1825.44V1825.97H249.654V1826C249.623 1826.9 249.793 1827.54 250.164 1827.93C250.539 1828.32 251.066 1828.51 251.746 1828.51C252.09 1828.51 252.449 1828.46 252.824 1828.35C253.199 1828.24 253.6 1828.08 254.025 1827.85V1828.92C253.615 1829.09 253.219 1829.22 252.836 1829.3C252.457 1829.39 252.09 1829.43 251.734 1829.43C250.715 1829.43 249.918 1829.12 249.344 1828.51C248.77 1827.9 248.482 1827.06 248.482 1825.98C248.482 1824.94 248.764 1824.1 249.326 1823.48C249.889 1822.85 250.639 1822.54 251.576 1822.54C252.412 1822.54 253.07 1822.82 253.551 1823.39C254.035 1823.95 254.293 1824.64 254.324 1825.44ZM253.246 1825.12C253.199 1824.67 253.033 1824.28 252.748 1823.95C252.467 1823.62 252.061 1823.45 251.529 1823.45C251.01 1823.45 250.582 1823.62 250.246 1823.97C249.91 1824.31 249.727 1824.7 249.695 1825.13L253.246 1825.12ZM260.693 1822.92V1823.98C260.385 1823.8 260.074 1823.67 259.762 1823.58C259.449 1823.49 259.131 1823.44 258.807 1823.44C258.318 1823.44 257.953 1823.52 257.711 1823.68C257.473 1823.84 257.354 1824.08 257.354 1824.4C257.354 1824.69 257.443 1824.91 257.623 1825.06C257.803 1825.2 258.25 1825.34 258.965 1825.48L259.398 1825.56C259.934 1825.66 260.338 1825.87 260.611 1826.17C260.889 1826.48 261.027 1826.87 261.027 1827.36C261.027 1828.01 260.797 1828.52 260.336 1828.88C259.875 1829.25 259.234 1829.43 258.414 1829.43C258.09 1829.43 257.75 1829.39 257.395 1829.32C257.039 1829.26 256.654 1829.16 256.24 1829.02V1827.91C256.643 1828.11 257.027 1828.27 257.395 1828.37C257.762 1828.48 258.109 1828.53 258.438 1828.53C258.914 1828.53 259.283 1828.43 259.545 1828.24C259.807 1828.04 259.938 1827.77 259.938 1827.42C259.938 1826.92 259.459 1826.58 258.502 1826.39L258.455 1826.38L258.051 1826.29C257.43 1826.17 256.977 1825.97 256.691 1825.68C256.406 1825.4 256.264 1825 256.264 1824.51C256.264 1823.88 256.477 1823.39 256.902 1823.05C257.328 1822.71 257.936 1822.54 258.725 1822.54C259.076 1822.54 259.414 1822.57 259.738 1822.64C260.062 1822.7 260.381 1822.8 260.693 1822.92ZM267.432 1820.51H268.545L263.939 1830.37H262.82L267.432 1820.51ZM270.039 1822.7H271.158L273.062 1828.2L274.973 1822.7H276.092L273.76 1829.26H272.371L270.039 1822.7ZM282.385 1822.92V1823.98C282.076 1823.8 281.766 1823.67 281.453 1823.58C281.141 1823.49 280.822 1823.44 280.498 1823.44C280.01 1823.44 279.645 1823.52 279.402 1823.68C279.164 1823.84 279.045 1824.08 279.045 1824.4C279.045 1824.69 279.135 1824.91 279.314 1825.06C279.494 1825.2 279.941 1825.34 280.656 1825.48L281.09 1825.56C281.625 1825.66 282.029 1825.87 282.303 1826.17C282.58 1826.48 282.719 1826.87 282.719 1827.36C282.719 1828.01 282.488 1828.52 282.027 1828.88C281.566 1829.25 280.926 1829.43 280.105 1829.43C279.781 1829.43 279.441 1829.39 279.086 1829.32C278.73 1829.26 278.346 1829.16 277.932 1829.02V1827.91C278.334 1828.11 278.719 1828.27 279.086 1828.37C279.453 1828.48 279.801 1828.53 280.129 1828.53C280.605 1828.53 280.975 1828.43 281.236 1828.24C281.498 1828.04 281.629 1827.77 281.629 1827.42C281.629 1826.92 281.15 1826.58 280.193 1826.39L280.146 1826.38L279.742 1826.29C279.121 1826.17 278.668 1825.97 278.383 1825.68C278.098 1825.4 277.955 1825 277.955 1824.51C277.955 1823.88 278.168 1823.39 278.594 1823.05C279.02 1822.71 279.627 1822.54 280.416 1822.54C280.768 1822.54 281.105 1822.57 281.43 1822.64C281.754 1822.7 282.072 1822.8 282.385 1822.92ZM290.131 1828.92C289.842 1829.09 289.543 1829.22 289.234 1829.3C288.93 1829.39 288.617 1829.43 288.297 1829.43C287.281 1829.43 286.486 1829.12 285.912 1828.51C285.342 1827.91 285.057 1827.06 285.057 1825.98C285.057 1824.91 285.342 1824.06 285.912 1823.45C286.486 1822.84 287.281 1822.54 288.297 1822.54C288.613 1822.54 288.922 1822.58 289.223 1822.66C289.523 1822.74 289.826 1822.87 290.131 1823.04V1824.17C289.846 1823.92 289.559 1823.74 289.27 1823.62C288.984 1823.51 288.66 1823.45 288.297 1823.45C287.621 1823.45 287.102 1823.67 286.738 1824.11C286.375 1824.55 286.193 1825.17 286.193 1825.98C286.193 1826.79 286.375 1827.42 286.738 1827.86C287.105 1828.3 287.625 1828.51 288.297 1828.51C288.672 1828.51 289.008 1828.46 289.305 1828.34C289.602 1828.23 289.877 1828.05 290.131 1827.81V1828.92ZM294.754 1823.45C294.207 1823.45 293.793 1823.67 293.512 1824.09C293.23 1824.52 293.09 1825.15 293.09 1825.98C293.09 1826.82 293.23 1827.45 293.512 1827.88C293.793 1828.3 294.207 1828.51 294.754 1828.51C295.305 1828.51 295.721 1828.3 296.002 1827.88C296.283 1827.45 296.424 1826.82 296.424 1825.98C296.424 1825.15 296.283 1824.52 296.002 1824.09C295.721 1823.67 295.305 1823.45 294.754 1823.45ZM294.754 1822.54C295.664 1822.54 296.359 1822.83 296.84 1823.42C297.324 1824.01 297.566 1824.87 297.566 1825.98C297.566 1827.1 297.326 1827.96 296.846 1828.55C296.365 1829.14 295.668 1829.43 294.754 1829.43C293.844 1829.43 293.148 1829.14 292.668 1828.55C292.188 1827.96 291.947 1827.1 291.947 1825.98C291.947 1824.87 292.188 1824.01 292.668 1823.42C293.148 1822.83 293.844 1822.54 294.754 1822.54ZM303.402 1823.53V1820.14H304.48V1829.26H303.402V1828.43C303.223 1828.76 302.982 1829.01 302.682 1829.18C302.385 1829.34 302.041 1829.43 301.65 1829.43C300.857 1829.43 300.232 1829.12 299.775 1828.51C299.322 1827.89 299.096 1827.04 299.096 1825.96C299.096 1824.89 299.324 1824.06 299.781 1823.45C300.238 1822.84 300.861 1822.54 301.65 1822.54C302.045 1822.54 302.393 1822.62 302.693 1822.8C302.994 1822.96 303.23 1823.21 303.402 1823.53ZM300.232 1825.98C300.232 1826.82 300.365 1827.45 300.631 1827.88C300.896 1828.3 301.289 1828.51 301.809 1828.51C302.328 1828.51 302.723 1828.3 302.992 1827.87C303.266 1827.44 303.402 1826.81 303.402 1825.98C303.402 1825.15 303.266 1824.52 302.992 1824.1C302.723 1823.67 302.328 1823.45 301.809 1823.45C301.289 1823.45 300.896 1823.67 300.631 1824.09C300.365 1824.52 300.232 1825.15 300.232 1825.98ZM312.168 1825.44V1825.97H307.498V1826C307.467 1826.9 307.637 1827.54 308.008 1827.93C308.383 1828.32 308.91 1828.51 309.59 1828.51C309.934 1828.51 310.293 1828.46 310.668 1828.35C311.043 1828.24 311.443 1828.08 311.869 1827.85V1828.92C311.459 1829.09 311.062 1829.22 310.68 1829.3C310.301 1829.39 309.934 1829.43 309.578 1829.43C308.559 1829.43 307.762 1829.12 307.188 1828.51C306.613 1827.9 306.326 1827.06 306.326 1825.98C306.326 1824.94 306.607 1824.1 307.17 1823.48C307.732 1822.85 308.482 1822.54 309.42 1822.54C310.256 1822.54 310.914 1822.82 311.395 1823.39C311.879 1823.95 312.137 1824.64 312.168 1825.44ZM311.09 1825.12C311.043 1824.67 310.877 1824.28 310.592 1823.95C310.311 1823.62 309.904 1823.45 309.373 1823.45C308.854 1823.45 308.426 1823.62 308.09 1823.97C307.754 1824.31 307.57 1824.7 307.539 1825.13L311.09 1825.12ZM313.434 1825.02H319.645V1826.01H313.434V1825.02ZM320.066 1822.7H321.133L322.275 1828L323.213 1824.61H324.133L325.082 1828L326.225 1822.7H327.291L325.756 1829.26H324.725L323.676 1825.66L322.633 1829.26H321.602L320.066 1822.7ZM333.859 1825.44V1825.97H329.189V1826C329.158 1826.9 329.328 1827.54 329.699 1827.93C330.074 1828.32 330.602 1828.51 331.281 1828.51C331.625 1828.51 331.984 1828.46 332.359 1828.35C332.734 1828.24 333.135 1828.08 333.561 1827.85V1828.92C333.15 1829.09 332.754 1829.22 332.371 1829.3C331.992 1829.39 331.625 1829.43 331.27 1829.43C330.25 1829.43 329.453 1829.12 328.879 1828.51C328.305 1827.9 328.018 1827.06 328.018 1825.98C328.018 1824.94 328.299 1824.1 328.861 1823.48C329.424 1822.85 330.174 1822.54 331.111 1822.54C331.947 1822.54 332.605 1822.82 333.086 1823.39C333.57 1823.95 333.828 1824.64 333.859 1825.44ZM332.781 1825.12C332.734 1824.67 332.568 1824.28 332.283 1823.95C332.002 1823.62 331.596 1823.45 331.064 1823.45C330.545 1823.45 330.117 1823.62 329.781 1823.97C329.445 1824.31 329.262 1824.7 329.23 1825.13L332.781 1825.12ZM339.906 1825.98C339.906 1825.15 339.773 1824.52 339.508 1824.09C339.242 1823.67 338.85 1823.45 338.33 1823.45C337.807 1823.45 337.41 1823.67 337.141 1824.1C336.871 1824.52 336.736 1825.15 336.736 1825.98C336.736 1826.81 336.871 1827.44 337.141 1827.87C337.41 1828.3 337.807 1828.51 338.33 1828.51C338.85 1828.51 339.242 1828.3 339.508 1827.88C339.773 1827.45 339.906 1826.82 339.906 1825.98ZM336.736 1823.53C336.908 1823.21 337.145 1822.97 337.445 1822.8C337.75 1822.62 338.102 1822.54 338.5 1822.54C339.289 1822.54 339.91 1822.84 340.363 1823.45C340.816 1824.06 341.043 1824.89 341.043 1825.96C341.043 1827.04 340.814 1827.89 340.357 1828.51C339.904 1829.12 339.281 1829.43 338.488 1829.43C338.098 1829.43 337.752 1829.34 337.451 1829.18C337.154 1829.01 336.916 1828.76 336.736 1828.43V1829.26H335.658V1820.14H336.736V1823.53ZM342.344 1822.7H343.463L345.367 1828.2L347.277 1822.7H348.396L346.064 1829.26H344.676L342.344 1822.7ZM350.84 1822.72H353.6V1828.42H355.738V1829.26H350.383V1828.42H352.521V1823.56H350.84V1822.72ZM352.521 1820.17H353.6V1821.53H352.521V1820.17ZM362.781 1825.44V1825.97H358.111V1826C358.08 1826.9 358.25 1827.54 358.621 1827.93C358.996 1828.32 359.523 1828.51 360.203 1828.51C360.547 1828.51 360.906 1828.46 361.281 1828.35C361.656 1828.24 362.057 1828.08 362.482 1827.85V1828.92C362.072 1829.09 361.676 1829.22 361.293 1829.3C360.914 1829.39 360.547 1829.43 360.191 1829.43C359.172 1829.43 358.375 1829.12 357.801 1828.51C357.227 1827.9 356.939 1827.06 356.939 1825.98C356.939 1824.94 357.221 1824.1 357.783 1823.48C358.346 1822.85 359.096 1822.54 360.033 1822.54C360.869 1822.54 361.527 1822.82 362.008 1823.39C362.492 1823.95 362.75 1824.64 362.781 1825.44ZM361.703 1825.12C361.656 1824.67 361.49 1824.28 361.205 1823.95C360.924 1823.62 360.518 1823.45 359.986 1823.45C359.467 1823.45 359.039 1823.62 358.703 1823.97C358.367 1824.31 358.184 1824.7 358.152 1825.13L361.703 1825.12ZM363.449 1822.7H364.516L365.658 1828L366.596 1824.61H367.516L368.465 1828L369.607 1822.7H370.674L369.139 1829.26H368.107L367.059 1825.66L366.016 1829.26H364.984L363.449 1822.7ZM371.277 1825.02H377.488V1826.01H371.277V1825.02ZM381.508 1820.83V1822.7H383.957V1823.53H381.508V1827.1C381.508 1827.58 381.6 1827.92 381.783 1828.11C381.967 1828.3 382.287 1828.4 382.744 1828.4H383.957V1829.26H382.639C381.83 1829.26 381.26 1829.1 380.928 1828.77C380.596 1828.45 380.43 1827.89 380.43 1827.1V1823.53H378.678V1822.7H380.43V1820.83H381.508ZM388.75 1823.45C388.203 1823.45 387.789 1823.67 387.508 1824.09C387.227 1824.52 387.086 1825.15 387.086 1825.98C387.086 1826.82 387.227 1827.45 387.508 1827.88C387.789 1828.3 388.203 1828.51 388.75 1828.51C389.301 1828.51 389.717 1828.3 389.998 1827.88C390.279 1827.45 390.42 1826.82 390.42 1825.98C390.42 1825.15 390.279 1824.52 389.998 1824.09C389.717 1823.67 389.301 1823.45 388.75 1823.45ZM388.75 1822.54C389.66 1822.54 390.355 1822.83 390.836 1823.42C391.32 1824.01 391.562 1824.87 391.562 1825.98C391.562 1827.1 391.322 1827.96 390.842 1828.55C390.361 1829.14 389.664 1829.43 388.75 1829.43C387.84 1829.43 387.145 1829.14 386.664 1828.55C386.184 1827.96 385.943 1827.1 385.943 1825.98C385.943 1824.87 386.184 1824.01 386.664 1823.42C387.145 1822.83 387.84 1822.54 388.75 1822.54ZM395.98 1823.45C395.434 1823.45 395.02 1823.67 394.738 1824.09C394.457 1824.52 394.316 1825.15 394.316 1825.98C394.316 1826.82 394.457 1827.45 394.738 1827.88C395.02 1828.3 395.434 1828.51 395.98 1828.51C396.531 1828.51 396.947 1828.3 397.229 1827.88C397.51 1827.45 397.65 1826.82 397.65 1825.98C397.65 1825.15 397.51 1824.52 397.229 1824.09C396.947 1823.67 396.531 1823.45 395.98 1823.45ZM395.98 1822.54C396.891 1822.54 397.586 1822.83 398.066 1823.42C398.551 1824.01 398.793 1824.87 398.793 1825.98C398.793 1827.1 398.553 1827.96 398.072 1828.55C397.592 1829.14 396.895 1829.43 395.98 1829.43C395.07 1829.43 394.375 1829.14 393.895 1828.55C393.414 1827.96 393.174 1827.1 393.174 1825.98C393.174 1824.87 393.414 1824.01 393.895 1823.42C394.375 1822.83 395.07 1822.54 395.98 1822.54ZM403.814 1826.89C403.814 1827.37 403.902 1827.74 404.078 1827.98C404.258 1828.23 404.521 1828.35 404.869 1828.35H406.129V1829.26H404.764C404.119 1829.26 403.619 1829.05 403.264 1828.64C402.912 1828.23 402.736 1827.64 402.736 1826.89V1820.95H401.008V1820.11H403.814V1826.89ZM408.215 1820.14H409.328V1825.42L412.158 1822.7H413.471L410.887 1825.17L413.875 1829.26H412.557L410.131 1825.87L409.328 1826.63V1829.26H408.215V1820.14ZM415.914 1822.72H418.674V1828.42H420.812V1829.26H415.457V1828.42H417.596V1823.56H415.914V1822.72ZM417.596 1820.17H418.674V1821.53H417.596V1820.17ZM424.891 1820.83V1822.7H427.34V1823.53H424.891V1827.1C424.891 1827.58 424.982 1827.92 425.166 1828.11C425.35 1828.3 425.67 1828.4 426.127 1828.4H427.34V1829.26H426.021C425.213 1829.26 424.643 1829.1 424.311 1828.77C423.979 1828.45 423.812 1827.89 423.812 1827.1V1823.53H422.061V1822.7H423.812V1820.83H424.891ZM430.803 1826.89H432.865V1829.26H430.803V1826.89ZM437.951 1828.43V1831.76H436.867V1822.7H437.951V1823.53C438.131 1823.21 438.369 1822.96 438.666 1822.8C438.967 1822.62 439.312 1822.54 439.703 1822.54C440.496 1822.54 441.117 1822.84 441.566 1823.46C442.02 1824.07 442.246 1824.92 442.246 1826.01C442.246 1827.07 442.02 1827.91 441.566 1828.52C441.113 1829.13 440.492 1829.43 439.703 1829.43C439.305 1829.43 438.955 1829.34 438.654 1829.18C438.357 1829.01 438.123 1828.76 437.951 1828.43ZM441.115 1825.98C441.115 1825.15 440.982 1824.52 440.717 1824.09C440.455 1823.67 440.064 1823.45 439.545 1823.45C439.021 1823.45 438.625 1823.67 438.355 1824.1C438.086 1824.52 437.951 1825.15 437.951 1825.98C437.951 1826.81 438.086 1827.44 438.355 1827.87C438.625 1828.3 439.021 1828.51 439.545 1828.51C440.064 1828.51 440.455 1828.3 440.717 1827.88C440.982 1827.45 441.115 1826.82 441.115 1825.98ZM449.143 1825.19V1829.26H448.059V1825.19C448.059 1824.6 447.955 1824.17 447.748 1823.89C447.541 1823.61 447.217 1823.48 446.775 1823.48C446.271 1823.48 445.883 1823.66 445.609 1824.01C445.34 1824.37 445.205 1824.88 445.205 1825.55V1829.26H444.127V1822.7H445.205V1823.68C445.396 1823.31 445.656 1823.02 445.984 1822.83C446.312 1822.64 446.701 1822.54 447.15 1822.54C447.818 1822.54 448.316 1822.76 448.645 1823.2C448.977 1823.64 449.143 1824.3 449.143 1825.19ZM455.242 1825.92C455.242 1825.12 455.109 1824.5 454.844 1824.09C454.582 1823.66 454.199 1823.45 453.695 1823.45C453.168 1823.45 452.766 1823.66 452.488 1824.09C452.211 1824.5 452.072 1825.12 452.072 1825.92C452.072 1826.73 452.211 1827.35 452.488 1827.78C452.77 1828.2 453.176 1828.41 453.707 1828.41C454.203 1828.41 454.582 1828.2 454.844 1827.77C455.109 1827.34 455.242 1826.73 455.242 1825.92ZM456.32 1828.84C456.32 1829.82 456.088 1830.57 455.623 1831.08C455.158 1831.58 454.475 1831.84 453.572 1831.84C453.275 1831.84 452.965 1831.81 452.641 1831.76C452.316 1831.7 451.992 1831.62 451.668 1831.51V1830.45C452.051 1830.63 452.398 1830.76 452.711 1830.85C453.023 1830.93 453.311 1830.98 453.572 1830.98C454.154 1830.98 454.578 1830.82 454.844 1830.5C455.109 1830.18 455.242 1829.68 455.242 1829V1828.95V1828.22C455.07 1828.58 454.836 1828.86 454.539 1829.04C454.242 1829.22 453.881 1829.31 453.455 1829.31C452.689 1829.31 452.078 1829 451.621 1828.39C451.164 1827.77 450.936 1826.95 450.936 1825.92C450.936 1824.89 451.164 1824.07 451.621 1823.46C452.078 1822.84 452.689 1822.54 453.455 1822.54C453.877 1822.54 454.234 1822.62 454.527 1822.79C454.82 1822.96 455.059 1823.22 455.242 1823.57V1822.72H456.32V1828.84ZM462.982 1820.19V1823.78H461.67V1820.19H462.982ZM459.859 1820.19V1823.78H458.547V1820.19H459.859ZM188.225 1874.19V1877.78H186.912V1874.19H188.225ZM185.102 1874.19V1877.78H183.789V1874.19H185.102ZM192.256 1875.48V1878.77H193.627C194.174 1878.77 194.6 1878.63 194.904 1878.34C195.213 1878.05 195.367 1877.64 195.367 1877.12C195.367 1876.6 195.215 1876.2 194.91 1875.92C194.605 1875.63 194.178 1875.48 193.627 1875.48H192.256ZM191.072 1874.51H193.627C194.604 1874.51 195.344 1874.73 195.848 1875.18C196.352 1875.62 196.604 1876.27 196.604 1877.12C196.604 1877.99 196.352 1878.64 195.848 1879.08C195.348 1879.52 194.607 1879.74 193.627 1879.74H192.256V1883.26H191.072V1874.51ZM203.916 1878.05C203.686 1877.87 203.451 1877.74 203.213 1877.66C202.975 1877.58 202.713 1877.53 202.428 1877.53C201.756 1877.53 201.242 1877.75 200.887 1878.17C200.531 1878.59 200.354 1879.2 200.354 1880V1883.26H199.27V1876.7H200.354V1877.98C200.533 1877.51 200.809 1877.16 201.18 1876.91C201.555 1876.66 201.998 1876.54 202.51 1876.54C202.775 1876.54 203.023 1876.57 203.254 1876.64C203.484 1876.7 203.705 1876.81 203.916 1876.95V1878.05ZM207.988 1877.45C207.441 1877.45 207.027 1877.67 206.746 1878.09C206.465 1878.52 206.324 1879.15 206.324 1879.98C206.324 1880.82 206.465 1881.45 206.746 1881.88C207.027 1882.3 207.441 1882.51 207.988 1882.51C208.539 1882.51 208.955 1882.3 209.236 1881.88C209.518 1881.45 209.658 1880.82 209.658 1879.98C209.658 1879.15 209.518 1878.52 209.236 1878.09C208.955 1877.67 208.539 1877.45 207.988 1877.45ZM207.988 1876.54C208.898 1876.54 209.594 1876.83 210.074 1877.42C210.559 1878.01 210.801 1878.87 210.801 1879.98C210.801 1881.1 210.561 1881.96 210.08 1882.55C209.6 1883.14 208.902 1883.43 207.988 1883.43C207.078 1883.43 206.383 1883.14 205.902 1882.55C205.422 1881.96 205.182 1881.1 205.182 1879.98C205.182 1878.87 205.422 1878.01 205.902 1877.42C206.383 1876.83 207.078 1876.54 207.988 1876.54ZM216.637 1877.53V1874.14H217.715V1883.26H216.637V1882.43C216.457 1882.76 216.217 1883.01 215.916 1883.18C215.619 1883.34 215.275 1883.43 214.885 1883.43C214.092 1883.43 213.467 1883.12 213.01 1882.51C212.557 1881.89 212.33 1881.04 212.33 1879.96C212.33 1878.89 212.559 1878.06 213.016 1877.45C213.473 1876.84 214.096 1876.54 214.885 1876.54C215.279 1876.54 215.627 1876.62 215.928 1876.8C216.229 1876.96 216.465 1877.21 216.637 1877.53ZM213.467 1879.98C213.467 1880.82 213.6 1881.45 213.865 1881.88C214.131 1882.3 214.523 1882.51 215.043 1882.51C215.562 1882.51 215.957 1882.3 216.227 1881.87C216.5 1881.44 216.637 1880.81 216.637 1879.98C216.637 1879.15 216.5 1878.52 216.227 1878.1C215.957 1877.67 215.562 1877.45 215.043 1877.45C214.523 1877.45 214.131 1877.67 213.865 1878.09C213.6 1878.52 213.467 1879.15 213.467 1879.98ZM219.982 1880.77V1876.71H221.061V1880.77C221.061 1881.36 221.164 1881.8 221.371 1882.08C221.582 1882.35 221.906 1882.49 222.344 1882.49C222.852 1882.49 223.24 1882.31 223.51 1881.96C223.779 1881.6 223.914 1881.09 223.914 1880.42V1876.71H224.998V1883.26H223.914V1882.27C223.723 1882.65 223.461 1882.94 223.129 1883.14C222.801 1883.33 222.416 1883.43 221.975 1883.43C221.303 1883.43 220.803 1883.21 220.475 1882.77C220.146 1882.33 219.982 1881.67 219.982 1880.77ZM232.287 1882.92C231.998 1883.09 231.699 1883.22 231.391 1883.3C231.086 1883.39 230.773 1883.43 230.453 1883.43C229.438 1883.43 228.643 1883.12 228.068 1882.51C227.498 1881.91 227.213 1881.06 227.213 1879.98C227.213 1878.91 227.498 1878.06 228.068 1877.45C228.643 1876.84 229.438 1876.54 230.453 1876.54C230.77 1876.54 231.078 1876.58 231.379 1876.66C231.68 1876.74 231.982 1876.87 232.287 1877.04V1878.17C232.002 1877.92 231.715 1877.74 231.426 1877.62C231.141 1877.51 230.816 1877.45 230.453 1877.45C229.777 1877.45 229.258 1877.67 228.895 1878.11C228.531 1878.55 228.35 1879.17 228.35 1879.98C228.35 1880.79 228.531 1881.42 228.895 1881.86C229.262 1882.3 229.781 1882.51 230.453 1882.51C230.828 1882.51 231.164 1882.46 231.461 1882.34C231.758 1882.23 232.033 1882.05 232.287 1881.81V1882.92ZM236.898 1874.83V1876.7H239.348V1877.53H236.898V1881.1C236.898 1881.58 236.99 1881.92 237.174 1882.11C237.357 1882.3 237.678 1882.4 238.135 1882.4H239.348V1883.26H238.029C237.221 1883.26 236.65 1883.1 236.318 1882.77C235.986 1882.45 235.82 1881.89 235.82 1881.1V1877.53H234.068V1876.7H235.82V1874.83H236.898ZM248.939 1874.51H253.797V1875.51H251.963V1882.26H253.797V1883.26H248.939V1882.26H250.773V1875.51H248.939V1874.51ZM261.15 1879.19V1883.26H260.066V1879.19C260.066 1878.6 259.963 1878.17 259.756 1877.89C259.549 1877.61 259.225 1877.48 258.783 1877.48C258.279 1877.48 257.891 1877.66 257.617 1878.01C257.348 1878.37 257.213 1878.88 257.213 1879.55V1883.26H256.135V1876.7H257.213V1877.68C257.404 1877.31 257.664 1877.02 257.992 1876.83C258.32 1876.64 258.709 1876.54 259.158 1876.54C259.826 1876.54 260.324 1876.76 260.652 1877.2C260.984 1877.64 261.15 1878.3 261.15 1879.19ZM267.924 1876.92V1877.98C267.615 1877.8 267.305 1877.67 266.992 1877.58C266.68 1877.49 266.361 1877.44 266.037 1877.44C265.549 1877.44 265.184 1877.52 264.941 1877.68C264.703 1877.84 264.584 1878.08 264.584 1878.4C264.584 1878.69 264.674 1878.91 264.854 1879.06C265.033 1879.2 265.48 1879.34 266.195 1879.48L266.629 1879.56C267.164 1879.66 267.568 1879.87 267.842 1880.17C268.119 1880.48 268.258 1880.87 268.258 1881.36C268.258 1882.01 268.027 1882.52 267.566 1882.88C267.105 1883.25 266.465 1883.43 265.645 1883.43C265.32 1883.43 264.98 1883.39 264.625 1883.32C264.27 1883.26 263.885 1883.16 263.471 1883.02V1881.91C263.873 1882.11 264.258 1882.27 264.625 1882.37C264.992 1882.48 265.34 1882.53 265.668 1882.53C266.145 1882.53 266.514 1882.43 266.775 1882.24C267.037 1882.04 267.168 1881.77 267.168 1881.42C267.168 1880.92 266.689 1880.58 265.732 1880.39L265.686 1880.38L265.281 1880.29C264.66 1880.17 264.207 1879.97 263.922 1879.68C263.637 1879.4 263.494 1879 263.494 1878.51C263.494 1877.88 263.707 1877.39 264.133 1877.05C264.559 1876.71 265.166 1876.54 265.955 1876.54C266.307 1876.54 266.645 1876.57 266.969 1876.64C267.293 1876.7 267.611 1876.8 267.924 1876.92ZM271.305 1876.72H274.064V1882.42H276.203V1883.26H270.848V1882.42H272.986V1877.56H271.305V1876.72ZM272.986 1874.17H274.064V1875.53H272.986V1874.17ZM281.711 1879.92C281.711 1879.12 281.578 1878.5 281.312 1878.09C281.051 1877.66 280.668 1877.45 280.164 1877.45C279.637 1877.45 279.234 1877.66 278.957 1878.09C278.68 1878.5 278.541 1879.12 278.541 1879.92C278.541 1880.73 278.68 1881.35 278.957 1881.78C279.238 1882.2 279.645 1882.41 280.176 1882.41C280.672 1882.41 281.051 1882.2 281.312 1881.77C281.578 1881.34 281.711 1880.73 281.711 1879.92ZM282.789 1882.84C282.789 1883.82 282.557 1884.57 282.092 1885.08C281.627 1885.58 280.943 1885.84 280.041 1885.84C279.744 1885.84 279.434 1885.81 279.109 1885.76C278.785 1885.7 278.461 1885.62 278.137 1885.51V1884.45C278.52 1884.63 278.867 1884.76 279.18 1884.85C279.492 1884.93 279.779 1884.98 280.041 1884.98C280.623 1884.98 281.047 1884.82 281.312 1884.5C281.578 1884.18 281.711 1883.68 281.711 1883V1882.95V1882.22C281.539 1882.58 281.305 1882.86 281.008 1883.04C280.711 1883.22 280.35 1883.31 279.924 1883.31C279.158 1883.31 278.547 1883 278.09 1882.39C277.633 1881.77 277.404 1880.95 277.404 1879.92C277.404 1878.89 277.633 1878.07 278.09 1877.46C278.547 1876.84 279.158 1876.54 279.924 1876.54C280.346 1876.54 280.703 1876.62 280.996 1876.79C281.289 1876.96 281.527 1877.22 281.711 1877.57V1876.72H282.789V1882.84ZM290.072 1879.19V1883.26H288.988V1879.19C288.988 1878.6 288.885 1878.17 288.678 1877.89C288.471 1877.61 288.146 1877.48 287.705 1877.48C287.201 1877.48 286.812 1877.66 286.539 1878.01C286.27 1878.37 286.135 1878.88 286.135 1879.55V1883.26H285.057V1874.14H286.135V1877.68C286.326 1877.31 286.586 1877.02 286.914 1876.83C287.242 1876.64 287.631 1876.54 288.08 1876.54C288.748 1876.54 289.246 1876.76 289.574 1877.2C289.906 1877.64 290.072 1878.3 290.072 1879.19ZM294.742 1874.83V1876.7H297.191V1877.53H294.742V1881.1C294.742 1881.58 294.834 1881.92 295.018 1882.11C295.201 1882.3 295.521 1882.4 295.979 1882.4H297.191V1883.26H295.873C295.064 1883.26 294.494 1883.1 294.162 1882.77C293.83 1882.45 293.664 1881.89 293.664 1881.1V1877.53H291.912V1876.7H293.664V1874.83H294.742ZM304.076 1876.92V1877.98C303.768 1877.8 303.457 1877.67 303.145 1877.58C302.832 1877.49 302.514 1877.44 302.189 1877.44C301.701 1877.44 301.336 1877.52 301.094 1877.68C300.855 1877.84 300.736 1878.08 300.736 1878.4C300.736 1878.69 300.826 1878.91 301.006 1879.06C301.186 1879.2 301.633 1879.34 302.348 1879.48L302.781 1879.56C303.316 1879.66 303.721 1879.87 303.994 1880.17C304.271 1880.48 304.41 1880.87 304.41 1881.36C304.41 1882.01 304.18 1882.52 303.719 1882.88C303.258 1883.25 302.617 1883.43 301.797 1883.43C301.473 1883.43 301.133 1883.39 300.777 1883.32C300.422 1883.26 300.037 1883.16 299.623 1883.02V1881.91C300.025 1882.11 300.41 1882.27 300.777 1882.37C301.145 1882.48 301.492 1882.53 301.82 1882.53C302.297 1882.53 302.666 1882.43 302.928 1882.24C303.189 1882.04 303.32 1881.77 303.32 1881.42C303.32 1880.92 302.842 1880.58 301.885 1880.39L301.838 1880.38L301.434 1880.29C300.812 1880.17 300.359 1879.97 300.074 1879.68C299.789 1879.4 299.646 1879 299.646 1878.51C299.646 1877.88 299.859 1877.39 300.285 1877.05C300.711 1876.71 301.318 1876.54 302.107 1876.54C302.459 1876.54 302.797 1876.57 303.121 1876.64C303.445 1876.7 303.764 1876.8 304.076 1876.92ZM311.143 1874.19V1877.78H309.83V1874.19H311.143ZM308.02 1874.19V1877.78H306.707V1874.19H308.02ZM231.607 1892.19V1895.78H230.295V1892.19H231.607ZM228.484 1892.19V1895.78H227.172V1892.19H228.484ZM237.754 1897.13C238.059 1897.21 238.318 1897.35 238.533 1897.57C238.748 1897.79 239.016 1898.22 239.336 1898.87L240.525 1901.26H239.254L238.211 1899.05C237.91 1898.42 237.639 1898.02 237.396 1897.84C237.158 1897.65 236.846 1897.56 236.459 1897.56H235.328V1901.26H234.139V1892.51H236.576C237.537 1892.51 238.273 1892.73 238.785 1893.16C239.297 1893.59 239.553 1894.22 239.553 1895.04C239.553 1895.62 239.395 1896.09 239.078 1896.46C238.766 1896.82 238.324 1897.05 237.754 1897.13ZM235.328 1893.48V1896.59H236.623C237.189 1896.59 237.611 1896.46 237.889 1896.21C238.166 1895.95 238.305 1895.57 238.305 1895.04C238.305 1894.54 238.156 1894.15 237.859 1893.89C237.566 1893.62 237.139 1893.48 236.576 1893.48H235.328ZM247.094 1897.44V1897.97H242.424V1898C242.393 1898.9 242.562 1899.54 242.934 1899.93C243.309 1900.32 243.836 1900.51 244.516 1900.51C244.859 1900.51 245.219 1900.46 245.594 1900.35C245.969 1900.24 246.369 1900.08 246.795 1899.85V1900.92C246.385 1901.09 245.988 1901.22 245.605 1901.3C245.227 1901.39 244.859 1901.43 244.504 1901.43C243.484 1901.43 242.688 1901.12 242.113 1900.51C241.539 1899.9 241.252 1899.06 241.252 1897.98C241.252 1896.94 241.533 1896.1 242.096 1895.48C242.658 1894.85 243.408 1894.54 244.346 1894.54C245.182 1894.54 245.84 1894.82 246.32 1895.39C246.805 1895.95 247.062 1896.64 247.094 1897.44ZM246.016 1897.12C245.969 1896.67 245.803 1896.28 245.518 1895.95C245.236 1895.62 244.83 1895.45 244.299 1895.45C243.779 1895.45 243.352 1895.62 243.016 1895.97C242.68 1896.31 242.496 1896.7 242.465 1897.13L246.016 1897.12ZM251.875 1897.96H251.518C250.889 1897.96 250.414 1898.07 250.094 1898.29C249.777 1898.51 249.619 1898.84 249.619 1899.28C249.619 1899.67 249.738 1899.98 249.977 1900.2C250.215 1900.42 250.545 1900.53 250.967 1900.53C251.561 1900.53 252.027 1900.32 252.367 1899.91C252.707 1899.5 252.879 1898.93 252.883 1898.2V1897.96H251.875ZM253.967 1897.51V1901.26H252.883V1900.29C252.652 1900.68 252.361 1900.97 252.01 1901.15C251.662 1901.34 251.238 1901.43 250.738 1901.43C250.07 1901.43 249.537 1901.24 249.139 1900.87C248.74 1900.49 248.541 1899.98 248.541 1899.35C248.541 1898.62 248.785 1898.06 249.273 1897.68C249.766 1897.31 250.486 1897.12 251.436 1897.12H252.883V1896.95C252.879 1896.42 252.746 1896.04 252.484 1895.81C252.223 1895.57 251.805 1895.45 251.23 1895.45C250.863 1895.45 250.492 1895.51 250.117 1895.61C249.742 1895.72 249.377 1895.87 249.021 1896.07V1895C249.42 1894.84 249.801 1894.73 250.164 1894.66C250.531 1894.58 250.887 1894.54 251.23 1894.54C251.773 1894.54 252.236 1894.62 252.619 1894.78C253.006 1894.94 253.318 1895.18 253.557 1895.5C253.705 1895.69 253.811 1895.94 253.873 1896.23C253.936 1896.51 253.967 1896.94 253.967 1897.51ZM259.205 1898.89C259.205 1899.37 259.293 1899.74 259.469 1899.98C259.648 1900.23 259.912 1900.35 260.26 1900.35H261.52V1901.26H260.154C259.51 1901.26 259.01 1901.05 258.654 1900.64C258.303 1900.23 258.127 1899.64 258.127 1898.89V1892.95H256.398V1892.11H259.205V1898.89ZM262.82 1897.02H269.031V1898.01H262.82V1897.02ZM273.051 1892.83V1894.7H275.5V1895.53H273.051V1899.1C273.051 1899.58 273.143 1899.92 273.326 1900.11C273.51 1900.3 273.83 1900.4 274.287 1900.4H275.5V1901.26H274.182C273.373 1901.26 272.803 1901.1 272.471 1900.77C272.139 1900.45 271.973 1899.89 271.973 1899.1V1895.53H270.221V1894.7H271.973V1892.83H273.051ZM278.535 1894.72H281.295V1900.42H283.434V1901.26H278.078V1900.42H280.217V1895.56H278.535V1894.72ZM280.217 1892.17H281.295V1893.53H280.217V1892.17ZM287.875 1895.36C288.008 1895.08 288.176 1894.88 288.379 1894.74C288.586 1894.61 288.834 1894.54 289.123 1894.54C289.65 1894.54 290.021 1894.74 290.236 1895.15C290.455 1895.56 290.564 1896.33 290.564 1897.46V1901.26H289.58V1897.5C289.58 1896.58 289.527 1896 289.422 1895.78C289.32 1895.55 289.133 1895.44 288.859 1895.44C288.547 1895.44 288.332 1895.56 288.215 1895.8C288.102 1896.04 288.045 1896.61 288.045 1897.5V1901.26H287.061V1897.5C287.061 1896.57 287.004 1895.99 286.891 1895.77C286.781 1895.55 286.582 1895.44 286.293 1895.44C286.008 1895.44 285.809 1895.56 285.695 1895.8C285.586 1896.04 285.531 1896.61 285.531 1897.5V1901.26H284.553V1894.7H285.531V1895.26C285.66 1895.02 285.82 1894.85 286.012 1894.73C286.207 1894.6 286.428 1894.54 286.674 1894.54C286.971 1894.54 287.217 1894.61 287.412 1894.74C287.611 1894.88 287.766 1895.09 287.875 1895.36ZM297.707 1897.44V1897.97H293.037V1898C293.006 1898.9 293.176 1899.54 293.547 1899.93C293.922 1900.32 294.449 1900.51 295.129 1900.51C295.473 1900.51 295.832 1900.46 296.207 1900.35C296.582 1900.24 296.982 1900.08 297.408 1899.85V1900.92C296.998 1901.09 296.602 1901.22 296.219 1901.3C295.84 1901.39 295.473 1901.43 295.117 1901.43C294.098 1901.43 293.301 1901.12 292.727 1900.51C292.152 1899.9 291.865 1899.06 291.865 1897.98C291.865 1896.94 292.146 1896.1 292.709 1895.48C293.271 1894.85 294.021 1894.54 294.959 1894.54C295.795 1894.54 296.453 1894.82 296.934 1895.39C297.418 1895.95 297.676 1896.64 297.707 1897.44ZM296.629 1897.12C296.582 1896.67 296.416 1896.28 296.131 1895.95C295.85 1895.62 295.443 1895.45 294.912 1895.45C294.393 1895.45 293.965 1895.62 293.629 1895.97C293.293 1896.31 293.109 1896.7 293.078 1897.13L296.629 1897.12ZM311.822 1900.92C311.533 1901.09 311.234 1901.22 310.926 1901.3C310.621 1901.39 310.309 1901.43 309.988 1901.43C308.973 1901.43 308.178 1901.12 307.604 1900.51C307.033 1899.91 306.748 1899.06 306.748 1897.98C306.748 1896.91 307.033 1896.06 307.604 1895.45C308.178 1894.84 308.973 1894.54 309.988 1894.54C310.305 1894.54 310.613 1894.58 310.914 1894.66C311.215 1894.74 311.518 1894.87 311.822 1895.04V1896.17C311.537 1895.92 311.25 1895.74 310.961 1895.62C310.676 1895.51 310.352 1895.45 309.988 1895.45C309.312 1895.45 308.793 1895.67 308.43 1896.11C308.066 1896.55 307.885 1897.17 307.885 1897.98C307.885 1898.79 308.066 1899.42 308.43 1899.86C308.797 1900.3 309.316 1900.51 309.988 1900.51C310.363 1900.51 310.699 1900.46 310.996 1900.34C311.293 1900.23 311.568 1900.05 311.822 1899.81V1900.92ZM319.604 1896.05C319.373 1895.87 319.139 1895.74 318.9 1895.66C318.662 1895.58 318.4 1895.53 318.115 1895.53C317.443 1895.53 316.93 1895.75 316.574 1896.17C316.219 1896.59 316.041 1897.2 316.041 1898V1901.26H314.957V1894.7H316.041V1895.98C316.221 1895.51 316.496 1895.16 316.867 1894.91C317.242 1894.66 317.686 1894.54 318.197 1894.54C318.463 1894.54 318.711 1894.57 318.941 1894.64C319.172 1894.7 319.393 1894.81 319.604 1894.95V1896.05ZM323.676 1895.45C323.129 1895.45 322.715 1895.67 322.434 1896.09C322.152 1896.52 322.012 1897.15 322.012 1897.98C322.012 1898.82 322.152 1899.45 322.434 1899.88C322.715 1900.3 323.129 1900.51 323.676 1900.51C324.227 1900.51 324.643 1900.3 324.924 1899.88C325.205 1899.45 325.346 1898.82 325.346 1897.98C325.346 1897.15 325.205 1896.52 324.924 1896.09C324.643 1895.67 324.227 1895.45 323.676 1895.45ZM323.676 1894.54C324.586 1894.54 325.281 1894.83 325.762 1895.42C326.246 1896.01 326.488 1896.87 326.488 1897.98C326.488 1899.1 326.248 1899.96 325.768 1900.55C325.287 1901.14 324.59 1901.43 323.676 1901.43C322.766 1901.43 322.07 1901.14 321.59 1900.55C321.109 1899.96 320.869 1899.1 320.869 1897.98C320.869 1896.87 321.109 1896.01 321.59 1895.42C322.07 1894.83 322.766 1894.54 323.676 1894.54ZM332.998 1894.92V1895.98C332.689 1895.8 332.379 1895.67 332.066 1895.58C331.754 1895.49 331.436 1895.44 331.111 1895.44C330.623 1895.44 330.258 1895.52 330.016 1895.68C329.777 1895.84 329.658 1896.08 329.658 1896.4C329.658 1896.69 329.748 1896.91 329.928 1897.06C330.107 1897.2 330.555 1897.34 331.27 1897.48L331.703 1897.56C332.238 1897.66 332.643 1897.87 332.916 1898.17C333.193 1898.48 333.332 1898.87 333.332 1899.36C333.332 1900.01 333.102 1900.52 332.641 1900.88C332.18 1901.25 331.539 1901.43 330.719 1901.43C330.395 1901.43 330.055 1901.39 329.699 1901.32C329.344 1901.26 328.959 1901.16 328.545 1901.02V1899.91C328.947 1900.11 329.332 1900.27 329.699 1900.37C330.066 1900.48 330.414 1900.53 330.742 1900.53C331.219 1900.53 331.588 1900.43 331.85 1900.24C332.111 1900.04 332.242 1899.77 332.242 1899.42C332.242 1898.92 331.764 1898.58 330.807 1898.39L330.76 1898.38L330.355 1898.29C329.734 1898.17 329.281 1897.97 328.996 1897.68C328.711 1897.4 328.568 1897 328.568 1896.51C328.568 1895.88 328.781 1895.39 329.207 1895.05C329.633 1894.71 330.24 1894.54 331.029 1894.54C331.381 1894.54 331.719 1894.57 332.043 1894.64C332.367 1894.7 332.686 1894.8 332.998 1894.92ZM340.229 1894.92V1895.98C339.92 1895.8 339.609 1895.67 339.297 1895.58C338.984 1895.49 338.666 1895.44 338.342 1895.44C337.854 1895.44 337.488 1895.52 337.246 1895.68C337.008 1895.84 336.889 1896.08 336.889 1896.4C336.889 1896.69 336.979 1896.91 337.158 1897.06C337.338 1897.2 337.785 1897.34 338.5 1897.48L338.934 1897.56C339.469 1897.66 339.873 1897.87 340.146 1898.17C340.424 1898.48 340.562 1898.87 340.562 1899.36C340.562 1900.01 340.332 1900.52 339.871 1900.88C339.41 1901.25 338.77 1901.43 337.949 1901.43C337.625 1901.43 337.285 1901.39 336.93 1901.32C336.574 1901.26 336.189 1901.16 335.775 1901.02V1899.91C336.178 1900.11 336.562 1900.27 336.93 1900.37C337.297 1900.48 337.645 1900.53 337.973 1900.53C338.449 1900.53 338.818 1900.43 339.08 1900.24C339.342 1900.04 339.473 1899.77 339.473 1899.42C339.473 1898.92 338.994 1898.58 338.037 1898.39L337.99 1898.38L337.586 1898.29C336.965 1898.17 336.512 1897.97 336.227 1897.68C335.941 1897.4 335.799 1897 335.799 1896.51C335.799 1895.88 336.012 1895.39 336.438 1895.05C336.863 1894.71 337.471 1894.54 338.26 1894.54C338.611 1894.54 338.949 1894.57 339.273 1894.64C339.598 1894.7 339.916 1894.8 340.229 1894.92ZM342.355 1897.02H348.566V1898.01H342.355V1897.02ZM351.186 1900.43V1903.76H350.102V1894.7H351.186V1895.53C351.365 1895.21 351.604 1894.96 351.9 1894.8C352.201 1894.62 352.547 1894.54 352.938 1894.54C353.73 1894.54 354.352 1894.84 354.801 1895.46C355.254 1896.07 355.48 1896.92 355.48 1898.01C355.48 1899.07 355.254 1899.91 354.801 1900.52C354.348 1901.13 353.727 1901.43 352.938 1901.43C352.539 1901.43 352.189 1901.34 351.889 1901.18C351.592 1901.01 351.357 1900.76 351.186 1900.43ZM354.35 1897.98C354.35 1897.15 354.217 1896.52 353.951 1896.09C353.689 1895.67 353.299 1895.45 352.779 1895.45C352.256 1895.45 351.859 1895.67 351.59 1896.1C351.32 1896.52 351.186 1897.15 351.186 1897.98C351.186 1898.81 351.32 1899.44 351.59 1899.87C351.859 1900.3 352.256 1900.51 352.779 1900.51C353.299 1900.51 353.689 1900.3 353.951 1899.88C354.217 1899.45 354.35 1898.82 354.35 1897.98ZM360.432 1898.89C360.432 1899.37 360.52 1899.74 360.695 1899.98C360.875 1900.23 361.139 1900.35 361.486 1900.35H362.746V1901.26H361.381C360.736 1901.26 360.236 1901.05 359.881 1900.64C359.529 1900.23 359.354 1899.64 359.354 1898.89V1892.95H357.625V1892.11H360.432V1898.89ZM367.562 1897.96H367.205C366.576 1897.96 366.102 1898.07 365.781 1898.29C365.465 1898.51 365.307 1898.84 365.307 1899.28C365.307 1899.67 365.426 1899.98 365.664 1900.2C365.902 1900.42 366.232 1900.53 366.654 1900.53C367.248 1900.53 367.715 1900.32 368.055 1899.91C368.395 1899.5 368.566 1898.93 368.57 1898.2V1897.96H367.562ZM369.654 1897.51V1901.26H368.57V1900.29C368.34 1900.68 368.049 1900.97 367.697 1901.15C367.35 1901.34 366.926 1901.43 366.426 1901.43C365.758 1901.43 365.225 1901.24 364.826 1900.87C364.428 1900.49 364.229 1899.98 364.229 1899.35C364.229 1898.62 364.473 1898.06 364.961 1897.68C365.453 1897.31 366.174 1897.12 367.123 1897.12H368.57V1896.95C368.566 1896.42 368.434 1896.04 368.172 1895.81C367.91 1895.57 367.492 1895.45 366.918 1895.45C366.551 1895.45 366.18 1895.51 365.805 1895.61C365.43 1895.72 365.064 1895.87 364.709 1896.07V1895C365.107 1894.84 365.488 1894.73 365.852 1894.66C366.219 1894.58 366.574 1894.54 366.918 1894.54C367.461 1894.54 367.924 1894.62 368.307 1894.78C368.693 1894.94 369.006 1895.18 369.244 1895.5C369.393 1895.69 369.498 1895.94 369.561 1896.23C369.623 1896.51 369.654 1896.94 369.654 1897.51ZM374.277 1892.83V1894.7H376.727V1895.53H374.277V1899.1C374.277 1899.58 374.369 1899.92 374.553 1900.11C374.736 1900.3 375.057 1900.4 375.514 1900.4H376.727V1901.26H375.408C374.6 1901.26 374.029 1901.1 373.697 1900.77C373.365 1900.45 373.199 1899.89 373.199 1899.1V1895.53H371.447V1894.7H373.199V1892.83H374.277ZM384.139 1892.14V1893.04H382.914C382.527 1893.04 382.258 1893.12 382.105 1893.28C381.957 1893.43 381.883 1893.71 381.883 1894.12V1894.7H384.139V1895.53H381.883V1901.26H380.805V1895.53H379.053V1894.7H380.805V1894.24C380.805 1893.52 380.969 1892.99 381.297 1892.65C381.629 1892.31 382.145 1892.14 382.844 1892.14H384.139ZM388.75 1895.45C388.203 1895.45 387.789 1895.67 387.508 1896.09C387.227 1896.52 387.086 1897.15 387.086 1897.98C387.086 1898.82 387.227 1899.45 387.508 1899.88C387.789 1900.3 388.203 1900.51 388.75 1900.51C389.301 1900.51 389.717 1900.3 389.998 1899.88C390.279 1899.45 390.42 1898.82 390.42 1897.98C390.42 1897.15 390.279 1896.52 389.998 1896.09C389.717 1895.67 389.301 1895.45 388.75 1895.45ZM388.75 1894.54C389.66 1894.54 390.355 1894.83 390.836 1895.42C391.32 1896.01 391.562 1896.87 391.562 1897.98C391.562 1899.1 391.322 1899.96 390.842 1900.55C390.361 1901.14 389.664 1901.43 388.75 1901.43C387.84 1901.43 387.145 1901.14 386.664 1900.55C386.184 1899.96 385.943 1899.1 385.943 1897.98C385.943 1896.87 386.184 1896.01 386.664 1895.42C387.145 1894.83 387.84 1894.54 388.75 1894.54ZM399.139 1896.05C398.908 1895.87 398.674 1895.74 398.436 1895.66C398.197 1895.58 397.936 1895.53 397.65 1895.53C396.979 1895.53 396.465 1895.75 396.109 1896.17C395.754 1896.59 395.576 1897.2 395.576 1898V1901.26H394.492V1894.7H395.576V1895.98C395.756 1895.51 396.031 1895.16 396.402 1894.91C396.777 1894.66 397.221 1894.54 397.732 1894.54C397.998 1894.54 398.246 1894.57 398.477 1894.64C398.707 1894.7 398.928 1894.81 399.139 1894.95V1896.05ZM403.562 1895.36C403.695 1895.08 403.863 1894.88 404.066 1894.74C404.273 1894.61 404.521 1894.54 404.811 1894.54C405.338 1894.54 405.709 1894.74 405.924 1895.15C406.143 1895.56 406.252 1896.33 406.252 1897.46V1901.26H405.268V1897.5C405.268 1896.58 405.215 1896 405.109 1895.78C405.008 1895.55 404.82 1895.44 404.547 1895.44C404.234 1895.44 404.02 1895.56 403.902 1895.8C403.789 1896.04 403.732 1896.61 403.732 1897.5V1901.26H402.748V1897.5C402.748 1896.57 402.691 1895.99 402.578 1895.77C402.469 1895.55 402.27 1895.44 401.98 1895.44C401.695 1895.44 401.496 1895.56 401.383 1895.8C401.273 1896.04 401.219 1896.61 401.219 1897.5V1901.26H400.24V1894.7H401.219V1895.26C401.348 1895.02 401.508 1894.85 401.699 1894.73C401.895 1894.6 402.115 1894.54 402.361 1894.54C402.658 1894.54 402.904 1894.61 403.1 1894.74C403.299 1894.88 403.453 1895.09 403.562 1895.36ZM418.176 1897.96H417.818C417.189 1897.96 416.715 1898.07 416.395 1898.29C416.078 1898.51 415.92 1898.84 415.92 1899.28C415.92 1899.67 416.039 1899.98 416.277 1900.2C416.516 1900.42 416.846 1900.53 417.268 1900.53C417.861 1900.53 418.328 1900.32 418.668 1899.91C419.008 1899.5 419.18 1898.93 419.184 1898.2V1897.96H418.176ZM420.268 1897.51V1901.26H419.184V1900.29C418.953 1900.68 418.662 1900.97 418.311 1901.15C417.963 1901.34 417.539 1901.43 417.039 1901.43C416.371 1901.43 415.838 1901.24 415.439 1900.87C415.041 1900.49 414.842 1899.98 414.842 1899.35C414.842 1898.62 415.086 1898.06 415.574 1897.68C416.066 1897.31 416.787 1897.12 417.736 1897.12H419.184V1896.95C419.18 1896.42 419.047 1896.04 418.785 1895.81C418.523 1895.57 418.105 1895.45 417.531 1895.45C417.164 1895.45 416.793 1895.51 416.418 1895.61C416.043 1895.72 415.678 1895.87 415.322 1896.07V1895C415.721 1894.84 416.102 1894.73 416.465 1894.66C416.832 1894.58 417.188 1894.54 417.531 1894.54C418.074 1894.54 418.537 1894.62 418.92 1894.78C419.307 1894.94 419.619 1895.18 419.857 1895.5C420.006 1895.69 420.111 1895.94 420.174 1896.23C420.236 1896.51 420.268 1896.94 420.268 1897.51ZM427.451 1897.19V1901.26H426.367V1897.19C426.367 1896.6 426.264 1896.17 426.057 1895.89C425.85 1895.61 425.525 1895.48 425.084 1895.48C424.58 1895.48 424.191 1895.66 423.918 1896.01C423.648 1896.37 423.514 1896.88 423.514 1897.55V1901.26H422.436V1894.7H423.514V1895.68C423.705 1895.31 423.965 1895.02 424.293 1894.83C424.621 1894.64 425.01 1894.54 425.459 1894.54C426.127 1894.54 426.625 1894.76 426.953 1895.2C427.285 1895.64 427.451 1896.3 427.451 1897.19ZM432.637 1897.96H432.279C431.65 1897.96 431.176 1898.07 430.855 1898.29C430.539 1898.51 430.381 1898.84 430.381 1899.28C430.381 1899.67 430.5 1899.98 430.738 1900.2C430.977 1900.42 431.307 1900.53 431.729 1900.53C432.322 1900.53 432.789 1900.32 433.129 1899.91C433.469 1899.5 433.641 1898.93 433.645 1898.2V1897.96H432.637ZM434.729 1897.51V1901.26H433.645V1900.29C433.414 1900.68 433.123 1900.97 432.771 1901.15C432.424 1901.34 432 1901.43 431.5 1901.43C430.832 1901.43 430.299 1901.24 429.9 1900.87C429.502 1900.49 429.303 1899.98 429.303 1899.35C429.303 1898.62 429.547 1898.06 430.035 1897.68C430.527 1897.31 431.248 1897.12 432.197 1897.12H433.645V1896.95C433.641 1896.42 433.508 1896.04 433.246 1895.81C432.984 1895.57 432.566 1895.45 431.992 1895.45C431.625 1895.45 431.254 1895.51 430.879 1895.61C430.504 1895.72 430.139 1895.87 429.783 1896.07V1895C430.182 1894.84 430.562 1894.73 430.926 1894.66C431.293 1894.58 431.648 1894.54 431.992 1894.54C432.535 1894.54 432.998 1894.62 433.381 1894.78C433.768 1894.94 434.08 1895.18 434.318 1895.5C434.467 1895.69 434.572 1895.94 434.635 1896.23C434.697 1896.51 434.729 1896.94 434.729 1897.51ZM439.967 1898.89C439.967 1899.37 440.055 1899.74 440.23 1899.98C440.41 1900.23 440.674 1900.35 441.021 1900.35H442.281V1901.26H440.916C440.271 1901.26 439.771 1901.05 439.416 1900.64C439.064 1900.23 438.889 1899.64 438.889 1898.89V1892.95H437.16V1892.11H439.967V1898.89ZM448.012 1899.15C447.832 1899.61 447.604 1900.21 447.326 1900.95C446.939 1901.99 446.68 1902.61 446.547 1902.84C446.367 1903.15 446.143 1903.37 445.873 1903.53C445.604 1903.68 445.289 1903.76 444.93 1903.76H444.062V1902.85H444.701C445.018 1902.85 445.266 1902.76 445.445 1902.58C445.625 1902.39 445.854 1901.92 446.131 1901.15L443.594 1894.7H444.736L446.682 1899.83L448.598 1894.7H449.74L448.012 1899.15ZM453.812 1892.83V1894.7H456.262V1895.53H453.812V1899.1C453.812 1899.58 453.904 1899.92 454.088 1900.11C454.271 1900.3 454.592 1900.4 455.049 1900.4H456.262V1901.26H454.943C454.135 1901.26 453.564 1901.1 453.232 1900.77C452.9 1900.45 452.734 1899.89 452.734 1899.1V1895.53H450.982V1894.7H452.734V1892.83H453.812ZM459.297 1894.72H462.057V1900.42H464.195V1901.26H458.84V1900.42H460.979V1895.56H459.297V1894.72ZM460.979 1892.17H462.057V1893.53H460.979V1892.17ZM470.893 1900.92C470.604 1901.09 470.305 1901.22 469.996 1901.3C469.691 1901.39 469.379 1901.43 469.059 1901.43C468.043 1901.43 467.248 1901.12 466.674 1900.51C466.104 1899.91 465.818 1899.06 465.818 1897.98C465.818 1896.91 466.104 1896.06 466.674 1895.45C467.248 1894.84 468.043 1894.54 469.059 1894.54C469.375 1894.54 469.684 1894.58 469.984 1894.66C470.285 1894.74 470.588 1894.87 470.893 1895.04V1896.17C470.607 1895.92 470.32 1895.74 470.031 1895.62C469.746 1895.51 469.422 1895.45 469.059 1895.45C468.383 1895.45 467.863 1895.67 467.5 1896.11C467.137 1896.55 466.955 1897.17 466.955 1897.98C466.955 1898.79 467.137 1899.42 467.5 1899.86C467.867 1900.3 468.387 1900.51 469.059 1900.51C469.434 1900.51 469.77 1900.46 470.066 1900.34C470.363 1900.23 470.639 1900.05 470.893 1899.81V1900.92ZM477.607 1894.92V1895.98C477.299 1895.8 476.988 1895.67 476.676 1895.58C476.363 1895.49 476.045 1895.44 475.721 1895.44C475.232 1895.44 474.867 1895.52 474.625 1895.68C474.387 1895.84 474.268 1896.08 474.268 1896.4C474.268 1896.69 474.357 1896.91 474.537 1897.06C474.717 1897.2 475.164 1897.34 475.879 1897.48L476.312 1897.56C476.848 1897.66 477.252 1897.87 477.525 1898.17C477.803 1898.48 477.941 1898.87 477.941 1899.36C477.941 1900.01 477.711 1900.52 477.25 1900.88C476.789 1901.25 476.148 1901.43 475.328 1901.43C475.004 1901.43 474.664 1901.39 474.309 1901.32C473.953 1901.26 473.568 1901.16 473.154 1901.02V1899.91C473.557 1900.11 473.941 1900.27 474.309 1900.37C474.676 1900.48 475.023 1900.53 475.352 1900.53C475.828 1900.53 476.197 1900.43 476.459 1900.24C476.721 1900.04 476.852 1899.77 476.852 1899.42C476.852 1898.92 476.373 1898.58 475.416 1898.39L475.369 1898.38L474.965 1898.29C474.344 1898.17 473.891 1897.97 473.605 1897.68C473.32 1897.4 473.178 1897 473.178 1896.51C473.178 1895.88 473.391 1895.39 473.816 1895.05C474.242 1894.71 474.85 1894.54 475.639 1894.54C475.99 1894.54 476.328 1894.57 476.652 1894.64C476.977 1894.7 477.295 1894.8 477.607 1894.92ZM492.297 1892.81V1894.01C491.938 1893.78 491.576 1893.61 491.213 1893.49C490.854 1893.37 490.49 1893.31 490.123 1893.31C489.564 1893.31 489.123 1893.44 488.799 1893.71C488.475 1893.96 488.312 1894.31 488.312 1894.76C488.312 1895.14 488.418 1895.44 488.629 1895.64C488.844 1895.84 489.242 1896.01 489.824 1896.15L490.445 1896.29C491.266 1896.48 491.863 1896.78 492.238 1897.19C492.613 1897.6 492.801 1898.16 492.801 1898.87C492.801 1899.7 492.543 1900.34 492.027 1900.77C491.512 1901.21 490.762 1901.43 489.777 1901.43C489.367 1901.43 488.955 1901.38 488.541 1901.29C488.127 1901.21 487.711 1901.08 487.293 1900.9V1899.64C487.742 1899.93 488.166 1900.14 488.564 1900.27C488.967 1900.4 489.371 1900.47 489.777 1900.47C490.375 1900.47 490.84 1900.34 491.172 1900.07C491.504 1899.8 491.67 1899.42 491.67 1898.94C491.67 1898.51 491.555 1898.17 491.324 1897.94C491.098 1897.71 490.701 1897.53 490.135 1897.41L489.502 1897.26C488.689 1897.08 488.1 1896.8 487.732 1896.43C487.365 1896.06 487.182 1895.56 487.182 1894.94C487.182 1894.16 487.443 1893.53 487.967 1893.06C488.494 1892.59 489.193 1892.35 490.064 1892.35C490.4 1892.35 490.754 1892.39 491.125 1892.47C491.496 1892.54 491.887 1892.66 492.297 1892.81ZM497.711 1897.96H497.354C496.725 1897.96 496.25 1898.07 495.93 1898.29C495.613 1898.51 495.455 1898.84 495.455 1899.28C495.455 1899.67 495.574 1899.98 495.812 1900.2C496.051 1900.42 496.381 1900.53 496.803 1900.53C497.396 1900.53 497.863 1900.32 498.203 1899.91C498.543 1899.5 498.715 1898.93 498.719 1898.2V1897.96H497.711ZM499.803 1897.51V1901.26H498.719V1900.29C498.488 1900.68 498.197 1900.97 497.846 1901.15C497.498 1901.34 497.074 1901.43 496.574 1901.43C495.906 1901.43 495.373 1901.24 494.975 1900.87C494.576 1900.49 494.377 1899.98 494.377 1899.35C494.377 1898.62 494.621 1898.06 495.109 1897.68C495.602 1897.31 496.322 1897.12 497.271 1897.12H498.719V1896.95C498.715 1896.42 498.582 1896.04 498.32 1895.81C498.059 1895.57 497.641 1895.45 497.066 1895.45C496.699 1895.45 496.328 1895.51 495.953 1895.61C495.578 1895.72 495.213 1895.87 494.857 1896.07V1895C495.256 1894.84 495.637 1894.73 496 1894.66C496.367 1894.58 496.723 1894.54 497.066 1894.54C497.609 1894.54 498.072 1894.62 498.455 1894.78C498.842 1894.94 499.154 1895.18 499.393 1895.5C499.541 1895.69 499.646 1895.94 499.709 1896.23C499.771 1896.51 499.803 1896.94 499.803 1897.51ZM504.941 1897.96H504.584C503.955 1897.96 503.48 1898.07 503.16 1898.29C502.844 1898.51 502.686 1898.84 502.686 1899.28C502.686 1899.67 502.805 1899.98 503.043 1900.2C503.281 1900.42 503.611 1900.53 504.033 1900.53C504.627 1900.53 505.094 1900.32 505.434 1899.91C505.773 1899.5 505.945 1898.93 505.949 1898.2V1897.96H504.941ZM507.033 1897.51V1901.26H505.949V1900.29C505.719 1900.68 505.428 1900.97 505.076 1901.15C504.729 1901.34 504.305 1901.43 503.805 1901.43C503.137 1901.43 502.604 1901.24 502.205 1900.87C501.807 1900.49 501.607 1899.98 501.607 1899.35C501.607 1898.62 501.852 1898.06 502.34 1897.68C502.832 1897.31 503.553 1897.12 504.502 1897.12H505.949V1896.95C505.945 1896.42 505.812 1896.04 505.551 1895.81C505.289 1895.57 504.871 1895.45 504.297 1895.45C503.93 1895.45 503.559 1895.51 503.184 1895.61C502.809 1895.72 502.443 1895.87 502.088 1896.07V1895C502.486 1894.84 502.867 1894.73 503.23 1894.66C503.598 1894.58 503.953 1894.54 504.297 1894.54C504.84 1894.54 505.303 1894.62 505.686 1894.78C506.072 1894.94 506.385 1895.18 506.623 1895.5C506.771 1895.69 506.877 1895.94 506.939 1896.23C507.002 1896.51 507.033 1896.94 507.033 1897.51ZM513.988 1892.81V1894.01C513.629 1893.78 513.268 1893.61 512.904 1893.49C512.545 1893.37 512.182 1893.31 511.814 1893.31C511.256 1893.31 510.814 1893.44 510.49 1893.71C510.166 1893.96 510.004 1894.31 510.004 1894.76C510.004 1895.14 510.109 1895.44 510.32 1895.64C510.535 1895.84 510.934 1896.01 511.516 1896.15L512.137 1896.29C512.957 1896.48 513.555 1896.78 513.93 1897.19C514.305 1897.6 514.492 1898.16 514.492 1898.87C514.492 1899.7 514.234 1900.34 513.719 1900.77C513.203 1901.21 512.453 1901.43 511.469 1901.43C511.059 1901.43 510.646 1901.38 510.232 1901.29C509.818 1901.21 509.402 1901.08 508.984 1900.9V1899.64C509.434 1899.93 509.857 1900.14 510.256 1900.27C510.658 1900.4 511.062 1900.47 511.469 1900.47C512.066 1900.47 512.531 1900.34 512.863 1900.07C513.195 1899.8 513.361 1899.42 513.361 1898.94C513.361 1898.51 513.246 1898.17 513.016 1897.94C512.789 1897.71 512.393 1897.53 511.826 1897.41L511.193 1897.26C510.381 1897.08 509.791 1896.8 509.424 1896.43C509.057 1896.06 508.873 1895.56 508.873 1894.94C508.873 1894.16 509.135 1893.53 509.658 1893.06C510.186 1892.59 510.885 1892.35 511.756 1892.35C512.092 1892.35 512.445 1892.39 512.816 1892.47C513.188 1892.54 513.578 1892.66 513.988 1892.81ZM526.633 1897.96H526.275C525.646 1897.96 525.172 1898.07 524.852 1898.29C524.535 1898.51 524.377 1898.84 524.377 1899.28C524.377 1899.67 524.496 1899.98 524.734 1900.2C524.973 1900.42 525.303 1900.53 525.725 1900.53C526.318 1900.53 526.785 1900.32 527.125 1899.91C527.465 1899.5 527.637 1898.93 527.641 1898.2V1897.96H526.633ZM528.725 1897.51V1901.26H527.641V1900.29C527.41 1900.68 527.119 1900.97 526.768 1901.15C526.42 1901.34 525.996 1901.43 525.496 1901.43C524.828 1901.43 524.295 1901.24 523.896 1900.87C523.498 1900.49 523.299 1899.98 523.299 1899.35C523.299 1898.62 523.543 1898.06 524.031 1897.68C524.523 1897.31 525.244 1897.12 526.193 1897.12H527.641V1896.95C527.637 1896.42 527.504 1896.04 527.242 1895.81C526.98 1895.57 526.562 1895.45 525.988 1895.45C525.621 1895.45 525.25 1895.51 524.875 1895.61C524.5 1895.72 524.135 1895.87 523.779 1896.07V1895C524.178 1894.84 524.559 1894.73 524.922 1894.66C525.289 1894.58 525.645 1894.54 525.988 1894.54C526.531 1894.54 526.994 1894.62 527.377 1894.78C527.764 1894.94 528.076 1895.18 528.314 1895.5C528.463 1895.69 528.568 1895.94 528.631 1896.23C528.693 1896.51 528.725 1896.94 528.725 1897.51ZM531.947 1900.43V1903.76H530.863V1894.7H531.947V1895.53C532.127 1895.21 532.365 1894.96 532.662 1894.8C532.963 1894.62 533.309 1894.54 533.699 1894.54C534.492 1894.54 535.113 1894.84 535.562 1895.46C536.016 1896.07 536.242 1896.92 536.242 1898.01C536.242 1899.07 536.016 1899.91 535.562 1900.52C535.109 1901.13 534.488 1901.43 533.699 1901.43C533.301 1901.43 532.951 1901.34 532.65 1901.18C532.354 1901.01 532.119 1900.76 531.947 1900.43ZM535.111 1897.98C535.111 1897.15 534.979 1896.52 534.713 1896.09C534.451 1895.67 534.061 1895.45 533.541 1895.45C533.018 1895.45 532.621 1895.67 532.352 1896.1C532.082 1896.52 531.947 1897.15 531.947 1897.98C531.947 1898.81 532.082 1899.44 532.352 1899.87C532.621 1900.3 533.018 1900.51 533.541 1900.51C534.061 1900.51 534.451 1900.3 534.713 1899.88C534.979 1899.45 535.111 1898.82 535.111 1897.98ZM539.178 1900.43V1903.76H538.094V1894.7H539.178V1895.53C539.357 1895.21 539.596 1894.96 539.893 1894.8C540.193 1894.62 540.539 1894.54 540.93 1894.54C541.723 1894.54 542.344 1894.84 542.793 1895.46C543.246 1896.07 543.473 1896.92 543.473 1898.01C543.473 1899.07 543.246 1899.91 542.793 1900.52C542.34 1901.13 541.719 1901.43 540.93 1901.43C540.531 1901.43 540.182 1901.34 539.881 1901.18C539.584 1901.01 539.35 1900.76 539.178 1900.43ZM542.342 1897.98C542.342 1897.15 542.209 1896.52 541.943 1896.09C541.682 1895.67 541.291 1895.45 540.771 1895.45C540.248 1895.45 539.852 1895.67 539.582 1896.1C539.312 1896.52 539.178 1897.15 539.178 1897.98C539.178 1898.81 539.312 1899.44 539.582 1899.87C539.852 1900.3 540.248 1900.51 540.771 1900.51C541.291 1900.51 541.682 1900.3 541.943 1899.88C542.209 1899.45 542.342 1898.82 542.342 1897.98ZM549.748 1892.19V1895.78H548.436V1892.19H549.748ZM546.625 1892.19V1895.78H545.312V1892.19H546.625ZM209.916 1910.19V1913.78H208.604V1910.19H209.916ZM206.793 1910.19V1913.78H205.48V1910.19H206.793ZM216.818 1910.51H217.932L213.326 1920.37H212.207L216.818 1910.51ZM220.691 1912.72H223.451V1918.42H225.59V1919.26H220.234V1918.42H222.373V1913.56H220.691V1912.72ZM222.373 1910.17H223.451V1911.53H222.373V1910.17ZM230.031 1913.36C230.164 1913.08 230.332 1912.88 230.535 1912.74C230.742 1912.61 230.99 1912.54 231.279 1912.54C231.807 1912.54 232.178 1912.74 232.393 1913.15C232.611 1913.56 232.721 1914.33 232.721 1915.46V1919.26H231.736V1915.5C231.736 1914.58 231.684 1914 231.578 1913.78C231.477 1913.55 231.289 1913.44 231.016 1913.44C230.703 1913.44 230.488 1913.56 230.371 1913.8C230.258 1914.04 230.201 1914.61 230.201 1915.5V1919.26H229.217V1915.5C229.217 1914.57 229.16 1913.99 229.047 1913.77C228.938 1913.55 228.738 1913.44 228.449 1913.44C228.164 1913.44 227.965 1913.56 227.852 1913.8C227.742 1914.04 227.688 1914.61 227.688 1915.5V1919.26H226.709V1912.7H227.688V1913.26C227.816 1913.02 227.977 1912.85 228.168 1912.73C228.363 1912.6 228.584 1912.54 228.83 1912.54C229.127 1912.54 229.373 1912.61 229.568 1912.74C229.768 1912.88 229.922 1913.09 230.031 1913.36ZM237.414 1915.96H237.057C236.428 1915.96 235.953 1916.07 235.633 1916.29C235.316 1916.51 235.158 1916.84 235.158 1917.28C235.158 1917.67 235.277 1917.98 235.516 1918.2C235.754 1918.42 236.084 1918.53 236.506 1918.53C237.1 1918.53 237.566 1918.32 237.906 1917.91C238.246 1917.5 238.418 1916.93 238.422 1916.2V1915.96H237.414ZM239.506 1915.51V1919.26H238.422V1918.29C238.191 1918.68 237.9 1918.97 237.549 1919.15C237.201 1919.34 236.777 1919.43 236.277 1919.43C235.609 1919.43 235.076 1919.24 234.678 1918.87C234.279 1918.49 234.08 1917.98 234.08 1917.35C234.08 1916.62 234.324 1916.06 234.812 1915.68C235.305 1915.31 236.025 1915.12 236.975 1915.12H238.422V1914.95C238.418 1914.42 238.285 1914.04 238.023 1913.81C237.762 1913.57 237.344 1913.45 236.77 1913.45C236.402 1913.45 236.031 1913.51 235.656 1913.61C235.281 1913.72 234.916 1913.87 234.561 1914.07V1913C234.959 1912.84 235.34 1912.73 235.703 1912.66C236.07 1912.58 236.426 1912.54 236.77 1912.54C237.312 1912.54 237.775 1912.62 238.158 1912.78C238.545 1912.94 238.857 1913.18 239.096 1913.5C239.244 1913.69 239.35 1913.94 239.412 1914.23C239.475 1914.51 239.506 1914.94 239.506 1915.51ZM245.559 1915.92C245.559 1915.12 245.426 1914.5 245.16 1914.09C244.898 1913.66 244.516 1913.45 244.012 1913.45C243.484 1913.45 243.082 1913.66 242.805 1914.09C242.527 1914.5 242.389 1915.12 242.389 1915.92C242.389 1916.73 242.527 1917.35 242.805 1917.78C243.086 1918.2 243.492 1918.41 244.023 1918.41C244.52 1918.41 244.898 1918.2 245.16 1917.77C245.426 1917.34 245.559 1916.73 245.559 1915.92ZM246.637 1918.84C246.637 1919.82 246.404 1920.57 245.939 1921.08C245.475 1921.58 244.791 1921.84 243.889 1921.84C243.592 1921.84 243.281 1921.81 242.957 1921.76C242.633 1921.7 242.309 1921.62 241.984 1921.51V1920.45C242.367 1920.63 242.715 1920.76 243.027 1920.85C243.34 1920.93 243.627 1920.98 243.889 1920.98C244.471 1920.98 244.895 1920.82 245.16 1920.5C245.426 1920.18 245.559 1919.68 245.559 1919V1918.95V1918.22C245.387 1918.58 245.152 1918.86 244.855 1919.04C244.559 1919.22 244.197 1919.31 243.771 1919.31C243.006 1919.31 242.395 1919 241.938 1918.39C241.48 1917.77 241.252 1916.95 241.252 1915.92C241.252 1914.89 241.48 1914.07 241.938 1913.46C242.395 1912.84 243.006 1912.54 243.771 1912.54C244.193 1912.54 244.551 1912.62 244.844 1912.79C245.137 1912.96 245.375 1913.22 245.559 1913.57V1912.72H246.637V1918.84ZM254.324 1915.44V1915.97H249.654V1916C249.623 1916.9 249.793 1917.54 250.164 1917.93C250.539 1918.32 251.066 1918.51 251.746 1918.51C252.09 1918.51 252.449 1918.46 252.824 1918.35C253.199 1918.24 253.6 1918.08 254.025 1917.85V1918.92C253.615 1919.09 253.219 1919.22 252.836 1919.3C252.457 1919.39 252.09 1919.43 251.734 1919.43C250.715 1919.43 249.918 1919.12 249.344 1918.51C248.77 1917.9 248.482 1917.06 248.482 1915.98C248.482 1914.94 248.764 1914.1 249.326 1913.48C249.889 1912.85 250.639 1912.54 251.576 1912.54C252.412 1912.54 253.07 1912.82 253.551 1913.39C254.035 1913.95 254.293 1914.64 254.324 1915.44ZM253.246 1915.12C253.199 1914.67 253.033 1914.28 252.748 1913.95C252.467 1913.62 252.061 1913.45 251.529 1913.45C251.01 1913.45 250.582 1913.62 250.246 1913.97C249.91 1914.31 249.727 1914.7 249.695 1915.13L253.246 1915.12ZM260.693 1912.92V1913.98C260.385 1913.8 260.074 1913.67 259.762 1913.58C259.449 1913.49 259.131 1913.44 258.807 1913.44C258.318 1913.44 257.953 1913.52 257.711 1913.68C257.473 1913.84 257.354 1914.08 257.354 1914.4C257.354 1914.69 257.443 1914.91 257.623 1915.06C257.803 1915.2 258.25 1915.34 258.965 1915.48L259.398 1915.56C259.934 1915.66 260.338 1915.87 260.611 1916.17C260.889 1916.48 261.027 1916.87 261.027 1917.36C261.027 1918.01 260.797 1918.52 260.336 1918.88C259.875 1919.25 259.234 1919.43 258.414 1919.43C258.09 1919.43 257.75 1919.39 257.395 1919.32C257.039 1919.26 256.654 1919.16 256.24 1919.02V1917.91C256.643 1918.11 257.027 1918.27 257.395 1918.37C257.762 1918.48 258.109 1918.53 258.438 1918.53C258.914 1918.53 259.283 1918.43 259.545 1918.24C259.807 1918.04 259.938 1917.77 259.938 1917.42C259.938 1916.92 259.459 1916.58 258.502 1916.39L258.455 1916.38L258.051 1916.29C257.43 1916.17 256.977 1915.97 256.691 1915.68C256.406 1915.4 256.264 1915 256.264 1914.51C256.264 1913.88 256.477 1913.39 256.902 1913.05C257.328 1912.71 257.936 1912.54 258.725 1912.54C259.076 1912.54 259.414 1912.57 259.738 1912.64C260.062 1912.7 260.381 1912.8 260.693 1912.92ZM267.432 1910.51H268.545L263.939 1920.37H262.82L267.432 1910.51ZM271.65 1918.43V1921.76H270.566V1912.7H271.65V1913.53C271.83 1913.21 272.068 1912.96 272.365 1912.8C272.666 1912.62 273.012 1912.54 273.402 1912.54C274.195 1912.54 274.816 1912.84 275.266 1913.46C275.719 1914.07 275.945 1914.92 275.945 1916.01C275.945 1917.07 275.719 1917.91 275.266 1918.52C274.812 1919.13 274.191 1919.43 273.402 1919.43C273.004 1919.43 272.654 1919.34 272.354 1919.18C272.057 1919.01 271.822 1918.76 271.65 1918.43ZM274.814 1915.98C274.814 1915.15 274.682 1914.52 274.416 1914.09C274.154 1913.67 273.764 1913.45 273.244 1913.45C272.721 1913.45 272.324 1913.67 272.055 1914.1C271.785 1914.52 271.65 1915.15 271.65 1915.98C271.65 1916.81 271.785 1917.44 272.055 1917.87C272.324 1918.3 272.721 1918.51 273.244 1918.51C273.764 1918.51 274.154 1918.3 274.416 1917.88C274.682 1917.45 274.814 1916.82 274.814 1915.98ZM283.451 1914.05C283.221 1913.87 282.986 1913.74 282.748 1913.66C282.51 1913.58 282.248 1913.53 281.963 1913.53C281.291 1913.53 280.777 1913.75 280.422 1914.17C280.066 1914.59 279.889 1915.2 279.889 1916V1919.26H278.805V1912.7H279.889V1913.98C280.068 1913.51 280.344 1913.16 280.715 1912.91C281.09 1912.66 281.533 1912.54 282.045 1912.54C282.311 1912.54 282.559 1912.57 282.789 1912.64C283.02 1912.7 283.24 1912.81 283.451 1912.95V1914.05ZM287.523 1913.45C286.977 1913.45 286.562 1913.67 286.281 1914.09C286 1914.52 285.859 1915.15 285.859 1915.98C285.859 1916.82 286 1917.45 286.281 1917.88C286.562 1918.3 286.977 1918.51 287.523 1918.51C288.074 1918.51 288.49 1918.3 288.771 1917.88C289.053 1917.45 289.193 1916.82 289.193 1915.98C289.193 1915.15 289.053 1914.52 288.771 1914.09C288.49 1913.67 288.074 1913.45 287.523 1913.45ZM287.523 1912.54C288.434 1912.54 289.129 1912.83 289.609 1913.42C290.094 1914.01 290.336 1914.87 290.336 1915.98C290.336 1917.1 290.096 1917.96 289.615 1918.55C289.135 1919.14 288.438 1919.43 287.523 1919.43C286.613 1919.43 285.918 1919.14 285.438 1918.55C284.957 1917.96 284.717 1917.1 284.717 1915.98C284.717 1914.87 284.957 1914.01 285.438 1913.42C285.918 1912.83 286.613 1912.54 287.523 1912.54ZM296.172 1913.53V1910.14H297.25V1919.26H296.172V1918.43C295.992 1918.76 295.752 1919.01 295.451 1919.18C295.154 1919.34 294.811 1919.43 294.42 1919.43C293.627 1919.43 293.002 1919.12 292.545 1918.51C292.092 1917.89 291.865 1917.04 291.865 1915.96C291.865 1914.89 292.094 1914.06 292.551 1913.45C293.008 1912.84 293.631 1912.54 294.42 1912.54C294.814 1912.54 295.162 1912.62 295.463 1912.8C295.764 1912.96 296 1913.21 296.172 1913.53ZM293.002 1915.98C293.002 1916.82 293.135 1917.45 293.4 1917.88C293.666 1918.3 294.059 1918.51 294.578 1918.51C295.098 1918.51 295.492 1918.3 295.762 1917.87C296.035 1917.44 296.172 1916.81 296.172 1915.98C296.172 1915.15 296.035 1914.52 295.762 1914.1C295.492 1913.67 295.098 1913.45 294.578 1913.45C294.059 1913.45 293.666 1913.67 293.4 1914.09C293.135 1914.52 293.002 1915.15 293.002 1915.98ZM299.518 1916.77V1912.71H300.596V1916.77C300.596 1917.36 300.699 1917.8 300.906 1918.08C301.117 1918.35 301.441 1918.49 301.879 1918.49C302.387 1918.49 302.775 1918.31 303.045 1917.96C303.314 1917.6 303.449 1917.09 303.449 1916.42V1912.71H304.533V1919.26H303.449V1918.27C303.258 1918.65 302.996 1918.94 302.664 1919.14C302.336 1919.33 301.951 1919.43 301.51 1919.43C300.838 1919.43 300.338 1919.21 300.01 1918.77C299.682 1918.33 299.518 1917.67 299.518 1916.77ZM311.822 1918.92C311.533 1919.09 311.234 1919.22 310.926 1919.3C310.621 1919.39 310.309 1919.43 309.988 1919.43C308.973 1919.43 308.178 1919.12 307.604 1918.51C307.033 1917.91 306.748 1917.06 306.748 1915.98C306.748 1914.91 307.033 1914.06 307.604 1913.45C308.178 1912.84 308.973 1912.54 309.988 1912.54C310.305 1912.54 310.613 1912.58 310.914 1912.66C311.215 1912.74 311.518 1912.87 311.822 1913.04V1914.17C311.537 1913.92 311.25 1913.74 310.961 1913.62C310.676 1913.51 310.352 1913.45 309.988 1913.45C309.312 1913.45 308.793 1913.67 308.43 1914.11C308.066 1914.55 307.885 1915.17 307.885 1915.98C307.885 1916.79 308.066 1917.42 308.43 1917.86C308.797 1918.3 309.316 1918.51 309.988 1918.51C310.363 1918.51 310.699 1918.46 310.996 1918.34C311.293 1918.23 311.568 1918.05 311.822 1917.81V1918.92ZM316.434 1910.83V1912.7H318.883V1913.53H316.434V1917.1C316.434 1917.58 316.525 1917.92 316.709 1918.11C316.893 1918.3 317.213 1918.4 317.67 1918.4H318.883V1919.26H317.564C316.756 1919.26 316.186 1919.1 315.854 1918.77C315.521 1918.45 315.355 1917.89 315.355 1917.1V1913.53H313.604V1912.7H315.355V1910.83H316.434ZM320.664 1915.02H326.875V1916.01H320.664V1915.02ZM329.148 1912.72H331.908V1918.42H334.047V1919.26H328.691V1918.42H330.83V1913.56H329.148V1912.72ZM330.83 1910.17H331.908V1911.53H330.83V1910.17ZM340.686 1915.19V1919.26H339.602V1915.19C339.602 1914.6 339.498 1914.17 339.291 1913.89C339.084 1913.61 338.76 1913.48 338.318 1913.48C337.814 1913.48 337.426 1913.66 337.152 1914.01C336.883 1914.37 336.748 1914.88 336.748 1915.55V1919.26H335.67V1912.7H336.748V1913.68C336.939 1913.31 337.199 1913.02 337.527 1912.83C337.855 1912.64 338.244 1912.54 338.693 1912.54C339.361 1912.54 339.859 1912.76 340.188 1913.2C340.52 1913.64 340.686 1914.3 340.686 1915.19ZM347.459 1912.92V1913.98C347.15 1913.8 346.84 1913.67 346.527 1913.58C346.215 1913.49 345.896 1913.44 345.572 1913.44C345.084 1913.44 344.719 1913.52 344.477 1913.68C344.238 1913.84 344.119 1914.08 344.119 1914.4C344.119 1914.69 344.209 1914.91 344.389 1915.06C344.568 1915.2 345.016 1915.34 345.73 1915.48L346.164 1915.56C346.699 1915.66 347.104 1915.87 347.377 1916.17C347.654 1916.48 347.793 1916.87 347.793 1917.36C347.793 1918.01 347.562 1918.52 347.102 1918.88C346.641 1919.25 346 1919.43 345.18 1919.43C344.855 1919.43 344.516 1919.39 344.16 1919.32C343.805 1919.26 343.42 1919.16 343.006 1919.02V1917.91C343.408 1918.11 343.793 1918.27 344.16 1918.37C344.527 1918.48 344.875 1918.53 345.203 1918.53C345.68 1918.53 346.049 1918.43 346.311 1918.24C346.572 1918.04 346.703 1917.77 346.703 1917.42C346.703 1916.92 346.225 1916.58 345.268 1916.39L345.221 1916.38L344.816 1916.29C344.195 1916.17 343.742 1915.97 343.457 1915.68C343.172 1915.4 343.029 1915 343.029 1914.51C343.029 1913.88 343.242 1913.39 343.668 1913.05C344.094 1912.71 344.701 1912.54 345.49 1912.54C345.842 1912.54 346.18 1912.57 346.504 1912.64C346.828 1912.7 347.146 1912.8 347.459 1912.92ZM350.84 1912.72H353.6V1918.42H355.738V1919.26H350.383V1918.42H352.521V1913.56H350.84V1912.72ZM352.521 1910.17H353.6V1911.53H352.521V1910.17ZM361.246 1915.92C361.246 1915.12 361.113 1914.5 360.848 1914.09C360.586 1913.66 360.203 1913.45 359.699 1913.45C359.172 1913.45 358.77 1913.66 358.492 1914.09C358.215 1914.5 358.076 1915.12 358.076 1915.92C358.076 1916.73 358.215 1917.35 358.492 1917.78C358.773 1918.2 359.18 1918.41 359.711 1918.41C360.207 1918.41 360.586 1918.2 360.848 1917.77C361.113 1917.34 361.246 1916.73 361.246 1915.92ZM362.324 1918.84C362.324 1919.82 362.092 1920.57 361.627 1921.08C361.162 1921.58 360.479 1921.84 359.576 1921.84C359.279 1921.84 358.969 1921.81 358.645 1921.76C358.32 1921.7 357.996 1921.62 357.672 1921.51V1920.45C358.055 1920.63 358.402 1920.76 358.715 1920.85C359.027 1920.93 359.314 1920.98 359.576 1920.98C360.158 1920.98 360.582 1920.82 360.848 1920.5C361.113 1920.18 361.246 1919.68 361.246 1919V1918.95V1918.22C361.074 1918.58 360.84 1918.86 360.543 1919.04C360.246 1919.22 359.885 1919.31 359.459 1919.31C358.693 1919.31 358.082 1919 357.625 1918.39C357.168 1917.77 356.939 1916.95 356.939 1915.92C356.939 1914.89 357.168 1914.07 357.625 1913.46C358.082 1912.84 358.693 1912.54 359.459 1912.54C359.881 1912.54 360.238 1912.62 360.531 1912.79C360.824 1912.96 361.062 1913.22 361.246 1913.57V1912.72H362.324V1918.84ZM369.607 1915.19V1919.26H368.523V1915.19C368.523 1914.6 368.42 1914.17 368.213 1913.89C368.006 1913.61 367.682 1913.48 367.24 1913.48C366.736 1913.48 366.348 1913.66 366.074 1914.01C365.805 1914.37 365.67 1914.88 365.67 1915.55V1919.26H364.592V1910.14H365.67V1913.68C365.861 1913.31 366.121 1913.02 366.449 1912.83C366.777 1912.64 367.166 1912.54 367.615 1912.54C368.283 1912.54 368.781 1912.76 369.109 1913.2C369.441 1913.64 369.607 1914.3 369.607 1915.19ZM374.277 1910.83V1912.7H376.727V1913.53H374.277V1917.1C374.277 1917.58 374.369 1917.92 374.553 1918.11C374.736 1918.3 375.057 1918.4 375.514 1918.4H376.727V1919.26H375.408C374.6 1919.26 374.029 1919.1 373.697 1918.77C373.365 1918.45 373.199 1917.89 373.199 1917.1V1913.53H371.447V1912.7H373.199V1910.83H374.277ZM383.611 1912.92V1913.98C383.303 1913.8 382.992 1913.67 382.68 1913.58C382.367 1913.49 382.049 1913.44 381.725 1913.44C381.236 1913.44 380.871 1913.52 380.629 1913.68C380.391 1913.84 380.271 1914.08 380.271 1914.4C380.271 1914.69 380.361 1914.91 380.541 1915.06C380.721 1915.2 381.168 1915.34 381.883 1915.48L382.316 1915.56C382.852 1915.66 383.256 1915.87 383.529 1916.17C383.807 1916.48 383.945 1916.87 383.945 1917.36C383.945 1918.01 383.715 1918.52 383.254 1918.88C382.793 1919.25 382.152 1919.43 381.332 1919.43C381.008 1919.43 380.668 1919.39 380.312 1919.32C379.957 1919.26 379.572 1919.16 379.158 1919.02V1917.91C379.561 1918.11 379.945 1918.27 380.312 1918.37C380.68 1918.48 381.027 1918.53 381.355 1918.53C381.832 1918.53 382.201 1918.43 382.463 1918.24C382.725 1918.04 382.855 1917.77 382.855 1917.42C382.855 1916.92 382.377 1916.58 381.42 1916.39L381.373 1916.38L380.969 1916.29C380.348 1916.17 379.895 1915.97 379.609 1915.68C379.324 1915.4 379.182 1915 379.182 1914.51C379.182 1913.88 379.395 1913.39 379.82 1913.05C380.246 1912.71 380.854 1912.54 381.643 1912.54C381.994 1912.54 382.332 1912.57 382.656 1912.64C382.98 1912.7 383.299 1912.8 383.611 1912.92ZM387.42 1916.89H389.482V1919.26H387.42V1916.89ZM394.568 1918.43V1921.76H393.484V1912.7H394.568V1913.53C394.748 1913.21 394.986 1912.96 395.283 1912.8C395.584 1912.62 395.93 1912.54 396.32 1912.54C397.113 1912.54 397.734 1912.84 398.184 1913.46C398.637 1914.07 398.863 1914.92 398.863 1916.01C398.863 1917.07 398.637 1917.91 398.184 1918.52C397.73 1919.13 397.109 1919.43 396.32 1919.43C395.922 1919.43 395.572 1919.34 395.271 1919.18C394.975 1919.01 394.74 1918.76 394.568 1918.43ZM397.732 1915.98C397.732 1915.15 397.6 1914.52 397.334 1914.09C397.072 1913.67 396.682 1913.45 396.162 1913.45C395.639 1913.45 395.242 1913.67 394.973 1914.1C394.703 1914.52 394.568 1915.15 394.568 1915.98C394.568 1916.81 394.703 1917.44 394.973 1917.87C395.242 1918.3 395.639 1918.51 396.162 1918.51C396.682 1918.51 397.072 1918.3 397.334 1917.88C397.6 1917.45 397.732 1916.82 397.732 1915.98ZM405.76 1915.19V1919.26H404.676V1915.19C404.676 1914.6 404.572 1914.17 404.365 1913.89C404.158 1913.61 403.834 1913.48 403.393 1913.48C402.889 1913.48 402.5 1913.66 402.227 1914.01C401.957 1914.37 401.822 1914.88 401.822 1915.55V1919.26H400.744V1912.7H401.822V1913.68C402.014 1913.31 402.273 1913.02 402.602 1912.83C402.93 1912.64 403.318 1912.54 403.768 1912.54C404.436 1912.54 404.934 1912.76 405.262 1913.2C405.594 1913.64 405.76 1914.3 405.76 1915.19ZM411.859 1915.92C411.859 1915.12 411.727 1914.5 411.461 1914.09C411.199 1913.66 410.816 1913.45 410.312 1913.45C409.785 1913.45 409.383 1913.66 409.105 1914.09C408.828 1914.5 408.689 1915.12 408.689 1915.92C408.689 1916.73 408.828 1917.35 409.105 1917.78C409.387 1918.2 409.793 1918.41 410.324 1918.41C410.82 1918.41 411.199 1918.2 411.461 1917.77C411.727 1917.34 411.859 1916.73 411.859 1915.92ZM412.938 1918.84C412.938 1919.82 412.705 1920.57 412.24 1921.08C411.775 1921.58 411.092 1921.84 410.189 1921.84C409.893 1921.84 409.582 1921.81 409.258 1921.76C408.934 1921.7 408.609 1921.62 408.285 1921.51V1920.45C408.668 1920.63 409.016 1920.76 409.328 1920.85C409.641 1920.93 409.928 1920.98 410.189 1920.98C410.771 1920.98 411.195 1920.82 411.461 1920.5C411.727 1920.18 411.859 1919.68 411.859 1919V1918.95V1918.22C411.688 1918.58 411.453 1918.86 411.156 1919.04C410.859 1919.22 410.498 1919.31 410.072 1919.31C409.307 1919.31 408.695 1919 408.238 1918.39C407.781 1917.77 407.553 1916.95 407.553 1915.92C407.553 1914.89 407.781 1914.07 408.238 1913.46C408.695 1912.84 409.307 1912.54 410.072 1912.54C410.494 1912.54 410.852 1912.62 411.145 1912.79C411.438 1912.96 411.676 1913.22 411.859 1913.57V1912.72H412.938V1918.84ZM419.6 1910.19V1913.78H418.287V1910.19H419.6ZM416.477 1910.19V1913.78H415.164V1910.19H416.477ZM188.225 1964.19V1967.78H186.912V1964.19H188.225ZM185.102 1964.19V1967.78H183.789V1964.19H185.102ZM196.387 1972.54C196.07 1972.83 195.713 1973.05 195.314 1973.21C194.92 1973.35 194.492 1973.43 194.031 1973.43C192.922 1973.43 192.059 1973.03 191.441 1972.24C190.824 1971.44 190.516 1970.33 190.516 1968.89C190.516 1967.46 190.828 1966.35 191.453 1965.55C192.078 1964.75 192.947 1964.35 194.061 1964.35C194.428 1964.35 194.779 1964.41 195.115 1964.51C195.451 1964.61 195.775 1964.77 196.088 1964.98V1966.19C195.771 1965.89 195.447 1965.67 195.115 1965.53C194.783 1965.39 194.432 1965.31 194.061 1965.31C193.291 1965.31 192.713 1965.61 192.326 1966.21C191.943 1966.8 191.752 1967.7 191.752 1968.89C191.752 1970.11 191.938 1971.01 192.309 1971.59C192.684 1972.18 193.258 1972.47 194.031 1972.47C194.293 1972.47 194.521 1972.44 194.717 1972.38C194.916 1972.32 195.096 1972.22 195.256 1972.09V1969.74H193.984V1968.77H196.387V1972.54ZM203.916 1968.05C203.686 1967.87 203.451 1967.74 203.213 1967.66C202.975 1967.58 202.713 1967.53 202.428 1967.53C201.756 1967.53 201.242 1967.75 200.887 1968.17C200.531 1968.59 200.354 1969.2 200.354 1970V1973.26H199.27V1966.7H200.354V1967.98C200.533 1967.51 200.809 1967.16 201.18 1966.91C201.555 1966.66 201.998 1966.54 202.51 1966.54C202.775 1966.54 203.023 1966.57 203.254 1966.64C203.484 1966.7 203.705 1966.81 203.916 1966.95V1968.05ZM206.23 1966.72H208.99V1972.42H211.129V1973.26H205.773V1972.42H207.912V1967.56H206.23V1966.72ZM207.912 1964.17H208.99V1965.53H207.912V1964.17ZM216.637 1967.53V1964.14H217.715V1973.26H216.637V1972.43C216.457 1972.76 216.217 1973.01 215.916 1973.18C215.619 1973.34 215.275 1973.43 214.885 1973.43C214.092 1973.43 213.467 1973.12 213.01 1972.51C212.557 1971.89 212.33 1971.04 212.33 1969.96C212.33 1968.89 212.559 1968.06 213.016 1967.45C213.473 1966.84 214.096 1966.54 214.885 1966.54C215.279 1966.54 215.627 1966.62 215.928 1966.8C216.229 1966.96 216.465 1967.21 216.637 1967.53ZM213.467 1969.98C213.467 1970.82 213.6 1971.45 213.865 1971.88C214.131 1972.3 214.523 1972.51 215.043 1972.51C215.562 1972.51 215.957 1972.3 216.227 1971.87C216.5 1971.44 216.637 1970.81 216.637 1969.98C216.637 1969.15 216.5 1968.52 216.227 1968.1C215.957 1967.67 215.562 1967.45 215.043 1967.45C214.523 1967.45 214.131 1967.67 213.865 1968.09C213.6 1968.52 213.467 1969.15 213.467 1969.98ZM228.408 1965.48V1968.77H229.779C230.326 1968.77 230.752 1968.63 231.057 1968.34C231.365 1968.05 231.52 1967.64 231.52 1967.12C231.52 1966.6 231.367 1966.2 231.062 1965.92C230.758 1965.63 230.33 1965.48 229.779 1965.48H228.408ZM227.225 1964.51H229.779C230.756 1964.51 231.496 1964.73 232 1965.18C232.504 1965.62 232.756 1966.27 232.756 1967.12C232.756 1967.99 232.504 1968.64 232 1969.08C231.5 1969.52 230.76 1969.74 229.779 1969.74H228.408V1973.26H227.225V1964.51ZM237.514 1970.89C237.514 1971.37 237.602 1971.74 237.777 1971.98C237.957 1972.23 238.221 1972.35 238.568 1972.35H239.828V1973.26H238.463C237.818 1973.26 237.318 1973.05 236.963 1972.64C236.611 1972.23 236.436 1971.64 236.436 1970.89V1964.95H234.707V1964.11H237.514V1970.89ZM244.645 1969.96H244.287C243.658 1969.96 243.184 1970.07 242.863 1970.29C242.547 1970.51 242.389 1970.84 242.389 1971.28C242.389 1971.67 242.508 1971.98 242.746 1972.2C242.984 1972.42 243.314 1972.53 243.736 1972.53C244.33 1972.53 244.797 1972.32 245.137 1971.91C245.477 1971.5 245.648 1970.93 245.652 1970.2V1969.96H244.645ZM246.736 1969.51V1973.26H245.652V1972.29C245.422 1972.68 245.131 1972.97 244.779 1973.15C244.432 1973.34 244.008 1973.43 243.508 1973.43C242.84 1973.43 242.307 1973.24 241.908 1972.87C241.51 1972.49 241.311 1971.98 241.311 1971.35C241.311 1970.62 241.555 1970.06 242.043 1969.68C242.535 1969.31 243.256 1969.12 244.205 1969.12H245.652V1968.95C245.648 1968.42 245.516 1968.04 245.254 1967.81C244.992 1967.57 244.574 1967.45 244 1967.45C243.633 1967.45 243.262 1967.51 242.887 1967.61C242.512 1967.72 242.146 1967.87 241.791 1968.07V1967C242.189 1966.84 242.57 1966.73 242.934 1966.66C243.301 1966.58 243.656 1966.54 244 1966.54C244.543 1966.54 245.006 1966.62 245.389 1966.78C245.775 1966.94 246.088 1967.18 246.326 1967.5C246.475 1967.69 246.58 1967.94 246.643 1968.23C246.705 1968.51 246.736 1968.94 246.736 1969.51ZM252.789 1971.15C252.609 1971.61 252.381 1972.21 252.104 1972.95C251.717 1973.99 251.457 1974.61 251.324 1974.84C251.145 1975.15 250.92 1975.37 250.65 1975.53C250.381 1975.68 250.066 1975.76 249.707 1975.76H248.84V1974.85H249.479C249.795 1974.85 250.043 1974.76 250.223 1974.58C250.402 1974.39 250.631 1973.92 250.908 1973.15L248.371 1966.7H249.514L251.459 1971.83L253.375 1966.7H254.518L252.789 1971.15ZM260.02 1969.92C260.02 1969.12 259.887 1968.5 259.621 1968.09C259.359 1967.66 258.977 1967.45 258.473 1967.45C257.945 1967.45 257.543 1967.66 257.266 1968.09C256.988 1968.5 256.85 1969.12 256.85 1969.92C256.85 1970.73 256.988 1971.35 257.266 1971.78C257.547 1972.2 257.953 1972.41 258.484 1972.41C258.98 1972.41 259.359 1972.2 259.621 1971.77C259.887 1971.34 260.02 1970.73 260.02 1969.92ZM261.098 1972.84C261.098 1973.82 260.865 1974.57 260.4 1975.08C259.936 1975.58 259.252 1975.84 258.35 1975.84C258.053 1975.84 257.742 1975.81 257.418 1975.76C257.094 1975.7 256.77 1975.62 256.445 1975.51V1974.45C256.828 1974.63 257.176 1974.76 257.488 1974.85C257.801 1974.93 258.088 1974.98 258.35 1974.98C258.932 1974.98 259.355 1974.82 259.621 1974.5C259.887 1974.18 260.02 1973.68 260.02 1973V1972.95V1972.22C259.848 1972.58 259.613 1972.86 259.316 1973.04C259.02 1973.22 258.658 1973.31 258.232 1973.31C257.467 1973.31 256.855 1973 256.398 1972.39C255.941 1971.77 255.713 1970.95 255.713 1969.92C255.713 1968.89 255.941 1968.07 256.398 1967.46C256.855 1966.84 257.467 1966.54 258.232 1966.54C258.654 1966.54 259.012 1966.62 259.305 1966.79C259.598 1966.96 259.836 1967.22 260.02 1967.57V1966.72H261.098V1972.84ZM268.99 1968.05C268.76 1967.87 268.525 1967.74 268.287 1967.66C268.049 1967.58 267.787 1967.53 267.502 1967.53C266.83 1967.53 266.316 1967.75 265.961 1968.17C265.605 1968.59 265.428 1969.2 265.428 1970V1973.26H264.344V1966.7H265.428V1967.98C265.607 1967.51 265.883 1967.16 266.254 1966.91C266.629 1966.66 267.072 1966.54 267.584 1966.54C267.85 1966.54 268.098 1966.57 268.328 1966.64C268.559 1966.7 268.779 1966.81 268.99 1966.95V1968.05ZM273.062 1967.45C272.516 1967.45 272.102 1967.67 271.82 1968.09C271.539 1968.52 271.398 1969.15 271.398 1969.98C271.398 1970.82 271.539 1971.45 271.82 1971.88C272.102 1972.3 272.516 1972.51 273.062 1972.51C273.613 1972.51 274.029 1972.3 274.311 1971.88C274.592 1971.45 274.732 1970.82 274.732 1969.98C274.732 1969.15 274.592 1968.52 274.311 1968.09C274.029 1967.67 273.613 1967.45 273.062 1967.45ZM273.062 1966.54C273.973 1966.54 274.668 1966.83 275.148 1967.42C275.633 1968.01 275.875 1968.87 275.875 1969.98C275.875 1971.1 275.635 1971.96 275.154 1972.55C274.674 1973.14 273.977 1973.43 273.062 1973.43C272.152 1973.43 271.457 1973.14 270.977 1972.55C270.496 1971.96 270.256 1971.1 270.256 1969.98C270.256 1968.87 270.496 1968.01 270.977 1967.42C271.457 1966.83 272.152 1966.54 273.062 1966.54ZM277.826 1970.77V1966.71H278.904V1970.77C278.904 1971.36 279.008 1971.8 279.215 1972.08C279.426 1972.35 279.75 1972.49 280.188 1972.49C280.695 1972.49 281.084 1972.31 281.354 1971.96C281.623 1971.6 281.758 1971.09 281.758 1970.42V1966.71H282.842V1973.26H281.758V1972.27C281.566 1972.65 281.305 1972.94 280.973 1973.14C280.645 1973.33 280.26 1973.43 279.818 1973.43C279.146 1973.43 278.646 1973.21 278.318 1972.77C277.99 1972.33 277.826 1971.67 277.826 1970.77ZM290.072 1969.19V1973.26H288.988V1969.19C288.988 1968.6 288.885 1968.17 288.678 1967.89C288.471 1967.61 288.146 1967.48 287.705 1967.48C287.201 1967.48 286.812 1967.66 286.539 1968.01C286.27 1968.37 286.135 1968.88 286.135 1969.55V1973.26H285.057V1966.7H286.135V1967.68C286.326 1967.31 286.586 1967.02 286.914 1966.83C287.242 1966.64 287.631 1966.54 288.08 1966.54C288.748 1966.54 289.246 1966.76 289.574 1967.2C289.906 1967.64 290.072 1968.3 290.072 1969.19ZM296.172 1967.53V1964.14H297.25V1973.26H296.172V1972.43C295.992 1972.76 295.752 1973.01 295.451 1973.18C295.154 1973.34 294.811 1973.43 294.42 1973.43C293.627 1973.43 293.002 1973.12 292.545 1972.51C292.092 1971.89 291.865 1971.04 291.865 1969.96C291.865 1968.89 292.094 1968.06 292.551 1967.45C293.008 1966.84 293.631 1966.54 294.42 1966.54C294.814 1966.54 295.162 1966.62 295.463 1966.8C295.764 1966.96 296 1967.21 296.172 1967.53ZM293.002 1969.98C293.002 1970.82 293.135 1971.45 293.4 1971.88C293.666 1972.3 294.059 1972.51 294.578 1972.51C295.098 1972.51 295.492 1972.3 295.762 1971.87C296.035 1971.44 296.172 1970.81 296.172 1969.98C296.172 1969.15 296.035 1968.52 295.762 1968.1C295.492 1967.67 295.098 1967.45 294.578 1967.45C294.059 1967.45 293.666 1967.67 293.4 1968.09C293.135 1968.52 293.002 1969.15 293.002 1969.98ZM303.912 1964.19V1967.78H302.6V1964.19H303.912ZM300.789 1964.19V1967.78H299.477V1964.19H300.789ZM231.607 1982.19V1985.78H230.295V1982.19H231.607ZM228.484 1982.19V1985.78H227.172V1982.19H228.484ZM239.23 1982.81V1984.01C238.871 1983.78 238.51 1983.61 238.146 1983.49C237.787 1983.37 237.424 1983.31 237.057 1983.31C236.498 1983.31 236.057 1983.44 235.732 1983.71C235.408 1983.96 235.246 1984.31 235.246 1984.76C235.246 1985.14 235.352 1985.44 235.562 1985.64C235.777 1985.84 236.176 1986.01 236.758 1986.15L237.379 1986.29C238.199 1986.48 238.797 1986.78 239.172 1987.19C239.547 1987.6 239.734 1988.16 239.734 1988.87C239.734 1989.7 239.477 1990.34 238.961 1990.77C238.445 1991.21 237.695 1991.43 236.711 1991.43C236.301 1991.43 235.889 1991.38 235.475 1991.29C235.061 1991.21 234.645 1991.08 234.227 1990.9V1989.64C234.676 1989.93 235.1 1990.14 235.498 1990.27C235.9 1990.4 236.305 1990.47 236.711 1990.47C237.309 1990.47 237.773 1990.34 238.105 1990.07C238.438 1989.8 238.604 1989.42 238.604 1988.94C238.604 1988.51 238.488 1988.17 238.258 1987.94C238.031 1987.71 237.635 1987.53 237.068 1987.41L236.436 1987.26C235.623 1987.08 235.033 1986.8 234.666 1986.43C234.299 1986.06 234.115 1985.56 234.115 1984.94C234.115 1984.16 234.377 1983.53 234.9 1983.06C235.428 1982.59 236.127 1982.35 236.998 1982.35C237.334 1982.35 237.688 1982.39 238.059 1982.47C238.43 1982.54 238.82 1982.66 239.23 1982.81ZM242.383 1984.72H245.143V1990.42H247.281V1991.26H241.926V1990.42H244.064V1985.56H242.383V1984.72ZM244.064 1982.17H245.143V1983.53H244.064V1982.17ZM252.789 1985.53V1982.14H253.867V1991.26H252.789V1990.43C252.609 1990.76 252.369 1991.01 252.068 1991.18C251.771 1991.34 251.428 1991.43 251.037 1991.43C250.244 1991.43 249.619 1991.12 249.162 1990.51C248.709 1989.89 248.482 1989.04 248.482 1987.96C248.482 1986.89 248.711 1986.06 249.168 1985.45C249.625 1984.84 250.248 1984.54 251.037 1984.54C251.432 1984.54 251.779 1984.62 252.08 1984.8C252.381 1984.96 252.617 1985.21 252.789 1985.53ZM249.619 1987.98C249.619 1988.82 249.752 1989.45 250.018 1989.88C250.283 1990.3 250.676 1990.51 251.195 1990.51C251.715 1990.51 252.109 1990.3 252.379 1989.87C252.652 1989.44 252.789 1988.81 252.789 1987.98C252.789 1987.15 252.652 1986.52 252.379 1986.1C252.109 1985.67 251.715 1985.45 251.195 1985.45C250.676 1985.45 250.283 1985.67 250.018 1986.09C249.752 1986.52 249.619 1987.15 249.619 1987.98ZM261.555 1987.44V1987.97H256.885V1988C256.854 1988.9 257.023 1989.54 257.395 1989.93C257.77 1990.32 258.297 1990.51 258.977 1990.51C259.32 1990.51 259.68 1990.46 260.055 1990.35C260.43 1990.24 260.83 1990.08 261.256 1989.85V1990.92C260.846 1991.09 260.449 1991.22 260.066 1991.3C259.688 1991.39 259.32 1991.43 258.965 1991.43C257.945 1991.43 257.148 1991.12 256.574 1990.51C256 1989.9 255.713 1989.06 255.713 1987.98C255.713 1986.94 255.994 1986.1 256.557 1985.48C257.119 1984.85 257.869 1984.54 258.807 1984.54C259.643 1984.54 260.301 1984.82 260.781 1985.39C261.266 1985.95 261.523 1986.64 261.555 1987.44ZM260.477 1987.12C260.43 1986.67 260.264 1986.28 259.979 1985.95C259.697 1985.62 259.291 1985.45 258.76 1985.45C258.24 1985.45 257.812 1985.62 257.477 1985.97C257.141 1986.31 256.957 1986.7 256.926 1987.13L260.477 1987.12ZM271.65 1990.43V1993.76H270.566V1984.7H271.65V1985.53C271.83 1985.21 272.068 1984.96 272.365 1984.8C272.666 1984.62 273.012 1984.54 273.402 1984.54C274.195 1984.54 274.816 1984.84 275.266 1985.46C275.719 1986.07 275.945 1986.92 275.945 1988.01C275.945 1989.07 275.719 1989.91 275.266 1990.52C274.812 1991.13 274.191 1991.43 273.402 1991.43C273.004 1991.43 272.654 1991.34 272.354 1991.18C272.057 1991.01 271.822 1990.76 271.65 1990.43ZM274.814 1987.98C274.814 1987.15 274.682 1986.52 274.416 1986.09C274.154 1985.67 273.764 1985.45 273.244 1985.45C272.721 1985.45 272.324 1985.67 272.055 1986.1C271.785 1986.52 271.65 1987.15 271.65 1987.98C271.65 1988.81 271.785 1989.44 272.055 1989.87C272.324 1990.3 272.721 1990.51 273.244 1990.51C273.764 1990.51 274.154 1990.3 274.416 1989.88C274.682 1989.45 274.814 1988.82 274.814 1987.98ZM283.451 1986.05C283.221 1985.87 282.986 1985.74 282.748 1985.66C282.51 1985.58 282.248 1985.53 281.963 1985.53C281.291 1985.53 280.777 1985.75 280.422 1986.17C280.066 1986.59 279.889 1987.2 279.889 1988V1991.26H278.805V1984.7H279.889V1985.98C280.068 1985.51 280.344 1985.16 280.715 1984.91C281.09 1984.66 281.533 1984.54 282.045 1984.54C282.311 1984.54 282.559 1984.57 282.789 1984.64C283.02 1984.7 283.24 1984.81 283.451 1984.95V1986.05ZM287.523 1985.45C286.977 1985.45 286.562 1985.67 286.281 1986.09C286 1986.52 285.859 1987.15 285.859 1987.98C285.859 1988.82 286 1989.45 286.281 1989.88C286.562 1990.3 286.977 1990.51 287.523 1990.51C288.074 1990.51 288.49 1990.3 288.771 1989.88C289.053 1989.45 289.193 1988.82 289.193 1987.98C289.193 1987.15 289.053 1986.52 288.771 1986.09C288.49 1985.67 288.074 1985.45 287.523 1985.45ZM287.523 1984.54C288.434 1984.54 289.129 1984.83 289.609 1985.42C290.094 1986.01 290.336 1986.87 290.336 1987.98C290.336 1989.1 290.096 1989.96 289.615 1990.55C289.135 1991.14 288.438 1991.43 287.523 1991.43C286.613 1991.43 285.918 1991.14 285.438 1990.55C284.957 1989.96 284.717 1989.1 284.717 1987.98C284.717 1986.87 284.957 1986.01 285.438 1985.42C285.918 1984.83 286.613 1984.54 287.523 1984.54ZM294.66 1991.38V1985.53H292.803V1984.7H295.738V1991.38C295.738 1992.14 295.562 1992.72 295.211 1993.13C294.863 1993.55 294.367 1993.76 293.723 1993.76H292.234V1992.84H293.605C293.957 1992.84 294.221 1992.72 294.396 1992.47C294.572 1992.23 294.66 1991.86 294.66 1991.38ZM294.66 1982.14H295.738V1983.51H294.66V1982.14ZM304.938 1987.44V1987.97H300.268V1988C300.236 1988.9 300.406 1989.54 300.777 1989.93C301.152 1990.32 301.68 1990.51 302.359 1990.51C302.703 1990.51 303.062 1990.46 303.438 1990.35C303.812 1990.24 304.213 1990.08 304.639 1989.85V1990.92C304.229 1991.09 303.832 1991.22 303.449 1991.3C303.07 1991.39 302.703 1991.43 302.348 1991.43C301.328 1991.43 300.531 1991.12 299.957 1990.51C299.383 1989.9 299.096 1989.06 299.096 1987.98C299.096 1986.94 299.377 1986.1 299.939 1985.48C300.502 1984.85 301.252 1984.54 302.189 1984.54C303.025 1984.54 303.684 1984.82 304.164 1985.39C304.648 1985.95 304.906 1986.64 304.938 1987.44ZM303.859 1987.12C303.812 1986.67 303.646 1986.28 303.361 1985.95C303.08 1985.62 302.674 1985.45 302.143 1985.45C301.623 1985.45 301.195 1985.62 300.859 1985.97C300.523 1986.31 300.34 1986.7 300.309 1987.13L303.859 1987.12ZM311.822 1990.92C311.533 1991.09 311.234 1991.22 310.926 1991.3C310.621 1991.39 310.309 1991.43 309.988 1991.43C308.973 1991.43 308.178 1991.12 307.604 1990.51C307.033 1989.91 306.748 1989.06 306.748 1987.98C306.748 1986.91 307.033 1986.06 307.604 1985.45C308.178 1984.84 308.973 1984.54 309.988 1984.54C310.305 1984.54 310.613 1984.58 310.914 1984.66C311.215 1984.74 311.518 1984.87 311.822 1985.04V1986.17C311.537 1985.92 311.25 1985.74 310.961 1985.62C310.676 1985.51 310.352 1985.45 309.988 1985.45C309.312 1985.45 308.793 1985.67 308.43 1986.11C308.066 1986.55 307.885 1987.17 307.885 1987.98C307.885 1988.79 308.066 1989.42 308.43 1989.86C308.797 1990.3 309.316 1990.51 309.988 1990.51C310.363 1990.51 310.699 1990.46 310.996 1990.34C311.293 1990.23 311.568 1990.05 311.822 1989.81V1990.92ZM316.434 1982.83V1984.7H318.883V1985.53H316.434V1989.1C316.434 1989.58 316.525 1989.92 316.709 1990.11C316.893 1990.3 317.213 1990.4 317.67 1990.4H318.883V1991.26H317.564C316.756 1991.26 316.186 1991.1 315.854 1990.77C315.521 1990.45 315.355 1989.89 315.355 1989.1V1985.53H313.604V1984.7H315.355V1982.83H316.434ZM330.895 1982.83V1984.7H333.344V1985.53H330.895V1989.1C330.895 1989.58 330.986 1989.92 331.17 1990.11C331.354 1990.3 331.674 1990.4 332.131 1990.4H333.344V1991.26H332.025C331.217 1991.26 330.646 1991.1 330.314 1990.77C329.982 1990.45 329.816 1989.89 329.816 1989.1V1985.53H328.064V1984.7H329.816V1982.83H330.895ZM338.137 1985.45C337.59 1985.45 337.176 1985.67 336.895 1986.09C336.613 1986.52 336.473 1987.15 336.473 1987.98C336.473 1988.82 336.613 1989.45 336.895 1989.88C337.176 1990.3 337.59 1990.51 338.137 1990.51C338.688 1990.51 339.104 1990.3 339.385 1989.88C339.666 1989.45 339.807 1988.82 339.807 1987.98C339.807 1987.15 339.666 1986.52 339.385 1986.09C339.104 1985.67 338.688 1985.45 338.137 1985.45ZM338.137 1984.54C339.047 1984.54 339.742 1984.83 340.223 1985.42C340.707 1986.01 340.949 1986.87 340.949 1987.98C340.949 1989.1 340.709 1989.96 340.229 1990.55C339.748 1991.14 339.051 1991.43 338.137 1991.43C337.227 1991.43 336.531 1991.14 336.051 1990.55C335.57 1989.96 335.33 1989.1 335.33 1987.98C335.33 1986.87 335.57 1986.01 336.051 1985.42C336.531 1984.83 337.227 1984.54 338.137 1984.54ZM350.934 1988.01C350.934 1988.84 351.064 1989.47 351.326 1989.9C351.592 1990.33 351.984 1990.54 352.504 1990.54C353.023 1990.54 353.416 1990.33 353.682 1989.9C353.951 1989.47 354.086 1988.84 354.086 1988.01C354.086 1987.17 353.951 1986.55 353.682 1986.12C353.416 1985.69 353.023 1985.48 352.504 1985.48C351.984 1985.48 351.592 1985.69 351.326 1986.11C351.064 1986.54 350.934 1987.17 350.934 1988.01ZM354.086 1990.44C353.91 1990.77 353.672 1991.02 353.371 1991.19C353.074 1991.37 352.729 1991.45 352.334 1991.45C351.549 1991.45 350.928 1991.15 350.471 1990.54C350.018 1989.93 349.791 1989.1 349.791 1988.03C349.791 1986.94 350.018 1986.09 350.471 1985.48C350.924 1984.87 351.545 1984.56 352.334 1984.56C352.725 1984.56 353.068 1984.65 353.365 1984.82C353.666 1984.99 353.906 1985.23 354.086 1985.56V1984.72H355.17V1993.78H354.086V1990.44ZM357.361 1988.77V1984.71H358.439V1988.77C358.439 1989.36 358.543 1989.8 358.75 1990.08C358.961 1990.35 359.285 1990.49 359.723 1990.49C360.23 1990.49 360.619 1990.31 360.889 1989.96C361.158 1989.6 361.293 1989.09 361.293 1988.42V1984.71H362.377V1991.26H361.293V1990.27C361.102 1990.65 360.84 1990.94 360.508 1991.14C360.18 1991.33 359.795 1991.43 359.354 1991.43C358.682 1991.43 358.182 1991.21 357.854 1990.77C357.525 1990.33 357.361 1989.67 357.361 1988.77ZM365.301 1984.72H368.061V1990.42H370.199V1991.26H364.844V1990.42H366.982V1985.56H365.301V1984.72ZM366.982 1982.17H368.061V1983.53H366.982V1982.17ZM376.896 1990.92C376.607 1991.09 376.309 1991.22 376 1991.3C375.695 1991.39 375.383 1991.43 375.062 1991.43C374.047 1991.43 373.252 1991.12 372.678 1990.51C372.107 1989.91 371.822 1989.06 371.822 1987.98C371.822 1986.91 372.107 1986.06 372.678 1985.45C373.252 1984.84 374.047 1984.54 375.062 1984.54C375.379 1984.54 375.688 1984.58 375.988 1984.66C376.289 1984.74 376.592 1984.87 376.896 1985.04V1986.17C376.611 1985.92 376.324 1985.74 376.035 1985.62C375.75 1985.51 375.426 1985.45 375.062 1985.45C374.387 1985.45 373.867 1985.67 373.504 1986.11C373.141 1986.55 372.959 1987.17 372.959 1987.98C372.959 1988.79 373.141 1989.42 373.504 1989.86C373.871 1990.3 374.391 1990.51 375.062 1990.51C375.438 1990.51 375.773 1990.46 376.07 1990.34C376.367 1990.23 376.643 1990.05 376.896 1989.81V1990.92ZM379.293 1982.14H380.406V1987.42L383.236 1984.7H384.549L381.965 1987.17L384.953 1991.26H383.635L381.209 1987.87L380.406 1988.63V1991.26H379.293V1982.14ZM389.354 1988.89C389.354 1989.37 389.441 1989.74 389.617 1989.98C389.797 1990.23 390.061 1990.35 390.408 1990.35H391.668V1991.26H390.303C389.658 1991.26 389.158 1991.05 388.803 1990.64C388.451 1990.23 388.275 1989.64 388.275 1988.89V1982.95H386.547V1982.11H389.354V1988.89ZM397.398 1989.15C397.219 1989.61 396.99 1990.21 396.713 1990.95C396.326 1991.99 396.066 1992.61 395.934 1992.84C395.754 1993.15 395.529 1993.37 395.26 1993.53C394.99 1993.68 394.676 1993.76 394.316 1993.76H393.449V1992.85H394.088C394.404 1992.85 394.652 1992.76 394.832 1992.58C395.012 1992.39 395.24 1991.92 395.518 1991.15L392.98 1984.7H394.123L396.068 1989.83L397.984 1984.7H399.127L397.398 1989.15ZM411.859 1987.92C411.859 1987.12 411.727 1986.5 411.461 1986.09C411.199 1985.66 410.816 1985.45 410.312 1985.45C409.785 1985.45 409.383 1985.66 409.105 1986.09C408.828 1986.5 408.689 1987.12 408.689 1987.92C408.689 1988.73 408.828 1989.35 409.105 1989.78C409.387 1990.2 409.793 1990.41 410.324 1990.41C410.82 1990.41 411.199 1990.2 411.461 1989.77C411.727 1989.34 411.859 1988.73 411.859 1987.92ZM412.938 1990.84C412.938 1991.82 412.705 1992.57 412.24 1993.08C411.775 1993.58 411.092 1993.84 410.189 1993.84C409.893 1993.84 409.582 1993.81 409.258 1993.76C408.934 1993.7 408.609 1993.62 408.285 1993.51V1992.45C408.668 1992.63 409.016 1992.76 409.328 1992.85C409.641 1992.93 409.928 1992.98 410.189 1992.98C410.771 1992.98 411.195 1992.82 411.461 1992.5C411.727 1992.18 411.859 1991.68 411.859 1991V1990.95V1990.22C411.688 1990.58 411.453 1990.86 411.156 1991.04C410.859 1991.22 410.498 1991.31 410.072 1991.31C409.307 1991.31 408.695 1991 408.238 1990.39C407.781 1989.77 407.553 1988.95 407.553 1987.92C407.553 1986.89 407.781 1986.07 408.238 1985.46C408.695 1984.84 409.307 1984.54 410.072 1984.54C410.494 1984.54 410.852 1984.62 411.145 1984.79C411.438 1984.96 411.676 1985.22 411.859 1985.57V1984.72H412.938V1990.84ZM420.625 1987.44V1987.97H415.955V1988C415.924 1988.9 416.094 1989.54 416.465 1989.93C416.84 1990.32 417.367 1990.51 418.047 1990.51C418.391 1990.51 418.75 1990.46 419.125 1990.35C419.5 1990.24 419.9 1990.08 420.326 1989.85V1990.92C419.916 1991.09 419.52 1991.22 419.137 1991.3C418.758 1991.39 418.391 1991.43 418.035 1991.43C417.016 1991.43 416.219 1991.12 415.645 1990.51C415.07 1989.9 414.783 1989.06 414.783 1987.98C414.783 1986.94 415.064 1986.1 415.627 1985.48C416.189 1984.85 416.939 1984.54 417.877 1984.54C418.713 1984.54 419.371 1984.82 419.852 1985.39C420.336 1985.95 420.594 1986.64 420.625 1987.44ZM419.547 1987.12C419.5 1986.67 419.334 1986.28 419.049 1985.95C418.768 1985.62 418.361 1985.45 417.83 1985.45C417.311 1985.45 416.883 1985.62 416.547 1985.97C416.211 1986.31 416.027 1986.7 415.996 1987.13L419.547 1987.12ZM427.451 1987.19V1991.26H426.367V1987.19C426.367 1986.6 426.264 1986.17 426.057 1985.89C425.85 1985.61 425.525 1985.48 425.084 1985.48C424.58 1985.48 424.191 1985.66 423.918 1986.01C423.648 1986.37 423.514 1986.88 423.514 1987.55V1991.26H422.436V1984.7H423.514V1985.68C423.705 1985.31 423.965 1985.02 424.293 1984.83C424.621 1984.64 425.01 1984.54 425.459 1984.54C426.127 1984.54 426.625 1984.76 426.953 1985.2C427.285 1985.64 427.451 1986.3 427.451 1987.19ZM435.086 1987.44V1987.97H430.416V1988C430.385 1988.9 430.555 1989.54 430.926 1989.93C431.301 1990.32 431.828 1990.51 432.508 1990.51C432.852 1990.51 433.211 1990.46 433.586 1990.35C433.961 1990.24 434.361 1990.08 434.787 1989.85V1990.92C434.377 1991.09 433.98 1991.22 433.598 1991.3C433.219 1991.39 432.852 1991.43 432.496 1991.43C431.477 1991.43 430.68 1991.12 430.105 1990.51C429.531 1989.9 429.244 1989.06 429.244 1987.98C429.244 1986.94 429.525 1986.1 430.088 1985.48C430.65 1984.85 431.4 1984.54 432.338 1984.54C433.174 1984.54 433.832 1984.82 434.312 1985.39C434.797 1985.95 435.055 1986.64 435.086 1987.44ZM434.008 1987.12C433.961 1986.67 433.795 1986.28 433.51 1985.95C433.229 1985.62 432.822 1985.45 432.291 1985.45C431.771 1985.45 431.344 1985.62 431.008 1985.97C430.672 1986.31 430.488 1986.7 430.457 1987.13L434.008 1987.12ZM442.521 1986.05C442.291 1985.87 442.057 1985.74 441.818 1985.66C441.58 1985.58 441.318 1985.53 441.033 1985.53C440.361 1985.53 439.848 1985.75 439.492 1986.17C439.137 1986.59 438.959 1987.2 438.959 1988V1991.26H437.875V1984.7H438.959V1985.98C439.139 1985.51 439.414 1985.16 439.785 1984.91C440.16 1984.66 440.604 1984.54 441.115 1984.54C441.381 1984.54 441.629 1984.57 441.859 1984.64C442.09 1984.7 442.311 1984.81 442.521 1984.95V1986.05ZM447.098 1987.96H446.74C446.111 1987.96 445.637 1988.07 445.316 1988.29C445 1988.51 444.842 1988.84 444.842 1989.28C444.842 1989.67 444.961 1989.98 445.199 1990.2C445.438 1990.42 445.768 1990.53 446.189 1990.53C446.783 1990.53 447.25 1990.32 447.59 1989.91C447.93 1989.5 448.102 1988.93 448.105 1988.2V1987.96H447.098ZM449.189 1987.51V1991.26H448.105V1990.29C447.875 1990.68 447.584 1990.97 447.232 1991.15C446.885 1991.34 446.461 1991.43 445.961 1991.43C445.293 1991.43 444.76 1991.24 444.361 1990.87C443.963 1990.49 443.764 1989.98 443.764 1989.35C443.764 1988.62 444.008 1988.06 444.496 1987.68C444.988 1987.31 445.709 1987.12 446.658 1987.12H448.105V1986.95C448.102 1986.42 447.969 1986.04 447.707 1985.81C447.445 1985.57 447.027 1985.45 446.453 1985.45C446.086 1985.45 445.715 1985.51 445.34 1985.61C444.965 1985.72 444.6 1985.87 444.244 1986.07V1985C444.643 1984.84 445.023 1984.73 445.387 1984.66C445.754 1984.58 446.109 1984.54 446.453 1984.54C446.996 1984.54 447.459 1984.62 447.842 1984.78C448.229 1984.94 448.541 1985.18 448.779 1985.5C448.928 1985.69 449.033 1985.94 449.096 1986.23C449.158 1986.51 449.189 1986.94 449.189 1987.51ZM453.812 1982.83V1984.7H456.262V1985.53H453.812V1989.1C453.812 1989.58 453.904 1989.92 454.088 1990.11C454.271 1990.3 454.592 1990.4 455.049 1990.4H456.262V1991.26H454.943C454.135 1991.26 453.564 1991.1 453.232 1990.77C452.9 1990.45 452.734 1989.89 452.734 1989.1V1985.53H450.982V1984.7H452.734V1982.83H453.812ZM464.008 1987.44V1987.97H459.338V1988C459.307 1988.9 459.477 1989.54 459.848 1989.93C460.223 1990.32 460.75 1990.51 461.43 1990.51C461.773 1990.51 462.133 1990.46 462.508 1990.35C462.883 1990.24 463.283 1990.08 463.709 1989.85V1990.92C463.299 1991.09 462.902 1991.22 462.52 1991.3C462.141 1991.39 461.773 1991.43 461.418 1991.43C460.398 1991.43 459.602 1991.12 459.027 1990.51C458.453 1989.9 458.166 1989.06 458.166 1987.98C458.166 1986.94 458.447 1986.1 459.01 1985.48C459.572 1984.85 460.322 1984.54 461.26 1984.54C462.096 1984.54 462.754 1984.82 463.234 1985.39C463.719 1985.95 463.977 1986.64 464.008 1987.44ZM462.93 1987.12C462.883 1986.67 462.717 1986.28 462.432 1985.95C462.15 1985.62 461.744 1985.45 461.213 1985.45C460.693 1985.45 460.266 1985.62 459.93 1985.97C459.594 1986.31 459.41 1986.7 459.379 1987.13L462.93 1987.12ZM478.193 1990.95C477.893 1991.11 477.584 1991.23 477.268 1991.31C476.951 1991.39 476.615 1991.43 476.26 1991.43C475.139 1991.43 474.268 1991.03 473.646 1990.24C473.029 1989.45 472.721 1988.33 472.721 1986.89C472.721 1985.46 473.031 1984.35 473.652 1983.55C474.277 1982.75 475.146 1982.35 476.26 1982.35C476.615 1982.35 476.951 1982.39 477.268 1982.48C477.584 1982.55 477.893 1982.67 478.193 1982.83V1984.05C477.904 1983.81 477.594 1983.63 477.262 1983.5C476.93 1983.38 476.596 1983.31 476.26 1983.31C475.49 1983.31 474.914 1983.61 474.531 1984.2C474.148 1984.8 473.957 1985.69 473.957 1986.89C473.957 1988.09 474.148 1988.98 474.531 1989.58C474.914 1990.17 475.49 1990.47 476.26 1990.47C476.604 1990.47 476.939 1990.41 477.268 1990.28C477.6 1990.16 477.908 1989.97 478.193 1989.74V1990.95ZM485.066 1982.81V1984.01C484.707 1983.78 484.346 1983.61 483.982 1983.49C483.623 1983.37 483.26 1983.31 482.893 1983.31C482.334 1983.31 481.893 1983.44 481.568 1983.71C481.244 1983.96 481.082 1984.31 481.082 1984.76C481.082 1985.14 481.188 1985.44 481.398 1985.64C481.613 1985.84 482.012 1986.01 482.594 1986.15L483.215 1986.29C484.035 1986.48 484.633 1986.78 485.008 1987.19C485.383 1987.6 485.57 1988.16 485.57 1988.87C485.57 1989.7 485.312 1990.34 484.797 1990.77C484.281 1991.21 483.531 1991.43 482.547 1991.43C482.137 1991.43 481.725 1991.38 481.311 1991.29C480.896 1991.21 480.48 1991.08 480.062 1990.9V1989.64C480.512 1989.93 480.936 1990.14 481.334 1990.27C481.736 1990.4 482.141 1990.47 482.547 1990.47C483.145 1990.47 483.609 1990.34 483.941 1990.07C484.273 1989.8 484.439 1989.42 484.439 1988.94C484.439 1988.51 484.324 1988.17 484.094 1987.94C483.867 1987.71 483.471 1987.53 482.904 1987.41L482.271 1987.26C481.459 1987.08 480.869 1986.8 480.502 1986.43C480.135 1986.06 479.951 1985.56 479.951 1984.94C479.951 1984.16 480.213 1983.53 480.736 1983.06C481.264 1982.59 481.963 1982.35 482.834 1982.35C483.17 1982.35 483.523 1982.39 483.895 1982.47C484.266 1982.54 484.656 1982.66 485.066 1982.81ZM492.297 1982.81V1984.01C491.938 1983.78 491.576 1983.61 491.213 1983.49C490.854 1983.37 490.49 1983.31 490.123 1983.31C489.564 1983.31 489.123 1983.44 488.799 1983.71C488.475 1983.96 488.312 1984.31 488.312 1984.76C488.312 1985.14 488.418 1985.44 488.629 1985.64C488.844 1985.84 489.242 1986.01 489.824 1986.15L490.445 1986.29C491.266 1986.48 491.863 1986.78 492.238 1987.19C492.613 1987.6 492.801 1988.16 492.801 1988.87C492.801 1989.7 492.543 1990.34 492.027 1990.77C491.512 1991.21 490.762 1991.43 489.777 1991.43C489.367 1991.43 488.955 1991.38 488.541 1991.29C488.127 1991.21 487.711 1991.08 487.293 1990.9V1989.64C487.742 1989.93 488.166 1990.14 488.564 1990.27C488.967 1990.4 489.371 1990.47 489.777 1990.47C490.375 1990.47 490.84 1990.34 491.172 1990.07C491.504 1989.8 491.67 1989.42 491.67 1988.94C491.67 1988.51 491.555 1988.17 491.324 1987.94C491.098 1987.71 490.701 1987.53 490.135 1987.41L489.502 1987.26C488.689 1987.08 488.1 1986.8 487.732 1986.43C487.365 1986.06 487.182 1985.56 487.182 1984.94C487.182 1984.16 487.443 1983.53 487.967 1983.06C488.494 1982.59 489.193 1982.35 490.064 1982.35C490.4 1982.35 490.754 1982.39 491.125 1982.47C491.496 1982.54 491.887 1982.66 492.297 1982.81ZM505.855 1987.92C505.855 1987.12 505.723 1986.5 505.457 1986.09C505.195 1985.66 504.812 1985.45 504.309 1985.45C503.781 1985.45 503.379 1985.66 503.102 1986.09C502.824 1986.5 502.686 1987.12 502.686 1987.92C502.686 1988.73 502.824 1989.35 503.102 1989.78C503.383 1990.2 503.789 1990.41 504.32 1990.41C504.816 1990.41 505.195 1990.2 505.457 1989.77C505.723 1989.34 505.855 1988.73 505.855 1987.92ZM506.934 1990.84C506.934 1991.82 506.701 1992.57 506.236 1993.08C505.771 1993.58 505.088 1993.84 504.186 1993.84C503.889 1993.84 503.578 1993.81 503.254 1993.76C502.93 1993.7 502.605 1993.62 502.281 1993.51V1992.45C502.664 1992.63 503.012 1992.76 503.324 1992.85C503.637 1992.93 503.924 1992.98 504.186 1992.98C504.768 1992.98 505.191 1992.82 505.457 1992.5C505.723 1992.18 505.855 1991.68 505.855 1991V1990.95V1990.22C505.684 1990.58 505.449 1990.86 505.152 1991.04C504.855 1991.22 504.494 1991.31 504.068 1991.31C503.303 1991.31 502.691 1991 502.234 1990.39C501.777 1989.77 501.549 1988.95 501.549 1987.92C501.549 1986.89 501.777 1986.07 502.234 1985.46C502.691 1984.84 503.303 1984.54 504.068 1984.54C504.49 1984.54 504.848 1984.62 505.141 1984.79C505.434 1984.96 505.672 1985.22 505.855 1985.57V1984.72H506.934V1990.84ZM514.826 1986.05C514.596 1985.87 514.361 1985.74 514.123 1985.66C513.885 1985.58 513.623 1985.53 513.338 1985.53C512.666 1985.53 512.152 1985.75 511.797 1986.17C511.441 1986.59 511.264 1987.2 511.264 1988V1991.26H510.18V1984.7H511.264V1985.98C511.443 1985.51 511.719 1985.16 512.09 1984.91C512.465 1984.66 512.908 1984.54 513.42 1984.54C513.686 1984.54 513.934 1984.57 514.164 1984.64C514.395 1984.7 514.615 1984.81 514.826 1984.95V1986.05ZM517.141 1984.72H519.9V1990.42H522.039V1991.26H516.684V1990.42H518.822V1985.56H517.141V1984.72ZM518.822 1982.17H519.9V1983.53H518.822V1982.17ZM527.547 1985.53V1982.14H528.625V1991.26H527.547V1990.43C527.367 1990.76 527.127 1991.01 526.826 1991.18C526.529 1991.34 526.186 1991.43 525.795 1991.43C525.002 1991.43 524.377 1991.12 523.92 1990.51C523.467 1989.89 523.24 1989.04 523.24 1987.96C523.24 1986.89 523.469 1986.06 523.926 1985.45C524.383 1984.84 525.006 1984.54 525.795 1984.54C526.189 1984.54 526.537 1984.62 526.838 1984.8C527.139 1984.96 527.375 1985.21 527.547 1985.53ZM524.377 1987.98C524.377 1988.82 524.51 1989.45 524.775 1989.88C525.041 1990.3 525.434 1990.51 525.953 1990.51C526.473 1990.51 526.867 1990.3 527.137 1989.87C527.41 1989.44 527.547 1988.81 527.547 1987.98C527.547 1987.15 527.41 1986.52 527.137 1986.1C526.867 1985.67 526.473 1985.45 525.953 1985.45C525.434 1985.45 525.041 1985.67 524.775 1986.09C524.51 1986.52 524.377 1987.15 524.377 1987.98ZM541.193 1988.89C541.193 1989.37 541.281 1989.74 541.457 1989.98C541.637 1990.23 541.9 1990.35 542.248 1990.35H543.508V1991.26H542.143C541.498 1991.26 540.998 1991.05 540.643 1990.64C540.291 1990.23 540.115 1989.64 540.115 1988.89V1982.95H538.387V1982.11H541.193V1988.89ZM548.324 1987.96H547.967C547.338 1987.96 546.863 1988.07 546.543 1988.29C546.227 1988.51 546.068 1988.84 546.068 1989.28C546.068 1989.67 546.188 1989.98 546.426 1990.2C546.664 1990.42 546.994 1990.53 547.416 1990.53C548.01 1990.53 548.477 1990.32 548.816 1989.91C549.156 1989.5 549.328 1988.93 549.332 1988.2V1987.96H548.324ZM550.416 1987.51V1991.26H549.332V1990.29C549.102 1990.68 548.811 1990.97 548.459 1991.15C548.111 1991.34 547.688 1991.43 547.188 1991.43C546.52 1991.43 545.986 1991.24 545.588 1990.87C545.189 1990.49 544.99 1989.98 544.99 1989.35C544.99 1988.62 545.234 1988.06 545.723 1987.68C546.215 1987.31 546.936 1987.12 547.885 1987.12H549.332V1986.95C549.328 1986.42 549.195 1986.04 548.934 1985.81C548.672 1985.57 548.254 1985.45 547.68 1985.45C547.312 1985.45 546.941 1985.51 546.566 1985.61C546.191 1985.72 545.826 1985.87 545.471 1986.07V1985C545.869 1984.84 546.25 1984.73 546.613 1984.66C546.98 1984.58 547.336 1984.54 547.68 1984.54C548.223 1984.54 548.686 1984.62 549.068 1984.78C549.455 1984.94 549.768 1985.18 550.006 1985.5C550.154 1985.69 550.26 1985.94 550.322 1986.23C550.385 1986.51 550.416 1986.94 550.416 1987.51ZM556.469 1989.15C556.289 1989.61 556.061 1990.21 555.783 1990.95C555.396 1991.99 555.137 1992.61 555.004 1992.84C554.824 1993.15 554.6 1993.37 554.33 1993.53C554.061 1993.68 553.746 1993.76 553.387 1993.76H552.52V1992.85H553.158C553.475 1992.85 553.723 1992.76 553.902 1992.58C554.082 1992.39 554.311 1991.92 554.588 1991.15L552.051 1984.7H553.193L555.139 1989.83L557.055 1984.7H558.197L556.469 1989.15ZM562.281 1985.45C561.734 1985.45 561.32 1985.67 561.039 1986.09C560.758 1986.52 560.617 1987.15 560.617 1987.98C560.617 1988.82 560.758 1989.45 561.039 1989.88C561.32 1990.3 561.734 1990.51 562.281 1990.51C562.832 1990.51 563.248 1990.3 563.529 1989.88C563.811 1989.45 563.951 1988.82 563.951 1987.98C563.951 1987.15 563.811 1986.52 563.529 1986.09C563.248 1985.67 562.832 1985.45 562.281 1985.45ZM562.281 1984.54C563.191 1984.54 563.887 1984.83 564.367 1985.42C564.852 1986.01 565.094 1986.87 565.094 1987.98C565.094 1989.1 564.854 1989.96 564.373 1990.55C563.893 1991.14 563.195 1991.43 562.281 1991.43C561.371 1991.43 560.676 1991.14 560.195 1990.55C559.715 1989.96 559.475 1989.1 559.475 1987.98C559.475 1986.87 559.715 1986.01 560.195 1985.42C560.676 1984.83 561.371 1984.54 562.281 1984.54ZM567.045 1988.77V1984.71H568.123V1988.77C568.123 1989.36 568.227 1989.8 568.434 1990.08C568.645 1990.35 568.969 1990.49 569.406 1990.49C569.914 1990.49 570.303 1990.31 570.572 1989.96C570.842 1989.6 570.977 1989.09 570.977 1988.42V1984.71H572.061V1991.26H570.977V1990.27C570.785 1990.65 570.523 1990.94 570.191 1991.14C569.863 1991.33 569.479 1991.43 569.037 1991.43C568.365 1991.43 567.865 1991.21 567.537 1990.77C567.209 1990.33 567.045 1989.67 567.045 1988.77ZM576.73 1982.83V1984.7H579.18V1985.53H576.73V1989.1C576.73 1989.58 576.822 1989.92 577.006 1990.11C577.189 1990.3 577.51 1990.4 577.967 1990.4H579.18V1991.26H577.861C577.053 1991.26 576.482 1991.1 576.15 1990.77C575.818 1990.45 575.652 1989.89 575.652 1989.1V1985.53H573.9V1984.7H575.652V1982.83H576.73ZM586.064 1984.92V1985.98C585.756 1985.8 585.445 1985.67 585.133 1985.58C584.82 1985.49 584.502 1985.44 584.178 1985.44C583.689 1985.44 583.324 1985.52 583.082 1985.68C582.844 1985.84 582.725 1986.08 582.725 1986.4C582.725 1986.69 582.814 1986.91 582.994 1987.06C583.174 1987.2 583.621 1987.34 584.336 1987.48L584.77 1987.56C585.305 1987.66 585.709 1987.87 585.982 1988.17C586.26 1988.48 586.398 1988.87 586.398 1989.36C586.398 1990.01 586.168 1990.52 585.707 1990.88C585.246 1991.25 584.605 1991.43 583.785 1991.43C583.461 1991.43 583.121 1991.39 582.766 1991.32C582.41 1991.26 582.025 1991.16 581.611 1991.02V1989.91C582.014 1990.11 582.398 1990.27 582.766 1990.37C583.133 1990.48 583.48 1990.53 583.809 1990.53C584.285 1990.53 584.654 1990.43 584.916 1990.24C585.178 1990.04 585.309 1989.77 585.309 1989.42C585.309 1988.92 584.83 1988.58 583.873 1988.39L583.826 1988.38L583.422 1988.29C582.801 1988.17 582.348 1987.97 582.062 1987.68C581.777 1987.4 581.635 1987 581.635 1986.51C581.635 1985.88 581.848 1985.39 582.273 1985.05C582.699 1984.71 583.307 1984.54 584.096 1984.54C584.447 1984.54 584.785 1984.57 585.109 1984.64C585.434 1984.7 585.752 1984.8 586.064 1984.92ZM593.131 1982.19V1985.78H591.818V1982.19H593.131ZM590.008 1982.19V1985.78H588.695V1982.19H590.008ZM209.916 2000.19V2003.78H208.604V2000.19H209.916ZM206.793 2000.19V2003.78H205.48V2000.19H206.793ZM216.818 2000.51H217.932L213.326 2010.37H212.207L216.818 2000.51ZM220.691 2002.72H223.451V2008.42H225.59V2009.26H220.234V2008.42H222.373V2003.56H220.691V2002.72ZM222.373 2000.17H223.451V2001.53H222.373V2000.17ZM230.031 2003.36C230.164 2003.08 230.332 2002.88 230.535 2002.74C230.742 2002.61 230.99 2002.54 231.279 2002.54C231.807 2002.54 232.178 2002.74 232.393 2003.15C232.611 2003.56 232.721 2004.33 232.721 2005.46V2009.26H231.736V2005.5C231.736 2004.58 231.684 2004 231.578 2003.78C231.477 2003.55 231.289 2003.44 231.016 2003.44C230.703 2003.44 230.488 2003.56 230.371 2003.8C230.258 2004.04 230.201 2004.61 230.201 2005.5V2009.26H229.217V2005.5C229.217 2004.57 229.16 2003.99 229.047 2003.77C228.938 2003.55 228.738 2003.44 228.449 2003.44C228.164 2003.44 227.965 2003.56 227.852 2003.8C227.742 2004.04 227.688 2004.61 227.688 2005.5V2009.26H226.709V2002.7H227.688V2003.26C227.816 2003.02 227.977 2002.85 228.168 2002.73C228.363 2002.6 228.584 2002.54 228.83 2002.54C229.127 2002.54 229.373 2002.61 229.568 2002.74C229.768 2002.88 229.922 2003.09 230.031 2003.36ZM237.414 2005.96H237.057C236.428 2005.96 235.953 2006.07 235.633 2006.29C235.316 2006.51 235.158 2006.84 235.158 2007.28C235.158 2007.67 235.277 2007.98 235.516 2008.2C235.754 2008.42 236.084 2008.53 236.506 2008.53C237.1 2008.53 237.566 2008.32 237.906 2007.91C238.246 2007.5 238.418 2006.93 238.422 2006.2V2005.96H237.414ZM239.506 2005.51V2009.26H238.422V2008.29C238.191 2008.68 237.9 2008.97 237.549 2009.15C237.201 2009.34 236.777 2009.43 236.277 2009.43C235.609 2009.43 235.076 2009.24 234.678 2008.87C234.279 2008.49 234.08 2007.98 234.08 2007.35C234.08 2006.62 234.324 2006.06 234.812 2005.68C235.305 2005.31 236.025 2005.12 236.975 2005.12H238.422V2004.95C238.418 2004.42 238.285 2004.04 238.023 2003.81C237.762 2003.57 237.344 2003.45 236.77 2003.45C236.402 2003.45 236.031 2003.51 235.656 2003.61C235.281 2003.72 234.916 2003.87 234.561 2004.07V2003C234.959 2002.84 235.34 2002.73 235.703 2002.66C236.07 2002.58 236.426 2002.54 236.77 2002.54C237.312 2002.54 237.775 2002.62 238.158 2002.78C238.545 2002.94 238.857 2003.18 239.096 2003.5C239.244 2003.69 239.35 2003.94 239.412 2004.23C239.475 2004.51 239.506 2004.94 239.506 2005.51ZM245.559 2005.92C245.559 2005.12 245.426 2004.5 245.16 2004.09C244.898 2003.66 244.516 2003.45 244.012 2003.45C243.484 2003.45 243.082 2003.66 242.805 2004.09C242.527 2004.5 242.389 2005.12 242.389 2005.92C242.389 2006.73 242.527 2007.35 242.805 2007.78C243.086 2008.2 243.492 2008.41 244.023 2008.41C244.52 2008.41 244.898 2008.2 245.16 2007.77C245.426 2007.34 245.559 2006.73 245.559 2005.92ZM246.637 2008.84C246.637 2009.82 246.404 2010.57 245.939 2011.08C245.475 2011.58 244.791 2011.84 243.889 2011.84C243.592 2011.84 243.281 2011.81 242.957 2011.76C242.633 2011.7 242.309 2011.62 241.984 2011.51V2010.45C242.367 2010.63 242.715 2010.76 243.027 2010.85C243.34 2010.93 243.627 2010.98 243.889 2010.98C244.471 2010.98 244.895 2010.82 245.16 2010.5C245.426 2010.18 245.559 2009.68 245.559 2009V2008.95V2008.22C245.387 2008.58 245.152 2008.86 244.855 2009.04C244.559 2009.22 244.197 2009.31 243.771 2009.31C243.006 2009.31 242.395 2009 241.938 2008.39C241.48 2007.77 241.252 2006.95 241.252 2005.92C241.252 2004.89 241.48 2004.07 241.938 2003.46C242.395 2002.84 243.006 2002.54 243.771 2002.54C244.193 2002.54 244.551 2002.62 244.844 2002.79C245.137 2002.96 245.375 2003.22 245.559 2003.57V2002.72H246.637V2008.84ZM254.324 2005.44V2005.97H249.654V2006C249.623 2006.9 249.793 2007.54 250.164 2007.93C250.539 2008.32 251.066 2008.51 251.746 2008.51C252.09 2008.51 252.449 2008.46 252.824 2008.35C253.199 2008.24 253.6 2008.08 254.025 2007.85V2008.92C253.615 2009.09 253.219 2009.22 252.836 2009.3C252.457 2009.39 252.09 2009.43 251.734 2009.43C250.715 2009.43 249.918 2009.12 249.344 2008.51C248.77 2007.9 248.482 2007.06 248.482 2005.98C248.482 2004.94 248.764 2004.1 249.326 2003.48C249.889 2002.85 250.639 2002.54 251.576 2002.54C252.412 2002.54 253.07 2002.82 253.551 2003.39C254.035 2003.95 254.293 2004.64 254.324 2005.44ZM253.246 2005.12C253.199 2004.67 253.033 2004.28 252.748 2003.95C252.467 2003.62 252.061 2003.45 251.529 2003.45C251.01 2003.45 250.582 2003.62 250.246 2003.97C249.91 2004.31 249.727 2004.7 249.695 2005.13L253.246 2005.12ZM260.693 2002.92V2003.98C260.385 2003.8 260.074 2003.67 259.762 2003.58C259.449 2003.49 259.131 2003.44 258.807 2003.44C258.318 2003.44 257.953 2003.52 257.711 2003.68C257.473 2003.84 257.354 2004.08 257.354 2004.4C257.354 2004.69 257.443 2004.91 257.623 2005.06C257.803 2005.2 258.25 2005.34 258.965 2005.48L259.398 2005.56C259.934 2005.66 260.338 2005.87 260.611 2006.17C260.889 2006.48 261.027 2006.87 261.027 2007.36C261.027 2008.01 260.797 2008.52 260.336 2008.88C259.875 2009.25 259.234 2009.43 258.414 2009.43C258.09 2009.43 257.75 2009.39 257.395 2009.32C257.039 2009.26 256.654 2009.16 256.24 2009.02V2007.91C256.643 2008.11 257.027 2008.27 257.395 2008.37C257.762 2008.48 258.109 2008.53 258.438 2008.53C258.914 2008.53 259.283 2008.43 259.545 2008.24C259.807 2008.04 259.938 2007.77 259.938 2007.42C259.938 2006.92 259.459 2006.58 258.502 2006.39L258.455 2006.38L258.051 2006.29C257.43 2006.17 256.977 2005.97 256.691 2005.68C256.406 2005.4 256.264 2005 256.264 2004.51C256.264 2003.88 256.477 2003.39 256.902 2003.05C257.328 2002.71 257.936 2002.54 258.725 2002.54C259.076 2002.54 259.414 2002.57 259.738 2002.64C260.062 2002.7 260.381 2002.8 260.693 2002.92ZM267.432 2000.51H268.545L263.939 2010.37H262.82L267.432 2000.51ZM274.48 2005.92C274.48 2005.12 274.348 2004.5 274.082 2004.09C273.82 2003.66 273.438 2003.45 272.934 2003.45C272.406 2003.45 272.004 2003.66 271.727 2004.09C271.449 2004.5 271.311 2005.12 271.311 2005.92C271.311 2006.73 271.449 2007.35 271.727 2007.78C272.008 2008.2 272.414 2008.41 272.945 2008.41C273.441 2008.41 273.82 2008.2 274.082 2007.77C274.348 2007.34 274.48 2006.73 274.48 2005.92ZM275.559 2008.84C275.559 2009.82 275.326 2010.57 274.861 2011.08C274.396 2011.58 273.713 2011.84 272.811 2011.84C272.514 2011.84 272.203 2011.81 271.879 2011.76C271.555 2011.7 271.23 2011.62 270.906 2011.51V2010.45C271.289 2010.63 271.637 2010.76 271.949 2010.85C272.262 2010.93 272.549 2010.98 272.811 2010.98C273.393 2010.98 273.816 2010.82 274.082 2010.5C274.348 2010.18 274.48 2009.68 274.48 2009V2008.95V2008.22C274.309 2008.58 274.074 2008.86 273.777 2009.04C273.48 2009.22 273.119 2009.31 272.693 2009.31C271.928 2009.31 271.316 2009 270.859 2008.39C270.402 2007.77 270.174 2006.95 270.174 2005.92C270.174 2004.89 270.402 2004.07 270.859 2003.46C271.316 2002.84 271.928 2002.54 272.693 2002.54C273.115 2002.54 273.473 2002.62 273.766 2002.79C274.059 2002.96 274.297 2003.22 274.48 2003.57V2002.72H275.559V2008.84ZM283.451 2004.05C283.221 2003.87 282.986 2003.74 282.748 2003.66C282.51 2003.58 282.248 2003.53 281.963 2003.53C281.291 2003.53 280.777 2003.75 280.422 2004.17C280.066 2004.59 279.889 2005.2 279.889 2006V2009.26H278.805V2002.7H279.889V2003.98C280.068 2003.51 280.344 2003.16 280.715 2002.91C281.09 2002.66 281.533 2002.54 282.045 2002.54C282.311 2002.54 282.559 2002.57 282.789 2002.64C283.02 2002.7 283.24 2002.81 283.451 2002.95V2004.05ZM285.766 2002.72H288.525V2008.42H290.664V2009.26H285.309V2008.42H287.447V2003.56H285.766V2002.72ZM287.447 2000.17H288.525V2001.53H287.447V2000.17ZM296.172 2003.53V2000.14H297.25V2009.26H296.172V2008.43C295.992 2008.76 295.752 2009.01 295.451 2009.18C295.154 2009.34 294.811 2009.43 294.42 2009.43C293.627 2009.43 293.002 2009.12 292.545 2008.51C292.092 2007.89 291.865 2007.04 291.865 2005.96C291.865 2004.89 292.094 2004.06 292.551 2003.45C293.008 2002.84 293.631 2002.54 294.42 2002.54C294.814 2002.54 295.162 2002.62 295.463 2002.8C295.764 2002.96 296 2003.21 296.172 2003.53ZM293.002 2005.98C293.002 2006.82 293.135 2007.45 293.4 2007.88C293.666 2008.3 294.059 2008.51 294.578 2008.51C295.098 2008.51 295.492 2008.3 295.762 2007.87C296.035 2007.44 296.172 2006.81 296.172 2005.98C296.172 2005.15 296.035 2004.52 295.762 2004.1C295.492 2003.67 295.098 2003.45 294.578 2003.45C294.059 2003.45 293.666 2003.67 293.4 2004.09C293.135 2004.52 293.002 2005.15 293.002 2005.98ZM298.973 2005.02H305.184V2006.01H298.973V2005.02ZM307.803 2008.43V2011.76H306.719V2002.7H307.803V2003.53C307.982 2003.21 308.221 2002.96 308.518 2002.8C308.818 2002.62 309.164 2002.54 309.555 2002.54C310.348 2002.54 310.969 2002.84 311.418 2003.46C311.871 2004.07 312.098 2004.92 312.098 2006.01C312.098 2007.07 311.871 2007.91 311.418 2008.52C310.965 2009.13 310.344 2009.43 309.555 2009.43C309.156 2009.43 308.807 2009.34 308.506 2009.18C308.209 2009.01 307.975 2008.76 307.803 2008.43ZM310.967 2005.98C310.967 2005.15 310.834 2004.52 310.568 2004.09C310.307 2003.67 309.916 2003.45 309.396 2003.45C308.873 2003.45 308.477 2003.67 308.207 2004.1C307.938 2004.52 307.803 2005.15 307.803 2005.98C307.803 2006.81 307.938 2007.44 308.207 2007.87C308.477 2008.3 308.873 2008.51 309.396 2008.51C309.916 2008.51 310.307 2008.3 310.568 2007.88C310.834 2007.45 310.967 2006.82 310.967 2005.98ZM317.049 2006.89C317.049 2007.37 317.137 2007.74 317.312 2007.98C317.492 2008.23 317.756 2008.35 318.104 2008.35H319.363V2009.26H317.998C317.354 2009.26 316.854 2009.05 316.498 2008.64C316.146 2008.23 315.971 2007.64 315.971 2006.89V2000.95H314.242V2000.11H317.049V2006.89ZM324.18 2005.96H323.822C323.193 2005.96 322.719 2006.07 322.398 2006.29C322.082 2006.51 321.924 2006.84 321.924 2007.28C321.924 2007.67 322.043 2007.98 322.281 2008.2C322.52 2008.42 322.85 2008.53 323.271 2008.53C323.865 2008.53 324.332 2008.32 324.672 2007.91C325.012 2007.5 325.184 2006.93 325.188 2006.2V2005.96H324.18ZM326.271 2005.51V2009.26H325.188V2008.29C324.957 2008.68 324.666 2008.97 324.314 2009.15C323.967 2009.34 323.543 2009.43 323.043 2009.43C322.375 2009.43 321.842 2009.24 321.443 2008.87C321.045 2008.49 320.846 2007.98 320.846 2007.35C320.846 2006.62 321.09 2006.06 321.578 2005.68C322.07 2005.31 322.791 2005.12 323.74 2005.12H325.188V2004.95C325.184 2004.42 325.051 2004.04 324.789 2003.81C324.527 2003.57 324.109 2003.45 323.535 2003.45C323.168 2003.45 322.797 2003.51 322.422 2003.61C322.047 2003.72 321.682 2003.87 321.326 2004.07V2003C321.725 2002.84 322.105 2002.73 322.469 2002.66C322.836 2002.58 323.191 2002.54 323.535 2002.54C324.078 2002.54 324.541 2002.62 324.924 2002.78C325.311 2002.94 325.623 2003.18 325.861 2003.5C326.01 2003.69 326.115 2003.94 326.178 2004.23C326.24 2004.51 326.271 2004.94 326.271 2005.51ZM332.324 2007.15C332.145 2007.61 331.916 2008.21 331.639 2008.95C331.252 2009.99 330.992 2010.61 330.859 2010.84C330.68 2011.15 330.455 2011.37 330.186 2011.53C329.916 2011.68 329.602 2011.76 329.242 2011.76H328.375V2010.85H329.014C329.33 2010.85 329.578 2010.76 329.758 2010.58C329.938 2010.39 330.166 2009.92 330.443 2009.15L327.906 2002.7H329.049L330.994 2007.83L332.91 2002.7H334.053L332.324 2007.15ZM339.555 2005.92C339.555 2005.12 339.422 2004.5 339.156 2004.09C338.895 2003.66 338.512 2003.45 338.008 2003.45C337.48 2003.45 337.078 2003.66 336.801 2004.09C336.523 2004.5 336.385 2005.12 336.385 2005.92C336.385 2006.73 336.523 2007.35 336.801 2007.78C337.082 2008.2 337.488 2008.41 338.02 2008.41C338.516 2008.41 338.895 2008.2 339.156 2007.77C339.422 2007.34 339.555 2006.73 339.555 2005.92ZM340.633 2008.84C340.633 2009.82 340.4 2010.57 339.936 2011.08C339.471 2011.58 338.787 2011.84 337.885 2011.84C337.588 2011.84 337.277 2011.81 336.953 2011.76C336.629 2011.7 336.305 2011.62 335.98 2011.51V2010.45C336.363 2010.63 336.711 2010.76 337.023 2010.85C337.336 2010.93 337.623 2010.98 337.885 2010.98C338.467 2010.98 338.891 2010.82 339.156 2010.5C339.422 2010.18 339.555 2009.68 339.555 2009V2008.95V2008.22C339.383 2008.58 339.148 2008.86 338.852 2009.04C338.555 2009.22 338.193 2009.31 337.768 2009.31C337.002 2009.31 336.391 2009 335.934 2008.39C335.477 2007.77 335.248 2006.95 335.248 2005.92C335.248 2004.89 335.477 2004.07 335.934 2003.46C336.391 2002.84 337.002 2002.54 337.768 2002.54C338.189 2002.54 338.547 2002.62 338.84 2002.79C339.133 2002.96 339.371 2003.22 339.555 2003.57V2002.72H340.633V2008.84ZM348.525 2004.05C348.295 2003.87 348.061 2003.74 347.822 2003.66C347.584 2003.58 347.322 2003.53 347.037 2003.53C346.365 2003.53 345.852 2003.75 345.496 2004.17C345.141 2004.59 344.963 2005.2 344.963 2006V2009.26H343.879V2002.7H344.963V2003.98C345.143 2003.51 345.418 2003.16 345.789 2002.91C346.164 2002.66 346.607 2002.54 347.119 2002.54C347.385 2002.54 347.633 2002.57 347.863 2002.64C348.094 2002.7 348.314 2002.81 348.525 2002.95V2004.05ZM352.598 2003.45C352.051 2003.45 351.637 2003.67 351.355 2004.09C351.074 2004.52 350.934 2005.15 350.934 2005.98C350.934 2006.82 351.074 2007.45 351.355 2007.88C351.637 2008.3 352.051 2008.51 352.598 2008.51C353.148 2008.51 353.564 2008.3 353.846 2007.88C354.127 2007.45 354.268 2006.82 354.268 2005.98C354.268 2005.15 354.127 2004.52 353.846 2004.09C353.564 2003.67 353.148 2003.45 352.598 2003.45ZM352.598 2002.54C353.508 2002.54 354.203 2002.83 354.684 2003.42C355.168 2004.01 355.41 2004.87 355.41 2005.98C355.41 2007.1 355.17 2007.96 354.689 2008.55C354.209 2009.14 353.512 2009.43 352.598 2009.43C351.688 2009.43 350.992 2009.14 350.512 2008.55C350.031 2007.96 349.791 2007.1 349.791 2005.98C349.791 2004.87 350.031 2004.01 350.512 2003.42C350.992 2002.83 351.688 2002.54 352.598 2002.54ZM357.361 2006.77V2002.71H358.439V2006.77C358.439 2007.36 358.543 2007.8 358.75 2008.08C358.961 2008.35 359.285 2008.49 359.723 2008.49C360.23 2008.49 360.619 2008.31 360.889 2007.96C361.158 2007.6 361.293 2007.09 361.293 2006.42V2002.71H362.377V2009.26H361.293V2008.27C361.102 2008.65 360.84 2008.94 360.508 2009.14C360.18 2009.33 359.795 2009.43 359.354 2009.43C358.682 2009.43 358.182 2009.21 357.854 2008.77C357.525 2008.33 357.361 2007.67 357.361 2006.77ZM369.607 2005.19V2009.26H368.523V2005.19C368.523 2004.6 368.42 2004.17 368.213 2003.89C368.006 2003.61 367.682 2003.48 367.24 2003.48C366.736 2003.48 366.348 2003.66 366.074 2004.01C365.805 2004.37 365.67 2004.88 365.67 2005.55V2009.26H364.592V2002.7H365.67V2003.68C365.861 2003.31 366.121 2003.02 366.449 2002.83C366.777 2002.64 367.166 2002.54 367.615 2002.54C368.283 2002.54 368.781 2002.76 369.109 2003.2C369.441 2003.64 369.607 2004.3 369.607 2005.19ZM375.707 2003.53V2000.14H376.785V2009.26H375.707V2008.43C375.527 2008.76 375.287 2009.01 374.986 2009.18C374.689 2009.34 374.346 2009.43 373.955 2009.43C373.162 2009.43 372.537 2009.12 372.08 2008.51C371.627 2007.89 371.4 2007.04 371.4 2005.96C371.4 2004.89 371.629 2004.06 372.086 2003.45C372.543 2002.84 373.166 2002.54 373.955 2002.54C374.35 2002.54 374.697 2002.62 374.998 2002.8C375.299 2002.96 375.535 2003.21 375.707 2003.53ZM372.537 2005.98C372.537 2006.82 372.67 2007.45 372.936 2007.88C373.201 2008.3 373.594 2008.51 374.113 2008.51C374.633 2008.51 375.027 2008.3 375.297 2007.87C375.57 2007.44 375.707 2006.81 375.707 2005.98C375.707 2005.15 375.57 2004.52 375.297 2004.1C375.027 2003.67 374.633 2003.45 374.113 2003.45C373.594 2003.45 373.201 2003.67 372.936 2004.09C372.67 2004.52 372.537 2005.15 372.537 2005.98ZM380.189 2006.89H382.252V2009.26H380.189V2006.89ZM387.338 2008.43V2011.76H386.254V2002.7H387.338V2003.53C387.518 2003.21 387.756 2002.96 388.053 2002.8C388.354 2002.62 388.699 2002.54 389.09 2002.54C389.883 2002.54 390.504 2002.84 390.953 2003.46C391.406 2004.07 391.633 2004.92 391.633 2006.01C391.633 2007.07 391.406 2007.91 390.953 2008.52C390.5 2009.13 389.879 2009.43 389.09 2009.43C388.691 2009.43 388.342 2009.34 388.041 2009.18C387.744 2009.01 387.51 2008.76 387.338 2008.43ZM390.502 2005.98C390.502 2005.15 390.369 2004.52 390.104 2004.09C389.842 2003.67 389.451 2003.45 388.932 2003.45C388.408 2003.45 388.012 2003.67 387.742 2004.1C387.473 2004.52 387.338 2005.15 387.338 2005.98C387.338 2006.81 387.473 2007.44 387.742 2007.87C388.012 2008.3 388.408 2008.51 388.932 2008.51C389.451 2008.51 389.842 2008.3 390.104 2007.88C390.369 2007.45 390.502 2006.82 390.502 2005.98ZM398.529 2005.19V2009.26H397.445V2005.19C397.445 2004.6 397.342 2004.17 397.135 2003.89C396.928 2003.61 396.604 2003.48 396.162 2003.48C395.658 2003.48 395.27 2003.66 394.996 2004.01C394.727 2004.37 394.592 2004.88 394.592 2005.55V2009.26H393.514V2002.7H394.592V2003.68C394.783 2003.31 395.043 2003.02 395.371 2002.83C395.699 2002.64 396.088 2002.54 396.537 2002.54C397.205 2002.54 397.703 2002.76 398.031 2003.2C398.363 2003.64 398.529 2004.3 398.529 2005.19ZM404.629 2005.92C404.629 2005.12 404.496 2004.5 404.23 2004.09C403.969 2003.66 403.586 2003.45 403.082 2003.45C402.555 2003.45 402.152 2003.66 401.875 2004.09C401.598 2004.5 401.459 2005.12 401.459 2005.92C401.459 2006.73 401.598 2007.35 401.875 2007.78C402.156 2008.2 402.562 2008.41 403.094 2008.41C403.59 2008.41 403.969 2008.2 404.23 2007.77C404.496 2007.34 404.629 2006.73 404.629 2005.92ZM405.707 2008.84C405.707 2009.82 405.475 2010.57 405.01 2011.08C404.545 2011.58 403.861 2011.84 402.959 2011.84C402.662 2011.84 402.352 2011.81 402.027 2011.76C401.703 2011.7 401.379 2011.62 401.055 2011.51V2010.45C401.438 2010.63 401.785 2010.76 402.098 2010.85C402.41 2010.93 402.697 2010.98 402.959 2010.98C403.541 2010.98 403.965 2010.82 404.23 2010.5C404.496 2010.18 404.629 2009.68 404.629 2009V2008.95V2008.22C404.457 2008.58 404.223 2008.86 403.926 2009.04C403.629 2009.22 403.268 2009.31 402.842 2009.31C402.076 2009.31 401.465 2009 401.008 2008.39C400.551 2007.77 400.322 2006.95 400.322 2005.92C400.322 2004.89 400.551 2004.07 401.008 2003.46C401.465 2002.84 402.076 2002.54 402.842 2002.54C403.264 2002.54 403.621 2002.62 403.914 2002.79C404.207 2002.96 404.445 2003.22 404.629 2003.57V2002.72H405.707V2008.84ZM412.369 2000.19V2003.78H411.057V2000.19H412.369ZM409.246 2000.19V2003.78H407.934V2000.19H409.246Z" fill="#CE9178" />
+                      <path d="M68.8516 166.72H71.6113V172.421H73.75V173.259H68.3945V172.421H70.5332V167.558H68.8516V166.72ZM70.5332 164.171H71.6113V165.53H70.5332V164.171ZM80.3887 169.193V173.259H79.3047V169.193C79.3047 168.603 79.2012 168.169 78.9941 167.892C78.7871 167.614 78.4629 167.476 78.0215 167.476C77.5176 167.476 77.1289 167.655 76.8555 168.015C76.5859 168.37 76.4512 168.882 76.4512 169.55V173.259H75.373V166.696H76.4512V167.681C76.6426 167.306 76.9023 167.023 77.2305 166.831C77.5586 166.636 77.9473 166.538 78.3965 166.538C79.0645 166.538 79.5625 166.759 79.8906 167.2C80.2227 167.638 80.3887 168.302 80.3887 169.193ZM85.0586 164.833V166.696H87.5078V167.534H85.0586V171.097C85.0586 171.581 85.1504 171.919 85.334 172.11C85.5176 172.302 85.8379 172.398 86.2949 172.398H87.5078V173.259H86.1895C85.3809 173.259 84.8105 173.097 84.4785 172.773C84.1465 172.448 83.9805 171.89 83.9805 171.097V167.534H82.2285V166.696H83.9805V164.833H85.0586ZM95.2539 169.439V169.966H90.584V170.001C90.5527 170.896 90.7227 171.538 91.0938 171.929C91.4688 172.319 91.9961 172.515 92.6758 172.515C93.0195 172.515 93.3789 172.46 93.7539 172.351C94.1289 172.241 94.5293 172.075 94.9551 171.853V172.925C94.5449 173.093 94.1484 173.218 93.7656 173.3C93.3867 173.386 93.0195 173.429 92.6641 173.429C91.6445 173.429 90.8477 173.124 90.2734 172.515C89.6992 171.901 89.4121 171.058 89.4121 169.984C89.4121 168.937 89.6934 168.101 90.2559 167.476C90.8184 166.851 91.5684 166.538 92.5059 166.538C93.3418 166.538 94 166.821 94.4805 167.388C94.9648 167.954 95.2227 168.638 95.2539 169.439ZM94.1758 169.122C94.1289 168.669 93.9629 168.278 93.6777 167.95C93.3965 167.618 92.9902 167.452 92.459 167.452C91.9395 167.452 91.5117 167.624 91.1758 167.968C90.8398 168.312 90.6562 168.698 90.625 169.128L94.1758 169.122ZM102.689 168.05C102.459 167.87 102.225 167.739 101.986 167.657C101.748 167.575 101.486 167.534 101.201 167.534C100.529 167.534 100.016 167.745 99.6602 168.167C99.3047 168.589 99.127 169.198 99.127 169.995V173.259H98.043V166.696H99.127V167.98C99.3066 167.515 99.582 167.159 99.9531 166.913C100.328 166.663 100.771 166.538 101.283 166.538C101.549 166.538 101.797 166.571 102.027 166.638C102.258 166.704 102.479 166.808 102.689 166.948V168.05ZM109.381 164.142V165.038H108.156C107.77 165.038 107.5 165.118 107.348 165.278C107.199 165.435 107.125 165.714 107.125 166.116V166.696H109.381V167.534H107.125V173.259H106.047V167.534H104.295V166.696H106.047V166.239C106.047 165.521 106.211 164.991 106.539 164.651C106.871 164.312 107.387 164.142 108.086 164.142H109.381ZM114.496 169.96H114.139C113.51 169.96 113.035 170.071 112.715 170.294C112.398 170.513 112.24 170.841 112.24 171.278C112.24 171.673 112.359 171.98 112.598 172.198C112.836 172.417 113.166 172.526 113.588 172.526C114.182 172.526 114.648 172.321 114.988 171.911C115.328 171.497 115.5 170.927 115.504 170.2V169.96H114.496ZM116.588 169.515V173.259H115.504V172.286C115.273 172.677 114.982 172.966 114.631 173.153C114.283 173.337 113.859 173.429 113.359 173.429C112.691 173.429 112.158 173.241 111.76 172.866C111.361 172.487 111.162 171.982 111.162 171.349C111.162 170.618 111.406 170.064 111.895 169.685C112.387 169.306 113.107 169.116 114.057 169.116H115.504V168.946C115.5 168.423 115.367 168.044 115.105 167.81C114.844 167.571 114.426 167.452 113.852 167.452C113.484 167.452 113.113 167.505 112.738 167.61C112.363 167.716 111.998 167.87 111.643 168.073V166.995C112.041 166.843 112.422 166.73 112.785 166.655C113.152 166.577 113.508 166.538 113.852 166.538C114.395 166.538 114.857 166.618 115.24 166.778C115.627 166.939 115.939 167.179 116.178 167.499C116.326 167.694 116.432 167.937 116.494 168.226C116.557 168.511 116.588 168.941 116.588 169.515ZM123.83 172.925C123.541 173.093 123.242 173.218 122.934 173.3C122.629 173.386 122.316 173.429 121.996 173.429C120.98 173.429 120.186 173.124 119.611 172.515C119.041 171.905 118.756 171.062 118.756 169.984C118.756 168.905 119.041 168.062 119.611 167.452C120.186 166.843 120.98 166.538 121.996 166.538C122.312 166.538 122.621 166.579 122.922 166.661C123.223 166.743 123.525 166.87 123.83 167.042V168.173C123.545 167.919 123.258 167.735 122.969 167.622C122.684 167.509 122.359 167.452 121.996 167.452C121.32 167.452 120.801 167.671 120.438 168.109C120.074 168.546 119.893 169.171 119.893 169.984C119.893 170.792 120.074 171.417 120.438 171.859C120.805 172.296 121.324 172.515 121.996 172.515C122.371 172.515 122.707 172.458 123.004 172.345C123.301 172.228 123.576 172.048 123.83 171.806V172.925ZM131.406 169.439V169.966H126.736V170.001C126.705 170.896 126.875 171.538 127.246 171.929C127.621 172.319 128.148 172.515 128.828 172.515C129.172 172.515 129.531 172.46 129.906 172.351C130.281 172.241 130.682 172.075 131.107 171.853V172.925C130.697 173.093 130.301 173.218 129.918 173.3C129.539 173.386 129.172 173.429 128.816 173.429C127.797 173.429 127 173.124 126.426 172.515C125.852 171.901 125.564 171.058 125.564 169.984C125.564 168.937 125.846 168.101 126.408 167.476C126.971 166.851 127.721 166.538 128.658 166.538C129.494 166.538 130.152 166.821 130.633 167.388C131.117 167.954 131.375 168.638 131.406 169.439ZM130.328 169.122C130.281 168.669 130.115 168.278 129.83 167.95C129.549 167.618 129.143 167.452 128.611 167.452C128.092 167.452 127.664 167.624 127.328 167.968C126.992 168.312 126.809 168.698 126.777 169.128L130.328 169.122ZM73.2168 298.925C72.9277 299.093 72.6289 299.218 72.3203 299.3C72.0156 299.386 71.7031 299.429 71.3828 299.429C70.3672 299.429 69.5723 299.124 68.998 298.515C68.4277 297.905 68.1426 297.062 68.1426 295.984C68.1426 294.905 68.4277 294.062 68.998 293.452C69.5723 292.843 70.3672 292.538 71.3828 292.538C71.6992 292.538 72.0078 292.579 72.3086 292.661C72.6094 292.743 72.9121 292.87 73.2168 293.042V294.173C72.9316 293.919 72.6445 293.735 72.3555 293.622C72.0703 293.509 71.7461 293.452 71.3828 293.452C70.707 293.452 70.1875 293.671 69.8242 294.109C69.4609 294.546 69.2793 295.171 69.2793 295.984C69.2793 296.792 69.4609 297.417 69.8242 297.859C70.1914 298.296 70.7109 298.515 71.3828 298.515C71.7578 298.515 72.0938 298.458 72.3906 298.345C72.6875 298.228 72.9629 298.048 73.2168 297.806V298.925ZM77.8398 293.452C77.293 293.452 76.8789 293.665 76.5977 294.091C76.3164 294.517 76.1758 295.148 76.1758 295.984C76.1758 296.816 76.3164 297.446 76.5977 297.876C76.8789 298.302 77.293 298.515 77.8398 298.515C78.3906 298.515 78.8066 298.302 79.0879 297.876C79.3691 297.446 79.5098 296.816 79.5098 295.984C79.5098 295.148 79.3691 294.517 79.0879 294.091C78.8066 293.665 78.3906 293.452 77.8398 293.452ZM77.8398 292.538C78.75 292.538 79.4453 292.833 79.9258 293.423C80.4102 294.013 80.6523 294.866 80.6523 295.984C80.6523 297.105 80.4121 297.96 79.9316 298.55C79.4512 299.136 78.7539 299.429 77.8398 299.429C76.9297 299.429 76.2344 299.136 75.7539 298.55C75.2734 297.96 75.0332 297.105 75.0332 295.984C75.0332 294.866 75.2734 294.013 75.7539 293.423C76.2344 292.833 76.9297 292.538 77.8398 292.538ZM87.6191 295.193V299.259H86.5352V295.193C86.5352 294.603 86.4316 294.169 86.2246 293.892C86.0176 293.614 85.6934 293.476 85.252 293.476C84.748 293.476 84.3594 293.655 84.0859 294.015C83.8164 294.37 83.6816 294.882 83.6816 295.55V299.259H82.6035V292.696H83.6816V293.681C83.873 293.306 84.1328 293.023 84.4609 292.831C84.7891 292.636 85.1777 292.538 85.627 292.538C86.2949 292.538 86.793 292.759 87.1211 293.2C87.4531 293.638 87.6191 294.302 87.6191 295.193ZM94.3926 292.925V293.98C94.084 293.8 93.7734 293.665 93.4609 293.575C93.1484 293.485 92.8301 293.441 92.5059 293.441C92.0176 293.441 91.6523 293.521 91.4102 293.681C91.1719 293.837 91.0527 294.077 91.0527 294.401C91.0527 294.694 91.1426 294.913 91.3223 295.058C91.502 295.202 91.9492 295.343 92.6641 295.48L93.0977 295.562C93.6328 295.663 94.0371 295.866 94.3105 296.171C94.5879 296.476 94.7266 296.872 94.7266 297.36C94.7266 298.009 94.4961 298.517 94.0352 298.884C93.5742 299.247 92.9336 299.429 92.1133 299.429C91.7891 299.429 91.4492 299.394 91.0938 299.323C90.7383 299.257 90.3535 299.155 89.9395 299.019V297.905C90.3418 298.112 90.7266 298.269 91.0938 298.374C91.4609 298.476 91.8086 298.526 92.1367 298.526C92.6133 298.526 92.9824 298.431 93.2441 298.239C93.5059 298.044 93.6367 297.773 93.6367 297.425C93.6367 296.925 93.1582 296.579 92.2012 296.388L92.1543 296.376L91.75 296.294C91.1289 296.173 90.6758 295.97 90.3906 295.685C90.1055 295.396 89.9629 295.003 89.9629 294.507C89.9629 293.878 90.1758 293.394 90.6016 293.054C91.0273 292.71 91.6348 292.538 92.4238 292.538C92.7754 292.538 93.1133 292.571 93.4375 292.638C93.7617 292.7 94.0801 292.796 94.3926 292.925ZM99.5195 290.833V292.696H101.969V293.534H99.5195V297.097C99.5195 297.581 99.6113 297.919 99.7949 298.11C99.9785 298.302 100.299 298.398 100.756 298.398H101.969V299.259H100.65C99.8418 299.259 99.2715 299.097 98.9395 298.773C98.6074 298.448 98.4414 297.89 98.4414 297.097V293.534H96.6895V292.696H98.4414V290.833H99.5195ZM89.207 386.329H95.4004V387.319H89.207V386.329ZM89.207 383.569H95.4004V384.56H89.207V383.569ZM96.4375 383.628V382.562L102.631 385.011V385.984L96.4375 388.433V387.36L101.418 385.503L96.4375 383.628ZM108.18 419.534V416.142H109.258V425.259H108.18V424.433C108 424.757 107.76 425.005 107.459 425.177C107.162 425.345 106.818 425.429 106.428 425.429C105.635 425.429 105.01 425.122 104.553 424.509C104.1 423.892 103.873 423.042 103.873 421.96C103.873 420.894 104.102 420.058 104.559 419.452C105.016 418.843 105.639 418.538 106.428 418.538C106.822 418.538 107.17 418.624 107.471 418.796C107.771 418.964 108.008 419.21 108.18 419.534ZM105.01 421.984C105.01 422.819 105.143 423.45 105.408 423.876C105.674 424.302 106.066 424.515 106.586 424.515C107.105 424.515 107.5 424.3 107.77 423.87C108.043 423.441 108.18 422.812 108.18 421.984C108.18 421.151 108.043 420.523 107.77 420.097C107.5 419.667 107.105 419.452 106.586 419.452C106.066 419.452 105.674 419.665 105.408 420.091C105.143 420.517 105.01 421.148 105.01 421.984ZM112.234 418.72H114.994V424.421H117.133V425.259H111.777V424.421H113.916V419.558H112.234V418.72ZM113.916 416.171H114.994V417.53H113.916V416.171ZM118.199 418.696H119.318L121.223 424.204L123.133 418.696H124.252L121.92 425.259H120.531L118.199 418.696ZM275.5 443.558V444.401H275.125C274.152 444.401 273.5 444.257 273.168 443.968C272.84 443.679 272.676 443.103 272.676 442.239V441.068C272.676 440.642 272.555 440.275 272.312 439.966C272.074 439.657 271.703 439.503 271.199 439.503H270.484V438.665H271.199C271.75 438.665 272.133 438.534 272.348 438.273C272.566 438.011 272.676 437.626 272.676 437.118V435.595C272.676 434.732 272.84 434.157 273.168 433.872C273.5 433.583 274.152 433.439 275.125 433.439H275.5V434.276H275.09C274.543 434.276 274.186 434.362 274.018 434.534C273.854 434.702 273.771 435.064 273.771 435.618V437.189C273.771 437.876 273.637 438.339 273.367 438.577C273.098 438.812 272.572 438.982 271.791 439.087C272.549 439.177 273.068 439.351 273.35 439.609C273.631 439.862 273.771 440.323 273.771 440.991V442.216C273.771 442.775 273.854 443.138 274.018 443.306C274.186 443.474 274.543 443.558 275.09 443.558H275.5ZM314.529 443.558C315.076 443.558 315.432 443.474 315.596 443.306C315.764 443.138 315.848 442.775 315.848 442.216V440.991C315.848 440.323 315.988 439.862 316.27 439.609C316.551 439.351 317.07 439.177 317.828 439.087C317.047 438.982 316.521 438.812 316.252 438.577C315.982 438.339 315.848 437.876 315.848 437.189V435.618C315.848 435.064 315.764 434.702 315.596 434.534C315.432 434.362 315.076 434.276 314.529 434.276H314.119V433.439H314.494C315.467 433.439 316.117 433.583 316.445 433.872C316.777 434.157 316.943 434.732 316.943 435.595V437.118C316.943 437.626 317.051 438.011 317.266 438.273C317.484 438.534 317.869 438.665 318.42 438.665H319.135V439.503H318.42C317.916 439.503 317.543 439.657 317.301 439.966C317.062 440.275 316.943 440.642 316.943 441.068V442.239C316.943 443.103 316.777 443.679 316.445 443.968C316.117 444.257 315.467 444.401 314.494 444.401H314.119V443.558H314.529ZM470.723 443.558V444.401H470.348C469.375 444.401 468.723 444.257 468.391 443.968C468.062 443.679 467.898 443.103 467.898 442.239V441.068C467.898 440.642 467.777 440.275 467.535 439.966C467.297 439.657 466.926 439.503 466.422 439.503H465.707V438.665H466.422C466.973 438.665 467.355 438.534 467.57 438.273C467.789 438.011 467.898 437.626 467.898 437.118V435.595C467.898 434.732 468.062 434.157 468.391 433.872C468.723 433.583 469.375 433.439 470.348 433.439H470.723V434.276H470.312C469.766 434.276 469.408 434.362 469.24 434.534C469.076 434.702 468.994 435.064 468.994 435.618V437.189C468.994 437.876 468.859 438.339 468.59 438.577C468.32 438.812 467.795 438.982 467.014 439.087C467.771 439.177 468.291 439.351 468.572 439.609C468.854 439.862 468.994 440.323 468.994 440.991V442.216C468.994 442.775 469.076 443.138 469.24 443.306C469.408 443.474 469.766 443.558 470.312 443.558H470.723ZM553.135 443.558C553.682 443.558 554.037 443.474 554.201 443.306C554.369 443.138 554.453 442.775 554.453 442.216V440.991C554.453 440.323 554.594 439.862 554.875 439.609C555.156 439.351 555.676 439.177 556.434 439.087C555.652 438.982 555.127 438.812 554.857 438.577C554.588 438.339 554.453 437.876 554.453 437.189V435.618C554.453 435.064 554.369 434.702 554.201 434.534C554.037 434.362 553.682 434.276 553.135 434.276H552.725V433.439H553.1C554.072 433.439 554.723 433.583 555.051 433.872C555.383 434.157 555.549 434.732 555.549 435.595V437.118C555.549 437.626 555.656 438.011 555.871 438.273C556.09 438.534 556.475 438.665 557.025 438.665H557.74V439.503H557.025C556.521 439.503 556.148 439.657 555.906 439.966C555.668 440.275 555.549 440.642 555.549 441.068V442.239C555.549 443.103 555.383 443.679 555.051 443.968C554.723 444.257 554.072 444.401 553.1 444.401H552.725V443.558H553.135ZM116.43 461.558V462.401H116.055C115.082 462.401 114.43 462.257 114.098 461.968C113.77 461.679 113.605 461.103 113.605 460.239V459.068C113.605 458.642 113.484 458.275 113.242 457.966C113.004 457.657 112.633 457.503 112.129 457.503H111.414V456.665H112.129C112.68 456.665 113.062 456.534 113.277 456.273C113.496 456.011 113.605 455.626 113.605 455.118V453.595C113.605 452.732 113.77 452.157 114.098 451.872C114.43 451.583 115.082 451.439 116.055 451.439H116.43V452.276H116.02C115.473 452.276 115.115 452.362 114.947 452.534C114.783 452.702 114.701 453.064 114.701 453.618V455.189C114.701 455.876 114.566 456.339 114.297 456.577C114.027 456.812 113.502 456.982 112.721 457.087C113.479 457.177 113.998 457.351 114.279 457.609C114.561 457.862 114.701 458.323 114.701 458.991V460.216C114.701 460.775 114.783 461.138 114.947 461.306C115.115 461.474 115.473 461.558 116.02 461.558H116.43ZM306.121 458.329H312.314V459.319H306.121V458.329ZM306.121 455.569H312.314V456.56H306.121V455.569ZM313.352 455.628V454.562L319.545 457.011V457.984L313.352 460.433V459.36L318.332 457.503L313.352 455.628ZM174.273 497.558V498.401H173.898C172.926 498.401 172.273 498.257 171.941 497.968C171.613 497.679 171.449 497.103 171.449 496.239V495.068C171.449 494.642 171.328 494.275 171.086 493.966C170.848 493.657 170.477 493.503 169.973 493.503H169.258V492.665H169.973C170.523 492.665 170.906 492.534 171.121 492.273C171.34 492.011 171.449 491.626 171.449 491.118V489.595C171.449 488.732 171.613 488.157 171.941 487.872C172.273 487.583 172.926 487.439 173.898 487.439H174.273V488.276H173.863C173.316 488.276 172.959 488.362 172.791 488.534C172.627 488.702 172.545 489.064 172.545 489.618V491.189C172.545 491.876 172.41 492.339 172.141 492.577C171.871 492.812 171.346 492.982 170.564 493.087C171.322 493.177 171.842 493.351 172.123 493.609C172.404 493.862 172.545 494.323 172.545 494.991V496.216C172.545 496.775 172.627 497.138 172.791 497.306C172.959 497.474 173.316 497.558 173.863 497.558H174.273ZM213.303 497.558C213.85 497.558 214.205 497.474 214.369 497.306C214.537 497.138 214.621 496.775 214.621 496.216V494.991C214.621 494.323 214.762 493.862 215.043 493.609C215.324 493.351 215.844 493.177 216.602 493.087C215.82 492.982 215.295 492.812 215.025 492.577C214.756 492.339 214.621 491.876 214.621 491.189V489.618C214.621 489.064 214.537 488.702 214.369 488.534C214.205 488.362 213.85 488.276 213.303 488.276H212.893V487.439H213.268C214.24 487.439 214.891 487.583 215.219 487.872C215.551 488.157 215.717 488.732 215.717 489.595V491.118C215.717 491.626 215.824 492.011 216.039 492.273C216.258 492.534 216.643 492.665 217.193 492.665H217.908V493.503H217.193C216.689 493.503 216.316 493.657 216.074 493.966C215.836 494.275 215.717 494.642 215.717 495.068V496.239C215.717 497.103 215.551 497.679 215.219 497.968C214.891 498.257 214.24 498.401 213.268 498.401H212.893V497.558H213.303ZM174.273 515.558V516.401H173.898C172.926 516.401 172.273 516.257 171.941 515.968C171.613 515.679 171.449 515.103 171.449 514.239V513.068C171.449 512.642 171.328 512.275 171.086 511.966C170.848 511.657 170.477 511.503 169.973 511.503H169.258V510.665H169.973C170.523 510.665 170.906 510.534 171.121 510.273C171.34 510.011 171.449 509.626 171.449 509.118V507.595C171.449 506.732 171.613 506.157 171.941 505.872C172.273 505.583 172.926 505.439 173.898 505.439H174.273V506.276H173.863C173.316 506.276 172.959 506.362 172.791 506.534C172.627 506.702 172.545 507.064 172.545 507.618V509.189C172.545 509.876 172.41 510.339 172.141 510.577C171.871 510.812 171.346 510.982 170.564 511.087C171.322 511.177 171.842 511.351 172.123 511.609C172.404 511.862 172.545 512.323 172.545 512.991V514.216C172.545 514.775 172.627 515.138 172.791 515.306C172.959 515.474 173.316 515.558 173.863 515.558H174.273ZM213.303 515.558C213.85 515.558 214.205 515.474 214.369 515.306C214.537 515.138 214.621 514.775 214.621 514.216V512.991C214.621 512.323 214.762 511.862 215.043 511.609C215.324 511.351 215.844 511.177 216.602 511.087C215.82 510.982 215.295 510.812 215.025 510.577C214.756 510.339 214.621 509.876 214.621 509.189V507.618C214.621 507.064 214.537 506.702 214.369 506.534C214.205 506.362 213.85 506.276 213.303 506.276H212.893V505.439H213.268C214.24 505.439 214.891 505.583 215.219 505.872C215.551 506.157 215.717 506.732 215.717 507.595V509.118C215.717 509.626 215.824 510.011 216.039 510.273C216.258 510.534 216.643 510.665 217.193 510.665H217.908V511.503H217.193C216.689 511.503 216.316 511.657 216.074 511.966C215.836 512.275 215.717 512.642 215.717 513.068V514.239C215.717 515.103 215.551 515.679 215.219 515.968C214.891 516.257 214.24 516.401 213.268 516.401H212.893V515.558H213.303ZM174.273 533.558V534.401H173.898C172.926 534.401 172.273 534.257 171.941 533.968C171.613 533.679 171.449 533.103 171.449 532.239V531.068C171.449 530.642 171.328 530.275 171.086 529.966C170.848 529.657 170.477 529.503 169.973 529.503H169.258V528.665H169.973C170.523 528.665 170.906 528.534 171.121 528.273C171.34 528.011 171.449 527.626 171.449 527.118V525.595C171.449 524.732 171.613 524.157 171.941 523.872C172.273 523.583 172.926 523.439 173.898 523.439H174.273V524.276H173.863C173.316 524.276 172.959 524.362 172.791 524.534C172.627 524.702 172.545 525.064 172.545 525.618V527.189C172.545 527.876 172.41 528.339 172.141 528.577C171.871 528.812 171.346 528.982 170.564 529.087C171.322 529.177 171.842 529.351 172.123 529.609C172.404 529.862 172.545 530.323 172.545 530.991V532.216C172.545 532.775 172.627 533.138 172.791 533.306C172.959 533.474 173.316 533.558 173.863 533.558H174.273ZM213.303 533.558C213.85 533.558 214.205 533.474 214.369 533.306C214.537 533.138 214.621 532.775 214.621 532.216V530.991C214.621 530.323 214.762 529.862 215.043 529.609C215.324 529.351 215.844 529.177 216.602 529.087C215.82 528.982 215.295 528.812 215.025 528.577C214.756 528.339 214.621 527.876 214.621 527.189V525.618C214.621 525.064 214.537 524.702 214.369 524.534C214.205 524.362 213.85 524.276 213.303 524.276H212.893V523.439H213.268C214.24 523.439 214.891 523.583 215.219 523.872C215.551 524.157 215.717 524.732 215.717 525.595V527.118C215.717 527.626 215.824 528.011 216.039 528.273C216.258 528.534 216.643 528.665 217.193 528.665H217.908V529.503H217.193C216.689 529.503 216.316 529.657 216.074 529.966C215.836 530.275 215.717 530.642 215.717 531.068V532.239C215.717 533.103 215.551 533.679 215.219 533.968C214.891 534.257 214.24 534.401 213.268 534.401H212.893V533.558H213.303ZM126.537 623.558C127.084 623.558 127.439 623.474 127.604 623.306C127.771 623.138 127.855 622.775 127.855 622.216V620.991C127.855 620.323 127.996 619.862 128.277 619.609C128.559 619.351 129.078 619.177 129.836 619.087C129.055 618.982 128.529 618.812 128.26 618.577C127.99 618.339 127.855 617.876 127.855 617.189V615.618C127.855 615.064 127.771 614.702 127.604 614.534C127.439 614.362 127.084 614.276 126.537 614.276H126.127V613.439H126.502C127.475 613.439 128.125 613.583 128.453 613.872C128.785 614.157 128.951 614.732 128.951 615.595V617.118C128.951 617.626 129.059 618.011 129.273 618.273C129.492 618.534 129.877 618.665 130.428 618.665H131.143V619.503H130.428C129.924 619.503 129.551 619.657 129.309 619.966C129.07 620.275 128.951 620.642 128.951 621.068V622.239C128.951 623.103 128.785 623.679 128.453 623.968C128.125 624.257 127.475 624.401 126.502 624.401H126.127V623.558H126.537ZM115.41 635.534V632.142H116.488V641.259H115.41V640.433C115.23 640.757 114.99 641.005 114.689 641.177C114.393 641.345 114.049 641.429 113.658 641.429C112.865 641.429 112.24 641.122 111.783 640.509C111.33 639.892 111.104 639.042 111.104 637.96C111.104 636.894 111.332 636.058 111.789 635.452C112.246 634.843 112.869 634.538 113.658 634.538C114.053 634.538 114.4 634.624 114.701 634.796C115.002 634.964 115.238 635.21 115.41 635.534ZM112.24 637.984C112.24 638.819 112.373 639.45 112.639 639.876C112.904 640.302 113.297 640.515 113.816 640.515C114.336 640.515 114.73 640.3 115 639.87C115.273 639.441 115.41 638.812 115.41 637.984C115.41 637.151 115.273 636.523 115 636.097C114.73 635.667 114.336 635.452 113.816 635.452C113.297 635.452 112.904 635.665 112.639 636.091C112.373 636.517 112.24 637.148 112.24 637.984ZM119.465 634.72H122.225V640.421H124.363V641.259H119.008V640.421H121.146V635.558H119.465V634.72ZM121.146 632.171H122.225V633.53H121.146V632.171ZM125.43 634.696H126.549L128.453 640.204L130.363 634.696H131.482L129.15 641.259H127.762L125.43 634.696ZM181.504 659.558V660.401H181.129C180.156 660.401 179.504 660.257 179.172 659.968C178.844 659.679 178.68 659.103 178.68 658.239V657.068C178.68 656.642 178.559 656.275 178.316 655.966C178.078 655.657 177.707 655.503 177.203 655.503H176.488V654.665H177.203C177.754 654.665 178.137 654.534 178.352 654.273C178.57 654.011 178.68 653.626 178.68 653.118V651.595C178.68 650.732 178.844 650.157 179.172 649.872C179.504 649.583 180.156 649.439 181.129 649.439H181.504V650.276H181.094C180.547 650.276 180.189 650.362 180.021 650.534C179.857 650.702 179.775 651.064 179.775 651.618V653.189C179.775 653.876 179.641 654.339 179.371 654.577C179.102 654.812 178.576 654.982 177.795 655.087C178.553 655.177 179.072 655.351 179.354 655.609C179.635 655.862 179.775 656.323 179.775 656.991V658.216C179.775 658.775 179.857 659.138 180.021 659.306C180.189 659.474 180.547 659.558 181.094 659.558H181.504ZM213.303 659.558C213.85 659.558 214.205 659.474 214.369 659.306C214.537 659.138 214.621 658.775 214.621 658.216V656.991C214.621 656.323 214.762 655.862 215.043 655.609C215.324 655.351 215.844 655.177 216.602 655.087C215.82 654.982 215.295 654.812 215.025 654.577C214.756 654.339 214.621 653.876 214.621 653.189V651.618C214.621 651.064 214.537 650.702 214.369 650.534C214.205 650.362 213.85 650.276 213.303 650.276H212.893V649.439H213.268C214.24 649.439 214.891 649.583 215.219 649.872C215.551 650.157 215.717 650.732 215.717 651.595V653.118C215.717 653.626 215.824 654.011 216.039 654.273C216.258 654.534 216.643 654.665 217.193 654.665H217.908V655.503H217.193C216.689 655.503 216.316 655.657 216.074 655.966C215.836 656.275 215.717 656.642 215.717 657.068V658.239C215.717 659.103 215.551 659.679 215.219 659.968C214.891 660.257 214.24 660.401 213.268 660.401H212.893V659.558H213.303ZM122.641 671.534V668.142H123.719V677.259H122.641V676.433C122.461 676.757 122.221 677.005 121.92 677.177C121.623 677.345 121.279 677.429 120.889 677.429C120.096 677.429 119.471 677.122 119.014 676.509C118.561 675.892 118.334 675.042 118.334 673.96C118.334 672.894 118.562 672.058 119.02 671.452C119.477 670.843 120.1 670.538 120.889 670.538C121.283 670.538 121.631 670.624 121.932 670.796C122.232 670.964 122.469 671.21 122.641 671.534ZM119.471 673.984C119.471 674.819 119.604 675.45 119.869 675.876C120.135 676.302 120.527 676.515 121.047 676.515C121.566 676.515 121.961 676.3 122.23 675.87C122.504 675.441 122.641 674.812 122.641 673.984C122.641 673.151 122.504 672.523 122.23 672.097C121.961 671.667 121.566 671.452 121.047 671.452C120.527 671.452 120.135 671.665 119.869 672.091C119.604 672.517 119.471 673.148 119.471 673.984ZM126.695 670.72H129.455V676.421H131.594V677.259H126.238V676.421H128.377V671.558H126.695V670.72ZM128.377 668.171H129.455V669.53H128.377V668.171ZM132.66 670.696H133.779L135.684 676.204L137.594 670.696H138.713L136.381 677.259H134.992L132.66 670.696ZM289.961 695.558V696.401H289.586C288.613 696.401 287.961 696.257 287.629 695.968C287.301 695.679 287.137 695.103 287.137 694.239V693.068C287.137 692.642 287.016 692.275 286.773 691.966C286.535 691.657 286.164 691.503 285.66 691.503H284.945V690.665H285.66C286.211 690.665 286.594 690.534 286.809 690.273C287.027 690.011 287.137 689.626 287.137 689.118V687.595C287.137 686.732 287.301 686.157 287.629 685.872C287.961 685.583 288.613 685.439 289.586 685.439H289.961V686.276H289.551C289.004 686.276 288.646 686.362 288.479 686.534C288.314 686.702 288.232 687.064 288.232 687.618V689.189C288.232 689.876 288.098 690.339 287.828 690.577C287.559 690.812 287.033 690.982 286.252 691.087C287.01 691.177 287.529 691.351 287.811 691.609C288.092 691.862 288.232 692.323 288.232 692.991V694.216C288.232 694.775 288.314 695.138 288.479 695.306C288.646 695.474 289.004 695.558 289.551 695.558H289.961ZM328.99 695.558C329.537 695.558 329.893 695.474 330.057 695.306C330.225 695.138 330.309 694.775 330.309 694.216V692.991C330.309 692.323 330.449 691.862 330.73 691.609C331.012 691.351 331.531 691.177 332.289 691.087C331.508 690.982 330.982 690.812 330.713 690.577C330.443 690.339 330.309 689.876 330.309 689.189V687.618C330.309 687.064 330.225 686.702 330.057 686.534C329.893 686.362 329.537 686.276 328.99 686.276H328.58V685.439H328.955C329.928 685.439 330.578 685.583 330.906 685.872C331.238 686.157 331.404 686.732 331.404 687.595V689.118C331.404 689.626 331.512 690.011 331.727 690.273C331.945 690.534 332.33 690.665 332.881 690.665H333.596V691.503H332.881C332.377 691.503 332.004 691.657 331.762 691.966C331.523 692.275 331.404 692.642 331.404 693.068V694.239C331.404 695.103 331.238 695.679 330.906 695.968C330.578 696.257 329.928 696.401 328.955 696.401H328.58V695.558H328.99ZM485.184 695.558V696.401H484.809C483.836 696.401 483.184 696.257 482.852 695.968C482.523 695.679 482.359 695.103 482.359 694.239V693.068C482.359 692.642 482.238 692.275 481.996 691.966C481.758 691.657 481.387 691.503 480.883 691.503H480.168V690.665H480.883C481.434 690.665 481.816 690.534 482.031 690.273C482.25 690.011 482.359 689.626 482.359 689.118V687.595C482.359 686.732 482.523 686.157 482.852 685.872C483.184 685.583 483.836 685.439 484.809 685.439H485.184V686.276H484.773C484.227 686.276 483.869 686.362 483.701 686.534C483.537 686.702 483.455 687.064 483.455 687.618V689.189C483.455 689.876 483.32 690.339 483.051 690.577C482.781 690.812 482.256 690.982 481.475 691.087C482.232 691.177 482.752 691.351 483.033 691.609C483.314 691.862 483.455 692.323 483.455 692.991V694.216C483.455 694.775 483.537 695.138 483.701 695.306C483.869 695.474 484.227 695.558 484.773 695.558H485.184ZM567.596 695.558C568.143 695.558 568.498 695.474 568.662 695.306C568.83 695.138 568.914 694.775 568.914 694.216V692.991C568.914 692.323 569.055 691.862 569.336 691.609C569.617 691.351 570.137 691.177 570.895 691.087C570.113 690.982 569.588 690.812 569.318 690.577C569.049 690.339 568.914 689.876 568.914 689.189V687.618C568.914 687.064 568.83 686.702 568.662 686.534C568.498 686.362 568.143 686.276 567.596 686.276H567.186V685.439H567.561C568.533 685.439 569.184 685.583 569.512 685.872C569.844 686.157 570.01 686.732 570.01 687.595V689.118C570.01 689.626 570.117 690.011 570.332 690.273C570.551 690.534 570.936 690.665 571.486 690.665H572.201V691.503H571.486C570.982 691.503 570.609 691.657 570.367 691.966C570.129 692.275 570.01 692.642 570.01 693.068V694.239C570.01 695.103 569.844 695.679 569.512 695.968C569.184 696.257 568.533 696.401 567.561 696.401H567.186V695.558H567.596ZM130.891 713.558V714.401H130.516C129.543 714.401 128.891 714.257 128.559 713.968C128.23 713.679 128.066 713.103 128.066 712.239V711.068C128.066 710.642 127.945 710.275 127.703 709.966C127.465 709.657 127.094 709.503 126.59 709.503H125.875V708.665H126.59C127.141 708.665 127.523 708.534 127.738 708.273C127.957 708.011 128.066 707.626 128.066 707.118V705.595C128.066 704.732 128.23 704.157 128.559 703.872C128.891 703.583 129.543 703.439 130.516 703.439H130.891V704.276H130.48C129.934 704.276 129.576 704.362 129.408 704.534C129.244 704.702 129.162 705.064 129.162 705.618V707.189C129.162 707.876 129.027 708.339 128.758 708.577C128.488 708.812 127.963 708.982 127.182 709.087C127.939 709.177 128.459 709.351 128.74 709.609C129.021 709.862 129.162 710.323 129.162 710.991V712.216C129.162 712.775 129.244 713.138 129.408 713.306C129.576 713.474 129.934 713.558 130.48 713.558H130.891ZM320.582 710.329H326.775V711.319H320.582V710.329ZM320.582 707.569H326.775V708.56H320.582V707.569ZM327.812 707.628V706.562L334.006 709.011V709.984L327.812 712.433V711.36L332.793 709.503L327.812 707.628ZM188.734 749.558V750.401H188.359C187.387 750.401 186.734 750.257 186.402 749.968C186.074 749.679 185.91 749.103 185.91 748.239V747.068C185.91 746.642 185.789 746.275 185.547 745.966C185.309 745.657 184.938 745.503 184.434 745.503H183.719V744.665H184.434C184.984 744.665 185.367 744.534 185.582 744.273C185.801 744.011 185.91 743.626 185.91 743.118V741.595C185.91 740.732 186.074 740.157 186.402 739.872C186.734 739.583 187.387 739.439 188.359 739.439H188.734V740.276H188.324C187.777 740.276 187.42 740.362 187.252 740.534C187.088 740.702 187.006 741.064 187.006 741.618V743.189C187.006 743.876 186.871 744.339 186.602 744.577C186.332 744.812 185.807 744.982 185.025 745.087C185.783 745.177 186.303 745.351 186.584 745.609C186.865 745.862 187.006 746.323 187.006 746.991V748.216C187.006 748.775 187.088 749.138 187.252 749.306C187.42 749.474 187.777 749.558 188.324 749.558H188.734ZM227.764 749.558C228.311 749.558 228.666 749.474 228.83 749.306C228.998 749.138 229.082 748.775 229.082 748.216V746.991C229.082 746.323 229.223 745.862 229.504 745.609C229.785 745.351 230.305 745.177 231.062 745.087C230.281 744.982 229.756 744.812 229.486 744.577C229.217 744.339 229.082 743.876 229.082 743.189V741.618C229.082 741.064 228.998 740.702 228.83 740.534C228.666 740.362 228.311 740.276 227.764 740.276H227.354V739.439H227.729C228.701 739.439 229.352 739.583 229.68 739.872C230.012 740.157 230.178 740.732 230.178 741.595V743.118C230.178 743.626 230.285 744.011 230.5 744.273C230.719 744.534 231.104 744.665 231.654 744.665H232.369V745.503H231.654C231.15 745.503 230.777 745.657 230.535 745.966C230.297 746.275 230.178 746.642 230.178 747.068V748.239C230.178 749.103 230.012 749.679 229.68 749.968C229.352 750.257 228.701 750.401 227.729 750.401H227.354V749.558H227.764ZM188.734 767.558V768.401H188.359C187.387 768.401 186.734 768.257 186.402 767.968C186.074 767.679 185.91 767.103 185.91 766.239V765.068C185.91 764.642 185.789 764.275 185.547 763.966C185.309 763.657 184.938 763.503 184.434 763.503H183.719V762.665H184.434C184.984 762.665 185.367 762.534 185.582 762.273C185.801 762.011 185.91 761.626 185.91 761.118V759.595C185.91 758.732 186.074 758.157 186.402 757.872C186.734 757.583 187.387 757.439 188.359 757.439H188.734V758.276H188.324C187.777 758.276 187.42 758.362 187.252 758.534C187.088 758.702 187.006 759.064 187.006 759.618V761.189C187.006 761.876 186.871 762.339 186.602 762.577C186.332 762.812 185.807 762.982 185.025 763.087C185.783 763.177 186.303 763.351 186.584 763.609C186.865 763.862 187.006 764.323 187.006 764.991V766.216C187.006 766.775 187.088 767.138 187.252 767.306C187.42 767.474 187.777 767.558 188.324 767.558H188.734ZM227.764 767.558C228.311 767.558 228.666 767.474 228.83 767.306C228.998 767.138 229.082 766.775 229.082 766.216V764.991C229.082 764.323 229.223 763.862 229.504 763.609C229.785 763.351 230.305 763.177 231.062 763.087C230.281 762.982 229.756 762.812 229.486 762.577C229.217 762.339 229.082 761.876 229.082 761.189V759.618C229.082 759.064 228.998 758.702 228.83 758.534C228.666 758.362 228.311 758.276 227.764 758.276H227.354V757.439H227.729C228.701 757.439 229.352 757.583 229.68 757.872C230.012 758.157 230.178 758.732 230.178 759.595V761.118C230.178 761.626 230.285 762.011 230.5 762.273C230.719 762.534 231.104 762.665 231.654 762.665H232.369V763.503H231.654C231.15 763.503 230.777 763.657 230.535 763.966C230.297 764.275 230.178 764.642 230.178 765.068V766.239C230.178 767.103 230.012 767.679 229.68 767.968C229.352 768.257 228.701 768.401 227.729 768.401H227.354V767.558H227.764ZM188.734 785.558V786.401H188.359C187.387 786.401 186.734 786.257 186.402 785.968C186.074 785.679 185.91 785.103 185.91 784.239V783.068C185.91 782.642 185.789 782.275 185.547 781.966C185.309 781.657 184.938 781.503 184.434 781.503H183.719V780.665H184.434C184.984 780.665 185.367 780.534 185.582 780.273C185.801 780.011 185.91 779.626 185.91 779.118V777.595C185.91 776.732 186.074 776.157 186.402 775.872C186.734 775.583 187.387 775.439 188.359 775.439H188.734V776.276H188.324C187.777 776.276 187.42 776.362 187.252 776.534C187.088 776.702 187.006 777.064 187.006 777.618V779.189C187.006 779.876 186.871 780.339 186.602 780.577C186.332 780.812 185.807 780.982 185.025 781.087C185.783 781.177 186.303 781.351 186.584 781.609C186.865 781.862 187.006 782.323 187.006 782.991V784.216C187.006 784.775 187.088 785.138 187.252 785.306C187.42 785.474 187.777 785.558 188.324 785.558H188.734ZM227.764 785.558C228.311 785.558 228.666 785.474 228.83 785.306C228.998 785.138 229.082 784.775 229.082 784.216V782.991C229.082 782.323 229.223 781.862 229.504 781.609C229.785 781.351 230.305 781.177 231.062 781.087C230.281 780.982 229.756 780.812 229.486 780.577C229.217 780.339 229.082 779.876 229.082 779.189V777.618C229.082 777.064 228.998 776.702 228.83 776.534C228.666 776.362 228.311 776.276 227.764 776.276H227.354V775.439H227.729C228.701 775.439 229.352 775.583 229.68 775.872C230.012 776.157 230.178 776.732 230.178 777.595V779.118C230.178 779.626 230.285 780.011 230.5 780.273C230.719 780.534 231.104 780.665 231.654 780.665H232.369V781.503H231.654C231.15 781.503 230.777 781.657 230.535 781.966C230.297 782.275 230.178 782.642 230.178 783.068V784.239C230.178 785.103 230.012 785.679 229.68 785.968C229.352 786.257 228.701 786.401 227.729 786.401H227.354V785.558H227.764ZM140.998 875.558C141.545 875.558 141.9 875.474 142.064 875.306C142.232 875.138 142.316 874.775 142.316 874.216V872.991C142.316 872.323 142.457 871.862 142.738 871.609C143.02 871.351 143.539 871.177 144.297 871.087C143.516 870.982 142.99 870.812 142.721 870.577C142.451 870.339 142.316 869.876 142.316 869.189V867.618C142.316 867.064 142.232 866.702 142.064 866.534C141.9 866.362 141.545 866.276 140.998 866.276H140.588V865.439H140.963C141.936 865.439 142.586 865.583 142.914 865.872C143.246 866.157 143.412 866.732 143.412 867.595V869.118C143.412 869.626 143.52 870.011 143.734 870.273C143.953 870.534 144.338 870.665 144.889 870.665H145.604V871.503H144.889C144.385 871.503 144.012 871.657 143.77 871.966C143.531 872.275 143.412 872.642 143.412 873.068V874.239C143.412 875.103 143.246 875.679 142.914 875.968C142.586 876.257 141.936 876.401 140.963 876.401H140.588V875.558H140.998ZM129.871 887.534V884.142H130.949V893.259H129.871V892.433C129.691 892.757 129.451 893.005 129.15 893.177C128.854 893.345 128.51 893.429 128.119 893.429C127.326 893.429 126.701 893.122 126.244 892.509C125.791 891.892 125.564 891.042 125.564 889.96C125.564 888.894 125.793 888.058 126.25 887.452C126.707 886.843 127.33 886.538 128.119 886.538C128.514 886.538 128.861 886.624 129.162 886.796C129.463 886.964 129.699 887.21 129.871 887.534ZM126.701 889.984C126.701 890.819 126.834 891.45 127.1 891.876C127.365 892.302 127.758 892.515 128.277 892.515C128.797 892.515 129.191 892.3 129.461 891.87C129.734 891.441 129.871 890.812 129.871 889.984C129.871 889.151 129.734 888.523 129.461 888.097C129.191 887.667 128.797 887.452 128.277 887.452C127.758 887.452 127.365 887.665 127.1 888.091C126.834 888.517 126.701 889.148 126.701 889.984ZM133.926 886.72H136.686V892.421H138.824V893.259H133.469V892.421H135.607V887.558H133.926V886.72ZM135.607 884.171H136.686V885.53H135.607V884.171ZM139.891 886.696H141.01L142.914 892.204L144.824 886.696H145.943L143.611 893.259H142.223L139.891 886.696ZM123.83 982.925C123.541 983.093 123.242 983.218 122.934 983.3C122.629 983.386 122.316 983.429 121.996 983.429C120.98 983.429 120.186 983.124 119.611 982.515C119.041 981.905 118.756 981.062 118.756 979.984C118.756 978.905 119.041 978.062 119.611 977.452C120.186 976.843 120.98 976.538 121.996 976.538C122.312 976.538 122.621 976.579 122.922 976.661C123.223 976.743 123.525 976.87 123.83 977.042V978.173C123.545 977.919 123.258 977.735 122.969 977.622C122.684 977.509 122.359 977.452 121.996 977.452C121.32 977.452 120.801 977.671 120.438 978.109C120.074 978.546 119.893 979.171 119.893 979.984C119.893 980.792 120.074 981.417 120.438 981.859C120.805 982.296 121.324 982.515 121.996 982.515C122.371 982.515 122.707 982.458 123.004 982.345C123.301 982.228 123.576 982.048 123.83 981.806V982.925ZM128.453 977.452C127.906 977.452 127.492 977.665 127.211 978.091C126.93 978.517 126.789 979.148 126.789 979.984C126.789 980.816 126.93 981.446 127.211 981.876C127.492 982.302 127.906 982.515 128.453 982.515C129.004 982.515 129.42 982.302 129.701 981.876C129.982 981.446 130.123 980.816 130.123 979.984C130.123 979.148 129.982 978.517 129.701 978.091C129.42 977.665 129.004 977.452 128.453 977.452ZM128.453 976.538C129.363 976.538 130.059 976.833 130.539 977.423C131.023 978.013 131.266 978.866 131.266 979.984C131.266 981.105 131.025 981.96 130.545 982.55C130.064 983.136 129.367 983.429 128.453 983.429C127.543 983.429 126.848 983.136 126.367 982.55C125.887 981.96 125.646 981.105 125.646 979.984C125.646 978.866 125.887 978.013 126.367 977.423C126.848 976.833 127.543 976.538 128.453 976.538ZM138.232 979.193V983.259H137.148V979.193C137.148 978.603 137.045 978.169 136.838 977.892C136.631 977.614 136.307 977.476 135.865 977.476C135.361 977.476 134.973 977.655 134.699 978.015C134.43 978.37 134.295 978.882 134.295 979.55V983.259H133.217V976.696H134.295V977.681C134.486 977.306 134.746 977.023 135.074 976.831C135.402 976.636 135.791 976.538 136.24 976.538C136.908 976.538 137.406 976.759 137.734 977.2C138.066 977.638 138.232 978.302 138.232 979.193ZM145.006 976.925V977.98C144.697 977.8 144.387 977.665 144.074 977.575C143.762 977.485 143.443 977.441 143.119 977.441C142.631 977.441 142.266 977.521 142.023 977.681C141.785 977.837 141.666 978.077 141.666 978.401C141.666 978.694 141.756 978.913 141.936 979.058C142.115 979.202 142.562 979.343 143.277 979.48L143.711 979.562C144.246 979.663 144.65 979.866 144.924 980.171C145.201 980.476 145.34 980.872 145.34 981.36C145.34 982.009 145.109 982.517 144.648 982.884C144.188 983.247 143.547 983.429 142.727 983.429C142.402 983.429 142.062 983.394 141.707 983.323C141.352 983.257 140.967 983.155 140.553 983.019V981.905C140.955 982.112 141.34 982.269 141.707 982.374C142.074 982.476 142.422 982.526 142.75 982.526C143.227 982.526 143.596 982.431 143.857 982.239C144.119 982.044 144.25 981.773 144.25 981.425C144.25 980.925 143.771 980.579 142.814 980.388L142.768 980.376L142.363 980.294C141.742 980.173 141.289 979.97 141.004 979.685C140.719 979.396 140.576 979.003 140.576 978.507C140.576 977.878 140.789 977.394 141.215 977.054C141.641 976.71 142.248 976.538 143.037 976.538C143.389 976.538 143.727 976.571 144.051 976.638C144.375 976.7 144.693 976.796 145.006 976.925ZM150.133 974.833V976.696H152.582V977.534H150.133V981.097C150.133 981.581 150.225 981.919 150.408 982.11C150.592 982.302 150.912 982.398 151.369 982.398H152.582V983.259H151.264C150.455 983.259 149.885 983.097 149.553 982.773C149.221 982.448 149.055 981.89 149.055 981.097V977.534H147.303V976.696H149.055V974.833H150.133ZM335.043 980.329H341.236V981.319H335.043V980.329ZM335.043 977.569H341.236V978.56H335.043V977.569ZM342.273 977.628V976.562L348.467 979.011V979.984L342.273 982.433V981.36L347.254 979.503L342.273 977.628ZM108.18 1013.53V1010.14H109.258V1019.26H108.18V1018.43C108 1018.76 107.76 1019.01 107.459 1019.18C107.162 1019.34 106.818 1019.43 106.428 1019.43C105.635 1019.43 105.01 1019.12 104.553 1018.51C104.1 1017.89 103.873 1017.04 103.873 1015.96C103.873 1014.89 104.102 1014.06 104.559 1013.45C105.016 1012.84 105.639 1012.54 106.428 1012.54C106.822 1012.54 107.17 1012.62 107.471 1012.8C107.771 1012.96 108.008 1013.21 108.18 1013.53ZM105.01 1015.98C105.01 1016.82 105.143 1017.45 105.408 1017.88C105.674 1018.3 106.066 1018.51 106.586 1018.51C107.105 1018.51 107.5 1018.3 107.77 1017.87C108.043 1017.44 108.18 1016.81 108.18 1015.98C108.18 1015.15 108.043 1014.52 107.77 1014.1C107.5 1013.67 107.105 1013.45 106.586 1013.45C106.066 1013.45 105.674 1013.67 105.408 1014.09C105.143 1014.52 105.01 1015.15 105.01 1015.98ZM112.234 1012.72H114.994V1018.42H117.133V1019.26H111.777V1018.42H113.916V1013.56H112.234V1012.72ZM113.916 1010.17H114.994V1011.53H113.916V1010.17ZM118.199 1012.7H119.318L121.223 1018.2L123.133 1012.7H124.252L121.92 1019.26H120.531L118.199 1012.7ZM123.771 1033.19V1037.26H122.688V1033.19C122.688 1032.6 122.584 1032.17 122.377 1031.89C122.17 1031.61 121.846 1031.48 121.404 1031.48C120.9 1031.48 120.512 1031.66 120.238 1032.01C119.969 1032.37 119.834 1032.88 119.834 1033.55V1037.26H118.756V1028.14H119.834V1031.68C120.025 1031.31 120.285 1031.02 120.613 1030.83C120.941 1030.64 121.33 1030.54 121.779 1030.54C122.447 1030.54 122.945 1030.76 123.273 1031.2C123.605 1031.64 123.771 1032.3 123.771 1033.19ZM127.029 1036.26H131.049V1037.26H125.734V1036.26C126.465 1035.49 127.104 1034.81 127.65 1034.22C128.197 1033.63 128.574 1033.22 128.781 1032.98C129.172 1032.5 129.436 1032.11 129.572 1031.82C129.709 1031.52 129.777 1031.22 129.777 1030.91C129.777 1030.42 129.633 1030.04 129.344 1029.76C129.059 1029.49 128.666 1029.35 128.166 1029.35C127.811 1029.35 127.438 1029.41 127.047 1029.54C126.656 1029.67 126.242 1029.87 125.805 1030.13V1028.93C126.207 1028.74 126.602 1028.6 126.988 1028.5C127.379 1028.4 127.764 1028.35 128.143 1028.35C128.998 1028.35 129.686 1028.58 130.205 1029.04C130.729 1029.49 130.99 1030.09 130.99 1030.83C130.99 1031.2 130.902 1031.58 130.727 1031.95C130.555 1032.33 130.273 1032.74 129.883 1033.19C129.664 1033.45 129.346 1033.8 128.928 1034.25C128.514 1034.7 127.881 1035.37 127.029 1036.26ZM131.002 1069.19V1073.26H129.918V1069.19C129.918 1068.6 129.814 1068.17 129.607 1067.89C129.4 1067.61 129.076 1067.48 128.635 1067.48C128.131 1067.48 127.742 1067.66 127.469 1068.01C127.199 1068.37 127.064 1068.88 127.064 1069.55V1073.26H125.986V1064.14H127.064V1067.68C127.256 1067.31 127.516 1067.02 127.844 1066.83C128.172 1066.64 128.561 1066.54 129.01 1066.54C129.678 1066.54 130.176 1066.76 130.504 1067.2C130.836 1067.64 131.002 1068.3 131.002 1069.19ZM134.26 1072.26H138.279V1073.26H132.965V1072.26C133.695 1071.49 134.334 1070.81 134.881 1070.22C135.428 1069.63 135.805 1069.22 136.012 1068.98C136.402 1068.5 136.666 1068.11 136.803 1067.82C136.939 1067.52 137.008 1067.22 137.008 1066.91C137.008 1066.42 136.863 1066.04 136.574 1065.76C136.289 1065.49 135.896 1065.35 135.396 1065.35C135.041 1065.35 134.668 1065.41 134.277 1065.54C133.887 1065.67 133.473 1065.87 133.035 1066.13V1064.93C133.438 1064.74 133.832 1064.6 134.219 1064.5C134.609 1064.4 134.994 1064.35 135.373 1064.35C136.229 1064.35 136.916 1064.58 137.436 1065.04C137.959 1065.49 138.221 1066.09 138.221 1066.83C138.221 1067.2 138.133 1067.58 137.957 1067.95C137.785 1068.33 137.504 1068.74 137.113 1069.19C136.895 1069.45 136.576 1069.8 136.158 1070.25C135.744 1070.7 135.111 1071.37 134.26 1072.26ZM122.641 1085.53V1082.14H123.719V1091.26H122.641V1090.43C122.461 1090.76 122.221 1091.01 121.92 1091.18C121.623 1091.34 121.279 1091.43 120.889 1091.43C120.096 1091.43 119.471 1091.12 119.014 1090.51C118.561 1089.89 118.334 1089.04 118.334 1087.96C118.334 1086.89 118.562 1086.06 119.02 1085.45C119.477 1084.84 120.1 1084.54 120.889 1084.54C121.283 1084.54 121.631 1084.62 121.932 1084.8C122.232 1084.96 122.469 1085.21 122.641 1085.53ZM119.471 1087.98C119.471 1088.82 119.604 1089.45 119.869 1089.88C120.135 1090.3 120.527 1090.51 121.047 1090.51C121.566 1090.51 121.961 1090.3 122.23 1089.87C122.504 1089.44 122.641 1088.81 122.641 1087.98C122.641 1087.15 122.504 1086.52 122.23 1086.1C121.961 1085.67 121.566 1085.45 121.047 1085.45C120.527 1085.45 120.135 1085.67 119.869 1086.09C119.604 1086.52 119.471 1087.15 119.471 1087.98ZM126.695 1084.72H129.455V1090.42H131.594V1091.26H126.238V1090.42H128.377V1085.56H126.695V1084.72ZM128.377 1082.17H129.455V1083.53H128.377V1082.17ZM132.66 1084.7H133.779L135.684 1090.2L137.594 1084.7H138.713L136.381 1091.26H134.992L132.66 1084.7ZM195.965 1163.56V1164.4H195.59C194.617 1164.4 193.965 1164.26 193.633 1163.97C193.305 1163.68 193.141 1163.1 193.141 1162.24V1161.07C193.141 1160.64 193.02 1160.27 192.777 1159.97C192.539 1159.66 192.168 1159.5 191.664 1159.5H190.949V1158.67H191.664C192.215 1158.67 192.598 1158.53 192.812 1158.27C193.031 1158.01 193.141 1157.63 193.141 1157.12V1155.59C193.141 1154.73 193.305 1154.16 193.633 1153.87C193.965 1153.58 194.617 1153.44 195.59 1153.44H195.965V1154.28H195.555C195.008 1154.28 194.65 1154.36 194.482 1154.53C194.318 1154.7 194.236 1155.06 194.236 1155.62V1157.19C194.236 1157.88 194.102 1158.34 193.832 1158.58C193.562 1158.81 193.037 1158.98 192.256 1159.09C193.014 1159.18 193.533 1159.35 193.814 1159.61C194.096 1159.86 194.236 1160.32 194.236 1160.99V1162.22C194.236 1162.77 194.318 1163.14 194.482 1163.31C194.65 1163.47 195.008 1163.56 195.555 1163.56H195.965ZM401.295 1163.56C401.842 1163.56 402.197 1163.47 402.361 1163.31C402.529 1163.14 402.613 1162.77 402.613 1162.22V1160.99C402.613 1160.32 402.754 1159.86 403.035 1159.61C403.316 1159.35 403.836 1159.18 404.594 1159.09C403.812 1158.98 403.287 1158.81 403.018 1158.58C402.748 1158.34 402.613 1157.88 402.613 1157.19V1155.62C402.613 1155.06 402.529 1154.7 402.361 1154.53C402.197 1154.36 401.842 1154.28 401.295 1154.28H400.885V1153.44H401.26C402.232 1153.44 402.883 1153.58 403.211 1153.87C403.543 1154.16 403.709 1154.73 403.709 1155.59V1157.12C403.709 1157.63 403.816 1158.01 404.031 1158.27C404.25 1158.53 404.635 1158.67 405.186 1158.67H405.9V1159.5H405.186C404.682 1159.5 404.309 1159.66 404.066 1159.97C403.828 1160.27 403.709 1160.64 403.709 1161.07V1162.24C403.709 1163.1 403.543 1163.68 403.211 1163.97C402.883 1164.26 402.232 1164.4 401.26 1164.4H400.885V1163.56H401.295ZM195.965 1271.56V1272.4H195.59C194.617 1272.4 193.965 1272.26 193.633 1271.97C193.305 1271.68 193.141 1271.1 193.141 1270.24V1269.07C193.141 1268.64 193.02 1268.27 192.777 1267.97C192.539 1267.66 192.168 1267.5 191.664 1267.5H190.949V1266.67H191.664C192.215 1266.67 192.598 1266.53 192.812 1266.27C193.031 1266.01 193.141 1265.63 193.141 1265.12V1263.59C193.141 1262.73 193.305 1262.16 193.633 1261.87C193.965 1261.58 194.617 1261.44 195.59 1261.44H195.965V1262.28H195.555C195.008 1262.28 194.65 1262.36 194.482 1262.53C194.318 1262.7 194.236 1263.06 194.236 1263.62V1265.19C194.236 1265.88 194.102 1266.34 193.832 1266.58C193.562 1266.81 193.037 1266.98 192.256 1267.09C193.014 1267.18 193.533 1267.35 193.814 1267.61C194.096 1267.86 194.236 1268.32 194.236 1268.99V1270.22C194.236 1270.77 194.318 1271.14 194.482 1271.31C194.65 1271.47 195.008 1271.56 195.555 1271.56H195.965ZM451.908 1271.56C452.455 1271.56 452.811 1271.47 452.975 1271.31C453.143 1271.14 453.227 1270.77 453.227 1270.22V1268.99C453.227 1268.32 453.367 1267.86 453.648 1267.61C453.93 1267.35 454.449 1267.18 455.207 1267.09C454.426 1266.98 453.9 1266.81 453.631 1266.58C453.361 1266.34 453.227 1265.88 453.227 1265.19V1263.62C453.227 1263.06 453.143 1262.7 452.975 1262.53C452.811 1262.36 452.455 1262.28 451.908 1262.28H451.498V1261.44H451.873C452.846 1261.44 453.496 1261.58 453.824 1261.87C454.156 1262.16 454.322 1262.73 454.322 1263.59V1265.12C454.322 1265.63 454.43 1266.01 454.645 1266.27C454.863 1266.53 455.248 1266.67 455.799 1266.67H456.514V1267.5H455.799C455.295 1267.5 454.922 1267.66 454.68 1267.97C454.441 1268.27 454.322 1268.64 454.322 1269.07V1270.24C454.322 1271.1 454.156 1271.68 453.824 1271.97C453.496 1272.26 452.846 1272.4 451.873 1272.4H451.498V1271.56H451.908ZM195.965 1379.56V1380.4H195.59C194.617 1380.4 193.965 1380.26 193.633 1379.97C193.305 1379.68 193.141 1379.1 193.141 1378.24V1377.07C193.141 1376.64 193.02 1376.27 192.777 1375.97C192.539 1375.66 192.168 1375.5 191.664 1375.5H190.949V1374.67H191.664C192.215 1374.67 192.598 1374.53 192.812 1374.27C193.031 1374.01 193.141 1373.63 193.141 1373.12V1371.59C193.141 1370.73 193.305 1370.16 193.633 1369.87C193.965 1369.58 194.617 1369.44 195.59 1369.44H195.965V1370.28H195.555C195.008 1370.28 194.65 1370.36 194.482 1370.53C194.318 1370.7 194.236 1371.06 194.236 1371.62V1373.19C194.236 1373.88 194.102 1374.34 193.832 1374.58C193.562 1374.81 193.037 1374.98 192.256 1375.09C193.014 1375.18 193.533 1375.35 193.814 1375.61C194.096 1375.86 194.236 1376.32 194.236 1376.99V1378.22C194.236 1378.77 194.318 1379.14 194.482 1379.31C194.65 1379.47 195.008 1379.56 195.555 1379.56H195.965ZM466.369 1379.56C466.916 1379.56 467.271 1379.47 467.436 1379.31C467.604 1379.14 467.688 1378.77 467.688 1378.22V1376.99C467.688 1376.32 467.828 1375.86 468.109 1375.61C468.391 1375.35 468.91 1375.18 469.668 1375.09C468.887 1374.98 468.361 1374.81 468.092 1374.58C467.822 1374.34 467.688 1373.88 467.688 1373.19V1371.62C467.688 1371.06 467.604 1370.7 467.436 1370.53C467.271 1370.36 466.916 1370.28 466.369 1370.28H465.959V1369.44H466.334C467.307 1369.44 467.957 1369.58 468.285 1369.87C468.617 1370.16 468.783 1370.73 468.783 1371.59V1373.12C468.783 1373.63 468.891 1374.01 469.105 1374.27C469.324 1374.53 469.709 1374.67 470.26 1374.67H470.975V1375.5H470.26C469.756 1375.5 469.383 1375.66 469.141 1375.97C468.902 1376.27 468.783 1376.64 468.783 1377.07V1378.24C468.783 1379.1 468.617 1379.68 468.285 1379.97C467.957 1380.26 467.307 1380.4 466.334 1380.4H465.959V1379.56H466.369ZM195.965 1469.56V1470.4H195.59C194.617 1470.4 193.965 1470.26 193.633 1469.97C193.305 1469.68 193.141 1469.1 193.141 1468.24V1467.07C193.141 1466.64 193.02 1466.27 192.777 1465.97C192.539 1465.66 192.168 1465.5 191.664 1465.5H190.949V1464.67H191.664C192.215 1464.67 192.598 1464.53 192.812 1464.27C193.031 1464.01 193.141 1463.63 193.141 1463.12V1461.59C193.141 1460.73 193.305 1460.16 193.633 1459.87C193.965 1459.58 194.617 1459.44 195.59 1459.44H195.965V1460.28H195.555C195.008 1460.28 194.65 1460.36 194.482 1460.53C194.318 1460.7 194.236 1461.06 194.236 1461.62V1463.19C194.236 1463.88 194.102 1464.34 193.832 1464.58C193.562 1464.81 193.037 1464.98 192.256 1465.09C193.014 1465.18 193.533 1465.35 193.814 1465.61C194.096 1465.86 194.236 1466.32 194.236 1466.99V1468.22C194.236 1468.77 194.318 1469.14 194.482 1469.31C194.65 1469.47 195.008 1469.56 195.555 1469.56H195.965ZM422.986 1469.56C423.533 1469.56 423.889 1469.47 424.053 1469.31C424.221 1469.14 424.305 1468.77 424.305 1468.22V1466.99C424.305 1466.32 424.445 1465.86 424.727 1465.61C425.008 1465.35 425.527 1465.18 426.285 1465.09C425.504 1464.98 424.979 1464.81 424.709 1464.58C424.439 1464.34 424.305 1463.88 424.305 1463.19V1461.62C424.305 1461.06 424.221 1460.7 424.053 1460.53C423.889 1460.36 423.533 1460.28 422.986 1460.28H422.576V1459.44H422.951C423.924 1459.44 424.574 1459.58 424.902 1459.87C425.234 1460.16 425.4 1460.73 425.4 1461.59V1463.12C425.4 1463.63 425.508 1464.01 425.723 1464.27C425.941 1464.53 426.326 1464.67 426.877 1464.67H427.592V1465.5H426.877C426.373 1465.5 426 1465.66 425.758 1465.97C425.52 1466.27 425.4 1466.64 425.4 1467.07V1468.24C425.4 1469.1 425.234 1469.68 424.902 1469.97C424.574 1470.26 423.924 1470.4 422.951 1470.4H422.576V1469.56H422.986ZM195.965 1559.56V1560.4H195.59C194.617 1560.4 193.965 1560.26 193.633 1559.97C193.305 1559.68 193.141 1559.1 193.141 1558.24V1557.07C193.141 1556.64 193.02 1556.27 192.777 1555.97C192.539 1555.66 192.168 1555.5 191.664 1555.5H190.949V1554.67H191.664C192.215 1554.67 192.598 1554.53 192.812 1554.27C193.031 1554.01 193.141 1553.63 193.141 1553.12V1551.59C193.141 1550.73 193.305 1550.16 193.633 1549.87C193.965 1549.58 194.617 1549.44 195.59 1549.44H195.965V1550.28H195.555C195.008 1550.28 194.65 1550.36 194.482 1550.53C194.318 1550.7 194.236 1551.06 194.236 1551.62V1553.19C194.236 1553.88 194.102 1554.34 193.832 1554.58C193.562 1554.81 193.037 1554.98 192.256 1555.09C193.014 1555.18 193.533 1555.35 193.814 1555.61C194.096 1555.86 194.236 1556.32 194.236 1556.99V1558.22C194.236 1558.77 194.318 1559.14 194.482 1559.31C194.65 1559.47 195.008 1559.56 195.555 1559.56H195.965ZM415.756 1559.56C416.303 1559.56 416.658 1559.47 416.822 1559.31C416.99 1559.14 417.074 1558.77 417.074 1558.22V1556.99C417.074 1556.32 417.215 1555.86 417.496 1555.61C417.777 1555.35 418.297 1555.18 419.055 1555.09C418.273 1554.98 417.748 1554.81 417.479 1554.58C417.209 1554.34 417.074 1553.88 417.074 1553.19V1551.62C417.074 1551.06 416.99 1550.7 416.822 1550.53C416.658 1550.36 416.303 1550.28 415.756 1550.28H415.346V1549.44H415.721C416.693 1549.44 417.344 1549.58 417.672 1549.87C418.004 1550.16 418.17 1550.73 418.17 1551.59V1553.12C418.17 1553.63 418.277 1554.01 418.492 1554.27C418.711 1554.53 419.096 1554.67 419.646 1554.67H420.361V1555.5H419.646C419.143 1555.5 418.77 1555.66 418.527 1555.97C418.289 1556.27 418.17 1556.64 418.17 1557.07V1558.24C418.17 1559.1 418.004 1559.68 417.672 1559.97C417.344 1560.26 416.693 1560.4 415.721 1560.4H415.346V1559.56H415.756ZM195.965 1649.56V1650.4H195.59C194.617 1650.4 193.965 1650.26 193.633 1649.97C193.305 1649.68 193.141 1649.1 193.141 1648.24V1647.07C193.141 1646.64 193.02 1646.27 192.777 1645.97C192.539 1645.66 192.168 1645.5 191.664 1645.5H190.949V1644.67H191.664C192.215 1644.67 192.598 1644.53 192.812 1644.27C193.031 1644.01 193.141 1643.63 193.141 1643.12V1641.59C193.141 1640.73 193.305 1640.16 193.633 1639.87C193.965 1639.58 194.617 1639.44 195.59 1639.44H195.965V1640.28H195.555C195.008 1640.28 194.65 1640.36 194.482 1640.53C194.318 1640.7 194.236 1641.06 194.236 1641.62V1643.19C194.236 1643.88 194.102 1644.34 193.832 1644.58C193.562 1644.81 193.037 1644.98 192.256 1645.09C193.014 1645.18 193.533 1645.35 193.814 1645.61C194.096 1645.86 194.236 1646.32 194.236 1646.99V1648.22C194.236 1648.77 194.318 1649.14 194.482 1649.31C194.65 1649.47 195.008 1649.56 195.555 1649.56H195.965ZM950.811 1649.56C951.357 1649.56 951.713 1649.47 951.877 1649.31C952.045 1649.14 952.129 1648.77 952.129 1648.22V1646.99C952.129 1646.32 952.27 1645.86 952.551 1645.61C952.832 1645.35 953.352 1645.18 954.109 1645.09C953.328 1644.98 952.803 1644.81 952.533 1644.58C952.264 1644.34 952.129 1643.88 952.129 1643.19V1641.62C952.129 1641.06 952.045 1640.7 951.877 1640.53C951.713 1640.36 951.357 1640.28 950.811 1640.28H950.4V1639.44H950.775C951.748 1639.44 952.398 1639.58 952.727 1639.87C953.059 1640.16 953.225 1640.73 953.225 1641.59V1643.12C953.225 1643.63 953.332 1644.01 953.547 1644.27C953.766 1644.53 954.15 1644.67 954.701 1644.67H955.416V1645.5H954.701C954.197 1645.5 953.824 1645.66 953.582 1645.97C953.344 1646.27 953.225 1646.64 953.225 1647.07V1648.24C953.225 1649.1 953.059 1649.68 952.727 1649.97C952.398 1650.26 951.748 1650.4 950.775 1650.4H950.4V1649.56H950.811ZM195.965 1739.56V1740.4H195.59C194.617 1740.4 193.965 1740.26 193.633 1739.97C193.305 1739.68 193.141 1739.1 193.141 1738.24V1737.07C193.141 1736.64 193.02 1736.27 192.777 1735.97C192.539 1735.66 192.168 1735.5 191.664 1735.5H190.949V1734.67H191.664C192.215 1734.67 192.598 1734.53 192.812 1734.27C193.031 1734.01 193.141 1733.63 193.141 1733.12V1731.59C193.141 1730.73 193.305 1730.16 193.633 1729.87C193.965 1729.58 194.617 1729.44 195.59 1729.44H195.965V1730.28H195.555C195.008 1730.28 194.65 1730.36 194.482 1730.53C194.318 1730.7 194.236 1731.06 194.236 1731.62V1733.19C194.236 1733.88 194.102 1734.34 193.832 1734.58C193.562 1734.81 193.037 1734.98 192.256 1735.09C193.014 1735.18 193.533 1735.35 193.814 1735.61C194.096 1735.86 194.236 1736.32 194.236 1736.99V1738.22C194.236 1738.77 194.318 1739.14 194.482 1739.31C194.65 1739.47 195.008 1739.56 195.555 1739.56H195.965ZM401.295 1739.56C401.842 1739.56 402.197 1739.47 402.361 1739.31C402.529 1739.14 402.613 1738.77 402.613 1738.22V1736.99C402.613 1736.32 402.754 1735.86 403.035 1735.61C403.316 1735.35 403.836 1735.18 404.594 1735.09C403.812 1734.98 403.287 1734.81 403.018 1734.58C402.748 1734.34 402.613 1733.88 402.613 1733.19V1731.62C402.613 1731.06 402.529 1730.7 402.361 1730.53C402.197 1730.36 401.842 1730.28 401.295 1730.28H400.885V1729.44H401.26C402.232 1729.44 402.883 1729.58 403.211 1729.87C403.543 1730.16 403.709 1730.73 403.709 1731.59V1733.12C403.709 1733.63 403.816 1734.01 404.031 1734.27C404.25 1734.53 404.635 1734.67 405.186 1734.67H405.9V1735.5H405.186C404.682 1735.5 404.309 1735.66 404.066 1735.97C403.828 1736.27 403.709 1736.64 403.709 1737.07V1738.24C403.709 1739.1 403.543 1739.68 403.211 1739.97C402.883 1740.26 402.232 1740.4 401.26 1740.4H400.885V1739.56H401.295ZM195.965 1829.56V1830.4H195.59C194.617 1830.4 193.965 1830.26 193.633 1829.97C193.305 1829.68 193.141 1829.1 193.141 1828.24V1827.07C193.141 1826.64 193.02 1826.27 192.777 1825.97C192.539 1825.66 192.168 1825.5 191.664 1825.5H190.949V1824.67H191.664C192.215 1824.67 192.598 1824.53 192.812 1824.27C193.031 1824.01 193.141 1823.63 193.141 1823.12V1821.59C193.141 1820.73 193.305 1820.16 193.633 1819.87C193.965 1819.58 194.617 1819.44 195.59 1819.44H195.965V1820.28H195.555C195.008 1820.28 194.65 1820.36 194.482 1820.53C194.318 1820.7 194.236 1821.06 194.236 1821.62V1823.19C194.236 1823.88 194.102 1824.34 193.832 1824.58C193.562 1824.81 193.037 1824.98 192.256 1825.09C193.014 1825.18 193.533 1825.35 193.814 1825.61C194.096 1825.86 194.236 1826.32 194.236 1826.99V1828.22C194.236 1828.77 194.318 1829.14 194.482 1829.31C194.65 1829.47 195.008 1829.56 195.555 1829.56H195.965ZM473.6 1829.56C474.146 1829.56 474.502 1829.47 474.666 1829.31C474.834 1829.14 474.918 1828.77 474.918 1828.22V1826.99C474.918 1826.32 475.059 1825.86 475.34 1825.61C475.621 1825.35 476.141 1825.18 476.898 1825.09C476.117 1824.98 475.592 1824.81 475.322 1824.58C475.053 1824.34 474.918 1823.88 474.918 1823.19V1821.62C474.918 1821.06 474.834 1820.7 474.666 1820.53C474.502 1820.36 474.146 1820.28 473.6 1820.28H473.189V1819.44H473.564C474.537 1819.44 475.188 1819.58 475.516 1819.87C475.848 1820.16 476.014 1820.73 476.014 1821.59V1823.12C476.014 1823.63 476.121 1824.01 476.336 1824.27C476.555 1824.53 476.939 1824.67 477.49 1824.67H478.205V1825.5H477.49C476.986 1825.5 476.613 1825.66 476.371 1825.97C476.133 1826.27 476.014 1826.64 476.014 1827.07V1828.24C476.014 1829.1 475.848 1829.68 475.516 1829.97C475.188 1830.26 474.537 1830.4 473.564 1830.4H473.189V1829.56H473.6ZM195.965 1919.56V1920.4H195.59C194.617 1920.4 193.965 1920.26 193.633 1919.97C193.305 1919.68 193.141 1919.1 193.141 1918.24V1917.07C193.141 1916.64 193.02 1916.27 192.777 1915.97C192.539 1915.66 192.168 1915.5 191.664 1915.5H190.949V1914.67H191.664C192.215 1914.67 192.598 1914.53 192.812 1914.27C193.031 1914.01 193.141 1913.63 193.141 1913.12V1911.59C193.141 1910.73 193.305 1910.16 193.633 1909.87C193.965 1909.58 194.617 1909.44 195.59 1909.44H195.965V1910.28H195.555C195.008 1910.28 194.65 1910.36 194.482 1910.53C194.318 1910.7 194.236 1911.06 194.236 1911.62V1913.19C194.236 1913.88 194.102 1914.34 193.832 1914.58C193.562 1914.81 193.037 1914.98 192.256 1915.09C193.014 1915.18 193.533 1915.35 193.814 1915.61C194.096 1915.86 194.236 1916.32 194.236 1916.99V1918.22C194.236 1918.77 194.318 1919.14 194.482 1919.31C194.65 1919.47 195.008 1919.56 195.555 1919.56H195.965ZM430.217 1919.56C430.764 1919.56 431.119 1919.47 431.283 1919.31C431.451 1919.14 431.535 1918.77 431.535 1918.22V1916.99C431.535 1916.32 431.676 1915.86 431.957 1915.61C432.238 1915.35 432.758 1915.18 433.516 1915.09C432.734 1914.98 432.209 1914.81 431.939 1914.58C431.67 1914.34 431.535 1913.88 431.535 1913.19V1911.62C431.535 1911.06 431.451 1910.7 431.283 1910.53C431.119 1910.36 430.764 1910.28 430.217 1910.28H429.807V1909.44H430.182C431.154 1909.44 431.805 1909.58 432.133 1909.87C432.465 1910.16 432.631 1910.73 432.631 1911.59V1913.12C432.631 1913.63 432.738 1914.01 432.953 1914.27C433.172 1914.53 433.557 1914.67 434.107 1914.67H434.822V1915.5H434.107C433.604 1915.5 433.23 1915.66 432.988 1915.97C432.75 1916.27 432.631 1916.64 432.631 1917.07V1918.24C432.631 1919.1 432.465 1919.68 432.133 1919.97C431.805 1920.26 431.154 1920.4 430.182 1920.4H429.807V1919.56H430.217ZM195.965 2009.56V2010.4H195.59C194.617 2010.4 193.965 2010.26 193.633 2009.97C193.305 2009.68 193.141 2009.1 193.141 2008.24V2007.07C193.141 2006.64 193.02 2006.27 192.777 2005.97C192.539 2005.66 192.168 2005.5 191.664 2005.5H190.949V2004.67H191.664C192.215 2004.67 192.598 2004.53 192.812 2004.27C193.031 2004.01 193.141 2003.63 193.141 2003.12V2001.59C193.141 2000.73 193.305 2000.16 193.633 1999.87C193.965 1999.58 194.617 1999.44 195.59 1999.44H195.965V2000.28H195.555C195.008 2000.28 194.65 2000.36 194.482 2000.53C194.318 2000.7 194.236 2001.06 194.236 2001.62V2003.19C194.236 2003.88 194.102 2004.34 193.832 2004.58C193.562 2004.81 193.037 2004.98 192.256 2005.09C193.014 2005.18 193.533 2005.35 193.814 2005.61C194.096 2005.86 194.236 2006.32 194.236 2006.99V2008.22C194.236 2008.77 194.318 2009.14 194.482 2009.31C194.65 2009.47 195.008 2009.56 195.555 2009.56H195.965ZM422.986 2009.56C423.533 2009.56 423.889 2009.47 424.053 2009.31C424.221 2009.14 424.305 2008.77 424.305 2008.22V2006.99C424.305 2006.32 424.445 2005.86 424.727 2005.61C425.008 2005.35 425.527 2005.18 426.285 2005.09C425.504 2004.98 424.979 2004.81 424.709 2004.58C424.439 2004.34 424.305 2003.88 424.305 2003.19V2001.62C424.305 2001.06 424.221 2000.7 424.053 2000.53C423.889 2000.36 423.533 2000.28 422.986 2000.28H422.576V1999.44H422.951C423.924 1999.44 424.574 1999.58 424.902 1999.87C425.234 2000.16 425.4 2000.73 425.4 2001.59V2003.12C425.4 2003.63 425.508 2004.01 425.723 2004.27C425.941 2004.53 426.326 2004.67 426.877 2004.67H427.592V2005.5H426.877C426.373 2005.5 426 2005.66 425.758 2005.97C425.52 2006.27 425.4 2006.64 425.4 2007.07V2008.24C425.4 2009.1 425.234 2009.68 424.902 2009.97C424.574 2010.26 423.924 2010.4 422.951 2010.4H422.576V2009.56H422.986ZM129.871 2039.53V2036.14H130.949V2045.26H129.871V2044.43C129.691 2044.76 129.451 2045.01 129.15 2045.18C128.854 2045.34 128.51 2045.43 128.119 2045.43C127.326 2045.43 126.701 2045.12 126.244 2044.51C125.791 2043.89 125.564 2043.04 125.564 2041.96C125.564 2040.89 125.793 2040.06 126.25 2039.45C126.707 2038.84 127.33 2038.54 128.119 2038.54C128.514 2038.54 128.861 2038.62 129.162 2038.8C129.463 2038.96 129.699 2039.21 129.871 2039.53ZM126.701 2041.98C126.701 2042.82 126.834 2043.45 127.1 2043.88C127.365 2044.3 127.758 2044.51 128.277 2044.51C128.797 2044.51 129.191 2044.3 129.461 2043.87C129.734 2043.44 129.871 2042.81 129.871 2041.98C129.871 2041.15 129.734 2040.52 129.461 2040.1C129.191 2039.67 128.797 2039.45 128.277 2039.45C127.758 2039.45 127.365 2039.67 127.1 2040.09C126.834 2040.52 126.701 2041.15 126.701 2041.98ZM133.926 2038.72H136.686V2044.42H138.824V2045.26H133.469V2044.42H135.607V2039.56H133.926V2038.72ZM135.607 2036.17H136.686V2037.53H135.607V2036.17ZM139.891 2038.7H141.01L142.914 2044.2L144.824 2038.7H145.943L143.611 2045.26H142.223L139.891 2038.7ZM115.41 2057.53V2054.14H116.488V2063.26H115.41V2062.43C115.23 2062.76 114.99 2063.01 114.689 2063.18C114.393 2063.34 114.049 2063.43 113.658 2063.43C112.865 2063.43 112.24 2063.12 111.783 2062.51C111.33 2061.89 111.104 2061.04 111.104 2059.96C111.104 2058.89 111.332 2058.06 111.789 2057.45C112.246 2056.84 112.869 2056.54 113.658 2056.54C114.053 2056.54 114.4 2056.62 114.701 2056.8C115.002 2056.96 115.238 2057.21 115.41 2057.53ZM112.24 2059.98C112.24 2060.82 112.373 2061.45 112.639 2061.88C112.904 2062.3 113.297 2062.51 113.816 2062.51C114.336 2062.51 114.73 2062.3 115 2061.87C115.273 2061.44 115.41 2060.81 115.41 2059.98C115.41 2059.15 115.273 2058.52 115 2058.1C114.73 2057.67 114.336 2057.45 113.816 2057.45C113.297 2057.45 112.904 2057.67 112.639 2058.09C112.373 2058.52 112.24 2059.15 112.24 2059.98ZM119.465 2056.72H122.225V2062.42H124.363V2063.26H119.008V2062.42H121.146V2057.56H119.465V2056.72ZM121.146 2054.17H122.225V2055.53H121.146V2054.17ZM125.43 2056.7H126.549L128.453 2062.2L130.363 2056.7H131.482L129.15 2063.26H127.762L125.43 2056.7Z" fill="var(--vscode-editorGutter-modifiedBackground, #569CD6)" />
+                      <path d="M141.643 165.484V168.771H143.014C143.561 168.771 143.986 168.626 144.291 168.337C144.6 168.048 144.754 167.644 144.754 167.124C144.754 166.605 144.602 166.202 144.297 165.917C143.992 165.628 143.564 165.484 143.014 165.484H141.643ZM140.459 164.511H143.014C143.99 164.511 144.73 164.734 145.234 165.179C145.738 165.62 145.99 166.269 145.99 167.124C145.99 167.987 145.738 168.64 145.234 169.081C144.734 169.523 143.994 169.743 143.014 169.743H141.643V173.259H140.459V164.511ZM153.303 168.05C153.072 167.87 152.838 167.739 152.6 167.657C152.361 167.575 152.1 167.534 151.814 167.534C151.143 167.534 150.629 167.745 150.273 168.167C149.918 168.589 149.74 169.198 149.74 169.995V173.259H148.656V166.696H149.74V167.98C149.92 167.515 150.195 167.159 150.566 166.913C150.941 166.663 151.385 166.538 151.896 166.538C152.162 166.538 152.41 166.571 152.641 166.638C152.871 166.704 153.092 166.808 153.303 166.948V168.05ZM157.375 167.452C156.828 167.452 156.414 167.665 156.133 168.091C155.852 168.517 155.711 169.148 155.711 169.984C155.711 170.816 155.852 171.446 156.133 171.876C156.414 172.302 156.828 172.515 157.375 172.515C157.926 172.515 158.342 172.302 158.623 171.876C158.904 171.446 159.045 170.816 159.045 169.984C159.045 169.148 158.904 168.517 158.623 168.091C158.342 167.665 157.926 167.452 157.375 167.452ZM157.375 166.538C158.285 166.538 158.98 166.833 159.461 167.423C159.945 168.013 160.188 168.866 160.188 169.984C160.188 171.105 159.947 171.96 159.467 172.55C158.986 173.136 158.289 173.429 157.375 173.429C156.465 173.429 155.77 173.136 155.289 172.55C154.809 171.96 154.568 171.105 154.568 169.984C154.568 168.866 154.809 168.013 155.289 167.423C155.77 166.833 156.465 166.538 157.375 166.538ZM164.512 173.376V167.534H162.654V166.696H165.59V173.376C165.59 174.138 165.414 174.724 165.062 175.134C164.715 175.548 164.219 175.755 163.574 175.755H162.086V174.841H163.457C163.809 174.841 164.072 174.718 164.248 174.472C164.424 174.23 164.512 173.864 164.512 173.376ZM164.512 164.142H165.59V165.507H164.512V164.142ZM174.789 169.439V169.966H170.119V170.001C170.088 170.896 170.258 171.538 170.629 171.929C171.004 172.319 171.531 172.515 172.211 172.515C172.555 172.515 172.914 172.46 173.289 172.351C173.664 172.241 174.064 172.075 174.49 171.853V172.925C174.08 173.093 173.684 173.218 173.301 173.3C172.922 173.386 172.555 173.429 172.199 173.429C171.18 173.429 170.383 173.124 169.809 172.515C169.234 171.901 168.947 171.058 168.947 169.984C168.947 168.937 169.229 168.101 169.791 167.476C170.354 166.851 171.104 166.538 172.041 166.538C172.877 166.538 173.535 166.821 174.016 167.388C174.5 167.954 174.758 168.638 174.789 169.439ZM173.711 169.122C173.664 168.669 173.498 168.278 173.213 167.95C172.932 167.618 172.525 167.452 171.994 167.452C171.475 167.452 171.047 167.624 170.711 167.968C170.375 168.312 170.191 168.698 170.16 169.128L173.711 169.122ZM181.674 172.925C181.385 173.093 181.086 173.218 180.777 173.3C180.473 173.386 180.16 173.429 179.84 173.429C178.824 173.429 178.029 173.124 177.455 172.515C176.885 171.905 176.6 171.062 176.6 169.984C176.6 168.905 176.885 168.062 177.455 167.452C178.029 166.843 178.824 166.538 179.84 166.538C180.156 166.538 180.465 166.579 180.766 166.661C181.066 166.743 181.369 166.87 181.674 167.042V168.173C181.389 167.919 181.102 167.735 180.812 167.622C180.527 167.509 180.203 167.452 179.84 167.452C179.164 167.452 178.645 167.671 178.281 168.109C177.918 168.546 177.736 169.171 177.736 169.984C177.736 170.792 177.918 171.417 178.281 171.859C178.648 172.296 179.168 172.515 179.84 172.515C180.215 172.515 180.551 172.458 180.848 172.345C181.145 172.228 181.42 172.048 181.674 171.806V172.925ZM186.285 164.833V166.696H188.734V167.534H186.285V171.097C186.285 171.581 186.377 171.919 186.561 172.11C186.744 172.302 187.064 172.398 187.521 172.398H188.734V173.259H187.416C186.607 173.259 186.037 173.097 185.705 172.773C185.373 172.448 185.207 171.89 185.207 171.097V167.534H183.455V166.696H185.207V164.833H186.285ZM192.256 165.484V168.771H193.627C194.174 168.771 194.6 168.626 194.904 168.337C195.213 168.048 195.367 167.644 195.367 167.124C195.367 166.605 195.215 166.202 194.91 165.917C194.605 165.628 194.178 165.484 193.627 165.484H192.256ZM191.072 164.511H193.627C194.604 164.511 195.344 164.734 195.848 165.179C196.352 165.62 196.604 166.269 196.604 167.124C196.604 167.987 196.352 168.64 195.848 169.081C195.348 169.523 194.607 169.743 193.627 169.743H192.256V173.259H191.072V164.511ZM203.916 168.05C203.686 167.87 203.451 167.739 203.213 167.657C202.975 167.575 202.713 167.534 202.428 167.534C201.756 167.534 201.242 167.745 200.887 168.167C200.531 168.589 200.354 169.198 200.354 169.995V173.259H199.27V166.696H200.354V167.98C200.533 167.515 200.809 167.159 201.18 166.913C201.555 166.663 201.998 166.538 202.51 166.538C202.775 166.538 203.023 166.571 203.254 166.638C203.484 166.704 203.705 166.808 203.916 166.948V168.05ZM207.988 167.452C207.441 167.452 207.027 167.665 206.746 168.091C206.465 168.517 206.324 169.148 206.324 169.984C206.324 170.816 206.465 171.446 206.746 171.876C207.027 172.302 207.441 172.515 207.988 172.515C208.539 172.515 208.955 172.302 209.236 171.876C209.518 171.446 209.658 170.816 209.658 169.984C209.658 169.148 209.518 168.517 209.236 168.091C208.955 167.665 208.539 167.452 207.988 167.452ZM207.988 166.538C208.898 166.538 209.594 166.833 210.074 167.423C210.559 168.013 210.801 168.866 210.801 169.984C210.801 171.105 210.561 171.96 210.08 172.55C209.6 173.136 208.902 173.429 207.988 173.429C207.078 173.429 206.383 173.136 205.902 172.55C205.422 171.96 205.182 171.105 205.182 169.984C205.182 168.866 205.422 168.013 205.902 167.423C206.383 166.833 207.078 166.538 207.988 166.538ZM213.807 172.433V175.755H212.723V166.696H213.807V167.534C213.986 167.21 214.225 166.964 214.521 166.796C214.822 166.624 215.168 166.538 215.559 166.538C216.352 166.538 216.973 166.845 217.422 167.458C217.875 168.071 218.102 168.921 218.102 170.007C218.102 171.073 217.875 171.911 217.422 172.521C216.969 173.126 216.348 173.429 215.559 173.429C215.16 173.429 214.811 173.345 214.51 173.177C214.213 173.005 213.979 172.757 213.807 172.433ZM216.971 169.984C216.971 169.148 216.838 168.517 216.572 168.091C216.311 167.665 215.92 167.452 215.4 167.452C214.877 167.452 214.48 167.667 214.211 168.097C213.941 168.523 213.807 169.151 213.807 169.984C213.807 170.812 213.941 171.441 214.211 171.87C214.48 172.3 214.877 172.515 215.4 172.515C215.92 172.515 216.311 172.302 216.572 171.876C216.838 171.45 216.971 170.819 216.971 169.984ZM224.541 166.925V167.98C224.232 167.8 223.922 167.665 223.609 167.575C223.297 167.485 222.979 167.441 222.654 167.441C222.166 167.441 221.801 167.521 221.559 167.681C221.32 167.837 221.201 168.077 221.201 168.401C221.201 168.694 221.291 168.913 221.471 169.058C221.65 169.202 222.098 169.343 222.812 169.48L223.246 169.562C223.781 169.663 224.186 169.866 224.459 170.171C224.736 170.476 224.875 170.872 224.875 171.36C224.875 172.009 224.645 172.517 224.184 172.884C223.723 173.247 223.082 173.429 222.262 173.429C221.938 173.429 221.598 173.394 221.242 173.323C220.887 173.257 220.502 173.155 220.088 173.019V171.905C220.49 172.112 220.875 172.269 221.242 172.374C221.609 172.476 221.957 172.526 222.285 172.526C222.762 172.526 223.131 172.431 223.393 172.239C223.654 172.044 223.785 171.773 223.785 171.425C223.785 170.925 223.307 170.579 222.35 170.388L222.303 170.376L221.898 170.294C221.277 170.173 220.824 169.97 220.539 169.685C220.254 169.396 220.111 169.003 220.111 168.507C220.111 167.878 220.324 167.394 220.75 167.054C221.176 166.71 221.783 166.538 222.572 166.538C222.924 166.538 223.262 166.571 223.586 166.638C223.91 166.7 224.229 166.796 224.541 166.925ZM137.775 184.925V185.98C137.467 185.8 137.156 185.665 136.844 185.575C136.531 185.485 136.213 185.441 135.889 185.441C135.4 185.441 135.035 185.521 134.793 185.681C134.555 185.837 134.436 186.077 134.436 186.401C134.436 186.694 134.525 186.913 134.705 187.058C134.885 187.202 135.332 187.343 136.047 187.48L136.48 187.562C137.016 187.663 137.42 187.866 137.693 188.171C137.971 188.476 138.109 188.872 138.109 189.36C138.109 190.009 137.879 190.517 137.418 190.884C136.957 191.247 136.316 191.429 135.496 191.429C135.172 191.429 134.832 191.394 134.477 191.323C134.121 191.257 133.736 191.155 133.322 191.019V189.905C133.725 190.112 134.109 190.269 134.477 190.374C134.844 190.476 135.191 190.526 135.52 190.526C135.996 190.526 136.365 190.431 136.627 190.239C136.889 190.044 137.02 189.773 137.02 189.425C137.02 188.925 136.541 188.579 135.584 188.388L135.537 188.376L135.133 188.294C134.512 188.173 134.059 187.97 133.773 187.685C133.488 187.396 133.346 187.003 133.346 186.507C133.346 185.878 133.559 185.394 133.984 185.054C134.41 184.71 135.018 184.538 135.807 184.538C136.158 184.538 136.496 184.571 136.82 184.638C137.145 184.7 137.463 184.796 137.775 184.925ZM142.902 182.833V184.696H145.352V185.534H142.902V189.097C142.902 189.581 142.994 189.919 143.178 190.11C143.361 190.302 143.682 190.398 144.139 190.398H145.352V191.259H144.033C143.225 191.259 142.654 191.097 142.322 190.773C141.99 190.448 141.824 189.89 141.824 189.097V185.534H140.072V184.696H141.824V182.833H142.902ZM153.303 186.05C153.072 185.87 152.838 185.739 152.6 185.657C152.361 185.575 152.1 185.534 151.814 185.534C151.143 185.534 150.629 185.745 150.273 186.167C149.918 186.589 149.74 187.198 149.74 187.995V191.259H148.656V184.696H149.74V185.98C149.92 185.515 150.195 185.159 150.566 184.913C150.941 184.663 151.385 184.538 151.896 184.538C152.162 184.538 152.41 184.571 152.641 184.638C152.871 184.704 153.092 184.808 153.303 184.948V186.05ZM155.617 184.72H158.377V190.421H160.516V191.259H155.16V190.421H157.299V185.558H155.617V184.72ZM157.299 182.171H158.377V183.53H157.299V182.171ZM167.154 187.193V191.259H166.07V187.193C166.07 186.603 165.967 186.169 165.76 185.892C165.553 185.614 165.229 185.476 164.787 185.476C164.283 185.476 163.895 185.655 163.621 186.015C163.352 186.37 163.217 186.882 163.217 187.55V191.259H162.139V184.696H163.217V185.681C163.408 185.306 163.668 185.023 163.996 184.831C164.324 184.636 164.713 184.538 165.162 184.538C165.83 184.538 166.328 184.759 166.656 185.2C166.988 185.638 167.154 186.302 167.154 187.193ZM173.254 187.925C173.254 187.116 173.121 186.503 172.855 186.085C172.594 185.663 172.211 185.452 171.707 185.452C171.18 185.452 170.777 185.663 170.5 186.085C170.223 186.503 170.084 187.116 170.084 187.925C170.084 188.734 170.223 189.351 170.5 189.776C170.781 190.198 171.188 190.409 171.719 190.409C172.215 190.409 172.594 190.196 172.855 189.771C173.121 189.345 173.254 188.73 173.254 187.925ZM174.332 190.837C174.332 191.821 174.1 192.568 173.635 193.075C173.17 193.583 172.486 193.837 171.584 193.837C171.287 193.837 170.977 193.81 170.652 193.755C170.328 193.7 170.004 193.62 169.68 193.515V192.448C170.062 192.628 170.41 192.761 170.723 192.847C171.035 192.933 171.322 192.976 171.584 192.976C172.166 192.976 172.59 192.818 172.855 192.501C173.121 192.185 173.254 191.683 173.254 190.995V190.948V190.216C173.082 190.583 172.848 190.857 172.551 191.036C172.254 191.216 171.893 191.306 171.467 191.306C170.701 191.306 170.09 190.999 169.633 190.386C169.176 189.773 168.947 188.952 168.947 187.925C168.947 186.894 169.176 186.071 169.633 185.458C170.09 184.845 170.701 184.538 171.467 184.538C171.889 184.538 172.246 184.622 172.539 184.79C172.832 184.958 173.07 185.218 173.254 185.569V184.72H174.332V190.837ZM181.158 202.925V203.98C180.85 203.8 180.539 203.665 180.227 203.575C179.914 203.485 179.596 203.441 179.271 203.441C178.783 203.441 178.418 203.521 178.176 203.681C177.938 203.837 177.818 204.077 177.818 204.401C177.818 204.694 177.908 204.913 178.088 205.058C178.268 205.202 178.715 205.343 179.43 205.48L179.863 205.562C180.398 205.663 180.803 205.866 181.076 206.171C181.354 206.476 181.492 206.872 181.492 207.36C181.492 208.009 181.262 208.517 180.801 208.884C180.34 209.247 179.699 209.429 178.879 209.429C178.555 209.429 178.215 209.394 177.859 209.323C177.504 209.257 177.119 209.155 176.705 209.019V207.905C177.107 208.112 177.492 208.269 177.859 208.374C178.227 208.476 178.574 208.526 178.902 208.526C179.379 208.526 179.748 208.431 180.01 208.239C180.271 208.044 180.402 207.773 180.402 207.425C180.402 206.925 179.924 206.579 178.967 206.388L178.92 206.376L178.516 206.294C177.895 206.173 177.441 205.97 177.156 205.685C176.871 205.396 176.729 205.003 176.729 204.507C176.729 203.878 176.941 203.394 177.367 203.054C177.793 202.71 178.4 202.538 179.189 202.538C179.541 202.538 179.879 202.571 180.203 202.638C180.527 202.7 180.846 202.796 181.158 202.925ZM186.285 200.833V202.696H188.734V203.534H186.285V207.097C186.285 207.581 186.377 207.919 186.561 208.11C186.744 208.302 187.064 208.398 187.521 208.398H188.734V209.259H187.416C186.607 209.259 186.037 209.097 185.705 208.773C185.373 208.448 185.207 207.89 185.207 207.097V203.534H183.455V202.696H185.207V200.833H186.285ZM196.686 204.05C196.455 203.87 196.221 203.739 195.982 203.657C195.744 203.575 195.482 203.534 195.197 203.534C194.525 203.534 194.012 203.745 193.656 204.167C193.301 204.589 193.123 205.198 193.123 205.995V209.259H192.039V202.696H193.123V203.98C193.303 203.515 193.578 203.159 193.949 202.913C194.324 202.663 194.768 202.538 195.279 202.538C195.545 202.538 195.793 202.571 196.023 202.638C196.254 202.704 196.475 202.808 196.686 202.948V204.05ZM199 202.72H201.76V208.421H203.898V209.259H198.543V208.421H200.682V203.558H199V202.72ZM200.682 200.171H201.76V201.53H200.682V200.171ZM210.537 205.193V209.259H209.453V205.193C209.453 204.603 209.35 204.169 209.143 203.892C208.936 203.614 208.611 203.476 208.17 203.476C207.666 203.476 207.277 203.655 207.004 204.015C206.734 204.37 206.6 204.882 206.6 205.55V209.259H205.521V202.696H206.6V203.681C206.791 203.306 207.051 203.023 207.379 202.831C207.707 202.636 208.096 202.538 208.545 202.538C209.213 202.538 209.711 202.759 210.039 203.2C210.371 203.638 210.537 204.302 210.537 205.193ZM216.637 205.925C216.637 205.116 216.504 204.503 216.238 204.085C215.977 203.663 215.594 203.452 215.09 203.452C214.562 203.452 214.16 203.663 213.883 204.085C213.605 204.503 213.467 205.116 213.467 205.925C213.467 206.734 213.605 207.351 213.883 207.776C214.164 208.198 214.57 208.409 215.102 208.409C215.598 208.409 215.977 208.196 216.238 207.771C216.504 207.345 216.637 206.73 216.637 205.925ZM217.715 208.837C217.715 209.821 217.482 210.568 217.018 211.075C216.553 211.583 215.869 211.837 214.967 211.837C214.67 211.837 214.359 211.81 214.035 211.755C213.711 211.7 213.387 211.62 213.062 211.515V210.448C213.445 210.628 213.793 210.761 214.105 210.847C214.418 210.933 214.705 210.976 214.967 210.976C215.549 210.976 215.973 210.818 216.238 210.501C216.504 210.185 216.637 209.683 216.637 208.995V208.948V208.216C216.465 208.583 216.23 208.857 215.934 209.036C215.637 209.216 215.275 209.306 214.85 209.306C214.084 209.306 213.473 208.999 213.016 208.386C212.559 207.773 212.33 206.952 212.33 205.925C212.33 204.894 212.559 204.071 213.016 203.458C213.473 202.845 214.084 202.538 214.85 202.538C215.271 202.538 215.629 202.622 215.922 202.79C216.215 202.958 216.453 203.218 216.637 203.569V202.72H217.715V208.837ZM145.006 220.925V221.98C144.697 221.8 144.387 221.665 144.074 221.575C143.762 221.485 143.443 221.441 143.119 221.441C142.631 221.441 142.266 221.521 142.023 221.681C141.785 221.837 141.666 222.077 141.666 222.401C141.666 222.694 141.756 222.913 141.936 223.058C142.115 223.202 142.562 223.343 143.277 223.48L143.711 223.562C144.246 223.663 144.65 223.866 144.924 224.171C145.201 224.476 145.34 224.872 145.34 225.36C145.34 226.009 145.109 226.517 144.648 226.884C144.188 227.247 143.547 227.429 142.727 227.429C142.402 227.429 142.062 227.394 141.707 227.323C141.352 227.257 140.967 227.155 140.553 227.019V225.905C140.955 226.112 141.34 226.269 141.707 226.374C142.074 226.476 142.422 226.526 142.75 226.526C143.227 226.526 143.596 226.431 143.857 226.239C144.119 226.044 144.25 225.773 144.25 225.425C144.25 224.925 143.771 224.579 142.814 224.388L142.768 224.376L142.363 224.294C141.742 224.173 141.289 223.97 141.004 223.685C140.719 223.396 140.576 223.003 140.576 222.507C140.576 221.878 140.789 221.394 141.215 221.054C141.641 220.71 142.248 220.538 143.037 220.538C143.389 220.538 143.727 220.571 144.051 220.638C144.375 220.7 144.693 220.796 145.006 220.925ZM150.133 218.833V220.696H152.582V221.534H150.133V225.097C150.133 225.581 150.225 225.919 150.408 226.11C150.592 226.302 150.912 226.398 151.369 226.398H152.582V227.259H151.264C150.455 227.259 149.885 227.097 149.553 226.773C149.221 226.448 149.055 225.89 149.055 225.097V221.534H147.303V220.696H149.055V218.833H150.133ZM160.533 222.05C160.303 221.87 160.068 221.739 159.83 221.657C159.592 221.575 159.33 221.534 159.045 221.534C158.373 221.534 157.859 221.745 157.504 222.167C157.148 222.589 156.971 223.198 156.971 223.995V227.259H155.887V220.696H156.971V221.98C157.15 221.515 157.426 221.159 157.797 220.913C158.172 220.663 158.615 220.538 159.127 220.538C159.393 220.538 159.641 220.571 159.871 220.638C160.102 220.704 160.322 220.808 160.533 220.948V222.05ZM162.848 220.72H165.607V226.421H167.746V227.259H162.391V226.421H164.529V221.558H162.848V220.72ZM164.529 218.171H165.607V219.53H164.529V218.171ZM174.385 223.193V227.259H173.301V223.193C173.301 222.603 173.197 222.169 172.99 221.892C172.783 221.614 172.459 221.476 172.018 221.476C171.514 221.476 171.125 221.655 170.852 222.015C170.582 222.37 170.447 222.882 170.447 223.55V227.259H169.369V220.696H170.447V221.681C170.639 221.306 170.898 221.023 171.227 220.831C171.555 220.636 171.943 220.538 172.393 220.538C173.061 220.538 173.559 220.759 173.887 221.2C174.219 221.638 174.385 222.302 174.385 223.193ZM180.484 223.925C180.484 223.116 180.352 222.503 180.086 222.085C179.824 221.663 179.441 221.452 178.938 221.452C178.41 221.452 178.008 221.663 177.73 222.085C177.453 222.503 177.314 223.116 177.314 223.925C177.314 224.734 177.453 225.351 177.73 225.776C178.012 226.198 178.418 226.409 178.949 226.409C179.445 226.409 179.824 226.196 180.086 225.771C180.352 225.345 180.484 224.73 180.484 223.925ZM181.562 226.837C181.562 227.821 181.33 228.568 180.865 229.075C180.4 229.583 179.717 229.837 178.814 229.837C178.518 229.837 178.207 229.81 177.883 229.755C177.559 229.7 177.234 229.62 176.91 229.515V228.448C177.293 228.628 177.641 228.761 177.953 228.847C178.266 228.933 178.553 228.976 178.814 228.976C179.396 228.976 179.82 228.818 180.086 228.501C180.352 228.185 180.484 227.683 180.484 226.995V226.948V226.216C180.312 226.583 180.078 226.857 179.781 227.036C179.484 227.216 179.123 227.306 178.697 227.306C177.932 227.306 177.32 226.999 176.863 226.386C176.406 225.773 176.178 224.952 176.178 223.925C176.178 222.894 176.406 222.071 176.863 221.458C177.32 220.845 177.932 220.538 178.697 220.538C179.119 220.538 179.477 220.622 179.77 220.79C180.062 220.958 180.301 221.218 180.484 221.569V220.72H181.562V226.837ZM130.545 238.925V239.98C130.236 239.8 129.926 239.665 129.613 239.575C129.301 239.485 128.982 239.441 128.658 239.441C128.17 239.441 127.805 239.521 127.562 239.681C127.324 239.837 127.205 240.077 127.205 240.401C127.205 240.694 127.295 240.913 127.475 241.058C127.654 241.202 128.102 241.343 128.816 241.48L129.25 241.562C129.785 241.663 130.189 241.866 130.463 242.171C130.74 242.476 130.879 242.872 130.879 243.36C130.879 244.009 130.648 244.517 130.188 244.884C129.727 245.247 129.086 245.429 128.266 245.429C127.941 245.429 127.602 245.394 127.246 245.323C126.891 245.257 126.506 245.155 126.092 245.019V243.905C126.494 244.112 126.879 244.269 127.246 244.374C127.613 244.476 127.961 244.526 128.289 244.526C128.766 244.526 129.135 244.431 129.396 244.239C129.658 244.044 129.789 243.773 129.789 243.425C129.789 242.925 129.311 242.579 128.354 242.388L128.307 242.376L127.902 242.294C127.281 242.173 126.828 241.97 126.543 241.685C126.258 241.396 126.115 241.003 126.115 240.507C126.115 239.878 126.328 239.394 126.754 239.054C127.18 238.71 127.787 238.538 128.576 238.538C128.928 238.538 129.266 238.571 129.59 238.638C129.914 238.7 130.232 238.796 130.545 238.925ZM135.672 236.833V238.696H138.121V239.534H135.672V243.097C135.672 243.581 135.764 243.919 135.947 244.11C136.131 244.302 136.451 244.398 136.908 244.398H138.121V245.259H136.803C135.994 245.259 135.424 245.097 135.092 244.773C134.76 244.448 134.594 243.89 134.594 243.097V239.534H132.842V238.696H134.594V236.833H135.672ZM146.072 240.05C145.842 239.87 145.607 239.739 145.369 239.657C145.131 239.575 144.869 239.534 144.584 239.534C143.912 239.534 143.398 239.745 143.043 240.167C142.688 240.589 142.51 241.198 142.51 241.995V245.259H141.426V238.696H142.51V239.98C142.689 239.515 142.965 239.159 143.336 238.913C143.711 238.663 144.154 238.538 144.666 238.538C144.932 238.538 145.18 238.571 145.41 238.638C145.641 238.704 145.861 238.808 146.072 238.948V240.05ZM148.387 238.72H151.146V244.421H153.285V245.259H147.93V244.421H150.068V239.558H148.387V238.72ZM150.068 236.171H151.146V237.53H150.068V236.171ZM159.924 241.193V245.259H158.84V241.193C158.84 240.603 158.736 240.169 158.529 239.892C158.322 239.614 157.998 239.476 157.557 239.476C157.053 239.476 156.664 239.655 156.391 240.015C156.121 240.37 155.986 240.882 155.986 241.55V245.259H154.908V238.696H155.986V239.681C156.178 239.306 156.438 239.023 156.766 238.831C157.094 238.636 157.482 238.538 157.932 238.538C158.6 238.538 159.098 238.759 159.426 239.2C159.758 239.638 159.924 240.302 159.924 241.193ZM166.023 241.925C166.023 241.116 165.891 240.503 165.625 240.085C165.363 239.663 164.98 239.452 164.477 239.452C163.949 239.452 163.547 239.663 163.27 240.085C162.992 240.503 162.854 241.116 162.854 241.925C162.854 242.734 162.992 243.351 163.27 243.776C163.551 244.198 163.957 244.409 164.488 244.409C164.984 244.409 165.363 244.196 165.625 243.771C165.891 243.345 166.023 242.73 166.023 241.925ZM167.102 244.837C167.102 245.821 166.869 246.568 166.404 247.075C165.939 247.583 165.256 247.837 164.354 247.837C164.057 247.837 163.746 247.81 163.422 247.755C163.098 247.7 162.773 247.62 162.449 247.515V246.448C162.832 246.628 163.18 246.761 163.492 246.847C163.805 246.933 164.092 246.976 164.354 246.976C164.936 246.976 165.359 246.818 165.625 246.501C165.891 246.185 166.023 245.683 166.023 244.995V244.948V244.216C165.852 244.583 165.617 244.857 165.32 245.036C165.023 245.216 164.662 245.306 164.236 245.306C163.471 245.306 162.859 244.999 162.402 244.386C161.945 243.773 161.717 242.952 161.717 241.925C161.717 240.894 161.945 240.071 162.402 239.458C162.859 238.845 163.471 238.538 164.236 238.538C164.658 238.538 165.016 238.622 165.309 238.79C165.602 238.958 165.84 239.218 166.023 239.569V238.72H167.102V244.837ZM179.91 295.128C180.215 295.206 180.475 295.355 180.689 295.573C180.904 295.788 181.172 296.22 181.492 296.868L182.682 299.259H181.41L180.367 297.05C180.066 296.421 179.795 296.017 179.553 295.837C179.314 295.653 179.002 295.562 178.615 295.562H177.484V299.259H176.295V290.511H178.732C179.693 290.511 180.43 290.728 180.941 291.161C181.453 291.595 181.709 292.222 181.709 293.042C181.709 293.62 181.551 294.093 181.234 294.46C180.922 294.823 180.48 295.046 179.91 295.128ZM177.484 291.484V294.589H178.779C179.346 294.589 179.768 294.462 180.045 294.208C180.322 293.954 180.461 293.566 180.461 293.042C180.461 292.538 180.312 292.153 180.016 291.888C179.723 291.618 179.295 291.484 178.732 291.484H177.484ZM189.25 295.439V295.966H184.58V296.001C184.549 296.896 184.719 297.538 185.09 297.929C185.465 298.319 185.992 298.515 186.672 298.515C187.016 298.515 187.375 298.46 187.75 298.351C188.125 298.241 188.525 298.075 188.951 297.853V298.925C188.541 299.093 188.145 299.218 187.762 299.3C187.383 299.386 187.016 299.429 186.66 299.429C185.641 299.429 184.844 299.124 184.27 298.515C183.695 297.901 183.408 297.058 183.408 295.984C183.408 294.937 183.689 294.101 184.252 293.476C184.814 292.851 185.564 292.538 186.502 292.538C187.338 292.538 187.996 292.821 188.477 293.388C188.961 293.954 189.219 294.638 189.25 295.439ZM188.172 295.122C188.125 294.669 187.959 294.278 187.674 293.95C187.393 293.618 186.986 293.452 186.455 293.452C185.936 293.452 185.508 293.624 185.172 293.968C184.836 294.312 184.652 294.698 184.621 295.128L188.172 295.122ZM194.031 295.96H193.674C193.045 295.96 192.57 296.071 192.25 296.294C191.934 296.513 191.775 296.841 191.775 297.278C191.775 297.673 191.895 297.98 192.133 298.198C192.371 298.417 192.701 298.526 193.123 298.526C193.717 298.526 194.184 298.321 194.523 297.911C194.863 297.497 195.035 296.927 195.039 296.2V295.96H194.031ZM196.123 295.515V299.259H195.039V298.286C194.809 298.677 194.518 298.966 194.166 299.153C193.818 299.337 193.395 299.429 192.895 299.429C192.227 299.429 191.693 299.241 191.295 298.866C190.896 298.487 190.697 297.982 190.697 297.349C190.697 296.618 190.941 296.064 191.43 295.685C191.922 295.306 192.643 295.116 193.592 295.116H195.039V294.946C195.035 294.423 194.902 294.044 194.641 293.81C194.379 293.571 193.961 293.452 193.387 293.452C193.02 293.452 192.648 293.505 192.273 293.61C191.898 293.716 191.533 293.87 191.178 294.073V292.995C191.576 292.843 191.957 292.73 192.32 292.655C192.688 292.577 193.043 292.538 193.387 292.538C193.93 292.538 194.393 292.618 194.775 292.778C195.162 292.939 195.475 293.179 195.713 293.499C195.861 293.694 195.967 293.937 196.029 294.226C196.092 294.511 196.123 294.941 196.123 295.515ZM203.365 298.925C203.076 299.093 202.777 299.218 202.469 299.3C202.164 299.386 201.852 299.429 201.531 299.429C200.516 299.429 199.721 299.124 199.146 298.515C198.576 297.905 198.291 297.062 198.291 295.984C198.291 294.905 198.576 294.062 199.146 293.452C199.721 292.843 200.516 292.538 201.531 292.538C201.848 292.538 202.156 292.579 202.457 292.661C202.758 292.743 203.061 292.87 203.365 293.042V294.173C203.08 293.919 202.793 293.735 202.504 293.622C202.219 293.509 201.895 293.452 201.531 293.452C200.855 293.452 200.336 293.671 199.973 294.109C199.609 294.546 199.428 295.171 199.428 295.984C199.428 296.792 199.609 297.417 199.973 297.859C200.34 298.296 200.859 298.515 201.531 298.515C201.906 298.515 202.242 298.458 202.539 298.345C202.836 298.228 203.111 298.048 203.365 297.806V298.925ZM207.977 290.833V292.696H210.426V293.534H207.977V297.097C207.977 297.581 208.068 297.919 208.252 298.11C208.436 298.302 208.756 298.398 209.213 298.398H210.426V299.259H209.107C208.299 299.259 207.729 299.097 207.396 298.773C207.064 298.448 206.898 297.89 206.898 297.097V293.534H205.146V292.696H206.898V290.833H207.977ZM220.205 290.511H225.355V291.507H221.395V293.851H224.986V294.847H221.395V299.259H220.205V290.511ZM232.357 298.948C232.057 299.109 231.748 299.228 231.432 299.306C231.115 299.388 230.779 299.429 230.424 299.429C229.303 299.429 228.432 299.032 227.811 298.239C227.193 297.446 226.885 296.331 226.885 294.894C226.885 293.464 227.195 292.351 227.816 291.554C228.441 290.753 229.311 290.353 230.424 290.353C230.779 290.353 231.115 290.394 231.432 290.476C231.748 290.554 232.057 290.673 232.357 290.833V292.046C232.068 291.808 231.758 291.626 231.426 291.501C231.094 291.376 230.76 291.314 230.424 291.314C229.654 291.314 229.078 291.61 228.695 292.204C228.312 292.798 228.121 293.694 228.121 294.894C228.121 296.089 228.312 296.984 228.695 297.577C229.078 298.171 229.654 298.468 230.424 298.468C230.768 298.468 231.104 298.405 231.432 298.28C231.764 298.155 232.072 297.974 232.357 297.735V298.948ZM242.869 291.484V294.771H244.24C244.787 294.771 245.213 294.626 245.518 294.337C245.826 294.048 245.98 293.644 245.98 293.124C245.98 292.605 245.828 292.202 245.523 291.917C245.219 291.628 244.791 291.484 244.24 291.484H242.869ZM241.686 290.511H244.24C245.217 290.511 245.957 290.734 246.461 291.179C246.965 291.62 247.217 292.269 247.217 293.124C247.217 293.987 246.965 294.64 246.461 295.081C245.961 295.523 245.221 295.743 244.24 295.743H242.869V299.259H241.686V290.511ZM254.529 294.05C254.299 293.87 254.064 293.739 253.826 293.657C253.588 293.575 253.326 293.534 253.041 293.534C252.369 293.534 251.855 293.745 251.5 294.167C251.145 294.589 250.967 295.198 250.967 295.995V299.259H249.883V292.696H250.967V293.98C251.146 293.515 251.422 293.159 251.793 292.913C252.168 292.663 252.611 292.538 253.123 292.538C253.389 292.538 253.637 292.571 253.867 292.638C254.098 292.704 254.318 292.808 254.529 292.948V294.05ZM258.602 293.452C258.055 293.452 257.641 293.665 257.359 294.091C257.078 294.517 256.938 295.148 256.938 295.984C256.938 296.816 257.078 297.446 257.359 297.876C257.641 298.302 258.055 298.515 258.602 298.515C259.152 298.515 259.568 298.302 259.85 297.876C260.131 297.446 260.271 296.816 260.271 295.984C260.271 295.148 260.131 294.517 259.85 294.091C259.568 293.665 259.152 293.452 258.602 293.452ZM258.602 292.538C259.512 292.538 260.207 292.833 260.688 293.423C261.172 294.013 261.414 294.866 261.414 295.984C261.414 297.105 261.174 297.96 260.693 298.55C260.213 299.136 259.516 299.429 258.602 299.429C257.691 299.429 256.996 299.136 256.516 298.55C256.035 297.96 255.795 297.105 255.795 295.984C255.795 294.866 256.035 294.013 256.516 293.423C256.996 292.833 257.691 292.538 258.602 292.538ZM265.738 299.376V293.534H263.881V292.696H266.816V299.376C266.816 300.138 266.641 300.724 266.289 301.134C265.941 301.548 265.445 301.755 264.801 301.755H263.312V300.841H264.684C265.035 300.841 265.299 300.718 265.475 300.472C265.65 300.23 265.738 299.864 265.738 299.376ZM265.738 290.142H266.816V291.507H265.738V290.142ZM276.016 295.439V295.966H271.346V296.001C271.314 296.896 271.484 297.538 271.855 297.929C272.23 298.319 272.758 298.515 273.438 298.515C273.781 298.515 274.141 298.46 274.516 298.351C274.891 298.241 275.291 298.075 275.717 297.853V298.925C275.307 299.093 274.91 299.218 274.527 299.3C274.148 299.386 273.781 299.429 273.426 299.429C272.406 299.429 271.609 299.124 271.035 298.515C270.461 297.901 270.174 297.058 270.174 295.984C270.174 294.937 270.455 294.101 271.018 293.476C271.58 292.851 272.33 292.538 273.268 292.538C274.104 292.538 274.762 292.821 275.242 293.388C275.727 293.954 275.984 294.638 276.016 295.439ZM274.938 295.122C274.891 294.669 274.725 294.278 274.439 293.95C274.158 293.618 273.752 293.452 273.221 293.452C272.701 293.452 272.273 293.624 271.938 293.968C271.602 294.312 271.418 294.698 271.387 295.128L274.938 295.122ZM282.9 298.925C282.611 299.093 282.312 299.218 282.004 299.3C281.699 299.386 281.387 299.429 281.066 299.429C280.051 299.429 279.256 299.124 278.682 298.515C278.111 297.905 277.826 297.062 277.826 295.984C277.826 294.905 278.111 294.062 278.682 293.452C279.256 292.843 280.051 292.538 281.066 292.538C281.383 292.538 281.691 292.579 281.992 292.661C282.293 292.743 282.596 292.87 282.9 293.042V294.173C282.615 293.919 282.328 293.735 282.039 293.622C281.754 293.509 281.43 293.452 281.066 293.452C280.391 293.452 279.871 293.671 279.508 294.109C279.145 294.546 278.963 295.171 278.963 295.984C278.963 296.792 279.145 297.417 279.508 297.859C279.875 298.296 280.395 298.515 281.066 298.515C281.441 298.515 281.777 298.458 282.074 298.345C282.371 298.228 282.646 298.048 282.9 297.806V298.925ZM287.512 290.833V292.696H289.961V293.534H287.512V297.097C287.512 297.581 287.604 297.919 287.787 298.11C287.971 298.302 288.291 298.398 288.748 298.398H289.961V299.259H288.643C287.834 299.259 287.264 299.097 286.932 298.773C286.6 298.448 286.434 297.89 286.434 297.097V293.534H284.682V292.696H286.434V290.833H287.512ZM293.482 291.484V294.771H294.854C295.4 294.771 295.826 294.626 296.131 294.337C296.439 294.048 296.594 293.644 296.594 293.124C296.594 292.605 296.441 292.202 296.137 291.917C295.832 291.628 295.404 291.484 294.854 291.484H293.482ZM292.299 290.511H294.854C295.83 290.511 296.57 290.734 297.074 291.179C297.578 291.62 297.83 292.269 297.83 293.124C297.83 293.987 297.578 294.64 297.074 295.081C296.574 295.523 295.834 295.743 294.854 295.743H293.482V299.259H292.299V290.511ZM305.143 294.05C304.912 293.87 304.678 293.739 304.439 293.657C304.201 293.575 303.939 293.534 303.654 293.534C302.982 293.534 302.469 293.745 302.113 294.167C301.758 294.589 301.58 295.198 301.58 295.995V299.259H300.496V292.696H301.58V293.98C301.76 293.515 302.035 293.159 302.406 292.913C302.781 292.663 303.225 292.538 303.736 292.538C304.002 292.538 304.25 292.571 304.48 292.638C304.711 292.704 304.932 292.808 305.143 292.948V294.05ZM309.215 293.452C308.668 293.452 308.254 293.665 307.973 294.091C307.691 294.517 307.551 295.148 307.551 295.984C307.551 296.816 307.691 297.446 307.973 297.876C308.254 298.302 308.668 298.515 309.215 298.515C309.766 298.515 310.182 298.302 310.463 297.876C310.744 297.446 310.885 296.816 310.885 295.984C310.885 295.148 310.744 294.517 310.463 294.091C310.182 293.665 309.766 293.452 309.215 293.452ZM309.215 292.538C310.125 292.538 310.82 292.833 311.301 293.423C311.785 294.013 312.027 294.866 312.027 295.984C312.027 297.105 311.787 297.96 311.307 298.55C310.826 299.136 310.129 299.429 309.215 299.429C308.305 299.429 307.609 299.136 307.129 298.55C306.648 297.96 306.408 297.105 306.408 295.984C306.408 294.866 306.648 294.013 307.129 293.423C307.609 292.833 308.305 292.538 309.215 292.538ZM315.033 298.433V301.755H313.949V292.696H315.033V293.534C315.213 293.21 315.451 292.964 315.748 292.796C316.049 292.624 316.395 292.538 316.785 292.538C317.578 292.538 318.199 292.845 318.648 293.458C319.102 294.071 319.328 294.921 319.328 296.007C319.328 297.073 319.102 297.911 318.648 298.521C318.195 299.126 317.574 299.429 316.785 299.429C316.387 299.429 316.037 299.345 315.736 299.177C315.439 299.005 315.205 298.757 315.033 298.433ZM318.197 295.984C318.197 295.148 318.064 294.517 317.799 294.091C317.537 293.665 317.146 293.452 316.627 293.452C316.104 293.452 315.707 293.667 315.438 294.097C315.168 294.523 315.033 295.151 315.033 295.984C315.033 296.812 315.168 297.441 315.438 297.87C315.707 298.3 316.104 298.515 316.627 298.515C317.146 298.515 317.537 298.302 317.799 297.876C318.064 297.45 318.197 296.819 318.197 295.984ZM325.768 292.925V293.98C325.459 293.8 325.148 293.665 324.836 293.575C324.523 293.485 324.205 293.441 323.881 293.441C323.393 293.441 323.027 293.521 322.785 293.681C322.547 293.837 322.428 294.077 322.428 294.401C322.428 294.694 322.518 294.913 322.697 295.058C322.877 295.202 323.324 295.343 324.039 295.48L324.473 295.562C325.008 295.663 325.412 295.866 325.686 296.171C325.963 296.476 326.102 296.872 326.102 297.36C326.102 298.009 325.871 298.517 325.41 298.884C324.949 299.247 324.309 299.429 323.488 299.429C323.164 299.429 322.824 299.394 322.469 299.323C322.113 299.257 321.729 299.155 321.314 299.019V297.905C321.717 298.112 322.102 298.269 322.469 298.374C322.836 298.476 323.184 298.526 323.512 298.526C323.988 298.526 324.357 298.431 324.619 298.239C324.881 298.044 325.012 297.773 325.012 297.425C325.012 296.925 324.533 296.579 323.576 296.388L323.529 296.376L323.125 296.294C322.504 296.173 322.051 295.97 321.766 295.685C321.48 295.396 321.338 295.003 321.338 294.507C321.338 293.878 321.551 293.394 321.977 293.054C322.402 292.71 323.01 292.538 323.799 292.538C324.15 292.538 324.488 292.571 324.812 292.638C325.137 292.7 325.455 292.796 325.768 292.925ZM120.168 442.286C121.164 442.286 121.859 442.042 122.254 441.554C122.648 441.062 122.846 440.175 122.846 438.894C122.846 437.601 122.648 436.71 122.254 436.222C121.863 435.73 121.168 435.484 120.168 435.484H119.605V442.286H120.168ZM120.191 434.511C121.527 434.511 122.512 434.866 123.145 435.577C123.777 436.288 124.094 437.394 124.094 438.894C124.094 440.386 123.777 441.487 123.145 442.198C122.512 442.905 121.527 443.259 120.191 443.259H118.416V434.511H120.191ZM131.406 439.439V439.966H126.736V440.001C126.705 440.896 126.875 441.538 127.246 441.929C127.621 442.319 128.148 442.515 128.828 442.515C129.172 442.515 129.531 442.46 129.906 442.351C130.281 442.241 130.682 442.075 131.107 441.853V442.925C130.697 443.093 130.301 443.218 129.918 443.3C129.539 443.386 129.172 443.429 128.816 443.429C127.797 443.429 127 443.124 126.426 442.515C125.852 441.901 125.564 441.058 125.564 439.984C125.564 438.937 125.846 438.101 126.408 437.476C126.971 436.851 127.721 436.538 128.658 436.538C129.494 436.538 130.152 436.821 130.633 437.388C131.117 437.954 131.375 438.638 131.406 439.439ZM130.328 439.122C130.281 438.669 130.115 438.278 129.83 437.95C129.549 437.618 129.143 437.452 128.611 437.452C128.092 437.452 127.664 437.624 127.328 437.968C126.992 438.312 126.809 438.698 126.777 439.128L130.328 439.122ZM137.775 436.925V437.98C137.467 437.8 137.156 437.665 136.844 437.575C136.531 437.485 136.213 437.441 135.889 437.441C135.4 437.441 135.035 437.521 134.793 437.681C134.555 437.837 134.436 438.077 134.436 438.401C134.436 438.694 134.525 438.913 134.705 439.058C134.885 439.202 135.332 439.343 136.047 439.48L136.48 439.562C137.016 439.663 137.42 439.866 137.693 440.171C137.971 440.476 138.109 440.872 138.109 441.36C138.109 442.009 137.879 442.517 137.418 442.884C136.957 443.247 136.316 443.429 135.496 443.429C135.172 443.429 134.832 443.394 134.477 443.323C134.121 443.257 133.736 443.155 133.322 443.019V441.905C133.725 442.112 134.109 442.269 134.477 442.374C134.844 442.476 135.191 442.526 135.52 442.526C135.996 442.526 136.365 442.431 136.627 442.239C136.889 442.044 137.02 441.773 137.02 441.425C137.02 440.925 136.541 440.579 135.584 440.388L135.537 440.376L135.133 440.294C134.512 440.173 134.059 439.97 133.773 439.685C133.488 439.396 133.346 439.003 133.346 438.507C133.346 437.878 133.559 437.394 133.984 437.054C134.41 436.71 135.018 436.538 135.807 436.538C136.158 436.538 136.496 436.571 136.82 436.638C137.145 436.7 137.463 436.796 137.775 436.925ZM145.521 442.925C145.232 443.093 144.934 443.218 144.625 443.3C144.32 443.386 144.008 443.429 143.688 443.429C142.672 443.429 141.877 443.124 141.303 442.515C140.732 441.905 140.447 441.062 140.447 439.984C140.447 438.905 140.732 438.062 141.303 437.452C141.877 436.843 142.672 436.538 143.688 436.538C144.004 436.538 144.312 436.579 144.613 436.661C144.914 436.743 145.217 436.87 145.521 437.042V438.173C145.236 437.919 144.949 437.735 144.66 437.622C144.375 437.509 144.051 437.452 143.688 437.452C143.012 437.452 142.492 437.671 142.129 438.109C141.766 438.546 141.584 439.171 141.584 439.984C141.584 440.792 141.766 441.417 142.129 441.859C142.496 442.296 143.016 442.515 143.688 442.515C144.062 442.515 144.398 442.458 144.695 442.345C144.992 442.228 145.268 442.048 145.521 441.806V442.925ZM153.303 438.05C153.072 437.87 152.838 437.739 152.6 437.657C152.361 437.575 152.1 437.534 151.814 437.534C151.143 437.534 150.629 437.745 150.273 438.167C149.918 438.589 149.74 439.198 149.74 439.995V443.259H148.656V436.696H149.74V437.98C149.92 437.515 150.195 437.159 150.566 436.913C150.941 436.663 151.385 436.538 151.896 436.538C152.162 436.538 152.41 436.571 152.641 436.638C152.871 436.704 153.092 436.808 153.303 436.948V438.05ZM155.617 436.72H158.377V442.421H160.516V443.259H155.16V442.421H157.299V437.558H155.617V436.72ZM157.299 434.171H158.377V435.53H157.299V434.171ZM163.193 442.433V445.755H162.109V436.696H163.193V437.534C163.373 437.21 163.611 436.964 163.908 436.796C164.209 436.624 164.555 436.538 164.945 436.538C165.738 436.538 166.359 436.845 166.809 437.458C167.262 438.071 167.488 438.921 167.488 440.007C167.488 441.073 167.262 441.911 166.809 442.521C166.355 443.126 165.734 443.429 164.945 443.429C164.547 443.429 164.197 443.345 163.896 443.177C163.6 443.005 163.365 442.757 163.193 442.433ZM166.357 439.984C166.357 439.148 166.225 438.517 165.959 438.091C165.697 437.665 165.307 437.452 164.787 437.452C164.264 437.452 163.867 437.667 163.598 438.097C163.328 438.523 163.193 439.151 163.193 439.984C163.193 440.812 163.328 441.441 163.598 441.87C163.867 442.3 164.264 442.515 164.787 442.515C165.307 442.515 165.697 442.302 165.959 441.876C166.225 441.45 166.357 440.819 166.357 439.984ZM171.824 434.833V436.696H174.273V437.534H171.824V441.097C171.824 441.581 171.916 441.919 172.1 442.11C172.283 442.302 172.604 442.398 173.061 442.398H174.273V443.259H172.955C172.146 443.259 171.576 443.097 171.244 442.773C170.912 442.448 170.746 441.89 170.746 441.097V437.534H168.994V436.696H170.746V434.833H171.824ZM177.309 436.72H180.068V442.421H182.207V443.259H176.852V442.421H178.99V437.558H177.309V436.72ZM178.99 434.171H180.068V435.53H178.99V434.171ZM186.297 437.452C185.75 437.452 185.336 437.665 185.055 438.091C184.773 438.517 184.633 439.148 184.633 439.984C184.633 440.816 184.773 441.446 185.055 441.876C185.336 442.302 185.75 442.515 186.297 442.515C186.848 442.515 187.264 442.302 187.545 441.876C187.826 441.446 187.967 440.816 187.967 439.984C187.967 439.148 187.826 438.517 187.545 438.091C187.264 437.665 186.848 437.452 186.297 437.452ZM186.297 436.538C187.207 436.538 187.902 436.833 188.383 437.423C188.867 438.013 189.109 438.866 189.109 439.984C189.109 441.105 188.869 441.96 188.389 442.55C187.908 443.136 187.211 443.429 186.297 443.429C185.387 443.429 184.691 443.136 184.211 442.55C183.73 441.96 183.49 441.105 183.49 439.984C183.49 438.866 183.73 438.013 184.211 437.423C184.691 436.833 185.387 436.538 186.297 436.538ZM196.076 439.193V443.259H194.992V439.193C194.992 438.603 194.889 438.169 194.682 437.892C194.475 437.614 194.15 437.476 193.709 437.476C193.205 437.476 192.816 437.655 192.543 438.015C192.273 438.37 192.139 438.882 192.139 439.55V443.259H191.061V436.696H192.139V437.681C192.33 437.306 192.59 437.023 192.918 436.831C193.246 436.636 193.635 436.538 194.084 436.538C194.752 436.538 195.25 436.759 195.578 437.2C195.91 437.638 196.076 438.302 196.076 439.193ZM201.602 439.128C201.906 439.206 202.166 439.355 202.381 439.573C202.596 439.788 202.863 440.22 203.184 440.868L204.373 443.259H203.102L202.059 441.05C201.758 440.421 201.486 440.017 201.244 439.837C201.006 439.653 200.693 439.562 200.307 439.562H199.176V443.259H197.986V434.511H200.424C201.385 434.511 202.121 434.728 202.633 435.161C203.145 435.595 203.4 436.222 203.4 437.042C203.4 437.62 203.242 438.093 202.926 438.46C202.613 438.823 202.172 439.046 201.602 439.128ZM199.176 435.484V438.589H200.471C201.037 438.589 201.459 438.462 201.736 438.208C202.014 437.954 202.152 437.566 202.152 437.042C202.152 436.538 202.004 436.153 201.707 435.888C201.414 435.618 200.986 435.484 200.424 435.484H199.176ZM207.988 437.452C207.441 437.452 207.027 437.665 206.746 438.091C206.465 438.517 206.324 439.148 206.324 439.984C206.324 440.816 206.465 441.446 206.746 441.876C207.027 442.302 207.441 442.515 207.988 442.515C208.539 442.515 208.955 442.302 209.236 441.876C209.518 441.446 209.658 440.816 209.658 439.984C209.658 439.148 209.518 438.517 209.236 438.091C208.955 437.665 208.539 437.452 207.988 437.452ZM207.988 436.538C208.898 436.538 209.594 436.833 210.074 437.423C210.559 438.013 210.801 438.866 210.801 439.984C210.801 441.105 210.561 441.96 210.08 442.55C209.6 443.136 208.902 443.429 207.988 443.429C207.078 443.429 206.383 443.136 205.902 442.55C205.422 441.96 205.182 441.105 205.182 439.984C205.182 438.866 205.422 438.013 205.902 437.423C206.383 436.833 207.078 436.538 207.988 436.538ZM211.609 436.696H212.676L213.818 441.999L214.756 438.612H215.676L216.625 441.999L217.768 436.696H218.834L217.299 443.259H216.268L215.219 439.661L214.176 443.259H213.145L211.609 436.696ZM133.252 470.511H138.109V471.507H136.275V478.263H138.109V479.259H133.252V478.263H135.086V471.507H133.252V470.511ZM143.266 473.364C143.398 473.083 143.566 472.876 143.77 472.743C143.977 472.607 144.225 472.538 144.514 472.538C145.041 472.538 145.412 472.743 145.627 473.153C145.846 473.56 145.955 474.327 145.955 475.456V479.259H144.971V475.503C144.971 474.577 144.918 474.003 144.812 473.78C144.711 473.554 144.523 473.441 144.25 473.441C143.938 473.441 143.723 473.562 143.605 473.804C143.492 474.042 143.436 474.609 143.436 475.503V479.259H142.451V475.503C142.451 474.566 142.395 473.987 142.281 473.769C142.172 473.55 141.973 473.441 141.684 473.441C141.398 473.441 141.199 473.562 141.086 473.804C140.977 474.042 140.922 474.609 140.922 475.503V479.259H139.943V472.696H140.922V473.259C141.051 473.025 141.211 472.847 141.402 472.726C141.598 472.601 141.818 472.538 142.064 472.538C142.361 472.538 142.607 472.607 142.803 472.743C143.002 472.88 143.156 473.087 143.266 473.364ZM150.648 475.96H150.291C149.662 475.96 149.188 476.071 148.867 476.294C148.551 476.513 148.393 476.841 148.393 477.278C148.393 477.673 148.512 477.98 148.75 478.198C148.988 478.417 149.318 478.526 149.74 478.526C150.334 478.526 150.801 478.321 151.141 477.911C151.48 477.497 151.652 476.927 151.656 476.2V475.96H150.648ZM152.74 475.515V479.259H151.656V478.286C151.426 478.677 151.135 478.966 150.783 479.153C150.436 479.337 150.012 479.429 149.512 479.429C148.844 479.429 148.311 479.241 147.912 478.866C147.514 478.487 147.314 477.982 147.314 477.349C147.314 476.618 147.559 476.064 148.047 475.685C148.539 475.306 149.26 475.116 150.209 475.116H151.656V474.946C151.652 474.423 151.52 474.044 151.258 473.81C150.996 473.571 150.578 473.452 150.004 473.452C149.637 473.452 149.266 473.505 148.891 473.61C148.516 473.716 148.15 473.87 147.795 474.073V472.995C148.193 472.843 148.574 472.73 148.938 472.655C149.305 472.577 149.66 472.538 150.004 472.538C150.547 472.538 151.01 472.618 151.393 472.778C151.779 472.939 152.092 473.179 152.33 473.499C152.479 473.694 152.584 473.937 152.646 474.226C152.709 474.511 152.74 474.941 152.74 475.515ZM158.793 475.925C158.793 475.116 158.66 474.503 158.395 474.085C158.133 473.663 157.75 473.452 157.246 473.452C156.719 473.452 156.316 473.663 156.039 474.085C155.762 474.503 155.623 475.116 155.623 475.925C155.623 476.734 155.762 477.351 156.039 477.776C156.32 478.198 156.727 478.409 157.258 478.409C157.754 478.409 158.133 478.196 158.395 477.771C158.66 477.345 158.793 476.73 158.793 475.925ZM159.871 478.837C159.871 479.821 159.639 480.568 159.174 481.075C158.709 481.583 158.025 481.837 157.123 481.837C156.826 481.837 156.516 481.81 156.191 481.755C155.867 481.7 155.543 481.62 155.219 481.515V480.448C155.602 480.628 155.949 480.761 156.262 480.847C156.574 480.933 156.861 480.976 157.123 480.976C157.705 480.976 158.129 480.818 158.395 480.501C158.66 480.185 158.793 479.683 158.793 478.995V478.948V478.216C158.621 478.583 158.387 478.857 158.09 479.036C157.793 479.216 157.432 479.306 157.006 479.306C156.24 479.306 155.629 478.999 155.172 478.386C154.715 477.773 154.486 476.952 154.486 475.925C154.486 474.894 154.715 474.071 155.172 473.458C155.629 472.845 156.24 472.538 157.006 472.538C157.428 472.538 157.785 472.622 158.078 472.79C158.371 472.958 158.609 473.218 158.793 473.569V472.72H159.871V478.837ZM167.559 475.439V475.966H162.889V476.001C162.857 476.896 163.027 477.538 163.398 477.929C163.773 478.319 164.301 478.515 164.98 478.515C165.324 478.515 165.684 478.46 166.059 478.351C166.434 478.241 166.834 478.075 167.26 477.853V478.925C166.85 479.093 166.453 479.218 166.07 479.3C165.691 479.386 165.324 479.429 164.969 479.429C163.949 479.429 163.152 479.124 162.578 478.515C162.004 477.901 161.717 477.058 161.717 475.984C161.717 474.937 161.998 474.101 162.561 473.476C163.123 472.851 163.873 472.538 164.811 472.538C165.646 472.538 166.305 472.821 166.785 473.388C167.27 473.954 167.527 474.638 167.559 475.439ZM166.48 475.122C166.434 474.669 166.268 474.278 165.982 473.95C165.701 473.618 165.295 473.452 164.764 473.452C164.244 473.452 163.816 473.624 163.48 473.968C163.145 474.312 162.961 474.698 162.93 475.128L166.48 475.122ZM104.412 650.511H105.602V658.263H109.826V659.259H104.412V650.511ZM112.234 652.72H114.994V658.421H117.133V659.259H111.777V658.421H113.916V653.558H112.234V652.72ZM113.916 650.171H114.994V651.53H113.916V650.171ZM123.771 655.193V659.259H122.688V655.193C122.688 654.603 122.584 654.169 122.377 653.892C122.17 653.614 121.846 653.476 121.404 653.476C120.9 653.476 120.512 653.655 120.238 654.015C119.969 654.37 119.834 654.882 119.834 655.55V659.259H118.756V652.696H119.834V653.681C120.025 653.306 120.285 653.023 120.613 652.831C120.941 652.636 121.33 652.538 121.779 652.538C122.447 652.538 122.945 652.759 123.273 653.2C123.605 653.638 123.771 654.302 123.771 655.193ZM126.227 650.142H127.34V655.421L130.17 652.696H131.482L128.898 655.169L131.887 659.259H130.568L128.143 655.872L127.34 656.628V659.259H126.227V650.142ZM134.629 694.286C135.625 694.286 136.32 694.042 136.715 693.554C137.109 693.062 137.307 692.175 137.307 690.894C137.307 689.601 137.109 688.71 136.715 688.222C136.324 687.73 135.629 687.484 134.629 687.484H134.066V694.286H134.629ZM134.652 686.511C135.988 686.511 136.973 686.866 137.605 687.577C138.238 688.288 138.555 689.394 138.555 690.894C138.555 692.386 138.238 693.487 137.605 694.198C136.973 694.905 135.988 695.259 134.652 695.259H132.877V686.511H134.652ZM145.867 691.439V691.966H141.197V692.001C141.166 692.896 141.336 693.538 141.707 693.929C142.082 694.319 142.609 694.515 143.289 694.515C143.633 694.515 143.992 694.46 144.367 694.351C144.742 694.241 145.143 694.075 145.568 693.853V694.925C145.158 695.093 144.762 695.218 144.379 695.3C144 695.386 143.633 695.429 143.277 695.429C142.258 695.429 141.461 695.124 140.887 694.515C140.312 693.901 140.025 693.058 140.025 691.984C140.025 690.937 140.307 690.101 140.869 689.476C141.432 688.851 142.182 688.538 143.119 688.538C143.955 688.538 144.613 688.821 145.094 689.388C145.578 689.954 145.836 690.638 145.867 691.439ZM144.789 691.122C144.742 690.669 144.576 690.278 144.291 689.95C144.01 689.618 143.604 689.452 143.072 689.452C142.553 689.452 142.125 689.624 141.789 689.968C141.453 690.312 141.27 690.698 141.238 691.128L144.789 691.122ZM152.236 688.925V689.98C151.928 689.8 151.617 689.665 151.305 689.575C150.992 689.485 150.674 689.441 150.35 689.441C149.861 689.441 149.496 689.521 149.254 689.681C149.016 689.837 148.896 690.077 148.896 690.401C148.896 690.694 148.986 690.913 149.166 691.058C149.346 691.202 149.793 691.343 150.508 691.48L150.941 691.562C151.477 691.663 151.881 691.866 152.154 692.171C152.432 692.476 152.57 692.872 152.57 693.36C152.57 694.009 152.34 694.517 151.879 694.884C151.418 695.247 150.777 695.429 149.957 695.429C149.633 695.429 149.293 695.394 148.938 695.323C148.582 695.257 148.197 695.155 147.783 695.019V693.905C148.186 694.112 148.57 694.269 148.938 694.374C149.305 694.476 149.652 694.526 149.98 694.526C150.457 694.526 150.826 694.431 151.088 694.239C151.35 694.044 151.48 693.773 151.48 693.425C151.48 692.925 151.002 692.579 150.045 692.388L149.998 692.376L149.594 692.294C148.973 692.173 148.52 691.97 148.234 691.685C147.949 691.396 147.807 691.003 147.807 690.507C147.807 689.878 148.02 689.394 148.445 689.054C148.871 688.71 149.479 688.538 150.268 688.538C150.619 688.538 150.957 688.571 151.281 688.638C151.605 688.7 151.924 688.796 152.236 688.925ZM159.982 694.925C159.693 695.093 159.395 695.218 159.086 695.3C158.781 695.386 158.469 695.429 158.148 695.429C157.133 695.429 156.338 695.124 155.764 694.515C155.193 693.905 154.908 693.062 154.908 691.984C154.908 690.905 155.193 690.062 155.764 689.452C156.338 688.843 157.133 688.538 158.148 688.538C158.465 688.538 158.773 688.579 159.074 688.661C159.375 688.743 159.678 688.87 159.982 689.042V690.173C159.697 689.919 159.41 689.735 159.121 689.622C158.836 689.509 158.512 689.452 158.148 689.452C157.473 689.452 156.953 689.671 156.59 690.109C156.227 690.546 156.045 691.171 156.045 691.984C156.045 692.792 156.227 693.417 156.59 693.859C156.957 694.296 157.477 694.515 158.148 694.515C158.523 694.515 158.859 694.458 159.156 694.345C159.453 694.228 159.729 694.048 159.982 693.806V694.925ZM167.764 690.05C167.533 689.87 167.299 689.739 167.061 689.657C166.822 689.575 166.561 689.534 166.275 689.534C165.604 689.534 165.09 689.745 164.734 690.167C164.379 690.589 164.201 691.198 164.201 691.995V695.259H163.117V688.696H164.201V689.98C164.381 689.515 164.656 689.159 165.027 688.913C165.402 688.663 165.846 688.538 166.357 688.538C166.623 688.538 166.871 688.571 167.102 688.638C167.332 688.704 167.553 688.808 167.764 688.948V690.05ZM170.078 688.72H172.838V694.421H174.977V695.259H169.621V694.421H171.76V689.558H170.078V688.72ZM171.76 686.171H172.838V687.53H171.76V686.171ZM177.654 694.433V697.755H176.57V688.696H177.654V689.534C177.834 689.21 178.072 688.964 178.369 688.796C178.67 688.624 179.016 688.538 179.406 688.538C180.199 688.538 180.82 688.845 181.27 689.458C181.723 690.071 181.949 690.921 181.949 692.007C181.949 693.073 181.723 693.911 181.27 694.521C180.816 695.126 180.195 695.429 179.406 695.429C179.008 695.429 178.658 695.345 178.357 695.177C178.061 695.005 177.826 694.757 177.654 694.433ZM180.818 691.984C180.818 691.148 180.686 690.517 180.42 690.091C180.158 689.665 179.768 689.452 179.248 689.452C178.725 689.452 178.328 689.667 178.059 690.097C177.789 690.523 177.654 691.151 177.654 691.984C177.654 692.812 177.789 693.441 178.059 693.87C178.328 694.3 178.725 694.515 179.248 694.515C179.768 694.515 180.158 694.302 180.42 693.876C180.686 693.45 180.818 692.819 180.818 691.984ZM186.285 686.833V688.696H188.734V689.534H186.285V693.097C186.285 693.581 186.377 693.919 186.561 694.11C186.744 694.302 187.064 694.398 187.521 694.398H188.734V695.259H187.416C186.607 695.259 186.037 695.097 185.705 694.773C185.373 694.448 185.207 693.89 185.207 693.097V689.534H183.455V688.696H185.207V686.833H186.285ZM191.77 688.72H194.529V694.421H196.668V695.259H191.312V694.421H193.451V689.558H191.77V688.72ZM193.451 686.171H194.529V687.53H193.451V686.171ZM200.758 689.452C200.211 689.452 199.797 689.665 199.516 690.091C199.234 690.517 199.094 691.148 199.094 691.984C199.094 692.816 199.234 693.446 199.516 693.876C199.797 694.302 200.211 694.515 200.758 694.515C201.309 694.515 201.725 694.302 202.006 693.876C202.287 693.446 202.428 692.816 202.428 691.984C202.428 691.148 202.287 690.517 202.006 690.091C201.725 689.665 201.309 689.452 200.758 689.452ZM200.758 688.538C201.668 688.538 202.363 688.833 202.844 689.423C203.328 690.013 203.57 690.866 203.57 691.984C203.57 693.105 203.33 693.96 202.85 694.55C202.369 695.136 201.672 695.429 200.758 695.429C199.848 695.429 199.152 695.136 198.672 694.55C198.191 693.96 197.951 693.105 197.951 691.984C197.951 690.866 198.191 690.013 198.672 689.423C199.152 688.833 199.848 688.538 200.758 688.538ZM210.537 691.193V695.259H209.453V691.193C209.453 690.603 209.35 690.169 209.143 689.892C208.936 689.614 208.611 689.476 208.17 689.476C207.666 689.476 207.277 689.655 207.004 690.015C206.734 690.37 206.6 690.882 206.6 691.55V695.259H205.521V688.696H206.6V689.681C206.791 689.306 207.051 689.023 207.379 688.831C207.707 688.636 208.096 688.538 208.545 688.538C209.213 688.538 209.711 688.759 210.039 689.2C210.371 689.638 210.537 690.302 210.537 691.193ZM216.062 691.128C216.367 691.206 216.627 691.355 216.842 691.573C217.057 691.788 217.324 692.22 217.645 692.868L218.834 695.259H217.562L216.52 693.05C216.219 692.421 215.947 692.017 215.705 691.837C215.467 691.653 215.154 691.562 214.768 691.562H213.637V695.259H212.447V686.511H214.885C215.846 686.511 216.582 686.728 217.094 687.161C217.605 687.595 217.861 688.222 217.861 689.042C217.861 689.62 217.703 690.093 217.387 690.46C217.074 690.823 216.633 691.046 216.062 691.128ZM213.637 687.484V690.589H214.932C215.498 690.589 215.92 690.462 216.197 690.208C216.475 689.954 216.613 689.566 216.613 689.042C216.613 688.538 216.465 688.153 216.168 687.888C215.875 687.618 215.447 687.484 214.885 687.484H213.637ZM222.449 689.452C221.902 689.452 221.488 689.665 221.207 690.091C220.926 690.517 220.785 691.148 220.785 691.984C220.785 692.816 220.926 693.446 221.207 693.876C221.488 694.302 221.902 694.515 222.449 694.515C223 694.515 223.416 694.302 223.697 693.876C223.979 693.446 224.119 692.816 224.119 691.984C224.119 691.148 223.979 690.517 223.697 690.091C223.416 689.665 223 689.452 222.449 689.452ZM222.449 688.538C223.359 688.538 224.055 688.833 224.535 689.423C225.02 690.013 225.262 690.866 225.262 691.984C225.262 693.105 225.021 693.96 224.541 694.55C224.061 695.136 223.363 695.429 222.449 695.429C221.539 695.429 220.844 695.136 220.363 694.55C219.883 693.96 219.643 693.105 219.643 691.984C219.643 690.866 219.883 690.013 220.363 689.423C220.844 688.833 221.539 688.538 222.449 688.538ZM226.07 688.696H227.137L228.279 693.999L229.217 690.612H230.137L231.086 693.999L232.229 688.696H233.295L231.76 695.259H230.729L229.68 691.661L228.637 695.259H227.605L226.07 688.696ZM147.713 722.511H152.57V723.507H150.736V730.263H152.57V731.259H147.713V730.263H149.547V723.507H147.713V722.511ZM157.727 725.364C157.859 725.083 158.027 724.876 158.23 724.743C158.438 724.607 158.686 724.538 158.975 724.538C159.502 724.538 159.873 724.743 160.088 725.153C160.307 725.56 160.416 726.327 160.416 727.456V731.259H159.432V727.503C159.432 726.577 159.379 726.003 159.273 725.78C159.172 725.554 158.984 725.441 158.711 725.441C158.398 725.441 158.184 725.562 158.066 725.804C157.953 726.042 157.896 726.609 157.896 727.503V731.259H156.912V727.503C156.912 726.566 156.855 725.987 156.742 725.769C156.633 725.55 156.434 725.441 156.145 725.441C155.859 725.441 155.66 725.562 155.547 725.804C155.438 726.042 155.383 726.609 155.383 727.503V731.259H154.404V724.696H155.383V725.259C155.512 725.025 155.672 724.847 155.863 724.726C156.059 724.601 156.279 724.538 156.525 724.538C156.822 724.538 157.068 724.607 157.264 724.743C157.463 724.88 157.617 725.087 157.727 725.364ZM165.109 727.96H164.752C164.123 727.96 163.648 728.071 163.328 728.294C163.012 728.513 162.854 728.841 162.854 729.278C162.854 729.673 162.973 729.98 163.211 730.198C163.449 730.417 163.779 730.526 164.201 730.526C164.795 730.526 165.262 730.321 165.602 729.911C165.941 729.497 166.113 728.927 166.117 728.2V727.96H165.109ZM167.201 727.515V731.259H166.117V730.286C165.887 730.677 165.596 730.966 165.244 731.153C164.896 731.337 164.473 731.429 163.973 731.429C163.305 731.429 162.771 731.241 162.373 730.866C161.975 730.487 161.775 729.982 161.775 729.349C161.775 728.618 162.02 728.064 162.508 727.685C163 727.306 163.721 727.116 164.67 727.116H166.117V726.946C166.113 726.423 165.98 726.044 165.719 725.81C165.457 725.571 165.039 725.452 164.465 725.452C164.098 725.452 163.727 725.505 163.352 725.61C162.977 725.716 162.611 725.87 162.256 726.073V724.995C162.654 724.843 163.035 724.73 163.398 724.655C163.766 724.577 164.121 724.538 164.465 724.538C165.008 724.538 165.471 724.618 165.854 724.778C166.24 724.939 166.553 725.179 166.791 725.499C166.939 725.694 167.045 725.937 167.107 726.226C167.17 726.511 167.201 726.941 167.201 727.515ZM173.254 727.925C173.254 727.116 173.121 726.503 172.855 726.085C172.594 725.663 172.211 725.452 171.707 725.452C171.18 725.452 170.777 725.663 170.5 726.085C170.223 726.503 170.084 727.116 170.084 727.925C170.084 728.734 170.223 729.351 170.5 729.776C170.781 730.198 171.188 730.409 171.719 730.409C172.215 730.409 172.594 730.196 172.855 729.771C173.121 729.345 173.254 728.73 173.254 727.925ZM174.332 730.837C174.332 731.821 174.1 732.568 173.635 733.075C173.17 733.583 172.486 733.837 171.584 733.837C171.287 733.837 170.977 733.81 170.652 733.755C170.328 733.7 170.004 733.62 169.68 733.515V732.448C170.062 732.628 170.41 732.761 170.723 732.847C171.035 732.933 171.322 732.976 171.584 732.976C172.166 732.976 172.59 732.818 172.855 732.501C173.121 732.185 173.254 731.683 173.254 730.995V730.948V730.216C173.082 730.583 172.848 730.857 172.551 731.036C172.254 731.216 171.893 731.306 171.467 731.306C170.701 731.306 170.09 730.999 169.633 730.386C169.176 729.773 168.947 728.952 168.947 727.925C168.947 726.894 169.176 726.071 169.633 725.458C170.09 724.845 170.701 724.538 171.467 724.538C171.889 724.538 172.246 724.622 172.539 724.79C172.832 724.958 173.07 725.218 173.254 725.569V724.72H174.332V730.837ZM182.02 727.439V727.966H177.35V728.001C177.318 728.896 177.488 729.538 177.859 729.929C178.234 730.319 178.762 730.515 179.441 730.515C179.785 730.515 180.145 730.46 180.52 730.351C180.895 730.241 181.295 730.075 181.721 729.853V730.925C181.311 731.093 180.914 731.218 180.531 731.3C180.152 731.386 179.785 731.429 179.43 731.429C178.41 731.429 177.613 731.124 177.039 730.515C176.465 729.901 176.178 729.058 176.178 727.984C176.178 726.937 176.459 726.101 177.021 725.476C177.584 724.851 178.334 724.538 179.271 724.538C180.107 724.538 180.766 724.821 181.246 725.388C181.73 725.954 181.988 726.638 182.02 727.439ZM180.941 727.122C180.895 726.669 180.729 726.278 180.443 725.95C180.162 725.618 179.756 725.452 179.225 725.452C178.705 725.452 178.277 725.624 177.941 725.968C177.605 726.312 177.422 726.698 177.391 727.128L180.941 727.122ZM111.643 902.511H112.832V910.263H117.057V911.259H111.643V902.511ZM119.465 904.72H122.225V910.421H124.363V911.259H119.008V910.421H121.146V905.558H119.465V904.72ZM121.146 902.171H122.225V903.53H121.146V902.171ZM131.002 907.193V911.259H129.918V907.193C129.918 906.603 129.814 906.169 129.607 905.892C129.4 905.614 129.076 905.476 128.635 905.476C128.131 905.476 127.742 905.655 127.469 906.015C127.199 906.37 127.064 906.882 127.064 907.55V911.259H125.986V904.696H127.064V905.681C127.256 905.306 127.516 905.023 127.844 904.831C128.172 904.636 128.561 904.538 129.01 904.538C129.678 904.538 130.176 904.759 130.504 905.2C130.836 905.638 131.002 906.302 131.002 907.193ZM133.457 902.142H134.57V907.421L137.4 904.696H138.713L136.129 907.169L139.117 911.259H137.799L135.373 907.872L134.57 908.628V911.259H133.457V902.142ZM237.754 979.128C238.059 979.206 238.318 979.355 238.533 979.573C238.748 979.788 239.016 980.22 239.336 980.868L240.525 983.259H239.254L238.211 981.05C237.91 980.421 237.639 980.017 237.396 979.837C237.158 979.653 236.846 979.562 236.459 979.562H235.328V983.259H234.139V974.511H236.576C237.537 974.511 238.273 974.728 238.785 975.161C239.297 975.595 239.553 976.222 239.553 977.042C239.553 977.62 239.395 978.093 239.078 978.46C238.766 978.823 238.324 979.046 237.754 979.128ZM235.328 975.484V978.589H236.623C237.189 978.589 237.611 978.462 237.889 978.208C238.166 977.954 238.305 977.566 238.305 977.042C238.305 976.538 238.156 976.153 237.859 975.888C237.566 975.618 237.139 975.484 236.576 975.484H235.328ZM247.094 979.439V979.966H242.424V980.001C242.393 980.896 242.562 981.538 242.934 981.929C243.309 982.319 243.836 982.515 244.516 982.515C244.859 982.515 245.219 982.46 245.594 982.351C245.969 982.241 246.369 982.075 246.795 981.853V982.925C246.385 983.093 245.988 983.218 245.605 983.3C245.227 983.386 244.859 983.429 244.504 983.429C243.484 983.429 242.688 983.124 242.113 982.515C241.539 981.901 241.252 981.058 241.252 979.984C241.252 978.937 241.533 978.101 242.096 977.476C242.658 976.851 243.408 976.538 244.346 976.538C245.182 976.538 245.84 976.821 246.32 977.388C246.805 977.954 247.062 978.638 247.094 979.439ZM246.016 979.122C245.969 978.669 245.803 978.278 245.518 977.95C245.236 977.618 244.83 977.452 244.299 977.452C243.779 977.452 243.352 977.624 243.016 977.968C242.68 978.312 242.496 978.698 242.465 979.128L246.016 979.122ZM251.875 979.96H251.518C250.889 979.96 250.414 980.071 250.094 980.294C249.777 980.513 249.619 980.841 249.619 981.278C249.619 981.673 249.738 981.98 249.977 982.198C250.215 982.417 250.545 982.526 250.967 982.526C251.561 982.526 252.027 982.321 252.367 981.911C252.707 981.497 252.879 980.927 252.883 980.2V979.96H251.875ZM253.967 979.515V983.259H252.883V982.286C252.652 982.677 252.361 982.966 252.01 983.153C251.662 983.337 251.238 983.429 250.738 983.429C250.07 983.429 249.537 983.241 249.139 982.866C248.74 982.487 248.541 981.982 248.541 981.349C248.541 980.618 248.785 980.064 249.273 979.685C249.766 979.306 250.486 979.116 251.436 979.116H252.883V978.946C252.879 978.423 252.746 978.044 252.484 977.81C252.223 977.571 251.805 977.452 251.23 977.452C250.863 977.452 250.492 977.505 250.117 977.61C249.742 977.716 249.377 977.87 249.021 978.073V976.995C249.42 976.843 249.801 976.73 250.164 976.655C250.531 976.577 250.887 976.538 251.23 976.538C251.773 976.538 252.236 976.618 252.619 976.778C253.006 976.939 253.318 977.179 253.557 977.499C253.705 977.694 253.811 977.937 253.873 978.226C253.936 978.511 253.967 978.941 253.967 979.515ZM261.209 982.925C260.92 983.093 260.621 983.218 260.312 983.3C260.008 983.386 259.695 983.429 259.375 983.429C258.359 983.429 257.564 983.124 256.99 982.515C256.42 981.905 256.135 981.062 256.135 979.984C256.135 978.905 256.42 978.062 256.99 977.452C257.564 976.843 258.359 976.538 259.375 976.538C259.691 976.538 260 976.579 260.301 976.661C260.602 976.743 260.904 976.87 261.209 977.042V978.173C260.924 977.919 260.637 977.735 260.348 977.622C260.062 977.509 259.738 977.452 259.375 977.452C258.699 977.452 258.18 977.671 257.816 978.109C257.453 978.546 257.271 979.171 257.271 979.984C257.271 980.792 257.453 981.417 257.816 981.859C258.184 982.296 258.703 982.515 259.375 982.515C259.75 982.515 260.086 982.458 260.383 982.345C260.68 982.228 260.955 982.048 261.209 981.806V982.925ZM265.82 974.833V976.696H268.27V977.534H265.82V981.097C265.82 981.581 265.912 981.919 266.096 982.11C266.279 982.302 266.6 982.398 267.057 982.398H268.27V983.259H266.951C266.143 983.259 265.572 983.097 265.24 982.773C264.908 982.448 264.742 981.89 264.742 981.097V977.534H262.99V976.696H264.742V974.833H265.82ZM278.049 974.511H283.199V975.507H279.238V977.851H282.83V978.847H279.238V983.259H278.049V974.511ZM290.201 982.948C289.9 983.109 289.592 983.228 289.275 983.306C288.959 983.388 288.623 983.429 288.268 983.429C287.146 983.429 286.275 983.032 285.654 982.239C285.037 981.446 284.729 980.331 284.729 978.894C284.729 977.464 285.039 976.351 285.66 975.554C286.285 974.753 287.154 974.353 288.268 974.353C288.623 974.353 288.959 974.394 289.275 974.476C289.592 974.554 289.9 974.673 290.201 974.833V976.046C289.912 975.808 289.602 975.626 289.27 975.501C288.938 975.376 288.604 975.314 288.268 975.314C287.498 975.314 286.922 975.61 286.539 976.204C286.156 976.798 285.965 977.694 285.965 978.894C285.965 980.089 286.156 980.984 286.539 981.577C286.922 982.171 287.498 982.468 288.268 982.468C288.611 982.468 288.947 982.405 289.275 982.28C289.607 982.155 289.916 981.974 290.201 981.735V982.948ZM134.412 1101.48V1104.77H135.783C136.33 1104.77 136.756 1104.63 137.061 1104.34C137.369 1104.05 137.523 1103.64 137.523 1103.12C137.523 1102.6 137.371 1102.2 137.066 1101.92C136.762 1101.63 136.334 1101.48 135.783 1101.48H134.412ZM133.229 1100.51H135.783C136.76 1100.51 137.5 1100.73 138.004 1101.18C138.508 1101.62 138.76 1102.27 138.76 1103.12C138.76 1103.99 138.508 1104.64 138.004 1105.08C137.504 1105.52 136.764 1105.74 135.783 1105.74H134.412V1109.26H133.229V1100.51ZM146.072 1104.05C145.842 1103.87 145.607 1103.74 145.369 1103.66C145.131 1103.58 144.869 1103.53 144.584 1103.53C143.912 1103.53 143.398 1103.75 143.043 1104.17C142.688 1104.59 142.51 1105.2 142.51 1106V1109.26H141.426V1102.7H142.51V1103.98C142.689 1103.51 142.965 1103.16 143.336 1102.91C143.711 1102.66 144.154 1102.54 144.666 1102.54C144.932 1102.54 145.18 1102.57 145.41 1102.64C145.641 1102.7 145.861 1102.81 146.072 1102.95V1104.05ZM150.145 1103.45C149.598 1103.45 149.184 1103.67 148.902 1104.09C148.621 1104.52 148.48 1105.15 148.48 1105.98C148.48 1106.82 148.621 1107.45 148.902 1107.88C149.184 1108.3 149.598 1108.51 150.145 1108.51C150.695 1108.51 151.111 1108.3 151.393 1107.88C151.674 1107.45 151.814 1106.82 151.814 1105.98C151.814 1105.15 151.674 1104.52 151.393 1104.09C151.111 1103.67 150.695 1103.45 150.145 1103.45ZM150.145 1102.54C151.055 1102.54 151.75 1102.83 152.23 1103.42C152.715 1104.01 152.957 1104.87 152.957 1105.98C152.957 1107.1 152.717 1107.96 152.236 1108.55C151.756 1109.14 151.059 1109.43 150.145 1109.43C149.234 1109.43 148.539 1109.14 148.059 1108.55C147.578 1107.96 147.338 1107.1 147.338 1105.98C147.338 1104.87 147.578 1104.01 148.059 1103.42C148.539 1102.83 149.234 1102.54 150.145 1102.54ZM157.281 1109.38V1103.53H155.424V1102.7H158.359V1109.38C158.359 1110.14 158.184 1110.72 157.832 1111.13C157.484 1111.55 156.988 1111.76 156.344 1111.76H154.855V1110.84H156.227C156.578 1110.84 156.842 1110.72 157.018 1110.47C157.193 1110.23 157.281 1109.86 157.281 1109.38ZM157.281 1100.14H158.359V1101.51H157.281V1100.14ZM167.559 1105.44V1105.97H162.889V1106C162.857 1106.9 163.027 1107.54 163.398 1107.93C163.773 1108.32 164.301 1108.51 164.98 1108.51C165.324 1108.51 165.684 1108.46 166.059 1108.35C166.434 1108.24 166.834 1108.08 167.26 1107.85V1108.92C166.85 1109.09 166.453 1109.22 166.07 1109.3C165.691 1109.39 165.324 1109.43 164.969 1109.43C163.949 1109.43 163.152 1109.12 162.578 1108.51C162.004 1107.9 161.717 1107.06 161.717 1105.98C161.717 1104.94 161.998 1104.1 162.561 1103.48C163.123 1102.85 163.873 1102.54 164.811 1102.54C165.646 1102.54 166.305 1102.82 166.785 1103.39C167.27 1103.95 167.527 1104.64 167.559 1105.44ZM166.48 1105.12C166.434 1104.67 166.268 1104.28 165.982 1103.95C165.701 1103.62 165.295 1103.45 164.764 1103.45C164.244 1103.45 163.816 1103.62 163.48 1103.97C163.145 1104.31 162.961 1104.7 162.93 1105.13L166.48 1105.12ZM174.443 1108.92C174.154 1109.09 173.855 1109.22 173.547 1109.3C173.242 1109.39 172.93 1109.43 172.609 1109.43C171.594 1109.43 170.799 1109.12 170.225 1108.51C169.654 1107.91 169.369 1107.06 169.369 1105.98C169.369 1104.91 169.654 1104.06 170.225 1103.45C170.799 1102.84 171.594 1102.54 172.609 1102.54C172.926 1102.54 173.234 1102.58 173.535 1102.66C173.836 1102.74 174.139 1102.87 174.443 1103.04V1104.17C174.158 1103.92 173.871 1103.74 173.582 1103.62C173.297 1103.51 172.973 1103.45 172.609 1103.45C171.934 1103.45 171.414 1103.67 171.051 1104.11C170.688 1104.55 170.506 1105.17 170.506 1105.98C170.506 1106.79 170.688 1107.42 171.051 1107.86C171.418 1108.3 171.938 1108.51 172.609 1108.51C172.984 1108.51 173.32 1108.46 173.617 1108.34C173.914 1108.23 174.189 1108.05 174.443 1107.81V1108.92ZM179.055 1100.83V1102.7H181.504V1103.53H179.055V1107.1C179.055 1107.58 179.146 1107.92 179.33 1108.11C179.514 1108.3 179.834 1108.4 180.291 1108.4H181.504V1109.26H180.186C179.377 1109.26 178.807 1109.1 178.475 1108.77C178.143 1108.45 177.977 1107.89 177.977 1107.1V1103.53H176.225V1102.7H177.977V1100.83H179.055ZM134.412 1209.48V1212.77H135.783C136.33 1212.77 136.756 1212.63 137.061 1212.34C137.369 1212.05 137.523 1211.64 137.523 1211.12C137.523 1210.6 137.371 1210.2 137.066 1209.92C136.762 1209.63 136.334 1209.48 135.783 1209.48H134.412ZM133.229 1208.51H135.783C136.76 1208.51 137.5 1208.73 138.004 1209.18C138.508 1209.62 138.76 1210.27 138.76 1211.12C138.76 1211.99 138.508 1212.64 138.004 1213.08C137.504 1213.52 136.764 1213.74 135.783 1213.74H134.412V1217.26H133.229V1208.51ZM146.072 1212.05C145.842 1211.87 145.607 1211.74 145.369 1211.66C145.131 1211.58 144.869 1211.53 144.584 1211.53C143.912 1211.53 143.398 1211.75 143.043 1212.17C142.688 1212.59 142.51 1213.2 142.51 1214V1217.26H141.426V1210.7H142.51V1211.98C142.689 1211.51 142.965 1211.16 143.336 1210.91C143.711 1210.66 144.154 1210.54 144.666 1210.54C144.932 1210.54 145.18 1210.57 145.41 1210.64C145.641 1210.7 145.861 1210.81 146.072 1210.95V1212.05ZM150.145 1211.45C149.598 1211.45 149.184 1211.67 148.902 1212.09C148.621 1212.52 148.48 1213.15 148.48 1213.98C148.48 1214.82 148.621 1215.45 148.902 1215.88C149.184 1216.3 149.598 1216.51 150.145 1216.51C150.695 1216.51 151.111 1216.3 151.393 1215.88C151.674 1215.45 151.814 1214.82 151.814 1213.98C151.814 1213.15 151.674 1212.52 151.393 1212.09C151.111 1211.67 150.695 1211.45 150.145 1211.45ZM150.145 1210.54C151.055 1210.54 151.75 1210.83 152.23 1211.42C152.715 1212.01 152.957 1212.87 152.957 1213.98C152.957 1215.1 152.717 1215.96 152.236 1216.55C151.756 1217.14 151.059 1217.43 150.145 1217.43C149.234 1217.43 148.539 1217.14 148.059 1216.55C147.578 1215.96 147.338 1215.1 147.338 1213.98C147.338 1212.87 147.578 1212.01 148.059 1211.42C148.539 1210.83 149.234 1210.54 150.145 1210.54ZM157.281 1217.38V1211.53H155.424V1210.7H158.359V1217.38C158.359 1218.14 158.184 1218.72 157.832 1219.13C157.484 1219.55 156.988 1219.76 156.344 1219.76H154.855V1218.84H156.227C156.578 1218.84 156.842 1218.72 157.018 1218.47C157.193 1218.23 157.281 1217.86 157.281 1217.38ZM157.281 1208.14H158.359V1209.51H157.281V1208.14ZM167.559 1213.44V1213.97H162.889V1214C162.857 1214.9 163.027 1215.54 163.398 1215.93C163.773 1216.32 164.301 1216.51 164.98 1216.51C165.324 1216.51 165.684 1216.46 166.059 1216.35C166.434 1216.24 166.834 1216.08 167.26 1215.85V1216.92C166.85 1217.09 166.453 1217.22 166.07 1217.3C165.691 1217.39 165.324 1217.43 164.969 1217.43C163.949 1217.43 163.152 1217.12 162.578 1216.51C162.004 1215.9 161.717 1215.06 161.717 1213.98C161.717 1212.94 161.998 1212.1 162.561 1211.48C163.123 1210.85 163.873 1210.54 164.811 1210.54C165.646 1210.54 166.305 1210.82 166.785 1211.39C167.27 1211.95 167.527 1212.64 167.559 1213.44ZM166.48 1213.12C166.434 1212.67 166.268 1212.28 165.982 1211.95C165.701 1211.62 165.295 1211.45 164.764 1211.45C164.244 1211.45 163.816 1211.62 163.48 1211.97C163.145 1212.31 162.961 1212.7 162.93 1213.13L166.48 1213.12ZM174.443 1216.92C174.154 1217.09 173.855 1217.22 173.547 1217.3C173.242 1217.39 172.93 1217.43 172.609 1217.43C171.594 1217.43 170.799 1217.12 170.225 1216.51C169.654 1215.91 169.369 1215.06 169.369 1213.98C169.369 1212.91 169.654 1212.06 170.225 1211.45C170.799 1210.84 171.594 1210.54 172.609 1210.54C172.926 1210.54 173.234 1210.58 173.535 1210.66C173.836 1210.74 174.139 1210.87 174.443 1211.04V1212.17C174.158 1211.92 173.871 1211.74 173.582 1211.62C173.297 1211.51 172.973 1211.45 172.609 1211.45C171.934 1211.45 171.414 1211.67 171.051 1212.11C170.688 1212.55 170.506 1213.17 170.506 1213.98C170.506 1214.79 170.688 1215.42 171.051 1215.86C171.418 1216.3 171.938 1216.51 172.609 1216.51C172.984 1216.51 173.32 1216.46 173.617 1216.34C173.914 1216.23 174.189 1216.05 174.443 1215.81V1216.92ZM179.055 1208.83V1210.7H181.504V1211.53H179.055V1215.1C179.055 1215.58 179.146 1215.92 179.33 1216.11C179.514 1216.3 179.834 1216.4 180.291 1216.4H181.504V1217.26H180.186C179.377 1217.26 178.807 1217.1 178.475 1216.77C178.143 1216.45 177.977 1215.89 177.977 1215.1V1211.53H176.225V1210.7H177.977V1208.83H179.055ZM134.412 1317.48V1320.77H135.783C136.33 1320.77 136.756 1320.63 137.061 1320.34C137.369 1320.05 137.523 1319.64 137.523 1319.12C137.523 1318.6 137.371 1318.2 137.066 1317.92C136.762 1317.63 136.334 1317.48 135.783 1317.48H134.412ZM133.229 1316.51H135.783C136.76 1316.51 137.5 1316.73 138.004 1317.18C138.508 1317.62 138.76 1318.27 138.76 1319.12C138.76 1319.99 138.508 1320.64 138.004 1321.08C137.504 1321.52 136.764 1321.74 135.783 1321.74H134.412V1325.26H133.229V1316.51ZM146.072 1320.05C145.842 1319.87 145.607 1319.74 145.369 1319.66C145.131 1319.58 144.869 1319.53 144.584 1319.53C143.912 1319.53 143.398 1319.75 143.043 1320.17C142.688 1320.59 142.51 1321.2 142.51 1322V1325.26H141.426V1318.7H142.51V1319.98C142.689 1319.51 142.965 1319.16 143.336 1318.91C143.711 1318.66 144.154 1318.54 144.666 1318.54C144.932 1318.54 145.18 1318.57 145.41 1318.64C145.641 1318.7 145.861 1318.81 146.072 1318.95V1320.05ZM150.145 1319.45C149.598 1319.45 149.184 1319.67 148.902 1320.09C148.621 1320.52 148.48 1321.15 148.48 1321.98C148.48 1322.82 148.621 1323.45 148.902 1323.88C149.184 1324.3 149.598 1324.51 150.145 1324.51C150.695 1324.51 151.111 1324.3 151.393 1323.88C151.674 1323.45 151.814 1322.82 151.814 1321.98C151.814 1321.15 151.674 1320.52 151.393 1320.09C151.111 1319.67 150.695 1319.45 150.145 1319.45ZM150.145 1318.54C151.055 1318.54 151.75 1318.83 152.23 1319.42C152.715 1320.01 152.957 1320.87 152.957 1321.98C152.957 1323.1 152.717 1323.96 152.236 1324.55C151.756 1325.14 151.059 1325.43 150.145 1325.43C149.234 1325.43 148.539 1325.14 148.059 1324.55C147.578 1323.96 147.338 1323.1 147.338 1321.98C147.338 1320.87 147.578 1320.01 148.059 1319.42C148.539 1318.83 149.234 1318.54 150.145 1318.54ZM157.281 1325.38V1319.53H155.424V1318.7H158.359V1325.38C158.359 1326.14 158.184 1326.72 157.832 1327.13C157.484 1327.55 156.988 1327.76 156.344 1327.76H154.855V1326.84H156.227C156.578 1326.84 156.842 1326.72 157.018 1326.47C157.193 1326.23 157.281 1325.86 157.281 1325.38ZM157.281 1316.14H158.359V1317.51H157.281V1316.14ZM167.559 1321.44V1321.97H162.889V1322C162.857 1322.9 163.027 1323.54 163.398 1323.93C163.773 1324.32 164.301 1324.51 164.98 1324.51C165.324 1324.51 165.684 1324.46 166.059 1324.35C166.434 1324.24 166.834 1324.08 167.26 1323.85V1324.92C166.85 1325.09 166.453 1325.22 166.07 1325.3C165.691 1325.39 165.324 1325.43 164.969 1325.43C163.949 1325.43 163.152 1325.12 162.578 1324.51C162.004 1323.9 161.717 1323.06 161.717 1321.98C161.717 1320.94 161.998 1320.1 162.561 1319.48C163.123 1318.85 163.873 1318.54 164.811 1318.54C165.646 1318.54 166.305 1318.82 166.785 1319.39C167.27 1319.95 167.527 1320.64 167.559 1321.44ZM166.48 1321.12C166.434 1320.67 166.268 1320.28 165.982 1319.95C165.701 1319.62 165.295 1319.45 164.764 1319.45C164.244 1319.45 163.816 1319.62 163.48 1319.97C163.145 1320.31 162.961 1320.7 162.93 1321.13L166.48 1321.12ZM174.443 1324.92C174.154 1325.09 173.855 1325.22 173.547 1325.3C173.242 1325.39 172.93 1325.43 172.609 1325.43C171.594 1325.43 170.799 1325.12 170.225 1324.51C169.654 1323.91 169.369 1323.06 169.369 1321.98C169.369 1320.91 169.654 1320.06 170.225 1319.45C170.799 1318.84 171.594 1318.54 172.609 1318.54C172.926 1318.54 173.234 1318.58 173.535 1318.66C173.836 1318.74 174.139 1318.87 174.443 1319.04V1320.17C174.158 1319.92 173.871 1319.74 173.582 1319.62C173.297 1319.51 172.973 1319.45 172.609 1319.45C171.934 1319.45 171.414 1319.67 171.051 1320.11C170.688 1320.55 170.506 1321.17 170.506 1321.98C170.506 1322.79 170.688 1323.42 171.051 1323.86C171.418 1324.3 171.938 1324.51 172.609 1324.51C172.984 1324.51 173.32 1324.46 173.617 1324.34C173.914 1324.23 174.189 1324.05 174.443 1323.81V1324.92ZM179.055 1316.83V1318.7H181.504V1319.53H179.055V1323.1C179.055 1323.58 179.146 1323.92 179.33 1324.11C179.514 1324.3 179.834 1324.4 180.291 1324.4H181.504V1325.26H180.186C179.377 1325.26 178.807 1325.1 178.475 1324.77C178.143 1324.45 177.977 1323.89 177.977 1323.1V1319.53H176.225V1318.7H177.977V1316.83H179.055ZM134.412 1407.48V1410.77H135.783C136.33 1410.77 136.756 1410.63 137.061 1410.34C137.369 1410.05 137.523 1409.64 137.523 1409.12C137.523 1408.6 137.371 1408.2 137.066 1407.92C136.762 1407.63 136.334 1407.48 135.783 1407.48H134.412ZM133.229 1406.51H135.783C136.76 1406.51 137.5 1406.73 138.004 1407.18C138.508 1407.62 138.76 1408.27 138.76 1409.12C138.76 1409.99 138.508 1410.64 138.004 1411.08C137.504 1411.52 136.764 1411.74 135.783 1411.74H134.412V1415.26H133.229V1406.51ZM146.072 1410.05C145.842 1409.87 145.607 1409.74 145.369 1409.66C145.131 1409.58 144.869 1409.53 144.584 1409.53C143.912 1409.53 143.398 1409.75 143.043 1410.17C142.688 1410.59 142.51 1411.2 142.51 1412V1415.26H141.426V1408.7H142.51V1409.98C142.689 1409.51 142.965 1409.16 143.336 1408.91C143.711 1408.66 144.154 1408.54 144.666 1408.54C144.932 1408.54 145.18 1408.57 145.41 1408.64C145.641 1408.7 145.861 1408.81 146.072 1408.95V1410.05ZM150.145 1409.45C149.598 1409.45 149.184 1409.67 148.902 1410.09C148.621 1410.52 148.48 1411.15 148.48 1411.98C148.48 1412.82 148.621 1413.45 148.902 1413.88C149.184 1414.3 149.598 1414.51 150.145 1414.51C150.695 1414.51 151.111 1414.3 151.393 1413.88C151.674 1413.45 151.814 1412.82 151.814 1411.98C151.814 1411.15 151.674 1410.52 151.393 1410.09C151.111 1409.67 150.695 1409.45 150.145 1409.45ZM150.145 1408.54C151.055 1408.54 151.75 1408.83 152.23 1409.42C152.715 1410.01 152.957 1410.87 152.957 1411.98C152.957 1413.1 152.717 1413.96 152.236 1414.55C151.756 1415.14 151.059 1415.43 150.145 1415.43C149.234 1415.43 148.539 1415.14 148.059 1414.55C147.578 1413.96 147.338 1413.1 147.338 1411.98C147.338 1410.87 147.578 1410.01 148.059 1409.42C148.539 1408.83 149.234 1408.54 150.145 1408.54ZM157.281 1415.38V1409.53H155.424V1408.7H158.359V1415.38C158.359 1416.14 158.184 1416.72 157.832 1417.13C157.484 1417.55 156.988 1417.76 156.344 1417.76H154.855V1416.84H156.227C156.578 1416.84 156.842 1416.72 157.018 1416.47C157.193 1416.23 157.281 1415.86 157.281 1415.38ZM157.281 1406.14H158.359V1407.51H157.281V1406.14ZM167.559 1411.44V1411.97H162.889V1412C162.857 1412.9 163.027 1413.54 163.398 1413.93C163.773 1414.32 164.301 1414.51 164.98 1414.51C165.324 1414.51 165.684 1414.46 166.059 1414.35C166.434 1414.24 166.834 1414.08 167.26 1413.85V1414.92C166.85 1415.09 166.453 1415.22 166.07 1415.3C165.691 1415.39 165.324 1415.43 164.969 1415.43C163.949 1415.43 163.152 1415.12 162.578 1414.51C162.004 1413.9 161.717 1413.06 161.717 1411.98C161.717 1410.94 161.998 1410.1 162.561 1409.48C163.123 1408.85 163.873 1408.54 164.811 1408.54C165.646 1408.54 166.305 1408.82 166.785 1409.39C167.27 1409.95 167.527 1410.64 167.559 1411.44ZM166.48 1411.12C166.434 1410.67 166.268 1410.28 165.982 1409.95C165.701 1409.62 165.295 1409.45 164.764 1409.45C164.244 1409.45 163.816 1409.62 163.48 1409.97C163.145 1410.31 162.961 1410.7 162.93 1411.13L166.48 1411.12ZM174.443 1414.92C174.154 1415.09 173.855 1415.22 173.547 1415.3C173.242 1415.39 172.93 1415.43 172.609 1415.43C171.594 1415.43 170.799 1415.12 170.225 1414.51C169.654 1413.91 169.369 1413.06 169.369 1411.98C169.369 1410.91 169.654 1410.06 170.225 1409.45C170.799 1408.84 171.594 1408.54 172.609 1408.54C172.926 1408.54 173.234 1408.58 173.535 1408.66C173.836 1408.74 174.139 1408.87 174.443 1409.04V1410.17C174.158 1409.92 173.871 1409.74 173.582 1409.62C173.297 1409.51 172.973 1409.45 172.609 1409.45C171.934 1409.45 171.414 1409.67 171.051 1410.11C170.688 1410.55 170.506 1411.17 170.506 1411.98C170.506 1412.79 170.688 1413.42 171.051 1413.86C171.418 1414.3 171.938 1414.51 172.609 1414.51C172.984 1414.51 173.32 1414.46 173.617 1414.34C173.914 1414.23 174.189 1414.05 174.443 1413.81V1414.92ZM179.055 1406.83V1408.7H181.504V1409.53H179.055V1413.1C179.055 1413.58 179.146 1413.92 179.33 1414.11C179.514 1414.3 179.834 1414.4 180.291 1414.4H181.504V1415.26H180.186C179.377 1415.26 178.807 1415.1 178.475 1414.77C178.143 1414.45 177.977 1413.89 177.977 1413.1V1409.53H176.225V1408.7H177.977V1406.83H179.055ZM134.412 1497.48V1500.77H135.783C136.33 1500.77 136.756 1500.63 137.061 1500.34C137.369 1500.05 137.523 1499.64 137.523 1499.12C137.523 1498.6 137.371 1498.2 137.066 1497.92C136.762 1497.63 136.334 1497.48 135.783 1497.48H134.412ZM133.229 1496.51H135.783C136.76 1496.51 137.5 1496.73 138.004 1497.18C138.508 1497.62 138.76 1498.27 138.76 1499.12C138.76 1499.99 138.508 1500.64 138.004 1501.08C137.504 1501.52 136.764 1501.74 135.783 1501.74H134.412V1505.26H133.229V1496.51ZM146.072 1500.05C145.842 1499.87 145.607 1499.74 145.369 1499.66C145.131 1499.58 144.869 1499.53 144.584 1499.53C143.912 1499.53 143.398 1499.75 143.043 1500.17C142.688 1500.59 142.51 1501.2 142.51 1502V1505.26H141.426V1498.7H142.51V1499.98C142.689 1499.51 142.965 1499.16 143.336 1498.91C143.711 1498.66 144.154 1498.54 144.666 1498.54C144.932 1498.54 145.18 1498.57 145.41 1498.64C145.641 1498.7 145.861 1498.81 146.072 1498.95V1500.05ZM150.145 1499.45C149.598 1499.45 149.184 1499.67 148.902 1500.09C148.621 1500.52 148.48 1501.15 148.48 1501.98C148.48 1502.82 148.621 1503.45 148.902 1503.88C149.184 1504.3 149.598 1504.51 150.145 1504.51C150.695 1504.51 151.111 1504.3 151.393 1503.88C151.674 1503.45 151.814 1502.82 151.814 1501.98C151.814 1501.15 151.674 1500.52 151.393 1500.09C151.111 1499.67 150.695 1499.45 150.145 1499.45ZM150.145 1498.54C151.055 1498.54 151.75 1498.83 152.23 1499.42C152.715 1500.01 152.957 1500.87 152.957 1501.98C152.957 1503.1 152.717 1503.96 152.236 1504.55C151.756 1505.14 151.059 1505.43 150.145 1505.43C149.234 1505.43 148.539 1505.14 148.059 1504.55C147.578 1503.96 147.338 1503.1 147.338 1501.98C147.338 1500.87 147.578 1500.01 148.059 1499.42C148.539 1498.83 149.234 1498.54 150.145 1498.54ZM157.281 1505.38V1499.53H155.424V1498.7H158.359V1505.38C158.359 1506.14 158.184 1506.72 157.832 1507.13C157.484 1507.55 156.988 1507.76 156.344 1507.76H154.855V1506.84H156.227C156.578 1506.84 156.842 1506.72 157.018 1506.47C157.193 1506.23 157.281 1505.86 157.281 1505.38ZM157.281 1496.14H158.359V1497.51H157.281V1496.14ZM167.559 1501.44V1501.97H162.889V1502C162.857 1502.9 163.027 1503.54 163.398 1503.93C163.773 1504.32 164.301 1504.51 164.98 1504.51C165.324 1504.51 165.684 1504.46 166.059 1504.35C166.434 1504.24 166.834 1504.08 167.26 1503.85V1504.92C166.85 1505.09 166.453 1505.22 166.07 1505.3C165.691 1505.39 165.324 1505.43 164.969 1505.43C163.949 1505.43 163.152 1505.12 162.578 1504.51C162.004 1503.9 161.717 1503.06 161.717 1501.98C161.717 1500.94 161.998 1500.1 162.561 1499.48C163.123 1498.85 163.873 1498.54 164.811 1498.54C165.646 1498.54 166.305 1498.82 166.785 1499.39C167.27 1499.95 167.527 1500.64 167.559 1501.44ZM166.48 1501.12C166.434 1500.67 166.268 1500.28 165.982 1499.95C165.701 1499.62 165.295 1499.45 164.764 1499.45C164.244 1499.45 163.816 1499.62 163.48 1499.97C163.145 1500.31 162.961 1500.7 162.93 1501.13L166.48 1501.12ZM174.443 1504.92C174.154 1505.09 173.855 1505.22 173.547 1505.3C173.242 1505.39 172.93 1505.43 172.609 1505.43C171.594 1505.43 170.799 1505.12 170.225 1504.51C169.654 1503.91 169.369 1503.06 169.369 1501.98C169.369 1500.91 169.654 1500.06 170.225 1499.45C170.799 1498.84 171.594 1498.54 172.609 1498.54C172.926 1498.54 173.234 1498.58 173.535 1498.66C173.836 1498.74 174.139 1498.87 174.443 1499.04V1500.17C174.158 1499.92 173.871 1499.74 173.582 1499.62C173.297 1499.51 172.973 1499.45 172.609 1499.45C171.934 1499.45 171.414 1499.67 171.051 1500.11C170.688 1500.55 170.506 1501.17 170.506 1501.98C170.506 1502.79 170.688 1503.42 171.051 1503.86C171.418 1504.3 171.938 1504.51 172.609 1504.51C172.984 1504.51 173.32 1504.46 173.617 1504.34C173.914 1504.23 174.189 1504.05 174.443 1503.81V1504.92ZM179.055 1496.83V1498.7H181.504V1499.53H179.055V1503.1C179.055 1503.58 179.146 1503.92 179.33 1504.11C179.514 1504.3 179.834 1504.4 180.291 1504.4H181.504V1505.26H180.186C179.377 1505.26 178.807 1505.1 178.475 1504.77C178.143 1504.45 177.977 1503.89 177.977 1503.1V1499.53H176.225V1498.7H177.977V1496.83H179.055ZM134.412 1587.48V1590.77H135.783C136.33 1590.77 136.756 1590.63 137.061 1590.34C137.369 1590.05 137.523 1589.64 137.523 1589.12C137.523 1588.6 137.371 1588.2 137.066 1587.92C136.762 1587.63 136.334 1587.48 135.783 1587.48H134.412ZM133.229 1586.51H135.783C136.76 1586.51 137.5 1586.73 138.004 1587.18C138.508 1587.62 138.76 1588.27 138.76 1589.12C138.76 1589.99 138.508 1590.64 138.004 1591.08C137.504 1591.52 136.764 1591.74 135.783 1591.74H134.412V1595.26H133.229V1586.51ZM146.072 1590.05C145.842 1589.87 145.607 1589.74 145.369 1589.66C145.131 1589.58 144.869 1589.53 144.584 1589.53C143.912 1589.53 143.398 1589.75 143.043 1590.17C142.688 1590.59 142.51 1591.2 142.51 1592V1595.26H141.426V1588.7H142.51V1589.98C142.689 1589.51 142.965 1589.16 143.336 1588.91C143.711 1588.66 144.154 1588.54 144.666 1588.54C144.932 1588.54 145.18 1588.57 145.41 1588.64C145.641 1588.7 145.861 1588.81 146.072 1588.95V1590.05ZM150.145 1589.45C149.598 1589.45 149.184 1589.67 148.902 1590.09C148.621 1590.52 148.48 1591.15 148.48 1591.98C148.48 1592.82 148.621 1593.45 148.902 1593.88C149.184 1594.3 149.598 1594.51 150.145 1594.51C150.695 1594.51 151.111 1594.3 151.393 1593.88C151.674 1593.45 151.814 1592.82 151.814 1591.98C151.814 1591.15 151.674 1590.52 151.393 1590.09C151.111 1589.67 150.695 1589.45 150.145 1589.45ZM150.145 1588.54C151.055 1588.54 151.75 1588.83 152.23 1589.42C152.715 1590.01 152.957 1590.87 152.957 1591.98C152.957 1593.1 152.717 1593.96 152.236 1594.55C151.756 1595.14 151.059 1595.43 150.145 1595.43C149.234 1595.43 148.539 1595.14 148.059 1594.55C147.578 1593.96 147.338 1593.1 147.338 1591.98C147.338 1590.87 147.578 1590.01 148.059 1589.42C148.539 1588.83 149.234 1588.54 150.145 1588.54ZM157.281 1595.38V1589.53H155.424V1588.7H158.359V1595.38C158.359 1596.14 158.184 1596.72 157.832 1597.13C157.484 1597.55 156.988 1597.76 156.344 1597.76H154.855V1596.84H156.227C156.578 1596.84 156.842 1596.72 157.018 1596.47C157.193 1596.23 157.281 1595.86 157.281 1595.38ZM157.281 1586.14H158.359V1587.51H157.281V1586.14ZM167.559 1591.44V1591.97H162.889V1592C162.857 1592.9 163.027 1593.54 163.398 1593.93C163.773 1594.32 164.301 1594.51 164.98 1594.51C165.324 1594.51 165.684 1594.46 166.059 1594.35C166.434 1594.24 166.834 1594.08 167.26 1593.85V1594.92C166.85 1595.09 166.453 1595.22 166.07 1595.3C165.691 1595.39 165.324 1595.43 164.969 1595.43C163.949 1595.43 163.152 1595.12 162.578 1594.51C162.004 1593.9 161.717 1593.06 161.717 1591.98C161.717 1590.94 161.998 1590.1 162.561 1589.48C163.123 1588.85 163.873 1588.54 164.811 1588.54C165.646 1588.54 166.305 1588.82 166.785 1589.39C167.27 1589.95 167.527 1590.64 167.559 1591.44ZM166.48 1591.12C166.434 1590.67 166.268 1590.28 165.982 1589.95C165.701 1589.62 165.295 1589.45 164.764 1589.45C164.244 1589.45 163.816 1589.62 163.48 1589.97C163.145 1590.31 162.961 1590.7 162.93 1591.13L166.48 1591.12ZM174.443 1594.92C174.154 1595.09 173.855 1595.22 173.547 1595.3C173.242 1595.39 172.93 1595.43 172.609 1595.43C171.594 1595.43 170.799 1595.12 170.225 1594.51C169.654 1593.91 169.369 1593.06 169.369 1591.98C169.369 1590.91 169.654 1590.06 170.225 1589.45C170.799 1588.84 171.594 1588.54 172.609 1588.54C172.926 1588.54 173.234 1588.58 173.535 1588.66C173.836 1588.74 174.139 1588.87 174.443 1589.04V1590.17C174.158 1589.92 173.871 1589.74 173.582 1589.62C173.297 1589.51 172.973 1589.45 172.609 1589.45C171.934 1589.45 171.414 1589.67 171.051 1590.11C170.688 1590.55 170.506 1591.17 170.506 1591.98C170.506 1592.79 170.688 1593.42 171.051 1593.86C171.418 1594.3 171.938 1594.51 172.609 1594.51C172.984 1594.51 173.32 1594.46 173.617 1594.34C173.914 1594.23 174.189 1594.05 174.443 1593.81V1594.92ZM179.055 1586.83V1588.7H181.504V1589.53H179.055V1593.1C179.055 1593.58 179.146 1593.92 179.33 1594.11C179.514 1594.3 179.834 1594.4 180.291 1594.4H181.504V1595.26H180.186C179.377 1595.26 178.807 1595.1 178.475 1594.77C178.143 1594.45 177.977 1593.89 177.977 1593.1V1589.53H176.225V1588.7H177.977V1586.83H179.055ZM134.412 1677.48V1680.77H135.783C136.33 1680.77 136.756 1680.63 137.061 1680.34C137.369 1680.05 137.523 1679.64 137.523 1679.12C137.523 1678.6 137.371 1678.2 137.066 1677.92C136.762 1677.63 136.334 1677.48 135.783 1677.48H134.412ZM133.229 1676.51H135.783C136.76 1676.51 137.5 1676.73 138.004 1677.18C138.508 1677.62 138.76 1678.27 138.76 1679.12C138.76 1679.99 138.508 1680.64 138.004 1681.08C137.504 1681.52 136.764 1681.74 135.783 1681.74H134.412V1685.26H133.229V1676.51ZM146.072 1680.05C145.842 1679.87 145.607 1679.74 145.369 1679.66C145.131 1679.58 144.869 1679.53 144.584 1679.53C143.912 1679.53 143.398 1679.75 143.043 1680.17C142.688 1680.59 142.51 1681.2 142.51 1682V1685.26H141.426V1678.7H142.51V1679.98C142.689 1679.51 142.965 1679.16 143.336 1678.91C143.711 1678.66 144.154 1678.54 144.666 1678.54C144.932 1678.54 145.18 1678.57 145.41 1678.64C145.641 1678.7 145.861 1678.81 146.072 1678.95V1680.05ZM150.145 1679.45C149.598 1679.45 149.184 1679.67 148.902 1680.09C148.621 1680.52 148.48 1681.15 148.48 1681.98C148.48 1682.82 148.621 1683.45 148.902 1683.88C149.184 1684.3 149.598 1684.51 150.145 1684.51C150.695 1684.51 151.111 1684.3 151.393 1683.88C151.674 1683.45 151.814 1682.82 151.814 1681.98C151.814 1681.15 151.674 1680.52 151.393 1680.09C151.111 1679.67 150.695 1679.45 150.145 1679.45ZM150.145 1678.54C151.055 1678.54 151.75 1678.83 152.23 1679.42C152.715 1680.01 152.957 1680.87 152.957 1681.98C152.957 1683.1 152.717 1683.96 152.236 1684.55C151.756 1685.14 151.059 1685.43 150.145 1685.43C149.234 1685.43 148.539 1685.14 148.059 1684.55C147.578 1683.96 147.338 1683.1 147.338 1681.98C147.338 1680.87 147.578 1680.01 148.059 1679.42C148.539 1678.83 149.234 1678.54 150.145 1678.54ZM157.281 1685.38V1679.53H155.424V1678.7H158.359V1685.38C158.359 1686.14 158.184 1686.72 157.832 1687.13C157.484 1687.55 156.988 1687.76 156.344 1687.76H154.855V1686.84H156.227C156.578 1686.84 156.842 1686.72 157.018 1686.47C157.193 1686.23 157.281 1685.86 157.281 1685.38ZM157.281 1676.14H158.359V1677.51H157.281V1676.14ZM167.559 1681.44V1681.97H162.889V1682C162.857 1682.9 163.027 1683.54 163.398 1683.93C163.773 1684.32 164.301 1684.51 164.98 1684.51C165.324 1684.51 165.684 1684.46 166.059 1684.35C166.434 1684.24 166.834 1684.08 167.26 1683.85V1684.92C166.85 1685.09 166.453 1685.22 166.07 1685.3C165.691 1685.39 165.324 1685.43 164.969 1685.43C163.949 1685.43 163.152 1685.12 162.578 1684.51C162.004 1683.9 161.717 1683.06 161.717 1681.98C161.717 1680.94 161.998 1680.1 162.561 1679.48C163.123 1678.85 163.873 1678.54 164.811 1678.54C165.646 1678.54 166.305 1678.82 166.785 1679.39C167.27 1679.95 167.527 1680.64 167.559 1681.44ZM166.48 1681.12C166.434 1680.67 166.268 1680.28 165.982 1679.95C165.701 1679.62 165.295 1679.45 164.764 1679.45C164.244 1679.45 163.816 1679.62 163.48 1679.97C163.145 1680.31 162.961 1680.7 162.93 1681.13L166.48 1681.12ZM174.443 1684.92C174.154 1685.09 173.855 1685.22 173.547 1685.3C173.242 1685.39 172.93 1685.43 172.609 1685.43C171.594 1685.43 170.799 1685.12 170.225 1684.51C169.654 1683.91 169.369 1683.06 169.369 1681.98C169.369 1680.91 169.654 1680.06 170.225 1679.45C170.799 1678.84 171.594 1678.54 172.609 1678.54C172.926 1678.54 173.234 1678.58 173.535 1678.66C173.836 1678.74 174.139 1678.87 174.443 1679.04V1680.17C174.158 1679.92 173.871 1679.74 173.582 1679.62C173.297 1679.51 172.973 1679.45 172.609 1679.45C171.934 1679.45 171.414 1679.67 171.051 1680.11C170.688 1680.55 170.506 1681.17 170.506 1681.98C170.506 1682.79 170.688 1683.42 171.051 1683.86C171.418 1684.3 171.938 1684.51 172.609 1684.51C172.984 1684.51 173.32 1684.46 173.617 1684.34C173.914 1684.23 174.189 1684.05 174.443 1683.81V1684.92ZM179.055 1676.83V1678.7H181.504V1679.53H179.055V1683.1C179.055 1683.58 179.146 1683.92 179.33 1684.11C179.514 1684.3 179.834 1684.4 180.291 1684.4H181.504V1685.26H180.186C179.377 1685.26 178.807 1685.1 178.475 1684.77C178.143 1684.45 177.977 1683.89 177.977 1683.1V1679.53H176.225V1678.7H177.977V1676.83H179.055ZM134.412 1767.48V1770.77H135.783C136.33 1770.77 136.756 1770.63 137.061 1770.34C137.369 1770.05 137.523 1769.64 137.523 1769.12C137.523 1768.6 137.371 1768.2 137.066 1767.92C136.762 1767.63 136.334 1767.48 135.783 1767.48H134.412ZM133.229 1766.51H135.783C136.76 1766.51 137.5 1766.73 138.004 1767.18C138.508 1767.62 138.76 1768.27 138.76 1769.12C138.76 1769.99 138.508 1770.64 138.004 1771.08C137.504 1771.52 136.764 1771.74 135.783 1771.74H134.412V1775.26H133.229V1766.51ZM146.072 1770.05C145.842 1769.87 145.607 1769.74 145.369 1769.66C145.131 1769.58 144.869 1769.53 144.584 1769.53C143.912 1769.53 143.398 1769.75 143.043 1770.17C142.688 1770.59 142.51 1771.2 142.51 1772V1775.26H141.426V1768.7H142.51V1769.98C142.689 1769.51 142.965 1769.16 143.336 1768.91C143.711 1768.66 144.154 1768.54 144.666 1768.54C144.932 1768.54 145.18 1768.57 145.41 1768.64C145.641 1768.7 145.861 1768.81 146.072 1768.95V1770.05ZM150.145 1769.45C149.598 1769.45 149.184 1769.67 148.902 1770.09C148.621 1770.52 148.48 1771.15 148.48 1771.98C148.48 1772.82 148.621 1773.45 148.902 1773.88C149.184 1774.3 149.598 1774.51 150.145 1774.51C150.695 1774.51 151.111 1774.3 151.393 1773.88C151.674 1773.45 151.814 1772.82 151.814 1771.98C151.814 1771.15 151.674 1770.52 151.393 1770.09C151.111 1769.67 150.695 1769.45 150.145 1769.45ZM150.145 1768.54C151.055 1768.54 151.75 1768.83 152.23 1769.42C152.715 1770.01 152.957 1770.87 152.957 1771.98C152.957 1773.1 152.717 1773.96 152.236 1774.55C151.756 1775.14 151.059 1775.43 150.145 1775.43C149.234 1775.43 148.539 1775.14 148.059 1774.55C147.578 1773.96 147.338 1773.1 147.338 1771.98C147.338 1770.87 147.578 1770.01 148.059 1769.42C148.539 1768.83 149.234 1768.54 150.145 1768.54ZM157.281 1775.38V1769.53H155.424V1768.7H158.359V1775.38C158.359 1776.14 158.184 1776.72 157.832 1777.13C157.484 1777.55 156.988 1777.76 156.344 1777.76H154.855V1776.84H156.227C156.578 1776.84 156.842 1776.72 157.018 1776.47C157.193 1776.23 157.281 1775.86 157.281 1775.38ZM157.281 1766.14H158.359V1767.51H157.281V1766.14ZM167.559 1771.44V1771.97H162.889V1772C162.857 1772.9 163.027 1773.54 163.398 1773.93C163.773 1774.32 164.301 1774.51 164.98 1774.51C165.324 1774.51 165.684 1774.46 166.059 1774.35C166.434 1774.24 166.834 1774.08 167.26 1773.85V1774.92C166.85 1775.09 166.453 1775.22 166.07 1775.3C165.691 1775.39 165.324 1775.43 164.969 1775.43C163.949 1775.43 163.152 1775.12 162.578 1774.51C162.004 1773.9 161.717 1773.06 161.717 1771.98C161.717 1770.94 161.998 1770.1 162.561 1769.48C163.123 1768.85 163.873 1768.54 164.811 1768.54C165.646 1768.54 166.305 1768.82 166.785 1769.39C167.27 1769.95 167.527 1770.64 167.559 1771.44ZM166.48 1771.12C166.434 1770.67 166.268 1770.28 165.982 1769.95C165.701 1769.62 165.295 1769.45 164.764 1769.45C164.244 1769.45 163.816 1769.62 163.48 1769.97C163.145 1770.31 162.961 1770.7 162.93 1771.13L166.48 1771.12ZM174.443 1774.92C174.154 1775.09 173.855 1775.22 173.547 1775.3C173.242 1775.39 172.93 1775.43 172.609 1775.43C171.594 1775.43 170.799 1775.12 170.225 1774.51C169.654 1773.91 169.369 1773.06 169.369 1771.98C169.369 1770.91 169.654 1770.06 170.225 1769.45C170.799 1768.84 171.594 1768.54 172.609 1768.54C172.926 1768.54 173.234 1768.58 173.535 1768.66C173.836 1768.74 174.139 1768.87 174.443 1769.04V1770.17C174.158 1769.92 173.871 1769.74 173.582 1769.62C173.297 1769.51 172.973 1769.45 172.609 1769.45C171.934 1769.45 171.414 1769.67 171.051 1770.11C170.688 1770.55 170.506 1771.17 170.506 1771.98C170.506 1772.79 170.688 1773.42 171.051 1773.86C171.418 1774.3 171.938 1774.51 172.609 1774.51C172.984 1774.51 173.32 1774.46 173.617 1774.34C173.914 1774.23 174.189 1774.05 174.443 1773.81V1774.92ZM179.055 1766.83V1768.7H181.504V1769.53H179.055V1773.1C179.055 1773.58 179.146 1773.92 179.33 1774.11C179.514 1774.3 179.834 1774.4 180.291 1774.4H181.504V1775.26H180.186C179.377 1775.26 178.807 1775.1 178.475 1774.77C178.143 1774.45 177.977 1773.89 177.977 1773.1V1769.53H176.225V1768.7H177.977V1766.83H179.055ZM134.412 1857.48V1860.77H135.783C136.33 1860.77 136.756 1860.63 137.061 1860.34C137.369 1860.05 137.523 1859.64 137.523 1859.12C137.523 1858.6 137.371 1858.2 137.066 1857.92C136.762 1857.63 136.334 1857.48 135.783 1857.48H134.412ZM133.229 1856.51H135.783C136.76 1856.51 137.5 1856.73 138.004 1857.18C138.508 1857.62 138.76 1858.27 138.76 1859.12C138.76 1859.99 138.508 1860.64 138.004 1861.08C137.504 1861.52 136.764 1861.74 135.783 1861.74H134.412V1865.26H133.229V1856.51ZM146.072 1860.05C145.842 1859.87 145.607 1859.74 145.369 1859.66C145.131 1859.58 144.869 1859.53 144.584 1859.53C143.912 1859.53 143.398 1859.75 143.043 1860.17C142.688 1860.59 142.51 1861.2 142.51 1862V1865.26H141.426V1858.7H142.51V1859.98C142.689 1859.51 142.965 1859.16 143.336 1858.91C143.711 1858.66 144.154 1858.54 144.666 1858.54C144.932 1858.54 145.18 1858.57 145.41 1858.64C145.641 1858.7 145.861 1858.81 146.072 1858.95V1860.05ZM150.145 1859.45C149.598 1859.45 149.184 1859.67 148.902 1860.09C148.621 1860.52 148.48 1861.15 148.48 1861.98C148.48 1862.82 148.621 1863.45 148.902 1863.88C149.184 1864.3 149.598 1864.51 150.145 1864.51C150.695 1864.51 151.111 1864.3 151.393 1863.88C151.674 1863.45 151.814 1862.82 151.814 1861.98C151.814 1861.15 151.674 1860.52 151.393 1860.09C151.111 1859.67 150.695 1859.45 150.145 1859.45ZM150.145 1858.54C151.055 1858.54 151.75 1858.83 152.23 1859.42C152.715 1860.01 152.957 1860.87 152.957 1861.98C152.957 1863.1 152.717 1863.96 152.236 1864.55C151.756 1865.14 151.059 1865.43 150.145 1865.43C149.234 1865.43 148.539 1865.14 148.059 1864.55C147.578 1863.96 147.338 1863.1 147.338 1861.98C147.338 1860.87 147.578 1860.01 148.059 1859.42C148.539 1858.83 149.234 1858.54 150.145 1858.54ZM157.281 1865.38V1859.53H155.424V1858.7H158.359V1865.38C158.359 1866.14 158.184 1866.72 157.832 1867.13C157.484 1867.55 156.988 1867.76 156.344 1867.76H154.855V1866.84H156.227C156.578 1866.84 156.842 1866.72 157.018 1866.47C157.193 1866.23 157.281 1865.86 157.281 1865.38ZM157.281 1856.14H158.359V1857.51H157.281V1856.14ZM167.559 1861.44V1861.97H162.889V1862C162.857 1862.9 163.027 1863.54 163.398 1863.93C163.773 1864.32 164.301 1864.51 164.98 1864.51C165.324 1864.51 165.684 1864.46 166.059 1864.35C166.434 1864.24 166.834 1864.08 167.26 1863.85V1864.92C166.85 1865.09 166.453 1865.22 166.07 1865.3C165.691 1865.39 165.324 1865.43 164.969 1865.43C163.949 1865.43 163.152 1865.12 162.578 1864.51C162.004 1863.9 161.717 1863.06 161.717 1861.98C161.717 1860.94 161.998 1860.1 162.561 1859.48C163.123 1858.85 163.873 1858.54 164.811 1858.54C165.646 1858.54 166.305 1858.82 166.785 1859.39C167.27 1859.95 167.527 1860.64 167.559 1861.44ZM166.48 1861.12C166.434 1860.67 166.268 1860.28 165.982 1859.95C165.701 1859.62 165.295 1859.45 164.764 1859.45C164.244 1859.45 163.816 1859.62 163.48 1859.97C163.145 1860.31 162.961 1860.7 162.93 1861.13L166.48 1861.12ZM174.443 1864.92C174.154 1865.09 173.855 1865.22 173.547 1865.3C173.242 1865.39 172.93 1865.43 172.609 1865.43C171.594 1865.43 170.799 1865.12 170.225 1864.51C169.654 1863.91 169.369 1863.06 169.369 1861.98C169.369 1860.91 169.654 1860.06 170.225 1859.45C170.799 1858.84 171.594 1858.54 172.609 1858.54C172.926 1858.54 173.234 1858.58 173.535 1858.66C173.836 1858.74 174.139 1858.87 174.443 1859.04V1860.17C174.158 1859.92 173.871 1859.74 173.582 1859.62C173.297 1859.51 172.973 1859.45 172.609 1859.45C171.934 1859.45 171.414 1859.67 171.051 1860.11C170.688 1860.55 170.506 1861.17 170.506 1861.98C170.506 1862.79 170.688 1863.42 171.051 1863.86C171.418 1864.3 171.938 1864.51 172.609 1864.51C172.984 1864.51 173.32 1864.46 173.617 1864.34C173.914 1864.23 174.189 1864.05 174.443 1863.81V1864.92ZM179.055 1856.83V1858.7H181.504V1859.53H179.055V1863.1C179.055 1863.58 179.146 1863.92 179.33 1864.11C179.514 1864.3 179.834 1864.4 180.291 1864.4H181.504V1865.26H180.186C179.377 1865.26 178.807 1865.1 178.475 1864.77C178.143 1864.45 177.977 1863.89 177.977 1863.1V1859.53H176.225V1858.7H177.977V1856.83H179.055ZM134.412 1947.48V1950.77H135.783C136.33 1950.77 136.756 1950.63 137.061 1950.34C137.369 1950.05 137.523 1949.64 137.523 1949.12C137.523 1948.6 137.371 1948.2 137.066 1947.92C136.762 1947.63 136.334 1947.48 135.783 1947.48H134.412ZM133.229 1946.51H135.783C136.76 1946.51 137.5 1946.73 138.004 1947.18C138.508 1947.62 138.76 1948.27 138.76 1949.12C138.76 1949.99 138.508 1950.64 138.004 1951.08C137.504 1951.52 136.764 1951.74 135.783 1951.74H134.412V1955.26H133.229V1946.51ZM146.072 1950.05C145.842 1949.87 145.607 1949.74 145.369 1949.66C145.131 1949.58 144.869 1949.53 144.584 1949.53C143.912 1949.53 143.398 1949.75 143.043 1950.17C142.688 1950.59 142.51 1951.2 142.51 1952V1955.26H141.426V1948.7H142.51V1949.98C142.689 1949.51 142.965 1949.16 143.336 1948.91C143.711 1948.66 144.154 1948.54 144.666 1948.54C144.932 1948.54 145.18 1948.57 145.41 1948.64C145.641 1948.7 145.861 1948.81 146.072 1948.95V1950.05ZM150.145 1949.45C149.598 1949.45 149.184 1949.67 148.902 1950.09C148.621 1950.52 148.48 1951.15 148.48 1951.98C148.48 1952.82 148.621 1953.45 148.902 1953.88C149.184 1954.3 149.598 1954.51 150.145 1954.51C150.695 1954.51 151.111 1954.3 151.393 1953.88C151.674 1953.45 151.814 1952.82 151.814 1951.98C151.814 1951.15 151.674 1950.52 151.393 1950.09C151.111 1949.67 150.695 1949.45 150.145 1949.45ZM150.145 1948.54C151.055 1948.54 151.75 1948.83 152.23 1949.42C152.715 1950.01 152.957 1950.87 152.957 1951.98C152.957 1953.1 152.717 1953.96 152.236 1954.55C151.756 1955.14 151.059 1955.43 150.145 1955.43C149.234 1955.43 148.539 1955.14 148.059 1954.55C147.578 1953.96 147.338 1953.1 147.338 1951.98C147.338 1950.87 147.578 1950.01 148.059 1949.42C148.539 1948.83 149.234 1948.54 150.145 1948.54ZM157.281 1955.38V1949.53H155.424V1948.7H158.359V1955.38C158.359 1956.14 158.184 1956.72 157.832 1957.13C157.484 1957.55 156.988 1957.76 156.344 1957.76H154.855V1956.84H156.227C156.578 1956.84 156.842 1956.72 157.018 1956.47C157.193 1956.23 157.281 1955.86 157.281 1955.38ZM157.281 1946.14H158.359V1947.51H157.281V1946.14ZM167.559 1951.44V1951.97H162.889V1952C162.857 1952.9 163.027 1953.54 163.398 1953.93C163.773 1954.32 164.301 1954.51 164.98 1954.51C165.324 1954.51 165.684 1954.46 166.059 1954.35C166.434 1954.24 166.834 1954.08 167.26 1953.85V1954.92C166.85 1955.09 166.453 1955.22 166.07 1955.3C165.691 1955.39 165.324 1955.43 164.969 1955.43C163.949 1955.43 163.152 1955.12 162.578 1954.51C162.004 1953.9 161.717 1953.06 161.717 1951.98C161.717 1950.94 161.998 1950.1 162.561 1949.48C163.123 1948.85 163.873 1948.54 164.811 1948.54C165.646 1948.54 166.305 1948.82 166.785 1949.39C167.27 1949.95 167.527 1950.64 167.559 1951.44ZM166.48 1951.12C166.434 1950.67 166.268 1950.28 165.982 1949.95C165.701 1949.62 165.295 1949.45 164.764 1949.45C164.244 1949.45 163.816 1949.62 163.48 1949.97C163.145 1950.31 162.961 1950.7 162.93 1951.13L166.48 1951.12ZM174.443 1954.92C174.154 1955.09 173.855 1955.22 173.547 1955.3C173.242 1955.39 172.93 1955.43 172.609 1955.43C171.594 1955.43 170.799 1955.12 170.225 1954.51C169.654 1953.91 169.369 1953.06 169.369 1951.98C169.369 1950.91 169.654 1950.06 170.225 1949.45C170.799 1948.84 171.594 1948.54 172.609 1948.54C172.926 1948.54 173.234 1948.58 173.535 1948.66C173.836 1948.74 174.139 1948.87 174.443 1949.04V1950.17C174.158 1949.92 173.871 1949.74 173.582 1949.62C173.297 1949.51 172.973 1949.45 172.609 1949.45C171.934 1949.45 171.414 1949.67 171.051 1950.11C170.688 1950.55 170.506 1951.17 170.506 1951.98C170.506 1952.79 170.688 1953.42 171.051 1953.86C171.418 1954.3 171.938 1954.51 172.609 1954.51C172.984 1954.51 173.32 1954.46 173.617 1954.34C173.914 1954.23 174.189 1954.05 174.443 1953.81V1954.92ZM179.055 1946.83V1948.7H181.504V1949.53H179.055V1953.1C179.055 1953.58 179.146 1953.92 179.33 1954.11C179.514 1954.3 179.834 1954.4 180.291 1954.4H181.504V1955.26H180.186C179.377 1955.26 178.807 1955.1 178.475 1954.77C178.143 1954.45 177.977 1953.89 177.977 1953.1V1949.53H176.225V1948.7H177.977V1946.83H179.055Z" fill="#4EC9B0" />
+                      <path d="M112.721 291.484V294.771H114.092C114.639 294.771 115.064 294.626 115.369 294.337C115.678 294.048 115.832 293.644 115.832 293.124C115.832 292.605 115.68 292.202 115.375 291.917C115.07 291.628 114.643 291.484 114.092 291.484H112.721ZM111.537 290.511H114.092C115.068 290.511 115.809 290.734 116.312 291.179C116.816 291.62 117.068 292.269 117.068 293.124C117.068 293.987 116.816 294.64 116.312 295.081C115.812 295.523 115.072 295.743 114.092 295.743H112.721V299.259H111.537V290.511ZM124.381 294.05C124.15 293.87 123.916 293.739 123.678 293.657C123.439 293.575 123.178 293.534 122.893 293.534C122.221 293.534 121.707 293.745 121.352 294.167C120.996 294.589 120.818 295.198 120.818 295.995V299.259H119.734V292.696H120.818V293.98C120.998 293.515 121.273 293.159 121.645 292.913C122.02 292.663 122.463 292.538 122.975 292.538C123.24 292.538 123.488 292.571 123.719 292.638C123.949 292.704 124.17 292.808 124.381 292.948V294.05ZM128.453 293.452C127.906 293.452 127.492 293.665 127.211 294.091C126.93 294.517 126.789 295.148 126.789 295.984C126.789 296.816 126.93 297.446 127.211 297.876C127.492 298.302 127.906 298.515 128.453 298.515C129.004 298.515 129.42 298.302 129.701 297.876C129.982 297.446 130.123 296.816 130.123 295.984C130.123 295.148 129.982 294.517 129.701 294.091C129.42 293.665 129.004 293.452 128.453 293.452ZM128.453 292.538C129.363 292.538 130.059 292.833 130.539 293.423C131.023 294.013 131.266 294.866 131.266 295.984C131.266 297.105 131.025 297.96 130.545 298.55C130.064 299.136 129.367 299.429 128.453 299.429C127.543 299.429 126.848 299.136 126.367 298.55C125.887 297.96 125.646 297.105 125.646 295.984C125.646 294.866 125.887 294.013 126.367 293.423C126.848 292.833 127.543 292.538 128.453 292.538ZM135.59 299.376V293.534H133.732V292.696H136.668V299.376C136.668 300.138 136.492 300.724 136.141 301.134C135.793 301.548 135.297 301.755 134.652 301.755H133.164V300.841H134.535C134.887 300.841 135.15 300.718 135.326 300.472C135.502 300.23 135.59 299.864 135.59 299.376ZM135.59 290.142H136.668V291.507H135.59V290.142ZM145.867 295.439V295.966H141.197V296.001C141.166 296.896 141.336 297.538 141.707 297.929C142.082 298.319 142.609 298.515 143.289 298.515C143.633 298.515 143.992 298.46 144.367 298.351C144.742 298.241 145.143 298.075 145.568 297.853V298.925C145.158 299.093 144.762 299.218 144.379 299.3C144 299.386 143.633 299.429 143.277 299.429C142.258 299.429 141.461 299.124 140.887 298.515C140.312 297.901 140.025 297.058 140.025 295.984C140.025 294.937 140.307 294.101 140.869 293.476C141.432 292.851 142.182 292.538 143.119 292.538C143.955 292.538 144.613 292.821 145.094 293.388C145.578 293.954 145.836 294.638 145.867 295.439ZM144.789 295.122C144.742 294.669 144.576 294.278 144.291 293.95C144.01 293.618 143.604 293.452 143.072 293.452C142.553 293.452 142.125 293.624 141.789 293.968C141.453 294.312 141.27 294.698 141.238 295.128L144.789 295.122ZM152.752 298.925C152.463 299.093 152.164 299.218 151.855 299.3C151.551 299.386 151.238 299.429 150.918 299.429C149.902 299.429 149.107 299.124 148.533 298.515C147.963 297.905 147.678 297.062 147.678 295.984C147.678 294.905 147.963 294.062 148.533 293.452C149.107 292.843 149.902 292.538 150.918 292.538C151.234 292.538 151.543 292.579 151.844 292.661C152.145 292.743 152.447 292.87 152.752 293.042V294.173C152.467 293.919 152.18 293.735 151.891 293.622C151.605 293.509 151.281 293.452 150.918 293.452C150.242 293.452 149.723 293.671 149.359 294.109C148.996 294.546 148.814 295.171 148.814 295.984C148.814 296.792 148.996 297.417 149.359 297.859C149.727 298.296 150.246 298.515 150.918 298.515C151.293 298.515 151.629 298.458 151.926 298.345C152.223 298.228 152.498 298.048 152.752 297.806V298.925ZM157.363 290.833V292.696H159.812V293.534H157.363V297.097C157.363 297.581 157.455 297.919 157.639 298.11C157.822 298.302 158.143 298.398 158.6 298.398H159.812V299.259H158.494C157.686 299.259 157.115 299.097 156.783 298.773C156.451 298.448 156.285 297.89 156.285 297.097V293.534H154.533V292.696H156.285V290.833H157.363ZM172.188 455.364C172.32 455.083 172.488 454.876 172.691 454.743C172.898 454.607 173.146 454.538 173.436 454.538C173.963 454.538 174.334 454.743 174.549 455.153C174.768 455.56 174.877 456.327 174.877 457.456V461.259H173.893V457.503C173.893 456.577 173.84 456.003 173.734 455.78C173.633 455.554 173.445 455.441 173.172 455.441C172.859 455.441 172.645 455.562 172.527 455.804C172.414 456.042 172.357 456.609 172.357 457.503V461.259H171.373V457.503C171.373 456.566 171.316 455.987 171.203 455.769C171.094 455.55 170.895 455.441 170.605 455.441C170.32 455.441 170.121 455.562 170.008 455.804C169.898 456.042 169.844 456.609 169.844 457.503V461.259H168.865V454.696H169.844V455.259C169.973 455.025 170.133 454.847 170.324 454.726C170.52 454.601 170.74 454.538 170.986 454.538C171.283 454.538 171.529 454.607 171.725 454.743C171.924 454.88 172.078 455.087 172.188 455.364ZM179.57 457.96H179.213C178.584 457.96 178.109 458.071 177.789 458.294C177.473 458.513 177.314 458.841 177.314 459.278C177.314 459.673 177.434 459.98 177.672 460.198C177.91 460.417 178.24 460.526 178.662 460.526C179.256 460.526 179.723 460.321 180.062 459.911C180.402 459.497 180.574 458.927 180.578 458.2V457.96H179.57ZM181.662 457.515V461.259H180.578V460.286C180.348 460.677 180.057 460.966 179.705 461.153C179.357 461.337 178.934 461.429 178.434 461.429C177.766 461.429 177.232 461.241 176.834 460.866C176.436 460.487 176.236 459.982 176.236 459.349C176.236 458.618 176.48 458.064 176.969 457.685C177.461 457.306 178.182 457.116 179.131 457.116H180.578V456.946C180.574 456.423 180.441 456.044 180.18 455.81C179.918 455.571 179.5 455.452 178.926 455.452C178.559 455.452 178.188 455.505 177.812 455.61C177.438 455.716 177.072 455.87 176.717 456.073V454.995C177.115 454.843 177.496 454.73 177.859 454.655C178.227 454.577 178.582 454.538 178.926 454.538C179.469 454.538 179.932 454.618 180.314 454.778C180.701 454.939 181.014 455.179 181.252 455.499C181.4 455.694 181.506 455.937 181.568 456.226C181.631 456.511 181.662 456.941 181.662 457.515ZM184.885 460.433V463.755H183.801V454.696H184.885V455.534C185.064 455.21 185.303 454.964 185.6 454.796C185.9 454.624 186.246 454.538 186.637 454.538C187.43 454.538 188.051 454.845 188.5 455.458C188.953 456.071 189.18 456.921 189.18 458.007C189.18 459.073 188.953 459.911 188.5 460.521C188.047 461.126 187.426 461.429 186.637 461.429C186.238 461.429 185.889 461.345 185.588 461.177C185.291 461.005 185.057 460.757 184.885 460.433ZM188.049 457.984C188.049 457.148 187.916 456.517 187.65 456.091C187.389 455.665 186.998 455.452 186.479 455.452C185.955 455.452 185.559 455.667 185.289 456.097C185.02 456.523 184.885 457.151 184.885 457.984C184.885 458.812 185.02 459.441 185.289 459.87C185.559 460.3 185.955 460.515 186.479 460.515C186.998 460.515 187.389 460.302 187.65 459.876C187.916 459.45 188.049 458.819 188.049 457.984ZM186.648 707.364C186.781 707.083 186.949 706.876 187.152 706.743C187.359 706.607 187.607 706.538 187.896 706.538C188.424 706.538 188.795 706.743 189.01 707.153C189.229 707.56 189.338 708.327 189.338 709.456V713.259H188.354V709.503C188.354 708.577 188.301 708.003 188.195 707.78C188.094 707.554 187.906 707.441 187.633 707.441C187.32 707.441 187.105 707.562 186.988 707.804C186.875 708.042 186.818 708.609 186.818 709.503V713.259H185.834V709.503C185.834 708.566 185.777 707.987 185.664 707.769C185.555 707.55 185.355 707.441 185.066 707.441C184.781 707.441 184.582 707.562 184.469 707.804C184.359 708.042 184.305 708.609 184.305 709.503V713.259H183.326V706.696H184.305V707.259C184.434 707.025 184.594 706.847 184.785 706.726C184.98 706.601 185.201 706.538 185.447 706.538C185.744 706.538 185.99 706.607 186.186 706.743C186.385 706.88 186.539 707.087 186.648 707.364ZM194.031 709.96H193.674C193.045 709.96 192.57 710.071 192.25 710.294C191.934 710.513 191.775 710.841 191.775 711.278C191.775 711.673 191.895 711.98 192.133 712.198C192.371 712.417 192.701 712.526 193.123 712.526C193.717 712.526 194.184 712.321 194.523 711.911C194.863 711.497 195.035 710.927 195.039 710.2V709.96H194.031ZM196.123 709.515V713.259H195.039V712.286C194.809 712.677 194.518 712.966 194.166 713.153C193.818 713.337 193.395 713.429 192.895 713.429C192.227 713.429 191.693 713.241 191.295 712.866C190.896 712.487 190.697 711.982 190.697 711.349C190.697 710.618 190.941 710.064 191.43 709.685C191.922 709.306 192.643 709.116 193.592 709.116H195.039V708.946C195.035 708.423 194.902 708.044 194.641 707.81C194.379 707.571 193.961 707.452 193.387 707.452C193.02 707.452 192.648 707.505 192.273 707.61C191.898 707.716 191.533 707.87 191.178 708.073V706.995C191.576 706.843 191.957 706.73 192.32 706.655C192.688 706.577 193.043 706.538 193.387 706.538C193.93 706.538 194.393 706.618 194.775 706.778C195.162 706.939 195.475 707.179 195.713 707.499C195.861 707.694 195.967 707.937 196.029 708.226C196.092 708.511 196.123 708.941 196.123 709.515ZM199.346 712.433V715.755H198.262V706.696H199.346V707.534C199.525 707.21 199.764 706.964 200.061 706.796C200.361 706.624 200.707 706.538 201.098 706.538C201.891 706.538 202.512 706.845 202.961 707.458C203.414 708.071 203.641 708.921 203.641 710.007C203.641 711.073 203.414 711.911 202.961 712.521C202.508 713.126 201.887 713.429 201.098 713.429C200.699 713.429 200.35 713.345 200.049 713.177C199.752 713.005 199.518 712.757 199.346 712.433ZM202.51 709.984C202.51 709.148 202.377 708.517 202.111 708.091C201.85 707.665 201.459 707.452 200.939 707.452C200.416 707.452 200.02 707.667 199.75 708.097C199.48 708.523 199.346 709.151 199.346 709.984C199.346 710.812 199.48 711.441 199.75 711.87C200.02 712.3 200.416 712.515 200.939 712.515C201.459 712.515 201.85 712.302 202.111 711.876C202.377 711.45 202.51 710.819 202.51 709.984ZM163.334 975.484V978.771H164.705C165.252 978.771 165.678 978.626 165.982 978.337C166.291 978.048 166.445 977.644 166.445 977.124C166.445 976.605 166.293 976.202 165.988 975.917C165.684 975.628 165.256 975.484 164.705 975.484H163.334ZM162.15 974.511H164.705C165.682 974.511 166.422 974.734 166.926 975.179C167.43 975.62 167.682 976.269 167.682 977.124C167.682 977.987 167.43 978.64 166.926 979.081C166.426 979.523 165.686 979.743 164.705 979.743H163.334V983.259H162.15V974.511ZM174.994 978.05C174.764 977.87 174.529 977.739 174.291 977.657C174.053 977.575 173.791 977.534 173.506 977.534C172.834 977.534 172.32 977.745 171.965 978.167C171.609 978.589 171.432 979.198 171.432 979.995V983.259H170.348V976.696H171.432V977.98C171.611 977.515 171.887 977.159 172.258 976.913C172.633 976.663 173.076 976.538 173.588 976.538C173.854 976.538 174.102 976.571 174.332 976.638C174.562 976.704 174.783 976.808 174.994 976.948V978.05ZM179.066 977.452C178.52 977.452 178.105 977.665 177.824 978.091C177.543 978.517 177.402 979.148 177.402 979.984C177.402 980.816 177.543 981.446 177.824 981.876C178.105 982.302 178.52 982.515 179.066 982.515C179.617 982.515 180.033 982.302 180.314 981.876C180.596 981.446 180.736 980.816 180.736 979.984C180.736 979.148 180.596 978.517 180.314 978.091C180.033 977.665 179.617 977.452 179.066 977.452ZM179.066 976.538C179.977 976.538 180.672 976.833 181.152 977.423C181.637 978.013 181.879 978.866 181.879 979.984C181.879 981.105 181.639 981.96 181.158 982.55C180.678 983.136 179.98 983.429 179.066 983.429C178.156 983.429 177.461 983.136 176.98 982.55C176.5 981.96 176.26 981.105 176.26 979.984C176.26 978.866 176.5 978.013 176.98 977.423C177.461 976.833 178.156 976.538 179.066 976.538ZM186.203 983.376V977.534H184.346V976.696H187.281V983.376C187.281 984.138 187.105 984.724 186.754 985.134C186.406 985.548 185.91 985.755 185.266 985.755H183.777V984.841H185.148C185.5 984.841 185.764 984.718 185.939 984.472C186.115 984.23 186.203 983.864 186.203 983.376ZM186.203 974.142H187.281V975.507H186.203V974.142ZM196.48 979.439V979.966H191.811V980.001C191.779 980.896 191.949 981.538 192.32 981.929C192.695 982.319 193.223 982.515 193.902 982.515C194.246 982.515 194.605 982.46 194.98 982.351C195.355 982.241 195.756 982.075 196.182 981.853V982.925C195.771 983.093 195.375 983.218 194.992 983.3C194.613 983.386 194.246 983.429 193.891 983.429C192.871 983.429 192.074 983.124 191.5 982.515C190.926 981.901 190.639 981.058 190.639 979.984C190.639 978.937 190.92 978.101 191.482 977.476C192.045 976.851 192.795 976.538 193.732 976.538C194.568 976.538 195.227 976.821 195.707 977.388C196.191 977.954 196.449 978.638 196.48 979.439ZM195.402 979.122C195.355 978.669 195.189 978.278 194.904 977.95C194.623 977.618 194.217 977.452 193.686 977.452C193.166 977.452 192.738 977.624 192.402 977.968C192.066 978.312 191.883 978.698 191.852 979.128L195.402 979.122ZM203.365 982.925C203.076 983.093 202.777 983.218 202.469 983.3C202.164 983.386 201.852 983.429 201.531 983.429C200.516 983.429 199.721 983.124 199.146 982.515C198.576 981.905 198.291 981.062 198.291 979.984C198.291 978.905 198.576 978.062 199.146 977.452C199.721 976.843 200.516 976.538 201.531 976.538C201.848 976.538 202.156 976.579 202.457 976.661C202.758 976.743 203.061 976.87 203.365 977.042V978.173C203.08 977.919 202.793 977.735 202.504 977.622C202.219 977.509 201.895 977.452 201.531 977.452C200.855 977.452 200.336 977.671 199.973 978.109C199.609 978.546 199.428 979.171 199.428 979.984C199.428 980.792 199.609 981.417 199.973 981.859C200.34 982.296 200.859 982.515 201.531 982.515C201.906 982.515 202.242 982.458 202.539 982.345C202.836 982.228 203.111 982.048 203.365 981.806V982.925ZM207.977 974.833V976.696H210.426V977.534H207.977V981.097C207.977 981.581 208.068 981.919 208.252 982.11C208.436 982.302 208.756 982.398 209.213 982.398H210.426V983.259H209.107C208.299 983.259 207.729 983.097 207.396 982.773C207.064 982.448 206.898 981.89 206.898 981.097V977.534H205.146V976.696H206.898V974.833H207.977ZM217.311 976.925V977.98C217.002 977.8 216.691 977.665 216.379 977.575C216.066 977.485 215.748 977.441 215.424 977.441C214.936 977.441 214.57 977.521 214.328 977.681C214.09 977.837 213.971 978.077 213.971 978.401C213.971 978.694 214.061 978.913 214.24 979.058C214.42 979.202 214.867 979.343 215.582 979.48L216.016 979.562C216.551 979.663 216.955 979.866 217.229 980.171C217.506 980.476 217.645 980.872 217.645 981.36C217.645 982.009 217.414 982.517 216.953 982.884C216.492 983.247 215.852 983.429 215.031 983.429C214.707 983.429 214.367 983.394 214.012 983.323C213.656 983.257 213.271 983.155 212.857 983.019V981.905C213.26 982.112 213.645 982.269 214.012 982.374C214.379 982.476 214.727 982.526 215.055 982.526C215.531 982.526 215.9 982.431 216.162 982.239C216.424 982.044 216.555 981.773 216.555 981.425C216.555 980.925 216.076 980.579 215.119 980.388L215.072 980.376L214.668 980.294C214.047 980.173 213.594 979.97 213.309 979.685C213.023 979.396 212.881 979.003 212.881 978.507C212.881 977.878 213.094 977.394 213.52 977.054C213.945 976.71 214.553 976.538 215.342 976.538C215.693 976.538 216.031 976.571 216.355 976.638C216.68 976.7 216.998 976.796 217.311 976.925Z" fill="#DCDCAA" />
+                      <path d="M102.631 419.628L97.6504 421.503L102.631 423.36V424.433L96.4375 421.984V421.011L102.631 418.562V419.628ZM356.734 419.628V418.562L362.928 421.011V421.984L356.734 424.433V423.36L361.715 421.503L356.734 419.628ZM117.092 437.628L112.111 439.503L117.092 441.36V442.433L110.898 439.984V439.011L117.092 436.562V437.628ZM571.111 434.511H572.225L567.619 444.372H566.5L571.111 434.511ZM573.648 437.628V436.562L579.842 439.011V439.984L573.648 442.433V441.36L578.629 439.503L573.648 437.628ZM131.553 473.628L126.572 475.503L131.553 477.36V478.433L125.359 475.984V475.011L131.553 472.562V473.628ZM130.053 596.511H131.166L126.561 606.372H125.441L130.053 596.511ZM132.59 599.628V598.562L138.783 601.011V601.984L132.59 604.433V603.36L137.57 601.503L132.59 599.628ZM102.631 635.628L97.6504 637.503L102.631 639.36V640.433L96.4375 637.984V637.011L102.631 634.562V635.628ZM108.361 632.511H109.475L104.869 642.372H103.75L108.361 632.511ZM132.59 635.628V634.562L138.783 637.011V637.984L132.59 640.433V639.36L137.57 637.503L132.59 635.628ZM102.631 653.628L97.6504 655.503L102.631 657.36V658.433L96.4375 655.984V655.011L102.631 652.562V653.628ZM609.801 653.628V652.562L615.994 655.011V655.984L609.801 658.433V657.36L614.781 655.503L609.801 653.628ZM117.092 671.628L112.111 673.503L117.092 675.36V676.433L110.898 673.984V673.011L117.092 670.562V671.628ZM371.195 671.628V670.562L377.389 673.011V673.984L371.195 676.433V675.36L376.176 673.503L371.195 671.628ZM131.553 689.628L126.572 691.503L131.553 693.36V694.433L125.359 691.984V691.011L131.553 688.562V689.628ZM585.572 686.511H586.686L582.08 696.372H580.961L585.572 686.511ZM588.109 689.628V688.562L594.303 691.011V691.984L588.109 694.433V693.36L593.09 691.503L588.109 689.628ZM146.014 725.628L141.033 727.503L146.014 729.36V730.433L139.82 727.984V727.011L146.014 724.562V725.628ZM144.514 848.511H145.627L141.021 858.372H139.902L144.514 848.511ZM147.051 851.628V850.562L153.244 853.011V853.984L147.051 856.433V855.36L152.031 853.503L147.051 851.628ZM117.092 887.628L112.111 889.503L117.092 891.36V892.433L110.898 889.984V889.011L117.092 886.562V887.628ZM122.822 884.511H123.936L119.33 894.372H118.211L122.822 884.511ZM147.051 887.628V886.562L153.244 889.011V889.984L147.051 892.433V891.36L152.031 889.503L147.051 887.628ZM102.631 905.628L97.6504 907.503L102.631 909.36V910.433L96.4375 907.984V907.011L102.631 904.562V905.628ZM108.361 902.511H109.475L104.869 912.372H103.75L108.361 902.511ZM139.82 905.628V904.562L146.014 907.011V907.984L139.82 910.433V909.36L144.801 907.503L139.82 905.628ZM102.631 1013.63L97.6504 1015.5L102.631 1017.36V1018.43L96.4375 1015.98V1015.01L102.631 1012.56V1013.63ZM277.199 1013.63V1012.56L283.393 1015.01V1015.98L277.199 1018.43V1017.36L282.18 1015.5L277.199 1013.63ZM117.092 1031.63L112.111 1033.5L117.092 1035.36V1036.43L110.898 1033.98V1033.01L117.092 1030.56V1031.63ZM667.645 1031.63V1030.56L673.838 1033.01V1033.98L667.645 1036.43V1035.36L672.625 1033.5L667.645 1031.63ZM117.092 1067.63L112.111 1069.5L117.092 1071.36V1072.43L110.898 1069.98V1069.01L117.092 1066.56V1067.63ZM122.822 1064.51H123.936L119.33 1074.37H118.211L122.822 1064.51ZM139.82 1067.63V1066.56L146.014 1069.01V1069.98L139.82 1072.43V1071.36L144.801 1069.5L139.82 1067.63ZM117.092 1085.63L112.111 1087.5L117.092 1089.36V1090.43L110.898 1087.98V1087.01L117.092 1084.56V1085.63ZM378.426 1085.63V1084.56L384.619 1087.01V1087.98L378.426 1090.43V1089.36L383.406 1087.5L378.426 1085.63ZM131.553 1103.63L126.572 1105.5L131.553 1107.36V1108.43L125.359 1105.98V1105.01L131.553 1102.56V1103.63ZM130.053 1190.51H131.166L126.561 1200.37H125.441L130.053 1190.51ZM132.59 1193.63V1192.56L138.783 1195.01V1195.98L132.59 1198.43V1197.36L137.57 1195.5L132.59 1193.63ZM131.553 1211.63L126.572 1213.5L131.553 1215.36V1216.43L125.359 1213.98V1213.01L131.553 1210.56V1211.63ZM130.053 1298.51H131.166L126.561 1308.37H125.441L130.053 1298.51ZM132.59 1301.63V1300.56L138.783 1303.01V1303.98L132.59 1306.43V1305.36L137.57 1303.5L132.59 1301.63ZM131.553 1319.63L126.572 1321.5L131.553 1323.36V1324.43L125.359 1321.98V1321.01L131.553 1318.56V1319.63ZM130.053 1388.51H131.166L126.561 1398.37H125.441L130.053 1388.51ZM132.59 1391.63V1390.56L138.783 1393.01V1393.98L132.59 1396.43V1395.36L137.57 1393.5L132.59 1391.63ZM131.553 1409.63L126.572 1411.5L131.553 1413.36V1414.43L125.359 1411.98V1411.01L131.553 1408.56V1409.63ZM130.053 1478.51H131.166L126.561 1488.37H125.441L130.053 1478.51ZM132.59 1481.63V1480.56L138.783 1483.01V1483.98L132.59 1486.43V1485.36L137.57 1483.5L132.59 1481.63ZM131.553 1499.63L126.572 1501.5L131.553 1503.36V1504.43L125.359 1501.98V1501.01L131.553 1498.56V1499.63ZM130.053 1568.51H131.166L126.561 1578.37H125.441L130.053 1568.51ZM132.59 1571.63V1570.56L138.783 1573.01V1573.98L132.59 1576.43V1575.36L137.57 1573.5L132.59 1571.63ZM131.553 1589.63L126.572 1591.5L131.553 1593.36V1594.43L125.359 1591.98V1591.01L131.553 1588.56V1589.63ZM130.053 1658.51H131.166L126.561 1668.37H125.441L130.053 1658.51ZM132.59 1661.63V1660.56L138.783 1663.01V1663.98L132.59 1666.43V1665.36L137.57 1663.5L132.59 1661.63ZM131.553 1679.63L126.572 1681.5L131.553 1683.36V1684.43L125.359 1681.98V1681.01L131.553 1678.56V1679.63ZM130.053 1748.51H131.166L126.561 1758.37H125.441L130.053 1748.51ZM132.59 1751.63V1750.56L138.783 1753.01V1753.98L132.59 1756.43V1755.36L137.57 1753.5L132.59 1751.63ZM131.553 1769.63L126.572 1771.5L131.553 1773.36V1774.43L125.359 1771.98V1771.01L131.553 1768.56V1769.63ZM130.053 1838.51H131.166L126.561 1848.37H125.441L130.053 1838.51ZM132.59 1841.63V1840.56L138.783 1843.01V1843.98L132.59 1846.43V1845.36L137.57 1843.5L132.59 1841.63ZM131.553 1859.63L126.572 1861.5L131.553 1863.36V1864.43L125.359 1861.98V1861.01L131.553 1858.56V1859.63ZM130.053 1928.51H131.166L126.561 1938.37H125.441L130.053 1928.51ZM132.59 1931.63V1930.56L138.783 1933.01V1933.98L132.59 1936.43V1935.36L137.57 1933.5L132.59 1931.63ZM131.553 1949.63L126.572 1951.5L131.553 1953.36V1954.43L125.359 1951.98V1951.01L131.553 1948.56V1949.63ZM130.053 2018.51H131.166L126.561 2028.37H125.441L130.053 2018.51ZM132.59 2021.63V2020.56L138.783 2023.01V2023.98L132.59 2026.43V2025.36L137.57 2023.5L132.59 2021.63ZM117.092 2039.63L112.111 2041.5L117.092 2043.36V2044.43L110.898 2041.98V2041.01L117.092 2038.56V2039.63ZM122.822 2036.51H123.936L119.33 2046.37H118.211L122.822 2036.51ZM147.051 2039.63V2038.56L153.244 2041.01V2041.98L147.051 2044.43V2043.36L152.031 2041.5L147.051 2039.63ZM102.631 2057.63L97.6504 2059.5L102.631 2061.36V2062.43L96.4375 2059.98V2059.01L102.631 2056.56V2057.63ZM108.361 2054.51H109.475L104.869 2064.37H103.75L108.361 2054.51ZM132.59 2057.63V2056.56L138.783 2059.01V2059.98L132.59 2062.43V2061.36L137.57 2059.5L132.59 2057.63Z" fill="#808080" />
+                    </g>
+                  </g>
+                </g>
+              </g>
+              <path d="M0 77.2589H596V75.2589H0V77.2589Z" fill="var(--vscode-activityBar-activeBorder, #FFFFFF)" fill-opacity="0.0901961" mask="url(#path-12-inside-3_304_6548)" />
+            </g>
+          </g>
+        </g>
+        <g>
+          <mask maskUnits="userSpaceOnUse" x="0" y="488.635" width="596" height="19" fill="var(--vscode-editorBracketHighlight-foreground4, #000000)">
+            <rect fill="#FFFFFF" y="488.635" width="596" height="19" />
+            <path d="M0 489.635H596V507H0V489.635Z" />
+          </mask>
+          <path d="M0 490.635H596V488.635H0V490.635Z" fill="var(--vscode-editorWidget-background, #2B2B2B)" mask="url(#path-16-outside-4_304_6548)" />
+          <g>
+            <rect width="985.1" height="17.3655" transform="translate(0 489.635)" fill="var(--vscode-editor-background, #181818)" />
+            <g opacity="0.15">
+              <g>
+                <g>
+                  <path d="M406.283 500.011H407.31C407.398 500.659 408.017 501.07 408.91 501.07C409.743 501.07 410.353 500.631 410.353 500.02C410.353 499.498 409.965 499.174 409.081 498.961L408.221 498.753C407.014 498.462 406.463 497.888 406.463 496.917C406.463 495.742 407.435 494.956 408.892 494.956C410.247 494.956 411.237 495.742 411.297 496.857H410.288C410.191 496.223 409.655 495.835 408.878 495.835C408.059 495.835 407.513 496.237 407.513 496.862C407.513 497.347 407.865 497.625 408.734 497.837L409.47 498.018C410.839 498.346 411.403 498.897 411.403 499.896C411.403 501.158 410.413 501.954 408.831 501.954C407.351 501.954 406.357 501.195 406.283 500.011ZM415.265 496.681C416.546 496.681 417.355 497.685 417.355 499.28C417.355 500.867 416.546 501.875 415.274 501.875C414.557 501.875 413.988 501.565 413.725 501.033H413.646V503.466H412.652V496.769H413.609V497.602H413.683C413.988 497.028 414.58 496.681 415.265 496.681ZM414.983 501.024C415.829 501.024 416.333 500.372 416.333 499.28C416.333 498.189 415.829 497.532 414.987 497.532C414.15 497.532 413.628 498.203 413.628 499.28C413.628 500.353 414.15 501.024 414.983 501.024ZM419.945 501.875C418.974 501.875 418.267 501.292 418.267 500.377C418.267 499.475 418.942 498.952 420.14 498.878L421.504 498.795V498.355C421.504 497.805 421.153 497.495 420.473 497.495C419.918 497.495 419.534 497.703 419.423 498.069H418.461C418.563 497.222 419.377 496.672 420.519 496.672C421.782 496.672 422.494 497.301 422.494 498.355V501.792H421.536V501.08H421.458C421.157 501.588 420.607 501.875 419.945 501.875ZM420.2 501.075C420.949 501.075 421.504 500.585 421.504 499.937V499.502L420.274 499.586C419.58 499.632 419.266 499.877 419.266 500.335C419.266 500.802 419.659 501.075 420.2 501.075ZM428.173 498.383H427.207C427.091 497.893 426.684 497.518 426.018 497.518C425.186 497.518 424.677 498.175 424.677 499.262C424.677 500.372 425.19 501.043 426.018 501.043C426.647 501.043 427.077 500.747 427.207 500.201H428.173C428.044 501.191 427.267 501.889 426.023 501.889C424.557 501.889 423.659 500.89 423.659 499.262C423.659 497.666 424.552 496.672 426.018 496.672C427.281 496.672 428.044 497.407 428.173 498.383ZM432.614 500.446H433.571C433.354 501.334 432.54 501.889 431.388 501.889C429.945 501.889 429.061 500.895 429.061 499.29C429.061 497.694 429.963 496.672 431.383 496.672C432.785 496.672 433.631 497.629 433.631 499.202V499.544H430.074V499.59C430.107 500.501 430.62 501.075 431.416 501.075C432.017 501.075 432.428 500.853 432.614 500.446ZM431.379 497.481C430.643 497.481 430.13 498.018 430.074 498.827H432.618C432.595 498.013 432.114 497.481 431.379 497.481ZM434.709 498.175C434.709 497.301 435.527 496.672 436.665 496.672C437.798 496.672 438.538 497.199 438.635 498.069H437.683C437.59 497.694 437.229 497.449 436.665 497.449C436.11 497.449 435.689 497.722 435.689 498.129C435.689 498.439 435.944 498.633 436.489 498.762L437.326 498.957C438.284 499.179 438.732 499.59 438.732 500.321C438.732 501.255 437.849 501.889 436.647 501.889C435.449 501.889 434.667 501.348 434.579 500.474H435.574C435.698 500.867 436.068 501.112 436.67 501.112C437.289 501.112 437.729 500.825 437.729 500.414C437.729 500.099 437.493 499.896 436.989 499.775L436.11 499.567C435.153 499.345 434.709 498.92 434.709 498.175ZM440.703 498.388C440.314 498.388 440.023 498.096 440.023 497.722C440.023 497.347 440.314 497.056 440.703 497.056C441.096 497.056 441.383 497.347 441.383 497.722C441.383 498.096 441.096 498.388 440.703 498.388ZM440.703 501.861C440.314 501.861 440.023 501.57 440.023 501.195C440.023 500.821 440.314 500.529 440.703 500.529C441.096 500.529 441.383 500.821 441.383 501.195C441.383 501.57 441.096 501.861 440.703 501.861ZM445.453 497.051C445.453 495.826 446.401 494.956 447.747 494.956C449 494.956 449.902 495.756 449.902 496.852C449.902 497.625 449.564 498.175 448.394 499.35L446.923 500.83V500.908H450.004V501.792H445.508V501.089L447.793 498.712C448.639 497.828 448.861 497.495 448.861 496.954C448.861 496.307 448.422 495.812 447.682 495.812C446.928 495.812 446.433 496.311 446.433 497.051H445.453Z" fill="var(--vscode-editorWidget-foreground, #FFFFFF)" />
+                </g>
+              </g>
+              <g>
+                <g>
+                  <path d="M465.254 495.118V499.41C465.254 500.363 465.86 501.033 466.919 501.033C467.983 501.033 468.588 500.363 468.588 499.41V495.118H469.624V499.493C469.624 500.936 468.598 501.954 466.919 501.954C465.249 501.954 464.218 500.936 464.218 499.493V495.118H465.254ZM474.023 501.792H472.987V496.011H470.887V495.118H476.118V496.011H474.023V501.792ZM478.426 501.792H477.39V495.118H481.557V496.011H478.426V498.124H481.294V498.998H478.426V501.792ZM485.84 499.563H482.806V498.642H485.84V499.563ZM489.697 501.954C488.213 501.954 487.19 501.158 487.19 500.007C487.19 499.151 487.75 498.476 488.606 498.305V498.226C487.912 498.05 487.459 497.472 487.459 496.751C487.459 495.701 488.388 494.956 489.697 494.956C491.006 494.956 491.936 495.701 491.936 496.751C491.936 497.477 491.492 498.046 490.789 498.226V498.305C491.644 498.466 492.209 499.142 492.209 500.002C492.209 501.154 491.182 501.954 489.697 501.954ZM489.697 497.907C490.423 497.907 490.918 497.481 490.918 496.848C490.918 496.205 490.428 495.775 489.697 495.775C488.966 495.775 488.481 496.205 488.481 496.848C488.481 497.481 488.971 497.907 489.697 497.907ZM489.697 501.13C490.553 501.13 491.145 500.636 491.145 499.923C491.145 499.211 490.553 498.721 489.697 498.721C488.842 498.721 488.25 499.211 488.25 499.923C488.25 500.636 488.842 501.13 489.697 501.13Z" fill="var(--vscode-editor-foreground, #FFFFFF)" />
+                </g>
+              </g>
+              <g>
+                <g>
+                  <path d="M511.019 500.89V501.792H506.857V495.118H507.893V500.89H511.019ZM513.369 501.792H512.333V495.118H516.5V496.011H513.369V498.124H516.236V498.998H513.369V501.792Z" fill="var(--vscode-editor-foreground, #FFFFFF)" />
+                </g>
+              </g>
+              <g>
+                <g>
+                  <path d="M533.811 494.804H533.738C533.59 494.804 533.455 494.828 533.332 494.878C533.161 494.976 533.013 495.111 532.89 495.283C532.792 495.43 532.743 495.614 532.743 495.835V496.756C532.743 496.904 532.731 497.051 532.706 497.198C532.682 497.346 532.645 497.481 532.596 497.603C532.473 497.874 532.301 498.095 532.08 498.266C532.301 498.438 532.473 498.659 532.596 498.93C532.645 499.052 532.682 499.187 532.706 499.335C532.731 499.482 532.743 499.629 532.743 499.777V500.698C532.743 500.845 532.768 500.98 532.817 501.103C532.866 501.226 532.927 501.336 533.001 501.434C533.099 501.533 533.21 501.606 533.332 501.655C533.455 501.704 533.59 501.729 533.738 501.729H533.811V502.429H533.738C533.517 502.404 533.308 502.355 533.111 502.282C532.915 502.208 532.731 502.097 532.559 501.95C532.412 501.778 532.301 501.594 532.227 501.398C532.154 501.201 532.105 501.017 532.08 500.845V500.808C532.056 500.612 532.056 500.415 532.08 500.219V499.629C532.08 499.482 532.056 499.347 532.006 499.224C531.957 499.101 531.884 499.003 531.785 498.93V498.893C531.712 498.819 531.613 498.758 531.491 498.709V498.672C531.368 498.623 531.233 498.598 531.085 498.598H531.049V497.935H531.085C531.233 497.935 531.368 497.91 531.491 497.861C531.736 497.738 531.908 497.554 532.006 497.309C532.056 497.186 532.08 497.051 532.08 496.904V496.314C532.056 496.118 532.056 495.921 532.08 495.725C532.105 495.528 532.154 495.332 532.227 495.135C532.301 494.939 532.412 494.767 532.559 494.62C532.706 494.448 532.878 494.325 533.075 494.251C533.296 494.153 533.517 494.104 533.738 494.104H533.811V494.804ZM536.574 501.729H536.611C536.758 501.729 536.893 501.704 537.016 501.655C537.188 501.557 537.323 501.434 537.421 501.287C537.544 501.115 537.605 500.919 537.605 500.698V499.777C537.605 499.629 537.618 499.482 537.642 499.335C537.667 499.187 537.704 499.052 537.753 498.93C537.876 498.659 538.048 498.438 538.269 498.266C538.048 498.095 537.876 497.874 537.753 497.603C537.704 497.481 537.667 497.346 537.642 497.198C537.618 497.051 537.605 496.904 537.605 496.756V495.835C537.605 495.688 537.581 495.553 537.532 495.43C537.483 495.307 537.409 495.197 537.311 495.099C537.237 495 537.139 494.927 537.016 494.878C536.893 494.828 536.758 494.804 536.611 494.804H536.574V494.141H536.611C536.832 494.116 537.041 494.153 537.237 494.251C537.434 494.325 537.605 494.448 537.753 494.62C537.925 494.767 538.048 494.939 538.121 495.135C538.195 495.332 538.244 495.516 538.269 495.688V495.725C538.293 495.921 538.293 496.118 538.269 496.314V496.904C538.269 497.051 538.293 497.186 538.342 497.309C538.391 497.432 538.465 497.53 538.563 497.603V497.64C538.637 497.714 538.735 497.775 538.858 497.824V497.861C538.981 497.91 539.116 497.935 539.263 497.935H539.337V498.598H539.263C539.116 498.598 538.981 498.623 538.858 498.672C538.612 498.794 538.44 498.979 538.342 499.224C538.293 499.347 538.269 499.482 538.269 499.629V500.219C538.293 500.415 538.293 500.612 538.269 500.808C538.244 501.029 538.195 501.226 538.121 501.398C538.048 501.594 537.925 501.778 537.753 501.95C537.605 502.097 537.434 502.208 537.237 502.282C537.041 502.355 536.832 502.392 536.611 502.392H536.574V501.729Z" fill="var(--vscode-editor-foreground, #FFFFFF)" />
+                  <path d="M548.372 501.792H547.336V496.011H545.236V495.118H550.467V496.011H548.372V501.792ZM551.624 503.614C551.54 503.614 551.304 503.605 551.212 503.591V502.777C551.291 502.791 551.443 502.796 551.536 502.796C552.007 502.796 552.276 502.597 552.447 502.065L552.521 501.806L550.699 496.769H551.781L553.043 500.793H553.122L554.38 496.769H555.435L553.557 502.023C553.127 503.23 552.65 503.614 551.624 503.614ZM559.065 496.681C560.346 496.681 561.156 497.685 561.156 499.28C561.156 500.867 560.346 501.875 559.075 501.875C558.358 501.875 557.789 501.565 557.525 501.033H557.447V503.466H556.452V496.769H557.41V497.602H557.484C557.789 497.028 558.381 496.681 559.065 496.681ZM558.783 501.024C559.63 501.024 560.134 500.372 560.134 499.28C560.134 498.189 559.63 497.532 558.788 497.532C557.951 497.532 557.428 498.203 557.428 499.28C557.428 500.353 557.951 501.024 558.783 501.024ZM565.656 500.446H566.613C566.396 501.334 565.582 501.889 564.43 501.889C562.987 501.889 562.104 500.895 562.104 499.29C562.104 497.694 563.006 496.672 564.426 496.672C565.827 496.672 566.673 497.629 566.673 499.202V499.544H563.117V499.59C563.149 500.501 563.663 501.075 564.458 501.075C565.059 501.075 565.471 500.853 565.656 500.446ZM564.421 497.481C563.686 497.481 563.172 498.018 563.117 498.827H565.661C565.637 498.013 565.156 497.481 564.421 497.481ZM567.668 500.011H568.695C568.783 500.659 569.402 501.07 570.295 501.07C571.127 501.07 571.738 500.631 571.738 500.02C571.738 499.498 571.349 499.174 570.466 498.961L569.606 498.753C568.399 498.462 567.848 497.888 567.848 496.917C567.848 495.742 568.82 494.956 570.276 494.956C571.632 494.956 572.621 495.742 572.681 496.857H571.673C571.576 496.223 571.04 495.835 570.263 495.835C569.444 495.835 568.898 496.237 568.898 496.862C568.898 497.347 569.25 497.625 570.119 497.837L570.855 498.018C572.224 498.346 572.788 498.897 572.788 499.896C572.788 501.158 571.798 501.954 570.216 501.954C568.736 501.954 567.742 501.195 567.668 500.011ZM578.301 498.383H577.334C577.219 497.893 576.812 497.518 576.146 497.518C575.313 497.518 574.804 498.175 574.804 499.262C574.804 500.372 575.318 501.043 576.146 501.043C576.775 501.043 577.205 500.747 577.334 500.201H578.301C578.171 501.191 577.394 501.889 576.15 501.889C574.684 501.889 573.787 500.89 573.787 499.262C573.787 497.666 574.679 496.672 576.146 496.672C577.408 496.672 578.171 497.407 578.301 498.383ZM579.439 501.792V496.769H580.396V497.532H580.47C580.613 497.037 581.173 496.681 581.83 496.681C581.978 496.681 582.167 496.695 582.274 496.718V497.652C582.191 497.629 581.895 497.597 581.719 497.597C580.965 497.597 580.433 498.083 580.433 498.79V501.792H579.439ZM583.745 495.872C583.398 495.872 583.116 495.59 583.116 495.247C583.116 494.901 583.398 494.618 583.745 494.618C584.091 494.618 584.374 494.901 584.374 495.247C584.374 495.59 584.091 495.872 583.745 495.872ZM583.25 501.792V496.769H584.239V501.792H583.25ZM588.314 496.681C589.595 496.681 590.405 497.685 590.405 499.28C590.405 500.867 589.595 501.875 588.323 501.875C587.606 501.875 587.038 501.565 586.774 501.033H586.695V503.466H585.701V496.769H586.658V497.602H586.732C587.038 497.028 587.63 496.681 588.314 496.681ZM588.032 501.024C588.878 501.024 589.383 500.372 589.383 499.28C589.383 498.189 588.878 497.532 588.037 497.532C587.199 497.532 586.677 498.203 586.677 499.28C586.677 500.353 587.199 501.024 588.032 501.024ZM591.954 495.502H592.948V496.783H594.04V497.578H592.948V500.229C592.948 500.77 593.166 501.006 593.661 501.006C593.813 501.006 593.901 500.996 594.04 500.982V501.773C593.878 501.801 593.693 501.824 593.499 501.824C592.393 501.824 591.954 501.436 591.954 500.469V497.578H591.154V496.783H591.954V495.502Z" fill="var(--vscode-editor-foreground, #FFFFFF)" />
+                </g>
+              </g>
+            </g>
+          </g>
+        </g>
+      </g>
+      <rect x="0.5" y="16.5" width="595" height="490" rx="8.97211" stroke="var(--vscode-editorSuggestWidget-border, #3C3C3C)" />
+    </g>
+    <g filter="url(#filter0_d_304_6548)">
+      <g clip-path="url(#clip4_304_6548)">
+        <rect x="259.775" y="4" width="367.225" height="518" rx="5.55" fill="var(--vscode-editorWidget-background, #181818)" />
+        <g>
+          <mask fill="var(--vscode-activityBar-activeBorder, #FFFFFF)">
+            <path d="M259.775 4H627V36.375H259.775V4Z" />
+          </mask>
+          <path d="M627 35.45H259.775V37.3H627V35.45Z" fill="var(--vscode-editorWidget-border, #2B2B2B)" mask="url(#path-25-inside-5_304_6548)" />
+          <g clip-path="url(#clip5_304_6548)">
+            <g>
+              <g>
+                <g>
+                  <path d="M277.35 22.8836L278.287 21.9463V23.2783L277.202 24.3143L276.413 23.969V21.6503H275.031L274.587 21.2063V13.8063L275.031 13.3623H286.131L286.625 13.8063V17.9503H285.687V14.2503H275.525V20.7623H276.906L277.35 21.2063V22.8836ZM283.171 24.4623L284.898 26.1396L285.687 25.8436V24.4623H287.069L287.513 23.969V19.381L287.069 18.8876H279.669L279.225 19.381V23.969L279.669 24.4623H283.171ZM283.369 23.525H280.113V19.825H286.625V23.525H285.194L284.75 23.969V24.709L283.665 23.673L283.369 23.525Z" fill="var(--vscode-editorOverviewRuler-bracketMatchForeground, #9D9D9D)" />
+                </g>
+              </g>
+              <g>
+                <g>
+                  <mask fill="var(--vscode-activityBar-activeBorder, #FFFFFF)">
+                    <path d="M294.925 9.55005H315.275V29.9H294.925V9.55005Z" />
+                  </mask>
+                  <path d="M315.275 28.975H294.925V30.825H315.275V28.975Z" fill="var(--vscode-banner-iconForeground, #3794FF)" mask="url(#path-28-inside-6_304_6548)" />
+                  <g clip-path="url(#clip6_304_6548)">
+                    <path fill-rule="evenodd" clip-rule="evenodd" d="M300.475 13.25H305.1V14.175H300.475V25.275H308.8V18.3375H309.725V25.275L308.8 26.2H300.475L299.55 25.275V14.175L300.475 13.25ZM304.175 16.025H305.1V17.875H306.95V18.8H305.1V20.65H304.175V18.8H302.325V17.875H304.175V16.025ZM306.95 22.5H302.325V23.425H306.95V22.5Z" fill="var(--vscode-editorWidget-foreground, #C5C5C5)" />
+                    <path fill-rule="evenodd" clip-rule="evenodd" d="M308.8 10.475V10.475L308.797 10.475C308.798 10.475 308.799 10.475 308.8 10.475ZM310.878 10.967C310.254 10.6523 309.548 10.475 308.8 10.475C309.22 10.475 309.63 10.5287 310.028 10.6381C310.325 10.7196 310.608 10.8291 310.878 10.967ZM312.67 12.5665C312.605 12.467 312.536 12.3701 312.463 12.2761C312.536 12.3699 312.605 12.4667 312.67 12.5665ZM313.425 15.0966C313.425 15.0977 313.425 15.0989 313.425 15.1C313.425 15.8474 313.248 16.5533 312.933 17.1781C313.071 16.9082 313.181 16.6244 313.262 16.3279C313.372 15.9295 313.425 15.5193 313.425 15.1H313.425L313.425 15.0966ZM311.334 18.9699C311.433 18.9046 311.53 18.8356 311.624 18.7631C311.53 18.8357 311.434 18.9047 311.334 18.9699ZM308.803 19.725C308.802 19.725 308.801 19.725 308.8 19.725V19.725L308.803 19.725ZM308.785 19.725C308.043 19.7226 307.343 19.5456 306.722 19.233C306.992 19.3709 307.276 19.4804 307.572 19.5619C307.966 19.67 308.371 19.7237 308.785 19.725ZM304.93 17.6334C304.995 17.733 305.065 17.8299 305.137 17.924C305.064 17.8301 304.995 17.7332 304.93 17.6334ZM304.175 15.1034C304.175 15.1023 304.175 15.1011 304.175 15.1C304.175 14.3526 304.352 13.6467 304.667 13.0219C304.529 13.2918 304.42 13.5756 304.338 13.8721C304.229 14.2705 304.175 14.6807 304.175 15.1H304.175L304.175 15.1034ZM306.267 11.23C306.167 11.2953 306.07 11.3644 305.976 11.4369C306.07 11.3642 306.167 11.2952 306.267 11.23ZM310.241 16.3836C310.148 16.4858 310.045 16.578 309.932 16.6602C309.899 16.6842 309.865 16.7073 309.83 16.7296L309.829 16.7301C309.678 16.8269 309.518 16.9004 309.348 16.9509L309.339 16.9536C309.165 17.0042 308.986 17.0295 308.8 17.0295C308.642 17.0295 308.488 17.0107 308.338 16.9732C308.309 16.9661 308.281 16.9584 308.253 16.95C308.188 16.9303 308.123 16.9069 308.058 16.8798L308.045 16.8741C307.989 16.8501 307.935 16.8239 307.882 16.7953L307.875 16.7914C307.724 16.7088 307.587 16.6075 307.463 16.4875L307.45 16.4747C307.437 16.4623 307.425 16.4497 307.413 16.4369V16.4875V16.5135V16.8416V16.95H306.95V16.8816V16.4875V16.4369V16.4119V16.025V15.5625H307.413H307.616H307.855H307.875H307.882H308.161H308.327H308.338V15.9898V16.025H307.882C308.004 16.1419 308.14 16.2339 308.292 16.3009L308.305 16.3068C308.316 16.3115 308.327 16.316 308.338 16.3203C308.485 16.3788 308.639 16.408 308.8 16.408C308.925 16.408 309.046 16.3901 309.164 16.3542L309.165 16.3538C309.198 16.3437 309.231 16.3324 309.263 16.32C309.343 16.2887 309.42 16.2502 309.494 16.2045L309.498 16.202C309.601 16.137 309.694 16.0587 309.776 15.9672L309.78 15.9626C309.86 15.8723 309.927 15.7714 309.982 15.6601L310.545 15.9274L310.542 15.9343C310.461 16.1025 310.361 16.252 310.242 16.3827L310.241 16.3836ZM308.435 13.8462C308.402 13.8565 308.37 13.8679 308.338 13.8806C308.258 13.9117 308.181 13.9501 308.107 13.9955L308.103 13.9979C307.997 14.063 307.903 14.1413 307.821 14.2328L307.819 14.2355C307.741 14.3231 307.676 14.4204 307.624 14.5277L307.619 14.5399L307.619 14.5399L307.055 14.2726C307.137 14.1019 307.238 13.9505 307.358 13.8182L307.358 13.8173C307.452 13.7147 307.555 13.6222 307.669 13.5398C307.702 13.5158 307.736 13.4927 307.77 13.4704L307.777 13.4664C307.925 13.3721 308.083 13.3 308.249 13.2502L308.262 13.2464C308.435 13.1958 308.615 13.1705 308.8 13.1705C308.958 13.1705 309.112 13.1893 309.263 13.2268C309.291 13.2339 309.319 13.2416 309.347 13.25C309.413 13.2697 309.478 13.2931 309.542 13.3202L309.555 13.3259C309.611 13.3499 309.665 13.3761 309.718 13.4047L309.725 13.4086C309.876 13.4912 310.013 13.5925 310.137 13.7125L310.15 13.7253C310.163 13.7377 310.175 13.7503 310.188 13.7631V13.7125V13.6865V13.3584V13.25H310.65V13.3184V13.7125V13.7631V13.7881V14.175V14.6375H310.188H309.984H309.745H309.725H309.718H309.452H309.273H309.263V14.2102V14.175H309.718C309.596 14.0581 309.46 13.9661 309.309 13.8991L309.295 13.8932C309.284 13.8885 309.274 13.884 309.263 13.8797C309.116 13.8212 308.962 13.792 308.8 13.792C308.673 13.792 308.552 13.8099 308.437 13.8458L308.435 13.8462Z" fill="var(--vscode-editorWidget-foreground, #C5C5C5)" />
+                  </g>
+                </g>
+              </g>
+            </g>
+            <g>
+              <g>
+                <g>
+                  <g>
+                    <path d="M528.731 14.1503H529.619V16.0743L530.31 15.433C530.836 14.8739 531.461 14.5121 532.184 14.3477C532.908 14.1503 533.631 14.1503 534.355 14.3477C535.079 14.5121 535.703 14.8739 536.23 15.433C536.789 15.9592 537.167 16.5841 537.364 17.3077C537.562 18.0312 537.562 18.7548 537.364 19.4783C537.167 20.2019 536.805 20.8432 536.279 21.4023L531.444 26.1877L530.803 25.5463L535.588 20.7117C536.016 20.317 536.312 19.8401 536.476 19.281C536.641 18.689 536.641 18.1134 536.476 17.5543C536.312 16.9623 536.016 16.469 535.588 16.0743C535.194 15.6468 534.7 15.3672 534.108 15.2357C533.549 15.0712 532.99 15.0712 532.431 15.2357C531.872 15.3672 531.379 15.6468 530.951 16.0743L530.063 16.9623H532.431V17.8503H529.175L528.731 17.4063V14.1503Z" fill="var(--vscode-editorWidget-foreground, #CCCCCC)" />
+                  </g>
+                </g>
+                <g>
+                  <g>
+                    <path d="M561.269 14.2503V17.5063L560.825 17.9503H557.569V17.0623H559.937L559.049 16.1743C558.621 15.7468 558.128 15.4672 557.569 15.3356C557.01 15.1712 556.434 15.1712 555.842 15.3356C555.283 15.4672 554.79 15.7468 554.362 16.1743C553.968 16.569 553.688 17.0623 553.524 17.6543C553.359 18.2134 553.359 18.789 553.524 19.381C553.688 19.9401 553.984 20.417 554.412 20.8116L559.197 25.6463L558.556 26.2876L553.721 21.5023C553.195 20.9432 552.833 20.3019 552.636 19.5783C552.438 18.8548 552.438 18.1312 552.636 17.4076C552.833 16.6841 553.195 16.0592 553.721 15.533C554.28 14.9739 554.921 14.6121 555.645 14.4476C556.369 14.2503 557.092 14.2503 557.816 14.4476C558.539 14.6121 559.181 14.9739 559.74 15.533L560.381 16.1743V14.2503H561.269Z" fill="var(--vscode-breadcrumb-foreground, #CCCCCC)" />
+                  </g>
+                </g>
+                <g>
+                  <g>
+                    <path d="M586.95 18.8876V19.825H581.375V25.3503H580.438V19.825H574.912V18.8876H580.438V13.3623H581.375V18.8876H586.95Z" fill="var(--vscode-breadcrumb-foreground, #CCCCCC)" />
+                  </g>
+                </g>
+                <g>
+                  <g>
+                    <path d="M605.625 20.4663L602.27 23.8703L601.58 23.1796L604.984 19.825L601.58 16.4703L602.27 15.7796L605.625 19.1836L608.98 15.7796L609.67 16.4703L606.266 19.825L609.67 23.1796L608.98 23.8703L605.625 20.4663Z" fill="var(--vscode-breadcrumb-foreground, #CCCCCC)" />
+                  </g>
+                </g>
+              </g>
+            </g>
+          </g>
+        </g>
+        <g clip-path="url(#clip7_304_6548)">
+          <g>
+            <g>
+              <g>
+                <g>
+                  <g>
+                    <g clip-path="url(#clip8_304_6548)">
+                      <g>
+                        <rect x="274.575" y="47.475" width="24" height="24" fill="url(#pattern0_304_6548)" />
+                      </g>
+                    </g>
+                    <path d="M275.075 59.475C275.075 53.1237 280.224 47.975 286.575 47.975C292.926 47.975 298.075 53.1237 298.075 59.475C298.075 65.8263 292.926 70.975 286.575 70.975C280.224 70.975 275.075 65.8263 275.075 59.475Z" stroke="#1F2328" stroke-opacity="0.15" />
+                  </g>
+                  <path d="M306.867 63.475V57.0573H308.271V58.0907H308.371C308.647 57.3685 309.304 56.934 310.156 56.934C311.042 56.934 311.659 57.3803 311.929 58.0907H312.029C312.346 57.392 313.085 56.934 313.978 56.934C315.264 56.934 316.039 57.7267 316.039 59.0595V63.475H314.589V59.4177C314.589 58.5839 314.195 58.1671 313.414 58.1671C312.657 58.1671 312.158 58.7307 312.158 59.4647V63.475H310.743V59.312C310.743 58.6016 310.296 58.1671 309.58 58.1671C308.858 58.1671 308.324 58.7718 308.324 59.5704V63.475H306.867ZM320.537 63.6042C318.611 63.6042 317.448 62.3476 317.448 60.2632C317.448 58.1964 318.628 56.934 320.537 56.934C322.451 56.934 323.625 58.1906 323.625 60.2632C323.625 62.3476 322.457 63.6042 320.537 63.6042ZM320.537 62.4122C321.552 62.4122 322.128 61.6254 322.128 60.2691C322.128 58.9128 321.546 58.126 320.537 58.126C319.521 58.126 318.939 58.9128 318.939 60.2691C318.939 61.6254 319.521 62.4122 320.537 62.4122ZM325.093 63.475V57.0573H326.496V58.0849H326.596C326.901 57.3685 327.547 56.934 328.504 56.934C329.937 56.934 330.718 57.7972 330.718 59.3238V63.475H329.262V59.6643C329.262 58.6661 328.851 58.1671 327.964 58.1671C327.095 58.1671 326.549 58.7718 326.549 59.7348V63.475H325.093ZM334.211 63.5807C332.973 63.5807 332.086 62.8291 332.086 61.6548C332.086 60.504 332.961 59.8287 334.523 59.7406L336.178 59.6408V59.0889C336.178 58.4489 335.756 58.0907 334.969 58.0907C334.3 58.0907 333.842 58.3315 333.706 58.7718H332.333C332.45 57.6504 333.513 56.934 335.039 56.934C336.689 56.934 337.617 57.7326 337.617 59.0889V63.475H336.214V62.5942H336.114C335.756 63.2166 335.051 63.5807 334.211 63.5807ZM334.64 62.4592C335.521 62.4592 336.178 61.8838 336.178 61.1205V60.5979L334.728 60.6977C333.912 60.7506 333.53 61.05 333.53 61.5843C333.53 62.1363 333.994 62.4592 334.64 62.4592ZM339.431 63.475V54.5737H340.887V63.475H339.431ZM343.471 55.9828C342.995 55.9828 342.602 55.6012 342.602 55.1197C342.602 54.6441 342.995 54.2566 343.471 54.2566C343.952 54.2566 344.346 54.6441 344.346 55.1197C344.346 55.6012 343.952 55.9828 343.471 55.9828ZM342.749 63.475V57.0573H344.199V63.475H342.749ZM345.861 58.8893C345.861 57.7384 346.918 56.934 348.432 56.934C349.959 56.934 350.916 57.6034 351.022 58.7601H349.654C349.548 58.308 349.119 58.0144 348.438 58.0144C347.775 58.0144 347.276 58.3373 347.276 58.8129C347.276 59.177 347.581 59.406 348.227 59.5586L349.36 59.8111C350.587 60.0929 351.157 60.6155 351.157 61.5608C351.157 62.788 350.024 63.6042 348.421 63.6042C346.818 63.6042 345.808 62.9113 345.696 61.7546H347.135C347.276 62.2302 347.728 62.5238 348.456 62.5238C349.19 62.5238 349.701 62.1891 349.701 61.7018C349.701 61.3377 349.425 61.1029 348.814 60.9619L347.675 60.6977C346.442 60.4159 345.861 59.8522 345.861 58.8893ZM354.398 63.5807C353.159 63.5807 352.272 62.8291 352.272 61.6548C352.272 60.504 353.147 59.8287 354.709 59.7406L356.365 59.6408V59.0889C356.365 58.4489 355.942 58.0907 355.155 58.0907C354.486 58.0907 354.028 58.3315 353.893 58.7718H352.519C352.636 57.6504 353.699 56.934 355.226 56.934C356.876 56.934 357.803 57.7326 357.803 59.0889V63.475H356.4V62.5942H356.3C355.942 63.2166 355.238 63.5807 354.398 63.5807ZM354.827 62.4592C355.707 62.4592 356.365 61.8838 356.365 61.1205V60.5979L354.915 60.6977C354.098 60.7506 353.717 61.05 353.717 61.5843C353.717 62.1363 354.181 62.4592 354.827 62.4592Z" fill="var(--vscode-editorWidget-foreground, #CCCCCC)" />
+                </g>
+              </g>
+              <g>
+                <g>
+                  <path d="M284.005 92.875H283.018V86.4045H282.948L280.276 92.875H279.384L276.712 86.4045H276.642V92.875H275.655V84.4023H276.883L279.783 91.4717H279.877L282.778 84.4023H284.005V92.875ZM287.798 92.9866C286.571 92.9866 285.661 92.2585 285.661 91.1018C285.661 89.9686 286.494 89.3168 287.968 89.2287L289.794 89.1172V88.5418C289.794 87.7609 289.307 87.3322 288.361 87.3322C287.604 87.3322 287.076 87.6199 286.935 88.119H285.913C286.048 87.1032 287.046 86.4339 288.397 86.4339C289.941 86.4339 290.804 87.2265 290.804 88.5418V92.875H289.841V91.9414H289.747C289.336 92.6167 288.643 92.9866 287.798 92.9866ZM287.986 92.1C289.025 92.1 289.794 91.4188 289.794 90.5146V89.9333L288.091 90.0449C287.128 90.1095 286.706 90.4442 286.706 91.0783C286.706 91.7242 287.252 92.1 287.986 92.1ZM293.834 89.3109L296.582 86.5454H297.821L295.096 89.2581L298.003 92.875H296.717L294.345 89.9099L293.74 90.4735V92.875H292.73V84.0324H293.74V89.3109H293.834ZM303.099 91.2368H304.109C303.815 92.3172 302.829 92.9866 301.443 92.9866C299.688 92.9866 298.59 91.7183 298.59 89.7161C298.59 87.7256 299.705 86.4339 301.443 86.4339C303.152 86.4339 304.191 87.6493 304.191 89.6163V90.0038H299.641V90.0508C299.694 91.3014 300.392 92.0941 301.467 92.0941C302.283 92.0941 302.835 91.7946 303.099 91.2368ZM301.432 87.3264C300.422 87.3264 299.717 88.0662 299.641 89.1876H303.129C303.105 88.0662 302.436 87.3264 301.432 87.3264ZM313.363 91.2368H314.373C314.079 92.3172 313.093 92.9866 311.707 92.9866C309.951 92.9866 308.853 91.7183 308.853 89.7161C308.853 87.7256 309.969 86.4339 311.707 86.4339C313.416 86.4339 314.455 87.6493 314.455 89.6163V90.0038H309.904V90.0508C309.957 91.3014 310.656 92.0941 311.73 92.0941C312.547 92.0941 313.098 91.7946 313.363 91.2368ZM311.695 87.3264C310.685 87.3264 309.981 88.0662 309.904 89.1876H313.392C313.369 88.0662 312.699 87.3264 311.695 87.3264ZM317.802 92.9866C316.574 92.9866 315.664 92.2585 315.664 91.1018C315.664 89.9686 316.498 89.3168 317.972 89.2287L319.798 89.1172V88.5418C319.798 87.7609 319.311 87.3322 318.365 87.3322C317.608 87.3322 317.079 87.6199 316.938 88.119H315.917C316.052 87.1032 317.05 86.4339 318.4 86.4339C319.945 86.4339 320.808 87.2265 320.808 88.5418V92.875H319.845V91.9414H319.751C319.34 92.6167 318.647 92.9866 317.802 92.9866ZM317.989 92.1C319.029 92.1 319.798 91.4188 319.798 90.5146V89.9333L318.095 90.0449C317.132 90.1095 316.709 90.4442 316.709 91.0783C316.709 91.7242 317.256 92.1 317.989 92.1ZM327.912 88.4831H326.891C326.726 87.8548 326.169 87.344 325.258 87.344C324.119 87.344 323.403 88.2541 323.403 89.6867C323.403 91.1488 324.131 92.0765 325.258 92.0765C326.11 92.0765 326.703 91.6831 326.891 90.9667H327.912C327.73 92.1293 326.785 92.9866 325.264 92.9866C323.491 92.9866 322.358 91.7007 322.358 89.6867C322.358 87.7139 323.485 86.4339 325.258 86.4339C326.797 86.4339 327.736 87.3557 327.912 88.4831ZM329.463 92.875V84.0324H330.472V87.5436H330.566C330.883 86.8449 331.547 86.4339 332.516 86.4339C333.854 86.4339 334.7 87.2911 334.7 88.7766V92.875H333.69V89.0232C333.69 87.9018 333.185 87.344 332.228 87.344C331.095 87.344 330.472 88.0603 330.472 89.1289V92.875H329.463ZM343.02 86.4339C344.635 86.4339 345.68 87.7198 345.68 89.7102C345.68 91.6889 344.629 92.9866 343.02 92.9866C342.116 92.9866 341.388 92.5932 341.041 91.9238H340.947V94.9888H339.937V86.5454H340.9V87.6023H340.994C341.399 86.8742 342.157 86.4339 343.02 86.4339ZM342.779 92.0765C343.942 92.0765 344.635 91.1899 344.635 89.7102C344.635 88.2306 343.942 87.344 342.785 87.344C341.64 87.344 340.918 88.2541 340.918 89.7102C340.918 91.1605 341.64 92.0765 342.779 92.0765ZM347.265 92.875V86.5454H348.228V87.4849H348.322C348.51 86.8684 349.238 86.4339 350.078 86.4339C350.242 86.4339 350.453 86.4456 350.583 86.4632V87.4731C350.5 87.4497 350.136 87.4144 349.937 87.4144C348.974 87.4144 348.275 88.0603 348.275 88.9528V92.875H347.265ZM354.27 92.9866C352.467 92.9866 351.352 91.7418 351.352 89.7102C351.352 87.6728 352.467 86.4339 354.27 86.4339C356.073 86.4339 357.188 87.6728 357.188 89.7102C357.188 91.7418 356.073 92.9866 354.27 92.9866ZM354.27 92.0765C355.468 92.0765 356.143 91.2075 356.143 89.7102C356.143 88.2071 355.468 87.344 354.27 87.344C353.072 87.344 352.397 88.2071 352.397 89.7102C352.397 91.2075 353.072 92.0765 354.27 92.0765ZM359.314 85.3241C358.926 85.3241 358.609 85.0071 358.609 84.6196C358.609 84.232 358.926 83.915 359.314 83.915C359.701 83.915 360.018 84.232 360.018 84.6196C360.018 85.0071 359.701 85.3241 359.314 85.3241ZM359.807 86.5454V93.1862C359.807 94.4897 359.196 95.0475 357.869 95.0475H357.693V94.1844H357.846C358.562 94.1844 358.797 93.9025 358.797 93.2038V86.5454H359.807ZM365.925 91.2368H366.935C366.641 92.3172 365.655 92.9866 364.269 92.9866C362.514 92.9866 361.416 91.7183 361.416 89.7161C361.416 87.7256 362.531 86.4339 364.269 86.4339C365.978 86.4339 367.017 87.6493 367.017 89.6163V90.0038H362.467V90.0508C362.52 91.3014 363.218 92.0941 364.293 92.0941C365.109 92.0941 365.661 91.7946 365.925 91.2368ZM364.258 87.3264C363.248 87.3264 362.543 88.0662 362.467 89.1876H365.954C365.931 88.0662 365.262 87.3264 364.258 87.3264ZM373.84 88.4831H372.818C372.654 87.8548 372.096 87.344 371.186 87.344C370.047 87.344 369.331 88.2541 369.331 89.6867C369.331 91.1488 370.059 92.0765 371.186 92.0765C372.037 92.0765 372.63 91.6831 372.818 90.9667H373.84C373.658 92.1293 372.713 92.9866 371.192 92.9866C369.419 92.9866 368.285 91.7007 368.285 89.6867C368.285 87.7139 369.413 86.4339 371.186 86.4339C372.724 86.4339 373.664 87.3557 373.84 88.4831ZM375.872 84.9073H376.881V86.5454H378.291V87.3909H376.881V90.9726C376.881 91.7183 377.163 92.0354 377.821 92.0354C378.003 92.0354 378.103 92.0295 378.291 92.0119V92.8633C378.091 92.8985 377.897 92.922 377.698 92.922C376.394 92.922 375.872 92.4405 375.872 91.231V87.3909H374.85V86.5454H375.872V84.9073ZM384.972 92.9866C383.745 92.9866 382.835 92.2585 382.835 91.1018C382.835 89.9686 383.669 89.3168 385.143 89.2287L386.969 89.1172V88.5418C386.969 87.7609 386.481 87.3322 385.536 87.3322C384.779 87.3322 384.25 87.6199 384.109 88.119H383.088C383.223 87.1032 384.221 86.4339 385.571 86.4339C387.116 86.4339 387.979 87.2265 387.979 88.5418V92.875H387.016V91.9414H386.922C386.511 92.6167 385.818 92.9866 384.972 92.9866ZM385.16 92.1C386.2 92.1 386.969 91.4188 386.969 90.5146V89.9333L385.266 90.0449C384.303 90.1095 383.88 90.4442 383.88 91.0783C383.88 91.7242 384.426 92.1 385.16 92.1ZM393.298 92.875V84.0324H394.308V92.875H393.298ZM396.798 85.3241C396.41 85.3241 396.093 85.0071 396.093 84.6196C396.093 84.232 396.41 83.915 396.798 83.915C397.185 83.915 397.502 84.232 397.502 84.6196C397.502 85.0071 397.185 85.3241 396.798 85.3241ZM396.293 92.875V86.5454H397.303V92.875H396.293ZM399.229 92.875V86.5454H400.192V87.5436H400.286C400.603 86.8449 401.219 86.4339 402.188 86.4339C403.609 86.4339 404.402 87.2735 404.402 88.7766V92.875H403.392V89.0232C403.392 87.8842 402.91 87.344 401.9 87.344C400.89 87.344 400.239 88.0192 400.239 89.1289V92.875H399.229ZM407.414 89.3109L410.162 86.5454H411.4L408.676 89.2581L411.583 92.875H410.297L407.925 89.9099L407.32 90.4735V92.875H406.31V84.0324H407.32V89.3109H407.414ZM417.936 92.9866C416.708 92.9866 415.798 92.2585 415.798 91.1018C415.798 89.9686 416.632 89.3168 418.106 89.2287L419.932 89.1172V88.5418C419.932 87.7609 419.445 87.3322 418.499 87.3322C417.742 87.3322 417.213 87.6199 417.072 88.119H416.051C416.186 87.1032 417.184 86.4339 418.534 86.4339C420.079 86.4339 420.942 87.2265 420.942 88.5418V92.875H419.979V91.9414H419.885C419.474 92.6167 418.781 92.9866 417.936 92.9866ZM418.123 92.1C419.163 92.1 419.932 91.4188 419.932 90.5146V89.9333L418.229 90.0449C417.266 90.1095 416.843 90.4442 416.843 91.0783C416.843 91.7242 417.389 92.1 418.123 92.1ZM422.809 92.875V86.5454H423.772V87.5436H423.866C424.183 86.8449 424.799 86.4339 425.768 86.4339C427.189 86.4339 427.982 87.2735 427.982 88.7766V92.875H426.972V89.0232C426.972 87.8842 426.49 87.344 425.481 87.344C424.471 87.344 423.819 88.0192 423.819 89.1289V92.875H422.809ZM432.174 92.9866C430.554 92.9866 429.514 91.7007 429.514 89.7102C429.514 87.7256 430.565 86.4339 432.174 86.4339C433.055 86.4339 433.801 86.8508 434.159 87.5436H434.247V84.0324H435.257V92.875H434.294V91.8651H434.2C433.801 92.5697 433.049 92.9866 432.174 92.9866ZM432.409 87.344C431.258 87.344 430.559 88.2364 430.559 89.7102C430.559 91.1899 431.252 92.0765 432.409 92.0765C433.56 92.0765 434.27 91.1722 434.27 89.7102C434.27 88.2599 433.554 87.344 432.409 87.344ZM442.373 92.9866C441.146 92.9866 440.236 92.2585 440.236 91.1018C440.236 89.9686 441.07 89.3168 442.543 89.2287L444.369 89.1172V88.5418C444.369 87.7609 443.882 87.3322 442.937 87.3322C442.179 87.3322 441.651 87.6199 441.51 88.119H440.488C440.623 87.1032 441.622 86.4339 442.972 86.4339C444.516 86.4339 445.379 87.2265 445.379 88.5418V92.875H444.416V91.9414H444.322C443.911 92.6167 443.219 92.9866 442.373 92.9866ZM442.561 92.1C443.6 92.1 444.369 91.4188 444.369 90.5146V89.9333L442.667 90.0449C441.704 90.1095 441.281 90.4442 441.281 91.0783C441.281 91.7242 441.827 92.1 442.561 92.1ZM449.589 92.9866C447.969 92.9866 446.929 91.7007 446.929 89.7102C446.929 87.7256 447.98 86.4339 449.589 86.4339C450.47 86.4339 451.216 86.8508 451.574 87.5436H451.662V84.0324H452.672V92.875H451.709V91.8651H451.615C451.216 92.5697 450.464 92.9866 449.589 92.9866ZM449.824 87.344C448.673 87.344 447.975 88.2364 447.975 89.7102C447.975 91.1899 448.667 92.0765 449.824 92.0765C450.975 92.0765 451.685 91.1722 451.685 89.7102C451.685 88.2599 450.969 87.344 449.824 87.344ZM456.976 92.9866C455.355 92.9866 454.316 91.7007 454.316 89.7102C454.316 87.7256 455.367 86.4339 456.976 86.4339C457.856 86.4339 458.602 86.8508 458.96 87.5436H459.048V84.0324H460.058V92.875H459.095V91.8651H459.001C458.602 92.5697 457.851 92.9866 456.976 92.9866ZM457.211 87.344C456.06 87.344 455.361 88.2364 455.361 89.7102C455.361 91.1899 456.054 92.0765 457.211 92.0765C458.361 92.0765 459.072 91.1722 459.072 89.7102C459.072 88.2599 458.356 87.344 457.211 87.344ZM467.175 92.9866C465.947 92.9866 465.037 92.2585 465.037 91.1018C465.037 89.9686 465.871 89.3168 467.345 89.2287L469.171 89.1172V88.5418C469.171 87.7609 468.684 87.3322 467.738 87.3322C466.981 87.3322 466.452 87.6199 466.312 88.119H465.29C465.425 87.1032 466.423 86.4339 467.774 86.4339C469.318 86.4339 470.181 87.2265 470.181 88.5418V92.875H469.218V91.9414H469.124C468.713 92.6167 468.02 92.9866 467.175 92.9866ZM467.363 92.1C468.402 92.1 469.171 91.4188 469.171 90.5146V89.9333L467.468 90.0449C466.505 90.1095 466.083 90.4442 466.083 91.0783C466.083 91.7242 466.629 92.1 467.363 92.1ZM475.442 92.875V86.5454H476.405V87.5436H476.499C476.816 86.8449 477.432 86.4339 478.401 86.4339C479.822 86.4339 480.615 87.2735 480.615 88.7766V92.875H479.605V89.0232C479.605 87.8842 479.123 87.344 478.113 87.344C477.103 87.344 476.452 88.0192 476.452 89.1289V92.875H475.442ZM486.657 91.2368H487.666C487.373 92.3172 486.386 92.9866 485.001 92.9866C483.245 92.9866 482.147 91.7183 482.147 89.7161C482.147 87.7256 483.263 86.4339 485.001 86.4339C486.709 86.4339 487.749 87.6493 487.749 89.6163V90.0038H483.198V90.0508C483.251 91.3014 483.95 92.0941 485.024 92.0941C485.84 92.0941 486.392 91.7946 486.657 91.2368ZM484.989 87.3264C483.979 87.3264 483.275 88.0662 483.198 89.1876H486.686C486.662 88.0662 485.993 87.3264 484.989 87.3264ZM497.296 86.5454L495.523 92.875H494.495L493.08 87.9781H492.986L491.577 92.875H490.555L488.782 86.5454H489.804L491.048 91.6067H491.142L492.557 86.5454H493.526L494.941 91.6067H495.035L496.28 86.5454H497.296ZM505.123 86.4339C506.737 86.4339 507.783 87.7198 507.783 89.7102C507.783 91.6889 506.731 92.9866 505.123 92.9866C504.218 92.9866 503.49 92.5932 503.144 91.9238H503.05V94.9888H502.04V86.5454H503.003V87.6023H503.097C503.502 86.8742 504.26 86.4339 505.123 86.4339ZM504.882 92.0765C506.045 92.0765 506.737 91.1899 506.737 89.7102C506.737 88.2306 506.045 87.344 504.888 87.344C503.743 87.344 503.021 88.2541 503.021 89.7102C503.021 91.1605 503.743 92.0765 504.882 92.0765ZM511.129 92.9866C509.902 92.9866 508.992 92.2585 508.992 91.1018C508.992 89.9686 509.826 89.3168 511.3 89.2287L513.126 89.1172V88.5418C513.126 87.7609 512.638 87.3322 511.693 87.3322C510.936 87.3322 510.407 87.6199 510.266 88.119H509.245C509.38 87.1032 510.378 86.4339 511.728 86.4339C513.272 86.4339 514.136 87.2265 514.136 88.5418V92.875H513.173V91.9414H513.079C512.668 92.6167 511.975 92.9866 511.129 92.9866ZM511.317 92.1C512.356 92.1 513.126 91.4188 513.126 90.5146V89.9333L511.423 90.0449C510.46 90.1095 510.037 90.4442 510.037 91.0783C510.037 91.7242 510.583 92.1 511.317 92.1ZM518.61 95.3058C517.083 95.3058 516.108 94.6189 515.956 93.5737H517.024C517.136 94.0904 517.7 94.4251 518.61 94.4251C519.743 94.4251 520.418 93.8673 520.418 92.9337V91.6889H520.324C519.925 92.3877 519.209 92.7811 518.34 92.7811C516.701 92.7811 515.686 91.5128 515.686 89.6163C515.686 87.7198 516.713 86.4339 518.34 86.4339C519.226 86.4339 520.007 86.8684 520.371 87.5495H520.465V86.5454H521.428V92.9866C521.428 94.4016 520.336 95.3058 518.61 95.3058ZM518.563 91.8886C519.737 91.8886 520.442 90.9961 520.442 89.6163C520.442 88.2364 519.731 87.344 518.563 87.344C517.388 87.344 516.731 88.2364 516.731 89.6163C516.731 90.9961 517.388 91.8886 518.563 91.8886ZM527.523 91.2368H528.533C528.239 92.3172 527.253 92.9866 525.867 92.9866C524.111 92.9866 523.013 91.7183 523.013 89.7161C523.013 87.7256 524.129 86.4339 525.867 86.4339C527.576 86.4339 528.615 87.6493 528.615 89.6163V90.0038H524.064V90.0508C524.117 91.3014 524.816 92.0941 525.89 92.0941C526.707 92.0941 527.259 91.7946 527.523 91.2368ZM525.855 87.3264C524.845 87.3264 524.141 88.0662 524.064 89.1876H527.552C527.529 88.0662 526.859 87.3264 525.855 87.3264ZM534.017 92.875V87.3909H532.966V86.5454H534.017V85.8408C534.017 84.5785 534.651 83.9737 535.855 83.9737C536.101 83.9737 536.324 83.9913 536.536 84.0324V84.8544C536.412 84.8309 536.242 84.8251 536.06 84.8251C535.332 84.8251 535.027 85.1774 535.027 85.8702V86.5454H536.477V87.3909H535.027V92.875H534.017ZM540.282 92.9866C538.479 92.9866 537.364 91.7418 537.364 89.7102C537.364 87.6728 538.479 86.4339 540.282 86.4339C542.084 86.4339 543.2 87.6728 543.2 89.7102C543.2 91.7418 542.084 92.9866 540.282 92.9866ZM540.282 92.0765C541.48 92.0765 542.155 91.2075 542.155 89.7102C542.155 88.2071 541.48 87.344 540.282 87.344C539.084 87.344 538.409 88.2071 538.409 89.7102C538.409 91.2075 539.084 92.0765 540.282 92.0765ZM544.785 92.875V86.5454H545.748V87.4849H545.842C546.03 86.8684 546.758 86.4339 547.598 86.4339C547.762 86.4339 547.973 86.4456 548.103 86.4632V87.4731C548.02 87.4497 547.656 87.4144 547.457 87.4144C546.494 87.4144 545.795 88.0603 545.795 88.9528V92.875H544.785ZM556.951 91.2368H557.961C557.667 92.3172 556.681 92.9866 555.295 92.9866C553.54 92.9866 552.442 91.7183 552.442 89.7161C552.442 87.7256 553.557 86.4339 555.295 86.4339C557.004 86.4339 558.043 87.6493 558.043 89.6163V90.0038H553.493V90.0508C553.546 91.3014 554.244 92.0941 555.319 92.0941C556.135 92.0941 556.687 91.7946 556.951 91.2368ZM555.284 87.3264C554.274 87.3264 553.569 88.0662 553.493 89.1876H556.98C556.957 88.0662 556.288 87.3264 555.284 87.3264ZM561.39 92.9866C560.163 92.9866 559.253 92.2585 559.253 91.1018C559.253 89.9686 560.087 89.3168 561.56 89.2287L563.386 89.1172V88.5418C563.386 87.7609 562.899 87.3322 561.954 87.3322C561.196 87.3322 560.668 87.6199 560.527 88.119H559.505C559.64 87.1032 560.638 86.4339 561.989 86.4339C563.533 86.4339 564.396 87.2265 564.396 88.5418V92.875H563.433V91.9414H563.339C562.928 92.6167 562.236 92.9866 561.39 92.9866ZM561.578 92.1C562.617 92.1 563.386 91.4188 563.386 90.5146V89.9333L561.684 90.0449C560.721 90.1095 560.298 90.4442 560.298 91.0783C560.298 91.7242 560.844 92.1 561.578 92.1ZM571.501 88.4831H570.479C570.315 87.8548 569.757 87.344 568.847 87.344C567.708 87.344 566.992 88.2541 566.992 89.6867C566.992 91.1488 567.72 92.0765 568.847 92.0765C569.698 92.0765 570.291 91.6831 570.479 90.9667H571.501C571.319 92.1293 570.374 92.9866 568.853 92.9866C567.08 92.9866 565.946 91.7007 565.946 89.6867C565.946 87.7139 567.074 86.4339 568.847 86.4339C570.385 86.4339 571.325 87.3557 571.501 88.4831ZM573.051 92.875V84.0324H574.061V87.5436H574.155C574.472 86.8449 575.135 86.4339 576.104 86.4339C577.443 86.4339 578.288 87.2911 578.288 88.7766V92.875H577.279V89.0232C577.279 87.9018 576.774 87.344 575.817 87.344C574.683 87.344 574.061 88.0603 574.061 89.1289V92.875H573.051ZM278.609 104.434C280.223 104.434 281.269 105.72 281.269 107.71C281.269 109.689 280.218 110.987 278.609 110.987C277.705 110.987 276.976 110.593 276.63 109.924H276.536V112.989H275.526V104.545H276.489V105.602H276.583C276.988 104.874 277.746 104.434 278.609 104.434ZM278.368 110.076C279.531 110.076 280.223 109.19 280.223 107.71C280.223 106.231 279.531 105.344 278.374 105.344C277.229 105.344 276.507 106.254 276.507 107.71C276.507 109.16 277.229 110.076 278.368 110.076ZM282.854 110.875V104.545H283.817V105.485H283.911C284.099 104.868 284.827 104.434 285.666 104.434C285.831 104.434 286.042 104.446 286.171 104.463V105.473C286.089 105.45 285.725 105.414 285.525 105.414C284.563 105.414 283.864 106.06 283.864 106.953V110.875H282.854ZM289.859 110.987C288.056 110.987 286.941 109.742 286.941 107.71C286.941 105.673 288.056 104.434 289.859 104.434C291.661 104.434 292.777 105.673 292.777 107.71C292.777 109.742 291.661 110.987 289.859 110.987ZM289.859 110.076C291.057 110.076 291.732 109.207 291.732 107.71C291.732 106.207 291.057 105.344 289.859 105.344C288.661 105.344 287.986 106.207 287.986 107.71C287.986 109.207 288.661 110.076 289.859 110.076ZM294.902 103.324C294.515 103.324 294.198 103.007 294.198 102.62C294.198 102.232 294.515 101.915 294.902 101.915C295.29 101.915 295.607 102.232 295.607 102.62C295.607 103.007 295.29 103.324 294.902 103.324ZM295.396 104.545V111.186C295.396 112.49 294.785 113.047 293.458 113.047H293.282V112.184H293.435C294.151 112.184 294.386 111.903 294.386 111.204V104.545H295.396ZM301.514 109.237H302.524C302.23 110.317 301.244 110.987 299.858 110.987C298.102 110.987 297.004 109.718 297.004 107.716C297.004 105.726 298.12 104.434 299.858 104.434C301.567 104.434 302.606 105.649 302.606 107.616V108.004H298.055V108.051C298.108 109.301 298.807 110.094 299.882 110.094C300.698 110.094 301.25 109.795 301.514 109.237ZM299.846 105.326C298.836 105.326 298.132 106.066 298.055 107.188H301.543C301.52 106.066 300.85 105.326 299.846 105.326ZM309.429 106.483H308.407C308.243 105.855 307.685 105.344 306.775 105.344C305.636 105.344 304.919 106.254 304.919 107.687C304.919 109.149 305.647 110.076 306.775 110.076C307.626 110.076 308.219 109.683 308.407 108.967H309.429C309.247 110.129 308.301 110.987 306.781 110.987C305.007 110.987 303.874 109.701 303.874 107.687C303.874 105.714 305.002 104.434 306.775 104.434C308.313 104.434 309.253 105.356 309.429 106.483ZM311.46 102.907H312.47V104.545H313.879V105.391H312.47V108.973C312.47 109.718 312.752 110.035 313.41 110.035C313.592 110.035 313.691 110.029 313.879 110.012V110.863C313.68 110.898 313.486 110.922 313.286 110.922C311.983 110.922 311.46 110.441 311.46 109.231V105.391H310.439V104.545H311.46V102.907Z" fill="var(--vscode-editor-foreground, #CCCCCC)" />
+                </g>
+              </g>
+            </g>
+          </g>
+          <g>
+            <mask fill="var(--vscode-activityBar-activeBorder, #FFFFFF)">
+              <path d="M259.775 126.975H627V427.875H259.775V126.975Z" />
+            </mask>
+            <path d="M259.775 127.9H627V126.05H259.775V127.9Z" fill="var(--vscode-editorWidget-border, #2B2B2B)" mask="url(#path-41-inside-7_304_6548)" />
+            <g>
+              <g>
+                <g>
+                  <g>
+                    <rect x="275.038" y="138.537" width="21.275" height="21.275" rx="10.6375" fill="var(--vscode-editorWidget-background, #1F1F1F)" />
+                    <rect x="275.038" y="138.537" width="21.275" height="21.275" rx="10.6375" stroke="var(--vscode-editorWidget-foreground, #313131)" stroke-width="0.925" />
+                    <g clip-path="url(#clip9_304_6548)">
+                      <g>
+                        <path d="M284.461 149.869C284.748 149.869 284.981 150.102 284.981 150.389V151.43C284.981 151.717 284.748 151.95 284.461 151.95C284.174 151.95 283.941 151.717 283.941 151.43V150.389C283.941 150.102 284.174 149.869 284.461 149.869Z" fill="var(--vscode-editorWidget-foreground, #CCCCCC)" />
+                        <path d="M287.409 150.389C287.409 150.102 287.177 149.869 286.889 149.869C286.602 149.869 286.369 150.102 286.369 150.389V151.43C286.369 151.717 286.602 151.95 286.889 151.95C287.177 151.95 287.409 151.717 287.409 151.43V150.389Z" fill="var(--vscode-editorWidget-foreground, #CCCCCC)" />
+                        <path fill-rule="evenodd" clip-rule="evenodd" d="M285.579 144.853C285.613 144.889 285.645 144.927 285.675 144.966C285.705 144.927 285.737 144.889 285.772 144.853C286.245 144.346 286.977 144.229 287.814 144.322C288.667 144.417 289.302 144.688 289.704 145.196C290.096 145.693 290.184 146.316 290.184 146.92C290.184 147.317 290.148 147.716 290.008 148.068L290.124 148.65L290.17 148.673C290.817 148.996 291.225 149.657 291.225 150.379L291.225 151.256C291.225 151.422 291.166 151.56 291.117 151.65C291.065 151.745 291 151.831 290.937 151.904C290.812 152.05 290.657 152.19 290.518 152.306C290.375 152.425 290.235 152.53 290.131 152.605C289.965 152.725 289.795 152.835 289.617 152.938C289.404 153.06 289.098 153.222 288.718 153.383C287.961 153.704 286.893 154.031 285.675 154.031C284.457 154.031 283.389 153.704 282.632 153.383C282.252 153.222 281.946 153.06 281.733 152.938C281.555 152.835 281.385 152.725 281.219 152.605C281.115 152.53 280.975 152.425 280.833 152.306C280.693 152.19 280.538 152.05 280.413 151.904C280.35 151.831 280.285 151.745 280.233 151.65C280.185 151.56 280.125 151.422 280.125 151.256L280.125 150.379C280.125 149.657 280.533 148.996 281.18 148.673L281.226 148.65L281.342 148.068C281.202 147.716 281.166 147.317 281.166 146.92C281.166 146.316 281.254 145.693 281.646 145.196C282.048 144.688 282.683 144.417 283.536 144.322C284.373 144.229 285.105 144.346 285.579 144.853ZM282.222 148.973L282.206 149.053V152.009C282.221 152.018 282.236 152.026 282.252 152.036C282.434 152.141 282.703 152.283 283.038 152.425C283.712 152.711 284.639 152.991 285.675 152.991C286.712 152.991 287.638 152.711 288.312 152.425C288.647 152.283 288.916 152.141 289.098 152.036C289.114 152.026 289.129 152.018 289.144 152.009V149.053L289.128 148.973C288.788 149.118 288.382 149.175 287.93 149.175C287.135 149.175 286.501 148.948 286.05 148.487C285.898 148.332 285.775 148.159 285.675 147.972C285.576 148.159 285.452 148.332 285.3 148.487C284.849 148.948 284.216 149.175 283.42 149.175C282.968 149.175 282.562 149.118 282.222 148.973ZM284.818 145.563C284.684 145.419 284.376 145.276 283.651 145.356C282.944 145.435 282.625 145.636 282.463 145.842C282.291 146.059 282.206 146.389 282.206 146.92C282.206 147.47 282.296 147.732 282.42 147.871C282.533 147.996 282.781 148.134 283.42 148.134C284.013 148.134 284.349 147.971 284.557 147.759C284.776 147.536 284.922 147.186 284.985 146.682C285.066 146.033 284.959 145.714 284.818 145.563ZM286.532 145.563C286.666 145.419 286.974 145.276 287.699 145.356C288.406 145.435 288.725 145.636 288.887 145.842C289.059 146.059 289.144 146.389 289.144 146.92C289.144 147.47 289.054 147.732 288.93 147.871C288.817 147.996 288.57 148.134 287.93 148.134C287.338 148.134 287.001 147.971 286.793 147.759C286.575 147.536 286.428 147.186 286.365 146.682C286.284 146.033 286.391 145.714 286.532 145.563Z" fill="var(--vscode-editorWidget-foreground, #CCCCCC)" />
+                      </g>
+                    </g>
+                  </g>
+                  <path d="M312.548 149.793C312.548 151.983 311.104 153.386 308.843 153.386C306.389 153.386 304.862 151.678 304.862 148.936C304.862 146.223 306.406 144.491 308.82 144.491C310.775 144.491 312.207 145.601 312.477 147.327H310.969C310.663 146.346 309.906 145.806 308.82 145.806C307.34 145.806 306.412 147.004 306.412 148.924C306.412 150.873 307.357 152.071 308.866 152.071C310.158 152.071 311.039 151.267 311.062 150.069L311.068 149.893H309.031V148.736H312.548V149.793ZM314.897 145.683C314.421 145.683 314.028 145.301 314.028 144.82C314.028 144.344 314.421 143.957 314.897 143.957C315.378 143.957 315.771 144.344 315.771 144.82C315.771 145.301 315.378 145.683 314.897 145.683ZM314.174 153.175V146.757H315.625V153.175H314.174ZM317.897 145.184H319.347V146.798H320.721V147.932H319.347V151.126C319.347 151.766 319.617 152.053 320.228 152.053C320.433 152.053 320.545 152.042 320.721 152.024V153.14C320.51 153.181 320.24 153.204 319.958 153.204C318.484 153.204 317.897 152.711 317.897 151.472V147.932H316.881V146.798H317.897V145.184ZM329.476 153.175H327.967V149.499H323.845V153.175H322.33V144.702H323.845V148.225H327.967V144.702H329.476V153.175ZM337.009 146.757V153.175H335.606V152.153H335.506C335.195 152.887 334.566 153.304 333.586 153.304C332.183 153.304 331.361 152.429 331.361 150.926V146.757H332.817V150.574C332.817 151.572 333.222 152.053 334.091 152.053C335.036 152.053 335.553 151.466 335.553 150.497V146.757H337.009ZM342.364 153.281C341.465 153.281 340.72 152.864 340.356 152.159H340.256V153.175H338.853V144.274H340.309V147.779H340.409C340.743 147.08 341.483 146.652 342.364 146.652C343.99 146.652 345 147.92 345 149.969C345 152.006 343.984 153.281 342.364 153.281ZM341.906 147.867C340.914 147.867 340.285 148.671 340.285 149.969C340.285 151.267 340.908 152.071 341.906 152.071C342.904 152.071 343.503 151.278 343.503 149.969C343.503 148.66 342.898 147.867 341.906 147.867ZM353.355 153.386C350.954 153.386 349.463 151.684 349.463 148.942C349.463 146.188 350.948 144.491 353.35 144.491C355.275 144.491 356.761 145.736 356.937 147.491H355.446C355.234 146.47 354.418 145.806 353.35 145.806C351.911 145.806 351.013 147.01 351.013 148.936C351.013 150.867 351.911 152.071 353.355 152.071C354.43 152.071 355.246 151.466 355.452 150.515H356.943C356.743 152.23 355.311 153.386 353.355 153.386ZM361.247 153.304C359.321 153.304 358.158 152.048 358.158 149.963C358.158 147.896 359.339 146.634 361.247 146.634C363.161 146.634 364.335 147.891 364.335 149.963C364.335 152.048 363.167 153.304 361.247 153.304ZM361.247 152.112C362.263 152.112 362.838 151.325 362.838 149.969C362.838 148.613 362.257 147.826 361.247 147.826C360.231 147.826 359.65 148.613 359.65 149.969C359.65 151.325 360.231 152.112 361.247 152.112ZM369.303 146.652C370.929 146.652 371.951 147.914 371.951 149.969C371.951 152.006 370.941 153.281 369.32 153.281C368.398 153.281 367.688 152.881 367.359 152.2H367.259V155.306H365.803V146.757H367.207V147.82H367.306C367.676 147.092 368.422 146.652 369.303 146.652ZM368.845 152.071C369.855 152.071 370.454 151.284 370.454 149.969C370.454 148.654 369.849 147.867 368.851 147.867C367.858 147.867 367.236 148.671 367.23 149.969C367.236 151.267 367.852 152.071 368.845 152.071ZM374.153 145.683C373.677 145.683 373.284 145.301 373.284 144.82C373.284 144.344 373.677 143.957 374.153 143.957C374.634 143.957 375.027 144.344 375.027 144.82C375.027 145.301 374.634 145.683 374.153 145.683ZM373.43 153.175V146.757H374.881V153.175H373.43ZM376.748 153.175V144.274H378.204V153.175H376.748ZM382.819 153.304C380.893 153.304 379.731 152.048 379.731 149.963C379.731 147.896 380.911 146.634 382.819 146.634C384.733 146.634 385.908 147.891 385.908 149.963C385.908 152.048 384.739 153.304 382.819 153.304ZM382.819 152.112C383.835 152.112 384.41 151.325 384.41 149.969C384.41 148.613 383.829 147.826 382.819 147.826C381.803 147.826 381.222 148.613 381.222 149.969C381.222 151.325 381.803 152.112 382.819 152.112ZM387.839 145.184H389.29V146.798H390.663V147.932H389.29V151.126C389.29 151.766 389.56 152.053 390.17 152.053C390.376 152.053 390.487 152.042 390.663 152.024V153.14C390.452 153.181 390.182 153.204 389.9 153.204C388.426 153.204 387.839 152.711 387.839 151.472V147.932H386.823V146.798H387.839V145.184Z" fill="var(--vscode-editorWidget-foreground, #CCCCCC)" />
+                  <g>
+                    <path d="M406.506 150.853C406.506 152.621 405.294 153.794 403.46 153.794C401.478 153.794 400.211 152.333 400.211 150.038C400.211 147.772 401.498 146.287 403.46 146.287C405.05 146.287 406.203 147.171 406.461 148.592H405.552C405.244 147.623 404.523 147.112 403.46 147.112C402.039 147.112 401.13 148.254 401.13 150.038C401.13 151.846 402.024 152.969 403.465 152.969C404.747 152.969 405.616 152.149 405.616 150.937V150.763H403.599V149.978H406.506V150.853ZM411.529 152.239H412.383C412.135 153.153 411.3 153.719 410.128 153.719C408.642 153.719 407.713 152.646 407.713 150.952C407.713 149.268 408.657 148.175 410.128 148.175C411.573 148.175 412.453 149.203 412.453 150.868V151.196H408.602V151.235C408.647 152.294 409.238 152.964 410.148 152.964C410.838 152.964 411.305 152.711 411.529 152.239ZM410.118 148.93C409.263 148.93 408.667 149.556 408.602 150.505H411.554C411.534 149.556 410.967 148.93 410.118 148.93ZM413.794 153.625V148.269H414.609V149.114H414.689C414.957 148.523 415.478 148.175 416.298 148.175C417.501 148.175 418.171 148.885 418.171 150.157V153.625H417.317V150.366C417.317 149.402 416.909 148.945 416.055 148.945C415.2 148.945 414.649 149.516 414.649 150.455V153.625H413.794ZM423.284 152.239H424.138C423.89 153.153 423.055 153.719 421.883 153.719C420.397 153.719 419.468 152.646 419.468 150.952C419.468 149.268 420.412 148.175 421.883 148.175C423.328 148.175 424.208 149.203 424.208 150.868V151.196H420.357V151.235C420.402 152.294 420.993 152.964 421.902 152.964C422.593 152.964 423.06 152.711 423.284 152.239ZM421.873 148.93C421.018 148.93 420.422 149.556 420.357 150.505H423.308C423.289 149.556 422.722 148.93 421.873 148.93ZM425.549 153.625V148.269H426.364V149.064H426.443C426.602 148.542 427.218 148.175 427.929 148.175C428.068 148.175 428.247 148.185 428.356 148.2V149.054C428.287 149.034 427.979 149.005 427.81 149.005C426.995 149.005 426.404 149.551 426.404 150.306V153.625H425.549ZM430.915 153.719C429.877 153.719 429.106 153.103 429.106 152.125C429.106 151.166 429.812 150.614 431.059 150.54L432.604 150.445V149.958C432.604 149.298 432.192 148.935 431.392 148.935C430.751 148.935 430.304 149.178 430.185 149.601H429.32C429.434 148.741 430.279 148.175 431.422 148.175C432.728 148.175 433.459 148.846 433.459 149.958V153.625H432.644V152.835H432.564C432.217 153.406 431.63 153.719 430.915 153.719ZM431.074 152.969C431.953 152.969 432.604 152.393 432.604 151.628V151.136L431.163 151.23C430.348 151.285 429.991 151.568 429.991 152.105C429.991 152.651 430.453 152.969 431.074 152.969ZM435.396 146.883H436.251V148.269H437.443V148.985H436.251V152.015C436.251 152.646 436.489 152.915 437.046 152.915C437.2 152.915 437.284 152.91 437.443 152.895V153.615C437.274 153.645 437.11 153.665 436.941 153.665C435.838 153.665 435.396 153.257 435.396 152.234V148.985H434.532V148.269H435.396V146.883ZM439.182 147.236C438.854 147.236 438.586 146.968 438.586 146.64C438.586 146.312 438.854 146.043 439.182 146.043C439.51 146.043 439.778 146.312 439.778 146.64C439.778 146.968 439.51 147.236 439.182 147.236ZM438.755 153.625V148.269H439.609V153.625H438.755ZM441.239 153.625V148.269H442.054V149.114H442.133C442.401 148.523 442.923 148.175 443.743 148.175C444.945 148.175 445.616 148.885 445.616 150.157V153.625H444.761V150.366C444.761 149.402 444.354 148.945 443.499 148.945C442.645 148.945 442.093 149.516 442.093 150.455V153.625H441.239ZM449.387 155.682C448.095 155.682 447.27 155.101 447.141 154.216H448.045C448.14 154.653 448.617 154.937 449.387 154.937C450.346 154.937 450.917 154.465 450.917 153.675V152.621H450.838C450.5 153.213 449.894 153.546 449.158 153.546C447.772 153.546 446.913 152.472 446.913 150.868C446.913 149.263 447.782 148.175 449.158 148.175C449.909 148.175 450.569 148.542 450.877 149.119H450.957V148.269H451.772V153.719C451.772 154.917 450.848 155.682 449.387 155.682ZM449.347 152.79C450.341 152.79 450.937 152.035 450.937 150.868C450.937 149.7 450.336 148.945 449.347 148.945C448.353 148.945 447.797 149.7 447.797 150.868C447.797 152.035 448.353 152.79 449.347 152.79ZM454.087 153.675C453.734 153.675 453.441 153.382 453.441 153.029C453.441 152.671 453.734 152.383 454.087 152.383C454.445 152.383 454.733 152.671 454.733 153.029C454.733 153.382 454.445 153.675 454.087 153.675Z" fill="var(--vscode-editorOverviewRuler-bracketMatchForeground, #9D9D9D)" />
+                  </g>
+                </g>
+              </g>
+              <g>
+                <g>
+                  <path d="M278.609 175.234C280.223 175.234 281.269 176.52 281.269 178.51C281.269 180.489 280.218 181.786 278.609 181.786C277.705 181.786 276.976 181.393 276.63 180.724H276.536V183.789H275.526V175.345H276.489V176.402H276.583C276.988 175.674 277.746 175.234 278.609 175.234ZM278.368 180.876C279.531 180.876 280.223 179.99 280.223 178.51C280.223 177.031 279.531 176.144 278.374 176.144C277.229 176.144 276.507 177.054 276.507 178.51C276.507 179.96 277.229 180.876 278.368 180.876ZM282.854 181.675V175.345H283.817V176.285H283.911C284.099 175.668 284.827 175.234 285.666 175.234C285.831 175.234 286.042 175.246 286.171 175.263V176.273C286.089 176.25 285.725 176.214 285.525 176.214C284.563 176.214 283.864 176.86 283.864 177.753V181.675H282.854ZM289.859 181.786C288.056 181.786 286.941 180.542 286.941 178.51C286.941 176.473 288.056 175.234 289.859 175.234C291.661 175.234 292.777 176.473 292.777 178.51C292.777 180.542 291.661 181.786 289.859 181.786ZM289.859 180.876C291.057 180.876 291.732 180.007 291.732 178.51C291.732 177.007 291.057 176.144 289.859 176.144C288.661 176.144 287.986 177.007 287.986 178.51C287.986 180.007 288.661 180.876 289.859 180.876ZM294.902 174.124C294.515 174.124 294.198 173.807 294.198 173.419C294.198 173.032 294.515 172.715 294.902 172.715C295.29 172.715 295.607 173.032 295.607 173.419C295.607 173.807 295.29 174.124 294.902 174.124ZM295.396 175.345V181.986C295.396 183.29 294.785 183.847 293.458 183.847H293.282V182.984H293.435C294.151 182.984 294.386 182.702 294.386 182.004V175.345H295.396ZM301.514 180.037H302.524C302.23 181.117 301.244 181.786 299.858 181.786C298.102 181.786 297.004 180.518 297.004 178.516C297.004 176.526 298.12 175.234 299.858 175.234C301.567 175.234 302.606 176.449 302.606 178.416V178.804H298.055V178.851C298.108 180.101 298.807 180.894 299.882 180.894C300.698 180.894 301.25 180.595 301.514 180.037ZM299.846 176.126C298.836 176.126 298.132 176.866 298.055 177.988H301.543C301.52 176.866 300.85 176.126 299.846 176.126ZM309.429 177.283H308.407C308.243 176.655 307.685 176.144 306.775 176.144C305.636 176.144 304.919 177.054 304.919 178.487C304.919 179.949 305.647 180.876 306.775 180.876C307.626 180.876 308.219 180.483 308.407 179.767H309.429C309.247 180.929 308.301 181.786 306.781 181.786C305.007 181.786 303.874 180.501 303.874 178.487C303.874 176.514 305.002 175.234 306.775 175.234C308.313 175.234 309.253 176.156 309.429 177.283ZM311.46 173.707H312.47V175.345H313.879V176.191H312.47V179.773C312.47 180.518 312.752 180.835 313.41 180.835C313.592 180.835 313.691 180.829 313.879 180.812V181.663C313.68 181.698 313.486 181.722 313.286 181.722C311.983 181.722 311.46 181.24 311.46 180.031V176.191H310.439V175.345H311.46V173.707ZM316.24 181.734C315.823 181.734 315.476 181.387 315.476 180.97C315.476 180.548 315.823 180.207 316.24 180.207C316.662 180.207 317.003 180.548 317.003 180.97C317.003 181.387 316.662 181.734 316.24 181.734ZM319.164 173.707H320.174V175.345H321.583V176.191H320.174V179.773C320.174 180.518 320.456 180.835 321.113 180.835C321.295 180.835 321.395 180.829 321.583 180.812V181.663C321.383 181.698 321.189 181.722 320.99 181.722C319.686 181.722 319.164 181.24 319.164 180.031V176.191H318.142V175.345H319.164V173.707ZM322.845 177.077C322.845 176.026 323.861 175.234 325.206 175.234C326.533 175.234 327.454 175.891 327.59 176.931H326.591C326.456 176.426 325.963 176.091 325.2 176.091C324.448 176.091 323.861 176.473 323.861 177.036C323.861 177.471 324.213 177.741 324.959 177.923L325.934 178.158C327.126 178.446 327.701 178.962 327.701 179.872C327.701 181.006 326.603 181.786 325.165 181.786C323.755 181.786 322.787 181.111 322.675 180.06H323.714C323.885 180.595 324.389 180.935 325.2 180.935C326.051 180.935 326.662 180.53 326.662 179.949C326.662 179.514 326.333 179.221 325.658 179.056L324.572 178.792C323.385 178.504 322.845 177.993 322.845 177.077ZM331.406 179.303H331.312L329.809 181.693H328.664L330.831 178.528L328.641 175.363H329.844L331.347 177.717H331.441L332.927 175.363H334.072L331.923 178.487L334.101 181.693H332.903L331.406 179.303Z" fill="var(--vscode-activityBarBadge-background, #40A6FF)" />
+                  <g>
+                    <path d="M284.005 207.575H283.018V201.104H282.948L280.276 207.575H279.384L276.712 201.104H276.642V207.575H275.655V199.102H276.882L279.783 206.172H279.877L282.777 199.102H284.005V207.575ZM288.637 207.687C286.835 207.687 285.719 206.442 285.719 204.41C285.719 202.373 286.835 201.134 288.637 201.134C290.44 201.134 291.555 202.373 291.555 204.41C291.555 206.442 290.44 207.687 288.637 207.687ZM288.637 206.776C289.835 206.776 290.51 205.907 290.51 204.41C290.51 202.907 289.835 202.044 288.637 202.044C287.439 202.044 286.764 202.907 286.764 204.41C286.764 205.907 287.439 206.776 288.637 206.776ZM295.484 207.687C293.863 207.687 292.824 206.401 292.824 204.41C292.824 202.426 293.875 201.134 295.484 201.134C296.364 201.134 297.11 201.551 297.468 202.244H297.556V198.732H298.566V207.575H297.603V206.565H297.509C297.11 207.27 296.358 207.687 295.484 207.687ZM295.718 202.044C294.568 202.044 293.869 202.936 293.869 204.41C293.869 205.89 294.562 206.776 295.718 206.776C296.869 206.776 297.58 205.872 297.58 204.41C297.58 202.96 296.863 202.044 295.718 202.044ZM301.056 200.024C300.668 200.024 300.351 199.707 300.351 199.32C300.351 198.932 300.668 198.615 301.056 198.615C301.443 198.615 301.76 198.932 301.76 199.32C301.76 199.707 301.443 200.024 301.056 200.024ZM300.551 207.575V201.245H301.561V207.575H300.551ZM303.909 207.575V202.091H302.858V201.245H303.909V200.541C303.909 199.278 304.543 198.674 305.747 198.674C305.994 198.674 306.217 198.691 306.428 198.732V199.554C306.305 199.531 306.135 199.525 305.953 199.525C305.224 199.525 304.919 199.877 304.919 200.57V201.245H306.369V202.091H304.919V207.575H303.909ZM308.383 209.865C308.248 209.865 308.072 209.853 307.931 209.83V208.967C308.055 208.99 308.213 208.996 308.354 208.996C308.935 208.996 309.252 208.72 309.517 207.957L309.634 207.581L307.291 201.245H308.383L310.121 206.453H310.215L311.947 201.245H313.022L310.55 207.962C310.01 209.43 309.505 209.865 308.383 209.865ZM318.189 199.607H319.199V201.245H320.608V202.091H319.199V205.673C319.199 206.418 319.481 206.735 320.138 206.735C320.32 206.735 320.42 206.729 320.608 206.712V207.563C320.408 207.598 320.215 207.622 320.015 207.622C318.711 207.622 318.189 207.14 318.189 205.931V202.091H317.167V201.245H318.189V199.607ZM322.193 207.575V198.732H323.203V202.244H323.297C323.614 201.545 324.278 201.134 325.247 201.134C326.585 201.134 327.431 201.991 327.431 203.477V207.575H326.421V203.723C326.421 202.602 325.916 202.044 324.959 202.044C323.826 202.044 323.203 202.76 323.203 203.829V207.575H322.193ZM333.467 205.937H334.477C334.183 207.017 333.197 207.687 331.811 207.687C330.055 207.687 328.957 206.418 328.957 204.416C328.957 202.426 330.073 201.134 331.811 201.134C333.52 201.134 334.559 202.349 334.559 204.316V204.704H330.008V204.751C330.061 206.001 330.76 206.794 331.834 206.794C332.651 206.794 333.203 206.495 333.467 205.937ZM331.799 202.026C330.789 202.026 330.085 202.766 330.008 203.888H333.496C333.473 202.766 332.803 202.026 331.799 202.026ZM339.667 199.102H342.867C344.47 199.102 345.58 200.23 345.58 201.844C345.58 203.43 344.447 204.551 342.855 204.551H340.724V207.575H339.667V199.102ZM340.724 200.042V203.612H342.591C343.795 203.612 344.494 202.966 344.494 201.844C344.494 200.682 343.818 200.042 342.591 200.042H340.724ZM347.183 207.575V201.245H348.146V202.185H348.24C348.428 201.568 349.156 201.134 349.995 201.134C350.16 201.134 350.371 201.146 350.5 201.163V202.173C350.418 202.15 350.054 202.114 349.854 202.114C348.891 202.114 348.193 202.76 348.193 203.653V207.575H347.183ZM354.188 207.687C352.385 207.687 351.269 206.442 351.269 204.41C351.269 202.373 352.385 201.134 354.188 201.134C355.99 201.134 357.106 202.373 357.106 204.41C357.106 206.442 355.99 207.687 354.188 207.687ZM354.188 206.776C355.385 206.776 356.061 205.907 356.061 204.41C356.061 202.907 355.385 202.044 354.188 202.044C352.99 202.044 352.315 202.907 352.315 204.41C352.315 205.907 352.99 206.776 354.188 206.776ZM359.231 200.024C358.844 200.024 358.527 199.707 358.527 199.32C358.527 198.932 358.844 198.615 359.231 198.615C359.619 198.615 359.936 198.932 359.936 199.32C359.936 199.707 359.619 200.024 359.231 200.024ZM359.724 201.245V207.886C359.724 209.19 359.114 209.747 357.787 209.747H357.611V208.884H357.763C358.48 208.884 358.715 208.602 358.715 207.904V201.245H359.724ZM365.843 205.937H366.853C366.559 207.017 365.573 207.687 364.187 207.687C362.431 207.687 361.333 206.418 361.333 204.416C361.333 202.426 362.449 201.134 364.187 201.134C365.896 201.134 366.935 202.349 366.935 204.316V204.704H362.384V204.751C362.437 206.001 363.136 206.794 364.21 206.794C365.027 206.794 365.578 206.495 365.843 205.937ZM364.175 202.026C363.165 202.026 362.461 202.766 362.384 203.888H365.872C365.849 202.766 365.179 202.026 364.175 202.026ZM373.758 203.183H372.736C372.572 202.555 372.014 202.044 371.104 202.044C369.965 202.044 369.248 202.954 369.248 204.387C369.248 205.849 369.976 206.776 371.104 206.776C371.955 206.776 372.548 206.383 372.736 205.667H373.758C373.576 206.829 372.63 207.687 371.109 207.687C369.336 207.687 368.203 206.401 368.203 204.387C368.203 202.414 369.33 201.134 371.104 201.134C372.642 201.134 373.581 202.056 373.758 203.183ZM375.789 199.607H376.799V201.245H378.208V202.091H376.799V205.673C376.799 206.418 377.081 206.735 377.738 206.735C377.921 206.735 378.02 206.729 378.208 206.712V207.563C378.009 207.598 377.815 207.622 377.615 207.622C376.312 207.622 375.789 207.14 375.789 205.931V202.091H374.767V201.245H375.789V199.607ZM379.471 202.978C379.471 201.926 380.486 201.134 381.831 201.134C383.158 201.134 384.08 201.791 384.215 202.831H383.217C383.082 202.326 382.588 201.991 381.825 201.991C381.074 201.991 380.486 202.373 380.486 202.936C380.486 203.371 380.839 203.641 381.584 203.823L382.559 204.058C383.751 204.346 384.326 204.862 384.326 205.772C384.326 206.906 383.228 207.687 381.79 207.687C380.381 207.687 379.412 207.011 379.3 205.96H380.34C380.51 206.495 381.015 206.835 381.825 206.835C382.677 206.835 383.287 206.43 383.287 205.849C383.287 205.414 382.958 205.121 382.283 204.956L381.197 204.692C380.011 204.404 379.471 203.893 379.471 202.978ZM394.543 203.183H393.521C393.357 202.555 392.799 202.044 391.889 202.044C390.75 202.044 390.034 202.954 390.034 204.387C390.034 205.849 390.762 206.776 391.889 206.776C392.74 206.776 393.333 206.383 393.521 205.667H394.543C394.361 206.829 393.416 207.687 391.895 207.687C390.122 207.687 388.988 206.401 388.988 204.387C388.988 202.414 390.116 201.134 391.889 201.134C393.427 201.134 394.367 202.056 394.543 203.183ZM398.635 207.687C396.833 207.687 395.717 206.442 395.717 204.41C395.717 202.373 396.833 201.134 398.635 201.134C400.438 201.134 401.554 202.373 401.554 204.41C401.554 206.442 400.438 207.687 398.635 207.687ZM398.635 206.776C399.833 206.776 400.508 205.907 400.508 204.41C400.508 202.907 399.833 202.044 398.635 202.044C397.438 202.044 396.762 202.907 396.762 204.41C396.762 205.907 397.438 206.776 398.635 206.776ZM403.139 207.575V201.245H404.102V202.244H404.196C404.484 201.539 405.118 201.134 405.963 201.134C406.82 201.134 407.419 201.586 407.713 202.244H407.807C408.147 201.574 408.87 201.134 409.744 201.134C411.036 201.134 411.758 201.874 411.758 203.201V207.575H410.749V203.435C410.749 202.502 410.308 202.044 409.416 202.044C408.535 202.044 407.948 202.702 407.948 203.506V207.575H406.938V203.277C406.938 202.525 406.415 202.044 405.617 202.044C404.789 202.044 404.149 202.76 404.149 203.653V207.575H403.139ZM416.685 201.134C418.299 201.134 419.345 202.42 419.345 204.41C419.345 206.389 418.294 207.687 416.685 207.687C415.78 207.687 415.052 207.293 414.706 206.624H414.612V209.689H413.602V201.245H414.565V202.302H414.659C415.064 201.574 415.822 201.134 416.685 201.134ZM416.444 206.776C417.607 206.776 418.299 205.89 418.299 204.41C418.299 202.931 417.607 202.044 416.45 202.044C415.305 202.044 414.583 202.954 414.583 204.41C414.583 205.86 415.305 206.776 416.444 206.776ZM423.531 207.687C421.728 207.687 420.613 206.442 420.613 204.41C420.613 202.373 421.728 201.134 423.531 201.134C425.334 201.134 426.449 202.373 426.449 204.41C426.449 206.442 425.334 207.687 423.531 207.687ZM423.531 206.776C424.729 206.776 425.404 205.907 425.404 204.41C425.404 202.907 424.729 202.044 423.531 202.044C422.333 202.044 421.658 202.907 421.658 204.41C421.658 205.907 422.333 206.776 423.531 206.776ZM428.034 207.575V201.245H428.997V202.244H429.091C429.408 201.545 430.025 201.134 430.994 201.134C432.415 201.134 433.207 201.973 433.207 203.477V207.575H432.197V203.723C432.197 202.584 431.716 202.044 430.706 202.044C429.696 202.044 429.044 202.719 429.044 203.829V207.575H428.034ZM439.249 205.937H440.259C439.966 207.017 438.979 207.687 437.593 207.687C435.838 207.687 434.74 206.418 434.74 204.416C434.74 202.426 435.855 201.134 437.593 201.134C439.302 201.134 440.341 202.349 440.341 204.316V204.704H435.791V204.751C435.844 206.001 436.542 206.794 437.617 206.794C438.433 206.794 438.985 206.495 439.249 205.937ZM437.582 202.026C436.572 202.026 435.867 202.766 435.791 203.888H439.279C439.255 202.766 438.586 202.026 437.582 202.026ZM441.927 207.575V201.245H442.89V202.244H442.984C443.301 201.545 443.917 201.134 444.886 201.134C446.307 201.134 447.1 201.973 447.1 203.477V207.575H446.09V203.723C446.09 202.584 445.608 202.044 444.598 202.044C443.588 202.044 442.937 202.719 442.937 203.829V207.575H441.927ZM449.372 199.607H450.382V201.245H451.791V202.091H450.382V205.673C450.382 206.418 450.664 206.735 451.321 206.735C451.503 206.735 451.603 206.729 451.791 206.712V207.563C451.591 207.598 451.397 207.622 451.198 207.622C449.894 207.622 449.372 207.14 449.372 205.931V202.091H448.35V201.245H449.372V199.607ZM457.134 199.607H458.144V201.245H459.553V202.091H458.144V205.673C458.144 206.418 458.426 206.735 459.083 206.735C459.265 206.735 459.365 206.729 459.553 206.712V207.563C459.353 207.598 459.16 207.622 458.96 207.622C457.657 207.622 457.134 207.14 457.134 205.931V202.091H456.112V201.245H457.134V199.607ZM463.587 207.687C461.784 207.687 460.669 206.442 460.669 204.41C460.669 202.373 461.784 201.134 463.587 201.134C465.389 201.134 466.505 202.373 466.505 204.41C466.505 206.442 465.389 207.687 463.587 207.687ZM463.587 206.776C464.785 206.776 465.46 205.907 465.46 204.41C465.46 202.907 464.785 202.044 463.587 202.044C462.389 202.044 461.714 202.907 461.714 204.41C461.714 205.907 462.389 206.776 463.587 206.776ZM471.484 207.575V201.245H472.447V202.244H472.541C472.829 201.539 473.463 201.134 474.308 201.134C475.166 201.134 475.765 201.586 476.058 202.244H476.152C476.493 201.574 477.215 201.134 478.09 201.134C479.381 201.134 480.104 201.874 480.104 203.201V207.575H479.094V203.435C479.094 202.502 478.653 202.044 477.761 202.044C476.88 202.044 476.293 202.702 476.293 203.506V207.575H475.283V203.277C475.283 202.525 474.761 202.044 473.962 202.044C473.134 202.044 472.494 202.76 472.494 203.653V207.575H471.484ZM483.709 207.687C482.482 207.687 481.572 206.958 481.572 205.802C481.572 204.669 482.405 204.017 483.879 203.929L485.705 203.817V203.242C485.705 202.461 485.218 202.032 484.272 202.032C483.515 202.032 482.987 202.32 482.846 202.819H481.824C481.959 201.803 482.957 201.134 484.308 201.134C485.852 201.134 486.715 201.926 486.715 203.242V207.575H485.752V206.641H485.658C485.247 207.317 484.554 207.687 483.709 207.687ZM483.897 206.8C484.936 206.8 485.705 206.119 485.705 205.215V204.633L484.002 204.745C483.039 204.809 482.617 205.144 482.617 205.778C482.617 206.424 483.163 206.8 483.897 206.8ZM489.745 204.011L492.493 201.245H493.732L491.007 203.958L493.914 207.575H492.628L490.256 204.61L489.651 205.173V207.575H488.641V198.732H489.651V204.011H489.745ZM499.01 205.937H500.02C499.726 207.017 498.74 207.687 497.354 207.687C495.599 207.687 494.501 206.418 494.501 204.416C494.501 202.426 495.616 201.134 497.354 201.134C499.063 201.134 500.102 202.349 500.102 204.316V204.704H495.552V204.751C495.605 206.001 496.303 206.794 497.378 206.794C498.194 206.794 498.746 206.495 499.01 205.937ZM497.343 202.026C496.333 202.026 495.628 202.766 495.552 203.888H499.04C499.016 202.766 498.347 202.026 497.343 202.026ZM509.274 205.937H510.284C509.99 207.017 509.004 207.687 507.618 207.687C505.862 207.687 504.764 206.418 504.764 204.416C504.764 202.426 505.88 201.134 507.618 201.134C509.327 201.134 510.366 202.349 510.366 204.316V204.704H505.815V204.751C505.868 206.001 506.567 206.794 507.641 206.794C508.458 206.794 509.009 206.495 509.274 205.937ZM507.606 202.026C506.596 202.026 505.892 202.766 505.815 203.888H509.303C509.28 202.766 508.61 202.026 507.606 202.026ZM513.713 207.687C512.485 207.687 511.575 206.958 511.575 205.802C511.575 204.669 512.409 204.017 513.883 203.929L515.709 203.817V203.242C515.709 202.461 515.222 202.032 514.276 202.032C513.519 202.032 512.99 202.32 512.849 202.819H511.828C511.963 201.803 512.961 201.134 514.312 201.134C515.856 201.134 516.719 201.926 516.719 203.242V207.575H515.756V206.641H515.662C515.251 207.317 514.558 207.687 513.713 207.687ZM513.901 206.8C514.94 206.8 515.709 206.119 515.709 205.215V204.633L514.006 204.745C513.043 204.809 512.62 205.144 512.62 205.778C512.62 206.424 513.167 206.8 513.901 206.8ZM523.823 203.183H522.802C522.637 202.555 522.08 202.044 521.17 202.044C520.03 202.044 519.314 202.954 519.314 204.387C519.314 205.849 520.042 206.776 521.17 206.776C522.021 206.776 522.614 206.383 522.802 205.667H523.823C523.641 206.829 522.696 207.687 521.175 207.687C519.402 207.687 518.269 206.401 518.269 204.387C518.269 202.414 519.396 201.134 521.17 201.134C522.708 201.134 523.647 202.056 523.823 203.183ZM525.374 207.575V198.732H526.383V202.244H526.477C526.794 201.545 527.458 201.134 528.427 201.134C529.766 201.134 530.611 201.991 530.611 203.477V207.575H529.601V203.723C529.601 202.602 529.096 202.044 528.139 202.044C527.006 202.044 526.383 202.76 526.383 203.829V207.575H525.374ZM538.931 201.134C540.546 201.134 541.591 202.42 541.591 204.41C541.591 206.389 540.54 207.687 538.931 207.687C538.027 207.687 537.299 207.293 536.952 206.624H536.858V209.689H535.848V201.245H536.811V202.302H536.905C537.31 201.574 538.068 201.134 538.931 201.134ZM538.69 206.776C539.853 206.776 540.546 205.89 540.546 204.41C540.546 202.931 539.853 202.044 538.696 202.044C537.551 202.044 536.829 202.954 536.829 204.41C536.829 205.86 537.551 206.776 538.69 206.776ZM543.176 207.575V201.245H544.139V202.185H544.233C544.421 201.568 545.149 201.134 545.989 201.134C546.153 201.134 546.364 201.146 546.494 201.163V202.173C546.411 202.15 546.047 202.114 545.848 202.114C544.885 202.114 544.186 202.76 544.186 203.653V207.575H543.176ZM550.181 207.687C548.378 207.687 547.263 206.442 547.263 204.41C547.263 202.373 548.378 201.134 550.181 201.134C551.984 201.134 553.099 202.373 553.099 204.41C553.099 206.442 551.984 207.687 550.181 207.687ZM550.181 206.776C551.379 206.776 552.054 205.907 552.054 204.41C552.054 202.907 551.379 202.044 550.181 202.044C548.983 202.044 548.308 202.907 548.308 204.41C548.308 205.907 548.983 206.776 550.181 206.776ZM555.225 200.024C554.837 200.024 554.52 199.707 554.52 199.32C554.52 198.932 554.837 198.615 555.225 198.615C555.612 198.615 555.929 198.932 555.929 199.32C555.929 199.707 555.612 200.024 555.225 200.024ZM555.718 201.245V207.886C555.718 209.19 555.107 209.747 553.78 209.747H553.604V208.884H553.757C554.473 208.884 554.708 208.602 554.708 207.904V201.245H555.718ZM561.836 205.937H562.846C562.552 207.017 561.566 207.687 560.18 207.687C558.425 207.687 557.327 206.418 557.327 204.416C557.327 202.426 558.442 201.134 560.18 201.134C561.889 201.134 562.928 202.349 562.928 204.316V204.704H558.378V204.751C558.431 206.001 559.129 206.794 560.204 206.794C561.02 206.794 561.572 206.495 561.836 205.937ZM560.169 202.026C559.159 202.026 558.454 202.766 558.378 203.888H561.865C561.842 202.766 561.173 202.026 560.169 202.026ZM569.751 203.183H568.729C568.565 202.555 568.007 202.044 567.097 202.044C565.958 202.044 565.242 202.954 565.242 204.387C565.242 205.849 565.97 206.776 567.097 206.776C567.948 206.776 568.541 206.383 568.729 205.667H569.751C569.569 206.829 568.624 207.687 567.103 207.687C565.33 207.687 564.196 206.401 564.196 204.387C564.196 202.414 565.324 201.134 567.097 201.134C568.635 201.134 569.575 202.056 569.751 203.183ZM571.783 199.607H572.792V201.245H574.202V202.091H572.792V205.673C572.792 206.418 573.074 206.735 573.732 206.735C573.914 206.735 574.014 206.729 574.202 206.712V207.563C574.002 207.598 573.808 207.622 573.609 207.622C572.305 207.622 571.783 207.14 571.783 205.931V202.091H570.761V201.245H571.783V199.607ZM580.884 207.687C579.656 207.687 578.746 206.958 578.746 205.802C578.746 204.669 579.58 204.017 581.054 203.929L582.88 203.817V203.242C582.88 202.461 582.393 202.032 581.447 202.032C580.69 202.032 580.161 202.32 580.02 202.819H578.999C579.134 201.803 580.132 201.134 581.482 201.134C583.027 201.134 583.89 201.926 583.89 203.242V207.575H582.927V206.641H582.833C582.422 207.317 581.729 207.687 580.884 207.687ZM581.071 206.8C582.111 206.8 582.88 206.119 582.88 205.215V204.633L581.177 204.745C580.214 204.809 579.791 205.144 579.791 205.778C579.791 206.424 580.337 206.8 581.071 206.8ZM589.209 207.575V198.732H590.219V207.575H589.209ZM592.709 200.024C592.321 200.024 592.004 199.707 592.004 199.32C592.004 198.932 592.321 198.615 592.709 198.615C593.096 198.615 593.413 198.932 593.413 199.32C593.413 199.707 593.096 200.024 592.709 200.024ZM592.204 207.575V201.245H593.214V207.575H592.204ZM595.14 207.575V201.245H596.103V202.244H596.197C596.514 201.545 597.13 201.134 598.099 201.134C599.52 201.134 600.313 201.973 600.313 203.477V207.575H599.303V203.723C599.303 202.584 598.821 202.044 597.811 202.044C596.801 202.044 596.15 202.719 596.15 203.829V207.575H595.14ZM603.325 204.011L606.073 201.245H607.312L604.587 203.958L607.494 207.575H606.208L603.836 204.61L603.231 205.173V207.575H602.221V198.732H603.231V204.011H603.325ZM277.287 225.687C276.06 225.687 275.15 224.958 275.15 223.802C275.15 222.669 275.984 222.017 277.458 221.929L279.284 221.817V221.242C279.284 220.461 278.796 220.032 277.851 220.032C277.094 220.032 276.565 220.32 276.424 220.819H275.403C275.538 219.803 276.536 219.134 277.886 219.134C279.431 219.134 280.294 219.926 280.294 221.242V225.575H279.331V224.641H279.237C278.826 225.317 278.133 225.687 277.287 225.687ZM277.475 224.8C278.515 224.8 279.284 224.119 279.284 223.215V222.633L277.581 222.745C276.618 222.809 276.195 223.144 276.195 223.778C276.195 224.424 276.741 224.8 277.475 224.8ZM282.161 225.575V219.245H283.124V220.244H283.218C283.535 219.545 284.151 219.134 285.12 219.134C286.541 219.134 287.334 219.973 287.334 221.477V225.575H286.324V221.723C286.324 220.584 285.842 220.044 284.832 220.044C283.823 220.044 283.171 220.719 283.171 221.829V225.575H282.161ZM291.526 225.687C289.906 225.687 288.866 224.401 288.866 222.41C288.866 220.426 289.917 219.134 291.526 219.134C292.407 219.134 293.152 219.551 293.511 220.244H293.599V216.732H294.609V225.575H293.646V224.565H293.552C293.152 225.27 292.401 225.687 291.526 225.687ZM291.761 220.044C290.61 220.044 289.911 220.936 289.911 222.41C289.911 223.89 290.604 224.776 291.761 224.776C292.912 224.776 293.622 223.872 293.622 222.41C293.622 220.96 292.906 220.044 291.761 220.044ZM305.201 221.183H304.179C304.015 220.555 303.457 220.044 302.547 220.044C301.408 220.044 300.692 220.954 300.692 222.387C300.692 223.849 301.42 224.776 302.547 224.776C303.398 224.776 303.991 224.383 304.179 223.667H305.201C305.019 224.829 304.074 225.687 302.553 225.687C300.78 225.687 299.646 224.401 299.646 222.387C299.646 220.414 300.774 219.134 302.547 219.134C304.085 219.134 305.025 220.056 305.201 221.183ZM306.692 225.575V219.245H307.655V220.185H307.749C307.937 219.568 308.665 219.134 309.505 219.134C309.669 219.134 309.881 219.146 310.01 219.163V220.173C309.928 220.15 309.564 220.114 309.364 220.114C308.401 220.114 307.702 220.76 307.702 221.653V225.575H306.692ZM315.288 223.937H316.298C316.005 225.017 315.018 225.687 313.633 225.687C311.877 225.687 310.779 224.418 310.779 222.416C310.779 220.426 311.895 219.134 313.633 219.134C315.341 219.134 316.38 220.349 316.38 222.316V222.704H311.83V222.751C311.883 224.001 312.582 224.794 313.656 224.794C314.472 224.794 315.024 224.495 315.288 223.937ZM313.621 220.026C312.611 220.026 311.906 220.766 311.83 221.888H315.318C315.294 220.766 314.625 220.026 313.621 220.026ZM319.727 225.687C318.5 225.687 317.59 224.958 317.59 223.802C317.59 222.669 318.424 222.017 319.898 221.929L321.724 221.817V221.242C321.724 220.461 321.236 220.032 320.291 220.032C319.534 220.032 319.005 220.32 318.864 220.819H317.842C317.978 219.803 318.976 219.134 320.326 219.134C321.87 219.134 322.734 219.926 322.734 221.242V225.575H321.771V224.641H321.677C321.266 225.317 320.573 225.687 319.727 225.687ZM319.915 224.8C320.954 224.8 321.724 224.119 321.724 223.215V222.633L320.021 222.745C319.058 222.809 318.635 223.144 318.635 223.778C318.635 224.424 319.181 224.8 319.915 224.8ZM325.023 217.607H326.033V219.245H327.443V220.091H326.033V223.673C326.033 224.418 326.315 224.735 326.973 224.735C327.155 224.735 327.255 224.729 327.443 224.712V225.563C327.243 225.598 327.049 225.622 326.849 225.622C325.546 225.622 325.023 225.14 325.023 223.931V220.091H324.002V219.245H325.023V217.607ZM333.068 223.937H334.077C333.784 225.017 332.797 225.687 331.412 225.687C329.656 225.687 328.558 224.418 328.558 222.416C328.558 220.426 329.674 219.134 331.412 219.134C333.12 219.134 334.16 220.349 334.16 222.316V222.704H329.609V222.751C329.662 224.001 330.361 224.794 331.435 224.794C332.251 224.794 332.803 224.495 333.068 223.937ZM331.4 220.026C330.39 220.026 329.685 220.766 329.609 221.888H333.097C333.073 220.766 332.404 220.026 331.4 220.026ZM339.561 217.607H340.571V219.245H341.981V220.091H340.571V223.673C340.571 224.418 340.853 224.735 341.511 224.735C341.693 224.735 341.793 224.729 341.981 224.712V225.563C341.781 225.598 341.587 225.622 341.388 225.622C340.084 225.622 339.561 225.14 339.561 223.931V220.091H338.54V219.245H339.561V217.607ZM343.566 225.575V216.732H344.576V220.244H344.67C344.987 219.545 345.65 219.134 346.619 219.134C347.958 219.134 348.803 219.991 348.803 221.477V225.575H347.793V221.723C347.793 220.602 347.288 220.044 346.331 220.044C345.198 220.044 344.576 220.76 344.576 221.829V225.575H343.566ZM354.839 223.937H355.849C355.556 225.017 354.569 225.687 353.184 225.687C351.428 225.687 350.33 224.418 350.33 222.416C350.33 220.426 351.446 219.134 353.184 219.134C354.892 219.134 355.931 220.349 355.931 222.316V222.704H351.381V222.751C351.434 224.001 352.133 224.794 353.207 224.794C354.023 224.794 354.575 224.495 354.839 223.937ZM353.172 220.026C352.162 220.026 351.457 220.766 351.381 221.888H354.869C354.845 220.766 354.176 220.026 353.172 220.026ZM360.911 225.575V219.245H361.873V220.244H361.967C362.284 219.545 362.901 219.134 363.87 219.134C365.291 219.134 366.083 219.973 366.083 221.477V225.575H365.073V221.723C365.073 220.584 364.592 220.044 363.582 220.044C362.572 220.044 361.92 220.719 361.92 221.829V225.575H360.911ZM372.125 223.937H373.135C372.842 225.017 371.855 225.687 370.469 225.687C368.714 225.687 367.616 224.418 367.616 222.416C367.616 220.426 368.731 219.134 370.469 219.134C372.178 219.134 373.217 220.349 373.217 222.316V222.704H368.667V222.751C368.72 224.001 369.418 224.794 370.493 224.794C371.309 224.794 371.861 224.495 372.125 223.937ZM370.458 220.026C369.448 220.026 368.743 220.766 368.667 221.888H372.155C372.131 220.766 371.462 220.026 370.458 220.026ZM380.04 221.183H379.019C378.854 220.555 378.296 220.044 377.386 220.044C376.247 220.044 375.531 220.954 375.531 222.387C375.531 223.849 376.259 224.776 377.386 224.776C378.238 224.776 378.831 224.383 379.019 223.667H380.04C379.858 224.829 378.913 225.687 377.392 225.687C375.619 225.687 374.486 224.401 374.486 222.387C374.486 220.414 375.613 219.134 377.386 219.134C378.925 219.134 379.864 220.056 380.04 221.183ZM385.724 223.937H386.734C386.44 225.017 385.454 225.687 384.068 225.687C382.312 225.687 381.214 224.418 381.214 222.416C381.214 220.426 382.33 219.134 384.068 219.134C385.777 219.134 386.816 220.349 386.816 222.316V222.704H382.265V222.751C382.318 224.001 383.017 224.794 384.092 224.794C384.908 224.794 385.46 224.495 385.724 223.937ZM384.056 220.026C383.046 220.026 382.342 220.766 382.265 221.888H385.753C385.73 220.766 385.06 220.026 384.056 220.026ZM388.255 220.978C388.255 219.926 389.27 219.134 390.615 219.134C391.942 219.134 392.864 219.791 392.999 220.831H392.001C391.866 220.326 391.372 219.991 390.609 219.991C389.857 219.991 389.27 220.373 389.27 220.936C389.27 221.371 389.623 221.641 390.368 221.823L391.343 222.058C392.535 222.346 393.11 222.862 393.11 223.772C393.11 224.906 392.012 225.687 390.574 225.687C389.165 225.687 388.196 225.011 388.084 223.96H389.123C389.294 224.495 389.799 224.835 390.609 224.835C391.46 224.835 392.071 224.43 392.071 223.849C392.071 223.414 391.742 223.121 391.067 222.956L389.981 222.692C388.795 222.404 388.255 221.893 388.255 220.978ZM394.431 220.978C394.431 219.926 395.447 219.134 396.792 219.134C398.119 219.134 399.041 219.791 399.176 220.831H398.177C398.042 220.326 397.549 219.991 396.786 219.991C396.034 219.991 395.447 220.373 395.447 220.936C395.447 221.371 395.799 221.641 396.545 221.823L397.52 222.058C398.712 222.346 399.287 222.862 399.287 223.772C399.287 224.906 398.189 225.687 396.751 225.687C395.342 225.687 394.373 225.011 394.261 223.96H395.3C395.471 224.495 395.976 224.835 396.786 224.835C397.637 224.835 398.248 224.43 398.248 223.849C398.248 223.414 397.919 223.121 397.244 222.956L396.158 222.692C394.972 222.404 394.431 221.893 394.431 220.978ZM402.634 225.687C401.407 225.687 400.497 224.958 400.497 223.802C400.497 222.669 401.331 222.017 402.804 221.929L404.63 221.817V221.242C404.63 220.461 404.143 220.032 403.198 220.032C402.44 220.032 401.912 220.32 401.771 220.819H400.749C400.884 219.803 401.882 219.134 403.233 219.134C404.777 219.134 405.64 219.926 405.64 221.242V225.575H404.677V224.641H404.583C404.172 225.317 403.48 225.687 402.634 225.687ZM402.822 224.8C403.861 224.8 404.63 224.119 404.63 223.215V222.633L402.928 222.745C401.965 222.809 401.542 223.144 401.542 223.778C401.542 224.424 402.088 224.8 402.822 224.8ZM407.507 225.575V219.245H408.47V220.185H408.564C408.752 219.568 409.48 219.134 410.32 219.134C410.484 219.134 410.696 219.146 410.825 219.163V220.173C410.743 220.15 410.379 220.114 410.179 220.114C409.216 220.114 408.517 220.76 408.517 221.653V225.575H407.507ZM412.627 227.865C412.492 227.865 412.316 227.853 412.175 227.83V226.967C412.299 226.99 412.457 226.996 412.598 226.996C413.179 226.996 413.496 226.72 413.761 225.957L413.878 225.581L411.535 219.245H412.627L414.365 224.453H414.459L416.191 219.245H417.266L414.794 225.962C414.254 227.43 413.749 227.865 412.627 227.865ZM425.093 219.134C426.707 219.134 427.753 220.42 427.753 222.41C427.753 224.389 426.702 225.687 425.093 225.687C424.189 225.687 423.461 225.293 423.114 224.624H423.02V227.689H422.01V219.245H422.973V220.302H423.067C423.472 219.574 424.23 219.134 425.093 219.134ZM424.852 224.776C426.015 224.776 426.707 223.89 426.707 222.41C426.707 220.931 426.015 220.044 424.858 220.044C423.713 220.044 422.991 220.954 422.991 222.41C422.991 223.86 423.713 224.776 424.852 224.776ZM431.099 225.687C429.872 225.687 428.962 224.958 428.962 223.802C428.962 222.669 429.796 222.017 431.27 221.929L433.096 221.817V221.242C433.096 220.461 432.608 220.032 431.663 220.032C430.906 220.032 430.377 220.32 430.236 220.819H429.215C429.35 219.803 430.348 219.134 431.698 219.134C433.243 219.134 434.106 219.926 434.106 221.242V225.575H433.143V224.641H433.049C432.638 225.317 431.945 225.687 431.099 225.687ZM431.287 224.8C432.327 224.8 433.096 224.119 433.096 223.215V222.633L431.393 222.745C430.43 222.809 430.007 223.144 430.007 223.778C430.007 224.424 430.553 224.8 431.287 224.8ZM438.58 228.006C437.053 228.006 436.079 227.319 435.926 226.274H436.995C437.106 226.79 437.67 227.125 438.58 227.125C439.713 227.125 440.388 226.567 440.388 225.634V224.389H440.294C439.895 225.088 439.179 225.481 438.31 225.481C436.672 225.481 435.656 224.213 435.656 222.316C435.656 220.42 436.683 219.134 438.31 219.134C439.196 219.134 439.977 219.568 440.341 220.249H440.435V219.245H441.398V225.687C441.398 227.102 440.306 228.006 438.58 228.006ZM438.533 224.589C439.707 224.589 440.412 223.696 440.412 222.316C440.412 220.936 439.701 220.044 438.533 220.044C437.359 220.044 436.701 220.936 436.701 222.316C436.701 223.696 437.359 224.589 438.533 224.589ZM447.493 223.937H448.503C448.209 225.017 447.223 225.687 445.837 225.687C444.082 225.687 442.984 224.418 442.984 222.416C442.984 220.426 444.099 219.134 445.837 219.134C447.546 219.134 448.585 220.349 448.585 222.316V222.704H444.035V222.751C444.087 224.001 444.786 224.794 445.861 224.794C446.677 224.794 447.229 224.495 447.493 223.937ZM445.825 220.026C444.815 220.026 444.111 220.766 444.035 221.888H447.522C447.499 220.766 446.829 220.026 445.825 220.026ZM450.024 220.978C450.024 219.926 451.039 219.134 452.384 219.134C453.711 219.134 454.633 219.791 454.768 220.831H453.77C453.635 220.326 453.141 219.991 452.378 219.991C451.626 219.991 451.039 220.373 451.039 220.936C451.039 221.371 451.392 221.641 452.137 221.823L453.112 222.058C454.304 222.346 454.879 222.862 454.879 223.772C454.879 224.906 453.781 225.687 452.343 225.687C450.934 225.687 449.965 225.011 449.853 223.96H450.893C451.063 224.495 451.568 224.835 452.378 224.835C453.229 224.835 453.84 224.43 453.84 223.849C453.84 223.414 453.511 223.121 452.836 222.956L451.75 222.692C450.564 222.404 450.024 221.893 450.024 220.978ZM460.281 225.575V220.091H459.23V219.245H460.281V218.541C460.281 217.278 460.915 216.674 462.119 216.674C462.366 216.674 462.589 216.691 462.8 216.732V217.554C462.677 217.531 462.507 217.525 462.325 217.525C461.596 217.525 461.291 217.877 461.291 218.57V219.245H462.741V220.091H461.291V225.575H460.281ZM466.546 225.687C464.744 225.687 463.628 224.442 463.628 222.41C463.628 220.373 464.744 219.134 466.546 219.134C468.349 219.134 469.464 220.373 469.464 222.41C469.464 224.442 468.349 225.687 466.546 225.687ZM466.546 224.776C467.744 224.776 468.419 223.907 468.419 222.41C468.419 220.907 467.744 220.044 466.546 220.044C465.348 220.044 464.673 220.907 464.673 222.41C464.673 223.907 465.348 224.776 466.546 224.776ZM471.05 225.575V219.245H472.013V220.185H472.107C472.294 219.568 473.023 219.134 473.862 219.134C474.027 219.134 474.238 219.146 474.367 219.163V220.173C474.285 220.15 473.921 220.114 473.721 220.114C472.758 220.114 472.06 220.76 472.06 221.653V225.575H471.05ZM483.216 223.937H484.226C483.932 225.017 482.946 225.687 481.56 225.687C479.804 225.687 478.706 224.418 478.706 222.416C478.706 220.426 479.822 219.134 481.56 219.134C483.268 219.134 484.308 220.349 484.308 222.316V222.704H479.757V222.751C479.81 224.001 480.509 224.794 481.583 224.794C482.399 224.794 482.951 224.495 483.216 223.937ZM481.548 220.026C480.538 220.026 479.834 220.766 479.757 221.888H483.245C483.221 220.766 482.552 220.026 481.548 220.026ZM487.655 225.687C486.427 225.687 485.517 224.958 485.517 223.802C485.517 222.669 486.351 222.017 487.825 221.929L489.651 221.817V221.242C489.651 220.461 489.164 220.032 488.218 220.032C487.461 220.032 486.932 220.32 486.791 220.819H485.77C485.905 219.803 486.903 219.134 488.253 219.134C489.798 219.134 490.661 219.926 490.661 221.242V225.575H489.698V224.641H489.604C489.193 225.317 488.5 225.687 487.655 225.687ZM487.842 224.8C488.882 224.8 489.651 224.119 489.651 223.215V222.633L487.948 222.745C486.985 222.809 486.562 223.144 486.562 223.778C486.562 224.424 487.108 224.8 487.842 224.8ZM497.765 221.183H496.744C496.579 220.555 496.022 220.044 495.111 220.044C493.972 220.044 493.256 220.954 493.256 222.387C493.256 223.849 493.984 224.776 495.111 224.776C495.963 224.776 496.556 224.383 496.744 223.667H497.765C497.583 224.829 496.638 225.687 495.117 225.687C493.344 225.687 492.211 224.401 492.211 222.387C492.211 220.414 493.338 219.134 495.111 219.134C496.65 219.134 497.589 220.056 497.765 221.183ZM499.315 225.575V216.732H500.325V220.244H500.419C500.736 219.545 501.4 219.134 502.369 219.134C503.707 219.134 504.553 219.991 504.553 221.477V225.575H503.543V221.723C503.543 220.602 503.038 220.044 502.081 220.044C500.948 220.044 500.325 220.76 500.325 221.829V225.575H499.315ZM512.873 219.134C514.488 219.134 515.533 220.42 515.533 222.41C515.533 224.389 514.482 225.687 512.873 225.687C511.969 225.687 511.241 225.293 510.894 224.624H510.8V227.689H509.79V219.245H510.753V220.302H510.847C511.252 219.574 512.01 219.134 512.873 219.134ZM512.632 224.776C513.795 224.776 514.488 223.89 514.488 222.41C514.488 220.931 513.795 220.044 512.638 220.044C511.493 220.044 510.771 220.954 510.771 222.41C510.771 223.86 511.493 224.776 512.632 224.776ZM517.118 225.575V219.245H518.081V220.185H518.175C518.363 219.568 519.091 219.134 519.931 219.134C520.095 219.134 520.306 219.146 520.436 219.163V220.173C520.353 220.15 519.989 220.114 519.79 220.114C518.827 220.114 518.128 220.76 518.128 221.653V225.575H517.118ZM524.123 225.687C522.32 225.687 521.205 224.442 521.205 222.41C521.205 220.373 522.32 219.134 524.123 219.134C525.926 219.134 527.041 220.373 527.041 222.41C527.041 224.442 525.926 225.687 524.123 225.687ZM524.123 224.776C525.321 224.776 525.996 223.907 525.996 222.41C525.996 220.907 525.321 220.044 524.123 220.044C522.925 220.044 522.25 220.907 522.25 222.41C522.25 223.907 522.925 224.776 524.123 224.776ZM529.167 218.024C528.779 218.024 528.462 217.707 528.462 217.32C528.462 216.932 528.779 216.615 529.167 216.615C529.554 216.615 529.871 216.932 529.871 217.32C529.871 217.707 529.554 218.024 529.167 218.024ZM529.66 219.245V225.886C529.66 227.19 529.049 227.747 527.722 227.747H527.546V226.884H527.699C528.415 226.884 528.65 226.602 528.65 225.904V219.245H529.66ZM535.778 223.937H536.788C536.494 225.017 535.508 225.687 534.122 225.687C532.367 225.687 531.269 224.418 531.269 222.416C531.269 220.426 532.384 219.134 534.122 219.134C535.831 219.134 536.87 220.349 536.87 222.316V222.704H532.32V222.751C532.372 224.001 533.071 224.794 534.146 224.794C534.962 224.794 535.514 224.495 535.778 223.937ZM534.11 220.026C533.101 220.026 532.396 220.766 532.32 221.888H535.807C535.784 220.766 535.115 220.026 534.11 220.026ZM543.693 221.183H542.671C542.507 220.555 541.949 220.044 541.039 220.044C539.9 220.044 539.184 220.954 539.184 222.387C539.184 223.849 539.912 224.776 541.039 224.776C541.89 224.776 542.483 224.383 542.671 223.667H543.693C543.511 224.829 542.566 225.687 541.045 225.687C539.272 225.687 538.138 224.401 538.138 222.387C538.138 220.414 539.266 219.134 541.039 219.134C542.577 219.134 543.517 220.056 543.693 221.183ZM545.724 217.607H546.734V219.245H548.144V220.091H546.734V223.673C546.734 224.418 547.016 224.735 547.674 224.735C547.856 224.735 547.956 224.729 548.144 224.712V225.563C547.944 225.598 547.75 225.622 547.551 225.622C546.247 225.622 545.724 225.14 545.724 223.931V220.091H544.703V219.245H545.724V217.607ZM550.504 225.634C550.087 225.634 549.741 225.287 549.741 224.87C549.741 224.448 550.087 224.107 550.504 224.107C550.927 224.107 551.267 224.448 551.267 224.87C551.267 225.287 550.927 225.634 550.504 225.634Z" fill="var(--vscode-editor-foreground, #CCCCCC)" />
+                  </g>
+                </g>
+                <g>
+                  <rect x="275.037" y="238.437" width="112.525" height="17.925" rx="3.2375" stroke="var(--vscode-activityBar-activeBorder, #FFFFFF)" stroke-opacity="0.12" stroke-width="0.925" />
+                  <g>
+                    <path d="M281.457 251.505L281.919 249.193H280.476V247.972H282.215L282.493 246.529H280.994V245.326H282.789L283.251 243.069H284.861L284.398 245.326H286.026L286.489 243.069H288.098L287.636 245.326H289.079V246.529H287.414L287.062 247.972H288.561V249.193H286.84L286.378 251.505H284.75L285.212 249.193H283.603L283.14 251.505H281.457ZM285.453 247.99L285.73 246.529H284.121L283.825 247.99H285.453Z" fill="#519ABA" />
+                    <path d="M299.263 245.45C300.629 245.45 301.514 246.538 301.514 248.222C301.514 249.896 300.625 250.994 299.263 250.994C298.498 250.994 297.882 250.661 297.589 250.095H297.509V252.688H296.655V245.544H297.47V246.438H297.549C297.892 245.822 298.533 245.45 299.263 245.45ZM299.06 250.224C300.043 250.224 300.629 249.474 300.629 248.222C300.629 246.97 300.043 246.22 299.064 246.22C298.096 246.22 297.485 246.99 297.485 248.222C297.485 249.449 298.096 250.224 299.06 250.224ZM302.855 250.9V245.544H303.67V246.339H303.75C303.909 245.817 304.525 245.45 305.235 245.45C305.374 245.45 305.553 245.46 305.662 245.475V246.329C305.593 246.309 305.285 246.279 305.116 246.279C304.301 246.279 303.71 246.826 303.71 247.581V250.9H302.855ZM308.782 250.994C307.257 250.994 306.313 249.941 306.313 248.222C306.313 246.498 307.257 245.45 308.782 245.45C310.308 245.45 311.252 246.498 311.252 248.222C311.252 249.941 310.308 250.994 308.782 250.994ZM308.782 250.224C309.796 250.224 310.367 249.489 310.367 248.222C310.367 246.95 309.796 246.22 308.782 246.22C307.769 246.22 307.198 246.95 307.198 248.222C307.198 249.489 307.769 250.224 308.782 250.224ZM313.05 244.511C312.722 244.511 312.454 244.242 312.454 243.915C312.454 243.587 312.722 243.318 313.05 243.318C313.378 243.318 313.646 243.587 313.646 243.915C313.646 244.242 313.378 244.511 313.05 244.511ZM313.467 245.544V251.163C313.467 252.266 312.951 252.738 311.828 252.738H311.679V252.008H311.808C312.414 252.008 312.613 251.769 312.613 251.178V245.544H313.467ZM318.644 249.514H319.499C319.251 250.428 318.416 250.994 317.243 250.994C315.758 250.994 314.829 249.921 314.829 248.227C314.829 246.543 315.773 245.45 317.243 245.45C318.689 245.45 319.568 246.478 319.568 248.143V248.47H315.718V248.51C315.763 249.568 316.354 250.239 317.263 250.239C317.954 250.239 318.421 249.986 318.644 249.514ZM317.233 246.205C316.379 246.205 315.783 246.831 315.718 247.78H318.669C318.649 246.831 318.083 246.205 317.233 246.205ZM325.342 247.184H324.477C324.338 246.652 323.866 246.22 323.096 246.22C322.132 246.22 321.526 246.99 321.526 248.202C321.526 249.439 322.142 250.224 323.096 250.224C323.816 250.224 324.318 249.891 324.477 249.285H325.342C325.188 250.269 324.388 250.994 323.101 250.994C321.601 250.994 320.642 249.906 320.642 248.202C320.642 246.533 321.596 245.45 323.096 245.45C324.398 245.45 325.193 246.23 325.342 247.184ZM327.061 244.158H327.915V245.544H329.108V246.26H327.915V249.29C327.915 249.921 328.154 250.189 328.71 250.189C328.864 250.189 328.949 250.184 329.108 250.17V250.89C328.939 250.92 328.775 250.94 328.606 250.94C327.503 250.94 327.061 250.532 327.061 249.509V246.26H326.196V245.544H327.061V244.158ZM331.105 250.95C330.752 250.95 330.459 250.656 330.459 250.304C330.459 249.946 330.752 249.658 331.105 249.658C331.463 249.658 331.751 249.946 331.751 250.304C331.751 250.656 331.463 250.95 331.105 250.95ZM333.579 244.158H334.434V245.544H335.626V246.26H334.434V249.29C334.434 249.921 334.672 250.189 335.228 250.189C335.382 250.189 335.467 250.184 335.626 250.17V250.89C335.457 250.92 335.293 250.94 335.124 250.94C334.021 250.94 333.579 250.532 333.579 249.509V246.26H332.715V245.544H333.579V244.158ZM336.694 247.01C336.694 246.12 337.554 245.45 338.691 245.45C339.814 245.45 340.594 246.006 340.708 246.886H339.864C339.75 246.458 339.332 246.175 338.686 246.175C338.05 246.175 337.554 246.498 337.554 246.975C337.554 247.343 337.852 247.571 338.483 247.725L339.307 247.924C340.316 248.167 340.803 248.605 340.803 249.375C340.803 250.334 339.874 250.994 338.657 250.994C337.464 250.994 336.644 250.423 336.55 249.534H337.429C337.573 249.986 338.001 250.274 338.686 250.274C339.407 250.274 339.923 249.931 339.923 249.439C339.923 249.072 339.645 248.823 339.074 248.684L338.155 248.46C337.151 248.217 336.694 247.785 336.694 247.01ZM343.938 248.893H343.858L342.586 250.915H341.618L343.451 248.237L341.598 245.559H342.616L343.888 247.551H343.968L345.225 245.559H346.193L344.375 248.202L346.218 250.915H345.205L343.938 248.893Z" fill="var(--vscode-editor-foreground, #CCCCCC)" />
+                  </g>
+                  <g>
+                    <path d="M352.653 247.916V249.632H351.995V247.916H350.361V247.258H351.995V245.542H352.653V247.258H354.287V247.916H352.653ZM355.922 249.9L358.556 244.746V244.689H355.418V244.034H359.3V244.713L356.69 249.9H355.922ZM362.295 250.038C361.186 250.038 360.389 249.355 360.324 248.351H361.043C361.108 248.977 361.613 249.396 362.304 249.396C363.072 249.396 363.58 248.843 363.58 248.022C363.58 247.229 363.072 246.697 362.332 246.697C361.775 246.697 361.336 246.953 361.104 247.388H360.417L360.755 244.034H364.011V244.689H361.328L361.145 246.599H361.21C361.495 246.246 361.93 246.067 362.515 246.067C363.499 246.067 364.312 246.839 364.312 248.002C364.312 249.209 363.495 250.038 362.295 250.038Z" fill="#2EA043" />
+                    <path d="M370.772 247.872H368.105V247.209H370.772V247.872ZM374.007 250.038C372.898 250.038 372.101 249.355 372.036 248.351H372.755C372.82 248.977 373.324 249.396 374.015 249.396C374.784 249.396 375.292 248.843 375.292 248.022C375.292 247.229 374.784 246.697 374.044 246.697C373.487 246.697 373.048 246.953 372.816 247.388H372.129L372.467 244.034H375.723V244.689H373.04L372.857 246.599H372.922C373.207 246.246 373.642 246.067 374.227 246.067C375.211 246.067 376.024 246.839 376.024 248.002C376.024 249.209 375.207 250.038 374.007 250.038ZM378.442 247.197V246.571H379.137C379.812 246.571 380.292 246.14 380.292 245.53C380.292 244.981 379.873 244.534 379.166 244.534C378.458 244.534 377.999 244.896 377.938 245.555H377.227C377.3 244.599 378.028 243.896 379.215 243.896C380.373 243.896 381.04 244.628 381.036 245.449C381.032 246.156 380.593 246.624 379.991 246.798V246.864C380.751 246.985 381.255 247.502 381.255 248.319C381.255 249.302 380.357 250.038 379.19 250.038C377.999 250.038 377.178 249.384 377.125 248.388H377.832C377.898 249.006 378.426 249.4 379.182 249.4C379.954 249.4 380.503 248.957 380.503 248.298C380.503 247.62 379.995 247.197 379.17 247.197H378.442Z" fill="#F85149" />
+                  </g>
+                </g>
+              </g>
+              <g>
+                <g>
+                  <path d="M276.149 269.382H278.697V270.181H277.135V279.229H278.697V280.028H276.149V269.382ZM279.971 273.628C279.971 272.577 280.987 271.784 282.331 271.784C283.658 271.784 284.58 272.441 284.715 273.481H283.717C283.582 272.976 283.089 272.641 282.325 272.641C281.574 272.641 280.987 273.023 280.987 273.586C280.987 274.021 281.339 274.291 282.085 274.473L283.059 274.708C284.251 274.996 284.827 275.512 284.827 276.422C284.827 277.556 283.729 278.337 282.29 278.337C280.881 278.337 279.912 277.661 279.801 276.61H280.84C281.01 277.145 281.515 277.485 282.325 277.485C283.177 277.485 283.788 277.08 283.788 276.499C283.788 276.064 283.459 275.771 282.783 275.606L281.697 275.342C280.511 275.054 279.971 274.543 279.971 273.628ZM286.471 278.225V269.382H287.481V278.225H286.471ZM294.562 271.895V278.225H293.599V277.233H293.505C293.188 277.937 292.513 278.337 291.544 278.337C290.123 278.337 289.383 277.491 289.383 275.994V271.895H290.393V275.747C290.393 276.886 290.816 277.415 291.826 277.415C292.941 277.415 293.552 276.751 293.552 275.641V271.895H294.562ZM299.071 280.656C297.545 280.656 296.57 279.969 296.417 278.924H297.486C297.597 279.44 298.161 279.775 299.071 279.775C300.204 279.775 300.88 279.217 300.88 278.284V277.039H300.786C300.386 277.738 299.67 278.131 298.801 278.131C297.163 278.131 296.147 276.863 296.147 274.966C296.147 273.07 297.175 271.784 298.801 271.784C299.688 271.784 300.469 272.218 300.833 272.899H300.927V271.895H301.89V278.337C301.89 279.752 300.797 280.656 299.071 280.656ZM299.024 277.239C300.199 277.239 300.903 276.346 300.903 274.966C300.903 273.586 300.193 272.694 299.024 272.694C297.85 272.694 297.192 273.586 297.192 274.966C297.192 276.346 297.85 277.239 299.024 277.239ZM305.859 280.028H303.311V279.229H304.872V270.181H303.311V269.382H305.859V280.028ZM309.217 278.284C308.8 278.284 308.454 277.937 308.454 277.52C308.454 277.098 308.8 276.757 309.217 276.757C309.64 276.757 309.981 277.098 309.981 277.52C309.981 277.937 309.64 278.284 309.217 278.284ZM312.141 270.257H313.151V271.895H314.56V272.741H313.151V276.323C313.151 277.068 313.433 277.385 314.091 277.385C314.273 277.385 314.373 277.379 314.56 277.362V278.213C314.361 278.248 314.167 278.272 313.967 278.272C312.664 278.272 312.141 277.79 312.141 276.581V272.741H311.12V271.895H312.141V270.257ZM315.823 273.628C315.823 272.577 316.839 271.784 318.183 271.784C319.51 271.784 320.432 272.441 320.567 273.481H319.569C319.434 272.976 318.941 272.641 318.177 272.641C317.426 272.641 316.839 273.023 316.839 273.586C316.839 274.021 317.191 274.291 317.937 274.473L318.911 274.708C320.103 274.996 320.679 275.512 320.679 276.422C320.679 277.556 319.581 278.337 318.142 278.337C316.733 278.337 315.764 277.661 315.653 276.61H316.692C316.862 277.145 317.367 277.485 318.177 277.485C319.029 277.485 319.639 277.08 319.639 276.499C319.639 276.064 319.311 275.771 318.635 275.606L317.549 275.342C316.363 275.054 315.823 274.543 315.823 273.628ZM324.384 275.853H324.29L322.787 278.243H321.642L323.808 275.078L321.618 271.913H322.822L324.325 274.268H324.419L325.904 271.913H327.049L324.9 275.037L327.079 278.243H325.881L324.384 275.853Z" fill="var(--vscode-activityBarBadge-background, #40A6FF)" />
+                  <g>
+                    <path d="M279.067 304.325C276.765 304.325 275.326 302.622 275.326 299.892C275.326 297.155 276.759 295.453 279.061 295.453C280.846 295.453 282.237 296.574 282.49 298.206H281.415C281.133 297.114 280.229 296.427 279.061 296.427C277.434 296.427 276.413 297.766 276.413 299.892C276.413 302.017 277.434 303.35 279.067 303.35C280.247 303.35 281.145 302.745 281.415 301.765H282.49C282.208 303.321 280.869 304.325 279.067 304.325ZM284.134 304.125V297.795H285.097V298.735H285.191C285.379 298.118 286.107 297.684 286.946 297.684C287.111 297.684 287.322 297.696 287.451 297.713V298.723C287.369 298.7 287.005 298.664 286.805 298.664C285.842 298.664 285.144 299.31 285.144 300.203V304.125H284.134ZM292.73 302.487H293.74C293.446 303.567 292.46 304.237 291.074 304.237C289.318 304.237 288.22 302.968 288.22 300.966C288.22 298.976 289.336 297.684 291.074 297.684C292.783 297.684 293.822 298.899 293.822 300.866V301.254H289.271V301.301C289.324 302.551 290.023 303.344 291.097 303.344C291.914 303.344 292.466 303.045 292.73 302.487ZM291.062 298.576C290.052 298.576 289.348 299.316 289.271 300.438H292.759C292.736 299.316 292.066 298.576 291.062 298.576ZM297.169 304.237C295.941 304.237 295.031 303.508 295.031 302.352C295.031 301.219 295.865 300.567 297.339 300.479L299.165 300.367V299.792C299.165 299.011 298.678 298.582 297.732 298.582C296.975 298.582 296.446 298.87 296.306 299.369H295.284C295.419 298.353 296.417 297.684 297.768 297.684C299.312 297.684 300.175 298.477 300.175 299.792V304.125H299.212V303.191H299.118C298.707 303.867 298.014 304.237 297.169 304.237ZM297.357 303.35C298.396 303.35 299.165 302.669 299.165 301.765V301.183L297.462 301.295C296.499 301.359 296.077 301.694 296.077 302.328C296.077 302.974 296.623 303.35 297.357 303.35ZM302.465 296.157H303.475V297.795H304.884V298.641H303.475V302.223C303.475 302.968 303.757 303.285 304.414 303.285C304.596 303.285 304.696 303.279 304.884 303.262V304.113C304.684 304.148 304.491 304.172 304.291 304.172C302.987 304.172 302.465 303.691 302.465 302.481V298.641H301.443V297.795H302.465V296.157ZM310.509 302.487H311.519C311.225 303.567 310.239 304.237 308.853 304.237C307.097 304.237 306 302.968 306 300.966C306 298.976 307.115 297.684 308.853 297.684C310.562 297.684 311.601 298.899 311.601 300.866V301.254H307.051V301.301C307.103 302.551 307.802 303.344 308.877 303.344C309.693 303.344 310.245 303.045 310.509 302.487ZM308.841 298.576C307.831 298.576 307.127 299.316 307.051 300.438H310.538C310.515 299.316 309.845 298.576 308.841 298.576ZM318.342 304.237C317.114 304.237 316.204 303.508 316.204 302.352C316.204 301.219 317.038 300.567 318.512 300.479L320.338 300.367V299.792C320.338 299.011 319.851 298.582 318.905 298.582C318.148 298.582 317.619 298.87 317.478 299.369H316.457C316.592 298.353 317.59 297.684 318.94 297.684C320.485 297.684 321.348 298.477 321.348 299.792V304.125H320.385V303.191H320.291C319.88 303.867 319.187 304.237 318.342 304.237ZM318.529 303.35C319.569 303.35 320.338 302.669 320.338 301.765V301.183L318.635 301.295C317.672 301.359 317.249 301.694 317.249 302.328C317.249 302.974 317.796 303.35 318.529 303.35ZM328.952 304.237C327.331 304.237 326.292 302.951 326.292 300.96C326.292 298.976 327.343 297.684 328.952 297.684C329.832 297.684 330.578 298.101 330.936 298.794H331.024V295.282H332.034V304.125H331.071V303.115H330.977C330.578 303.82 329.826 304.237 328.952 304.237ZM329.186 298.594C328.036 298.594 327.337 299.486 327.337 300.96C327.337 302.44 328.03 303.326 329.186 303.326C330.337 303.326 331.048 302.422 331.048 300.96C331.048 299.51 330.331 298.594 329.186 298.594ZM334.535 306.415C334.4 306.415 334.224 306.403 334.083 306.38V305.517C334.207 305.54 334.365 305.546 334.506 305.546C335.087 305.546 335.404 305.27 335.669 304.507L335.786 304.131L333.443 297.795H334.535L336.273 303.004H336.367L338.099 297.795H339.174L336.702 304.513C336.162 305.98 335.657 306.415 334.535 306.415ZM340.524 304.125V297.795H341.487V298.794H341.581C341.898 298.095 342.515 297.684 343.484 297.684C344.905 297.684 345.697 298.524 345.697 300.027V304.125H344.687V300.273C344.687 299.134 344.206 298.594 343.196 298.594C342.186 298.594 341.534 299.269 341.534 300.379V304.125H340.524ZM349.308 304.237C348.081 304.237 347.171 303.508 347.171 302.352C347.171 301.219 348.005 300.567 349.479 300.479L351.305 300.367V299.792C351.305 299.011 350.817 298.582 349.872 298.582C349.115 298.582 348.586 298.87 348.445 299.369H347.424C347.559 298.353 348.557 297.684 349.907 297.684C351.451 297.684 352.315 298.477 352.315 299.792V304.125H351.352V303.191H351.258C350.847 303.867 350.154 304.237 349.308 304.237ZM349.496 303.35C350.535 303.35 351.305 302.669 351.305 301.765V301.183L349.602 301.295C348.639 301.359 348.216 301.694 348.216 302.328C348.216 302.974 348.762 303.35 349.496 303.35ZM354.182 304.125V297.795H355.145V298.794H355.239C355.526 298.089 356.16 297.684 357.006 297.684C357.863 297.684 358.462 298.136 358.756 298.794H358.85C359.19 298.124 359.912 297.684 360.787 297.684C362.079 297.684 362.801 298.424 362.801 299.751V304.125H361.791V299.986C361.791 299.052 361.351 298.594 360.458 298.594C359.578 298.594 358.991 299.252 358.991 300.056V304.125H357.981V299.827C357.981 299.075 357.458 298.594 356.66 298.594C355.832 298.594 355.192 299.31 355.192 300.203V304.125H354.182ZM365.173 296.574C364.786 296.574 364.469 296.257 364.469 295.87C364.469 295.482 364.786 295.165 365.173 295.165C365.561 295.165 365.878 295.482 365.878 295.87C365.878 296.257 365.561 296.574 365.173 296.574ZM364.668 304.125V297.795H365.678V304.125H364.668ZM372.842 299.733H371.82C371.656 299.105 371.098 298.594 370.188 298.594C369.049 298.594 368.332 299.504 368.332 300.937C368.332 302.399 369.06 303.326 370.188 303.326C371.039 303.326 371.632 302.933 371.82 302.217H372.842C372.66 303.379 371.714 304.237 370.194 304.237C368.42 304.237 367.287 302.951 367.287 300.937C367.287 298.964 368.414 297.684 370.188 297.684C371.726 297.684 372.665 298.606 372.842 299.733ZM377.727 304.125V297.795H378.69V298.735H378.784C378.972 298.118 379.7 297.684 380.539 297.684C380.704 297.684 380.915 297.696 381.044 297.713V298.723C380.962 298.7 380.598 298.664 380.398 298.664C379.435 298.664 378.737 299.31 378.737 300.203V304.125H377.727ZM384.732 304.237C382.929 304.237 381.813 302.992 381.813 300.96C381.813 298.923 382.929 297.684 384.732 297.684C386.534 297.684 387.65 298.923 387.65 300.96C387.65 302.992 386.534 304.237 384.732 304.237ZM384.732 303.326C385.929 303.326 386.605 302.457 386.605 300.96C386.605 299.457 385.929 298.594 384.732 298.594C383.534 298.594 382.859 299.457 382.859 300.96C382.859 302.457 383.534 303.326 384.732 303.326ZM394.355 297.795V304.125H393.392V303.133H393.298C392.981 303.837 392.306 304.237 391.337 304.237C389.916 304.237 389.176 303.391 389.176 301.894V297.795H390.186V301.647C390.186 302.786 390.609 303.315 391.619 303.315C392.735 303.315 393.345 302.651 393.345 301.542V297.795H394.355ZM396.68 296.157H397.69V297.795H399.099V298.641H397.69V302.223C397.69 302.968 397.972 303.285 398.63 303.285C398.812 303.285 398.911 303.279 399.099 303.262V304.113C398.9 304.148 398.706 304.172 398.506 304.172C397.203 304.172 396.68 303.691 396.68 302.481V298.641H395.659V297.795H396.68V296.157ZM404.724 302.487H405.734C405.441 303.567 404.454 304.237 403.069 304.237C401.313 304.237 400.215 302.968 400.215 300.966C400.215 298.976 401.331 297.684 403.069 297.684C404.777 297.684 405.816 298.899 405.816 300.866V301.254H401.266V301.301C401.319 302.551 402.017 303.344 403.092 303.344C403.908 303.344 404.46 303.045 404.724 302.487ZM403.057 298.576C402.047 298.576 401.342 299.316 401.266 300.438H404.754C404.73 299.316 404.061 298.576 403.057 298.576ZM411.218 304.125V298.641H410.167V297.795H411.218V297.091C411.218 295.828 411.852 295.224 413.056 295.224C413.303 295.224 413.526 295.241 413.737 295.282V296.104C413.614 296.081 413.444 296.075 413.262 296.075C412.533 296.075 412.228 296.427 412.228 297.12V297.795H413.678V298.641H412.228V304.125H411.218ZM417.483 304.237C415.681 304.237 414.565 302.992 414.565 300.96C414.565 298.923 415.681 297.684 417.483 297.684C419.286 297.684 420.401 298.923 420.401 300.96C420.401 302.992 419.286 304.237 417.483 304.237ZM417.483 303.326C418.681 303.326 419.356 302.457 419.356 300.96C419.356 299.457 418.681 298.594 417.483 298.594C416.285 298.594 415.61 299.457 415.61 300.96C415.61 302.457 416.285 303.326 417.483 303.326ZM421.987 304.125V297.795H422.95V298.735H423.044C423.232 298.118 423.96 297.684 424.799 297.684C424.964 297.684 425.175 297.696 425.304 297.713V298.723C425.222 298.7 424.858 298.664 424.658 298.664C423.695 298.664 422.997 299.31 422.997 300.203V304.125H421.987ZM434.153 302.487H435.163C434.869 303.567 433.883 304.237 432.497 304.237C430.741 304.237 429.643 302.968 429.643 300.966C429.643 298.976 430.759 297.684 432.497 297.684C434.206 297.684 435.245 298.899 435.245 300.866V301.254H430.694V301.301C430.747 302.551 431.446 303.344 432.52 303.344C433.337 303.344 433.888 303.045 434.153 302.487ZM432.485 298.576C431.475 298.576 430.771 299.316 430.694 300.438H434.182C434.159 299.316 433.489 298.576 432.485 298.576ZM438.592 304.237C437.364 304.237 436.454 303.508 436.454 302.352C436.454 301.219 437.288 300.567 438.762 300.479L440.588 300.367V299.792C440.588 299.011 440.101 298.582 439.155 298.582C438.398 298.582 437.869 298.87 437.728 299.369H436.707C436.842 298.353 437.84 297.684 439.19 297.684C440.735 297.684 441.598 298.477 441.598 299.792V304.125H440.635V303.191H440.541C440.13 303.867 439.437 304.237 438.592 304.237ZM438.779 303.35C439.819 303.35 440.588 302.669 440.588 301.765V301.183L438.885 301.295C437.922 301.359 437.499 301.694 437.499 302.328C437.499 302.974 438.046 303.35 438.779 303.35ZM448.702 299.733H447.681C447.516 299.105 446.959 298.594 446.048 298.594C444.909 298.594 444.193 299.504 444.193 300.937C444.193 302.399 444.921 303.326 446.048 303.326C446.9 303.326 447.493 302.933 447.681 302.217H448.702C448.52 303.379 447.575 304.237 446.054 304.237C444.281 304.237 443.148 302.951 443.148 300.937C443.148 298.964 444.275 297.684 446.048 297.684C447.587 297.684 448.526 298.606 448.702 299.733ZM450.253 304.125V295.282H451.262V298.794H451.356C451.673 298.095 452.337 297.684 453.306 297.684C454.644 297.684 455.49 298.541 455.49 300.027V304.125H454.48V300.273C454.48 299.152 453.975 298.594 453.018 298.594C451.885 298.594 451.262 299.31 451.262 300.379V304.125H450.253ZM463.81 297.684C465.425 297.684 466.47 298.97 466.47 300.96C466.47 302.939 465.419 304.237 463.81 304.237C462.906 304.237 462.178 303.843 461.831 303.174H461.737V306.239H460.727V297.795H461.69V298.852H461.784C462.189 298.124 462.947 297.684 463.81 297.684ZM463.569 303.326C464.732 303.326 465.425 302.44 465.425 300.96C465.425 299.481 464.732 298.594 463.575 298.594C462.43 298.594 461.708 299.504 461.708 300.96C461.708 302.41 462.43 303.326 463.569 303.326ZM468.055 304.125V297.795H469.018V298.735H469.112C469.3 298.118 470.028 297.684 470.868 297.684C471.032 297.684 471.243 297.696 471.373 297.713V298.723C471.29 298.7 470.926 298.664 470.727 298.664C469.764 298.664 469.065 299.31 469.065 300.203V304.125H468.055ZM475.06 304.237C473.257 304.237 472.142 302.992 472.142 300.96C472.142 298.923 473.257 297.684 475.06 297.684C476.863 297.684 477.978 298.923 477.978 300.96C477.978 302.992 476.863 304.237 475.06 304.237ZM475.06 303.326C476.258 303.326 476.933 302.457 476.933 300.96C476.933 299.457 476.258 298.594 475.06 298.594C473.862 298.594 473.187 299.457 473.187 300.96C473.187 302.457 473.862 303.326 475.06 303.326ZM480.104 296.574C479.716 296.574 479.399 296.257 479.399 295.87C479.399 295.482 479.716 295.165 480.104 295.165C480.491 295.165 480.808 295.482 480.808 295.87C480.808 296.257 480.491 296.574 480.104 296.574ZM480.597 297.795V304.436C480.597 305.74 479.986 306.297 478.659 306.297H478.483V305.434H478.636C479.352 305.434 479.587 305.153 479.587 304.454V297.795H480.597ZM486.715 302.487H487.725C487.431 303.567 486.445 304.237 485.059 304.237C483.304 304.237 482.206 302.968 482.206 300.966C482.206 298.976 483.321 297.684 485.059 297.684C486.768 297.684 487.807 298.899 487.807 300.866V301.254H483.257V301.301C483.31 302.551 484.008 303.344 485.083 303.344C485.899 303.344 486.451 303.045 486.715 302.487ZM485.048 298.576C484.038 298.576 483.333 299.316 483.257 300.438H486.744C486.721 299.316 486.052 298.576 485.048 298.576ZM494.63 299.733H493.608C493.444 299.105 492.886 298.594 491.976 298.594C490.837 298.594 490.121 299.504 490.121 300.937C490.121 302.399 490.849 303.326 491.976 303.326C492.827 303.326 493.42 302.933 493.608 302.217H494.63C494.448 303.379 493.503 304.237 491.982 304.237C490.209 304.237 489.075 302.951 489.075 300.937C489.075 298.964 490.203 297.684 491.976 297.684C493.514 297.684 494.454 298.606 494.63 299.733ZM496.662 296.157H497.671V297.795H499.081V298.641H497.671V302.223C497.671 302.968 497.953 303.285 498.611 303.285C498.793 303.285 498.893 303.279 499.081 303.262V304.113C498.881 304.148 498.687 304.172 498.488 304.172C497.184 304.172 496.662 303.691 496.662 302.481V298.641H495.64V297.795H496.662V296.157ZM507.084 297.684C508.698 297.684 509.743 298.97 509.743 300.96C509.743 302.939 508.692 304.237 507.084 304.237C506.179 304.237 505.451 303.843 505.105 303.174H505.011V306.239H504.001V297.795H504.964V298.852H505.058C505.463 298.124 506.22 297.684 507.084 297.684ZM506.843 303.326C508.005 303.326 508.698 302.44 508.698 300.96C508.698 299.481 508.005 298.594 506.849 298.594C505.704 298.594 504.982 299.504 504.982 300.96C504.982 302.41 505.704 303.326 506.843 303.326ZM513.09 304.237C511.863 304.237 510.953 303.508 510.953 302.352C510.953 301.219 511.787 300.567 513.26 300.479L515.087 300.367V299.792C515.087 299.011 514.599 298.582 513.654 298.582C512.896 298.582 512.368 298.87 512.227 299.369H511.205C511.34 298.353 512.339 297.684 513.689 297.684C515.233 297.684 516.096 298.477 516.096 299.792V304.125H515.134V303.191H515.04C514.629 303.867 513.936 304.237 513.09 304.237ZM513.278 303.35C514.317 303.35 515.087 302.669 515.087 301.765V301.183L513.384 301.295C512.421 301.359 511.998 301.694 511.998 302.328C511.998 302.974 512.544 303.35 513.278 303.35ZM520.571 306.556C519.044 306.556 518.069 305.869 517.917 304.824H518.985C519.097 305.34 519.661 305.675 520.571 305.675C521.704 305.675 522.379 305.117 522.379 304.184V302.939H522.285C521.886 303.638 521.17 304.031 520.301 304.031C518.662 304.031 517.647 302.763 517.647 300.866C517.647 298.97 518.674 297.684 520.301 297.684C521.187 297.684 521.968 298.118 522.332 298.799H522.426V297.795H523.389V304.237C523.389 305.652 522.297 306.556 520.571 306.556ZM520.524 303.139C521.698 303.139 522.403 302.246 522.403 300.866C522.403 299.486 521.692 298.594 520.524 298.594C519.349 298.594 518.692 299.486 518.692 300.866C518.692 302.246 519.349 303.139 520.524 303.139ZM529.484 302.487H530.494C530.2 303.567 529.214 304.237 527.828 304.237C526.072 304.237 524.974 302.968 524.974 300.966C524.974 298.976 526.09 297.684 527.828 297.684C529.537 297.684 530.576 298.899 530.576 300.866V301.254H526.025V301.301C526.078 302.551 526.777 303.344 527.851 303.344C528.668 303.344 529.219 303.045 529.484 302.487ZM527.816 298.576C526.806 298.576 526.102 299.316 526.025 300.438H529.513C529.49 299.316 528.82 298.576 527.816 298.576Z" fill="var(--vscode-editor-foreground, #CCCCCC)" />
+                  </g>
+                </g>
+                <g>
+                  <rect x="275.037" y="316.988" width="93.675" height="17.925" rx="3.2375" stroke="var(--vscode-activityBar-activeBorder, #FFFFFF)" stroke-opacity="0.12" stroke-width="0.925" />
+                  <g>
+                    <path d="M281.457 330.056L281.919 327.743H280.476V326.522H282.215L282.493 325.079H280.994V323.877H282.789L283.251 321.62H284.861L284.398 323.877H286.026L286.489 321.62H288.098L287.636 323.877H289.079V325.079H287.414L287.062 326.522H288.561V327.743H286.84L286.378 330.056H284.75L285.212 327.743H283.603L283.14 330.056H281.457ZM285.453 326.541L285.73 325.079H284.121L283.825 326.541H285.453Z" fill="#519ABA" />
+                    <path d="M297.182 321.968H299.338V322.644H298.016V330.3H299.338V330.975H297.182V321.968ZM300.416 325.56C300.416 324.671 301.275 324 302.413 324C303.536 324 304.316 324.556 304.43 325.436H303.586C303.471 325.008 303.054 324.725 302.408 324.725C301.772 324.725 301.275 325.048 301.275 325.525C301.275 325.893 301.573 326.121 302.204 326.275L303.029 326.474C304.038 326.718 304.525 327.155 304.525 327.925C304.525 328.884 303.596 329.544 302.378 329.544C301.186 329.544 300.366 328.973 300.272 328.084H301.151C301.295 328.536 301.722 328.824 302.408 328.824C303.129 328.824 303.645 328.481 303.645 327.989C303.645 327.622 303.367 327.373 302.796 327.234L301.877 327.011C300.873 326.767 300.416 326.335 300.416 325.56ZM305.916 329.45V321.968H306.77V329.45H305.916ZM312.762 324.094V329.45H311.947V328.61H311.868C311.599 329.207 311.028 329.544 310.208 329.544C309.006 329.544 308.38 328.829 308.38 327.562V324.094H309.235V327.353C309.235 328.317 309.592 328.764 310.447 328.764C311.391 328.764 311.907 328.203 311.907 327.264V324.094H312.762ZM316.578 331.507C315.286 331.507 314.461 330.926 314.332 330.041H315.236C315.331 330.479 315.808 330.762 316.578 330.762C317.536 330.762 318.108 330.29 318.108 329.5V328.446H318.028C317.69 329.038 317.084 329.371 316.349 329.371C314.963 329.371 314.103 328.297 314.103 326.693C314.103 325.088 314.973 324 316.349 324C317.099 324 317.76 324.368 318.068 324.944H318.148V324.094H318.962V329.544C318.962 330.742 318.038 331.507 316.578 331.507ZM316.538 328.615C317.532 328.615 318.128 327.86 318.128 326.693C318.128 325.525 317.527 324.77 316.538 324.77C315.544 324.77 314.988 325.525 314.988 326.693C314.988 327.86 315.544 328.615 316.538 328.615ZM322.321 330.975H320.165V330.3H321.486V322.644H320.165V321.968H322.321V330.975ZM325.163 329.5C324.81 329.5 324.517 329.207 324.517 328.854C324.517 328.496 324.81 328.208 325.163 328.208C325.52 328.208 325.809 328.496 325.809 328.854C325.809 329.207 325.52 329.5 325.163 329.5ZM327.637 322.708H328.491V324.094H329.684V324.81H328.491V327.84C328.491 328.471 328.73 328.74 329.286 328.74C329.44 328.74 329.525 328.735 329.684 328.72V329.44C329.515 329.47 329.351 329.49 329.182 329.49C328.079 329.49 327.637 329.082 327.637 328.059V324.81H326.772V324.094H327.637V322.708ZM330.752 325.56C330.752 324.671 331.612 324 332.749 324C333.872 324 334.652 324.556 334.766 325.436H333.922C333.808 325.008 333.39 324.725 332.744 324.725C332.108 324.725 331.612 325.048 331.612 325.525C331.612 325.893 331.91 326.121 332.541 326.275L333.365 326.474C334.374 326.718 334.861 327.155 334.861 327.925C334.861 328.884 333.932 329.544 332.715 329.544C331.522 329.544 330.702 328.973 330.608 328.084H331.487C331.631 328.536 332.059 328.824 332.744 328.824C333.465 328.824 333.981 328.481 333.981 327.989C333.981 327.622 333.703 327.373 333.132 327.234L332.213 327.011C331.209 326.767 330.752 326.335 330.752 325.56ZM337.996 327.443H337.916L336.644 329.465H335.676L337.509 326.787L335.656 324.109H336.674L337.946 326.101H338.026L339.283 324.109H340.251L338.433 326.752L340.276 329.465H339.263L337.996 327.443Z" fill="var(--vscode-editor-foreground, #CCCCCC)" />
+                  </g>
+                  <g>
+                    <path d="M346.653 326.466V328.182H345.995V326.466H344.361V325.808H345.995V324.092H346.653V325.808H348.287V326.466H346.653ZM351.08 328.45V323.397H351.015L349.523 324.479V323.706L351.084 322.584H351.812V328.45H351.08ZM355.535 328.588C354.214 328.588 353.454 327.466 353.454 325.515C353.454 323.58 354.222 322.446 355.535 322.446C356.84 322.446 357.608 323.584 357.608 325.527C357.608 327.474 356.852 328.588 355.535 328.588ZM355.535 327.95C356.401 327.95 356.873 327.088 356.873 325.515C356.873 323.958 356.393 323.088 355.535 323.088C354.678 323.088 354.19 323.966 354.19 325.515C354.19 327.084 354.669 327.95 355.535 327.95ZM360.812 328.588C359.568 328.588 358.698 327.885 358.698 326.881C358.698 326.117 359.182 325.523 359.917 325.385V325.32C359.32 325.157 358.938 324.649 358.938 324.011C358.938 323.097 359.714 322.446 360.812 322.446C361.909 322.446 362.686 323.097 362.686 324.011C362.686 324.653 362.312 325.153 361.706 325.32V325.385C362.442 325.523 362.925 326.117 362.925 326.881C362.925 327.885 362.055 328.588 360.812 328.588ZM360.812 325.076C361.503 325.076 361.966 324.678 361.966 324.08C361.966 323.475 361.507 323.072 360.812 323.072C360.116 323.072 359.657 323.475 359.657 324.08C359.657 324.678 360.121 325.076 360.812 325.076ZM360.812 327.962C361.625 327.962 362.186 327.499 362.186 326.828C362.186 326.157 361.625 325.694 360.812 325.694C359.999 325.694 359.438 326.157 359.438 326.828C359.438 327.499 359.999 327.962 360.812 327.962Z" fill="#2EA043" />
+                  </g>
+                </g>
+              </g>
+            </g>
+          </g>
+        </g>
+        <g>
+          <path d="M259.775 352.95C259.775 351.417 261.017 350.175 262.55 350.175H624.225C625.758 350.175 627 351.417 627 352.95V519.225C627 520.758 625.758 522 624.225 522H262.55C261.017 522 259.775 520.758 259.775 519.225V352.95Z" fill="var(--vscode-editorWidget-background, #181818)" />
+          <g>
+            <g clip-path="url(#clip10_304_6548)">
+              <path d="M278.275 364.975C278.275 362.932 279.932 361.275 281.975 361.275H604.8C606.844 361.275 608.5 362.932 608.5 364.975V457.675H278.275V364.975Z" fill="var(--vscode-activityBar-background, #FFFFFF)" fill-opacity="0.03" />
+              <g>
+                <g>
+                  <path d="M294.269 373.091L292.619 378.75H291.775L289.822 371.581H290.756L292.182 377.409H292.242L293.847 371.581H294.751L296.356 377.409H296.415L297.841 371.581H298.775L296.823 378.75H295.978L294.329 373.091H294.269ZM301.731 378.844C300.206 378.844 299.262 377.791 299.262 376.072C299.262 374.348 300.206 373.3 301.731 373.3C303.257 373.3 304.2 374.348 304.2 376.072C304.2 377.791 303.257 378.844 301.731 378.844ZM301.731 378.074C302.745 378.074 303.316 377.339 303.316 376.072C303.316 374.8 302.745 374.07 301.731 374.07C300.718 374.07 300.146 374.8 300.146 376.072C300.146 377.339 300.718 378.074 301.731 378.074ZM305.542 378.75V373.394H306.357V374.189H306.436C306.595 373.667 307.211 373.3 307.922 373.3C308.061 373.3 308.24 373.31 308.349 373.325V374.179C308.279 374.159 307.971 374.13 307.802 374.13C306.988 374.13 306.396 374.676 306.396 375.431V378.75H305.542ZM310.401 375.734L312.726 373.394H313.774L311.469 375.69L313.928 378.75H312.84L310.833 376.241L310.321 376.718V378.75H309.467V371.268H310.321V375.734H310.401ZM315.389 372.361C315.061 372.361 314.793 372.093 314.793 371.765C314.793 371.437 315.061 371.168 315.389 371.168C315.717 371.168 315.985 371.437 315.985 371.765C315.985 372.093 315.717 372.361 315.389 372.361ZM314.962 378.75V373.394H315.816V378.75H314.962ZM317.446 378.75V373.394H318.261V374.239H318.34C318.608 373.648 319.13 373.3 319.95 373.3C321.152 373.3 321.823 374.01 321.823 375.282V378.75H320.968V375.491C320.968 374.527 320.561 374.07 319.706 374.07C318.852 374.07 318.3 374.641 318.3 375.58V378.75H317.446ZM325.594 380.807C324.302 380.807 323.477 380.226 323.348 379.341H324.252C324.347 379.778 324.824 380.062 325.594 380.062C326.553 380.062 327.124 379.59 327.124 378.8V377.746H327.045C326.707 378.338 326.101 378.671 325.365 378.671C323.979 378.671 323.12 377.597 323.12 375.993C323.12 374.388 323.989 373.3 325.365 373.3C326.115 373.3 326.776 373.667 327.084 374.244H327.164V373.394H327.979V378.844C327.979 380.042 327.054 380.807 325.594 380.807ZM325.554 377.915C326.548 377.915 327.144 377.16 327.144 375.993C327.144 374.825 326.543 374.07 325.554 374.07C324.56 374.07 324.004 374.825 324.004 375.993C324.004 377.16 324.56 377.915 325.554 377.915ZM332.336 374.86C332.336 373.971 333.195 373.3 334.333 373.3C335.456 373.3 336.236 373.856 336.35 374.736H335.505C335.391 374.308 334.974 374.025 334.328 374.025C333.692 374.025 333.195 374.348 333.195 374.825C333.195 375.193 333.493 375.421 334.124 375.575L334.949 375.774C335.958 376.017 336.444 376.455 336.444 377.225C336.444 378.184 335.515 378.844 334.298 378.844C333.106 378.844 332.286 378.273 332.192 377.384H333.071C333.215 377.836 333.642 378.124 334.328 378.124C335.048 378.124 335.565 377.781 335.565 377.289C335.565 376.922 335.287 376.673 334.716 376.534L333.796 376.311C332.793 376.067 332.336 375.635 332.336 374.86ZM341.333 377.364H342.188C341.939 378.278 341.105 378.844 339.932 378.844C338.447 378.844 337.518 377.771 337.518 376.077C337.518 374.393 338.462 373.3 339.932 373.3C341.378 373.3 342.257 374.328 342.257 375.993V376.321H338.407V376.36C338.452 377.419 339.043 378.089 339.952 378.089C340.643 378.089 341.11 377.836 341.333 377.364ZM339.922 374.055C339.068 374.055 338.472 374.681 338.407 375.63H341.358C341.338 374.681 340.772 374.055 339.922 374.055ZM343.957 372.008H344.811V373.394H346.003V374.11H344.811V377.14C344.811 377.771 345.05 378.04 345.606 378.04C345.76 378.04 345.844 378.035 346.003 378.02V378.74C345.835 378.77 345.671 378.79 345.502 378.79C344.399 378.79 343.957 378.382 343.957 377.359V374.11H343.092V373.394H343.957V372.008ZM350.564 375.769C350.564 373.98 351.021 372.53 351.975 371.268H352.701C351.995 372.172 351.444 374.09 351.444 375.769C351.444 377.458 351.99 379.371 352.701 380.275H351.975C351.021 379.013 350.564 377.563 350.564 375.769ZM354.002 373.603C354.002 372.326 354.986 371.412 356.357 371.412C357.609 371.412 358.568 372.261 358.568 373.424C358.568 374.249 358.21 374.845 356.919 376.181L355.289 377.866V377.945H358.687V378.75H354.047V378.134L356.472 375.511C357.386 374.522 357.654 374.149 357.654 373.518C357.654 372.758 357.142 372.192 356.298 372.192C355.438 372.192 354.867 372.753 354.867 373.603H354.002ZM363.432 378.75V374.11H362.543V373.394H363.432V372.798C363.432 371.73 363.969 371.218 364.987 371.218C365.196 371.218 365.385 371.233 365.563 371.268V371.963C365.459 371.943 365.315 371.939 365.161 371.939C364.545 371.939 364.287 372.237 364.287 372.823V373.394H365.514V374.11H364.287V378.75H363.432ZM367.208 372.361C366.88 372.361 366.612 372.093 366.612 371.765C366.612 371.437 366.88 371.168 367.208 371.168C367.536 371.168 367.804 371.437 367.804 371.765C367.804 372.093 367.536 372.361 367.208 372.361ZM366.781 378.75V373.394H367.635V378.75H366.781ZM369.315 378.75V371.268H370.169V378.75H369.315ZM375.376 377.364H376.23C375.982 378.278 375.147 378.844 373.975 378.844C372.489 378.844 371.56 377.771 371.56 376.077C371.56 374.393 372.504 373.3 373.975 373.3C375.421 373.3 376.3 374.328 376.3 375.993V376.321H372.449V376.36C372.494 377.419 373.085 378.089 373.995 378.089C374.685 378.089 375.152 377.836 375.376 377.364ZM373.965 374.055C373.11 374.055 372.514 374.681 372.449 375.63H375.401C375.381 374.681 374.814 374.055 373.965 374.055ZM377.517 374.86C377.517 373.971 378.377 373.3 379.514 373.3C380.637 373.3 381.417 373.856 381.531 374.736H380.687C380.573 374.308 380.155 374.025 379.509 374.025C378.873 374.025 378.377 374.348 378.377 374.825C378.377 375.193 378.675 375.421 379.306 375.575L380.13 375.774C381.139 376.017 381.626 376.455 381.626 377.225C381.626 378.184 380.697 378.844 379.48 378.844C378.287 378.844 377.467 378.273 377.373 377.384H378.252C378.396 377.836 378.824 378.124 379.509 378.124C380.23 378.124 380.746 377.781 380.746 377.289C380.746 376.922 380.468 376.673 379.897 376.534L378.978 376.311C377.974 376.067 377.517 375.635 377.517 374.86ZM384.845 375.774C384.845 377.563 384.388 379.013 383.434 380.275H382.709C383.414 379.371 383.966 377.453 383.966 375.774C383.966 374.085 383.419 372.172 382.709 371.268H383.434C384.388 372.53 384.845 373.98 384.845 375.774Z" fill="var(--vscode-editorOverviewRuler-bracketMatchForeground, #9D9D9D)" />
+                </g>
+                <g>
+                  <g>
+                    <g clip-path="url(#clip11_304_6548)">
+                      <g>
+                        <rect width="51.8" height="15.55" transform="translate(472.55 367.475)" fill="var(--vscode-button-secondaryBackground, #313131)" />
+                        <path d="M481.111 372.081H483.57C485.697 372.081 486.954 373.407 486.954 375.663C486.954 377.923 485.702 379.25 483.57 379.25H481.111V372.081ZM482.005 372.886V378.445H483.511C485.11 378.445 486.039 377.422 486.039 375.673C486.039 373.919 485.1 372.886 483.511 372.886H482.005ZM488.842 372.861C488.514 372.861 488.245 372.593 488.245 372.265C488.245 371.937 488.514 371.668 488.842 371.668C489.169 371.668 489.438 371.937 489.438 372.265C489.438 372.593 489.169 372.861 488.842 372.861ZM488.414 379.25V373.894H489.269V379.25H488.414ZM490.774 375.36C490.774 374.471 491.634 373.8 492.771 373.8C493.894 373.8 494.674 374.356 494.789 375.236H493.944C493.83 374.808 493.412 374.525 492.766 374.525C492.131 374.525 491.634 374.848 491.634 375.325C491.634 375.693 491.932 375.921 492.563 376.075L493.388 376.274C494.396 376.517 494.883 376.955 494.883 377.725C494.883 378.684 493.954 379.344 492.737 379.344C491.544 379.344 490.725 378.773 490.63 377.884H491.51C491.654 378.336 492.081 378.624 492.766 378.624C493.487 378.624 494.004 378.281 494.004 377.789C494.004 377.422 493.725 377.173 493.154 377.034L492.235 376.811C491.231 376.567 490.774 376.135 490.774 375.36ZM500.656 375.534H499.792C499.652 375.002 499.181 374.57 498.41 374.57C497.447 374.57 496.84 375.34 496.84 376.552C496.84 377.789 497.457 378.574 498.41 378.574C499.131 378.574 499.633 378.241 499.792 377.635H500.656C500.502 378.619 499.702 379.344 498.415 379.344C496.915 379.344 495.956 378.256 495.956 376.552C495.956 374.883 496.91 373.8 498.41 373.8C499.712 373.8 500.507 374.58 500.656 375.534ZM503.408 379.344C502.37 379.344 501.6 378.728 501.6 377.75C501.6 376.791 502.306 376.239 503.553 376.165L505.098 376.07V375.583C505.098 374.923 504.685 374.56 503.885 374.56C503.245 374.56 502.797 374.803 502.678 375.226H501.814C501.928 374.366 502.773 373.8 503.915 373.8C505.222 373.8 505.952 374.471 505.952 375.583V379.25H505.137V378.46H505.058C504.71 379.031 504.124 379.344 503.408 379.344ZM503.567 378.594C504.447 378.594 505.098 378.018 505.098 377.253V376.761L503.657 376.855C502.842 376.91 502.484 377.193 502.484 377.73C502.484 378.276 502.946 378.594 503.567 378.594ZM507.532 379.25V373.894H508.347V374.689H508.426C508.585 374.167 509.201 373.8 509.912 373.8C510.051 373.8 510.23 373.81 510.339 373.825V374.679C510.27 374.659 509.962 374.63 509.793 374.63C508.978 374.63 508.387 375.176 508.387 375.931V379.25H507.532ZM513.241 379.344C511.869 379.344 510.99 378.256 510.99 376.572C510.99 374.893 511.879 373.8 513.241 373.8C513.986 373.8 514.617 374.153 514.92 374.739H514.994V371.768H515.849V379.25H515.034V378.395H514.955C514.617 378.992 513.981 379.344 513.241 379.344ZM513.439 374.57C512.466 374.57 511.874 375.325 511.874 376.572C511.874 377.824 512.461 378.574 513.439 378.574C514.413 378.574 515.014 377.809 515.014 376.572C515.014 375.345 514.408 374.57 513.439 374.57Z" fill="var(--vscode-button-secondaryForeground, #CCCCCC)" />
+                      </g>
+                    </g>
+                    <rect x="473.013" y="367.937" width="50.875" height="14.625" rx="1.3875" stroke="var(--vscode-editorWidget-border, #FFFFFF)" stroke-opacity="0.0705882" stroke-width="0.925" />
+                  </g>
+                  <g>
+                    <g clip-path="url(#clip12_304_6548)">
+                      <g>
+                        <rect width="48.8" height="15.55" transform="translate(528.05 367.475)" fill="var(--vscode-button-hoverBackground, #0078D4)" />
+                        <path d="M541.197 379.25L540.477 377.198H537.625L536.904 379.25H535.965L538.609 372.081H539.493L542.136 379.25H541.197ZM539.011 373.238L537.888 376.438H540.213L539.091 373.238H539.011ZM547.417 375.534H546.553C546.414 375.002 545.942 374.57 545.172 374.57C544.208 374.57 543.602 375.34 543.602 376.552C543.602 377.789 544.218 378.574 545.172 378.574C545.892 378.574 546.394 378.241 546.553 377.635H547.417C547.263 378.619 546.463 379.344 545.177 379.344C543.676 379.344 542.717 378.256 542.717 376.552C542.717 374.883 543.671 373.8 545.172 373.8C546.473 373.8 547.268 374.58 547.417 375.534ZM553.111 375.534H552.246C552.107 375.002 551.635 374.57 550.865 374.57C549.901 374.57 549.295 375.34 549.295 376.552C549.295 377.789 549.911 378.574 550.865 378.574C551.586 378.574 552.087 378.241 552.246 377.635H553.111C552.957 378.619 552.157 379.344 550.87 379.344C549.37 379.344 548.411 378.256 548.411 376.552C548.411 374.883 549.365 373.8 550.865 373.8C552.167 373.8 552.962 374.58 553.111 375.534ZM557.92 377.864H558.775C558.526 378.778 557.692 379.344 556.519 379.344C555.034 379.344 554.105 378.271 554.105 376.577C554.105 374.893 555.049 373.8 556.519 373.8C557.965 373.8 558.844 374.828 558.844 376.493V376.821H554.994V376.86C555.039 377.919 555.63 378.589 556.539 378.589C557.23 378.589 557.697 378.336 557.92 377.864ZM556.509 374.555C555.655 374.555 555.059 375.181 554.994 376.13H557.945C557.925 375.181 557.359 374.555 556.509 374.555ZM562.794 373.8C564.16 373.8 565.045 374.888 565.045 376.572C565.045 378.246 564.155 379.344 562.794 379.344C562.029 379.344 561.413 379.012 561.12 378.445H561.04V381.039H560.186V373.894H561.001V374.789H561.08C561.423 374.172 562.064 373.8 562.794 373.8ZM562.59 378.574C563.574 378.574 564.16 377.824 564.16 376.572C564.16 375.32 563.574 374.57 562.595 374.57C561.627 374.57 561.015 375.34 561.015 376.572C561.015 377.799 561.627 378.574 562.59 378.574ZM566.744 372.508H567.598V373.894H568.791V374.61H567.598V377.64C567.598 378.271 567.837 378.54 568.393 378.54C568.547 378.54 568.632 378.535 568.791 378.52V379.24C568.622 379.27 568.458 379.29 568.289 379.29C567.186 379.29 566.744 378.882 566.744 377.859V374.61H565.879V373.894H566.744V372.508Z" fill="var(--vscode-button-foreground, #FFFFFF)" />
+                      </g>
+                    </g>
+                    <rect x="528.513" y="367.937" width="47.875" height="14.625" rx="1.3875" stroke="var(--vscode-activityBar-activeBorder, #FFFFFF)" stroke-opacity="0.0705882" stroke-width="0.925" />
+                  </g>
+                  <g>
+                    <g>
+                      <path d="M592.404 369.134L595.167 371.897L595.463 372.587V380.875L594.525 381.813H586.188L585.251 380.875V369.775L586.188 368.887H591.763L592.404 369.134ZM586.188 380.875H594.525V372.587L591.763 369.775H586.188V380.875ZM589.888 373.475H588.063V374.413H589.888V376.287H590.825V374.413H592.7V373.475H590.825V371.65H589.888V373.475ZM588.063 378.113H592.7V379.05H588.063V378.113ZM594.92 368.887L597.041 371.009L597.288 371.65V380.875L596.4 381.813L596.351 371.65L593.588 368.887H594.92Z" fill="var(--vscode-editor-foreground, #CCCCCC)" />
+                    </g>
+                  </g>
+                </g>
+              </g>
+              <g>
+                <g>
+                  <g clip-path="url(#clip13_304_6548)">
+                    <g>
+                      <g>
+                        <g>
+                          <path d="M300.253 398.011C300.253 398.048 300.253 398.098 300.253 398.159C300.327 398.912 300.364 399.479 300.364 399.861C300.364 400.231 300.272 400.54 300.087 400.786C299.902 401.033 299.667 401.169 299.384 401.193C299.1 401.255 298.792 401.218 298.459 401.082C298.212 400.959 297.867 400.749 297.423 400.453C297.139 400.268 296.923 400.133 296.775 400.046C296.393 400.355 296.085 400.583 295.85 400.731C295.653 400.866 295.462 400.965 295.277 401.027C294.931 401.175 294.611 401.224 294.315 401.175C294.019 401.113 293.778 400.965 293.593 400.731C293.421 400.496 293.328 400.188 293.316 399.806C293.316 399.423 293.353 398.807 293.427 397.956C292.958 397.808 292.607 397.654 292.372 397.493C292.064 397.345 291.756 397.117 291.447 396.809C291.201 396.55 291.083 396.272 291.096 395.976C291.108 395.668 291.25 395.384 291.521 395.125C291.719 394.891 291.984 394.694 292.317 394.533C292.514 394.422 292.822 394.293 293.242 394.145C293.266 394.145 293.303 394.139 293.353 394.126C293.414 394.102 293.458 394.089 293.482 394.089L293.316 392.813C293.303 392.541 293.34 392.178 293.427 391.721C293.513 391.401 293.686 391.172 293.945 391.037C294.216 390.901 294.524 390.876 294.87 390.963C295.178 391.037 295.486 391.172 295.795 391.37C296.017 391.505 296.27 391.697 296.553 391.943C296.603 391.968 296.658 392.023 296.72 392.11L296.775 392.184C297.392 391.715 297.873 391.382 298.218 391.185C298.613 390.926 299.001 390.852 299.384 390.963C299.667 391.024 299.889 391.179 300.05 391.425C300.222 391.66 300.327 391.968 300.364 392.35V393.275C300.364 393.399 300.333 393.584 300.272 393.83C300.235 393.991 300.204 394.114 300.179 394.2C300.525 394.311 300.851 394.447 301.16 394.607C301.48 394.755 301.709 394.879 301.844 394.977C302.079 395.138 302.264 395.323 302.399 395.532C302.535 395.73 302.603 395.939 302.603 396.161C302.603 396.383 302.535 396.599 302.399 396.809C302.264 397.006 302.079 397.185 301.844 397.345C301.696 397.444 301.468 397.573 301.16 397.734C300.938 397.771 300.629 397.863 300.235 398.011H300.253ZM296.886 397.956C296.948 397.956 297.047 397.95 297.182 397.937C297.367 397.913 297.503 397.9 297.589 397.9C297.75 397.9 297.885 397.82 297.996 397.66C298.379 397.043 298.644 396.562 298.792 396.217C298.829 396.167 298.847 396.106 298.847 396.032C298.847 395.958 298.829 395.908 298.792 395.884C298.607 395.526 298.317 395.045 297.922 394.441C297.873 394.317 297.78 394.256 297.645 394.256C296.991 394.256 296.492 394.237 296.146 394.2C295.838 394.2 295.604 394.336 295.443 394.607C295.295 394.842 295.178 395.033 295.092 395.181L294.833 395.662C294.722 395.822 294.654 395.939 294.629 396.013C294.617 396.075 294.617 396.143 294.629 396.217C294.654 396.278 294.722 396.396 294.833 396.568L295.092 397.031L295.314 397.401C295.437 397.598 295.523 397.721 295.573 397.771C295.647 397.857 295.733 397.906 295.832 397.919C295.906 397.931 296.06 397.937 296.294 397.937L296.886 397.956ZM293.538 397.493C293.772 396.877 293.945 396.433 294.056 396.161V395.939L293.538 394.607C292.847 394.817 292.311 395.064 291.928 395.347C291.657 395.557 291.521 395.785 291.521 396.032C291.521 396.266 291.657 396.482 291.928 396.679C292.126 396.889 292.378 397.062 292.687 397.197C292.872 397.284 293.155 397.382 293.538 397.493ZM300.068 394.552C299.92 394.897 299.729 395.378 299.495 395.995L299.476 396.05C299.464 396.087 299.47 396.106 299.495 396.106C299.729 396.722 299.92 397.222 300.068 397.604C300.216 397.53 300.444 397.413 300.753 397.253C301.16 397.068 301.45 396.92 301.622 396.809C301.943 396.599 302.103 396.365 302.103 396.106C302.103 395.847 301.949 395.619 301.641 395.421C301.431 395.236 301.092 395.033 300.623 394.811C300.364 394.7 300.179 394.613 300.068 394.552ZM293.889 393.96C294.506 393.898 294.987 393.824 295.332 393.738C295.357 393.738 295.382 393.725 295.406 393.701L295.443 393.682C295.665 393.374 295.974 392.985 296.368 392.517C296.06 392.258 295.826 392.067 295.665 391.943C295.394 391.734 295.129 391.579 294.87 391.481C294.549 391.37 294.29 391.376 294.093 391.499C293.895 391.61 293.766 391.838 293.704 392.184C293.68 392.418 293.686 392.689 293.723 392.998C293.747 393.183 293.797 393.473 293.871 393.867L293.889 393.96ZM299.661 393.96C299.661 393.947 299.667 393.917 299.68 393.867C299.704 393.806 299.717 393.762 299.717 393.738C299.803 393.355 299.846 393.059 299.846 392.85C299.871 392.504 299.828 392.202 299.717 391.943C299.667 391.746 299.575 391.604 299.439 391.518C299.304 391.431 299.149 391.401 298.977 391.425C298.668 391.475 298.366 391.598 298.07 391.795C297.885 391.906 297.632 392.11 297.312 392.406L297.182 392.517C297.38 392.788 297.669 393.158 298.052 393.627L298.218 393.793L299.661 393.978V393.96ZM293.889 398.122C293.877 398.196 293.858 398.301 293.834 398.437C293.76 398.782 293.717 399.035 293.704 399.195C293.68 399.479 293.704 399.744 293.778 399.991C293.828 400.274 293.945 400.472 294.13 400.583C294.327 400.694 294.574 400.706 294.87 400.62C295.116 400.546 295.369 400.422 295.628 400.25C295.776 400.139 295.992 399.96 296.276 399.713L296.424 399.584C296.202 399.275 295.893 398.887 295.499 398.418C295.425 398.344 295.369 398.307 295.332 398.307C294.888 398.307 294.407 398.246 293.889 398.122ZM297.127 399.584C297.287 399.793 297.521 400.009 297.83 400.231C298.113 400.441 298.379 400.589 298.625 400.675C299.242 400.86 299.606 400.651 299.717 400.046C299.766 399.775 299.778 399.479 299.754 399.158C299.741 398.961 299.698 398.665 299.624 398.27L299.606 398.196L299.236 398.233C298.718 398.27 298.342 398.332 298.107 398.418C297.996 398.48 297.891 398.566 297.793 398.677C297.731 398.751 297.651 398.862 297.552 399.01C297.466 399.134 297.398 399.232 297.349 399.306C297.312 399.368 297.238 399.46 297.127 399.584ZM297.478 393.682C297.392 393.584 297.269 393.448 297.108 393.275C296.96 393.103 296.849 392.967 296.775 392.868L296.683 392.998C296.448 393.294 296.251 393.522 296.091 393.682H297.478ZM297.478 398.418H296.146C296.22 398.517 296.331 398.653 296.479 398.825C296.64 398.998 296.757 399.134 296.831 399.232C296.917 399.097 297.059 398.912 297.256 398.677L297.478 398.418ZM295.092 397.845C295.042 397.758 294.968 397.629 294.87 397.456C294.66 397.111 294.506 396.833 294.407 396.624L294.056 397.604C294.265 397.691 294.611 397.771 295.092 397.845ZM299.143 396.624L298.459 397.845L299.495 397.66C299.445 397.413 299.328 397.068 299.143 396.624ZM294.407 395.477L295.092 394.256L294.056 394.422L294.13 394.663C294.216 395.02 294.309 395.292 294.407 395.477ZM298.459 394.256C298.533 394.416 298.644 394.613 298.792 394.848C298.952 395.07 299.069 395.261 299.143 395.421C299.304 394.953 299.421 394.626 299.495 394.441C299.199 394.428 298.853 394.367 298.459 394.256Z" fill="#519ABA" />
+                        </g>
+                      </g>
+                      <g>
+                        <path d="M312.834 392.859C314.449 392.859 315.494 394.145 315.494 396.135C315.494 398.114 314.443 399.412 312.834 399.412C311.93 399.412 311.202 399.018 310.855 398.349H310.761V401.414H309.751V392.971H310.714V394.027H310.808C311.213 393.299 311.971 392.859 312.834 392.859ZM312.593 398.502C313.756 398.502 314.449 397.615 314.449 396.135C314.449 394.656 313.756 393.769 312.599 393.769C311.454 393.769 310.732 394.679 310.732 396.135C310.732 397.586 311.454 398.502 312.593 398.502ZM317.079 399.3V392.971H318.042V393.91H318.136C318.324 393.294 319.052 392.859 319.892 392.859C320.056 392.859 320.267 392.871 320.397 392.888V393.898C320.314 393.875 319.95 393.84 319.751 393.84C318.788 393.84 318.089 394.485 318.089 395.378V399.3H317.079ZM324.084 399.412C322.281 399.412 321.166 398.167 321.166 396.135C321.166 394.098 322.281 392.859 324.084 392.859C325.886 392.859 327.002 394.098 327.002 396.135C327.002 398.167 325.886 399.412 324.084 399.412ZM324.084 398.502C325.282 398.502 325.957 397.633 325.957 396.135C325.957 394.632 325.282 393.769 324.084 393.769C322.886 393.769 322.211 394.632 322.211 396.135C322.211 397.633 322.886 398.502 324.084 398.502ZM329.128 391.749C328.74 391.749 328.423 391.432 328.423 391.045C328.423 390.657 328.74 390.34 329.128 390.34C329.515 390.34 329.832 390.657 329.832 391.045C329.832 391.432 329.515 391.749 329.128 391.749ZM329.621 392.971V399.611C329.621 400.915 329.01 401.473 327.683 401.473H327.507V400.61H327.66C328.376 400.61 328.611 400.328 328.611 399.629V392.971H329.621ZM335.739 397.662H336.749C336.455 398.742 335.469 399.412 334.083 399.412C332.328 399.412 331.23 398.143 331.23 396.141C331.23 394.151 332.345 392.859 334.083 392.859C335.792 392.859 336.831 394.074 336.831 396.041V396.429H332.281V396.476C332.333 397.727 333.032 398.519 334.107 398.519C334.923 398.519 335.475 398.22 335.739 397.662ZM334.071 393.752C333.062 393.752 332.357 394.491 332.281 395.613H335.768C335.745 394.491 335.076 393.752 334.071 393.752ZM343.654 394.908H342.632C342.468 394.28 341.91 393.769 341 393.769C339.861 393.769 339.145 394.679 339.145 396.112C339.145 397.574 339.873 398.502 341 398.502C341.851 398.502 342.444 398.108 342.632 397.392H343.654C343.472 398.554 342.527 399.412 341.006 399.412C339.233 399.412 338.099 398.126 338.099 396.112C338.099 394.139 339.227 392.859 341 392.859C342.538 392.859 343.478 393.781 343.654 394.908ZM345.685 391.332H346.695V392.971H348.105V393.816H346.695V397.398C346.695 398.143 346.977 398.461 347.635 398.461C347.817 398.461 347.917 398.455 348.105 398.437V399.288C347.905 399.324 347.711 399.347 347.512 399.347C346.208 399.347 345.685 398.866 345.685 397.656V393.816H344.664V392.971H345.685V391.332ZM349.367 394.703C349.367 393.652 350.383 392.859 351.727 392.859C353.054 392.859 353.976 393.517 354.111 394.556H353.113C352.978 394.051 352.485 393.716 351.721 393.716C350.97 393.716 350.383 394.098 350.383 394.662C350.383 395.096 350.735 395.366 351.481 395.548L352.455 395.783C353.647 396.071 354.223 396.587 354.223 397.498C354.223 398.631 353.125 399.412 351.686 399.412C350.277 399.412 349.308 398.736 349.197 397.685H350.236C350.406 398.22 350.911 398.56 351.721 398.56C352.573 398.56 353.183 398.155 353.183 397.574C353.183 397.139 352.855 396.846 352.179 396.681L351.093 396.417C349.907 396.13 349.367 395.619 349.367 394.703ZM356.642 399.359C356.225 399.359 355.879 399.012 355.879 398.596C355.879 398.173 356.225 397.832 356.642 397.832C357.065 397.832 357.405 398.173 357.405 398.596C357.405 399.012 357.065 399.359 356.642 399.359ZM359.566 391.332H360.576V392.971H361.985V393.816H360.576V397.398C360.576 398.143 360.858 398.461 361.515 398.461C361.697 398.461 361.797 398.455 361.985 398.437V399.288C361.785 399.324 361.592 399.347 361.392 399.347C360.088 399.347 359.566 398.866 359.566 397.656V393.816H358.544V392.971H359.566V391.332ZM363.247 394.703C363.247 393.652 364.263 392.859 365.608 392.859C366.935 392.859 367.857 393.517 367.992 394.556H366.993C366.858 394.051 366.365 393.716 365.602 393.716C364.85 393.716 364.263 394.098 364.263 394.662C364.263 395.096 364.615 395.366 365.361 395.548L366.336 395.783C367.528 396.071 368.103 396.587 368.103 397.498C368.103 398.631 367.005 399.412 365.567 399.412C364.157 399.412 363.189 398.736 363.077 397.685H364.116C364.287 398.22 364.792 398.56 365.602 398.56C366.453 398.56 367.064 398.155 367.064 397.574C367.064 397.139 366.735 396.846 366.06 396.681L364.974 396.417C363.788 396.13 363.247 395.619 363.247 394.703ZM371.808 396.928H371.714L370.211 399.318H369.066L371.233 396.153L369.043 392.988H370.246L371.749 395.343H371.843L373.329 392.988H374.474L372.325 396.112L374.503 399.318H373.305L371.808 396.928Z" fill="var(--vscode-editor-foreground, #CCCCCC)" />
+                      </g>
+                    </g>
+                  </g>
+                </g>
+                <g>
+                  <g clip-path="url(#clip14_304_6548)">
+                    <g>
+                      <g>
+                        <g>
+                          <path d="M300.253 418.361C300.253 418.398 300.253 418.447 300.253 418.509C300.327 419.261 300.364 419.829 300.364 420.211C300.364 420.581 300.272 420.889 300.087 421.136C299.902 421.383 299.667 421.518 299.384 421.543C299.1 421.605 298.792 421.568 298.459 421.432C298.212 421.309 297.867 421.099 297.423 420.803C297.139 420.618 296.923 420.482 296.775 420.396C296.393 420.704 296.084 420.933 295.85 421.081C295.653 421.216 295.462 421.315 295.277 421.377C294.931 421.525 294.611 421.574 294.315 421.525C294.019 421.463 293.778 421.315 293.593 421.081C293.42 420.846 293.328 420.538 293.316 420.156C293.316 419.773 293.353 419.157 293.427 418.306C292.958 418.158 292.606 418.003 292.372 417.843C292.064 417.695 291.755 417.467 291.447 417.159C291.2 416.9 291.083 416.622 291.096 416.326C291.108 416.018 291.25 415.734 291.521 415.475C291.718 415.241 291.984 415.043 292.317 414.883C292.514 414.772 292.822 414.643 293.242 414.495C293.266 414.495 293.303 414.488 293.353 414.476C293.414 414.451 293.457 414.439 293.482 414.439L293.316 413.163C293.303 412.891 293.34 412.527 293.427 412.071C293.513 411.75 293.686 411.522 293.945 411.387C294.216 411.251 294.524 411.226 294.87 411.313C295.178 411.387 295.486 411.522 295.795 411.72C296.017 411.855 296.269 412.046 296.553 412.293C296.602 412.318 296.658 412.373 296.72 412.46L296.775 412.534C297.392 412.065 297.873 411.732 298.218 411.535C298.613 411.276 299.001 411.202 299.384 411.313C299.667 411.374 299.889 411.528 300.05 411.775C300.222 412.009 300.327 412.318 300.364 412.7V413.625C300.364 413.748 300.333 413.933 300.272 414.18C300.235 414.34 300.204 414.464 300.179 414.55C300.524 414.661 300.851 414.797 301.16 414.957C301.48 415.105 301.708 415.228 301.844 415.327C302.078 415.487 302.263 415.672 302.399 415.882C302.535 416.079 302.603 416.289 302.603 416.511C302.603 416.733 302.535 416.949 302.399 417.159C302.263 417.356 302.078 417.535 301.844 417.695C301.696 417.794 301.468 417.923 301.16 418.084C300.938 418.121 300.629 418.213 300.235 418.361H300.253ZM296.886 418.306C296.948 418.306 297.046 418.299 297.182 418.287C297.367 418.262 297.503 418.25 297.589 418.25C297.749 418.25 297.885 418.17 297.996 418.01C298.378 417.393 298.644 416.912 298.792 416.567C298.829 416.517 298.847 416.456 298.847 416.382C298.847 416.308 298.829 416.258 298.792 416.234C298.607 415.876 298.317 415.395 297.922 414.791C297.873 414.667 297.78 414.606 297.645 414.606C296.991 414.606 296.491 414.587 296.146 414.55C295.838 414.55 295.603 414.686 295.443 414.957C295.295 415.191 295.178 415.383 295.092 415.531L294.833 416.012C294.722 416.172 294.654 416.289 294.629 416.363C294.617 416.425 294.617 416.493 294.629 416.567C294.654 416.628 294.722 416.745 294.833 416.918L295.092 417.381L295.314 417.751C295.437 417.948 295.523 418.071 295.573 418.121C295.647 418.207 295.733 418.256 295.832 418.269C295.906 418.281 296.06 418.287 296.294 418.287L296.886 418.306ZM293.538 417.843C293.772 417.226 293.945 416.782 294.056 416.511V416.289L293.538 414.957C292.847 415.167 292.31 415.413 291.928 415.697C291.657 415.907 291.521 416.135 291.521 416.382C291.521 416.616 291.657 416.832 291.928 417.029C292.125 417.239 292.378 417.411 292.687 417.547C292.872 417.633 293.155 417.732 293.538 417.843ZM300.068 414.902C299.92 415.247 299.729 415.728 299.495 416.345L299.476 416.4C299.464 416.437 299.47 416.456 299.495 416.456C299.729 417.072 299.92 417.572 300.068 417.954C300.216 417.88 300.444 417.763 300.753 417.603C301.16 417.418 301.449 417.27 301.622 417.159C301.943 416.949 302.103 416.715 302.103 416.456C302.103 416.197 301.949 415.968 301.641 415.771C301.431 415.586 301.092 415.383 300.623 415.161C300.364 415.05 300.179 414.963 300.068 414.902ZM293.889 414.31C294.506 414.248 294.987 414.174 295.332 414.088C295.357 414.088 295.381 414.075 295.406 414.051L295.443 414.032C295.665 413.724 295.973 413.335 296.368 412.867C296.06 412.608 295.825 412.416 295.665 412.293C295.394 412.083 295.129 411.929 294.87 411.831C294.549 411.72 294.29 411.726 294.093 411.849C293.895 411.96 293.766 412.188 293.704 412.534C293.679 412.768 293.686 413.039 293.723 413.348C293.747 413.533 293.797 413.822 293.871 414.217L293.889 414.31ZM299.661 414.31C299.661 414.297 299.667 414.266 299.68 414.217C299.704 414.155 299.717 414.112 299.717 414.088C299.803 413.705 299.846 413.409 299.846 413.2C299.871 412.854 299.828 412.552 299.717 412.293C299.667 412.096 299.575 411.954 299.439 411.868C299.303 411.781 299.149 411.75 298.977 411.775C298.668 411.824 298.366 411.948 298.07 412.145C297.885 412.256 297.632 412.46 297.312 412.756L297.182 412.867C297.379 413.138 297.669 413.508 298.052 413.977L298.218 414.143L299.661 414.328V414.31ZM293.889 418.472C293.877 418.546 293.858 418.651 293.834 418.787C293.76 419.132 293.716 419.385 293.704 419.545C293.679 419.829 293.704 420.094 293.778 420.341C293.827 420.624 293.945 420.822 294.13 420.933C294.327 421.044 294.574 421.056 294.87 420.97C295.116 420.896 295.369 420.772 295.628 420.6C295.776 420.489 295.992 420.31 296.276 420.063L296.424 419.934C296.202 419.625 295.893 419.237 295.499 418.768C295.425 418.694 295.369 418.657 295.332 418.657C294.888 418.657 294.407 418.595 293.889 418.472ZM297.127 419.934C297.287 420.143 297.521 420.359 297.83 420.581C298.113 420.791 298.378 420.939 298.625 421.025C299.242 421.21 299.606 421 299.717 420.396C299.766 420.125 299.778 419.829 299.754 419.508C299.741 419.311 299.698 419.015 299.624 418.62L299.606 418.546L299.236 418.583C298.718 418.62 298.341 418.682 298.107 418.768C297.996 418.83 297.891 418.916 297.793 419.027C297.731 419.101 297.651 419.212 297.552 419.36C297.466 419.483 297.398 419.582 297.349 419.656C297.312 419.718 297.238 419.81 297.127 419.934ZM297.478 414.032C297.392 413.933 297.268 413.798 297.108 413.625C296.96 413.452 296.849 413.317 296.775 413.218L296.683 413.348C296.448 413.644 296.251 413.872 296.091 414.032H297.478ZM297.478 418.768H296.146C296.22 418.867 296.331 419.002 296.479 419.175C296.639 419.348 296.757 419.483 296.831 419.582C296.917 419.446 297.059 419.261 297.256 419.027L297.478 418.768ZM295.092 418.195C295.042 418.108 294.968 417.979 294.87 417.806C294.66 417.461 294.506 417.183 294.407 416.974L294.056 417.954C294.265 418.04 294.611 418.121 295.092 418.195ZM299.143 416.974L298.459 418.195L299.495 418.01C299.445 417.763 299.328 417.418 299.143 416.974ZM294.407 415.827L295.092 414.606L294.056 414.772L294.13 415.013C294.216 415.37 294.308 415.642 294.407 415.827ZM298.459 414.606C298.533 414.766 298.644 414.963 298.792 415.198C298.952 415.42 299.069 415.611 299.143 415.771C299.303 415.302 299.421 414.976 299.495 414.791C299.199 414.778 298.853 414.717 298.459 414.606Z" fill="#519ABA" />
+                        </g>
+                      </g>
+                      <g>
+                        <path d="M310.374 410.807H312.922V411.606H311.36V420.654H312.922V421.453H310.374V410.807ZM314.196 415.053C314.196 414.002 315.212 413.209 316.556 413.209C317.883 413.209 318.805 413.867 318.94 414.906H317.942C317.807 414.401 317.314 414.066 316.551 414.066C315.799 414.066 315.212 414.448 315.212 415.011C315.212 415.446 315.564 415.716 316.31 415.898L317.285 416.133C318.476 416.421 319.052 416.937 319.052 417.847C319.052 418.981 317.954 419.762 316.515 419.762C315.106 419.762 314.137 419.086 314.026 418.035H315.065C315.235 418.57 315.74 418.91 316.551 418.91C317.402 418.91 318.013 418.505 318.013 417.924C318.013 417.489 317.684 417.196 317.009 417.031L315.922 416.767C314.736 416.479 314.196 415.969 314.196 415.053ZM320.696 419.65V410.807H321.706V419.65H320.696ZM328.787 413.32V419.65H327.824V418.658H327.73C327.413 419.362 326.738 419.762 325.769 419.762C324.348 419.762 323.608 418.916 323.608 417.419V413.32H324.618V417.172C324.618 418.311 325.041 418.84 326.051 418.84C327.166 418.84 327.777 418.176 327.777 417.067V413.32H328.787ZM333.296 422.081C331.77 422.081 330.795 421.394 330.642 420.349H331.711C331.823 420.865 332.386 421.2 333.296 421.2C334.43 421.2 335.105 420.642 335.105 419.709V418.464H335.011C334.612 419.163 333.895 419.556 333.026 419.556C331.388 419.556 330.372 418.288 330.372 416.391C330.372 414.495 331.4 413.209 333.026 413.209C333.913 413.209 334.694 413.643 335.058 414.324H335.152V413.32H336.115V419.762C336.115 421.177 335.023 422.081 333.296 422.081ZM333.249 418.664C334.424 418.664 335.128 417.771 335.128 416.391C335.128 415.011 334.418 414.119 333.249 414.119C332.075 414.119 331.417 415.011 331.417 416.391C331.417 417.771 332.075 418.664 333.249 418.664ZM340.084 421.453H337.536V420.654H339.097V411.606H337.536V410.807H340.084V421.453ZM343.442 419.709C343.026 419.709 342.679 419.362 342.679 418.945C342.679 418.523 343.026 418.182 343.442 418.182C343.865 418.182 344.206 418.523 344.206 418.945C344.206 419.362 343.865 419.709 343.442 419.709ZM346.366 411.682H347.376V413.32H348.786V414.166H347.376V417.748C347.376 418.493 347.658 418.81 348.316 418.81C348.498 418.81 348.598 418.805 348.786 418.787V419.638C348.586 419.674 348.392 419.697 348.193 419.697C346.889 419.697 346.366 419.216 346.366 418.006V414.166H345.345V413.32H346.366V411.682ZM350.048 415.053C350.048 414.002 351.064 413.209 352.408 413.209C353.735 413.209 354.657 413.867 354.792 414.906H353.794C353.659 414.401 353.166 414.066 352.402 414.066C351.651 414.066 351.064 414.448 351.064 415.011C351.064 415.446 351.416 415.716 352.162 415.898L353.136 416.133C354.328 416.421 354.904 416.937 354.904 417.847C354.904 418.981 353.806 419.762 352.367 419.762C350.958 419.762 349.989 419.086 349.878 418.035H350.917C351.087 418.57 351.592 418.91 352.402 418.91C353.254 418.91 353.864 418.505 353.864 417.924C353.864 417.489 353.536 417.196 352.86 417.031L351.774 416.767C350.588 416.479 350.048 415.969 350.048 415.053ZM358.609 417.278H358.515L357.012 419.668H355.867L358.033 416.503L355.843 413.338H357.047L358.55 415.693H358.644L360.129 413.338H361.274L359.125 416.462L361.304 419.668H360.106L358.609 417.278Z" fill="var(--vscode-editor-foreground, #CCCCCC)" />
+                      </g>
+                    </g>
+                  </g>
+                </g>
+                <g>
+                  <g clip-path="url(#clip15_304_6548)">
+                    <g>
+                      <g>
+                        <g>
+                          <path d="M302.35 435.663V436.6H296.775V442.125H295.838V436.6H290.312V435.663H295.838V430.137H296.775V435.663H302.35Z" fill="var(--vscode-editor-foreground, #CCCCCC)" />
+                        </g>
+                      </g>
+                      <g>
+                        <path d="M315.388 440L314.537 437.575H311.166L310.315 440H309.205L312.329 431.527H313.374L316.498 440H315.388ZM312.804 432.895L311.478 436.677H314.225L312.898 432.895H312.804ZM319.845 440.112C318.224 440.112 317.185 438.826 317.185 436.835C317.185 434.851 318.236 433.559 319.845 433.559C320.725 433.559 321.471 433.976 321.829 434.669H321.917V431.157H322.927V440H321.964V438.99H321.87C321.471 439.695 320.719 440.112 319.845 440.112ZM320.079 434.469C318.929 434.469 318.23 435.361 318.23 436.835C318.23 438.315 318.923 439.201 320.079 439.201C321.23 439.201 321.941 438.297 321.941 436.835C321.941 435.385 321.224 434.469 320.079 434.469ZM327.231 440.112C325.61 440.112 324.571 438.826 324.571 436.835C324.571 434.851 325.622 433.559 327.231 433.559C328.112 433.559 328.857 433.976 329.216 434.669H329.304V431.157H330.314V440H329.351V438.99H329.257C328.857 439.695 328.106 440.112 327.231 440.112ZM327.466 434.469C326.315 434.469 325.616 435.361 325.616 436.835C325.616 438.315 326.309 439.201 327.466 439.201C328.617 439.201 329.327 438.297 329.327 436.835C329.327 435.385 328.611 434.469 327.466 434.469ZM336.854 440H335.798V431.527H340.941V432.479H336.854V435.391H340.606V436.33H336.854V440ZM343.078 432.449C342.691 432.449 342.374 432.132 342.374 431.745C342.374 431.357 342.691 431.04 343.078 431.04C343.466 431.04 343.783 431.357 343.783 431.745C343.783 432.132 343.466 432.449 343.078 432.449ZM342.573 440V433.67H343.583V440H342.573ZM345.568 440V431.157H346.578V440H345.568ZM352.731 438.362H353.741C353.448 439.442 352.461 440.112 351.075 440.112C349.32 440.112 348.222 438.843 348.222 436.841C348.222 434.851 349.337 433.559 351.075 433.559C352.784 433.559 353.823 434.774 353.823 436.741V437.129H349.273V437.176C349.326 438.426 350.024 439.219 351.099 439.219C351.915 439.219 352.467 438.92 352.731 438.362ZM351.064 434.451C350.054 434.451 349.349 435.191 349.273 436.313H352.761C352.737 435.191 352.068 434.451 351.064 434.451ZM355.262 435.403C355.262 434.352 356.278 433.559 357.622 433.559C358.949 433.559 359.871 434.216 360.006 435.256H359.008C358.873 434.751 358.38 434.416 357.616 434.416C356.865 434.416 356.278 434.798 356.278 435.361C356.278 435.796 356.63 436.066 357.376 436.248L358.35 436.483C359.542 436.771 360.118 437.287 360.118 438.197C360.118 439.331 359.02 440.112 357.581 440.112C356.172 440.112 355.203 439.436 355.092 438.385H356.131C356.301 438.92 356.806 439.26 357.616 439.26C358.468 439.26 359.078 438.855 359.078 438.274C359.078 437.839 358.75 437.546 358.074 437.381L356.988 437.117C355.802 436.829 355.262 436.319 355.262 435.403ZM362.537 440.059C362.12 440.059 361.773 439.712 361.773 439.295C361.773 438.873 362.12 438.532 362.537 438.532C362.96 438.532 363.3 438.873 363.3 439.295C363.3 439.712 362.96 440.059 362.537 440.059ZM366.107 440.059C365.69 440.059 365.343 439.712 365.343 439.295C365.343 438.873 365.69 438.532 366.107 438.532C366.529 438.532 366.87 438.873 366.87 439.295C366.87 439.712 366.529 440.059 366.107 440.059ZM369.677 440.059C369.26 440.059 368.913 439.712 368.913 439.295C368.913 438.873 369.26 438.532 369.677 438.532C370.099 438.532 370.44 438.873 370.44 439.295C370.44 439.712 370.099 440.059 369.677 440.059Z" fill="var(--vscode-editor-foreground, #CCCCCC)" />
+                      </g>
+                    </g>
+                  </g>
+                </g>
+              </g>
+            </g>
+            <path d="M278.738 364.975C278.738 363.187 280.187 361.738 281.975 361.738H604.8C606.588 361.738 608.038 363.187 608.038 364.975V457.213H278.738V364.975Z" stroke="var(--vscode-editorWidget-border, #2B2B2B)" stroke-width="0.925" />
+          </g>
+          <g>
+            <g>
+              <rect x="278.737" y="454.438" width="329.3" height="56" rx="3.2375" fill="var(--vscode-editorWidget-background, #313131)" />
+              <rect x="278.737" y="454.438" width="329.3" height="56" rx="3.2375" stroke="#2488DB" stroke-width="0.925" />
+              <g>
+                <g>
+                  <rect x="285.675" y="464.15" width="0.925" height="12.95" fill="var(--vscode-editorCursor-foreground, #CCCCCC)" />
+                </g>
+                <g>
+                  <path d="M292.005 474.424V475.375H286.755V466.902H292.005V467.854H287.812V470.572H291.787V471.512H287.812V474.424H292.005ZM296.132 475.487C294.512 475.487 293.472 474.201 293.472 472.21C293.472 470.226 294.523 468.934 296.132 468.934C297.013 468.934 297.759 469.351 298.117 470.044H298.205V466.533H299.215V475.375H298.252V474.365H298.158C297.759 475.07 297.007 475.487 296.132 475.487ZM296.367 469.844C295.216 469.844 294.518 470.737 294.518 472.21C294.518 473.69 295.21 474.577 296.367 474.577C297.518 474.577 298.228 473.672 298.228 472.21C298.228 470.76 297.512 469.844 296.367 469.844ZM301.704 467.824C301.317 467.824 301 467.507 301 467.12C301 466.732 301.317 466.415 301.704 466.415C302.092 466.415 302.409 466.732 302.409 467.12C302.409 467.507 302.092 467.824 301.704 467.824ZM301.199 475.375V469.046H302.209V475.375H301.199ZM304.558 467.407H305.568V469.046H306.977V469.891H305.568V473.473C305.568 474.218 305.85 474.535 306.507 474.535C306.689 474.535 306.789 474.53 306.977 474.512V475.363C306.777 475.399 306.584 475.422 306.384 475.422C305.081 475.422 304.558 474.941 304.558 473.731V469.891H303.536V469.046H304.558V467.407ZM312.32 475.375V469.891H311.269V469.046H312.32V468.341C312.32 467.079 312.954 466.474 314.158 466.474C314.405 466.474 314.628 466.491 314.839 466.533V467.355C314.716 467.331 314.546 467.325 314.364 467.325C313.635 467.325 313.33 467.677 313.33 468.37V469.046H314.78V469.891H313.33V475.375H312.32ZM316.783 467.824C316.395 467.824 316.078 467.507 316.078 467.12C316.078 466.732 316.395 466.415 316.783 466.415C317.17 466.415 317.487 466.732 317.487 467.12C317.487 467.507 317.17 467.824 316.783 467.824ZM316.278 475.375V469.046H317.288V475.375H316.278ZM319.272 475.375V466.533H320.282V475.375H319.272ZM326.436 473.737H327.445C327.152 474.817 326.165 475.487 324.78 475.487C323.024 475.487 321.926 474.218 321.926 472.216C321.926 470.226 323.042 468.934 324.78 468.934C326.488 468.934 327.528 470.149 327.528 472.116V472.504H322.977V472.551C323.03 473.802 323.729 474.594 324.803 474.594C325.619 474.594 326.171 474.295 326.436 473.737ZM324.768 469.826C323.758 469.826 323.053 470.566 322.977 471.688H326.465C326.441 470.566 325.772 469.826 324.768 469.826ZM328.966 470.778C328.966 469.727 329.982 468.934 331.327 468.934C332.654 468.934 333.575 469.592 333.71 470.631H332.712C332.577 470.126 332.084 469.791 331.321 469.791C330.569 469.791 329.982 470.173 329.982 470.737C329.982 471.171 330.334 471.441 331.08 471.623L332.055 471.858C333.247 472.146 333.822 472.662 333.822 473.573C333.822 474.706 332.724 475.487 331.285 475.487C329.876 475.487 328.907 474.811 328.796 473.76H329.835C330.005 474.295 330.51 474.635 331.321 474.635C332.172 474.635 332.783 474.23 332.783 473.649C332.783 473.214 332.454 472.921 331.779 472.756L330.692 472.492C329.506 472.204 328.966 471.694 328.966 470.778ZM339.33 467.824C338.942 467.824 338.625 467.507 338.625 467.12C338.625 466.732 338.942 466.415 339.33 466.415C339.717 466.415 340.034 466.732 340.034 467.12C340.034 467.507 339.717 467.824 339.33 467.824ZM338.825 475.375V469.046H339.834V475.375H338.825ZM341.76 475.375V469.046H342.723V470.044H342.817C343.134 469.345 343.751 468.934 344.72 468.934C346.141 468.934 346.933 469.774 346.933 471.277V475.375H345.923V471.523C345.923 470.384 345.442 469.844 344.432 469.844C343.422 469.844 342.77 470.519 342.77 471.629V475.375H341.76ZM352.717 477.665C352.582 477.665 352.406 477.653 352.265 477.63V476.767C352.388 476.79 352.546 476.796 352.687 476.796C353.269 476.796 353.586 476.52 353.85 475.757L353.967 475.381L351.625 469.046H352.717L354.455 474.254H354.549L356.281 469.046H357.355L354.883 475.763C354.343 477.231 353.838 477.665 352.717 477.665ZM361.072 475.487C359.269 475.487 358.154 474.242 358.154 472.21C358.154 470.173 359.269 468.934 361.072 468.934C362.875 468.934 363.99 470.173 363.99 472.21C363.99 474.242 362.875 475.487 361.072 475.487ZM361.072 474.577C362.27 474.577 362.945 473.708 362.945 472.21C362.945 470.707 362.27 469.844 361.072 469.844C359.874 469.844 359.199 470.707 359.199 472.21C359.199 473.708 359.874 474.577 361.072 474.577ZM370.695 469.046V475.375H369.733V474.383H369.639C369.322 475.087 368.646 475.487 367.678 475.487C366.257 475.487 365.517 474.641 365.517 473.144V469.046H366.527V472.897C366.527 474.036 366.949 474.565 367.959 474.565C369.075 474.565 369.686 473.901 369.686 472.792V469.046H370.695ZM372.598 475.375V469.046H373.561V469.985H373.655C373.843 469.368 374.571 468.934 375.41 468.934C375.575 468.934 375.786 468.946 375.915 468.963V469.973C375.833 469.95 375.469 469.915 375.269 469.915C374.307 469.915 373.608 470.56 373.608 471.453V475.375H372.598ZM388.533 469.046L386.76 475.375H385.733L384.318 470.478H384.224L382.814 475.375H381.793L380.02 469.046H381.041L382.286 474.107H382.38L383.795 469.046H384.764L386.179 474.107H386.273L387.518 469.046H388.533ZM392.25 475.487C390.448 475.487 389.332 474.242 389.332 472.21C389.332 470.173 390.448 468.934 392.25 468.934C394.053 468.934 395.168 470.173 395.168 472.21C395.168 474.242 394.053 475.487 392.25 475.487ZM392.25 474.577C393.448 474.577 394.123 473.708 394.123 472.21C394.123 470.707 393.448 469.844 392.25 469.844C391.052 469.844 390.377 470.707 390.377 472.21C390.377 473.708 391.052 474.577 392.25 474.577ZM396.754 475.375V469.046H397.717V469.985H397.81C397.998 469.368 398.726 468.934 399.566 468.934C399.73 468.934 399.942 468.946 400.071 468.963V469.973C399.989 469.95 399.625 469.915 399.425 469.915C398.462 469.915 397.763 470.56 397.763 471.453V475.375H396.754ZM402.496 471.811L405.244 469.046H406.483L403.758 471.758L406.665 475.375H405.379L403.007 472.41L402.402 472.974V475.375H401.392V466.533H402.402V471.811H402.496ZM407.481 470.778C407.481 469.727 408.497 468.934 409.841 468.934C411.168 468.934 412.09 469.592 412.225 470.631H411.227C411.092 470.126 410.599 469.791 409.835 469.791C409.084 469.791 408.497 470.173 408.497 470.737C408.497 471.171 408.849 471.441 409.595 471.623L410.569 471.858C411.761 472.146 412.337 472.662 412.337 473.573C412.337 474.706 411.239 475.487 409.8 475.487C408.391 475.487 407.422 474.811 407.311 473.76H408.35C408.52 474.295 409.025 474.635 409.835 474.635C410.687 474.635 411.297 474.23 411.297 473.649C411.297 473.214 410.969 472.921 410.293 472.756L409.207 472.492C408.021 472.204 407.481 471.694 407.481 470.778ZM417.005 468.934C418.619 468.934 419.664 470.22 419.664 472.21C419.664 474.189 418.613 475.487 417.005 475.487C416.1 475.487 415.372 475.093 415.026 474.424H414.932V477.489H413.922V469.046H414.885V470.102H414.979C415.384 469.374 416.142 468.934 417.005 468.934ZM416.764 474.577C417.927 474.577 418.619 473.69 418.619 472.21C418.619 470.731 417.927 469.844 416.77 469.844C415.625 469.844 414.903 470.754 414.903 472.21C414.903 473.661 415.625 474.577 416.764 474.577ZM423.011 475.487C421.784 475.487 420.874 474.759 420.874 473.602C420.874 472.469 421.708 471.817 423.182 471.729L425.008 471.617V471.042C425.008 470.261 424.52 469.832 423.575 469.832C422.818 469.832 422.289 470.12 422.148 470.619H421.127C421.262 469.603 422.26 468.934 423.61 468.934C425.154 468.934 426.018 469.727 426.018 471.042V475.375H425.055V474.442H424.961C424.55 475.117 423.857 475.487 423.011 475.487ZM423.199 474.6C424.238 474.6 425.008 473.919 425.008 473.015V472.433L423.305 472.545C422.342 472.61 421.919 472.944 421.919 473.578C421.919 474.224 422.465 474.6 423.199 474.6ZM433.122 470.983H432.101C431.936 470.355 431.378 469.844 430.468 469.844C429.329 469.844 428.613 470.754 428.613 472.187C428.613 473.649 429.341 474.577 430.468 474.577C431.32 474.577 431.913 474.183 432.101 473.467H433.122C432.94 474.629 431.995 475.487 430.474 475.487C428.701 475.487 427.568 474.201 427.568 472.187C427.568 470.214 428.695 468.934 430.468 468.934C432.007 468.934 432.946 469.856 433.122 470.983ZM438.806 473.737H439.816C439.522 474.817 438.536 475.487 437.15 475.487C435.394 475.487 434.296 474.218 434.296 472.216C434.296 470.226 435.412 468.934 437.15 468.934C438.859 468.934 439.898 470.149 439.898 472.116V472.504H435.347V472.551C435.4 473.802 436.099 474.594 437.174 474.594C437.99 474.594 438.542 474.295 438.806 473.737ZM437.138 469.826C436.128 469.826 435.424 470.566 435.347 471.688H438.835C438.812 470.566 438.142 469.826 437.138 469.826Z" fill="var(--vscode-editorGhostText-foreground, #9D9D9D)" />
+                </g>
+              </g>
+              <g>
+                <g>
+                  <g>
+                    <g>
+                      <g>
+                        <path d="M294.233 502.575H293.771C292.943 502.542 292.163 502.183 291.599 501.576C291.036 500.969 290.736 500.164 290.764 499.337V492.105C290.744 491.47 290.976 490.853 291.409 490.388C291.842 489.923 292.442 489.649 293.077 489.625C293.712 489.649 294.312 489.923 294.745 490.388C295.178 490.853 295.41 491.47 295.389 492.105V498.735C295.4 499.114 295.259 499.481 294.999 499.757C294.739 500.033 294.381 500.194 294.002 500.207C293.627 500.195 293.271 500.036 293.011 499.765C292.752 499.494 292.609 499.131 292.614 498.756V495.175H293.539V498.735C293.529 498.868 293.572 499.001 293.659 499.103C293.745 499.205 293.868 499.269 294.002 499.282C294.135 499.269 294.258 499.205 294.345 499.103C294.432 499.001 294.474 498.868 294.464 498.735V492.105C294.485 491.715 294.351 491.333 294.091 491.042C293.831 490.75 293.467 490.573 293.077 490.55C292.687 490.573 292.323 490.75 292.063 491.042C291.803 491.333 291.669 491.715 291.689 492.105V499.337C291.661 499.919 291.864 500.489 292.254 500.922C292.644 501.355 293.189 501.617 293.771 501.65H294.233C294.815 501.617 295.36 501.355 295.75 500.922C296.14 500.489 296.343 499.919 296.314 499.337V493.325H297.239V499.337C297.268 500.164 296.968 500.969 296.404 501.576C295.841 502.183 295.06 502.542 294.233 502.575Z" fill="var(--vscode-editorGutter-commentRangeForeground, #C5C5C5)" />
+                      </g>
+                    </g>
+                    <g>
+                      <g>
+                        <path d="M318.05 498.412C318.663 498.412 319.252 498.168 319.685 497.735C320.119 497.301 320.363 496.713 320.363 496.1V491.937C320.363 491.324 320.119 490.736 319.685 490.302C319.252 489.868 318.663 489.625 318.05 489.625C317.437 489.625 316.849 489.868 316.415 490.302C315.981 490.736 315.738 491.324 315.738 491.937V496.1C315.738 496.713 315.981 497.301 316.415 497.735C316.849 498.168 317.437 498.412 318.05 498.412ZM316.663 491.937C316.663 491.569 316.809 491.216 317.069 490.956C317.329 490.696 317.682 490.55 318.05 490.55C318.418 490.55 318.771 490.696 319.031 490.956C319.291 491.216 319.438 491.569 319.438 491.937V496.1C319.438 496.467 319.291 496.82 319.031 497.081C318.771 497.341 318.418 497.487 318.05 497.487C317.682 497.487 317.329 497.341 317.069 497.081C316.809 496.82 316.663 496.467 316.663 496.1V491.937ZM318.513 500.236V501.65H320.363V502.575H315.738V501.65H317.588V500.236C316.57 500.122 315.63 499.638 314.948 498.874C314.265 498.111 313.888 497.123 313.888 496.1H314.813C314.813 496.958 315.154 497.782 315.761 498.389C316.368 498.996 317.191 499.337 318.05 499.337C318.909 499.337 319.732 498.996 320.339 498.389C320.946 497.782 321.288 496.958 321.288 496.1H322.213C322.212 497.123 321.835 498.111 321.153 498.874C320.47 499.638 319.53 500.122 318.513 500.236Z" fill="var(--vscode-editorGutter-commentRangeForeground, #C5C5C5)" />
+                      </g>
+                    </g>
+                  </g>
+                  <g>
+                    <g>
+                      <g>
+                        <g>
+                          <path d="M525.182 496.576C525.182 498.505 523.859 499.784 521.859 499.784C519.697 499.784 518.315 498.191 518.315 495.687C518.315 493.215 519.718 491.595 521.859 491.595C523.594 491.595 524.851 492.56 525.133 494.11H524.141C523.805 493.053 523.019 492.495 521.859 492.495C520.309 492.495 519.317 493.741 519.317 495.687C519.317 497.66 520.293 498.885 521.865 498.885C523.263 498.885 524.211 497.99 524.211 496.668V496.478H522.011V495.622H525.182V496.576ZM526.91 491.779H529.864C531.344 491.779 532.368 492.82 532.368 494.31C532.368 495.774 531.322 496.809 529.854 496.809H527.886V499.6H526.91V491.779ZM527.886 492.646V495.942H529.61C530.721 495.942 531.366 495.345 531.366 494.31C531.366 493.237 530.742 492.646 529.61 492.646H527.886ZM536.975 499.6H536V492.657H533.479V491.779H539.496V492.657H536.975V499.6ZM543.588 496.896H540.032V496.012H543.588V496.896ZM548.872 499.6V497.98H545.062V497.091C546.119 495.318 547.317 493.411 548.411 491.779H549.826V497.107H550.937V497.98H549.826V499.6H548.872ZM546.059 497.047V497.112H548.877V492.684H548.812C547.934 493.996 546.91 495.611 546.059 497.047ZM554.85 499.703C553.186 499.703 552.156 498.554 552.156 496.679C552.156 494.798 553.186 493.654 554.85 493.654C556.514 493.654 557.544 494.798 557.544 496.679C557.544 498.554 556.514 499.703 554.85 499.703ZM554.85 498.863C555.956 498.863 556.579 498.061 556.579 496.679C556.579 495.291 555.956 494.495 554.85 494.495C553.745 494.495 553.121 495.291 553.121 496.679C553.121 498.061 553.745 498.863 554.85 498.863Z" fill="var(--vscode-breadcrumb-foreground, #CCCCCC)" />
+                        </g>
+                        <g>
+                          <path d="M568.075 497.493L571.072 494.459L571.516 494.903L568.26 498.122H567.853L564.597 494.903L565.041 494.459L568.075 497.493Z" fill="var(--vscode-breadcrumb-foreground, #CCCCCC)" />
+                        </g>
+                      </g>
+                    </g>
+                    <g>
+                      <g opacity="0.4">
+                        <g>
+                          <path d="M585.287 490.576L585.978 490.181L598.213 495.707V496.545L585.978 502.071L585.287 501.676L586.718 496.2L585.287 490.576ZM587.705 496.644L586.521 500.936L596.831 496.101L586.521 491.415L587.705 495.657L592.687 495.756V496.644H587.705Z" fill="var(--vscode-breadcrumb-foreground, #CCCCCC)" />
+                        </g>
+                      </g>
+                    </g>
+                  </g>
+                </g>
+              </g>
+            </g>
+          </g>
+        </g>
+      </g>
+      <rect x="260.237" y="4.4625" width="366.3" height="517.075" rx="5.0875" stroke="var(--vscode-tab-inactiveBackground, #2B2B2B)" stroke-width="0.925" />
+    </g>
+  </g>
+  <defs>
+    <filter id="filter0_d_304_6548" x="255.775" y="0" width="375.225" height="526" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+      <feFlood flood-opacity="0" result="BackgroundImageFix" />
+      <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha" />
+      <feOffset />
+      <feGaussianBlur stdDeviation="2" />
+      <feComposite in2="hardAlpha" operator="out" />
+      <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.45 0" />
+      <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_304_6548" />
+      <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_304_6548" result="shape" />
+    </filter>
+    <pattern id="pattern0_304_6548" patternContentUnits="objectBoundingBox" width="1" height="1">
+      <use xlink:href="#image0_304_6548" transform="scale(0.00166667)" />
+    </pattern>
+    <clipPath id="clip0_304_6548">
+      <rect y="16" width="596" height="491" rx="9.47211" fill="#FFFFFF" />
+    </clipPath>
+    <clipPath id="clip1_304_6548">
+      <path d="M0 76.2589H596V472.259H0V76.2589Z" fill="#FFFFFF" />
+    </clipPath>
+    <clipPath id="clip2_304_6548">
+      <rect width="67" height="384" fill="#FFFFFF" transform="translate(0 88.2589)" />
+    </clipPath>
+    <clipPath id="clip3_304_6548">
+      <rect width="529" height="384" fill="#FFFFFF" transform="translate(67 88.2589)" />
+    </clipPath>
+    <clipPath id="clip4_304_6548">
+      <rect x="259.775" y="4" width="367.225" height="518" rx="5.55" fill="#FFFFFF" />
+    </clipPath>
+    <clipPath id="clip5_304_6548">
+      <rect width="367.225" height="31.45" fill="#FFFFFF" transform="translate(259.775 4)" />
+    </clipPath>
+    <clipPath id="clip6_304_6548">
+      <rect width="14.8" height="14.8" fill="#FFFFFF" transform="translate(297.7 12.325)" />
+    </clipPath>
+    <clipPath id="clip7_304_6548">
+      <rect width="367.225" height="313.8" fill="#FFFFFF" transform="translate(259.775 36.375)" />
+    </clipPath>
+    <clipPath id="clip8_304_6548">
+      <path d="M274.575 59.475C274.575 52.8476 279.948 47.475 286.575 47.475C293.202 47.475 298.575 52.8476 298.575 59.475C298.575 66.1024 293.202 71.475 286.575 71.475C279.948 71.475 274.575 66.1024 274.575 59.475Z" fill="#FFFFFF" />
+    </clipPath>
+    <clipPath id="clip9_304_6548">
+      <rect width="11.1" height="11.1" fill="#FFFFFF" transform="translate(280.125 143.625)" />
+    </clipPath>
+    <clipPath id="clip10_304_6548">
+      <path d="M278.275 364.975C278.275 362.932 279.932 361.275 281.975 361.275H604.8C606.844 361.275 608.5 362.932 608.5 364.975V457.675H278.275V364.975Z" fill="#FFFFFF" />
+    </clipPath>
+    <clipPath id="clip11_304_6548">
+      <rect x="472.55" y="367.475" width="51.8" height="15.55" rx="1.85" fill="#FFFFFF" />
+    </clipPath>
+    <clipPath id="clip12_304_6548">
+      <rect x="528.05" y="367.475" width="48.8" height="15.55" rx="1.85" fill="#FFFFFF" />
+    </clipPath>
+    <clipPath id="clip13_304_6548">
+      <rect x="282.9" y="385.525" width="320.975" height="20.35" rx="2.775" fill="#FFFFFF" />
+    </clipPath>
+    <clipPath id="clip14_304_6548">
+      <rect x="282.9" y="405.875" width="320.975" height="20.35" rx="2.775" fill="#FFFFFF" />
+    </clipPath>
+    <clipPath id="clip15_304_6548">
+      <rect x="282.9" y="426.225" width="320.975" height="20.35" rx="2.775" fill="#FFFFFF" />
+    </clipPath>
+    <image id="image0_304_6548" data-name="image.png" width="600" height="600" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAlgAAAJYCAYAAAC+ZpjcAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAJ0PSURBVHgB7f0HmCTndaaJnrTlXVd7h26Y7gYBAgQIAgQ9QEoUDUiRMpQImRnxjqg7kmavJM7endHOvZJ27oyuebi6u7MzI2nHSCNpKI5EiaSoFUXCkARBgADhgUY7tKuuLm+yXPrc+P7MPysyK01kZkRkROT34kmkqayq7KzIiDfOOf85oQcf+lRBCCGEEEKIbYSFEEIIIYTYCgWLEEIIIcRmKFiEEEIIITZDwSKEEEIIsRkKFiGEEEKIzVCwCCGEEEJshoJFCCGEEGIzFCxCCCGEEJuhYBFCCCGE2AwFixBCCCHEZihYhBBCCCE2Q8EihBBCCLEZChYhhBBCiM1QsAghhBBCbIaCRQghhBBiMxQsQgghhBCboWARQgghhNgMBYsQQgghxGYoWIQQQgghNkPBIoQQQgixGQoWIYQQQojNULAIIYQQQmyGgkUIIYQQYjMULEIIIYQQm6FgEUIIIYTYDAWLEEIIIcRmKFiEEEIIITZDwSKEEEIIsRkKFiGEEEKIzVCwCCGEEEJshoJFCCGEEGIzFCxCCCGEEJuhYBFCCCGE2AwFixBCCCHEZihYhBBCCCE2Q8EihBBCCLEZChYhhBBCiM1QsAghhBBCbIaCRQghhBBiMxQsQgghhBCboWARQgghhNgMBYsQQgghxGYoWIQQQgghNkPBIoQQQgixGQoWIYQQQojNULAIIYQQQmyGgkUIIYQQYjMULEIIIYQQm6FgEUIIIYTYDAWLEEIIIcRmKFiEEEIIITZDwSKEEEIIsRkKFiGEEEKIzVCwCCGEEEJshoJFCCGEEGIzFCxCCCGEEJuhYBFCCCGE2AwFixBCCCHEZihYhBBCCCE2Q8EihBBCCLEZChYhhBBCiM1QsAghhBBCbIaCRQghhBBiM1EhhBBCHCKXzUgmtSW5TNq4bVzSacka14V8bsdzI9G4uo71D0h8YFhiff3lxwjxGxQsQgghtgBpyqSSSqjSm+uS2lqXfA2RqkfWkDCA75PleXU7EovLwPCYDI3vpmwRX0HBIoQQ0jaQqs3EsiTXV5VYtSJUVkDka92QLVwGR3fJyOQ+ihbxBRQsQgghLYG03+bqkqS3ilEqt9hMLKnLyK79SrQI8TIULEIIIU0xR6rclKparC3NSHJjVXYdPMZoFvEsFCxCCCF1SW9tqPRcusV6KqdBOnJh6oLsPnwTJYt4EgoWIYSQCrwUrWoE6rOWpi8pyQqFI0KIl6BgkUCDWhFdfIsLDhzYEYeNC5eCE1IJPh/rywuysTLvqWhVI/C5Xp2flvF9R4QQL0HBIoEDKQ3UZ6AIt9FBwrwUvM8QrYHRXTI4OiGE9BqIBK0tzaoCcj+C1x2LD8jQxG4hxCtQsEggsCpV9UiVVkOheHZwxBCtsQlGtUjgwedmbXHG02lAq+Cz2z8yys8t8QwULOJr7D5AFM/kZ2RzbYmiRQJLkMRKgxOrxNy0TBw8JoR4AQoW8SUowIUI5Uqdn+3GLFroucPUIQkCfk8FNmPLiGIPGdKI2kpCug0Fi/gKnHmvzl9Tha1ugAPSyuwVJVtcDk78ii5ex3bsFwoFIypV2L4fDouELHzf2uKsTB6mYJHuQ8EivqAoOle7ltLA75+9eJodpImv8NuqQPhUNleQXL4oWNVEIyKxSGPNwj4izSgW8QAULOJpvHbmrdOGjGYRr5PcSKhor1NpdDvRYpVt4oDFrxeaShajWMQLULCIZ0E6cNlIz3ntAMFoFvEySJ8n5qd9U8CONGA6W6gZsaoFJCtipAvDDRwL/3bd846QbkHBIp4EjQOR1vAyiGYhFTG+/wijWaTrIAWIyI3XPzdmsoZdZbLSMhCyvlioYU3W+sqCcRLEEyDSPcJCiIdAdGhx6oJvDhI4U8Y8tHSAlrsT/7G5tipXz73mK7lCwKoduVLfa3xzrkk6MagrJYl/YASLeAakBJemL/pmRIcGUgjJYsqQuE3W2Pbmrl2RrY11iUetrLHzDqmMxZxgHVCzFYnUj2Lhc8lid9JNKFjEEyC14acl5LXA60fdBySLtR/EaVYX52VpbkadkIRCxbokv5DJWa+5qge+HT8j1MArUehPwSLdgilC0nXQfsHvcqVZN1I0c1fOSi7r/ZVbxJ8gajV96bwszFwrR3ujYf9EryBGaMNgBxC1Rmytrwoh3YIRLNI1EO1Bas2ppqFYnaRqNYwbumEhznZxKAobN8JNViK1i04ZspUDsRtz1MqMn6JXWRuiV5pCvihsjdKEWWP/Eu0bEELchoJFuoKSkGsXHGnBAJnCmW2+xlmy3rHnsFvOFYULohWLhMRO18K/a/7yWbXCsH9oTAjpBHOtVTUR4ywh5JMAVrHfldiGlTRhamuDgkW6AlOExHWckivsbFPZgiqezVtMQejVSMl0QdI4sxb7QJRhafqSqi8jpF0Qtbp6/kxNuQJRH5X7ZXN2fsKKNEs3JpkmJF2CESziKk7JVavNCmsB0cobPwj1LHYetHR9GVcYklaAoCNqtZGoLwgqAuuT6BU+o1kHFgg3+8yjBIFNR0k3oGAR13BKrtptVliLQim9iBNtLHu369ilVxiO7jkohDQjubkuc1NXJNPksxL2S25Qmhekt0s+36gKqyiqkCyuJiRuQ8EiruBk5Mouuar4uflinx5Ill0RgvXSwN0xQ7J4Nk3qgZQgVghawS/pQXxO8zatHKymII0L3QHqsChYxG1Yg0Ucx8maK6QFnQLRLEiWnWfe6C6NFYYFnzVTJc4D+dbtF6zgp/RgNufc5xQ0SxOmNzlpgbgPBYs4ipOrBSE/BWf32wrUjdgpWUhXULKImVRyS6YaFLLXwi/pQTv7XtWjWXTMqVYwhDSCgkUcw0m5yuTckSsNJEsV0Ys9YIfPhqQEICV47Y0zTeutqvFLetDp6BVo9hsQHeRnjbgNBYs4AqIzS9cvOSJXdvfSsUquVJdl1+FCNyTljr93WTTSgUgJtnOy4IcAlluf1byFNxB1WIS4CQWLOMLyzFXHwvJO1l01Q9dlUbJIJ6Bx6JQRtVoxolftgOa4fkgQuhG9AlYENcs0IXEZChaxHTTWTG4409wPUaS8w/UczaBkkU5QswQvnjciKu0f8EM+0Cs3I834TDb7PObS/HwRd6FgEVvZWF5wdHBzJte96JUZJyQLXd9Z+B5s0N8KXdkzHabO/TB7MOv2Z7XJr0ttcSUhcRcKFrENpARXF6wtMW+HXEFcLWxvht2SxdWFwUYVsxuRq7wNf18/tGfIuRxpzjf5IOJ952eLuAkFi9iCisBcvyROkvVI9MoMJYtYYXluxnJ/Kyt4vcAdcuX2yZCV3+fEohtC6kHBIrbg1IpBDfad3a69qocTkrU6Py0kGECulubtS5uHfbDX7kYqP2/hV6bTSSHELShYpGNQ1O50Iz8vRq/M2C1Z6Pi+MntViL+Zn75iq1wBrxe4dyuVb+XTx5WExE0oWKQjNhPLjha1a3IejV6ZcUKyIK/En8xduyKJ5SWxG6+nB7t1MlSwsI/gSkLiJhQs0jZICbohV3mPFbc3Aq/TzvQI3l9Klv+AXK2t2C9XwMt+1c1Uvhr63GwmYZoRLOIeFCzSNkhhuVE0msv7xK5K5HL2S9ZWwpmDNbEfJ+UKeDmC5flUfo6LR4h7ULBIWyCq4lZfGT+kB6uxe0D0siGzafbx8TwYfeOkXAGvCla3RliZYasG4iUoWKRl3EoNAj+lB6vBwSZroxyiESm7vXsXrBZsd/RNEPDCKt88WzUQD0HBIi2zcO2CuIUfo1dmstmCbYKIs2+O1PEmdrdi8CNemLJgqRcWPz/EJShYpCWQGnTzDDDv1/BVCbz6VJYjdYLM5tpqz8uVVyLNllo1ZDJCiBtQsIhl3EwNAi83F20FNiINLhjcvHDdufFQfsErxe1WWjXkeXJCXCIqhFjEzdQg8NniwYbo9g3xiD0VyuiRFYnGZWRynwSFUKl6O9ckwhCJxdR1wQMhk+mL5zse3Ox38FfwSiq/ULo0+pSxBou4BQWLWCLhcmoQBCF6ZQYrxLPGdTQitoBoYqy/X/qHxsRL5LJZlcLMpFPqPlIy+WxRmrK5jBSMo7GOIuSMx614kl45Z15Bp2+GSw9GDfHSB9dwOCKhSLj8nEg0po68kDOIWThalLRwJLb99bDx/JD1oD7qrnpdroDnWjM0MSy2aiBuQcEiTUEaZHVhRiIuJ5T9Xn9VC0SxIuGQbUvtV2auyp4bBlQ0yy0KRh4GUSYIVN6QpUw6aVxn1XbiVH2L3hRqbRK5UvI1k6svO2ZBC5Wvi38H/ZiUriFfEC78roghYOFotPxYCBJmPAaJ7PW6K43XFqIg8t0oUMxmo8QtKFikKejt43bvnaDUX9UCRe99MXsmyumVhXuPnjAO/jaFxsw/3xCJVHJTyRQimLj2Y5FwbUGrLfAh498ZCqWLshUySVhoOzCSMzbO/r6YEcHKqdtuUmiWA3MRyJXXzoMCeF5GfAoFizQETRPXE6vSH3N3jx7knST+bWlIVtSe9xTig6L38X1HpBMQlUlDplKGRBkilU5tGQIXUMttQMG0Ii5XJWFatCBeffGYkixE8VIZQ0TTWXEDL302sh4slGz2kliDRdyCgkXqgjoa1JkA1yNYAT8LhbegEald9Vgoeo/FB2RoYrel5xfyeRWNyqSShlRtSWprwzGZ0sXouDYXptd7vBVCKsIU2vFYo9uhDjZmLV/Fd0q/5pBKHw4aqcS0IVlZ1Pg4uAF7xWnwOvzq39i3ORHxJcQMBYvUZWVhXhXxdmM0h9/mD7ZD1uZ6rNWFa9I3OCTRvoEdX0PdFCJTWqZw267l6pAjLWe4Nt/3wkq/epiFS98Oq0L3nY83k7LiPzMksVhMooZoZY1oIC5OUGi6Ts4dvPoZzVvIoWLbj1CwiMNQsEhNULCsi3jDXTCsXiij0E1I7arHAovXL5XrsXLptCQNmUpurqtIVScRKi1K+BlmifKyQDXDHEHT5OqsMKuWLi1i5ov5uU6KVsEDUSMvzB2sh5VNUq0k5NGPOAw3MVKTpbnurZAKcoF7NTgYIJIVi9hXj7Uw9YYqPm5XqHTKDhcIh99Fyg6qZayWiJnlSwsYJAuXTCZTV95afi1S3G66OfTZc60Zqmj2/rDZKHEDChbZASIeKG7XsP7KWRAJQAuMsE3vcya1afywmPGHs5YC0dEoylRnaCmtFttadWKd0qwVgZN4OXqlaZYkzGYz4l5jE9KrULDIDuauXam47/Z+vBeP72mbU4WSzxatrcZPpFC5SydF/PVAhDLSpUFnXo9eAS+1siC9CwWLVIDIVSbd3WXMvVDgXo3dqUJ1Dp/PGJGsOIXKo3TiAPl89wzCa41Fa9FsE2erBuIGFCxSwXKN2qtuNBntRexOFaIaOptJSSbbe72s/EAnf2ZVp1iwcVuxiBcbi9aiB8/RiAfpUpCZeBEVvapxZue2YPVgb8syGZvTL5FwoavF0MQ5uhFJyvggPQgKTU7TCixyJy5AwSJllue6P1ut1888dQNSu4BbxaM0rCCSyxVcjfb6JXoFmr3OPAc+ExdgipAo6kWvgJuHZ0b2Sw1II/YVvCONhNSjH2pnWkEPbLaCXwaHb/eGt/bcnI3TAJrhl+gVYJkh8QIULKLwQvQK9HJ6UFNcBm9nwbuon5VXq9nEsxTn/IXKYfVw2PR41fPa+OkV98zvQ8F8bRoKXR4Qbfoep0UtZHotVv6Z2E6iLvRr8FP0StOoF1aBESziAhQs0jB65TZ+iTQ4TTFNaJ9k4UATNUJZXotCYFSQLux3s1bM/Lsqfm3T1xCqEC8tZfrEQDcB7XQ7tvpW6J5UTkax8Dv8FL2yQr5AwSLOQ8EinolekUpw4ETLCshHWHUI3xnNaYWIcRDOeiQSgX8HasPcXgVnB1rOyi89VKsnVVHEtHCZh0QXbI4k2p1SrvXz/Xje081mrIQAClaP46XoVS+NyLEKDmwIHuRE/U+BAzxkK6Kly+LPwvO8EMXC6++LhlyNWHWDsgzv+HdWyhe2+WLbhcYiUy9t6ERK2fyz/Vq71/C9ZIqQuAAFq8fxUvSK2UFrKOnKlaRLirIFcbIiW16IYkEEer11hFm+tqNfoXKUC10EqqULz68nWbb3UCv/XH9Gr5qRY5sG4gIUrB7GS9ErQL9qD0RA0qX+FhAoRLbqjVHpdhQLv79bI178AMQL5VSR8p65JF2lSFeuJFy1RCudKUhf3L5UYXG6gPgWNhsl3YaC1cN4rfaqwPRgx+jIFg7UiBTVkhm1Oo8n8L5BSVcp0hUzCRdSd+axUriVytg30zKVpaEQ0gkUrB4lubHuqegV4ApC+8BbiQHSul4rFvZGWs6NVW9BxyxchUJIiZaOSOLvbodkZQKQGix0NO2RkM6hYPUoq0vz4jWoV/ZTrtfKFUp9prpf61aUgRAlywZU+41Isd0FxDWbL3QsWXmfpwY1PF8j3YbVED1I1ohcrSdWxWtwh+gs5RVrHnifIVlpl0e9BBmVEo4WW19oiU6mC23V2qUDkhpstJ3nPBa9J8GEEaweZKnF2is3Au16yTppTKMIlP6aF6JUVkBkLW+ES5DqijrYx6mXwHuJaJZOG+peaqjHs9LMNWifw0bd3AlxGgpWj4Ho1eYao1d+pWFvn0Lz53gNvVItR9GyFbNo5fPbNVU6TYz3GM1rseq0YgyRFBdHmCNfNUcYVTW8VWKW133bvFO/xSos0k0oWD3G1sa6ETlorcCi4MJeqpf9igeBbdEqdiUv9fXikbFjiqK1vfrQvK3Vi+ygpqut+YalmrpYVT+vbgoX5DLMWj/SJShYPYZXx+L0YosGfbCjR1RiLspXqa0w3yM76GTMUju/S/fzMreWyOaLaWG3YC8s0k0oWD1Eu60Z3Dj77KUUIcXKGrrVBGjWQJV4m+rWEm7JFls1kG5CweohEitL0g5unAXmeyhJyN1965gbqJZHA/GN9CXVspV1MI3I5sWkm1CwegQUt6+1KVikdfSxgg5gL9V9vVgY7290ewmkEVFXny/18rILvSqSKwlJN6Bg9Qgobm+XvAtV7vmAnWlyf+485sJ41mv5HxXVMo5IUZujWkwSkm5BweoRVhc76NzucPaOdaj+JFyqmjbXk+lIgTli0E70oLrlRPlaX6oOvuZ6rXIKkbLlSyqiWvnOx/ZwJSHpFhSsHiCd2pJUckvaRR/UnDpYsQeWtyh603aNU7l3Uqj5En/7XoS1J+jWA+q6sH1fHZSzlC2/U904tZ19BVcSkm5BweoBVhZsmDvooGFx/9cdEIHSEgUBCdeIPnmdsvTteM3bvZhQ6Jw1ZKsQKqiViJQt/6FFC6nDVsf/cCUh6RYUrB4g2UH9lQZngRHHQlhCHKSWSPVC0a/uxSTl9NB2PyZsc+FSbpOHXv+gB1unstajWYyQk25BwQo47fa+qkYJljiDr0a7iLcPyFqm9DgTdUWDKFOWrtJ7olKKuM2VZr4Bf6f+mPVoFgWLdAsKVsBJ2NSawcmVhH7aAXrpGKx6QoWKLQpQxEuZap3y+8X3zXe0Es2qbtUQZtU7cQEKVsCxa7Czkw37eqnJaCdooUI9iq49olCRXqbVaFb5+yIULOI8FKwAs5FYbXmwcz3YsM99tFDplB87lxNSG0SzwsYHJJ0tMCVIPAMFK8Bs2BS90jhW6O6xHWI366y0UOEEmxEqQqyDz02fEc3K1Ypm8XNEugAFK8Bs2ixY6EXjxLBdr/WpcXtfjDqSSA+t7iPEKfDx0bVZSBvmhYPVSfegYAUUrB60Kz2ocaLQvRej+cVht6GeaplAiJvobvCEdBNuggEl4cBgZ90p21Yh6BHD0lLF1B8hhPQGFKyAYkdz0VogTRi1cQFOkP3KLFUsUCfEO0RjcSHEaShYAcSu5qK1wIT7KCsaGsKaKkIIIRSsALKxbm9xuxn0w7KzEisoESxKFSH+oZDPG59TjE5iTwfiHA6sCSPdZmvdmfQg0P2wbP2BPgUiFTWMCkvD41EpNwAlhHibXCYlq7OXKVjEUShYASNrpAZTyS1xkqyNixPd2L/ZLT2IVsWjhlgZF6xUYn0VIf4jl05KYvaS5HNZIcQJKFgBY2vDueiVJp8v+CrwZIfEMVpFSPDIZzOyNn+VkkUcgYIVMNwQLPhK3qbZhF6P0Kt+OhFGqwgJEuHw9qEPkrVuSBbShoTYCQUrYCRdECyQ9Vr7dZuJlKJVGCSLthSMVhESHMyCBXJKsqYkvZEQQuyCghUgUHvlVHuGahDBsiP65LVkY8SUBmS0ipBgks1mdxS45/M52ViekdTGihBiBxSsAOFW9EqTsyFN6AW9Ug1Bw8VoFcWKkOCDMWKpVKrmKsLN5TnZSiwKIZ1CwQoQW5vuClY2569i92rM9VUQK6YBCekdIFf1JCtpCBYli3QKBStAbLkcwcJuyeZ50q5gFivWVxHSu1CyiJNQsAIC6q/yXbCdjovdXQ6BUawIIWaaSVZybUkIaQcKVkBIO9xctB7YJ+VsatnQDlYlSddYUawIIdVoycrX6D+ztbogG8uzQkirULACwuaac/MHm5HJebcSy7wqkGJFCKmHliysMKwmvbFKySItw2HPASGTdqc9Qy0QxcL4HESHWv5e6Yx6rSIgVng9XBFICGmFTCajrqPRysMjJAsMTewTQqzACFYAQO1VqkspQk27Kwrt7uSuC9jZboEQ0i6QLC1aZhjJIq3ACFYASHdZroBeUdhOFMsuooZYRTkjkBBiAzpVGIvFKh5nJItYhRGsAOB2/6t6dKsvli5gj7GAnRBiI5CsepEsri4kzaBgBYBupwc1kKt0tjXF6iSNB5mKs0koIcRB6kkWVheyTxZpBAUrAKS3vCFYAKucW2rb0KYYQajQzyrCLZgQ4jCQrFqrC9mMlDSChyefgwJ3twY8WyWTtZ4qjLQReoqWmoUyakUIcQtEsepJFgdEk1pQsHyOFwrcq4FcZSymCiMtFMXrFYKstSKEdIN6koUB0emNhBBihoLlc7xSf1UN0oRZC5N74EmQpmaohqGlETeEENItIFi1xupsrs5JLpMSQjQULJ+T9Vh60IzVVYWQpnqSxU7shBAvUW92YSGfl43FacnnskIIoGD5HK9GsAB2P6mMdclCq4WiTBXbLvTH2DCUEOI96klWLpuRtfmrxuNdHNBKPAMFy+d4WbAA9j9W67EQoYJMRUrNQhmxIoR4lXqSlTcka31hWgihYPkYrCDExeugHsvLA6EJIaQdtGRVk01tyubqvJDehoLlY7y4grAeKHinZBFCggYkK53eWQubWluW9CZXFvYyFCwfk/NB9MoMJCvL0gRCSMDIqX6EO7u9b67MSYFF7z0LBcvHpFP+iWBpUI9FySKEBA20b8jnK3duWFmYYNF7z0LB8jFebtHQCEoWISSIIFVYq+h9a4X1WL0IBcvHZNL+FCwAyWJNFiEkSNRbWZjaWJXU+rKQ3oKC5WP8sIKwESx8J4QEDchVrXE6GArNJqS9BQXLx3i9B1Yz0KU9yi6ihJCAAcGqlizUY20uzwjpHShYPsXP0Ss0EEW3do6/IYQElVozCzPJTRXJIr0BBcunZHxa4B6NFIc2R7jlEUICTL0mpElDsDgUujfgYc6nFHwWwUKkCgOdYxFGrQghvUHdeix2ee8JKFg+xU9NRiFUiFphoDMhhPQSaEBaK1XIVYXBh4LlU/J5fwiWlitGrQghvUqtVCFXFQYfCpZP8UOTUcoVIYTUThViVeHW6pyQ4ELBIo5AuSKEkG1qrSpMb65L1ocjz4g1KFg+xesRLMoVIYRsA7lK15i+kVxj24agQsEitoPVgpQrQgipBMOgqwdCo+A9vZkQEjwoWD7Fq6sIVXd2rhYkhJCa1BoIvbkyZzyWFxIsKFg+xYud3Iu9roQQQkgdIFfVJ8goeE+usW1D0KBgEVtgUTshhFijVsE7+mIxihUsKFjEFihXhBBiDUaxegMKFrFMoc7jLGonhJDWYBQr+ESFEIvUcijIFYvaCSFeZWSwX9507Ab58D23yckj+2VkYKD8tesrCTXX9cLMokzNL8mZqevqkljfEKfRUaxodPswrKNYA6OTQvwPBYu0BSJWcSMtGGbkihDiQSBWn37gfnn4wXeo27U4ODmuru85cbzi8bPTc/L65WvyrVfOyuMvnHZsNBmiWJFIxNifbu9IEcWiYAUDChZpGRa0E0K8ihWxasaJg3vV5WP33yUbqYw88twr8tWnnpdnz14UO6kXxUJ392jfgBB/E3rwoU8VhPiO6UvnZWtjvaXvgQ91+semXBFCvMpbjUjU7/zcJ8uRKbtBZOtPvvmEfPV7z4tdIHrV19dXEcWK9g3KyJ7DQvwNBcunXL3wuqSTSXETyhUhxItAqD734x+WB95yq7jB9OKK/M6f/Y08/doZsYNYLFYRxQIje44wiuVzIsdP3v5bQnzF5vqqbKyu7Bi54CSUK0KIF/n0g/fL737mU3LyyAFxC6QeP3rfHXJ0/z55/co1Wdvq/GS3WrBCkYjE+oeE+BcKlg9Zmp2WbCbjmmBRrgghXgOS87u/8JPy8PvfIX2x7pQT33Jwr3zgnjuVYJ25Oi3tglqs6mL3fDYtfcPjFY8Rf0HB8hmIXm2tJWoODQV2fxYpV4QQr4FVf//br/y83HHjEek2w30xed8dp2RseEi+d/rCjt5WrQDJKmP8nGgsLpFYnxB/wlWEPgNyBeqd1RRsrKijXBFCvMbnfuJDaoWg1/jp992niux/7d/+iUwvtt6RHSfMkDPzvj25kZDY4KgQf8JO7j4indyS1Namuu1G2Jgd2gkhXgGF7F/4zX/sSbnSoLXDH/7aLxivdUJapdb4nGxqk53dfQwFy0esLS+IW0TCIeMihBDSdR66/y75wj//ZTl52L1C9naBCP6Hz/0jObx3t7RKtWCB9MaqEH/CQ6hPyKRT5egVCIfDammvEyBqFeP4G0JIl0EhO1KC6G3VbtPQbrB/fER+/5/8fMuRLJ0mNJPecn5sD3EGCpZP2FitzOkjRVjrbMcOomGmBgkh3UWlBI2olZdTgo3A60e6EMXvrcA0YXCgYPmAXDYjm2uVYeJ6qwg7BWLF4c2EkG6C3laQK6c6srsFXv/nf+nTRsbB+k6VacLgQMHyAWvLizsew5BQJ0BhOyGEdAOkAX/bSAf+05/4sK9Sgo24+6aj8osffcDy85kmDA5s0+BxakWvaq02sQMWthNCugUK2BHt8XvUqhaf/dB75fkLV+XpV62N1qkeAJ3LJFVZSKHAyXZ+godTj7O+urOfilPRK6YGCSHdQKUEf/MfB1KuNL/1Mx+3XI9VfQJdMKJameSmEH9BwfI4yc31ivs4g3FCsBC9CjM7SAhxEaQBUQiOlGDQwcrCX/7RD1p6bq1IVTa9JcRfULA8DMbi5DKZiscYvSKEBAGMu0EhO657hZ94512W/r0QrOpFTIxg+Q8KloepLm53svaK0StCiFugt1Wx43lwU4L1sBrFqhYstmvwHyxy9ygYi1Mdvaq1usQOGL3yD6PDQzLcF5dINC77xgZrPmd2dVNy2bTMJTYkm0kLIV5Bty3wQ0d2p3jL8UPyjjtvlydffKXh86oL3dVj6ZRE+waE+AMKlkepXjkIMlXCZQfoe8XolbdA9+dTNxySg7sm5JaDe+TQ3kk5MD6qCmSH+lrv3n99JSHTiyuyvpmUM1PXZXV9U85dn5Nz1+ZkJZEQQtwAhey/9JEHA9N+oRP+xU99WD7y8mnjpLl+RqLWyTRWE1Kw/AMFy4PUayzqRPSKfa+6CxoQ3n3zUXnrLcdUbQbO7O0+AEHOcAHvffOJiq9tpDLyuiFdkK3Xr1yTs1Mzcubq9YY7fkJaAVEr9LbqpVqrZqDg/QNvu0P+/unn6z4H+3tcQqaxGtnUlvQNtz5ImnQHCpYHSdUoZnSi9gqfW/a9ch8I1ENvv1vuPXWTakLYzTN6RMTearwGXETuUY9p6TpriNZjL76uol6JdTY6JK3zwJ23Krli1Gonn37gHQ0FC1SnCbOZlBD/QMHyILWK251qzUDcQUvVA3ee8vyZvFm6fvp996nHzk3PyTNnL8rjhnCdVWlGChepjxrS/OMflo/df5eQ2tx5w35526mb5ZnXz9d9TnWhe97IbqDQPRTimbEfoGB5jFrF7c4NdRbiMJCpn/nAu7oeqeqUWw7uVZdPl4TruQtX5PGXz8mzxsHh9OUpIUTzVmOb/x0jatWLKwRb5Rc/9J6GglWzH1ZqU2L9w0K8DwXLY9QqbncqehViAMsRIFKffuB+efjBdwQ2NQJhvFulFd+vCuifNaJbf/P9l+QHxjXrt3oTNUfwZz8pD7zlViHWwAnYxOioLNdZbFJLsBDFIv6AguUh3CxuZ+2V/WBn+dmPPNBzxbyIVCAVhAvqtx5/+aw8/doZ+ZZxzdqt3oArBNvnI/fdKX/yje/U/FqtQvdcmq1X/AIFy0OwuN2fQCweevtdXCUlxfqtj9xzm7oASNYjz79C2QooXCHYOR946x11BQvsWEmYTQrxBxQsD7G1Vhkmdqq4PczcYMf0QhrQDtAWQreGoGwFB27/9oFi9yP79snV2dmaX0cWIxzePiNmitA/ULA8AtKDqa3KCFb1ChK7YOf29uGBpX0oW8EA0arfZhG7rbz3jhNGFKu+YJkpqLIRriT0AxQsj1ArPehE9Iqd29vnY0Ya8HM/8WGKlQ1o2dI1W48+94o8/uJpFsh7GKYDneP9d93WsA6rGkSxIrE+Id6GguURNlZWKu7XmqZuB0wPtg7P2J3DXLM1m9iQp189q1YjNlq6TtxFR21/6aMPCnEGzCfEnNFa0dzaI3NSFCwfQMHyAEgPZtKVhYtMD3YfnrG7y77RofJqxJnlhHz/9Qvy1aeeVy0giPswHe4u2M8gkltNLcEqMNLrCyhYHoDpQW+BgwnaLeDAQrrD/onRsmyhz9bjL5+RL3zrGbk6MyvEeZAO/6wRsWLU1j3uuaW2YIEdrRpy9h8fiP1QsDxArdWDTA92B6YDvQf+Fuggj8vZ6TkjhfiyPPb8KzI1tyDEXiC0n/0Ixaob3HPimPUn55zJcBB7CT340Kfs72JJLIP04OyVNyofy+Uk7UAzuXg0xP5XdWAXav/xwsVr8tWnX5Lvnz5L2eoQipU3eO8//d2adVh9fX0VrRqifYMysuewEG/DCFaXcSs9CJgerA2iVp//7KdZZ+IzUBiMi8iHKFttwBor73HyyAF55vTOBR7VdVj5HHth+QEKVpdJb21V3HcsPRgWzh6sgrVWwaFath598XWmEetAsfIup44etiRYxB9QsLpMdQTLqdWDrL+qBKmQP/y1zzAlEkC0bP36j75f1WxhFeJjz7/a86sRe3VWpp84cXBPzcd3RLDYzd0XULC6SCadklym8oPilGCx9mobDqbtHU4c3KsuKJBH64dnz12Sx144bVxf7IkO8gcnJ+Sht7+F0SqfcPLw/pqP12zVwG7unoeC1UXSW+4MdwYMYBX53E98iCnBHgWtHz567x3qAn5w4Yr8wIhqPfP6BXnu/JXAdJGHSD309rvlgTtPMVrlMyDE4XDE0rZYyBmCFaVgeRkKVhdJbq5X3MdZihO5dlV/Jb3Nwd0T8ts/+wkecEiZt950VF1+8UPvVSN7Tl+ekm+9fE5evzLlO+G69YbD8p7bb1HbN7dx/4LJBthXsXYwGFCwukgm5U739l6vv1L1Vv+3X2C9FakLDmzVcoII1+uXr8lzxvW1+UU5c/W6eAVEOtA36a23HDciVbcy/RcgThhpQiuCVSjgBICHcC/Dv06XSCe3dgiVU+nBXq6/Onn4gPzhr/0CD0CkZXSE6+EH71f3dZTr3PScTM0vydmp63J+ZlFWEglxEsjUySP75cCuCbn16CF568ljcmB8VEgwObRnt6XnFfJsNup1KFhdojp6BZyKYPVq/Oqh+++Sf/rjH6ZcEVuoFeUCEK+p+QVZ20zK2el5SWxsqIL6ta1kuZB+dnVTctnazYMx5HdkoF8OTIzI8MCAirTiPqTqoCFV3H57i5v379rxWJ4y5UsoWF0ildzZ/8qJ+ivIVS9mCCFXv/NznxRCnAbihUgpYP0T6ZSJUUYngwIFq0u41Z4h3IPt2x9+//3yOSNyRQghfuOWA3uFBAMKVheATGXS7hS491r06pc++qBqpkgIIX5kv5EqttKqoTguZ0CId2ETjS6QTad2PObcCkLpGR5SA2spV4QQf4OebcT/ULC6QK0Cd6dmTfVKBOuBt9zKmitCSCAYGx4S4n8oWF2gusAd0SsKVvugwPi3f5ZyRQgJBgfYsy8QULC6QHWBu2NyJcFv0YAl7Z//pU9zKTshJDCgTQfxPxSsLlBd4O6UYAV9BSGk6g9/7TPs0E4ICRRoLkv8DwXLZTIuFrgHPT2ItCDlihASNBjBCgYULJepNd7AyRRhUPnsRx9Qhe2EEBI0WPIQDChYLuPmCsJwQP+6EKtf+siDQgghQYSR+WBAwXKZbHZngbtTghVEsONhl3ZCSJCxkiIMBfUMOkDwL+QyuWy24r6TchXEFOHv/PyP8eyOEBJoRgaad2gPhSJCvA0Fy2UKVeMPHBWsgBnWpx+8X956yzEhhJAgE4pQnoIABctlqlOEThE0uULUinVXhJBeYN/oYMX9MNOBvoR/NZepbjLq3AzCYBnW537iI1xZQwjpGSKxuBB/Q8FykbyLLRqCxMfuv0seuPOUEEJIr7BvjPMI/Q4Fy0VyNdKDFKzGHNw9IZ9lapAQ0ms0OTSEIzEh3iYqxDUKDqUDaxGUDOHDD9zPVYOE9ADT09fl2rUZuWZcr62ty1piTT3e1xeXyd2Tsntyl5w6dYvsNm73ApEoU4R+h4LlIvlcTtwiCH4FscLKQUJIMEml0vLSS6/K62fOGkK1Xvc509euqwuee/DQAbnzjtvk+PEbJMgM9zNC5XcoWC6SL+wUrLyLUS2/wdQgIcHl9dfPyXe/+5QSKM3ggYMydOCQDO0/KNH+AckmtyS5siyb169J4uIF9RwtW4hm3XPP3TI6OixBZKivsWCFozx8ex3+hVykkGOK0CqIXqG4nRASLJD+e+TRbytJAhCpA+94j+x/x7vV7XqkVpbk+pPfMS7fVvchaNeMn/Hxj38kkJIVCm/3wmKbBn9CwXKR6mgVm4zWh9ErQoLHwsKS/B9/9w2VDoRMHX7wg4ZcvdvS9/aN75JjH/64ev6r/+HfSWp5Scnal7/8tUBKVpjNRn0PtZh4DkavCAkeiDh98Yt/peQKEau7PvebNeUqZJwdImJTL2oD0brjl39d9t71NnVfS1aiTg1XEAlHWZ/lBxjBcpF83r0idz/D6BUhwQJy9aiRFkTU6tiHf1T23H1Pxddj0ahEDWnoj8d3iFUmm5Wt5Ja61uDn3PRjP6Vuzz3/TFmyfvInP6FWHQaNUNBGc/QIjGC5SMHFFKFfYfSKkGCh5apvwog8/cqvV8gVxGp0eERdBvv7a0at9HOGB4d2iAYkC4XxAJL1xHefkqBgbjRa/e9mDyx/QMEKKH4933ngLW8SQkgwQM2VlqvbPvN/Vek9AGGAMEGcYhZXw/UZ0a0x4/nVsnHq4X+ofj44Y8gcWjkEAZ5/+x8KFvEUn36Afa8ICQKIKKGgvVqu4rGYTIyOKWFqlUgkIiNDlcXs+Lk3f/Knyvefeea5itYPQYSrCv0B/0rEMzzwllvZtZ2QgPDXX/6apCPxCrkaHBhUgtRJTREiXkPGzzEzevwmVTgPIFfPPPucBInq9ysU4gpDP0DBIp7hfXfcKoQQ//PMM8/LVjpXlisIAtKBA319Ygf9xs+pTi0efvCHy320XnrxVdUjK6iwyag/oGARTzAy0M/idkICAFKDSNOhAB1yFTHSWeMjo5ZrraxSXfRe7Kv1w+X7zzz7vAQFriL0J9Rg4gmQHiTeBCmXxcVFVbCcSKxJOl1Z3zIyMqKWxu/evUsmJycDuUyeWAepwSMPflB23Xq7kitErpyoGcLP7O/rVy0cNEgTXv/ed1QTUnSKRxTr0KED4ke0U9WSK/bB8gcULOIJ3ncnBctL6CG816avl0eaWGVy96QcOrhfbrzxBjl40J8HN9IeSA2GJvepSJKTcqVByjGdTknO1ALnwP3vlkt/+2V1++LFK74VrI1k8USmpmCxTYMvoGCRrjMy2C8PGoLFVcndR6d30LuoGqRg4hMTahivGUQLMJQ3vbysrhcXFtUFgjYyMqwOcEEeykuKYNu5OLsgN//kz7oiVwDygSjWxtZm+bE9d79Nph79e7UtnjlzVt72trt8GVVdT2XUNdOD/oWC1UX4wSlyz4njlKsuo1ZeGdGHl156peJxrM5Cqmfs+M3lho6N2Lw+LcmVJVl67RVJXLoga4Z8QdZwOXXqFopWgIGYj93zDumfmFQrBd1qJYB2D5uGTOnGzTgRQDNTDIbGdn3mzDm5447bJEgwguUPKFguEmHevCYPcPVgVzEP4NUgCoBZbxCsVoCE4QIpAxCu6Se/rWSLohVcEL1aHByXm43tZsAQnIiLg4p1FMtci7Xr1jcrwQJvXLzsa8GqdSIeinB9mh+gYAUUnMv5JT524sh+Id0BwvPd7z5VbswIoUKBcqtiVQ/I1s2lmXHzzz0jVx/7+7Jove1td6sDH4vi/Q+iV0c++pNq3I1drRhaATMMzYKF7RcNTnWxO7Zvv21nuUz9GqxQiILlB/hXIl0FjUVPHmYhdDfQM+K0XGEF1m2f+ceW5ArpH32xCqJid//Gb6qu2zj44aD8xS/+VaD7FfUCiF4lb7xNRvbsU9GrboDtsLoNxJ67tmceXjSiWH5lxxxCZkJ8AyNYLhKJVb7drMEyoleUq64wPX1dyZXm2Id/1BCsd9d8LrZT1LnEjB171Ej91JIq1L9kcznJ5/OSyWYkm81WrOwyA9HCRUe0vvzlv1XRLBQjE/9xKRuR/ffcu6O7utvEY3Fj28uW76NucEr+Xt1GGtyvcNCzf6FgBZSCT3KEKHAn7oKIwyMmubr5kz+tioKrgUxhtImVBpE4COjn6RlzOUO4tlLJurIFyZp40+1qxdczT37biKidlY9//COszfIRaeNgn9g1Lod27+36fDzMONzYzhKqSCwK3rGa8OLFS/Kud90nfmJ2dbPm45xD6B/4l3KRcI35Ub3+YTl5mPVXboNGkLqgHfVWteQKYjXWYfdtFDqj2/b46Ji6rvWzcAA89uGPy52//BuSjsaNaNbXjGjDohB/sFIIy+7jN3piP1YrZT1SSnfjpMKvA6B3zCFkitA3ULBcJOziypqCT/oesP7KXdCKQcsVIkjm0SLA7plxGkS18HNxqSVaKIbH3Lr+m29VKcNafbiI98hN7u9a3VUtqretMVM9IdLifiKXrV3kHmaBu29gitBFIhzQWcGpIwdUk1HiDrqJKECR+ZEquXKjOSQOgDHjd6TSabXqy5w6xNw6rDicMl7bo49+XT2Glg7EuxTG94iXiBrbV8o0ygnbuQbbv68IcUyO3+ERv8s4VejuhwDW8ADlyk20XIHDD/ywEhozbjeHRM3MVipVsbxevTZD/BDR+vZffkHdp2R5k+TgqGRj7rdkaEQsUnlIGzI1x/Vb6nl2daPm55FF7v6BsUYXqdVo1DHB8oFhcQWhe+DsXafdIC97jfSgGfQvcrM5JMC2j987MTqmomdm0KgULSO++/wrTBd6lI3xfeI1sA2b96k4iYiWUph+W0lYyOVqPh5ikbtv4F/KZSKxSsnq5VYN6IFF3OGJJ54q3z7+4R+t+BrSdt2so8FZOgrq+6vqvnRd1lOnL8jVlQ0h3mJrZJd4keqoT7yUJkwZ0VI/kc/nah4fIh6LGpL6ULC6jHMpQu+HsFjg7g5qCG+p0SKWrlc3EsUKv26DzwH6KFX3UkIE4tTD/0Ce+O5TsrK+KcQbbIzvlXzEmxUm0apI7ND+YprQTzVYG3UGPTN65S/413KZqEsFin5IEY4O8kzMDcy1V+jWbgYpOi+1CkEUa9yIZplThpCs4z/xsDz61A9kM5MV0n02h70ZvQLV23PUVOuZSKyJH1jbTKrr6n9LJMa6VT9BwXKZ6josx1KEPhCs4QHvLO8OMjp6hRVVeggzgMT0xb0nuaijwWrGasna90MPybfPXpUcz+K7ztbopHiVaimpXszhBwr52vVXbDLqL/jXchm3BKsg3ncs1mA5DwrEdYNF82w2gJV8Xt1hh0stI8yShZqs2OEb5KVrC0K6R7ty1Wfs+/aPjMue4VHj7+tc7WkkXJkijJrqC9fX/ZEmnEkUaw7ZZNTfULBcpvqA5miRu4cNi/2v3MHcXLF65aAXo1dmakkWInAzqYJMRxj97BbtpAchVzfs2i2jRtR6YnBIDo9POiZZ1StSIz6MlOcyaXVsqD4+RDxa90ZqQ8FymVqtGpyKIng5gjXCHliucK0kWEgPmlMlXo5emaklWfvf8W55bWpWzcEj7pMaGpNWOTg2UXG/39gPTgw4s7hih5T0+3NfU3sFIfebfoKC5TLVbRqcxC/jcogzoO+PHotTvXJQD2T2A7Uka+y2O+WsMIrlNun+oZabi44aKbpYjR5riGQ5EcVqlBVIJPyRIpxNbNb8d3AVob/gX8tlXI1geViwDu32X+Gp3zB3rjYXt2PHHfNZLYeWLH3QQV3Net+gzA1xO3ITdG9vleG+2lEXzNQb6x8UJzDvU/sn/LeNYA4he2D5HwqWy9Sa+O4UeUawehpz52rzyJB4zJ+pNXxuMM5Hg5TnzMgerip0kWQbBe6DsfrR0qG4uymv0dFh8QOzqzsjWCEOefYdrJjrApFoXPLpZPk+l94SJ1hYLEawEO0x11/5LXplBl3n0Yx0Y6vYdDQXjhhRrEk5sDYvxHnSfY3rphZPvyKzP/i+cXlaNhfmZM+NJ+TEv/vjus/vjzlzCPL7hAy0adjRAyvO+iu/QcHqArG+PsmYBMsp8ipH2LujeHqd9VLn6kFT9ApAUtwkbBzs4pGoJLMZsQM0I83mspJKF9tPIIo1ubki8Zw9P5/UBunBet3bM5sbcu6v/lwu/t1XKx4f3d94WgPShOi8nq0zd69dsM3Z+xPdZW0rWWMFIRd1+A0KVheoLlR0LILl4RRhYnNLiLPortXmPkDYabsZMZ0cGjEuxbTMunFSMZdISDbf+aEPUaxsNiu5fF7dv25I1g0r00KcAwXutUCk6qn/17+QLeNag+0sYlz233xCmtFvCP96zs86ZD9rxv6xWrDCUR6u/QZzU10gVjXUtla/EztQzUY9KllrFCxHMc9dM0ewojVWczlFzEjfTZpqpoaNFMeRCXv6H+HzYq7HWhocZy2Ww6QGd7ZnqJYr/F2GjbTfrr6YTBiX0dHmRfExh3s7Zbe29zXDw/6owdpI7hxMHfF43zqyE+6RukA4tPMg52RHd9J76O7t1URcFKzhGv2HsFwfUS07wL9lwBSdQy0WcY5cVQ0Q0oJmuULEClI1EI2oFB2IDzUXmrDD9VLZ5LZg9fX5Q1LWkzs/v2GmCH0HBasLxGp8yHutVQNqDIhzpNPbZ8DmAnc3i3/rrRBDg8mBmD19uDCsWkfl5od2MYrlINUpQtRcmeVqzJCriMeLy/v6fNL/rZDf8RBbNPgPJnW7AHphQajy+e0PkVMHPrRqcC9mYR1Mi8e/mBE2d4k6mI5JXL6oLkgbZTc35eD/5ZeNEEbtAxqiWFMri2IHgwODklhfUysKFwfGZe/GkhB7qZarqe88Wi5o97pc5ZLFk7mREX+kB8H8WuUJaIgjcnwJ/2pdorpVg2MpQg8bzLXFFQ58dhm7NzOkiS59/W/UwRa3zcQ++0/qft+gIV6IYm1l0tIpWBWJlYXJVEpW+0cpWA5gTg/i73z2S39evj8Yi9SVq/RG9zunp5aL28PIqD2paTfI5yo/FzheEP9BweoS1a0anItgsVUD2cbOZoXodfTiH/yvO8RK09ek1godvu0QLDDYP6DaNqC7O2YUsmWDvWRMB/hLhkzr1GC/kZ7tb1DXtz43I81Yn5s18snOzCUEugZr1FcRrMpFQCxw9ycsWOgSsfjOlYROAL/yahDrzNR1Ie5iV0Hxa3/6H+XZ3/vdslxh++2PRmQkHpPxvuKlWfRibMC+WYLq95dGsiwOMipqNzqChfTv1e88Vn4c0atGbFgQrNf+4k+NlPKGOEVqeVldj4z4J4KVq+oZF2GK0JdQsLpE9UxCR/sTebbQPSXEGeIOnvG+ZEStzA0lsWoMy/JHYkaqLhKWWLh4yTQRLDSZtKvYXb0OIyqMz9F63LloSK+SjRa3p2vffrQietWs7mr54nlpxuLFC7J6+aLYSd5UG5FaKaYId/tk/ulGamf0NRJjF3c/QsHqErVWEjpZ6O5Fri8uC3EG82qpnGmZeqcSf+5LXzAiGI+q29heEalC36NakTEr9TfXvvZXqmDaDnQUC2lCria0l0KpyWUr0SuAFGGj7SC1vi7zF86qFYl2UjAJVtZnRe7rW+yBFRS4F+oSeiWhGaciWF4VrGkKlmOYDybmPkCdABE6WzoQarmKNdhmly+ea/ozd994QtVx2SVZOoq10t+8wSWxTtaIoOBv1Er0SjP19Hfqfm3+jbPqGqtP7UwTmgUrvawjWP7okza7slZxH5M/OOjZn/Cv1kWqV4Y4W+juPc5MNa/PIO2jo1h2CBZqb8wrx0aM6EW0yfa6ZCE9tPemW9T1a3/yH9VBtlN0FGsryjN+O8mHI4ZgbUevBmLWm79cePTv6n7t9W/+rbpGLZ+daUItWNj2cfGLXIFstmoFIdODvoWC1UWq04SONRvNiyeZXmAEy0l01+r08vb7bO691grnvrTdVHLISAn2WegIb6X+ZnTfAbXaEAdYFM1vmubZtQuiWGs1xrqQ9lk3okCLp19Rt6PGfirawsng7Csv1NwWkD68/sx3t5/3g++LHZijVxvXr6nr0VH/rCCsrsFietC/ULC6SK2VhL00kxDd3NnR3TkmJ4tFvamVzkQWB1adwkNaaDBqLXqBA6uVOqzB0uouCBwK6DsFn6GBPp7120U+EpWlklyBvkjrh41n/8POv+vrX/1vRmh0s3w/ccWeCJZZsHST0YMHD4hf2ExnK+5zBaF/oWB1kfjA4I7Heq/QfUWIM+hl6brRYruYC5AHY63NBWhUf6PZNTFRrueBzF36+lelU+JxNma0i+r0YDuCBdmGZOm+WC994T8ZgvUXqvGtHv6dsClFmDNFaXUEyy8rCMHqemUtGlOE/oWC1UWqWzWAXit0f511WI6hDyqoQdFL1Vutx0PKTqeGIEH9LQ6LblR/oxkYHpaR+PZZOmq9Ok0VZmN9hhjwzN8OEMEypwfbHYkDofrrX/yUfPHhjxiC9Z/Lj+uFEkgT25EiLhTMgjWtrn0VwcpURbCYIvQtFKwuApmKxGI7HnMCzxa6X2WzUacwF/bqA02hxYK8c19qP3oFrKYJcZDVqUccaO1IFVbPzyPtsXD29fLtWLjzCHv19mD+mWs2RLEqe2Aty8FD/pErkDNNN+AKQn/Dv1yX6euvTBP2WqE7e2E5hzktotOEuRaL3DuJXmlUrU0DdAH0YDRaTpHj9y6a6n7aIdM/KKRzrl2+Wr7d1+Y20IiQaZTX5nznESy9kAOR200jRbh70j8rCMFcYrsujelBf0PB6jK9XujOVg3OoqNYGzM6gmV9I4Dg6JWDsQ7EH6mhelEsPK6/hs1+2BQl67T5ZJYHJ1uYvrItWBEHSkRjpp+5tTAvnaK3cV1/deONR8VPmMfkMD3obyhYXcbNju45D0ax0Gx0bZMrCZ1C155sllKErbRpMBc290fbj1xAoL73v/zrml+bfeX5ivuIkmmZ6zSKhTos0jmLc0XpQf1V2IF9U9iUAttamJVO0ds4tnn0gvNT/RWYN0WwYn32zesk7kPB6jLR+M6z7F4rdL++xDShU+g0Ic7mkTJpJYK1Wlo2j2Nqp7U3V59+Qq0cq6ZWEfyQTVGszIB/eh95lYXZeUmVWh2EnTnvE7OzZUxtG9pFb+OrFy/IIZ/VX4F8IVe+HQrZn5Il7kHB6jIsdBd55uwlIc5gPsDgjN5qBAuruXTBccym7RErx8yShdtThnhVEzOtVEMEq93l+4xgdc7a6mr5dtTB+Y66VYMdNVi6znDTSIsfO3aD+I2C6TMaZQTL13AdswdAoftmZntH5lihe6FYi+XQiWjbnJ3iSkKnwEzC0dERSSTWVBRrvDSaphlmqYnZuD1CslCTBRqtLsQolvVSw0WkKt90w3FpB9RhRTNMQbfL2mqifDsa9tqeozY4iUBbEizs8Ft6EKyXOrmz/sr/MILlAdwqdAd5D9ZhsdDdWfRZfMJImViNYDklWMBc2F6P/nCk/BnoZBB0PsJdXCeYI1iRkPOC1enAZ719oy0JFnj4aUSOZr003SISiQnxN9z7eIBaHd17qQ4Lhe7+ODf2JwcP7lfXECxgRbISVy6Vb0e68MfBsTwe2W5A2W6xezbOlYSdsDC7nbKLOihYkdIeINOhYOn04NJrr8ipU9aitV6jkC/WYEWY4vY9FCwPgAhWtVBFIs4UN+Y8aFhYRXiGaULHQB0WVlOhyB2Slcvnmn6PjiSoUSah7ujvgCn61G4Uq8Bu7h2RSqXUdcgnZ0C5XHHb3vBp/RWYLa0iZIrQ/1CwPEKsajitUylCXYflNVjo7hyQq0ndD+v6NUvNRnWxcaSLXaRjqot18XMw+4PvSzuw0L0z1ks1WBGfdBPHyQPqr8bDeV+mB4He5sNMEfoeCpZHiNaow3IKL9ZhsdDdWW48XjybXzJSbfosvxG6wWi3Ixd2pAlJ++gWDU5vB7nSaV9ssLPxRkh/J964IKdO+jM9CDAqB60mmCL0PxQsj1A9MgeC5VQdlhcbjj7LCJajnCwdcJAiTDepczHXwUS6XB0XN30GFl9/VVqF3dz9RbRDwUJ0Fv2vjt7U3qpTrxBl7WAgoGB5BFcL3T1Yh6U6um9xOb1TqI7WpZ5Y8y+/2PC5na7kshNzg9MlRrBcpWIFocOirVv0xYY6FCwjOjsZyshgzN+1d5Eo04NBgILlEdxsOOrVuYSPvXhaiHPoNOHyG+csf0+3U4QRFcktvoh2G44S76O7r3eSIoRcrV48L7e/5U7xK7OJ4skN04PBgILlIarThGEHOyd7MU14lv2wHEWnCZdfe8VyP6yQB5aP6T5cSF1uLrTW6Tsf5qgRr5Mzne3FBgelXdTqWGP72Nvv/5WjXEEYDChYHiI+UDkWwdE6LA+GsJ49ywiFk+g0Ido1LJ0/Y+l7Ch7YTirShK+1liYsRNmmweuY90UDu/dJu2SNCNa+XeMSBLiCMBhQsDxEdQQLOFeH5b12DWeuXmcdlsPo1VVzL79g6fle8HBz/Y+5ASoJCKZtLNpBBGtzaVFuGg6GmIRZgxUIKFgeAoWN1ULlZJrQi+0aHnvxdSHOcfz4DSqSdfWp79Z9TqcruewmYopgZTbXhQSLnMmwxm5of/XfCdmSeC4jfmbfaPGzF/JJ3zHSGP4VPUb/0EjF/V6rw/rB2TeEOAfk6uTJE5LZ2pTFc7Vl1lxonPdAnNM8A6/VCFYomxXSHiNjY+XbTm4H5ukSA7v3SjtE0ykZXmmtPs9u9AzZmpcWfg6jV8GBguUxag1+7qV2DY+9wJWETnP8+FF13SiKpZfLe2UT0SsJMxuttZAIWxgLRJrj5GaQNW1ko21GsIZWnZUr7IcRSY0Y++JYNCJx49IXK17641F10fdrXkrPMT8PPwM/KxoJq5+Nbby4v+fCjKBAwfIYbvbDwm7Na46FGiwWuzsLZhOi2H32peclu7VZ8zn9pUiCF4rcga7D2lrobpSi1xgZG1XXTp6MZUq1CqMdpAeHbIxeFWWqKFJaoHAdU0JUKUPtrLLV3xcOF6UNgmWWtr0j/cbnzoPpBdIyFCyPUWvwc8+lCc9dEuIs6ImFNGG9KNZgSbCwwivvAckylWG11KohnGOKsBPi/cWO4k6lCM1zMQd375F2gFxFM+0vjsGmBdEpCpWWqaJIdaNNyUP33Wmc+LDWMAhQsDxIfKCyyNhRwcp5L034A47NcRz0xEI91owRxarFgOlg5wkHb/NAF85TsDph914dyRRHRDtj+pG7Tt0u7TA2f1VapShV4WLUyIhQQa6KQiVd5+EH75djk/4cVE0qYZMYD9LXPyDJjbXyfV2HlXdg2Z9OE4Y9sGPRPHP2DZleXJGDk8HoaeNFIFd33HG7PPPMc5KYuiKjh49WfH3s6Ha6BjUy0YiHNpAWYASrM/r6t2tCsfex+1QvbRo8Pnlr64LVSvQKW3AIKTljXxr20g6viuH+uPyTD79DfuPPHpNo34B4nUI+p45NmdSWGlSdy6Ylb/xd9e1qItG4RGJxI5AwLIOjExJkKFgepF4dVt6hvgpIE3qtrvLxF0/Lp40zOeIcp07dogQLUaxqwRo5ZhasPE73xY9Esikh7bN773Yk0wnRTue3R+S0WoOFlYNWolcqWqUKycOeiFBZ4Z5bjsmtu/vl/HrIM3WQIJfNSHpzXTJpQ6bSaXWdzaRb+hnq+VtGqj+xJGtLMzKya39gRYspQg/ieh2WB9OEnEvoPCMjw6ov1sXHvrGj2H3QtFw+68HVplYJZ7mKsBMm9213Vs/afIKXNn6elofJW2+TVsHKwUbRq7CqqwqrFCAKyf0iV5rPfuS9klpflm6ByFR6a0M2VhZkefqSzFx4RWYvvibLs1dkfXletjZWW5arahDlws9bmQ/mmDQKlkdxsx+WF1cTYiXhdSNNSJzljjtuq1nsjojCSCmikC3kPVHo3g7RDCNYnYBVhH2lQveMzTuJlGmFzb633ietUIxeXan5NXhUvLQqL2NEWVZXVuTcmbNy5dJl8RN3HTson7jnhCEh7m3DEKq1xVlZnLpgyNRpWZg6L6vz15RM5R1oeYJNKpUpyOLcjGwFsIkwU4QeBXMJN9dWy/edrMMCONGPe2xr+PJTz8svfeQBIc6hWzYgTXj8gR+q+Nrkqdtk7fJFVeCc81idnlU6WV1GijVYk0aacPrKVRXBgmiHbQoFZUyCtb9FwRpd2ClXeFUb6wl549x5mZ+ZkdnZWdlnROAOHzsmt5w8If0lUfQTv/jBd8kTp/9UVoyTHCe6uyNKlTTes+T6qqS21h2RqJq/V3DMKYg5wLxsSNbAsZslSFCwPEr/ICJYlWHTSCTimGChz01BWus47DRf/R4Fyw3eds9d8uUv/63q7D55y6ny4yg6vvT1v1G3kc6JdbFQz9yHKW5xlA+jV/awe99eJVjALtHG9qSHPO9/670tjWdCYbu5a/v83Jy8cfasnH7lFUklk3LCkKnb7rxTPnTsBvE7KHj/3Z/7qPyDf/NFGRidFDuAVG0mlstS5Sb4i6NzP8SqOiieSm5J0KBgeRREq/oGBo0PwGbFY06h0oQeq2WeXlxWqcJ7TrTfgJA0B1Gs4zfeIGf/9ity/39XKVgaFW2IemMlRNSyYDF6ZQfHT9wsLz3zA3U7lcsZot35YcOcHjz87gctf5+5sH3qyhX5/hNPqOujhkzdc++9cvtb7vBlpKoRJw7ukV/5oXvk97/9WturCrspVer3SzFihT97vWoDLxXz2wUFy8PE+3cKFlKFTm2IKGaOeCwP9PhLr1OwXOBd73y7/Jf/8ucVUSzUYUGyFk+/orptI+IQ6VKlcLa0zbcyqy621dpYHVKbg0ePqDosRIeShmANxzo7bCDNmCzlhgb27G2p/gqpwbPPPaPEKrG6qsTqp37uZ9V1kPn0A/fJt197Q84mWksVoqYKBelpF9N/mmLvtOJxxUriZXB4VIIGi9w9TN/AzrMVpAmdAh8Cr51DfOXJ52Rtk5EIp8GKQhS8I4plZp+RvtEku9T2HztqfVIxuMe6YDGCZR8n31xc5Yc/Q6fF7humwpsbP/hRy983/ejfyl/869+Wb37tazI+Ma7EqhfkSvNbD3/U2KabnzRApJbnZ2TmUrFIPelQgboZvVAKu4h01hDoTPGC21bkKhKLye79ByVoULA8DCJYbrZrADmPrWrHbMKvPvW8EOd529vulvUrb6golsacvkl3SbDyprlso0etRzNjyU0h9oA0oWYj037z1naiVwuvvyxP/Ot/Lt//z/9OnXT2mlhp9o+PyGcefKtkU7VrlbBicmHmmlw686oszc0YEUd7axAhUYWSROGSyRW2ZSpdUKsBcb9RGrCasBEwGBgalsPHb5FoLC5BgylCjzM4Mi7rq0vl+46nCXPe69rNpqPugO7u99xzt7xuqsUypwmxigzRi5jLaWTzOJWBFubVxZNMEdoF0oST+/bK4uycShe3u5rQHL2CvDdK+WY2N+T1v/qvcuHrX1Ypyvd+4Ifk3vvv810/Kzv51LvulsdePFORKkynkkqoNhKVbW3wVudLaX3ze1b9/lUfSlTEGP+VHtcBS9zH94bDEYmhE3s8rgQJWZVwJCqRaEx9HZ3ay78Lx6tSUCCfrRRzfG8MP8NrXa5thILlcfqHhioES09id0qwvDk65yKL3V3izjtvk4tVKwpv+cSnlGABRC/G+2LiJhlTjsFqt2/IFecQ2supN98u3519VN1eM7aDsXhr2wFSzObo1ZF3118hvGpEUp/+vX8lmwuzcvjoUfngQw/Jrl0TPS1Xml//xAfkF/7tX0h0YEQWZ6ZlbWWp7nPx0Wl1ULeSJEN+MLItaghQ3LiGCMX7BtTjoXaFqE96DgqWx4nG+3f0v4pGo5JOd9ZBtxEI/fZFvbUn+/2vPUbBcol3vfM+ecQUxUIECwfErfnOohftYu4kb3VeXYzRK9tBHRZWE66trqp0cSvRTGwzm6bU4glD2utFry58/Svy8p/+oYpavecDH5B77rtXdWInRbCq8EfvvkX+7VceUzP/OkHL1MDgsPQZqbp4SajMUSjSPtxqPQ7kamB4Z1f3kIMHuHwLOXS3UJ3dl9jZ3Q12756UU3vHZcrU3f3wu7ajDRsZ9wr1cGDWI1paGQY8sL4oxF7QdPSdH9jeDtbSGUsd/hFtX01lyn2vDhuRq1qtGZASfO4Pfk/JFaJWP/0LvyD3vv0+ylUNPvsj75Jdw+21bIBEjU7skn2Hj8oNJ94kN5x8s+w9clzGdu0xjjVjlCsb4ZbrA2L9lR8knSZ0kmx36pkb8pXvsdjdLZAqXH7q8fKMwuM/8pDEhor9p7BU363ROWlT9Grf3fda/r74lj8L3IsTG0KqXcr2JawkI1oaWKwfD5cuIRejiSh2Rz0WyJXEqdG2ALlaMZ5TbrNhREJPfPKndjxvc2FOHvsf/zu58sQjKmr14z/zsOyZ3KX+fWQnI4P98pkPv8dSyhTPGTSiU7sPHFJCdeSWN8meg0dleGwXZcphKFg+AF3dq1cPIk3oJBgA7bWWDX/6yJNs2eAi77n/Hrn0zf9D3Uax+7Ef3l5Sn0i7U9+UNBVF77/HWr8k1F95uUUDhAiCBGGKRSPSFyte+uNRdY0ZerGKy7Zg4bZ+XM/b2/5e8/cXZUwJmNjLj/zYj8rI2Ji6nW0gWZBjs1xB0O//5//TjtQg6q2e+Ff/XP3NPvnpT6uUIP4NrLdqzM8++HaZHB2u+TUtVXsMqTp26s1y4NjNKkIVxJV6XiZy/OTtvyXE02CHjIajuWym4rGcwz0VsGsOe0jB09msEd6OsRbLJbCqsLCyKMuhmAxO7lYpuqknHpOskcrBATWOFUROpqqN37FeqtvB7z7+wYcsfd/g6oIMbHgjnVwhU0qSIuVIlIpAlaLRdkSh8CP0zwqHKqNf+rb6VIc6KwHAyd3xE7fIxbPnJZ1KCYLdW9mcWhyD2xAqLIbYND6vOhAOuXq7IVfDBw5X/CwtVyP9cfnEpz4lhw4d9FyzY68CCcUR4MlXz5UfQz3V+O59svfQURmb3CN9A0OOzDAk1uA77xNGJirnUOnhz06S9WAU688YxXKVG2+8QQovPV1OFd75j361/DWrNTjtUrmk3/pMyqHVWekW4ZLIFCNLxYgSok2RUt1kt6IyOvWIyJZ+bcUoV3sRrpGxUfn4w58qR7IAUsfrxjaBS/XKz3f/y8/v6GF25TuPKLm65aab5Kd/7mdl9+5djFq1yM+8715Vi4W6qj2lFOCuvfsZqfIIjGD5BCyN3UysVLRn6NUo1u6xEXnz8SNC3OHAnl1y9cpV6T98THVST1y5JBvXr5UbD/Y5UIQMcVsrpSFRt3PnL/4TS9+HWXXjc5fFLYoRqlL6rhydCnVVpqyg+hmZXntxVWhr7V9Q9H7yzbcbB/OorK0mVDTLDKJWN330k3L3L/+GSjGbuf6Dp+TZf/v/lfvfcb984Ed+WGIxLmhvB4jyuvE5mc31S//gMKNVHiP04EOfCt6ExYCyujgnG6vLFY8lk0lHh2Riv9sf89aR4uDkuPztv/wNz0XXgkwqlZarB05IfP8htdrrO//jr6u2DWDI2MkP2jwIGn2WdP3VLZ/8KbWs3woji9MyMXtRnEJpiC4yD7lbYO4Gxflxeclm8y1/vqYNCZ/NR2VreJeMHju+I2IVzmVlYG1Jts6+LF/73/+9vP+Hf0huf8udQjrjwuyS/Oz//wsyMLpLiLdgBMtHIMS/uZaoeAxylc87u+QvrGo6xDNgfM49J29UokXcIWoI1Gh2SzbG90q4r18dPKe+85j6GtJBdtZjpXL58jgWRK/e8ou/KmGLKY/d187a3mAU/ypEesw1VEGUK6AjW+1EtZAuPDA+IkcGozJqpB+HVuakf3PVkN7rMjZ/VSaMyGJh+pJ84y+/aMjVD8utt98mpHOQIvzBuUuymOQpp9dgPNFH1JpN6OTwZw0aj3qNf/83jwpxl2gmJbuvFucUouj8FlNUaTWdLq8W64R8qUBag8hVtCq9VA8czO1aPRguFaareqV4sV6p2BJBegZds6XrtVppmYC/BS6QrMFkQgYKaSkY4vuVv/xL+fDHHpJbTp0UYh/vvvWYIcIe7K3T41CwfMbQWGUYOKxWIzn7Z8RxM+uxIdDPlsbnEHfBQRPRCIB+Rsc+WGzdgG1kxUgjpjoYCG21IWU9BlfmpBO2haLY6kBFcbiirdjtO7yzOL7We2Pu46VbUMRLRf5PfuvbSq727t8vxF4+eu+bjdT9uhBvQcHyGQPDozsec7onFvDiisL/+tj3hLjP2PwVGVm6rm7f9jOfKUsQvCiRzrTV6d1qQ8p6oLh9uEXBgh6EyyIQLYtAEFN/dqFlS/fhQv8t88XcxytiaoL6yosvyu133kG5coiRgX65/SBLJrwGBctnRGMx6RsYrHgs7MJBAYe9nMeiWBgCzZYN3WFi5g2V/gF3/uKvliNZAP2PllPWWzigIeVylVzVakjZiNGFK5aep+upVJPOslT1VurPbVLJpBy54RjlymHuvumIkYb12E66x2GRuw/BgM+UaRQI5MqNYncc/yIR+ztDt0s6k5XJsRG5o0stG3Q6JBzSl1JDx0ioNNIkLNFwuHzbfNGdubfHn+y8hMPbo1HCoVC5BqiyOWX3/hr9mwnZGp6QfDQue++4Wz229Pqr6hpyheaTkCZsMZFSE0wzECtEu1BzpVWsHblC9Gpy+lzdr+tWCrFS53Q/tFEIEoiw9/f3C3GWSDgiX3vujESiMSHegM1HfMjg6LisryxWCBWK3bNZZ8eX4CCIgvd4xDtHpsdfPC0PP3i/OIE+COtUEm7pshM7I4bNf1Tz31UM/hTKHbohOOXH8P+8/SleLLvfd/kVmb3hdsn0D6mU3pH3PCjf+1f/otzCIZ3Lq4t6PkQHvdsKpddUFeFC4TyiYa3IFahuyxC0VgqIAKWSKdV3qo+iQupwy8E9MhQLS1qIV6Bg+RBENjD1fCOxXPEYLk5HsZAmzIfFM20bni2lCTH8tF30AVmLlPrPZxGO4mvdfs3hGlJmljAoDjaVgr7f5gpASNaeq6dl7oY3Szbep+Towc//vkx951E5+1d/XhYtAOmrlTZEQ8pbfvRTaqB0qyBNObC2WHwtZakK+zI6BZE6//o5mZ+dk/mZWUmsrKpLNaPjY+py+IajcuTYUTlsXAgZ6ovJgYkRuZzICPEGFCyfMjgyWiFYAKH4dNr585d0tiB9Me+kCs9Mzcg9J45Zfn6o1NdLp/fMYhJkKiUMMrL9NbNkFaNfxShTPt9YvBKrq5JKpWT97DmZG92OPKHj+x2/+CuGYM3L2uVLkrhyUV0yGxtKqCBik6dul31vvVdFrtoBqUGsaNRz9vy64u/VF16W1158WaYuWasj0+KF5z/1raJwvf2975Lb3vJmIb3NbQfHDcGaF+INKFg+JdbXr4rdzbVYutjdyc7uoNi2oSAxj6QKz1673lCwdFSKtTf1CZlqpMzRLy1eOuKVTG7JuTNnZWFuTslVOrm9yEDLViq5c+EBRqWM3XCjjB3F5bhx+7i63Qn75i7IoGQlFHW+F5wTnH/9rHzr64/UjFK1Ar7/77/8NUO2npCf+PlPK+Eivckt+yel8NqMGq1Gug8Fy8dgAHR1sTuiWJmM8yFi9MWKeCRVeObq9Yr7xVSfP2bCeZ1t8SpGvGLDQ3L3W+8qSpchX7l8YUeaEYKVSCSMA/+KrBnX165cUY/NXzwnC6dfLv9sLV0H7r5Pdt/65paEa3JpSoaSa+KZMGoL4L143BCr1154ecfXVLd44/2OqwUSJeGt2oCxcCBr2G7GeO+TpgZ1EK0/+f3/pCRrz/7W6thIMLj1hkOSy74o0TgFywtQsHyM7uxeq9jd6SgW8EqqcHpxRV2r7ts+ThX5CS2u1e81trtYdFAGBgdkz97iQf6ue+5RNW5gDrVFRqQL0jVvRMHM0jVopA0hWkff/X7Zfap+ugtyNbl0TfwI5Oq//dF/VTVWGryXg9Gw9Buf3bCFs4GoGmUTMZ4vagZkKpcr9x4r/vw/k5/57D9kJKsHQT+sQg4n2H1Cug8Fy+egs/va8kL5vlqS7sKKQgCHU5IV7a7Q4N+MfkYUq+4TKq0URLRLR7XMUcTDhw8a/zsob7rt1vL3rBqRLojX1ctX5Mq5V+SJ7zyiZOvouz9gXB40bu8rP9fPcgW+8udfqpCrAWO7hSSF2wyzRpScRaXP+MzrLviQrK8bKUNEskhvsX98RMIRHta9Av8SPmdobEI2Vpdcb9mgwa/NdLke69ajBylXHiQUstbOYmx8XF30fLqkIQgQrvNnzsoL/59HpP+W2+VNH/+UHJMtGfVxAe9Tjz9RUcg+FIsqubIDiNZoX0yWk8VFLvg98zNzTBX2IJODUVlxZ/dPmkDB8jndbNmgKZaBdE+y3nbiuJDggKaUR4/doC4AEa6r3/6qzBqPF/bvUzLmN1Af9eS3nlC38SmxU640WBRqXuSCGjgKVu8RjcWNnXJx35/P51Rj6lwmLTlcGxdsf4V88zrdcDiiLiCCn1m6VoupWERvCQpWABgan9jRsiEWi6kVXW7RTcm691Rnq9GIt1ERrrf4c84a2lygIP3C+UtqQQBSgShet1uu0BV/PZ0pyxXqr/bs3yek91hdnJcrU7NKpvI1RudEjX10zIbNDyIXicaVhEXixduxvgElYewmX4SCFQCixsaMDTuT2io/5nYUC2jJiro4Tuf9d71JRgfZ3Zp4jxxW+pUiCW+cKY7yQca030a5glBtGB+8rWzlgfR9H3w/i9x7lHQqLZlM/X6IdlVTZI3fkdW/Z6PqdxjShWNSrH9AovEBiRu3o329t5+mYAWEscndsjB9teIxt6NYAPt5nKmj8N2N9gjvv+s2IcSLZHPbJzcjY0XZQRNXjA7qj4TbLmwHKGZPGvK2ZUQpzCuGMUrngx//sNx06oSQ3iSTbdxsGjWz4bCzJ8GInKW21tVFo6Wrf3hM+gaGe0K4KFgBAS0bajUedTuKBbC/T2VKLRwc/BQf2j0hn3jn3UKI11BjiEydUm46ebO8+Myz6rEkamFSBRmMRVVxeqzJYgA1yF1QVlNQl4zqgbXzM42ROT/8sQ8bkSt/plOJPUwvJRp+Xe+fjUNDecWvG1RLF1KJEK3B0V0SHxiSIELBChDVjUdBN6JYAMeWVLYg/THnDOttJ1l7RbxJtS8duuGI3Pfud8rT3/lusb1JDpJUjDQgkhUujTCKlL4xV7KzWkOxzeAriI6994MPqlWYfm6qm0isqX3VqrrejsKMjY7Inj2T0tfH3k7NuL6ckFw21/R5qkkwsg2lEfCQLDXHM+xe714U3m9mlmQzsVSWrZHJfaqWKyhQsAKEl6JYoNjpWxw7Q/qVj71fCPEiqkWFiJjV6N73vENGxkcNyXpS1lZWyxEuyJQ+0IXK/zP9rNIDBakUrYNHj8r9732n3HD8Bk+3KYEsnb9wseJ+oiRRc/ML5fvV7NmzW44cPqBujxqSRcFqzuWZBWkH7Kdzpbmj2HajJdlya7MyyxYiWkERLQpWwPBSFAsgpRFx4FP6o+98q0oREuJVYtGIZLK5Ci269Y7b1eX0S6/IG2fOS2I1IQuz241HC+X/iemxgiFmY4Zg9BuRsMOyZ99eufnUCRkaHPBF/7e+vrghSgfl6tS0XLhwWZKYV2lI1WoioSRz397d6uuQqNHRYdlriBWuKVStc84QrFhsp5iodg35nFgZ8IHnoE7LsP7itIZQKboVElcipJCsoIgWBStgeC6K5dCvZO0V8TqQn3gsahyscqpdgxktWprESkLSqaSkksUTob7+PomXioBHjaiX/nnFA13Yd6lAyNNtbzqpLgALAP79//4ncodx/73vvk+IPZyeTcjRE29q+JxCvtgPCysA0SMro6+TW8bfpfh4Jl1M0aosRKEyuuWWcEGyUK81uveIDAwOix+hYAUQr9Vi4UNq5wcRkat7WX9FfAC2e4xxQh0VDlL5UgihWriKElUUKTVau7TKq7jaK1hDyxHVe+J7z6h/z7ve+TYh9nFxPtH0OWgSGsUl1jgylDKEC6m7tHGNC6QrldrakU7UtYOqfitkXw0XfsOWccKRm5uRgWM3ix+hYAUQz0WxxN7CyV/+2AeEED8RUgOad34KqgvYQ0GxqBoUU09ZeeWVM/K9p5+TD/3w+4xIiEtL2HqA6cVlmV3bsq3Lel//gIhxGRyp7KcG8coaspVUKwK31P1MsWJeYY5yaQFrdavOl+bcYpvZ2lhXEbZwxH/d4ylYAcVrtVh2cu/J40JIEAiyUJkpDobPyupqQh7/zvfk9jedkDtuPyXEPl64POfKCBuIFy5Do9vilSpFuZKb29KVM0VptWiptKJsi5emvOBDRXllR61YNpuWeGRA/AYFK6AgihU3PgTY6DWIYEWjUdcGQWsKNoaw0Lmdxe2E+IeckVPCuCDI1Rf/8m+kv69P7r/vrYxe2cw3Tl+VbqGla2R8l7qPOi6I1ub6qqSN66RxHMJxoJg/sVBpXwVqxvwIBSvADI9PytLMVMVjEKxcVfdnP8HO7YT4B1U0bQgWIudf+ZtvyPrauvzCP/gp2b2LzVDtZDaxKS+qCJY3pBX1XbjoKBeEC9GtzcSqbBnX2WxrwhTxYXoQULACTP/gkAyMjMrW2nbho6oFMSQrk2k+Td1rjAz2c/UgIT5ApwT1idxXv/YNmVtYlAfec7/smhjrmdSoW/zg/FXPyFUtIFvDY7vUBUC2NlaXjAjXuqTTjUf7RONxNcvQj1CwAs7IxG5JoUjQVNyOs4GsaefnF7hykBDvo1OCev/y9W98S65MXZd3GGnBu9/yZon6NBrhZb7+8kXxE/2Dw+oyadxGGcva8rxsGLKVqZItHKsO+XQFIaBgBZxoNCZDxlnD2vJ2h1+/RrGYHiTEu8CnkBLMmU7m/t6Qq1dPn5UTNx1TdVfxGOXKbmZWN+SV6yviV1ArPHngqJIt1GwljYAAyljQMHV0co8aEu1XKFg9wNDYhArHmqNYuhbLjbYNdgXKuHqQEG+C/Ugml6+IikOuXjHkamJ0RH7oA+8xohFhpgYd4D888owEhcHhMXUJClzG0QNg9eDo5N4dj6Ntg184deQAVw8S4jF01Cqd3V44g4L2v/jS38grr51RcvVjn/yIDA4MGKlBHm7sBtGr719ZEuJNGMHqEdAsbms9saP5aDfaNrTDvaduEkKId0AqMFsVtcLQZhS0z84tyMTYqJKrsdFRNZeR2M+LV+ZkPZkW4k14StFDoPloNRAsp8P2eRtShG87wfQgIV5ArxDMZHM75OovvvS1HXLFuivn+OMnXhHiXRjB6iHQfLRYj7VcfswvBe+3Hj0ghJDuoQb/YlBwvrBjBfLU1HUVudoy0oPVcsW6K2fAykGkCIl3oWD1GGjbsLW26mrBe77DVu7of8X6K0K6R610oOaFF16Rx7/9PdWlW9dcUa6ch9Er70PB6jFQd4VU4erifMXj8XhcUqmk2iHqvHF5XlRpWGejXWXBfI2RCPnibXXpMEd469GDQghxH5x0oadVvsZnGMXsTz39vPzg+ZfUjmL/nkklV/19/ZQrB4Hj/ufvvMTolQ+gYPUgKHjfNKJYmdQW7EcwISpkfGj7Y+3vEENVd8wLhgqFzna0p45QsMg2U1PTsppYk9vedFKIMzQSK1AsZv+mzM7NK5G63fhbvOfd91GuHAZydXUxIX/93Dkh3oeC1QNkjchUamtdCVXauMZcKDfpdF+LFCHpTXAgv2oI1fz8oswZF1zffNMxed977xdiP7WahVZz+vRZ+dZ3npLNraSEjQ/3/W9/q9x3793GeVWIcuUgenHBn37vNVlP+m/UWS9CwQoguWxGkphivrmuxCqf9+ckcs2pwyxw7wXm5xfKEqWvkYZCDAX1Pwf275afffjHZHR0RIi9oLYK73EjsdIpwedfeFnVWw0O9Mvb77tb3nLn7ZQrh9FyNbO6Kd989ZIQf0DBCgjprQ1JbqwqsXI7QuU0o0OMYAURRKdefe2snL9w0bi9rg7gGkjUkcMHZc+eXUYaalFeP3tBpqbn5L9+8cvyqZ/4mIyPjQrpnGapQA1WCf79N78tK6urKiQ9MTYiH/3ID8me3ZOUK4fZHpwt8s+++C0h/oGC5WO0VG2qMTjej1LpXXiru+HRAQpWEIFEIb109123G3KVrni8mieefEae+N6zsri8Kv/pj78o73j7PXLPW+8wUlRh4XG9dayKFaT3aSNq9RyiVsYRHilBiO9HP/IB6evro1w5jFmukBqcTbCw3U9QsHyG21JVKP/PtFKwxUWBqn9OoaCu2ymkHxkcEBJccKDGpRHvesfb1Gin7z39A9lMpuTRbz1pRL4uqRl34+OjEgmH1YXUp1Efq1pUR63w/r73PW9XKUFAuXIWs1zNJjblzwzBIv6CguUDCsZOcTOxrNJ/qKmy/ecXtrut50o39H27BjVrcvnKFYaEWOXee+6U48dvkC/91deMg35CLl+9Jv/xP39B7r/vrXLffXdLNpRXEZZIOKTakZDi57dQsBat0iB1+w1DrLC4QEetxo2U4EdKKUEA2YpyeLNjmOUKMDXoTyhYHsaJaJXqS1UoilS+oHfA4hqZnLHDDoeEu2XSKjiY7941Lv/g5z8l3/7OU/L8C6+oyOh3n3pWXnv9nLz93rvk1ltPKIkPlWQL21ovphGRAkTBevEzbu0DjnTgCy+8Ks+/+IpaIaijVne95Xa5z3hvdZQxGolwcLODVMsVU4P+hYLlQSBWa4sztkWr8iahatasHQexiLEDRQQAt3FRK7lssjAldznspIWQloEwxYzt8z3vfrvceOMN8k2VwkrI8sqqfP0b35Knvv+8/ND73yOHDx9Q8pVT23tOfR9kISQSyOhWMQqdV2LVilSBbbF6VbaSSfW9kNO9eyblPe+5Xw4fKq7iZUrQearlao6pQV9DwfIQdoqVliocYJrtaweGhmXQuPQNDqtUZGprs+LrxS7vKbGLrPG6ohHupEl7RIzoCTZpHPh/+qc+IS8YEZenn35OpbMgWn/xpb9RhdjozXS41OID6TEdBUZ0KxQSXwuXTv3hfci1kP4zo8XqhZJY4f2DPJnbL2i02FKunKNarlB3xdSgv6FgeQC7xKrYL6h5pCps7Cj7+gdkZHyXDI2OGTvP7XBSzEgDLExdqphLiAMQ5hVmjQ+/HeiarzD31aRNVP0PbvTFlUjdeuoW+fYTT6vCd4gC6rNQQzQ2NlpOHWoKpQUX22n3XCltHSqnr70mXXjN+ULBdN1alMpMPbGCcL7JeJ/QkV2nA/FuQGiZEnSWarkCf/D4C0wN+pzQgw99ysUKHGIml0nL2tKsETVakk6ArKC2qVn6D5GqoZExGZnYVSFV1aSTm7IwfXXH49gx2zUQGsevvqg1w/rm//u/57BnUhNIRjqTM04uirux106fle8bacKVxFpxyHgp3QXRuuvO21Ra0Wqj0mKKXCrES6fNnfm3qP+XhqOXom6l23ak6NG49fTr5+T06XNlsVJ1Vmi9YEQD7zWiVjodCJgSdIdacoW6K6YG/Q8Fq0tsLC8YcjXTUfF6rlCKWDWJVo3t2iOjhlRFY3GxyurinGysLlc8hp28nfVYfbGQpSjWH/33/0juPXmjEFKLaskCZtEqlCI/4ZIc3WxI1qlTJ+Smm26QdtHSod0jZHqs1vP066y+rRedVH/dLvB5nZqakReNNOrVa9fLUTA11L2BWDFq5Q5I76KDvvlP/9T5afmfvvKkEP/DFKHLYB7gyuzV4qDlNkFdFSJWjfbHiFaNTe5REat2GJvca6QuNyWT3q69wk7Zznos1GLFLdRiXVtYEeFcX1IHbJd98ag6UGGOHkCqCxctWqsl0cIB7cz5i3LOSCUiqgWxQHrxcIvjmMqCVPEZ9M65KnpYvXHxcjlaVRS57VRgLbECrLVyj5yxvWZylWfHqLv6/NefERIMKFgugqjV6sI1aZe8CiU3FivUVCFiBcHqlF37D8l8jXosNHzMZDofNorgXSHSvLN7YrN9GSW9Q7EvkyHu2Xw5mqVFa8qI3kA2MKgYW7MuiMcKxFdfO6NG7xwyZOPG4zcYsrW/aeNTL2KWqmQp0qzTgIhFQawO1xErRK2iUTZrdYviycBOuUJR+0aKg5yDAgXLBdAodGn6UttF7DhUQKzqpQKRBkQKEGLVShqwGZFoTElWdT0WCt7VcNgOi97VCigLLRuuzC2pnRFTFqQZEISwkXquHlwMocAF/Zx0HZKOauFZS4ZsLZdkC6kzPPdQ6XLYo8PG0RB06tqMTF+blgtvXKmUKpFytKq/Ly5vecvt8pY7b9shjjodiOasjFq5Qy25wjv/L7/8JIvaAwYFy2FQyL5w7YK6bhW9KjBbp0xL11eN797TsGi9E+L9gzIyMSlry4sVj0OyVM+dDove8e+LRBo3Hp1eXC7vkChZpBkQhZhh7ZF8WDLZytosFLhj1SEuOqp1zbg2yxa26ctT03LFuKiidikK2u49k3Lo4AHjZwzLnj2T4iZIy8/PL8nCwqK6QKz0a9bpP/1vR5R5wJAqdF2vFa1Sz6NYuU6hIDvEX/P5rz8rb8yvCAkWFCwHQZ3V4tSFtgrZG6UDsT8c373fUbEyMzKx2/i3JCW5uWF6Ddv1WJ0U51qJYp01Uh+AkkVaAfVEqM1ShcSmtKFGR7XADtmS7dYI+BBq4Xru+ZfL0gWB6TNEBuI1OjIsIyMj6j4EzOpKRQ0+Rxh4nUisS2JtXdLGfYiUvp8wvSazUEnptehIFV4TVkreeustNdOcFKvuUGuloAarBb/56iUhwYOC5RDtyhU+fyhgz9X5NvSu2rV3v62pQCuM7z1oROIuSdZUe6WKi42deKeS1SyKNb24ImubSRkZ7KdkkZZRg6Dj4bqiBcyyNW+IzTXUM71xWYlXwdjOzVKjo7Yz8wvqGuIFzMKibzUTLUiVXjRiflVapPTt8s8t/Y5wqUnqmPHzIVQqlXmofu0Yvg+fmXCIYuU2jeSK7RiCDQXLAZAObEeusKoO6cBaH0QUrU/s2W9L8Xo7YIc+eeDIjqJ3lY6JxSSdbj0FqrESxZpeWpaTg8UDICRLnbVTskgLWBEtgCgQLqhbApCshflFFd1CRAkCZpYffTtfY7An6rqasePkJLR9sqHaP5RkChGqUSNKduiwka40Xh+EqpnAIYoXDUfUNXEf9DLLGDs3ylVvQsGyGV1z1YpcNSpijxppuL0Hj3ZNrMzUK3rH7MJOVxY2i2I9e/aSnDQVG2N5M943RrJIq2jRyucL5TEzhQYtFnR0SwuXqodaWFLShfTdmpG+06k8Fc2t83NqRaJKd7ZvSjHq1Wd87vfs2aXSjiPGfSsypdEDrpkG7C612jBoKFe9AQXLZtCZ3WpBe6MidjcK2NsBRe/okYVGpGY6XVmoU6P1+mLpOiwzTBeSTlAiYny2dK1VcdGGNJQtgDScOaVYDeqlIFvF281XDqNmC7VbkKpWa7c0WqrCoRCjVR6g1kpBDeWqd6Bg2cj66pKlsTdarOoNYh4cHpY9RtTK7TorqwyNTRgilZaN1cpVL4higXYlC2nCfLj2jMJnz16s+T2ULNIpodK4GN0DSke2IFrtDFGGJJVF6ZA4QnF8TzF1z7oq79Co3gpQrnoLCpZNZI2o1dLsjNoh14vCYF+dy9cXKy+lA5sxNrlPCsZBaHOtssak0/YNSJVihE71O4hCd0jWPSeO7/geShaxEx3ZAnowdFG2imnpdqSrE9QY6vD2TEQKlTehXJFqKFg2sbo4L5lSajBp7IDV2WVJE1T6oSANO7BjrA1WB3opHdiMUUOyMum0auGg6bR9Q6E0XzFWQ1KfPXeppmABShZxAj3wGXqjI1xaukC+kDe1ThAVnm6WYtzxO0RNlC4Nli4+UhwuHdqedUih8jSN6q0A5ao3oWDZxEZitXwbO1qku3IWdrR+ilpVg/TExL6DsnT9asvtG1QBrmBg9c5eX6hJi9RIFf7ZI0/KL33kAakHJAsyW5ylJoQ4wrZ04SSq9gmR1ZMLipO/adQ8VPOHj78of/3cOSG9B0/3bSC5sV6OXrUColZHbjrpS7nSRKMx1b4hWqq/0mjJqugNZNxEZKrfSAHGDbWPGRfcrhWtUk1Wqx5b20rWrcXSIH3TKExPiBuESmm8ZhfiX3RKsJ5cYabg//z1ZylXPQwFywbSqdaGESNqdfDYzbJ7/yFfpQTrESlJVrhqUKyWLKTtUFcFmUKvq+rjCh6LVkkWdl5YVVjN73/tMWlGs1oIQgjpBKQEG+1jNtIZ+R+++C12aO9xKFguE4SoVS2UZB00SxaKUbISyqeNCFVBmq0cryVeSLNWt7BABKtZFEv9duPXpzJZtaiAEELsQJ34ZYv1VvXkajaxKb/6x9/kbEFCwbKDWN9A0+egr9X+o8cDE7WqRSzer0b5iCFVkksZ12jX0JngIIpV7UhWoljl7zcMLZvrbCA1IYTo8oNG9VaQqn9mRK5mExtCCAXLBhCNahSRwtcQtRoaGZOgkt7aUOOBVuenDKdqTWjgT6lMoa6LpTOV9ViIYH3le8+LVbIqnJ9jypAQ0jK6kL3ZPgTpwP+BckVMcBWhTew9dFSW5mZkbWW70SjEChEdFdUJIIV8TrbWE7K2NGO5e33F90v9TvbVz4OAmftj/f/+29/KA3feqgZAW0GdfRopy3g0yhWGhBBLWK3nZBsGUovQgw99iuf1NoIZhPlcTqUEg5oKhFitLy/Ixsp8ywOt1fdL40729YAYmSXr4fe/Qz734x+SVkHRPftlEUIa0WjcjQYrBf/g8RdZzE5qwgiWzYTDFKu6349Qe751sTJ/vzmS9aePPCnvu+NU3eaj9ciWClQhWYxmEULMINqdyTUvKUAxO+utSCN4Gk8ssZlYlrkrZ1U6sFW5QpF6KluQZKaYDsSOS3d8r27t0AwtWXrf9+v//s/UGJ1WQaEqWzkQQjRWa63AK1ML8qv/5RuUK9IQChZpCIrXZy+dlpXZKy3VWWH/hBWAkCoIkV54o8Wqv79fIkYaVfXJirYWSDVLFpqP/j//+EvSDrqVA1cZEtLb6BMuK/sC1Fr937/4uEoPEtKIyPGTt/+WEFIFxGpl9qqKWBVaiFjpNGAmJ2JezYyaNPQAi6HhVdXpYUSNtgm1PCAa+8JIJCTXjQjWejIl73jTLdIOGK+DHSxmzTFlSEjvUGxonJNcrnkoGynBf/mVJ+Wbr14WQqzAGixSAWQqsTir6qxaIV/qvF7tSEqsdu2R8d17VG1aLpuRxarZhUBHsTIZ62eF5pos1GMd2DUuDz94v7SDjmaxAJ6Q4KPmxebzlqPXL03Ny+/93bNMCZKWoGCRMhvLCy3XWNUTK4D2FLsPVDZW1WN16kkWIlmQLKvDcs2ShdYNJw/vb7no3Ywe3Mp2DoQEDy1WuFitv0RK8E/ZgoG0Ads0EJUOXJ2/JpkWZio2Eiv0/5rYs79h81VEspZmp43fmdzxNchVKpWyLFkALhSLhmR8qF/+8Nd/wRCtA9IpjGYREhx0xMrqbgUpwd/7+rPy0tU5IaQdKFg9TDvpQGws6WxtsUI6EGI1PrlHrICaK/z+zbXEzt9j7AXT6XTLdVko8do1PCBf+M1floOT49IpiGJBsiJhihYhfgRtF7LGfiTfwlxS1Fn9weMvsJCddAQFq0dB1Gq5hZWBzZqDIlqFbvbRWFxaZQ2pyeXFml9DujCbzUorGJ4nx/ZMGJGsz9giWepnhsPsm0WIj2hHrCBUn//6M/LU+WkhpFO4irDHUFGrhRlZnZuyvDowX2gctdq176DsOXhE3W6HvoFBVaeV2tpZQNrOCkMI4MpGUr7z8mm55+Rx2T06Ip1SKK00BHg9FC1CvIlOBbaSDgTobfX/+NITcub6khBiB4xg9RCtRq1ApsGswE6iVjV/VzppvL7pHcXvoN26rImRAflPn7OnJqv8c5k2JMRTtFO8rkHUCkXsX37unBBiJxSsHqDbtVatUK+Ng3pNbdZlIbD2r/7hj8nH779L7ISiRUh36USsAKJWn/+7Z9h+gTgCU4QBB9GqxemLktxYtfw92E+pTuk1dljReFwO33hCBodHxQmQKhwYGVMDszPpVMXXkJrTrRxaTRk+8vxpCRvf97aT7bdwqEU+X0wdQrbCzBsS4grFeYHFNGC+DbNC1OqPvvuK/JtvPsdCduIY7IMVYNrpa4UidqQFa+2z0Il91979jg+zxnzCcSNCFjFkqlbxOyQLtVmtpAzxtP/lrx+R1fUt+Wc//WGxE9UNOmucRYcLEjVeezhM0SLEbop1kIW2o1Wab756Sf7g8RcpVsRxmCIMIO12Y1cjbmos2ENKcPf+Q6pxqNs0q8vCCsNWVxmeOnJA/rdfeVgO7bZnhWE1TB0SYg8QqXwhr8SqldWAtUBfq//568/Iy1db2y8S0i4UrICBlODS9UstNQ0F9YrZkRI8dOxm2wrZ2wF1WSvzM5La2qz9daQTW+j+Dg7tnjAk69NKtpyCokVI69gpVQCRqr9+7px85flzsp5k1Iq4B2uwAgSkCvVW2arapabfV0euhkbG5OCxm9R4m26ClOSg8VpAOrlV4+thlTLMq9SBtR3y2mZSvvD4M+r2vafsrcsyo2u0ANs7EFIbfG5RS6XbK+BzU7Dh1F+3XnjqwrSks60tjiGkU1iDFRBQb7W6cE1apZ5cTezdL7v27BcvMTKxW/qHhmumDCEvfX195ZShVdH6N195VK4trsivfOxBx1KGeCn6wIFoViQcYp0W6WmKUapihArXhYK9iRSmA4kXYIowAKwtzqpi9lapJVfdrLeyClKGKH7fXKu9MhI7a6QMkTq0ClKGkKxPvNPeVg710OnDcIjd4UnwMQsV/rMj9VcLpAPRz+rLTAcSD0DB8jmr89MtF7ODWnKFeqv9R45LX/+A+IGt9VUlWrUK4EE7tVk//4F3yC9//EEZHewXt2BUiwSNokgV543CpeyOUNUCYoWGoVwdSLwCBcvHrMxelc1E62Md6slVt4vZ28FKNKvVlYaIZv2zn/qwfOCuW8VNir20KFvEPxRK8lSMSkmpJ5U99VNWeWlqXv7w8RfljbkVIcRLULB8CNowLExdaHmlIKjVigEjb/YfPe54fysnaRbNwpk0usC3cib9iXfe7WhtViMoW8RLKIkqSCkqVRSqgkuRqXpArP7MiFixzop4FQqWz+hErtBEFONvzKDWCvMEg0CzaBZotQje7dqsWlC2iNMUPw4F0aVRxRopfd/diFQz5hKb8nkWsBMfQMHyGfNXzrYlV7XG33hxpaAdNItmtZs2/ON/+pmuRLPMQLawYlLJFgvkiQWq5alQWrVXMH3NSwJVD6wMRMQKndgJ8QMULB/Rbs1VL8mVBtGs9dVl2TAu9WhntWE304a10NGtsBIu9tnqJcxpu+37xXvbi/T8IU+N2EiXVgY+x5WBxF9QsHxCu6sFa8nV5P5DMj65R3oBiNbi9at1o1nqOS2uNkQ06xPvuEt+5eMPitdAdAuihebxhm4xpegj9Pa3LU2VdU5+izh1CsWK+B0Klg9ot89VLblCvZWXe1w5RbO0IWhHtLpdn9UMnVLUsgXd6lXpqh3xUbdM8rL9tWrMnfhDFfcbvZ/bnz+zKBXv73wOKaYCH3ntEsWK+B4KlsdJbiRkafqitEq1XPmhgajTWEkbqucFULSq0XJQTCuGqoTBf2y3C1D3pDidqLLuiHiXmZWEPPXGrBppw+J1EhQoWB4Gg5tR1J7PW68RArXk6uCxm33TQNRprKw2VM/rAdGqRke8QNgUoQlVfc1NquuK/FqkTbZZ20rKs+euKJl6dmpRFjfSQkjQoGB5mNlLp5VktQLlyjqprU1ZmZ9RwtWIXhStRpSly+RaofLXQnWfD2q9h1qStv8vO9JqxN9ML67Is+evyNmpWUOsLsvlxYQMT+yWeP+gEBJUKFgepZ26K8pVe1ipzwLtita9J497ZtUhIU4DmTpzbU5+YIjU9OKqIVaXZW0zKeFwWIbGJmRwZEwi0ZgQEnQoWB4EUStEr1qBctU5rYiWvlgBogXJ8lJ7B+JdEoaMTC8uy+krM3LNuL62sGJclpWkJIzUWi1GBvrL8zOxvent7NBk5e2Rwf6O52xCoNa2UjK9tKpuX1fXq4ZUzarUH16nmVhfnwwOjyqxCvl4WgQhrULB8iCtpgZrrRY8fNNJylWbWBWtdhqWoo8WUocQLkIABOr7Zy6qy+tXrxtidV3cACIGzHJWjZY6JHhnV9dVFAqX5hSM/c+gjOxiGpD0LhQsj7GZWJaV2SuWn89WDM7RqmghosX0IWkGIlQQqUeePy3fNC6ITnkRNTHAiITjYk2qigsjhox9z/DYLiNaZe17CAkqFCwPgajVwrULlqNXWFWF2YKUK2exKlqg1fQhYFQr+ECqIFTPnL0o33zuNXXfi7QlVcbzYvE+RqsIqYKC5SHWVhZkbf5a0+fhD5bNGVGTqmN4L3Vo7wbp5Kbqo5XcWG/63HajWugQD+FiVCsYIO3319993ohUBUuqQN/AoPQPDsngyDijVYTUgILlIa6ce00ikmnYFzqXF8nkdvb9CfpsQS9htY9W+fmGZOXz+ZZqtRDNgmgxheg/kP775nOn5Y+/+aRnpQoipYWqFanSKUDUd8YHhoQQUh8KlkdYT6zI7NVLxk5PJBYJVUgWUoE543+Qq1rBEMpVd4BoIaplNX2ISBZEq9UUImXL+0CkkP77o79/UkWtvIaaUWmSqlYaxuL5WAHYPzTMFCAhLUDB8gjz16cksbRQvm/e/zXKMFGuvEFyc11FtKykDwFlKxgUi9Vflz/6xnc9F63S0SlIVag0EqmV7+0fGjHEalTVV7G9AiGtExXiCTKpyp2zlbIdFLNTrrxB/+CwuiCqBdHaWk80jGqZ615akS29nB/ceuSA3HvquLz/rltZIO8i0JSnjb/Bv/nyo56KVultSotVq2ONKFWE2AsjWB5h+tJ52bIY/QBDRsh+/1EeVL0M0oebawkjqrWmBMoKWra0cLVSIH/rkf2GbL2J0S2HQBNNpAC9UlvVqVCBiPF9A6X0H6WKEHuhYHmExZlrsrJobYp838CA6tIe5s7QFxQMWUpurinZwvzDVtCipaXLKohunTp6QEW3cJvC1R5eilZpkepEqFQD0IEhifcPqP1IvJ+F6oQ4BQXLIyB6hShWM6LxuBy56STlyqfowvh2ZKvd6BbQwoXoFiJduE3qgxEwX3riua5Fq3RRur5uX6i2U3+xWEwGRyfYUoEQl6BgeYhmaULI1SEjchWNxYX4n05kC5iFq9UIF2bS3WfIlpauU4aAdTqjzu9ApP76yedUiwU3o1U61Qc6lakiBdWjCiv+GKUipHtQsDxE3ohKzFy9WFOyxib3yK69+xm5CihatvC3Txuy1YosabRwmcWrlSiXruOCdEG4DhtpRVwHGUjVo8+fli999zm1ItDJaJVeyWfuPdW5TBX/7qFQWIZGx2RgeIS1VIR4BAqWB9lIrKpl/7l8TqLRuAwMDasL6R10ZAvXVnps1cMsXWbxsgqiWjq6FRTxwnDlR154TUWqnJCqaoHS152KlKY6chmJRlVNJiPbhHgLChYhHseO6FY11eJlFjCrIOJ1aHK8eG1I16HJ4rWWMq8AoULKT3VYt2G4ci15Ml/bJVIacxuP6qgkF7wQ4l0oWIT4jEw6aYjWlqQM6bJLuMxUS5e+6K9Z/X0QLUgX6r3U7d3bt0cMMdArG/EcoL/WLhCpNeN9OX1lRskURApiZSVCZZYjLUjm207JUzXV0Snze18NazIJ8TZsNEqIz4jF+9VlaKwoJhCubDolKUMuMsZ1ddPaVrHS9dssXNXX+vZmOitnp+d2fI+mkagpCRsc2PE4ImZadnQkCgK1nkxVvH7zbayeq37MLFHdQL8X5lWh5setMDG5h3JFiIehYBHic7RwDQyPqfvouwXpyqRSanViLpftWLqqcVpQMoZnLG3sfM1LGzM1nx+Pe1M0qkXKnJrtlH7WZRLiaShYhAQM9DnCEn1cdJQLQLpy2awSL9xWImaIl90pxl6jVh2bfk/tEKl6sO6KEG9DwSKkRyhGuopzE83oiFdeCVdKrVrM5zLF1FUm3bMCFjVSiyASjakLhCZfyMvKwpwrAtWMdHKLKUJCPAwFi5AeR0e8QLV8gXw+p1YyFnS9UKYoXxCxQiFXfFx1li9ee0nIVMuEUhNPSFKt62gsqvpG4bnVX6tFYmmx6VBuN1hfW5XBkTEhhHgTChYhpCGI3ITjraejIGUAglYwSZeWsU5A4EhHmIr3CxXRnEaC1Al47ehP5wXWlpdk1579jGIR4lEoWIQQRyhHg8QZ2ekGq4vzSrK8wpVzr8mefQdkZHKfEEK8Bad+EkKIBVLJLVmanxEvgUje0vx1mTr/mpGyTQshxDtQsAghpAmQl+mL58WLZI2AWiqVlstnX5PVpXkhhHgDChYhhDRAy1XeI7VXjVi4fk0WZ64JIaT7sAaLEELqgLSgX+RKs7I4r+ZW7j96nAXwhHQRRrAIIaQG6ILvN7nSQAyvGa+ddVmEdA8KFiGEVIFmotcu+VOuNJArShYh3YOCRQghJYpSck4WZ6crenf5Ffx7pi6cUREtQoi7ULAIIcQgsbwoV8+fkeTmhgQJdJ2fNqJxlCxC3IWCRQjpadAFHivv5qev+jol2Ig8JYsQ16FgEUJ6FpUSfOOsWnkXdChZhLgLBYsQ0pNgleDUxXM9JRyULELcg4JFCOk5MFNwyohc5TIZ6TUoWYS4AwWLENJToN5qoce7nVOyCHEeChYhpCdAAfv1y28Eut4qHA5Zfi4k6/ol9skixCkoWISQwKP6QZ0/I5vrCQkSIcOnooZUxWMh6TcufVGReNS6ZKGFA5uREuIMnEVICAk0SIPNXrkomQ4lImzYDAJE4bC+X/t5BX3JowVE6bbxvzz+ZwOQqojxv0jEuF26byYSLkpWOmvt9+mO74eO38zZhYTYCAWLEBJY1laWZOH6tbb6W2mRgVBBpkIWA0Plp0V2fkULF9C+pR4zuVChzs9r5XVQsgjpPhQsQkggWZ6bkaX5GWmViGExkRalyir4eeUfafPPrqZtybrRkKwoJYuQTmENFiEkcCzOXW9JrnQtE+qY4tGinIQcFiA3wL8jFrH+D4FkzVy+qArgCSGdQcEihAQGpALnpi7LyvyspedDoiAgfUakJxZtT6rsqaxyjmikNclCzRpaOBQCOjaIELegYBFCAgGiL9NGimttddnS85EKhFhBQNqNVmVyBe8blrQnWfPXe7tXGCGdwhosQojv0XJlZaUgZAq1SeEOU4BpJVch36QSIVlwwazFwBQWCODftufgUSGEtA4FixDiazBTcPrShaYrBXWdVTQiHQO5QplS3Gd7UESx0C4in7f2/MTyklpVOLFnvxBCWoOCRQjxLYnlRZmfvtr0eZArpAPtiDZpuVJtHHxYZIHoXTJjPbW5NFdcLEDJIqQ1KFiEEF9itQ1D1IjaxGyIWgEtV+rnhn2SG6wCrzpmvHZVP2YRShYhrcMid0KIrygYKa7561NN5UpFrWLOyJVfo1cadIFvtQ8XJAt1WYQQazCCRQjxDblcVmauXJTk5kbD59mZEkScB806zXVLiF75uU9WO1EsMHftiroeGd8lhJDGMIJFCPEFqtP4hbNN5Spa6mtll1ylMpVypaJXNkXFWn0tdhJpsz3Fwsw11caBENIYChYhxPNgpeDV82eatmGIleqt7JSr6hnN+NkFu23HCjb/TrxFkdIb1cr7hS7vaERKySKkMRQsQoinWV2cl6k3zjZsw6B7W0VtiizVkyuAaFY3BKsgzkSx9A9vVbKuG5KVtdB3jJBehYJFCPEsmCmIlFQjdL2VXUXn9eSqK1ErE05EzrAQMhzeFrdWJCtnSBaGQ1OyCKkNBYsQ4jkQrbp++Y2mMwXtLGYHDeUqVHXfZUIO/V49Qkf/7FbeS1UXR8kipCYULEKIp8DBeur8GdlcTzR8nmtypX5ZZVeDbgWznBAsHcXSPz/c4lGBkkVIbShYhBDPsLm+ZqmY3c6VgqBRzVVIdraM6la6UKUJxX7Mg6DR6yvSYhNVLVn5nMVBh4T0ABQsQognWFmYM9KCzWcKRm1cKQgayZXnCInlOYKtAJ8yv5+YVxhtQ7KwupCSRUgRChYhpKtAqNDAcnF2uulzYzaOvQEN04IeBDvsvEMvzhzFwvuRN96FVtOFaN1AySKkCAWLENI1dL2VlREsEICoC3JV/qIHQZQp71CoDTJVEcXKI7LVehqWkkVIEQoWIaQrrK+uWKq30jMF3ZKrUMi+9KNTOKFY+CdXpwWzuYIS23Yka276ihDSy1CwCCGuszhzTWanLjWtt9IrBcM2Ck+zmisrAaJwFwUsbKiQU/VitcbnZEqS1SobidXy7EJCehEOeyaEuAZSgrNTl5vOEwR2t2EAviporwPejxzSdw7MQ1Tjcwx7zJqGQKt6rEJRslodDq1Tv3sPHRVCeg0KFiHEFdCCYfZq86gVwEHezpWCoFkrBr84V1Gwqjqf2kg0jNRg5WO4H4+KStNmWyytomSRXoWCRQhxFAjV8tyMrCzOW3p+1OaVgqBpWlD8Q6jUqsEpxQqVGo9Wt4PIZAvSFw+paFarrSIoWaQXoWARQhwjtbWpolYZC12+cWBHkXXUZbnyGzqqVyiIY8X4SAemqvpB4F7akKw4vlZo/f2kZJFeg4JFCLGdgnH0XZ6fMS6zlp7vRL2Veh3ijFx1c5UhfnXYwToske3xOdWRKtzPlf5WqSwli5BGULAIIbaCJfrz166oays4UW8Fgha5MrPdD8s506sVxQIogI8gjWtIVjrT+ptLySK9AgWLEGIbiFotzc1Yeq5TKUHQSK7CkYgMDI3IRmJF2qXbfbJCxgvIG6LjpGLp8Tm1utwjVYgoVjsrCwEli/QCFCxCSMeg1go9j9KppKXnO5USBM0iV7v3H5J1C53jvQzkJyvO1mEBCHBGRawiKu2bL+UMcYXVhJDjglS2dbAKJAs/E5IV8npnV0LagI1GCSFtgxWCS3PXZeqNs5blClGP/lh35Gpi734ZGd8lOb+PcSm9d04MfjajG4/i/RoYGKz4GqQK7zPSu+E2jyTrq8tyzdh2OFaHBBEKFiGkLZKb62qOYCuF7P0xZ1KCwIpc7dqzX91Op6zVh3kVveN2avCzxjw+B3+/eDxe/pp6v7PFFxBHt/02jyacXUiCCgWLENISiFph1M21i+ctt19wMmoFmsnV2OSeslyhm3ynhe/dTmiFyhEs5yv4IyUh3tjYlJGRUUOktg8beB+RKsTLiUfa//tqycpa2J4I8QsULEKIZXTUymrTUKwQRK2VU1Er0EyuBoeHVd2VJpsOxkEcgSX8kwsuRbEKhbykjfdudHSs4uuZUqqw07o6SBaknZJFggIFixDSFEStMEPQatRKiZURscJ4FSfrl5vJVdRIae07crzisXS68/SgF2qyy1EsF9pQ6CjW1taW9PX1yeDgUMXXdapQS1a7QK4oWSQoULAIIQ1JLC/K5TOvqYLkZqg6nWhRrMIOS4gVuTp07GYjpVUZPssEJIIVKiUqcw4XugPdeDSbzago1rARFYxEtt9XnSpUr6u0DbQLJYsEBQoWIaQmOMChLmZ++mrTAc26zgrRi4gLexWrchWNxXd8Lb3VWQTLKw0FdClU3qVOqvj7go2NddVWYXx8oqIeS6cKAbYB/fx2wLY39cY5y81qCfEiFCxCyA5WFubk6vkzsmUcTBthFqtoxJ3UWTO5wmvYb6QFa8kV6LhFg8daNuF9cEOxdONRRLDQvyoajcrQ0HDFc3SqEGB76ESycka0DIK/vtp+Q1hCugkFixBSBg1Dr108J4uz0w2jVqixQhpIt11wqybJyvibPQePSl//QN2v+71Fg8b8nrs1Dki3bNjc3FDXg4OD0tfXX/E6sqbNplPJQuuG2alLsrpkbVEFIV6CndwJIepAtjA7I4nl+YYBmkhptE24C1EcK3KlG4nWAymnTmUk7JGu4+aX4eTgZzMou8rmiy0bdPRqbGxMFhcz5cignlWoX16x23uleLXKwvVrahudKLXaIMQPMIJFSI+zaaQB3zh7pq5cmftYuVG8XgurcrWryQE4F6DCafwZtlcSuhPCMrdsSKVSxcdK9VgaPavQDLafTlt1YMYlpgYQ4hcYwSKkR8llszJz7ZokVpfVuBOzN+HAjUhNt6JVZqzI1cjErqZyBbY21yVI4E+jemG5sJJQgwL2TK6YJkTLBoB6LDQhXVtLqPvmWYWaYqqw0FEkC1MDMJJpr5EGDkdcCNkR0gEULEJ6kKWFeZmbmZFQIVchV0gB4gCqC5q7jRW56hsYUAdcK6S2grUqLVQyLN1w1I2/WajUsgHF7llD0iFXAPVYeCxVmklZnSoEdkjWRmJVrm6dkUPHb667kIEQL8AUISE9BHpAXb5wXkWuwiW5ipkK1pEChGD5Ra7QjmH/0eNi+WfaMO/OIyVYipDpxeRcjGLpwvVU1YBv1GPp/li1UoX6eztNF7JXFvEDFCxCegAsq0cR+4Uzr6txN4PxkAz2FaUq5iGp0liVK9XrKmotioFVkUkb+ip5qUuDOX3rRkd38+9FFAvF7gXTH6m6P5ZOFVZjl2RdvXBGNtZWhRAvQsEiJOBAqK4YB6Ll+RnpixRkuK97xepWsCJXqL+p10i0HumApQercavQXWOeT1jxeFV/LKQKa72yomR1thFiZeHMlYtq2ybEa7AGi5CAgogNDjwrC8UeQk4PXbYDK3IF9h062nL9jR0zCIG3UoTbt3XDUbdeXrgU9TQXu2tQj4W2DfgaXlPGSBXWGp9TrP8LqS7wnYAVhpCtSdNQb0K6DQWLkACCqNXc1BU1mFkP4PWSGNTCqlzt2rtfBkfGpFXsmkHoKcGquu9Wobv+3Yhi6c7uoapfjHmF2P4ymYyqD8Ol1hilovR3Llkri/Oyub4mB264kcXvxBMwRUhIgEDUavbqRVUAjINbtDTGJihyhV5X7TabDGKKsPrv6mahO9DCpDu7m4FwjY2Nl+uxEMWq9+fttOO7Bi0csO2nSz26COkmFCxCAkJiaV4un3lN1hOrxagVCtgj3oq41MKqXI1N7rHU66oeKZtG5Hjt7awsdHe3DitkKnavBVYUQrJAsZt7/dcHycI22+n2qorfz59W8zQJ6SYULEJ8Dg4oGIo7j3EiRgRLR628WsRuxqpcodfV7g7qa/C+5LKdt2jwJOY6LJcjWACRp1rF7pp4PK6akAL8CRqtdgzbmM7GPE10fi+4LJ2EaChYhPiY1cV542z9jGxtrPsqagWsylWrva5qYWt60GPvbdj0gnTDUVd/f6kpbaMWGCh6HxgoDuBON0gVAl0zGLbh6ITO71MXzrBfFukKFCxCfEjaSHdNvXFGFmb8F7UCrchVK72u6mHXCkLgtbe4WqbzXQjYoNg9m8/LvltO1H0OolhIGeJvnm1S0K4ly666rKk3zqkCeELchIJFiI8oGDK1OHtNRa0w9sVvUSsNVow1kyv0ujpw5LgtK8IyKZtWEIr36HahO0Dz9mw6JdHBAbnroY9J39DQjueg6H1iYpcqem+WKtSgLiveYcoQ29HoxKT0G1E0QtyEgkWIT0DrBYgV+lrhgIOze3Ri90vUSpM25MrKxBrUXMX7B8QOUkmbIlieNKzKu40TcM69BMyxvPLaq0qu7vjgj8iBkyd3PM9c9N4sVVj+nnB7dVl4/qghdEduPqlae4TDHA5N3IV9sAjxOKph6NyM6vMDcCDzW8RKk7EoV2jHMDK+S+zCLsEKe/BNr35FGE/jZsNRDURoYWrKiBamJNbXJzfcdbdEjOjj1CsvVzxPF72vrSVUqtBKGhBvO04mEPmy0i8L2w6kiv2wSDdhBIsQD4Oo1RSiVovbUSuMufGrXFlZyNdpO4Ydvze1pbp8B5Va20I3Fs7p+YRvvPBc+bHDt98uJ9/9bkN0YhXPRdH74OCQ2h5aea1IGfY3aOUwODwsN5x4k+xto9M/IXZDwSLEg1Q3DEXUyg+jbuphVa5wgNxt87gTuzq4exW4xo5C9y7UYQEUuyOKZWbi0GF58498aEddFjq9xwzxSmVbs0EdzTJHvhCxOnT8Zjlww80UK+IZKFiEeIzqhqEo8vVr1ApYlSusGNx3pLN2DLVIJ4M95BnsSBN2qfUTIliL16ZksUqyIFdvevD9FZK13ek9Iu20KMPJxq7JyXLEqn9wWAjxEhQsQjwCevVcv7yzYWjEx5/SbN66XKEdgxOFyEkbBcuzCwp2tGrojmHpYvfrb5zf8TUtWUMTE+XHUPQ+Pj4huULIcqoQ28jwxB7Zd/xWmdh/hBEr4lkoWIR4AN0wdHPdfw1D64F2AZls8+fZ2Y6hFkGcQVhNuMqwICvd6l+OE4Irr71W82tKsh54UHYZaUNNNBo10oUjTVOFEKuRyX1KrEZ3H5RIlGJFvA0Fi5Auosfc+LVhaD1wqLSy2gvY2Y6hmpzx/mZs7OLtWeH1SKE7wLaby6R2pAk1ESNaeeLd75Y9x7fTwejyPmik+GpFO81iNbJrv4TYboH4BLZpIKRLIGq1NDejxErXWvldrIDVLu3A7nYM1dhd4O5Vwaq13aDQvVsuEi2lCScPH677nJvue7sR0Rout3FA0XvC+CwUssliFNcQrsGRCRkYdW77IMRJKFiEuAyiVnPXrqj5gcDPfa2qaUWu7G7HUItUclN6lW4VugMUu189/Zrc/p73NXwe2jgALVnoj7WVisu4sW3EB1i0TvwNBYsQF6mOWuFM36+tF6ppRa76jJSQ3e0YapHc2hA78WyGsGYEqxvtRovgt+aNEwmkCRtFsQAkK5fNysLlKxLr65eRaEwICQIULEJcoDpqpYfZBiFqBVqRK6wY3H/U/nYMtcimgt0DS1NrM8KfAn+Pbm1jqtjdiGI1Eqz05pYkFhZkc3XNSBeOCCFBgoJFiMOYo1YgSClBjZorZ0GusCwf7RiiLq0AS6XsXUHopyJ30L0YVrEubPaN85JJvVeNztFgG9hYXpHr586ra0KCCgWLEIeojloBdJ8OSkpQg9WCVjuH7z3s3ggTzB8sdLEOyU10N/fqf2+ui4XuoJBNS2J+XkWxkmsJ4/aiLF6dkpyV/h2E+BwKFiEOUB21CtIqQTNWu7QDDN8dHB4Tt8j2yApCDV5etU92WzBjxtnElVdflcTsPKNVpOegYBFiI7WiVkFMCYJW5AorBiccXjFYTXJrXezE83+/GobVrUJ3tFgYGt8tfQPDqm8V5Yr0IhQsQmwCMwQXZ7ejVgCNQ2MB7ItodQQOcGvFYDXJLXtbNIQ8u4awCLq556sMy81Cd0hVfGBIhsf3sBkoIULBIqRjIFSIWm0kVsuPBTUlCHDQtipXasWgAwOcrZBJJaWn6EKhO7qsD00UI1XsW0VIJRQsQjogubkuc1NXKsaxBDUlCFppxxDWKwa7MIw3n8tJzqoFBoR6Mm93oTukanBsl/QPjVKqCGkABYuQNikYloFRLHEjBaYFK4irBDWtyBWY3Lu/K3IF0kn7Bzz7NRppR6E7pYqQ1qFgEdImISNEhTl6uCBNiGhWeiMhyfXVijqsoNCKXGHG4OiuPdIt8LfoOeoIYLuF7pDjgdEJpv8IaRMKFiE2oM7wh8eKbQj2HZH01rpsJpbVdTbj/27iWDFoVa6GR8ccnzHYjJQDESw/tGmoRSuF7ihUR5Sq39iOI9HuRB8JCQoULEIcIG4668+ktpRoJY3oVsqHkZVW2jGgqH3PoaPSbTJp+6XWr4IF6sWwcGIAmeobGFLXXP1HiH1QsAhxmFjfgLoMje+RgpE6TEG21hO+iG610o5Bj8EJd/kgjfSsExEsr9NIAM2F7rqdAlN/hDgLBYsQF0GEoH9oTF1AzhAsiNaWEd1KG9EtL9VuIerRykSTvYeOdq2o3Ux6yxm58kONOwrx81Wp3JgRVRwx0rYDw8Plxp+EEOehYBHSRSIoJI7tkoHRXeq+Tiemtja6Klx6xaBVUNQ+OOLeGJxG2D3guYxPVhHGjG1qyBCqeP+Auu52RJGQXoWCRYiHMKcTAYQra1wQ4cK1GynFVtsxYAxOt4vazTi1gtCrfoWUH7YZnfZjhIoQb0DBIsTDaOHSES6kFDNpRLk2lHxlklu2RrlalSsUtaPflZfIphwocBdvgBQs6qZiff3lbYNCRYg3oWAR4iOQUsRF13ABHeXKpJPqdicrFdPZ1uQKRe1eOsCrfmROtGgIi+tApqKGQBWlitEpQvwGBYsQn1OOcpkeg2jlsumWIl1ox5DPi2X2eaSo3YxzBe7OxrBi/cbfMD6gIlMQaMoUIf6HgkVIANHSZY50oUWEki0lXxl1DemCfLXS6wqgqL1/0HtL/NNp77ZnQLF5xIj6QaQgUdFoTOLGe8iGnoQEEwoWIT0CIiLxOr2P0Dcqm04X5StX7COVz9XuJ+W1onYzya3uCpaWKEgTonuxeL+EIhEluxQpQnoLChYhRPqMFBUuhj7t+FpWFdanlXClDQEbn+zejMFmZBwSLPSXgjyFDVlSdXCGLKnbRhRK34dQMa1HCNFQsAghDVHF1qVaqyHxRq+reljtgRUr/XsgSeZLpCRRRVkKF//t0Wjx65QnQkgLULAIIYEAEbYDN9xc8Ri6mGsoSYQQN/k/AUnuF1PSmfQLAAAAAElFTkSuQmCC" />
+  </defs>
+</svg>

From 853cbfe09344e0510d497ef5fbef68afc4650baa Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Mon, 9 Dec 2024 15:43:54 -0800
Subject: [PATCH 062/479] Adjust notebooks (#235682)

---
 .vscode/notebooks/grooming.github-issues   | 16 ++++++++--------
 .vscode/notebooks/my-endgame.github-issues |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.vscode/notebooks/grooming.github-issues b/.vscode/notebooks/grooming.github-issues
index 8bb9a246d5f..cca871afdb8 100644
--- a/.vscode/notebooks/grooming.github-issues
+++ b/.vscode/notebooks/grooming.github-issues
@@ -7,22 +7,22 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "// list of repos we work in\r\n$repos=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\r"
+    "value": "// list of repos we work in\r\n$repos=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\r\n"
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "#### Missing Type label\r"
+    "value": "#### Missing Type label\r\n"
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos assignee:@me is:open type:issue -label:bug -label:\"info-needed\" -label:feature-request -label:under-discussion -label:debt -label:plan-item -label:upstream -label:polish -label:testplan-item -label:error-telemetry -label:engineering -label:endgame-plan\r"
+    "value": "$repos assignee:@me is:open type:issue -label:bug -label:\"info-needed\" -label:feature-request -label:under-discussion -label:debt -label:plan-item -label:upstream -label:polish -label:testplan-item -label:error-telemetry -label:engineering -label:endgame-plan\r\n"
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "#### Missing Area Label\r\n\r\nFeature area labels are light or strong blue (`1d76db` or `c5def5`) and they denote a specific feature or feature area, like `editor-clipboard` or `file-explorer`\r"
+    "value": "#### Missing Area Label\r\n\r\nFeature area labels are light or strong blue (`1d76db` or `c5def5`) and they denote a specific feature or feature area, like `editor-clipboard` or `file-explorer`\r\n"
   },
   {
     "kind": 2,
@@ -32,21 +32,21 @@
   {
     "kind": 1,
     "language": "markdown",
-    "value": "### Missing Milestone\r"
+    "value": "### Missing Milestone\r\n"
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos assignee:@me is:open type:issue no:milestone -label:info-needed -label:triage-needed\r"
+    "value": "$repos assignee:@me is:open type:issue no:milestone -label:info-needed -label:triage-needed -label:confirmation-pending\r\n"
   },
   {
     "kind": 1,
     "language": "markdown",
-    "value": "#### Not Actionable\r"
+    "value": "#### Not Actionable\r\n"
   },
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos assignee:@me is:open label:\"info-needed\"\r"
+    "value": "$repos assignee:@me is:open label:\"info-needed\"\r\n"
   }
 ]
\ No newline at end of file
diff --git a/.vscode/notebooks/my-endgame.github-issues b/.vscode/notebooks/my-endgame.github-issues
index 9d101de768b..b0be17265cd 100644
--- a/.vscode/notebooks/my-endgame.github-issues
+++ b/.vscode/notebooks/my-endgame.github-issues
@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n$MILESTONE=milestone:\"November 2024\"\n\n$MINE=assignee:@me"
+    "value": "$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\r\n\r\n$MILESTONE=milestone:\"November 2024\"\r\n\r\n$MINE=assignee:@me"
   },
   {
     "kind": 1,
@@ -157,7 +157,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:*out-of-scope -label:error-telemetry -label:verification-steps-needed -label:verification-found -author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:andreamah -author:bamurtaugh -author:bpasero -author:chrisdias -author:chrmarti -author:Chuxel -author:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:egamma -author:fiveisprime -author:gregvanl -author:hediet -author:isidorn -author:joaomoreno -author:joyceerhl -author:jrieken -author:kieferrm -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:roblourens -author:rzhao271 -author:sandy081 -author:sbatten -author:stevencl -author:tanhakabir -author:TylerLeonhardt -author:Tyriar -author:weinand -author:amunger -author:karthiknadig -author:eleanorjboyd -author:Yoyokrazy -author:paulacamargo25 -author:ulugbekna -author:aiday-mar -author:daviddossett -author:bhavyaus -author:justschen -author:benibenj -author:luabud -author:anthonykim1 -author:joshspicer -author:osortega -author:legomushroom"
+    "value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:*out-of-scope -label:error-telemetry -label:verification-steps-needed -label:verification-found -author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:andreamah -author:bamurtaugh -author:bpasero -author:chrisdias -author:chrmarti -author:Chuxel -author:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:egamma -author:fiveisprime -author:ntrogh -author:hediet -author:isidorn -author:joaomoreno -author:joyceerhl -author:jrieken -author:kieferrm -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:roblourens -author:rzhao271 -author:sandy081 -author:sbatten -author:stevencl -author:tanhakabir -author:TylerLeonhardt -author:Tyriar -author:weinand -author:amunger -author:karthiknadig -author:eleanorjboyd -author:Yoyokrazy -author:paulacamargo25 -author:ulugbekna -author:aiday-mar -author:daviddossett -author:bhavyaus -author:justschen -author:benibenj -author:luabud -author:anthonykim1 -author:joshspicer -author:osortega -author:legomushroom"
   },
   {
     "kind": 1,
@@ -187,6 +187,6 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS $MILESTONE $MINE is:issue is:closed reason:completed label:feature-request -label:on-release-notes\n$REPOS $MILESTONE $MINE is:issue is:closed reason:completed label:engineering -label:on-release-notes\n$REPOS $MILESTONE $MINE is:issue is:closed reason:completed label:plan-item -label:on-release-notes"
+    "value": "$REPOS $MILESTONE $MINE is:issue is:closed reason:completed label:feature-request -label:on-release-notes\r\n$REPOS $MILESTONE $MINE is:issue is:closed reason:completed label:engineering -label:on-release-notes\r\n$REPOS $MILESTONE $MINE is:issue is:closed reason:completed label:plan-item -label:on-release-notes"
   }
 ]
\ No newline at end of file

From 05fd1308240072efb09749954fd478221fd01d55 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Mon, 9 Dec 2024 16:35:26 -0800
Subject: [PATCH 063/479] Remove under-discussion from needing milestone
 (#235687)

---
 .vscode/notebooks/grooming.github-issues | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vscode/notebooks/grooming.github-issues b/.vscode/notebooks/grooming.github-issues
index cca871afdb8..6e2e81b21a5 100644
--- a/.vscode/notebooks/grooming.github-issues
+++ b/.vscode/notebooks/grooming.github-issues
@@ -37,7 +37,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos assignee:@me is:open type:issue no:milestone -label:info-needed -label:triage-needed -label:confirmation-pending\r\n"
+    "value": "$repos assignee:@me is:open type:issue no:milestone -label:info-needed -label:triage-needed -label:confirmation-pending -label:under-discussion\r\n"
   },
   {
     "kind": 1,

From ff31a135b1901c4ca7e486ad25ef03c35aeca56c Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 10 Dec 2024 10:23:59 +0100
Subject: [PATCH 064/479] debt - implement `disableCache` for node/electron
 requests (#235709)

---
 src/vs/platform/request/node/requestService.ts              | 6 +++++-
 .../electron-sandbox/emergencyAlert.contribution.ts         | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/vs/platform/request/node/requestService.ts b/src/vs/platform/request/node/requestService.ts
index 149d42059e1..38a582b044e 100644
--- a/src/vs/platform/request/node/requestService.ts
+++ b/src/vs/platform/request/node/requestService.ts
@@ -155,7 +155,7 @@ export async function nodeRequest(options: NodeRequestOptions, token: Cancellati
 			? options.getRawRequest(options)
 			: await getNodeRequest(options);
 
-		const opts: https.RequestOptions = {
+		const opts: https.RequestOptions & { cache?: 'default' | 'no-store' | 'reload' | 'no-cache' | 'force-cache' | 'only-if-cached' } = {
 			hostname: endpoint.hostname,
 			port: endpoint.port ? parseInt(endpoint.port) : (endpoint.protocol === 'https:' ? 443 : 80),
 			protocol: endpoint.protocol,
@@ -170,6 +170,10 @@ export async function nodeRequest(options: NodeRequestOptions, token: Cancellati
 			opts.auth = options.user + ':' + options.password;
 		}
 
+		if (options.disableCache) {
+			opts.cache = 'no-store';
+		}
+
 		const req = rawRequest(opts, (res: http.IncomingMessage) => {
 			const followRedirects: number = isNumber(options.followRedirects) ? options.followRedirects : 3;
 			if (res.statusCode && res.statusCode >= 300 && res.statusCode < 400 && followRedirects > 0 && res.headers['location']) {
diff --git a/src/vs/workbench/contrib/emergencyAlert/electron-sandbox/emergencyAlert.contribution.ts b/src/vs/workbench/contrib/emergencyAlert/electron-sandbox/emergencyAlert.contribution.ts
index 6a9851fa5b9..6ef9584b413 100644
--- a/src/vs/workbench/contrib/emergencyAlert/electron-sandbox/emergencyAlert.contribution.ts
+++ b/src/vs/workbench/contrib/emergencyAlert/electron-sandbox/emergencyAlert.contribution.ts
@@ -58,7 +58,7 @@ export class EmergencyAlert implements IWorkbenchContribution {
 	}
 
 	private async doFetchAlerts(url: string): Promise<void> {
-		const requestResult = await this.requestService.request({ type: 'GET', url }, CancellationToken.None);
+		const requestResult = await this.requestService.request({ type: 'GET', url, disableCache: true }, CancellationToken.None);
 
 		if (requestResult.res.statusCode !== 200) {
 			throw new Error(`Failed to fetch emergency alerts: HTTP ${requestResult.res.statusCode}`);

From 7ccf9661c70637e3056795f6c00250e5def2a349 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Tue, 10 Dec 2024 11:00:46 +0100
Subject: [PATCH 065/479] Git - keybindings to match command pallette `when`
 clause (#235713)

---
 extensions/git/package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/git/package.json b/extensions/git/package.json
index 5c48bd5dc8b..5e7caad22bb 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -943,19 +943,19 @@
         "command": "git.stageSelectedRanges",
         "key": "ctrl+k ctrl+alt+s",
         "mac": "cmd+k cmd+alt+s",
-        "when": "isInDiffEditor"
+        "when": "resourceScheme =~ /^git$|^file$/"
       },
       {
         "command": "git.unstageSelectedRanges",
         "key": "ctrl+k ctrl+n",
         "mac": "cmd+k cmd+n",
-        "when": "isInDiffEditor"
+        "when": "isInDiffEditor && resourceScheme =~ /^git$|^file$/"
       },
       {
         "command": "git.revertSelectedRanges",
         "key": "ctrl+k ctrl+r",
         "mac": "cmd+k cmd+r",
-        "when": "isInDiffEditor"
+        "when": "resourceScheme =~ /^git$|^file$/"
       }
     ],
     "menus": {

From 21c52a4a3ae29fac345c863b39c5fd44f4005862 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Tue, 10 Dec 2024 11:02:51 +0100
Subject: [PATCH 066/479] onEnter Indentation Rules: Ignoring double slashes
 inside of strings (#235712)

ignoring double slashes inside of strings
---
 extensions/cpp/language-configuration.json                   | 2 +-
 extensions/csharp/language-configuration.json                | 2 +-
 extensions/go/language-configuration.json                    | 2 +-
 extensions/groovy/language-configuration.json                | 2 +-
 extensions/java/language-configuration.json                  | 2 +-
 extensions/javascript/javascript-language-configuration.json | 2 +-
 extensions/json/language-configuration.json                  | 2 +-
 extensions/less/language-configuration.json                  | 2 +-
 extensions/objective-c/language-configuration.json           | 2 +-
 extensions/php/language-configuration.json                   | 2 +-
 extensions/rust/language-configuration.json                  | 2 +-
 extensions/swift/language-configuration.json                 | 2 +-
 extensions/typescript-basics/language-configuration.json     | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/extensions/cpp/language-configuration.json b/extensions/cpp/language-configuration.json
index cb1fb733b99..4324b1ffc2c 100644
--- a/extensions/cpp/language-configuration.json
+++ b/extensions/cpp/language-configuration.json
@@ -118,7 +118,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "\/\/.*"
+				"pattern": "^(?:\"[^\"]*\"|'[^']*'|[^\"']*)*\/\/"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/csharp/language-configuration.json b/extensions/csharp/language-configuration.json
index 60814ae02f4..c54e020bf8c 100644
--- a/extensions/csharp/language-configuration.json
+++ b/extensions/csharp/language-configuration.json
@@ -86,7 +86,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "\/\/.*"
+				"pattern": "^(?:\"[^\"]*\"|'[^']*'|[^\"']*)*\/\/"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/go/language-configuration.json b/extensions/go/language-configuration.json
index 9238bf3529b..2170510547b 100644
--- a/extensions/go/language-configuration.json
+++ b/extensions/go/language-configuration.json
@@ -96,7 +96,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "\/\/.*"
+				"pattern": "^(?:\"[^\"]*\"|'[^']*'|`[^`]*`|[^\"'`]*)*\/\/"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/groovy/language-configuration.json b/extensions/groovy/language-configuration.json
index 39e5fd4092c..08c7a1c6395 100644
--- a/extensions/groovy/language-configuration.json
+++ b/extensions/groovy/language-configuration.json
@@ -74,7 +74,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "\/\/.*"
+				"pattern": "^(?:\"[^\"]*\"|'[^']*'|[^\"']*)*\/\/"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/java/language-configuration.json b/extensions/java/language-configuration.json
index 6ba09bbd15c..813f406fcb0 100644
--- a/extensions/java/language-configuration.json
+++ b/extensions/java/language-configuration.json
@@ -158,7 +158,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "\/\/.*"
+				"pattern": "^(?:\"[^\"]*\"|'[^']*'|[^\"']*)*\/\/"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/javascript/javascript-language-configuration.json b/extensions/javascript/javascript-language-configuration.json
index 46ee043c52c..b1006f3d05f 100644
--- a/extensions/javascript/javascript-language-configuration.json
+++ b/extensions/javascript/javascript-language-configuration.json
@@ -231,7 +231,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "\/\/.*"
+				"pattern": "^(?:\"[^\"]*\"|'[^']*'|`[^`]*`|[^\"'`]*)*\/\/"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/json/language-configuration.json b/extensions/json/language-configuration.json
index d47efe2587e..215f9d6c854 100644
--- a/extensions/json/language-configuration.json
+++ b/extensions/json/language-configuration.json
@@ -70,7 +70,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "\/\/.*"
+				"pattern": "^(?:\"[^\"]*\"|[^\"]*)*\/\/"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/less/language-configuration.json b/extensions/less/language-configuration.json
index 71e155ddfcc..ff92640a6a3 100644
--- a/extensions/less/language-configuration.json
+++ b/extensions/less/language-configuration.json
@@ -99,7 +99,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "\/\/.*"
+				"pattern": "^(?:\"[^\"]*\"|'[^']*'|[^\"']*)*\/\/"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/objective-c/language-configuration.json b/extensions/objective-c/language-configuration.json
index 39e5fd4092c..08c7a1c6395 100644
--- a/extensions/objective-c/language-configuration.json
+++ b/extensions/objective-c/language-configuration.json
@@ -74,7 +74,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "\/\/.*"
+				"pattern": "^(?:\"[^\"]*\"|'[^']*'|[^\"']*)*\/\/"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/php/language-configuration.json b/extensions/php/language-configuration.json
index d696ffa2950..8880f278e42 100644
--- a/extensions/php/language-configuration.json
+++ b/extensions/php/language-configuration.json
@@ -157,7 +157,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "\/\/.*"
+				"pattern": "^(?:\"[^\"]*\"|'[^']*'|`[^`]*`|[^\"'`]*)*\/\/"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/rust/language-configuration.json b/extensions/rust/language-configuration.json
index 490f4409c65..846c799f877 100644
--- a/extensions/rust/language-configuration.json
+++ b/extensions/rust/language-configuration.json
@@ -77,7 +77,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "\/\/.*"
+				"pattern": "^(?:\"[^\"]*\"|'[^']*'|[^\"']*)*\/\/"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/swift/language-configuration.json b/extensions/swift/language-configuration.json
index e1ceb1f6bc6..b3f8ae7de50 100644
--- a/extensions/swift/language-configuration.json
+++ b/extensions/swift/language-configuration.json
@@ -85,7 +85,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "\/\/.*"
+				"pattern": "^(?:\"[^\"]*\"|'[^']*'|[^\"']*)*\/\/"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/typescript-basics/language-configuration.json b/extensions/typescript-basics/language-configuration.json
index 876c11e8143..b59f5ac79f0 100644
--- a/extensions/typescript-basics/language-configuration.json
+++ b/extensions/typescript-basics/language-configuration.json
@@ -249,7 +249,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "\/\/.*"
+				"pattern": "^(?:\"[^\"]*\"|'[^']*'|`[^`]*`|[^\"'`]*)*\/\/"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"

From 373cd3886faac35154703cd301af865b2238b29a Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 10 Dec 2024 11:18:17 +0100
Subject: [PATCH 067/479] chat - allow to override status icon too (#235715)

---
 .../browser/parts/statusbar/statusbarPart.ts      | 15 +++++++--------
 .../contrib/chat/browser/chatQuotasService.ts     |  6 +++++-
 .../services/statusbar/browser/statusbar.ts       | 12 ------------
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
index 7454d382d0c..efc5e92e03f 100644
--- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
@@ -9,7 +9,7 @@ import { Disposable, DisposableStore, disposeIfDisposable, IDisposable, MutableD
 import { MultiWindowParts, Part } from '../../part.js';
 import { EventType as TouchEventType, Gesture, GestureEvent } from '../../../../base/browser/touch.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { StatusbarAlignment, IStatusbarService, IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarStyleOverride, isStatusbarEntryLocation, IStatusbarEntryLocation, isStatusbarEntryPriority, IStatusbarEntryPriority, IStatusbarEntryOverride } from '../../../services/statusbar/browser/statusbar.js';
+import { StatusbarAlignment, IStatusbarService, IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarStyleOverride, isStatusbarEntryLocation, IStatusbarEntryLocation, isStatusbarEntryPriority, IStatusbarEntryPriority } from '../../../services/statusbar/browser/statusbar.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { IAction, Separator, toAction } from '../../../../base/common/actions.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
@@ -76,10 +76,9 @@ export interface IStatusbarEntryContainer extends IDisposable {
 	updateEntryVisibility(id: string, visible: boolean): void;
 
 	/**
-	 * Allows to override the appearance of an entry with the provided ID. Only a subset
-	 * of properties is allowed to be overridden.
+	 * Allows to override the appearance of an entry with the provided ID.
 	 */
-	overrideEntry(id: string, override: IStatusbarEntryOverride): IDisposable;
+	overrideEntry(id: string, override: Partial<IStatusbarEntry>): IDisposable;
 
 	/**
 	 * Focused the status bar. If one of the status bar entries was focused, focuses it directly.
@@ -141,7 +140,7 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
 	readonly onWillDispose = this._onWillDispose.event;
 
 	private readonly onDidOverrideEntry = this._register(new Emitter<string>());
-	private readonly entryOverrides = new Map<string, IStatusbarEntryOverride>();
+	private readonly entryOverrides = new Map<string, Partial<IStatusbarEntry>>();
 
 	private leftItemsContainer: HTMLElement | undefined;
 	private rightItemsContainer: HTMLElement | undefined;
@@ -182,7 +181,7 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
 		this._register(this.contextService.onDidChangeWorkbenchState(() => this.updateStyles()));
 	}
 
-	overrideEntry(id: string, override: IStatusbarEntryOverride): IDisposable {
+	overrideEntry(id: string, override: Partial<IStatusbarEntry>): IDisposable {
 		this.entryOverrides.set(id, override);
 		this.onDidOverrideEntry.fire(id);
 
@@ -834,7 +833,7 @@ export class StatusbarService extends MultiWindowParts<StatusbarPart> implements
 		}
 	}
 
-	overrideEntry(id: string, override: IStatusbarEntryOverride): IDisposable {
+	overrideEntry(id: string, override: Partial<IStatusbarEntry>): IDisposable {
 		const disposables = new DisposableStore();
 
 		for (const part of this.parts) {
@@ -910,7 +909,7 @@ export class ScopedStatusbarService extends Disposable implements IStatusbarServ
 		this.statusbarEntryContainer.updateEntryVisibility(id, visible);
 	}
 
-	overrideEntry(id: string, override: IStatusbarEntryOverride): IDisposable {
+	overrideEntry(id: string, override: Partial<IStatusbarEntry>): IDisposable {
 		return this.statusbarEntryContainer.overrideEntry(id, override);
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts b/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
index 7b82ddbb330..87b4eb19f7f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
@@ -261,7 +261,11 @@ export class ChatQuotasStatusBarEntry extends Disposable implements IWorkbenchCo
 				compact: isCopilotStatusVisible
 			}));
 
-			this.entry.add(this.statusbarService.overrideEntry(ChatQuotasStatusBarEntry.COPILOT_STATUS_ID, { kind: 'prominent' }));
+			this.entry.add(this.statusbarService.overrideEntry(ChatQuotasStatusBarEntry.COPILOT_STATUS_ID, {
+				text: '$(copilot-warning)',
+				ariaLabel: text,
+				kind: 'prominent'
+			}));
 		}
 	}
 }
diff --git a/src/vs/workbench/services/statusbar/browser/statusbar.ts b/src/vs/workbench/services/statusbar/browser/statusbar.ts
index 1c589dc4f66..3b3f1f1fe17 100644
--- a/src/vs/workbench/services/statusbar/browser/statusbar.ts
+++ b/src/vs/workbench/services/statusbar/browser/statusbar.ts
@@ -197,15 +197,3 @@ export interface IStatusbarEntryAccessor extends IDisposable {
 	 */
 	update(properties: IStatusbarEntry): void;
 }
-
-/**
- * A way to override a status bar entry appearance. Only a subset of
- * properties are currently allowed to override.
- */
-export interface IStatusbarEntryOverride {
-
-	/**
-	 * The kind of status bar entry. This applies different colors to the entry.
-	 */
-	readonly kind?: StatusbarEntryKind;
-}

From 958bcc0e643637bee7a095bfcf9a95c5f0bf83fc Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Tue, 10 Dec 2024 11:05:54 +0100
Subject: [PATCH 068/479] Remove obsolete config

---
 .github/commands.yml | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 .github/commands.yml

diff --git a/.github/commands.yml b/.github/commands.yml
deleted file mode 100644
index 5073658e526..00000000000
--- a/.github/commands.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  perform: true,
-  commands:
-    [
-      {
-        type: "comment",
-        name: "findDuplicates",
-        allowUsers: ["cleidigh", "usernamehw", "gjsjohnmurray", "IllusionMH"],
-        action: "comment",
-        comment: "Potential duplicates:\n${potentialDuplicates}",
-      },
-    ],
-}

From 037120232e42b0ac30ceab03bfceaa68b610a1d6 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 10 Dec 2024 11:48:20 +0100
Subject: [PATCH 069/479] status - tweaks to
 `statusBarItem.prominentHoverBackground` (#235719)

---
 src/vs/workbench/common/theme.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts
index 5b0f4493d37..d864f0c9c69 100644
--- a/src/vs/workbench/common/theme.ts
+++ b/src/vs/workbench/common/theme.ts
@@ -424,12 +424,7 @@ export const STATUS_BAR_PROMINENT_ITEM_BACKGROUND = registerColor('statusBarItem
 
 export const STATUS_BAR_PROMINENT_ITEM_HOVER_FOREGROUND = registerColor('statusBarItem.prominentHoverForeground', STATUS_BAR_ITEM_HOVER_FOREGROUND, localize('statusBarProminentItemHoverForeground', "Status bar prominent items foreground color when hovering. Prominent items stand out from other status bar entries to indicate importance. The status bar is shown in the bottom of the window."));
 
-export const STATUS_BAR_PROMINENT_ITEM_HOVER_BACKGROUND = registerColor('statusBarItem.prominentHoverBackground', {
-	dark: Color.black.transparent(0.3),
-	light: Color.black.transparent(0.3),
-	hcDark: Color.black.transparent(0.3),
-	hcLight: null
-}, localize('statusBarProminentItemHoverBackground', "Status bar prominent items background color when hovering. Prominent items stand out from other status bar entries to indicate importance. The status bar is shown in the bottom of the window."));
+export const STATUS_BAR_PROMINENT_ITEM_HOVER_BACKGROUND = registerColor('statusBarItem.prominentHoverBackground', STATUS_BAR_ITEM_HOVER_BACKGROUND, localize('statusBarProminentItemHoverBackground', "Status bar prominent items background color when hovering. Prominent items stand out from other status bar entries to indicate importance. The status bar is shown in the bottom of the window."));
 
 export const STATUS_BAR_ERROR_ITEM_BACKGROUND = registerColor('statusBarItem.errorBackground', {
 	dark: darken(errorForeground, .4),

From 461a6983d7803720547fcd04297eaa5b5f57d83f Mon Sep 17 00:00:00 2001
From: andretshurotshka <andwebar@gmail.com>
Date: Tue, 10 Dec 2024 16:09:10 +0500
Subject: [PATCH 070/479] Fixes #44237: Add column number in tasks (#65264)

Add column number in tasks

Co-authored-by: Alex Ross <alros@microsoft.com>
---
 src/vs/server/node/remoteTerminalChannel.ts           |  3 +++
 .../api/common/extHostVariableResolverService.ts      |  9 +++++++++
 .../browser/baseConfigurationResolverService.ts       | 11 +++++++++++
 .../common/configurationResolver.ts                   |  1 +
 .../configurationResolver/common/variableResolver.ts  |  8 ++++++++
 5 files changed, 32 insertions(+)

diff --git a/src/vs/server/node/remoteTerminalChannel.ts b/src/vs/server/node/remoteTerminalChannel.ts
index 399c8d8f8e6..69029595bb9 100644
--- a/src/vs/server/node/remoteTerminalChannel.ts
+++ b/src/vs/server/node/remoteTerminalChannel.ts
@@ -74,6 +74,9 @@ class CustomVariableResolver extends AbstractVariableResolverService {
 			getLineNumber: (): string | undefined => {
 				return resolvedVariables['lineNumber'];
 			},
+			getColumnNumber: (): string | undefined => {
+				return resolvedVariables['columnNumber'];
+			},
 			getExtension: async id => {
 				const installed = await extensionService.getInstalled();
 				const found = installed.find(e => e.identifier.id === id);
diff --git a/src/vs/workbench/api/common/extHostVariableResolverService.ts b/src/vs/workbench/api/common/extHostVariableResolverService.ts
index d5c19b162fa..1acc6ab696f 100644
--- a/src/vs/workbench/api/common/extHostVariableResolverService.ts
+++ b/src/vs/workbench/api/common/extHostVariableResolverService.ts
@@ -117,6 +117,15 @@ class ExtHostVariableResolverService extends AbstractVariableResolverService {
 				}
 				return undefined;
 			},
+			getColumnNumber: (): string | undefined => {
+				if (editorService) {
+					const activeEditor = editorService.activeEditor();
+					if (activeEditor) {
+						return String(activeEditor.selection.end.character + 1);
+					}
+				}
+				return undefined;
+			},
 			getExtension: (id) => {
 				return extensionService.getExtension(id);
 			},
diff --git a/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts b/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts
index e8d38a377d1..5c06bad50b5 100644
--- a/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts
+++ b/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.ts
@@ -121,6 +121,17 @@ export abstract class BaseConfigurationResolverService extends AbstractVariableR
 				}
 				return undefined;
 			},
+			getColumnNumber: (): string | undefined => {
+				const activeTextEditorControl = editorService.activeTextEditorControl;
+				if (isCodeEditor(activeTextEditorControl)) {
+					const selection = activeTextEditorControl.getSelection();
+					if (selection) {
+						const columnNumber = selection.positionColumn;
+						return String(columnNumber);
+					}
+				}
+				return undefined;
+			},
 			getExtension: id => {
 				return extensionService.getExtension(id);
 			},
diff --git a/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts b/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts
index fd63a52e332..e7486544888 100644
--- a/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts
+++ b/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts
@@ -95,6 +95,7 @@ export enum VariableKind {
 	WorkspaceFolderBasename = 'workspaceFolderBasename',
 	UserHome = 'userHome',
 	LineNumber = 'lineNumber',
+	ColumnNumber = 'columnNumber',
 	SelectedText = 'selectedText',
 	File = 'file',
 	FileWorkspaceFolder = 'fileWorkspaceFolder',
diff --git a/src/vs/workbench/services/configurationResolver/common/variableResolver.ts b/src/vs/workbench/services/configurationResolver/common/variableResolver.ts
index ed21fcd79b2..b67a8fe1401 100644
--- a/src/vs/workbench/services/configurationResolver/common/variableResolver.ts
+++ b/src/vs/workbench/services/configurationResolver/common/variableResolver.ts
@@ -27,6 +27,7 @@ interface IVariableResolveContext {
 	getWorkspaceFolderPathForFile?(): string | undefined;
 	getSelectedText(): string | undefined;
 	getLineNumber(): string | undefined;
+	getColumnNumber(): string | undefined;
 	getExtension(id: string): Promise<{ readonly extensionLocation: uri } | undefined>;
 }
 
@@ -307,6 +308,13 @@ export class AbstractVariableResolverService implements IConfigurationResolverSe
 						}
 						throw new VariableError(VariableKind.LineNumber, localize('canNotResolveLineNumber', "Variable {0} can not be resolved. Make sure to have a line selected in the active editor.", match));
 					}
+					case 'columnNumber': {
+						const columnNumber = this._context.getColumnNumber();
+						if (columnNumber) {
+							return columnNumber;
+						}
+						throw new Error(localize('canNotResolveColumnNumber', "Variable {0} can not be resolved. Make sure to have a column selected in the active editor.", match));
+					}
 					case 'selectedText': {
 						const selectedText = this._context.getSelectedText();
 						if (selectedText) {

From 1c91332da73c972a75c497e5d3d7bfdbf4b94684 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Tue, 10 Dec 2024 12:32:57 +0100
Subject: [PATCH 071/479] Re-adopt new YAML grammar! (#232244)

* Embedded languages syntax highlighting stopped working in 1.92.0
Fixes #224978

* Get embedded grammar
---
 .../colorize-results/issue-1550_yaml.json     |  40 +-
 .../colorize-results/issue-224862_yaml.json   | 206 +++++-
 .../colorize-results/issue-4008_yaml.json     |  48 +-
 .../colorize-results/issue-6303_yaml.json     | 132 +++-
 .../test/colorize-results/test_yaml.json      | 374 +++++++----
 extensions/yaml/build/update-grammar.js       |   7 +-
 extensions/yaml/cgmanifest.json               |  31 +-
 extensions/yaml/package.json                  |  28 +-
 .../yaml/syntaxes/yaml-1.0.tmLanguage.json    |  10 +-
 .../yaml/syntaxes/yaml-1.2.tmLanguage.json    |  26 +-
 .../syntaxes/yaml-embedded.tmLanguage.json    | 502 ++++++++++++++
 extensions/yaml/syntaxes/yaml.tmLanguage.json | 625 ++----------------
 12 files changed, 1183 insertions(+), 846 deletions(-)
 create mode 100644 extensions/yaml/syntaxes/yaml-embedded.tmLanguage.json

diff --git a/extensions/vscode-colorize-tests/test/colorize-results/issue-1550_yaml.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-1550_yaml.json
index dac84162b3c..cc1450808af 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/issue-1550_yaml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/issue-1550_yaml.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "test1",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": "dsd",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "test2",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": "abc-def",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": "test-3",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -169,7 +169,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -197,7 +197,7 @@
 	},
 	{
 		"c": "abcdef",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -211,7 +211,7 @@
 	},
 	{
 		"c": "test-4",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -225,7 +225,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -239,7 +239,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -253,7 +253,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -267,7 +267,7 @@
 	},
 	{
 		"c": "abc-def",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/issue-224862_yaml.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-224862_yaml.json
index 5c87b443d34..f79882e54e4 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/issue-224862_yaml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/issue-224862_yaml.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "---",
-		"t": "source.yaml entity.other.document.begin.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml entity.other.document.begin.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": "1",
-		"t": "source.yaml constant.numeric.integer.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml constant.numeric.integer.decimal.yaml",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "---",
-		"t": "source.yaml entity.other.document.begin.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml entity.other.document.begin.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": "This is highlighted as a YAML string",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": "#",
-		"t": "source.yaml comment.line.number-sign.yaml punctuation.definition.comment.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml comment.line.number-sign.yaml punctuation.definition.comment.yaml",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": " This is highlighted as a YAML comment",
-		"t": "source.yaml comment.line.number-sign.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml comment.line.number-sign.yaml",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -126,17 +126,185 @@
 		}
 	},
 	{
-		"c": "This is highlighted as a YAML error",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"c": "This",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml invalid.illegal.unrecognized.yaml",
 		"r": {
-			"dark_plus": "string: #CE9178",
-			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
-			"dark_vs": "string: #CE9178",
-			"light_vs": "string.unquoted.plain.out.yaml: #0000FF",
-			"hc_black": "string: #CE9178",
-			"dark_modern": "string: #CE9178",
-			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
-			"light_modern": "string.unquoted.plain.out.yaml: #0000FF"
+			"dark_plus": "invalid: #F44747",
+			"light_plus": "invalid: #CD3131",
+			"dark_vs": "invalid: #F44747",
+			"light_vs": "invalid: #CD3131",
+			"hc_black": "invalid: #F44747",
+			"dark_modern": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_modern": "invalid: #CD3131"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml punctuation.whitespace.separator.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "is",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml invalid.illegal.unrecognized.yaml",
+		"r": {
+			"dark_plus": "invalid: #F44747",
+			"light_plus": "invalid: #CD3131",
+			"dark_vs": "invalid: #F44747",
+			"light_vs": "invalid: #CD3131",
+			"hc_black": "invalid: #F44747",
+			"dark_modern": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_modern": "invalid: #CD3131"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml punctuation.whitespace.separator.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "highlighted",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml invalid.illegal.unrecognized.yaml",
+		"r": {
+			"dark_plus": "invalid: #F44747",
+			"light_plus": "invalid: #CD3131",
+			"dark_vs": "invalid: #F44747",
+			"light_vs": "invalid: #CD3131",
+			"hc_black": "invalid: #F44747",
+			"dark_modern": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_modern": "invalid: #CD3131"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml punctuation.whitespace.separator.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "as",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml invalid.illegal.unrecognized.yaml",
+		"r": {
+			"dark_plus": "invalid: #F44747",
+			"light_plus": "invalid: #CD3131",
+			"dark_vs": "invalid: #F44747",
+			"light_vs": "invalid: #CD3131",
+			"hc_black": "invalid: #F44747",
+			"dark_modern": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_modern": "invalid: #CD3131"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml punctuation.whitespace.separator.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "a",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml invalid.illegal.unrecognized.yaml",
+		"r": {
+			"dark_plus": "invalid: #F44747",
+			"light_plus": "invalid: #CD3131",
+			"dark_vs": "invalid: #F44747",
+			"light_vs": "invalid: #CD3131",
+			"hc_black": "invalid: #F44747",
+			"dark_modern": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_modern": "invalid: #CD3131"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml punctuation.whitespace.separator.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "YAML",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml invalid.illegal.unrecognized.yaml",
+		"r": {
+			"dark_plus": "invalid: #F44747",
+			"light_plus": "invalid: #CD3131",
+			"dark_vs": "invalid: #F44747",
+			"light_vs": "invalid: #CD3131",
+			"hc_black": "invalid: #F44747",
+			"dark_modern": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_modern": "invalid: #CD3131"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml punctuation.whitespace.separator.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "error",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml invalid.illegal.unrecognized.yaml",
+		"r": {
+			"dark_plus": "invalid: #F44747",
+			"light_plus": "invalid: #CD3131",
+			"dark_vs": "invalid: #F44747",
+			"light_vs": "invalid: #CD3131",
+			"hc_black": "invalid: #F44747",
+			"dark_modern": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_modern": "invalid: #CD3131"
 		}
 	}
 ]
\ No newline at end of file
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/issue-4008_yaml.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-4008_yaml.json
index e1aa82e9ca3..c8c2d57d903 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/issue-4008_yaml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/issue-4008_yaml.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": "blue",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "a=\"brown,not_brown\"",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": "not_blue",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "foo",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -169,7 +169,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -197,7 +197,7 @@
 	},
 	{
 		"c": "blue",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -211,7 +211,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -225,7 +225,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -239,7 +239,7 @@
 	},
 	{
 		"c": "foo=\"}\"",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -253,7 +253,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -267,7 +267,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -281,7 +281,7 @@
 	},
 	{
 		"c": "not_blue",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -295,7 +295,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -309,7 +309,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -323,7 +323,7 @@
 	},
 	{
 		"c": "1",
-		"t": "source.yaml constant.numeric.integer.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml constant.numeric.integer.decimal.yaml",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/issue-6303_yaml.json b/extensions/vscode-colorize-tests/test/colorize-results/issue-6303_yaml.json
index 2066b677e2c..e5267d62494 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/issue-6303_yaml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/issue-6303_yaml.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "swagger",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": "'",
-		"t": "source.yaml string.quoted.single.yaml punctuation.definition.string.begin.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml string.quoted.single.yaml punctuation.definition.string.begin.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.yaml: #0000FF",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": "2.0",
-		"t": "source.yaml string.quoted.single.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml string.quoted.single.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.yaml: #0000FF",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "'",
-		"t": "source.yaml string.quoted.single.yaml punctuation.definition.string.end.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml string.quoted.single.yaml punctuation.definition.string.end.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.yaml: #0000FF",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": "info",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": "description",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -141,7 +141,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -169,7 +169,7 @@
 	},
 	{
 		"c": "'",
-		"t": "source.yaml string.quoted.single.yaml punctuation.definition.string.begin.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.quoted.single.yaml punctuation.definition.string.begin.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.yaml: #0000FF",
@@ -183,7 +183,7 @@
 	},
 	{
 		"c": "The API Management Service API defines an updated and refined version",
-		"t": "source.yaml string.quoted.single.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.quoted.single.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.yaml: #0000FF",
@@ -196,8 +196,64 @@
 		}
 	},
 	{
-		"c": "    of the concepts currently known as Developer, APP, and API Product in Edge. Of",
-		"t": "source.yaml string.quoted.single.yaml",
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.quoted.single.yaml punctuation.whitespace.separator.yaml",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string.quoted.single.yaml: #0000FF",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string.quoted.single.yaml: #0000FF",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string.quoted.single.yaml: #0F4A85",
+			"light_modern": "string.quoted.single.yaml: #0000FF"
+		}
+	},
+	{
+		"c": "of the concepts currently known as Developer, APP, and API Product in Edge. Of",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.quoted.single.yaml",
+		"r": {
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string.quoted.single.yaml: #0000FF",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string.quoted.single.yaml: #0000FF",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string.quoted.single.yaml: #0F4A85",
+			"light_modern": "string.quoted.single.yaml: #0000FF"
+		}
+	},
+	{
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.quoted.single.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.yaml: #0000FF",
@@ -210,8 +266,8 @@
 		}
 	},
 	{
-		"c": "    note is the introduction of the API concept, missing previously from Edge",
-		"t": "source.yaml string.quoted.single.yaml",
+		"c": "note is the introduction of the API concept, missing previously from Edge",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.quoted.single.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.yaml: #0000FF",
@@ -224,8 +280,22 @@
 		}
 	},
 	{
-		"c": "    ",
-		"t": "source.yaml string.quoted.single.yaml",
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.quoted.single.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.yaml: #0000FF",
@@ -239,7 +309,7 @@
 	},
 	{
 		"c": "'",
-		"t": "source.yaml string.quoted.single.yaml punctuation.definition.string.end.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.quoted.single.yaml punctuation.definition.string.end.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.quoted.single.yaml: #0000FF",
@@ -253,7 +323,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -267,7 +337,7 @@
 	},
 	{
 		"c": "title",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -281,7 +351,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -295,7 +365,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -309,7 +379,7 @@
 	},
 	{
 		"c": "API Management Service API",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -323,7 +393,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -337,7 +407,7 @@
 	},
 	{
 		"c": "version",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -351,7 +421,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -365,7 +435,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -379,7 +449,7 @@
 	},
 	{
 		"c": "initial",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_yaml.json b/extensions/vscode-colorize-tests/test/colorize-results/test_yaml.json
index 407cc7c7a1a..0908e19e3ea 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_yaml.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_yaml.json
@@ -1,7 +1,7 @@
 [
 	{
 		"c": "#",
-		"t": "source.yaml comment.line.number-sign.yaml punctuation.definition.comment.yaml",
+		"t": "source.yaml meta.stream.yaml comment.line.number-sign.yaml punctuation.definition.comment.yaml",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -15,7 +15,7 @@
 	},
 	{
 		"c": " sequencer protocols for Laser eye surgery",
-		"t": "source.yaml comment.line.number-sign.yaml",
+		"t": "source.yaml meta.stream.yaml comment.line.number-sign.yaml",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -29,7 +29,7 @@
 	},
 	{
 		"c": "---",
-		"t": "source.yaml entity.other.document.begin.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml entity.other.document.begin.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -43,7 +43,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -57,7 +57,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -71,7 +71,7 @@
 	},
 	{
 		"c": "step",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -85,7 +85,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -99,7 +99,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": "&",
-		"t": "source.yaml meta.property.yaml keyword.control.property.anchor.yaml punctuation.definition.anchor.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml keyword.control.flow.anchor.yaml punctuation.definition.anchor.yaml",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -127,21 +127,21 @@
 	},
 	{
 		"c": "id001",
-		"t": "source.yaml meta.property.yaml entity.name.type.anchor.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml keyword.control.flow.anchor.yaml variable.other.anchor.yaml",
 		"r": {
-			"dark_plus": "entity.name.type: #4EC9B0",
-			"light_plus": "entity.name.type: #267F99",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "entity.name.type: #4EC9B0",
-			"dark_modern": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
 		}
 	},
 	{
 		"c": "                  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -155,7 +155,7 @@
 	},
 	{
 		"c": "#",
-		"t": "source.yaml comment.line.number-sign.yaml punctuation.definition.comment.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml comment.line.number-sign.yaml punctuation.definition.comment.yaml",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -169,7 +169,7 @@
 	},
 	{
 		"c": " defines anchor label &id001",
-		"t": "source.yaml comment.line.number-sign.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml comment.line.number-sign.yaml",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -182,8 +182,22 @@
 		}
 	},
 	{
-		"c": "    ",
-		"t": "source.yaml",
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -197,7 +211,7 @@
 	},
 	{
 		"c": "instrument",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -211,7 +225,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -225,7 +239,7 @@
 	},
 	{
 		"c": "      ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -239,7 +253,7 @@
 	},
 	{
 		"c": "Lasik 2000",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -252,8 +266,22 @@
 		}
 	},
 	{
-		"c": "    ",
-		"t": "source.yaml",
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -267,7 +295,7 @@
 	},
 	{
 		"c": "pulseEnergy",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -281,7 +309,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -295,7 +323,7 @@
 	},
 	{
 		"c": "     ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -309,7 +337,7 @@
 	},
 	{
 		"c": "5.4",
-		"t": "source.yaml constant.numeric.float.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml constant.numeric.float.yaml",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -322,8 +350,22 @@
 		}
 	},
 	{
-		"c": "    ",
-		"t": "source.yaml",
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -337,7 +379,7 @@
 	},
 	{
 		"c": "spotSize",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -351,7 +393,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -365,7 +407,7 @@
 	},
 	{
 		"c": "        ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -379,7 +421,7 @@
 	},
 	{
 		"c": "1mm",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -393,7 +435,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -407,7 +449,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -421,7 +463,7 @@
 	},
 	{
 		"c": "step",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -435,7 +477,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -449,7 +491,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -463,7 +505,7 @@
 	},
 	{
 		"c": "*",
-		"t": "source.yaml keyword.control.flow.alias.yaml punctuation.definition.alias.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml keyword.control.flow.alias.yaml punctuation.definition.alias.yaml",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -477,12 +519,12 @@
 	},
 	{
 		"c": "id001",
-		"t": "source.yaml variable.other.alias.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml keyword.control.flow.alias.yaml variable.other.alias.yaml",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
@@ -491,7 +533,7 @@
 	},
 	{
 		"c": "                   ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -505,7 +547,7 @@
 	},
 	{
 		"c": "#",
-		"t": "source.yaml comment.line.number-sign.yaml punctuation.definition.comment.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml comment.line.number-sign.yaml punctuation.definition.comment.yaml",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -519,7 +561,7 @@
 	},
 	{
 		"c": " refers to the first step (with anchor &id001)",
-		"t": "source.yaml comment.line.number-sign.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml comment.line.number-sign.yaml",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -533,7 +575,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -547,7 +589,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -561,7 +603,7 @@
 	},
 	{
 		"c": "step",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -575,7 +617,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -589,7 +631,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -603,7 +645,7 @@
 	},
 	{
 		"c": "*",
-		"t": "source.yaml keyword.control.flow.alias.yaml punctuation.definition.alias.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml keyword.control.flow.alias.yaml punctuation.definition.alias.yaml",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -617,12 +659,12 @@
 	},
 	{
 		"c": "id001",
-		"t": "source.yaml variable.other.alias.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml keyword.control.flow.alias.yaml variable.other.alias.yaml",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
@@ -630,8 +672,8 @@
 		}
 	},
 	{
-		"c": "    ",
-		"t": "source.yaml",
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -644,22 +686,8 @@
 		}
 	},
 	{
-		"c": "spotSize",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
-		"r": {
-			"dark_plus": "entity.name.tag: #569CD6",
-			"light_plus": "entity.name.tag: #800000",
-			"dark_vs": "entity.name.tag: #569CD6",
-			"light_vs": "entity.name.tag: #800000",
-			"hc_black": "entity.name.tag: #569CD6",
-			"dark_modern": "entity.name.tag: #569CD6",
-			"hc_light": "entity.name.tag: #0F4A85",
-			"light_modern": "entity.name.tag: #800000"
-		}
-	},
-	{
-		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"c": "  ",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -671,9 +699,23 @@
 			"light_modern": "default: #3B3B3B"
 		}
 	},
+	{
+		"c": "spotSize:",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml invalid.illegal.unrecognized.yaml",
+		"r": {
+			"dark_plus": "invalid: #F44747",
+			"light_plus": "invalid: #CD3131",
+			"dark_vs": "invalid: #F44747",
+			"light_vs": "invalid: #CD3131",
+			"hc_black": "invalid: #F44747",
+			"dark_modern": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_modern": "invalid: #CD3131"
+		}
+	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -687,7 +729,7 @@
 	},
 	{
 		"c": "2mm",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -701,21 +743,21 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml punctuation.whitespace.separator.yaml",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "string: #CE9178",
+			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
+			"dark_vs": "string: #CE9178",
+			"light_vs": "string.unquoted.plain.out.yaml: #0000FF",
+			"hc_black": "string: #CE9178",
+			"dark_modern": "string: #CE9178",
+			"hc_light": "string.unquoted.plain.out.yaml: #0F4A85",
+			"light_modern": "string.unquoted.plain.out.yaml: #0000FF"
 		}
 	},
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -729,7 +771,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -743,7 +785,7 @@
 	},
 	{
 		"c": "step",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -757,7 +799,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -771,7 +813,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -785,7 +827,7 @@
 	},
 	{
 		"c": "*",
-		"t": "source.yaml keyword.control.flow.alias.yaml punctuation.definition.alias.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml keyword.control.flow.alias.yaml punctuation.definition.alias.yaml",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -799,12 +841,12 @@
 	},
 	{
 		"c": "id002",
-		"t": "source.yaml variable.other.alias.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml keyword.control.flow.alias.yaml variable.other.alias.yaml",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
+			"dark_vs": "keyword.control: #569CD6",
+			"light_vs": "keyword.control: #0000FF",
 			"hc_black": "variable: #9CDCFE",
 			"dark_modern": "variable: #9CDCFE",
 			"hc_light": "variable: #001080",
@@ -813,7 +855,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -827,7 +869,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -841,7 +883,7 @@
 	},
 	{
 		"c": "{",
-		"t": "source.yaml meta.flow-mapping.yaml punctuation.definition.mapping.begin.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml punctuation.definition.mapping.begin.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -855,7 +897,7 @@
 	},
 	{
 		"c": "name",
-		"t": "source.yaml meta.flow-mapping.yaml meta.flow-pair.key.yaml string.unquoted.plain.in.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml meta.flow.map.implicit.yaml meta.flow.map.key.yaml string.unquoted.plain.in.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -869,7 +911,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml meta.flow-mapping.yaml meta.flow-pair.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml meta.flow.map.implicit.yaml meta.flow.pair.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -883,7 +925,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml meta.flow-mapping.yaml meta.flow-pair.yaml meta.flow-pair.value.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml meta.flow.map.implicit.yaml meta.flow.pair.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -897,7 +939,7 @@
 	},
 	{
 		"c": "John Smith",
-		"t": "source.yaml meta.flow-mapping.yaml meta.flow-pair.yaml meta.flow-pair.value.yaml string.unquoted.plain.in.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml meta.flow.map.implicit.yaml meta.flow.pair.value.yaml string.unquoted.plain.in.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.in.yaml: #0000FF",
@@ -911,7 +953,7 @@
 	},
 	{
 		"c": ",",
-		"t": "source.yaml meta.flow-mapping.yaml punctuation.separator.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml punctuation.separator.mapping.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -925,7 +967,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml meta.flow-mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -939,7 +981,7 @@
 	},
 	{
 		"c": "age",
-		"t": "source.yaml meta.flow-mapping.yaml meta.flow-pair.key.yaml string.unquoted.plain.in.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml meta.flow.map.implicit.yaml meta.flow.map.key.yaml string.unquoted.plain.in.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -953,7 +995,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml meta.flow-mapping.yaml meta.flow-pair.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml meta.flow.map.implicit.yaml meta.flow.pair.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -967,7 +1009,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml meta.flow-mapping.yaml meta.flow-pair.yaml meta.flow-pair.value.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml meta.flow.map.implicit.yaml meta.flow.pair.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -981,7 +1023,7 @@
 	},
 	{
 		"c": "33",
-		"t": "source.yaml meta.flow-mapping.yaml meta.flow-pair.yaml meta.flow-pair.value.yaml constant.numeric.integer.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml meta.flow.map.implicit.yaml meta.flow.pair.value.yaml string.unquoted.plain.in.yaml constant.numeric.integer.decimal.yaml",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -995,7 +1037,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.yaml meta.flow-mapping.yaml punctuation.definition.mapping.end.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.flow.mapping.yaml punctuation.definition.mapping.end.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1009,7 +1051,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1023,7 +1065,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1037,7 +1079,7 @@
 	},
 	{
 		"c": "name",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1051,7 +1093,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1065,7 +1107,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1079,7 +1121,7 @@
 	},
 	{
 		"c": "Mary Smith",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -1093,7 +1135,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1107,7 +1149,7 @@
 	},
 	{
 		"c": "age",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1121,7 +1163,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1135,7 +1177,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1149,7 +1191,7 @@
 	},
 	{
 		"c": "27",
-		"t": "source.yaml constant.numeric.integer.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml string.unquoted.plain.out.yaml constant.numeric.integer.decimal.yaml",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -1163,7 +1205,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1176,8 +1218,22 @@
 		}
 	},
 	{
-		"c": "men",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"c": "m",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml invalid.illegal.expected-indentation.yaml",
+		"r": {
+			"dark_plus": "invalid: #F44747",
+			"light_plus": "invalid: #CD3131",
+			"dark_vs": "invalid: #F44747",
+			"light_vs": "invalid: #CD3131",
+			"hc_black": "invalid: #F44747",
+			"dark_modern": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_modern": "invalid: #CD3131"
+		}
+	},
+	{
+		"c": "en",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1191,7 +1247,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1205,7 +1261,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1219,7 +1275,7 @@
 	},
 	{
 		"c": "[",
-		"t": "source.yaml meta.flow-sequence.yaml punctuation.definition.sequence.begin.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.flow.sequence.yaml punctuation.definition.sequence.begin.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1233,7 +1289,7 @@
 	},
 	{
 		"c": "John Smith",
-		"t": "source.yaml meta.flow-sequence.yaml string.unquoted.plain.in.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.flow.sequence.yaml string.unquoted.plain.in.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.in.yaml: #0000FF",
@@ -1247,7 +1303,7 @@
 	},
 	{
 		"c": ",",
-		"t": "source.yaml meta.flow-sequence.yaml punctuation.separator.sequence.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.flow.sequence.yaml punctuation.separator.sequence.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1261,7 +1317,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml meta.flow-sequence.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.flow.sequence.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1275,7 +1331,7 @@
 	},
 	{
 		"c": "Bill Jones",
-		"t": "source.yaml meta.flow-sequence.yaml string.unquoted.plain.in.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.flow.sequence.yaml string.unquoted.plain.in.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.in.yaml: #0000FF",
@@ -1289,7 +1345,7 @@
 	},
 	{
 		"c": "]",
-		"t": "source.yaml meta.flow-sequence.yaml punctuation.definition.sequence.end.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.flow.sequence.yaml punctuation.definition.sequence.end.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1302,8 +1358,36 @@
 		}
 	},
 	{
-		"c": "women",
-		"t": "source.yaml string.unquoted.plain.out.yaml entity.name.tag.yaml",
+		"c": "w",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml invalid.illegal.expected-indentation.yaml",
+		"r": {
+			"dark_plus": "invalid: #F44747",
+			"light_plus": "invalid: #CD3131",
+			"dark_vs": "invalid: #F44747",
+			"light_vs": "invalid: #CD3131",
+			"hc_black": "invalid: #F44747",
+			"dark_modern": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_modern": "invalid: #CD3131"
+		}
+	},
+	{
+		"c": "o",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml invalid.illegal.expected-indentation.yaml",
+		"r": {
+			"dark_plus": "invalid: #F44747",
+			"light_plus": "invalid: #CD3131",
+			"dark_vs": "invalid: #F44747",
+			"light_vs": "invalid: #CD3131",
+			"hc_black": "invalid: #F44747",
+			"dark_modern": "invalid: #F44747",
+			"hc_light": "invalid: #B5200D",
+			"light_modern": "invalid: #CD3131"
+		}
+	},
+	{
+		"c": "men",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
 		"r": {
 			"dark_plus": "entity.name.tag: #569CD6",
 			"light_plus": "entity.name.tag: #800000",
@@ -1317,7 +1401,7 @@
 	},
 	{
 		"c": ":",
-		"t": "source.yaml punctuation.separator.key-value.mapping.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml punctuation.separator.map.value.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1331,7 +1415,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1345,7 +1429,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1359,7 +1443,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.block.sequence.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1373,7 +1457,7 @@
 	},
 	{
 		"c": "Mary Smith",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.block.sequence.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
@@ -1387,7 +1471,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml punctuation.whitespace.indentation.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1401,7 +1485,7 @@
 	},
 	{
 		"c": "-",
-		"t": "source.yaml punctuation.definition.block.sequence.item.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.block.sequence.yaml punctuation.definition.block.sequence.item.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1415,7 +1499,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.block.sequence.yaml punctuation.whitespace.separator.yaml",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -1429,7 +1513,7 @@
 	},
 	{
 		"c": "Susan Williams",
-		"t": "source.yaml string.unquoted.plain.out.yaml",
+		"t": "source.yaml meta.stream.yaml meta.document.yaml meta.block.sequence.yaml meta.mapping.yaml meta.map.value.yaml meta.block.sequence.yaml string.unquoted.plain.out.yaml",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string.unquoted.plain.out.yaml: #0000FF",
diff --git a/extensions/yaml/build/update-grammar.js b/extensions/yaml/build/update-grammar.js
index ae390a791dd..a238c250fb3 100644
--- a/extensions/yaml/build/update-grammar.js
+++ b/extensions/yaml/build/update-grammar.js
@@ -7,7 +7,12 @@
 var updateGrammar = require('vscode-grammar-updater');
 
 async function updateGrammars() {
-	await updateGrammar.update('textmate/yaml.tmbundle', 'Syntaxes/YAML.tmLanguage', './syntaxes/yaml.tmLanguage.json',  undefined);
+	await updateGrammar.update('RedCMD/YAML-Syntax-Highlighter', 'syntaxes/yaml-1.0.tmLanguage.json', './syntaxes/yaml-1.0.tmLanguage.json',  undefined, 'main');
+	await updateGrammar.update('RedCMD/YAML-Syntax-Highlighter', 'syntaxes/yaml-1.1.tmLanguage.json', './syntaxes/yaml-1.1.tmLanguage.json',  undefined, 'main');
+	await updateGrammar.update('RedCMD/YAML-Syntax-Highlighter', 'syntaxes/yaml-1.2.tmLanguage.json', './syntaxes/yaml-1.2.tmLanguage.json',  undefined, 'main');
+	await updateGrammar.update('RedCMD/YAML-Syntax-Highlighter', 'syntaxes/yaml-1.3.tmLanguage.json', './syntaxes/yaml-1.3.tmLanguage.json',  undefined, 'main');
+	await updateGrammar.update('RedCMD/YAML-Syntax-Highlighter', 'syntaxes/yaml-embedded.tmLanguage.json', './syntaxes/yaml-embedded.tmLanguage.json',  undefined, 'main');
+	await updateGrammar.update('RedCMD/YAML-Syntax-Highlighter', 'syntaxes/yaml.tmLanguage.json', './syntaxes/yaml.tmLanguage.json',  undefined, 'main');
 }
 
 updateGrammars();
diff --git a/extensions/yaml/cgmanifest.json b/extensions/yaml/cgmanifest.json
index e6c3ca158b5..be9230ef0a5 100644
--- a/extensions/yaml/cgmanifest.json
+++ b/extensions/yaml/cgmanifest.json
@@ -4,33 +4,24 @@
 			"component": {
 				"type": "git",
 				"git": {
-					"name": "textmate/yaml.tmbundle",
-					"repositoryUrl": "https://github.com/textmate/yaml.tmbundle",
-					"commitHash": "e54ceae3b719506dba7e481a77cea4a8b576ae46"
+					"name": "RedCMD/YAML-Syntax-Highlighter",
+					"repositoryUrl": "https://github.com/RedCMD/YAML-Syntax-Highlighter",
+					"commitHash": "53d38bbc66b704803de54ffce5b251bf97211c60"
 				}
 			},
 			"licenseDetail": [
-				"Copyright (c) 2015 FichteFoll <fichtefoll2@googlemail.com>",
+				"MIT License",
 				"",
-				"Permission is hereby granted, free of charge, to any person obtaining a copy",
-				"of this software and associated documentation files (the \"Software\"), to deal",
-				"in the Software without restriction, including without limitation the rights",
-				"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
-				"copies of the Software, and to permit persons to whom the Software is",
-				"furnished to do so, subject to the following conditions:",
+				"Copyright 2024 RedCMD",
 				"",
-				"The above copyright notice and this permission notice shall be included in all",
-				"copies or substantial portions of the Software.",
+				"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:",
 				"",
-				"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
-				"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
-				"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
-				"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
-				"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
-				"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+				"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.",
+				"",
+				"THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
 			],
-			"license": "TextMate Bundle License",
-			"version": "0.0.0"
+			"license": "MIT",
+			"version": "1.3.2"
 		}
 	],
 	"version": 1
diff --git a/extensions/yaml/package.json b/extensions/yaml/package.json
index 6b0a787cf46..6ac315318b4 100644
--- a/extensions/yaml/package.json
+++ b/extensions/yaml/package.json
@@ -57,10 +57,36 @@
         "scopeName": "source.yaml",
         "path": "./syntaxes/yaml.tmLanguage.json"
       },
+      {
+        "scopeName": "source.yaml.1.3",
+        "path": "./syntaxes/yaml-1.3.tmLanguage.json"
+      },
+      {
+        "scopeName": "source.yaml.1.2",
+        "path": "./syntaxes/yaml-1.2.tmLanguage.json"
+      },
+      {
+        "scopeName": "source.yaml.1.1",
+        "path": "./syntaxes/yaml-1.1.tmLanguage.json"
+      },
+      {
+        "scopeName": "source.yaml.1.0",
+        "path": "./syntaxes/yaml-1.0.tmLanguage.json"
+      },
+      {
+        "scopeName": "source.yaml.embedded",
+        "path": "./syntaxes/yaml-embedded.tmLanguage.json"
+      },
       {
         "language": "yaml",
         "scopeName": "source.yaml",
-        "path": "./syntaxes/yaml.tmLanguage.json"
+        "path": "./syntaxes/yaml.tmLanguage.json",
+        "unbalancedBracketScopes": [
+          "invalid.illegal",
+          "meta.scalar.yaml",
+          "storage.type.tag.shorthand.yaml",
+          "keyword.control.flow"
+        ]
       }
     ],
     "configurationDefaults": {
diff --git a/extensions/yaml/syntaxes/yaml-1.0.tmLanguage.json b/extensions/yaml/syntaxes/yaml-1.0.tmLanguage.json
index 96afa88b231..9a63c206b1e 100644
--- a/extensions/yaml/syntaxes/yaml-1.0.tmLanguage.json
+++ b/extensions/yaml/syntaxes/yaml-1.0.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/RedCMD/YAML-Syntax-Highlighter/commit/71a88711ec184b7dde5240c8f150ad3c2dbbd5f1",
+	"version": "https://github.com/RedCMD/YAML-Syntax-Highlighter/commit/0b50d9c47145df62c4461c4407698a24e8f1f3c2",
 	"name": "YAML 1.0",
 	"scopeName": "source.yaml.1.0",
 	"comment": "https://yaml.org/spec/1.0/",
@@ -520,8 +520,8 @@
 			"patterns": [
 				{
 					"comment": "https://yaml.org/spec/1.2.2/#8111-block-indentation-indicator",
-					"begin": "(?>(\\|)|(>))(?<chomp>[+-])?+((0)|(1)|(2)|(3)|(4)|(5)|(6)|(7)|(8)|(9))(?(<chomp>)|([+-]))?+",
-					"while": "\\G(?>(?>(?!\\5)|(?!\\6) |(?!\\7) {2}|(?!\\8) {3}|(?!\\9) {4}|(?!\\10) {5}|(?!\\11) {6}|(?!\\12) {7}|(?!\\13) {8}|(?!\\14) {9})| *+($|[^#]))",
+					"begin": "(?>(\\|)|(>))(?<chomp>[+-])?+([0-9])(?(<chomp>)|\\g<chomp>)?+",
+					"while": "\\G(?> {\\4}| *+($|[^#]))",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.control.flow.block-scalar.literal.yaml"
@@ -534,9 +534,6 @@
 						},
 						"4": {
 							"name": "constant.numeric.indentation-indicator.yaml"
-						},
-						"15": {
-							"name": "storage.modifier.chomping-indicator.yaml"
 						}
 					},
 					"whileCaptures": {
@@ -571,7 +568,6 @@
 					]
 				},
 				{
-					"comment": "https://yaml.org/spec/1.2.2/#rule-c-b-block-header",
 					"//": "Soooooooo many edge cases",
 					"begin": "(?>(\\|)|(>))([+-]?+)",
 					"while": "\\G",
diff --git a/extensions/yaml/syntaxes/yaml-1.2.tmLanguage.json b/extensions/yaml/syntaxes/yaml-1.2.tmLanguage.json
index 5571102d9e0..d07dbe6ec5d 100644
--- a/extensions/yaml/syntaxes/yaml-1.2.tmLanguage.json
+++ b/extensions/yaml/syntaxes/yaml-1.2.tmLanguage.json
@@ -4,7 +4,7 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/RedCMD/YAML-Syntax-Highlighter/commit/71a88711ec184b7dde5240c8f150ad3c2dbbd5f1",
+	"version": "https://github.com/RedCMD/YAML-Syntax-Highlighter/commit/53d38bbc66b704803de54ffce5b251bf97211c60",
 	"name": "YAML 1.2",
 	"scopeName": "source.yaml.1.2",
 	"comment": "https://yaml.org/spec/1.2.2",
@@ -38,7 +38,7 @@
 				},
 				{
 					"comment": "For when YAML is embedded inside a Markdown code-block",
-					"begin": "\\G",
+					"begin": "\\G(?!$)",
 					"while": "\\G",
 					"name": "meta.stream.yaml",
 					"patterns": [
@@ -331,10 +331,10 @@
 		"block-node": {
 			"patterns": [
 				{
-					"include": "#block-sequence"
+					"include": "#block-mapping"
 				},
 				{
-					"include": "#block-mapping"
+					"include": "#block-sequence"
 				},
 				{
 					"include": "#block-scalar"
@@ -623,6 +623,10 @@
 					"match": "[\t ]++$",
 					"name": "punctuation.whitespace.separator.yaml"
 				},
+				{
+					"match": "[^\r\n\t ](?=[\t ]*+$)",
+					"name": "invalid.illegal.expected-map-separator.yaml"
+				},
 				{
 					"match": "\\x{FEFF}",
 					"name": "invalid.illegal.bom.yaml"
@@ -654,8 +658,8 @@
 			"patterns": [
 				{
 					"comment": "https://yaml.org/spec/1.2.2/#8111-block-indentation-indicator",
-					"begin": "(?>(\\|)|(>))(?<chomp>[+-])?+((1)|(2)|(3)|(4)|(5)|(6)|(7)|(8)|(9))(?(<chomp>)|([+-]))?+",
-					"while": "\\G(?>(?>(?!\\5) |(?!\\6) {2}|(?!\\7) {3}|(?!\\8) {4}|(?!\\9) {5}|(?!\\10) {6}|(?!\\11) {7}|(?!\\12) {8}|(?!\\13) {9})| *+($|[^#]))",
+					"begin": "(?>(\\|)|(>))(?<chomp>[+-])?+([1-9])(?(<chomp>)|\\g<chomp>)?+",
+					"while": "\\G(?> {\\4}| *+($|[^#]))",
 					"beginCaptures": {
 						"1": {
 							"name": "keyword.control.flow.block-scalar.literal.yaml"
@@ -668,9 +672,6 @@
 						},
 						"4": {
 							"name": "constant.numeric.indentation-indicator.yaml"
-						},
-						"14": {
-							"name": "storage.modifier.chomping-indicator.yaml"
 						}
 					},
 					"whileCaptures": {
@@ -705,7 +706,6 @@
 					]
 				},
 				{
-					"comment": "https://yaml.org/spec/1.2.2/#rule-c-b-block-header",
 					"//": "Soooooooo many edge cases",
 					"begin": "(?>(\\|)|(>))([+-]?+)",
 					"while": "\\G",
@@ -798,7 +798,7 @@
 							]
 						},
 						{
-							"comment": "Header Comment",
+							"comment": "https://yaml.org/spec/1.2.2/#rule-c-b-block-header",
 							"begin": "\\G",
 							"end": "$",
 							"patterns": [
@@ -1279,7 +1279,7 @@
 			"name": "meta.map.key.yaml string.quoted.double.yaml entity.name.tag.yaml",
 			"patterns": [
 				{
-					"match": "[^\t -\\x{10FFFF}]++",
+					"match": "[^\r\n\t -\\x{10FFFF}]++",
 					"name": "invalid.illegal.character.yaml"
 				},
 				{
@@ -1614,7 +1614,7 @@
 		"comment": {
 			"comment": "Comments must be separated from other tokens by white space characters. `space`, `tab`, `newline` or `carriage-return`. `#(.*)` causes performance issues",
 			"begin": "(?<=[\\x{FEFF}\t ]|^)#",
-			"end": "\r|\n",
+			"end": "$",
 			"captures": {
 				"0": {
 					"name": "punctuation.definition.comment.yaml"
diff --git a/extensions/yaml/syntaxes/yaml-embedded.tmLanguage.json b/extensions/yaml/syntaxes/yaml-embedded.tmLanguage.json
new file mode 100644
index 00000000000..ba7c0900784
--- /dev/null
+++ b/extensions/yaml/syntaxes/yaml-embedded.tmLanguage.json
@@ -0,0 +1,502 @@
+{
+	"information_for_contributors": [
+		"This file has been converted from https://github.com/RedCMD/YAML-Syntax-Highlighter/blob/master/syntaxes/yaml-embedded.tmLanguage.json",
+		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
+		"Once accepted there, we are happy to receive an update request."
+	],
+	"version": "https://github.com/RedCMD/YAML-Syntax-Highlighter/commit/c42cf86959ba238dc8a825bdd07bed6f5e97c978",
+	"name": "YAML embedded",
+	"scopeName": "source.yaml.embedded",
+	"patterns": [
+		{
+			"include": "source.yaml.1.2#byte-order-mark"
+		},
+		{
+			"include": "#directives"
+		},
+		{
+			"include": "#document"
+		},
+		{
+			"include": "#block-sequence"
+		},
+		{
+			"include": "#block-mapping"
+		},
+		{
+			"include": "#block-map-key-explicit"
+		},
+		{
+			"include": "#block-map-value"
+		},
+		{
+			"include": "#block-scalar"
+		},
+		{
+			"include": "source.yaml.1.2#anchor-property"
+		},
+		{
+			"include": "source.yaml.1.2#tag-property"
+		},
+		{
+			"include": "#alias"
+		},
+		{
+			"include": "source.yaml.1.2#double"
+		},
+		{
+			"include": "source.yaml.1.2#single"
+		},
+		{
+			"include": "source.yaml.1.2#flow-mapping"
+		},
+		{
+			"include": "source.yaml.1.2#flow-sequence"
+		},
+		{
+			"include": "#block-plain-out"
+		},
+		{
+			"include": "#presentation-detail"
+		}
+	],
+	"repository": {
+		"directives": {
+			"comment": "https://yaml.org/spec/1.2.2/#68-directives",
+			"patterns": [
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#681-yaml-directives",
+					"begin": "(?>^|\\G)(%)(YAML)([\t ]+)([0-9]+\\.[0-9]*)",
+					"end": "$",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.directive.begin.yaml"
+						},
+						"2": {
+							"name": "keyword.other.directive.yaml.yaml"
+						},
+						"3": {
+							"name": "punctuation.whitespace.separator.yaml"
+						},
+						"4": {
+							"name": "constant.numeric.yaml-version.yaml"
+						}
+					},
+					"name": "meta.directives.yaml",
+					"patterns": [
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#682-tag-directives",
+					"begin": "(?>^|\\G)(%)(TAG)(?>([\t ]++)((!)(?>[0-9A-Za-z-]*+(!))?+))?+",
+					"end": "$",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.directive.begin.yaml"
+						},
+						"2": {
+							"name": "keyword.other.directive.tag.yaml"
+						},
+						"3": {
+							"name": "punctuation.whitespace.separator.yaml"
+						},
+						"4": {
+							"name": "storage.type.tag-handle.yaml"
+						},
+						"5": {
+							"name": "punctuation.definition.tag.begin.yaml"
+						},
+						"6": {
+							"name": "punctuation.definition.tag.end.yaml"
+						},
+						"comment": "https://yaml.org/spec/1.2.2/#rule-c-tag-handle"
+					},
+					"patterns": [
+						{
+							"comment": "technically the beginning should only validate against a valid uri scheme [A-Za-z][A-Za-z0-9.+-]*",
+							"begin": "\\G[\t ]++(?!#)",
+							"end": "(?=[\r\n\t ])",
+							"beginCaptures": {
+								"0": {
+									"name": "punctuation.whitespace.separator.yaml"
+								}
+							},
+							"contentName": "support.type.tag-prefix.yaml",
+							"patterns": [
+								{
+									"match": "%[0-9a-fA-F]{2}",
+									"name": "constant.character.escape.unicode.8-bit.yaml"
+								},
+								{
+									"match": "%[^\r\n\t ]{2,0}",
+									"name": "invalid.illegal.constant.character.escape.unicode.8-bit.yaml"
+								},
+								{
+									"match": "\\G[,\\[\\]{}]",
+									"name": "invalid.illegal.character.uri.yaml"
+								},
+								{
+									"include": "source.yaml#non-printable"
+								},
+								{
+									"match": "[^\r\n\t a-zA-Z0-9-#;/?:@&=+$,_.!~*'()\\[\\]]++",
+									"name": "invalid.illegal.unrecognized.yaml"
+								}
+							]
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				},
+				{
+					"comment": "https://yaml.org/spec/1.2.2/#rule-ns-reserved-directive",
+					"begin": "(?>^|\\G)(%)([\\x{85}[^ \\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]++)",
+					"end": "$",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.directive.begin.yaml"
+						},
+						"2": {
+							"name": "keyword.other.directive.other.yaml"
+						}
+					},
+					"patterns": [
+						{
+							"match": "\\G([\t ]++)([\\x{85}[^ \\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]++)",
+							"captures": {
+								"1": {
+									"name": "punctuation.whitespace.separator.yaml"
+								},
+								"2": {
+									"name": "string.unquoted.directive-name.yaml"
+								}
+							}
+						},
+						{
+							"match": "([\t ]++)([\\x{85}[^ \\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]++)",
+							"captures": {
+								"1": {
+									"name": "punctuation.whitespace.separator.yaml"
+								},
+								"2": {
+									"name": "string.unquoted.directive-parameter.yaml"
+								}
+							}
+						},
+						{
+							"include": "#presentation-detail"
+						}
+					]
+				}
+			]
+		},
+		"document": {
+			"comment": "https://yaml.org/spec/1.2.2/#91-documents",
+			"patterns": [
+				{
+					"match": "(?>^|\\G)---(?=[\r\n\t ])",
+					"name": "entity.other.document.begin.yaml"
+				},
+				{
+					"begin": "(?>^|\\G)\\.{3}(?=[\r\n\t ])",
+					"end": "$",
+					"name": "entity.other.document.end.yaml",
+					"patterns": [
+						{
+							"include": "#presentation-detail"
+						},
+						{
+							"include": "source.yaml.1.2#unknown"
+						}
+					]
+				}
+			]
+		},
+		"block-mapping": {
+			"//": "The check for plain keys is expensive",
+			"begin": "(?<=^|\\G|\t| )(?<![^\t ][\t ]*+:[\t ]*+|^---[\t ]*+)(?!:[\r\n\t ])(?=(?>(?#Double Quote)\"(?>[^\\\\\"]++|\\\\.)*+\"|(?#Single Quote)'(?>[^']++|'')*+'|(?#Flow-Map){(?>[^}]++|}[ \t]*+(?!:[\r\n\t ]))++}|(?#Flow-Seq)\\[(?>[^]]++|][ \t]*+(?!:[\r\n\t ]))++]|(?#Plain)(?>[\\x{85}[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]|[?:-](?![\r\n\t ]))(?>[^:#]++|:(?![\r\n\t ])|(?<! |\t)#++)*+)?+(?#Map Value)[\t ]*+:[\r\n\t ])",
+			"end": "(?=:[\r\n\t ])",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.separator.map.value.yaml"
+				}
+			},
+			"name": "meta.map.yaml",
+			"patterns": [
+				{
+					"include": "source.yaml.1.2#block-map-key-double"
+				},
+				{
+					"include": "source.yaml#block-map-key-single"
+				},
+				{
+					"include": "source.yaml.1.2#block-map-key-plain"
+				},
+				{
+					"include": "source.yaml.1.2#flow-mapping"
+				},
+				{
+					"include": "source.yaml.1.2#flow-sequence"
+				}
+			]
+		},
+		"block-sequence": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-l+block-sequence",
+			"match": "(?<![^\t ][\t ]*+: *+|^--- *+)-(?=[\r\n\t ])",
+			"name": "punctuation.definition.block.sequence.item.yaml"
+		},
+		"block-map-key-explicit": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-c-l-block-map-explicit-key",
+			"begin": "\\?(?=[\r\n\t ])",
+			"end": "(?=(?>:|(?>^|\\G)(?>\\.{3}|---))[\r\n\t ])",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.map.key.yaml"
+				}
+			},
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.separator.map.value.yaml"
+				}
+			},
+			"name": "meta.map.explicit.yaml",
+			"patterns": [
+				{
+					"include": "source.yaml.1.2#key-double"
+				},
+				{
+					"include": "source.yaml#key-single"
+				},
+				{
+					"include": "#flow-key-plain-out"
+				},
+				{
+					"include": "#block-sequence"
+				},
+				{
+					"include": "#block-mapping"
+				},
+				{
+					"include": "#block-scalar"
+				},
+				{
+					"include": "source.yaml.1.2#anchor-property"
+				},
+				{
+					"include": "source.yaml.1.2#tag-property"
+				},
+				{
+					"include": "#alias"
+				},
+				{
+					"include": "source.yaml.1.2#flow-mapping"
+				},
+				{
+					"include": "source.yaml.1.2#flow-sequence"
+				},
+				{
+					"include": "#presentation-detail"
+				}
+			]
+		},
+		"block-map-value": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-c-l-block-map-implicit-value",
+			"match": ":(?=[\r\n\t ])",
+			"name": "punctuation.separator.map.value.yaml"
+		},
+		"block-scalar": {
+			"patterns": [
+				{
+					"comment": "This doesn't work correctly when indented. Might have to dump it",
+					"begin": "(?>(\\|)|(>))(?<chomp>[+-])?+([1-9])(?(<chomp>)|\\g<chomp>)?+",
+					"while": "(?>^|\\G)(?> {\\4}| *+$)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.flow.block-scalar.literal.yaml"
+						},
+						"2": {
+							"name": "keyword.control.flow.block-scalar.folded.yaml"
+						},
+						"3": {
+							"name": "storage.modifier.chomping-indicator.yaml"
+						},
+						"4": {
+							"name": "constant.numeric.indentation-indicator.yaml"
+						}
+					},
+					"whileCaptures": {
+						"0": {
+							"name": "punctuation.whitespace.indentation.yaml"
+						}
+					},
+					"name": "meta.scalar.yaml",
+					"patterns": [
+						{
+							"begin": "$",
+							"while": "\\G",
+							"contentName": "string.unquoted.block.yaml",
+							"patterns": [
+								{
+									"include": "source.yaml#non-printable"
+								}
+							]
+						},
+						{
+							"begin": "\\G",
+							"end": "$",
+							"patterns": [
+								{
+									"include": "#presentation-detail"
+								},
+								{
+									"include": "source.yaml.1.2#unknown"
+								}
+							]
+						}
+					]
+				},
+				{
+					"comment": "I'm not sure how I feel about this",
+					"begin": "(?>(\\|)|(>))([+-]?+)(.*+)",
+					"end": "(?! |$)",
+					"beginCaptures": {
+						"1": {
+							"name": "keyword.control.flow.block-scalar.literal.yaml"
+						},
+						"2": {
+							"name": "keyword.control.flow.block-scalar.folded.yaml"
+						},
+						"3": {
+							"name": "storage.modifier.chomping-indicator.yaml"
+						},
+						"4": {
+							"patterns": [
+								{
+									"include": "#presentation-detail"
+								},
+								{
+									"include": "source.yaml.1.2#unknown"
+								}
+							]
+						}
+					},
+					"name": "meta.scalar.yaml",
+					"patterns": [
+						{
+							"comment": "https://yaml.org/spec/1.2.2/#rule-l-nb-literal-text",
+							"//": "Find the highest indented line",
+							"begin": "(?>^|\\G)(?=( ++)$)",
+							"end": "(?>^|\\G)(?>(?=\\1(?!$))|(?!\\1| *+$) *+)",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.whitespace.separator.yaml"
+								}
+							},
+							"patterns": [
+								{
+									"include": "#presentation-detail"
+								}
+							]
+						},
+						{
+							"comment": "https://yaml.org/spec/1.2.2/#rule-l-nb-literal-text",
+							"begin": "(?>^|\\G)(?=( ++))",
+							"end": "(?>^|\\G)(?!\\1| *+$) *+",
+							"endCaptures": {
+								"0": {
+									"name": "punctuation.whitespace.separator.yaml"
+								}
+							},
+							"contentName": "string.unquoted.block.yaml",
+							"patterns": [
+								{
+									"comment": "This is not 100% correct",
+									"match": "(?>^|\\G) ++",
+									"name": "punctuation.whitespace.separator.yaml"
+								},
+								{
+									"include": "source.yaml#non-printable"
+								}
+							]
+						}
+					]
+				}
+			]
+		},
+		"block-plain-out": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-ns-plain-multi-line (FLOW-OUT)",
+			"begin": "(?=[\\x{85}[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]|[?:-](?![\r\n\t ]))",
+			"end": "(?=[\t ]++#|[\t ]*+$)",
+			"name": "string.unquoted.plain.out.yaml",
+			"patterns": [
+				{
+					"include": "source.yaml.1.2#tag-implicit-plain-out"
+				},
+				{
+					"match": ":(?=[\r\n\t ])",
+					"name": "invalid.illegal.multiline-key.yaml"
+				},
+				{
+					"match": "\\x{FEFF}",
+					"name": "invalid.illegal.bom.yaml"
+				},
+				{
+					"include": "source.yaml#non-printable"
+				}
+			]
+		},
+		"flow-key-plain-out": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-ns-plain-one-line (FLOW-OUT)",
+			"begin": "(?=[\\x{85}[^-?:,\\[\\]{}#&*!|>'\"%@` \\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]|[?:-](?![\r\n\t ]))",
+			"end": "(?=[\t ]*+(?>$|:[\r\n\t ])|[\t ]++#)",
+			"name": "meta.map.key.yaml string.unquoted.plain.yaml entity.name.tag.yaml",
+			"patterns": [
+				{
+					"include": "source.yaml.1.2#tag-implicit-plain-out"
+				},
+				{
+					"match": "\\x{FEFF}",
+					"name": "invalid.illegal.bom.yaml"
+				},
+				{
+					"include": "source.yaml#non-printable"
+				}
+			]
+		},
+		"alias": {
+			"match": "(\\*)([\\x{85}[^ ,\\[\\]{}\\p{Cntrl}\\p{Surrogate}\\x{FEFF FFFE FFFF}]]++)|(\\*)",
+			"captures": {
+				"0": {
+					"name": "keyword.control.flow.alias.yaml"
+				},
+				"1": {
+					"name": "punctuation.definition.alias.yaml"
+				},
+				"2": {
+					"name": "variable.other.alias.yaml"
+				},
+				"3": {
+					"name": "invalid.illegal.flow.alias.yaml"
+				}
+			}
+		},
+		"presentation-detail": {
+			"patterns": [
+				{
+					"match": "[\t ]++",
+					"name": "punctuation.whitespace.separator.yaml"
+				},
+				{
+					"include": "source.yaml#non-printable"
+				},
+				{
+					"include": "source.yaml.1.2#comment"
+				}
+			]
+		}
+	}
+}
\ No newline at end of file
diff --git a/extensions/yaml/syntaxes/yaml.tmLanguage.json b/extensions/yaml/syntaxes/yaml.tmLanguage.json
index 447df713901..168cd4f7649 100644
--- a/extensions/yaml/syntaxes/yaml.tmLanguage.json
+++ b/extensions/yaml/syntaxes/yaml.tmLanguage.json
@@ -1,621 +1,116 @@
 {
 	"information_for_contributors": [
-		"This file has been converted from https://github.com/textmate/yaml.tmbundle/blob/master/Syntaxes/YAML.tmLanguage",
+		"This file has been converted from https://github.com/RedCMD/YAML-Syntax-Highlighter/blob/master/syntaxes/yaml.tmLanguage.json",
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/textmate/yaml.tmbundle/commit/e54ceae3b719506dba7e481a77cea4a8b576ae46",
-	"name": "YAML",
+	"version": "https://github.com/RedCMD/YAML-Syntax-Highlighter/commit/c42cf86959ba238dc8a825bdd07bed6f5e97c978",
+	"name": "YAML Ain't Markup Language",
 	"scopeName": "source.yaml",
 	"patterns": [
 		{
-			"include": "#comment"
-		},
-		{
-			"include": "#property"
-		},
-		{
-			"include": "#directive"
-		},
-		{
-			"match": "^---",
-			"name": "entity.other.document.begin.yaml"
-		},
-		{
-			"match": "^\\.{3}",
-			"name": "entity.other.document.end.yaml"
-		},
-		{
-			"include": "#node"
-		}
-	],
-	"repository": {
-		"block-collection": {
-			"patterns": [
-				{
-					"include": "#block-sequence"
-				},
-				{
-					"include": "#block-mapping"
-				}
-			]
-		},
-		"block-mapping": {
-			"patterns": [
-				{
-					"include": "#block-pair"
-				}
-			]
-		},
-		"block-node": {
-			"patterns": [
-				{
-					"include": "#prototype"
-				},
-				{
-					"include": "#block-scalar"
-				},
-				{
-					"include": "#block-collection"
-				},
-				{
-					"include": "#flow-scalar-plain-out"
-				},
-				{
-					"include": "#flow-node"
-				}
-			]
-		},
-		"block-pair": {
-			"patterns": [
-				{
-					"begin": "\\?",
-					"beginCaptures": {
-						"1": {
-							"name": "punctuation.definition.key-value.begin.yaml"
-						}
-					},
-					"end": "(?=\\?)|^ *(:)|(:)",
-					"endCaptures": {
-						"1": {
-							"name": "punctuation.separator.key-value.mapping.yaml"
-						},
-						"2": {
-							"name": "invalid.illegal.expected-newline.yaml"
-						}
-					},
-					"name": "meta.block-mapping.yaml",
-					"patterns": [
-						{
-							"include": "#block-node"
-						}
-					]
-				},
-				{
-					"begin": "(?x)\n                        (?=\n                            (?x:\n                                  [^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]\n                                | [?:-] \\S\n                            )\n                            (\n                                  [^\\s:]\n                                | : \\S\n                                | \\s+ (?![#\\s])\n                            )*\n                            \\s*\n                            :\n\t\t\t\t\t\t\t(\\s|$)\n                        )\n                    ",
-					"end": "(?x)\n                        (?=\n                              \\s* $\n                            | \\s+ \\#\n                            | \\s* : (\\s|$)\n                        )\n                    ",
-					"patterns": [
-						{
-							"include": "#flow-scalar-plain-out-implicit-type"
-						},
-						{
-							"begin": "(?x)\n                                  [^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]\n                                | [?:-] \\S\n                            ",
-							"beginCaptures": {
-								"0": {
-									"name": "entity.name.tag.yaml"
-								}
-							},
-							"contentName": "entity.name.tag.yaml",
-							"end": "(?x)\n                                (?=\n                                      \\s* $\n                                    | \\s+ \\#\n                                    | \\s* : (\\s|$)\n                                )\n                            ",
-							"name": "string.unquoted.plain.out.yaml"
-						}
-					]
-				},
-				{
-					"match": ":(?=\\s|$)",
-					"name": "punctuation.separator.key-value.mapping.yaml"
-				}
-			]
-		},
-		"block-scalar": {
-			"begin": "(?:(\\|)|(>))([1-9])?([-+])?(.*\\n?)",
-			"beginCaptures": {
-				"1": {
-					"name": "keyword.control.flow.block-scalar.literal.yaml"
-				},
-				"2": {
-					"name": "keyword.control.flow.block-scalar.folded.yaml"
-				},
-				"3": {
-					"name": "constant.numeric.indentation-indicator.yaml"
-				},
-				"4": {
-					"name": "storage.modifier.chomping-indicator.yaml"
-				},
-				"5": {
-					"patterns": [
-						{
-							"include": "#comment"
-						},
-						{
-							"match": ".+",
-							"name": "invalid.illegal.expected-comment-or-newline.yaml"
-						}
-					]
-				}
-			},
-			"end": "^(?=\\S)|(?!\\G)",
-			"patterns": [
-				{
-					"begin": "^([ ]+)(?! )",
-					"end": "^(?!\\1|\\s*$)",
-					"name": "string.unquoted.block.yaml"
-				}
-			]
-		},
-		"block-sequence": {
-			"match": "(-)(?!\\S)",
-			"name": "punctuation.definition.block.sequence.item.yaml"
-		},
-		"comment": {
-			"begin": "(?:(^[ \\t]*)|[ \\t]+)(?=#\\p{Print}*$)",
-			"beginCaptures": {
-				"1": {
-					"name": "punctuation.whitespace.comment.leading.yaml"
-				}
-			},
-			"end": "(?!\\G)",
-			"patterns": [
-				{
-					"begin": "#",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.comment.yaml"
-						}
-					},
-					"end": "\\n",
-					"name": "comment.line.number-sign.yaml"
-				}
-			]
-		},
-		"directive": {
-			"begin": "^%",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.definition.directive.begin.yaml"
-				}
-			},
-			"end": "(?=$|[ \\t]+($|#))",
-			"name": "meta.directive.yaml",
-			"patterns": [
-				{
-					"captures": {
-						"1": {
-							"name": "keyword.other.directive.yaml.yaml"
-						},
-						"2": {
-							"name": "constant.numeric.yaml-version.yaml"
-						}
-					},
-					"match": "\\G(YAML)[ \\t]+(\\d+\\.\\d+)"
-				},
-				{
-					"captures": {
-						"1": {
-							"name": "keyword.other.directive.tag.yaml"
-						},
-						"2": {
-							"name": "storage.type.tag-handle.yaml"
-						},
-						"3": {
-							"name": "support.type.tag-prefix.yaml"
-						}
-					},
-					"match": "(?x)\n                        \\G\n                        (TAG)\n                        (?:[ \\t]+\n                            ((?:!(?:[0-9A-Za-z\\-]*!)?))\n                            (?:[ \\t]+ (\n                                  !              (?x: %[0-9A-Fa-f]{2} | [0-9A-Za-z\\-#;/?:@&=+$,_.!~*'()\\[\\]] )*\n                                | (?![,!\\[\\]{}]) (?x: %[0-9A-Fa-f]{2} | [0-9A-Za-z\\-#;/?:@&=+$,_.!~*'()\\[\\]] )+\n                                )\n                            )?\n                        )?\n                    "
-				},
-				{
-					"captures": {
-						"1": {
-							"name": "support.other.directive.reserved.yaml"
-						},
-						"2": {
-							"name": "string.unquoted.directive-name.yaml"
-						},
-						"3": {
-							"name": "string.unquoted.directive-parameter.yaml"
-						}
-					},
-					"match": "(?x) \\G (\\w+) (?:[ \\t]+ (\\w+) (?:[ \\t]+ (\\w+))? )?"
-				},
-				{
-					"match": "\\S+",
-					"name": "invalid.illegal.unrecognized.yaml"
-				}
-			]
-		},
-		"flow-alias": {
-			"captures": {
-				"1": {
-					"name": "keyword.control.flow.alias.yaml"
-				},
-				"2": {
-					"name": "punctuation.definition.alias.yaml"
-				},
-				"3": {
-					"name": "variable.other.alias.yaml"
-				},
-				"4": {
-					"name": "invalid.illegal.character.anchor.yaml"
-				}
-			},
-			"match": "((\\*))([^\\s\\[\\]/{/},]+)([^\\s\\]},]\\S*)?"
-		},
-		"flow-collection": {
-			"patterns": [
-				{
-					"include": "#flow-sequence"
-				},
-				{
-					"include": "#flow-mapping"
-				}
-			]
-		},
-		"flow-mapping": {
-			"begin": "\\{",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.definition.mapping.begin.yaml"
-				}
-			},
-			"end": "\\}",
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.definition.mapping.end.yaml"
-				}
-			},
-			"name": "meta.flow-mapping.yaml",
-			"patterns": [
-				{
-					"include": "#prototype"
-				},
-				{
-					"match": ",",
-					"name": "punctuation.separator.mapping.yaml"
-				},
-				{
-					"include": "#flow-pair"
-				}
-			]
-		},
-		"flow-node": {
+			"comment": "Default to YAML version 1.2",
+			"begin": "\\A",
+			"while": "^",
 			"patterns": [
 				{
-					"include": "#prototype"
-				},
-				{
-					"include": "#flow-alias"
-				},
-				{
-					"include": "#flow-collection"
-				},
-				{
-					"include": "#flow-scalar"
+					"include": "source.yaml.1.2"
 				}
 			]
 		},
-		"flow-pair": {
+		{
+			"comment": "Support legacy FrontMatter integration",
+			"//": "https://github.com/microsoft/vscode-markdown-tm-grammar/pull/162",
+			"begin": "(?<=^-{3,}\\s*+)\\G$",
+			"while": "^(?! {3,0}-{3,}[ \t]*+$|[ \t]*+\\.{3}$)",
 			"patterns": [
 				{
-					"begin": "\\?",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.key-value.begin.yaml"
-						}
-					},
-					"end": "(?=[},\\]])",
-					"name": "meta.flow-pair.explicit.yaml",
-					"patterns": [
-						{
-							"include": "#prototype"
-						},
-						{
-							"include": "#flow-pair"
-						},
-						{
-							"include": "#flow-node"
-						},
-						{
-							"begin": ":(?=\\s|$|[\\[\\]{},])",
-							"beginCaptures": {
-								"0": {
-									"name": "punctuation.separator.key-value.mapping.yaml"
-								}
-							},
-							"end": "(?=[},\\]])",
-							"patterns": [
-								{
-									"include": "#flow-value"
-								}
-							]
-						}
-					]
-				},
-				{
-					"begin": "(?x)\n                        (?=\n                            (?:\n                                [^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]\n                              | [?:-] [^\\s[\\[\\]{},]]\n                            )\n                            (\n                                  [^\\s:[\\[\\]{},]]\n                                | : [^\\s[\\[\\]{},]]\n                                | \\s+ (?![#\\s])\n                            )*\n                            \\s*\n                            :\n\t\t\t\t\t\t\t(\\s|$)\n                        )\n                    ",
-					"end": "(?x)\n                        (?=\n                              \\s* $\n                            | \\s+ \\#\n                            | \\s* : (\\s|$)\n                            | \\s* : [\\[\\]{},]\n                            | \\s* [\\[\\]{},]\n                        )\n                    ",
-					"name": "meta.flow-pair.key.yaml",
-					"patterns": [
-						{
-							"include": "#flow-scalar-plain-in-implicit-type"
-						},
-						{
-							"begin": "(?x)\n                                  [^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]\n                                | [?:-] [^\\s[\\[\\]{},]]\n                            ",
-							"beginCaptures": {
-								"0": {
-									"name": "entity.name.tag.yaml"
-								}
-							},
-							"contentName": "entity.name.tag.yaml",
-							"end": "(?x)\n                                (?=\n                                      \\s* $\n                                    | \\s+ \\#\n                                    | \\s* : (\\s|$)\n                                    | \\s* : [\\[\\]{},]\n                                    | \\s* [\\[\\]{},]\n                                )\n                            ",
-							"name": "string.unquoted.plain.in.yaml"
-						}
-					]
-				},
-				{
-					"include": "#flow-node"
-				},
-				{
-					"begin": ":(?=\\s|$|[\\[\\]{},])",
-					"captures": {
-						"0": {
-							"name": "punctuation.separator.key-value.mapping.yaml"
-						}
-					},
-					"end": "(?=[},\\]])",
-					"name": "meta.flow-pair.yaml",
-					"patterns": [
-						{
-							"include": "#flow-value"
-						}
-					]
+					"include": "source.yaml.1.2"
 				}
 			]
 		},
-		"flow-scalar": {
-			"patterns": [
-				{
-					"include": "#flow-scalar-double-quoted"
-				},
-				{
-					"include": "#flow-scalar-single-quoted"
-				},
-				{
-					"include": "#flow-scalar-plain-in"
-				}
-			]
+		{
+			"comment": "Basic version for embedding",
+			"include": "source.yaml.embedded"
+		}
+	],
+	"repository": {
+		"parity": {
+			"comment": "Yes... That is right. Due to the changes with \\x2028, \\x2029, \\x85 and 'tags'. This is all the code I was able to reuse between all YAML versions 1.3, 1.2, 1.1 and 1.0"
 		},
-		"flow-scalar-double-quoted": {
-			"begin": "\"",
+		"block-map-key-single": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-c-single-quoted (BLOCK-KEY)",
+			"begin": "\\G'",
+			"end": "'(?!')",
 			"beginCaptures": {
 				"0": {
 					"name": "punctuation.definition.string.begin.yaml"
 				}
 			},
-			"end": "\"",
 			"endCaptures": {
 				"0": {
 					"name": "punctuation.definition.string.end.yaml"
 				}
 			},
-			"name": "string.quoted.double.yaml",
-			"patterns": [
-				{
-					"match": "\\\\([0abtnvfre \"/\\\\N_Lp]|x\\d\\d|u\\d{4}|U\\d{8})",
-					"name": "constant.character.escape.yaml"
-				},
-				{
-					"match": "\\\\\\n",
-					"name": "constant.character.escape.double-quoted.newline.yaml"
-				}
-			]
-		},
-		"flow-scalar-plain-in": {
+			"name": "meta.map.key.yaml string.quoted.single.yaml entity.name.tag.yaml",
 			"patterns": [
 				{
-					"include": "#flow-scalar-plain-in-implicit-type"
+					"match": ".[\t ]*+$",
+					"name": "invalid.illegal.multiline-key.yaml"
 				},
 				{
-					"begin": "(?x)\n                          [^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]\n                        | [?:-] [^\\s[\\[\\]{},]]\n                    ",
-					"end": "(?x)\n                        (?=\n                              \\s* $\n                            | \\s+ \\#\n                            | \\s* : (\\s|$)\n                            | \\s* : [\\[\\]{},]\n                            | \\s* [\\[\\]{},]\n                        )\n                    ",
-					"name": "string.unquoted.plain.in.yaml"
-				}
-			]
-		},
-		"flow-scalar-plain-in-implicit-type": {
-			"patterns": [
-				{
-					"captures": {
-						"1": {
-							"name": "constant.language.null.yaml"
-						},
-						"2": {
-							"name": "constant.language.boolean.yaml"
-						},
-						"3": {
-							"name": "constant.numeric.integer.yaml"
-						},
-						"4": {
-							"name": "constant.numeric.float.yaml"
-						},
-						"5": {
-							"name": "constant.other.timestamp.yaml"
-						},
-						"6": {
-							"name": "constant.language.value.yaml"
-						},
-						"7": {
-							"name": "constant.language.merge.yaml"
-						}
-					},
-					"match": "(?x)\n                        (?x:\n                              (null|Null|NULL|~)\n                            | (y|Y|yes|Yes|YES|n|N|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF)\n                            | (\n                                (?:\n                                      [-+]? 0b [0-1_]+ # (base 2)\n                                    | [-+]? 0  [0-7_]+ # (base 8)\n                                    | [-+]? (?: 0|[1-9][0-9_]*) # (base 10)\n                                    | [-+]? 0x [0-9a-fA-F_]+ # (base 16)\n                                    | [-+]? [1-9] [0-9_]* (?: :[0-5]?[0-9])+ # (base 60)\n                                )\n                              )\n                            | (\n                                (?x:\n                                      [-+]? (?: [0-9] [0-9_]*)? \\. [0-9.]* (?: [eE] [-+] [0-9]+)? # (base 10)\n                                    | [-+]? [0-9] [0-9_]* (?: :[0-5]?[0-9])+ \\. [0-9_]* # (base 60)\n                                    | [-+]? \\. (?: inf|Inf|INF) # (infinity)\n                                    |       \\. (?: nan|NaN|NAN) # (not a number)\n                                )\n                              )\n                            | (\n                                (?x:\n                                    \\d{4} - \\d{2} - \\d{2}           # (y-m-d)\n                                  | \\d{4}                           # (year)\n                                    - \\d{1,2}                       # (month)\n                                    - \\d{1,2}                       # (day)\n                                    (?: [Tt] | [ \\t]+) \\d{1,2}      # (hour)\n                                    : \\d{2}                         # (minute)\n                                    : \\d{2}                         # (second)\n                                    (?: \\.\\d*)?                     # (fraction)\n                                    (?:\n                                          (?:[ \\t]*) Z\n                                        | [-+] \\d{1,2} (?: :\\d{1,2})?\n                                    )?                              # (time zone)\n                                )\n                              )\n                            | (=)\n                            | (<<)\n                        )\n                        (?:\n                            (?=\n                                  \\s* $\n                                | \\s+ \\#\n                                | \\s* : (\\s|$)\n                                | \\s* : [\\[\\]{},]\n                                | \\s* [\\[\\]{},]\n                            )\n                        )\n                    "
-				}
-			]
-		},
-		"flow-scalar-plain-out": {
-			"patterns": [
-				{
-					"include": "#flow-scalar-plain-out-implicit-type"
+					"match": "[^\t -\\x{10FFFF}]++",
+					"name": "invalid.illegal.character.yaml"
 				},
 				{
-					"begin": "(?x)\n                          [^\\s[-?:,\\[\\]{}#&*!|>'\"%@`]]\n                        | [?:-] \\S\n                    ",
-					"end": "(?x)\n                        (?=\n                              \\s* $\n                            | \\s+ \\#\n                            | \\s* : (\\s|$)\n                        )\n                    ",
-					"name": "string.unquoted.plain.out.yaml"
-				}
-			]
-		},
-		"flow-scalar-plain-out-implicit-type": {
-			"patterns": [
-				{
-					"captures": {
-						"1": {
-							"name": "constant.language.null.yaml"
-						},
-						"2": {
-							"name": "constant.language.boolean.yaml"
-						},
-						"3": {
-							"name": "constant.numeric.integer.yaml"
-						},
-						"4": {
-							"name": "constant.numeric.float.yaml"
-						},
-						"5": {
-							"name": "constant.other.timestamp.yaml"
-						},
-						"6": {
-							"name": "constant.language.value.yaml"
-						},
-						"7": {
-							"name": "constant.language.merge.yaml"
-						}
-					},
-					"match": "(?x)\n                        (?x:\n                              (null|Null|NULL|~)\n                            | (y|Y|yes|Yes|YES|n|N|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF)\n                            | (\n                                (?:\n                                      [-+]? 0b [0-1_]+ # (base 2)\n                                    | [-+]? 0  [0-7_]+ # (base 8)\n                                    | [-+]? (?: 0|[1-9][0-9_]*) # (base 10)\n                                    | [-+]? 0x [0-9a-fA-F_]+ # (base 16)\n                                    | [-+]? [1-9] [0-9_]* (?: :[0-5]?[0-9])+ # (base 60)\n                                )\n                              )\n                            | (\n                                (?x:\n                                      [-+]? (?: [0-9] [0-9_]*)? \\. [0-9.]* (?: [eE] [-+] [0-9]+)? # (base 10)\n                                    | [-+]? [0-9] [0-9_]* (?: :[0-5]?[0-9])+ \\. [0-9_]* # (base 60)\n                                    | [-+]? \\. (?: inf|Inf|INF) # (infinity)\n                                    |       \\. (?: nan|NaN|NAN) # (not a number)\n                                )\n                              )\n                            | (\n                                (?x:\n                                    \\d{4} - \\d{2} - \\d{2}           # (y-m-d)\n                                  | \\d{4}                           # (year)\n                                    - \\d{1,2}                       # (month)\n                                    - \\d{1,2}                       # (day)\n                                    (?: [Tt] | [ \\t]+) \\d{1,2}      # (hour)\n                                    : \\d{2}                         # (minute)\n                                    : \\d{2}                         # (second)\n                                    (?: \\.\\d*)?                     # (fraction)\n                                    (?:\n                                          (?:[ \\t]*) Z\n                                        | [-+] \\d{1,2} (?: :\\d{1,2})?\n                                    )?                              # (time zone)\n                                )\n                              )\n                            | (=)\n                            | (<<)\n                        )\n                        (?x:\n                            (?=\n                                  \\s* $\n                                | \\s+ \\#\n                                | \\s* : (\\s|$)\n                            )\n                        )\n                    "
+					"match": "''",
+					"name": "constant.character.escape.single-quote.yaml"
 				}
 			]
 		},
-		"flow-scalar-single-quoted": {
+		"key-single": {
+			"comment": "https://yaml.org/spec/1.2.2/#rule-c-single-quoted (FLOW-OUT)",
 			"begin": "'",
+			"end": "'(?!')",
 			"beginCaptures": {
 				"0": {
 					"name": "punctuation.definition.string.begin.yaml"
 				}
 			},
-			"end": "'(?!')",
 			"endCaptures": {
 				"0": {
 					"name": "punctuation.definition.string.end.yaml"
 				}
 			},
-			"name": "string.quoted.single.yaml",
+			"name": "meta.map.key.yaml string.quoted.single.yaml entity.name.tag.yaml",
 			"patterns": [
 				{
-					"match": "''",
-					"name": "constant.character.escape.single-quoted.yaml"
-				}
-			]
-		},
-		"flow-sequence": {
-			"begin": "\\[",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.definition.sequence.begin.yaml"
-				}
-			},
-			"end": "\\]",
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.definition.sequence.end.yaml"
-				}
-			},
-			"name": "meta.flow-sequence.yaml",
-			"patterns": [
-				{
-					"include": "#prototype"
-				},
-				{
-					"match": ",",
-					"name": "punctuation.separator.sequence.yaml"
+					"match": "[^\r\n\t -\\x{10FFFF}]++",
+					"name": "invalid.illegal.character.yaml"
 				},
 				{
-					"include": "#flow-pair"
-				},
-				{
-					"include": "#flow-node"
-				}
-			]
-		},
-		"flow-value": {
-			"patterns": [
-				{
-					"begin": "\\G(?![},\\]])",
-					"end": "(?=[},\\]])",
-					"name": "meta.flow-pair.value.yaml",
-					"patterns": [
-						{
-							"include": "#flow-node"
-						}
-					]
-				}
-			]
-		},
-		"node": {
-			"patterns": [
-				{
-					"include": "#block-node"
-				}
-			]
-		},
-		"property": {
-			"begin": "(?=!|&)",
-			"end": "(?!\\G)",
-			"name": "meta.property.yaml",
-			"patterns": [
-				{
-					"captures": {
-						"1": {
-							"name": "keyword.control.property.anchor.yaml"
-						},
-						"2": {
-							"name": "punctuation.definition.anchor.yaml"
-						},
-						"3": {
-							"name": "entity.name.type.anchor.yaml"
-						},
-						"4": {
-							"name": "invalid.illegal.character.anchor.yaml"
-						}
-					},
-					"match": "\\G((&))([^\\s\\[\\]/{/},]+)(\\S+)?"
-				},
-				{
-					"match": "(?x)\n                        \\G\n                        (?:\n                            ! < (?: %[0-9A-Fa-f]{2} | [0-9A-Za-z\\-#;/?:@&=+$,_.!~*'()\\[\\]] )+ >\n                          | (?:!(?:[0-9A-Za-z\\-]*!)?) (?: %[0-9A-Fa-f]{2} | [0-9A-Za-z\\-#;/?:@&=+$_.~*'()] )+\n                          | !\n                        )\n                        (?=\\ |\\t|$)\n                    ",
-					"name": "storage.type.tag-handle.yaml"
-				},
-				{
-					"match": "\\S+",
-					"name": "invalid.illegal.tag-handle.yaml"
-				}
-			]
-		},
-		"prototype": {
-			"patterns": [
-				{
-					"include": "#comment"
-				},
-				{
-					"include": "#property"
-				}
-			]
+					"match": "''",
+					"name": "constant.character.escape.single-quote.yaml"
+				}
+			]
+		},
+		"non-printable": {
+			"//": {
+				"85": "…",
+				"2028": "",
+				"2029": "",
+				"10000": "𐀀",
+				"A0": " ",
+				"D7FF": "퟿",
+				"E000": "",
+				"FFFD": "�",
+				"FEFF": "",
+				"FFFF": "￿",
+				"10FFFF": "􏿿"
+			},
+			"//match": "[\\p{Cntrl}\\p{Surrogate}\\x{FFFE FFFF}&&[^\t\n\r\\x{85}]]++",
+			"match": "[^\t\n\r -~\\x{85}\\x{A0}-\\x{D7FF}\\x{E000}-\\x{FFFD}\\x{010000}-\\x{10FFFF}]++",
+			"name": "invalid.illegal.non-printable.yaml"
 		}
 	}
 }
\ No newline at end of file

From 8a2a20c476e27f6f931cc322d4d6a98ebba80581 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 10 Dec 2024 12:44:49 +0100
Subject: [PATCH 072/479] Hovering on Copilot link is now showing the link href
 (fix microsoft/vscode-copilot#11189) (#235724)

---
 src/vs/workbench/contrib/chat/browser/chatSetup.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 3e43f4428ec..9713d25a97f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -840,7 +840,7 @@ class ChatSetupWelcomeContent extends Disposable {
 
 		// Header
 		{
-			const header = localize({ key: 'setupHeader', comment: ['{Locked="[Copilot]({0})"}'] }, "[Copilot]({0} 'Copilot') is your AI pair programmer.", this.context.state.installed ? 'command:github.copilot.open.walkthrough' : defaultChat.documentationUrl);
+			const header = localize({ key: 'setupHeader', comment: ['{Locked="[Copilot]({0})"}'] }, "[Copilot]({0}) is your AI pair programmer.", this.context.state.installed ? 'command:github.copilot.open.walkthrough' : defaultChat.documentationUrl);
 			this.element.appendChild($('p')).appendChild(this._register(markdown.render(new MarkdownString(header, { isTrusted: true }))).element);
 
 			const features = this.element.appendChild($('div.chat-features-container'));

From 4d5225f1fca6a194b48473df0d62e12cef624758 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Tue, 10 Dec 2024 07:08:33 -0800
Subject: [PATCH 073/479] Mention shell integration in terminal sticky scroll
 setting

Fixes #200509
---
 .../stickyScroll/common/terminalStickyScrollConfiguration.ts   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration.ts
index 9a12add2442..47f043767c8 100644
--- a/src/vs/workbench/contrib/terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration.ts
+++ b/src/vs/workbench/contrib/terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration.ts
@@ -7,6 +7,7 @@ import type { IStringDictionary } from '../../../../../base/common/collections.j
 import { localize } from '../../../../../nls.js';
 import type { IConfigurationPropertySchema } from '../../../../../platform/configuration/common/configurationRegistry.js';
 import product from '../../../../../platform/product/common/product.js';
+import { TerminalSettingId } from '../../../../../platform/terminal/common/terminal.js';
 
 export const enum TerminalStickyScrollSettingId {
 	Enabled = 'terminal.integrated.stickyScroll.enabled',
@@ -20,7 +21,7 @@ export interface ITerminalStickyScrollConfiguration {
 
 export const terminalStickyScrollConfiguration: IStringDictionary<IConfigurationPropertySchema> = {
 	[TerminalStickyScrollSettingId.Enabled]: {
-		markdownDescription: localize('stickyScroll.enabled', "Shows the current command at the top of the terminal."),
+		markdownDescription: localize('stickyScroll.enabled', "Shows the current command at the top of the terminal. This feature requires [shell integration]({0}) to be activated. See {1}.", 'https://code.visualstudio.com/docs/terminal/shell-integration', `\`#${TerminalSettingId.ShellIntegrationEnabled}#\``),
 		type: 'boolean',
 		default: product.quality !== 'stable'
 	},

From 97d42fd4b813382c253c1b362a81b753b84e986d Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Tue, 10 Dec 2024 16:22:56 +0100
Subject: [PATCH 074/479] fix #197849 - improve doc (#235736)

---
 src/vscode-dts/vscode.d.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/vscode-dts/vscode.d.ts b/src/vscode-dts/vscode.d.ts
index d49cd276997..4fd34315755 100644
--- a/src/vscode-dts/vscode.d.ts
+++ b/src/vscode-dts/vscode.d.ts
@@ -13986,10 +13986,13 @@ declare module 'vscode' {
 	}
 
 	/**
-	 * The configuration scope which can be a
-	 * a 'resource' or a languageId or both or
-	 * a '{@link TextDocument}' or
-	 * a '{@link WorkspaceFolder}'
+	 * The configuration scope which can be:
+	 * - a {@link Uri} representing a resource
+	 * - a {@link TextDocument} representing an open text document
+	 * - a {@link WorkspaceFolder} representing a workspace folder
+	 * - an object containing:
+	 *   - `uri`: an optional {@link Uri} of a text document
+	 *   - `languageId`: the language identifier of a text document
 	 */
 	export type ConfigurationScope = Uri | TextDocument | WorkspaceFolder | {
 		/**

From 7d69a1c962175789eb2e58811b0551108ff6db24 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Tue, 10 Dec 2024 16:38:03 +0100
Subject: [PATCH 075/479] Allow accepting a path in the simple file picker when
 items haven't been listed (#235740)

Fixes #232950
---
 src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
index 843d9ed0a0c..c4faf15f40b 100644
--- a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
+++ b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
@@ -497,7 +497,7 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 
 	private async onDidAccept(): Promise<URI | undefined> {
 		this.busy = true;
-		if (this.filePickBox.activeItems.length === 1) {
+		if (!this.updatingPromise && this.filePickBox.activeItems.length === 1) {
 			const item = this.filePickBox.selectedItems[0];
 			if (item.isFolder) {
 				if (this.trailing) {
@@ -519,7 +519,7 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 				this.filePickBox.busy = false;
 				return;
 			}
-		} else {
+		} else if (!this.updatingPromise) {
 			// If the items have updated, don't try to resolve
 			if ((await this.tryUpdateItems(this.filePickBox.value, this.filePickBoxValue())) !== UpdateResult.NotUpdated) {
 				this.filePickBox.busy = false;

From c0d25ffb56b4b1fe4a4f33ab764f0fff1970d66d Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Tue, 10 Dec 2024 16:49:07 +0100
Subject: [PATCH 076/479] Performance regression: revert "Ignoring double
 slashes inside of strings" (#235742)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Revert "onEnter Indentation Rules: Ignoring double slashes inside of strings …"

This reverts commit 21c52a4a3ae29fac345c863b39c5fd44f4005862.
---
 extensions/cpp/language-configuration.json                   | 2 +-
 extensions/csharp/language-configuration.json                | 2 +-
 extensions/go/language-configuration.json                    | 2 +-
 extensions/groovy/language-configuration.json                | 2 +-
 extensions/java/language-configuration.json                  | 2 +-
 extensions/javascript/javascript-language-configuration.json | 2 +-
 extensions/json/language-configuration.json                  | 2 +-
 extensions/less/language-configuration.json                  | 2 +-
 extensions/objective-c/language-configuration.json           | 2 +-
 extensions/php/language-configuration.json                   | 2 +-
 extensions/rust/language-configuration.json                  | 2 +-
 extensions/swift/language-configuration.json                 | 2 +-
 extensions/typescript-basics/language-configuration.json     | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/extensions/cpp/language-configuration.json b/extensions/cpp/language-configuration.json
index 4324b1ffc2c..cb1fb733b99 100644
--- a/extensions/cpp/language-configuration.json
+++ b/extensions/cpp/language-configuration.json
@@ -118,7 +118,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "^(?:\"[^\"]*\"|'[^']*'|[^\"']*)*\/\/"
+				"pattern": "\/\/.*"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/csharp/language-configuration.json b/extensions/csharp/language-configuration.json
index c54e020bf8c..60814ae02f4 100644
--- a/extensions/csharp/language-configuration.json
+++ b/extensions/csharp/language-configuration.json
@@ -86,7 +86,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "^(?:\"[^\"]*\"|'[^']*'|[^\"']*)*\/\/"
+				"pattern": "\/\/.*"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/go/language-configuration.json b/extensions/go/language-configuration.json
index 2170510547b..9238bf3529b 100644
--- a/extensions/go/language-configuration.json
+++ b/extensions/go/language-configuration.json
@@ -96,7 +96,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "^(?:\"[^\"]*\"|'[^']*'|`[^`]*`|[^\"'`]*)*\/\/"
+				"pattern": "\/\/.*"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/groovy/language-configuration.json b/extensions/groovy/language-configuration.json
index 08c7a1c6395..39e5fd4092c 100644
--- a/extensions/groovy/language-configuration.json
+++ b/extensions/groovy/language-configuration.json
@@ -74,7 +74,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "^(?:\"[^\"]*\"|'[^']*'|[^\"']*)*\/\/"
+				"pattern": "\/\/.*"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/java/language-configuration.json b/extensions/java/language-configuration.json
index 813f406fcb0..6ba09bbd15c 100644
--- a/extensions/java/language-configuration.json
+++ b/extensions/java/language-configuration.json
@@ -158,7 +158,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "^(?:\"[^\"]*\"|'[^']*'|[^\"']*)*\/\/"
+				"pattern": "\/\/.*"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/javascript/javascript-language-configuration.json b/extensions/javascript/javascript-language-configuration.json
index b1006f3d05f..46ee043c52c 100644
--- a/extensions/javascript/javascript-language-configuration.json
+++ b/extensions/javascript/javascript-language-configuration.json
@@ -231,7 +231,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "^(?:\"[^\"]*\"|'[^']*'|`[^`]*`|[^\"'`]*)*\/\/"
+				"pattern": "\/\/.*"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/json/language-configuration.json b/extensions/json/language-configuration.json
index 215f9d6c854..d47efe2587e 100644
--- a/extensions/json/language-configuration.json
+++ b/extensions/json/language-configuration.json
@@ -70,7 +70,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "^(?:\"[^\"]*\"|[^\"]*)*\/\/"
+				"pattern": "\/\/.*"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/less/language-configuration.json b/extensions/less/language-configuration.json
index ff92640a6a3..71e155ddfcc 100644
--- a/extensions/less/language-configuration.json
+++ b/extensions/less/language-configuration.json
@@ -99,7 +99,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "^(?:\"[^\"]*\"|'[^']*'|[^\"']*)*\/\/"
+				"pattern": "\/\/.*"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/objective-c/language-configuration.json b/extensions/objective-c/language-configuration.json
index 08c7a1c6395..39e5fd4092c 100644
--- a/extensions/objective-c/language-configuration.json
+++ b/extensions/objective-c/language-configuration.json
@@ -74,7 +74,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "^(?:\"[^\"]*\"|'[^']*'|[^\"']*)*\/\/"
+				"pattern": "\/\/.*"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/php/language-configuration.json b/extensions/php/language-configuration.json
index 8880f278e42..d696ffa2950 100644
--- a/extensions/php/language-configuration.json
+++ b/extensions/php/language-configuration.json
@@ -157,7 +157,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "^(?:\"[^\"]*\"|'[^']*'|`[^`]*`|[^\"'`]*)*\/\/"
+				"pattern": "\/\/.*"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/rust/language-configuration.json b/extensions/rust/language-configuration.json
index 846c799f877..490f4409c65 100644
--- a/extensions/rust/language-configuration.json
+++ b/extensions/rust/language-configuration.json
@@ -77,7 +77,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "^(?:\"[^\"]*\"|'[^']*'|[^\"']*)*\/\/"
+				"pattern": "\/\/.*"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/swift/language-configuration.json b/extensions/swift/language-configuration.json
index b3f8ae7de50..e1ceb1f6bc6 100644
--- a/extensions/swift/language-configuration.json
+++ b/extensions/swift/language-configuration.json
@@ -85,7 +85,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "^(?:\"[^\"]*\"|'[^']*'|[^\"']*)*\/\/"
+				"pattern": "\/\/.*"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"
diff --git a/extensions/typescript-basics/language-configuration.json b/extensions/typescript-basics/language-configuration.json
index b59f5ac79f0..876c11e8143 100644
--- a/extensions/typescript-basics/language-configuration.json
+++ b/extensions/typescript-basics/language-configuration.json
@@ -249,7 +249,7 @@
 		// Add // when pressing enter from inside line comment
 		{
 			"beforeText": {
-				"pattern": "^(?:\"[^\"]*\"|'[^']*'|`[^`]*`|[^\"'`]*)*\/\/"
+				"pattern": "\/\/.*"
 			},
 			"afterText": {
 				"pattern": "^(?!\\s*$).+"

From d239906998fca67302d6c325b709050f4ce767dd Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Tue, 10 Dec 2024 16:49:51 +0100
Subject: [PATCH 077/479] fix #227358 (#235743)

---
 .../userDataProfile/common/remoteUserDataProfiles.ts         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/services/userDataProfile/common/remoteUserDataProfiles.ts b/src/vs/workbench/services/userDataProfile/common/remoteUserDataProfiles.ts
index 1281d1f717b..5c9ca3c72cc 100644
--- a/src/vs/workbench/services/userDataProfile/common/remoteUserDataProfiles.ts
+++ b/src/vs/workbench/services/userDataProfile/common/remoteUserDataProfiles.ts
@@ -15,6 +15,7 @@ import { IUserDataProfileService } from './userDataProfile.js';
 import { distinct } from '../../../../base/common/arrays.js';
 import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js';
 import { UserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfileIpc.js';
+import { ErrorNoTelemetry } from '../../../../base/common/errors.js';
 
 const associatedRemoteProfilesKey = 'associatedRemoteProfiles';
 
@@ -81,7 +82,7 @@ class RemoteUserDataProfilesService extends Disposable implements IRemoteUserDat
 		await this.initPromise;
 
 		if (!this.remoteUserDataProfilesService) {
-			throw new Error('Remote profiles service not available in the current window');
+			throw new ErrorNoTelemetry('Remote profiles service not available in the current window');
 		}
 
 		return this.remoteUserDataProfilesService.profiles;
@@ -91,7 +92,7 @@ class RemoteUserDataProfilesService extends Disposable implements IRemoteUserDat
 		await this.initPromise;
 
 		if (!this.remoteUserDataProfilesService) {
-			throw new Error('Remote profiles service not available in the current window');
+			throw new ErrorNoTelemetry('Remote profiles service not available in the current window');
 		}
 
 		return this.getAssociatedRemoteProfile(localProfile, this.remoteUserDataProfilesService);

From f43f3cc8f962d7fc4e8fa6ce5878882935cbaf1c Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Tue, 10 Dec 2024 17:26:34 +0100
Subject: [PATCH 078/479] server.cli.ts does not await Promises (#235738)

---
 resources/server/bin-dev/remote-cli/code.cmd |  1 +
 resources/server/bin-dev/remote-cli/code.sh  |  2 ++
 src/server-cli.ts                            |  2 +-
 src/vs/server/node/server.cli.ts             | 14 +++++++-------
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/resources/server/bin-dev/remote-cli/code.cmd b/resources/server/bin-dev/remote-cli/code.cmd
index fd1d2c5ca49..4d8214ead19 100644
--- a/resources/server/bin-dev/remote-cli/code.cmd
+++ b/resources/server/bin-dev/remote-cli/code.cmd
@@ -1,6 +1,7 @@
 @echo off
 setlocal
 SET VSCODE_PATH=%~dp0..\..\..\..
+SET VSCODE_DEV=1
 FOR /F "tokens=* USEBACKQ" %%g IN (`where /r "%VSCODE_PATH%\.build\node" node.exe`) do (SET "NODE=%%g")
 call "%NODE%" "%VSCODE_PATH%\out\server-cli.js" "Code Server - Dev" "" "" "code.cmd" %*
 endlocal
diff --git a/resources/server/bin-dev/remote-cli/code.sh b/resources/server/bin-dev/remote-cli/code.sh
index 1d0bc9b5c85..3deeb272c7c 100755
--- a/resources/server/bin-dev/remote-cli/code.sh
+++ b/resources/server/bin-dev/remote-cli/code.sh
@@ -10,6 +10,8 @@ else
 	VSCODE_PATH=$(dirname $(dirname $(dirname $(dirname $(dirname $(readlink -f $0))))))
 fi
 
+export VSCODE_DEV=1
+
 PROD_NAME="Code Server - Dev"
 VERSION=""
 COMMIT=""
diff --git a/src/server-cli.ts b/src/server-cli.ts
index 3ed0c87a466..4d1afa4018a 100644
--- a/src/server-cli.ts
+++ b/src/server-cli.ts
@@ -30,4 +30,4 @@ if (process.env['VSCODE_DEV']) {
 await bootstrapESM();
 
 // Load Server
-await import('./vs/server/node/server.cli');
+await import('./vs/server/node/server.cli.js');
diff --git a/src/vs/server/node/server.cli.ts b/src/vs/server/node/server.cli.ts
index eb68e8aa8b5..654a769cd27 100644
--- a/src/vs/server/node/server.cli.ts
+++ b/src/vs/server/node/server.cli.ts
@@ -154,7 +154,7 @@ export async function main(desc: ProductDescription, args: string[]): Promise<vo
 	}
 	if (cliPipe) {
 		if (parsedArgs['openExternal']) {
-			openInBrowser(parsedArgs['_'], verbose);
+			await openInBrowser(parsedArgs['_'], verbose);
 			return;
 		}
 	}
@@ -294,7 +294,7 @@ export async function main(desc: ProductDescription, args: string[]): Promise<vo
 		}
 	} else {
 		if (parsedArgs.status) {
-			sendToPipe({
+			await sendToPipe({
 				type: 'status'
 			}, verbose).then((res: string) => {
 				console.log(res);
@@ -305,7 +305,7 @@ export async function main(desc: ProductDescription, args: string[]): Promise<vo
 		}
 
 		if (parsedArgs['install-extension'] !== undefined || parsedArgs['uninstall-extension'] !== undefined || parsedArgs['list-extensions'] || parsedArgs['update-extensions']) {
-			sendToPipe({
+			await sendToPipe({
 				type: 'extensionManagement',
 				list: parsedArgs['list-extensions'] ? { showVersions: parsedArgs['show-versions'], category: parsedArgs['category'] } : undefined,
 				install: asExtensionIdOrVSIX(parsedArgs['install-extension']),
@@ -328,7 +328,7 @@ export async function main(desc: ProductDescription, args: string[]): Promise<vo
 			waitMarkerFilePath = createWaitMarkerFileSync(verbose);
 		}
 
-		sendToPipe({
+		await sendToPipe({
 			type: 'open',
 			fileURIs,
 			folderURIs,
@@ -345,7 +345,7 @@ export async function main(desc: ProductDescription, args: string[]): Promise<vo
 		});
 
 		if (waitMarkerFilePath) {
-			waitForFileDeleted(waitMarkerFilePath);
+			await waitForFileDeleted(waitMarkerFilePath);
 		}
 
 		if (readFromStdinPromise) {
@@ -371,7 +371,7 @@ async function waitForFileDeleted(path: string) {
 	}
 }
 
-function openInBrowser(args: string[], verbose: boolean) {
+async function openInBrowser(args: string[], verbose: boolean) {
 	const uris: string[] = [];
 	for (const location of args) {
 		try {
@@ -385,7 +385,7 @@ function openInBrowser(args: string[], verbose: boolean) {
 		}
 	}
 	if (uris.length) {
-		sendToPipe({
+		await sendToPipe({
 			type: 'openExternal',
 			uris
 		}, verbose).catch(e => {

From f20fe4d31a589ee118632b9663e4b4cb4dc01587 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Tue, 10 Dec 2024 17:38:39 +0100
Subject: [PATCH 079/479] Typing ".." in the (simple) Open File dialog has
 strange behaviour (#235746)

Fixes #154642
---
 src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
index c4faf15f40b..0fc6fad2c5a 100644
--- a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
+++ b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
@@ -862,6 +862,8 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 	private async updateItems(newFolder: URI, force: boolean = false, trailing?: string): Promise<boolean> {
 		this.busy = true;
 		this.autoCompletePathSegment = '';
+		const wasDotDot = trailing === '..';
+		trailing = wasDotDot ? undefined : trailing;
 		const isSave = !!trailing;
 		let result = false;
 
@@ -892,7 +894,7 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 				this.filePickBox.items = items;
 
 				// the user might have continued typing while we were updating. Only update the input box if it doesn't match the directory.
-				if (!equalsIgnoreCase(this.filePickBox.value, newValue) && force) {
+				if (!equalsIgnoreCase(this.filePickBox.value, newValue) && (force || wasDotDot)) {
 					this.filePickBox.valueSelection = [0, this.filePickBox.value.length];
 					this.insertText(newValue, newValue);
 				}

From a5539aee23533a8083819cb0b4277b05e1d6525a Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Tue, 10 Dec 2024 09:41:48 -0800
Subject: [PATCH 080/479] Clarify sixel support on Windows, mention conpty
 version

Fixes #198622
---
 .../contrib/terminal/common/terminalConfiguration.ts          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index 752b9e8d1bd..54c79186f02 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -460,7 +460,7 @@ const terminalConfiguration: IConfigurationNode = {
 			default: true
 		},
 		[TerminalSettingId.ExperimentalWindowsUseConptyDll]: {
-			markdownDescription: localize('terminal.integrated.experimentalWindowsUseConptyDll', "Whether to use the experimental conpty.dll shipped with VS Code, instead of the one bundled with Windows."),
+			markdownDescription: localize('terminal.integrated.experimentalWindowsUseConptyDll', "Whether to use the experimental conpty.dll (v1.20.240626001) shipped with VS Code, instead of the one bundled with Windows."),
 			type: 'boolean',
 			default: false
 		},
@@ -590,7 +590,7 @@ const terminalConfiguration: IConfigurationNode = {
 		},
 		[TerminalSettingId.EnableImages]: {
 			restricted: true,
-			markdownDescription: localize('terminal.integrated.enableImages', "Enables image support in the terminal, this will only work when {0} is enabled. Both sixel and iTerm's inline image protocol are supported on Linux and macOS, Windows support will light up automatically when ConPTY passes through the sequences. Images will currently not be restored between window reloads/reconnects.", `\`#${TerminalSettingId.GpuAcceleration}#\``),
+			markdownDescription: localize('terminal.integrated.enableImages', "Enables image support in the terminal, this will only work when {0} is enabled. Both sixel and iTerm's inline image protocol are supported on Linux and macOS. This will only work on Windows for versions of ConPTY >= v2 which is shipped with Windows itself, see also {1}. Images will currently not be restored between window reloads/reconnects.", `\`#${TerminalSettingId.GpuAcceleration}#\``, `\`#${TerminalSettingId.ExperimentalWindowsUseConptyDll}#\``),
 			type: 'boolean',
 			default: false
 		},

From 3e59d46a8708ed5baf367416778de566f7ab39d1 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 10 Dec 2024 13:55:59 -0600
Subject: [PATCH 081/479] testing: sort completed tests by start sequence, not
 completion time (#235758)

* testing: sort completed tests by start sequence, not completion time

Fixes #235667

The root cause of the issue is the separate test run that playwright does:

https://github.com/microsoft/playwright-vscode/blob/4fba0d0873ee9bf5de17219fa2f48201fd16162f/src/extension.ts#L403-L422.

VS Code by default only shows failure messages from the last-ended test
run, which was the original (unused) test run VS Code created, because
it ends automatically after the runHandler's promise resolves. A good
change to make, which happens to fix this bug, is ensuring results are
retained in the order the user started the test runs versus the order
in which they ended.

Note that playwright is able to avoid the duplicate run since #213182,
but I think this is still a sensible change to make.

* fix other test
---
 .../contrib/testing/common/testResult.ts        |  1 +
 .../contrib/testing/common/testResultService.ts | 17 ++++++++++++++---
 .../test/common/testResultService.test.ts       | 10 +++++++---
 .../test/common/testResultStorage.test.ts       |  1 +
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/testing/common/testResult.ts b/src/vs/workbench/contrib/testing/common/testResult.ts
index 53353b58d98..ed3db492667 100644
--- a/src/vs/workbench/contrib/testing/common/testResult.ts
+++ b/src/vs/workbench/contrib/testing/common/testResult.ts
@@ -340,6 +340,7 @@ export class LiveTestResult extends Disposable implements ITestResult {
 		public readonly id: string,
 		public readonly persist: boolean,
 		public readonly request: ResolvedTestRunRequest,
+		public readonly insertOrder: number,
 		@ITelemetryService private readonly telemetry: ITelemetryService,
 	) {
 		super();
diff --git a/src/vs/workbench/contrib/testing/common/testResultService.ts b/src/vs/workbench/contrib/testing/common/testResultService.ts
index 8a836a39086..8790f01262f 100644
--- a/src/vs/workbench/contrib/testing/common/testResultService.ts
+++ b/src/vs/workbench/contrib/testing/common/testResultService.ts
@@ -78,6 +78,7 @@ export class TestResultService extends Disposable implements ITestResultService
 	private _results: ITestResult[] = [];
 	private readonly _resultsDisposables: DisposableStore[] = [];
 	private testChangeEmitter = this._register(new Emitter<TestResultItemChange>());
+	private insertOrderCounter = 0;
 
 	/**
 	 * @inheritdoc
@@ -139,7 +140,7 @@ export class TestResultService extends Disposable implements ITestResultService
 	public createLiveResult(req: ResolvedTestRunRequest | ExtensionRunTestsRequest) {
 		if ('targets' in req) {
 			const id = generateUuid();
-			return this.push(new LiveTestResult(id, true, req, this.telemetryService));
+			return this.push(new LiveTestResult(id, true, req, this.insertOrderCounter++, this.telemetryService));
 		}
 
 		let profile: ITestRunProfile | undefined;
@@ -164,7 +165,7 @@ export class TestResultService extends Disposable implements ITestResultService
 			});
 		}
 
-		return this.push(new LiveTestResult(req.id, req.persist, resolved, this.telemetryService));
+		return this.push(new LiveTestResult(req.id, req.persist, resolved, this.insertOrderCounter++, this.telemetryService));
 	}
 
 	/**
@@ -251,7 +252,17 @@ export class TestResultService extends Disposable implements ITestResultService
 	}
 
 	private resort() {
-		this.results.sort((a, b) => (b.completedAt ?? Number.MAX_SAFE_INTEGER) - (a.completedAt ?? Number.MAX_SAFE_INTEGER));
+		this.results.sort((a, b) => {
+			// Running tests should always be sorted higher:
+			if (!!a.completedAt !== !!b.completedAt) {
+				return a.completedAt === undefined ? -1 : 1;
+			}
+
+			// Otherwise sort by insertion order, hydrated tests are always last:
+			const aComp = a instanceof LiveTestResult ? a.insertOrder : -1;
+			const bComp = b instanceof LiveTestResult ? b.insertOrder : -1;
+			return bComp - aComp;
+		});
 	}
 
 	private updateIsRunning() {
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 38c0a2c83c2..ac0ba381e3b 100644
--- a/src/vs/workbench/contrib/testing/test/common/testResultService.test.ts
+++ b/src/vs/workbench/contrib/testing/test/common/testResultService.test.ts
@@ -40,13 +40,15 @@ suite('Workbench - Test Results Service', () => {
 		}]
 	});
 
+	let insertCounter = 0;
+
 	class TestLiveTestResult extends LiveTestResult {
 		constructor(
 			id: string,
 			persist: boolean,
 			request: ResolvedTestRunRequest,
 		) {
-			super(id, persist, request, NullTelemetryService);
+			super(id, persist, request, insertCounter++, NullTelemetryService);
 			ds.add(this);
 		}
 
@@ -263,6 +265,7 @@ suite('Workbench - Test Results Service', () => {
 				'',
 				false,
 				defaultOpts([]),
+				insertCounter++,
 				NullTelemetryService,
 			));
 			results.clear();
@@ -270,12 +273,13 @@ suite('Workbench - Test Results Service', () => {
 			assert.deepStrictEqual(results.results, [r2]);
 		});
 
-		test('keeps ongoing tests on top', async () => {
+		test('keeps ongoing tests on top, restored order when done', async () => {
 			results.push(r);
 			const r2 = results.push(new LiveTestResult(
 				'',
 				false,
 				defaultOpts([]),
+				insertCounter++,
 				NullTelemetryService,
 			));
 
@@ -283,7 +287,7 @@ suite('Workbench - Test Results Service', () => {
 			r2.markComplete();
 			assert.deepStrictEqual(results.results, [r, r2]);
 			r.markComplete();
-			assert.deepStrictEqual(results.results, [r, r2]);
+			assert.deepStrictEqual(results.results, [r2, r]);
 		});
 
 		const makeHydrated = async (completedAt = 42, state = TestResultState.Passed) => new HydratedTestResult({
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 01218dbbe72..34c9fb80d0d 100644
--- a/src/vs/workbench/contrib/testing/test/common/testResultStorage.test.ts
+++ b/src/vs/workbench/contrib/testing/test/common/testResultStorage.test.ts
@@ -25,6 +25,7 @@ suite('Workbench - Test Result Storage', () => {
 			'',
 			true,
 			{ targets: [], group: TestRunProfileBitset.Run },
+			1,
 			NullTelemetryService,
 		));
 

From f771cf574394f0193189a5b7132157e2cd13e1bd Mon Sep 17 00:00:00 2001
From: Logan Ramos <lramos15@gmail.com>
Date: Tue, 10 Dec 2024 13:38:27 -0700
Subject: [PATCH 082/479] Remove quota from sku messaging (#235753)

* Remove quota from sku messaging

* Update wording
---
 src/vs/workbench/contrib/chat/browser/chatSetup.ts              | 2 +-
 .../welcomeGettingStarted/common/gettingStartedContent.ts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 9713d25a97f..ecd84a1ab9d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -866,7 +866,7 @@ class ChatSetupWelcomeContent extends Disposable {
 		}
 
 		// Limited SKU
-		const limitedSkuHeader = localize({ key: 'limitedSkuHeader', comment: ['{Locked="[]({0})"}'] }, "$(sparkle-filled) We now offer [Copilot for free]({0}) with 2,000 code completions and 50 chat messages per month.", defaultChat.skusDocumentationUrl);
+		const limitedSkuHeader = localize({ key: 'limitedSkuHeader', comment: ['{Locked="[]({0})"}'] }, "$(sparkle-filled) We now offer [Copilot for free]({0}).", defaultChat.skusDocumentationUrl);
 		const limitedSkuHeaderContainer = this.element.appendChild($('p'));
 		limitedSkuHeaderContainer.appendChild(this._register(markdown.render(new MarkdownString(limitedSkuHeader, { isTrusted: true, supportThemeIcons: true }))).element);
 
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
index 50e0e26bab2..637e77f71f8 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
@@ -211,7 +211,7 @@ export const startEntries: GettingStartedStartEntryContent = [
 const Button = (title: string, href: string) => `[${title}](${href})`;
 
 const CopilotStepTitle = localize('gettingStarted.copilotSetup.title', "Use AI features with Copilot for free");
-const CopilotDescription = localize({ key: 'gettingStarted.copilotSetup.description', comment: ['{Locked="["}', '{Locked="]({0})"}'] }, "Write code faster and smarter using [Copilot]({0}). With your GitHub account, get 2,000 code completions and 50 chat messages per month for free.", product.defaultChatAgent?.documentationUrl ?? '');
+const CopilotDescription = localize({ key: 'gettingStarted.copilotSetup.description', comment: ['{Locked="["}', '{Locked="]({0})"}'] }, "Write code faster and smarter using [Copilot]({0}) for free with your GitHub account.", product.defaultChatAgent?.documentationUrl ?? '');
 const CopilotTermsString = localize({ key: 'copilotTerms', comment: ['{Locked="["}', '{Locked="]({0})"}', '{Locked="]({1})"}'] }, "By continuing, you agree to Copilot [Terms]({0}) and [Privacy Policy]({1}).", product.defaultChatAgent?.termsStatementUrl ?? '', product.defaultChatAgent?.privacyStatementUrl ?? '');
 const CopilotSignedOutButton = Button(localize('setupCopilotButton.signIn', "Sign in to Use Copilot"), `command:workbench.action.chat.triggerSetup?${encodeURIComponent(JSON.stringify([true]))}`);
 const CopilotSignedInButton = Button(localize('setupCopilotButton.setup', "Set Up Copilot"), `command:workbench.action.chat.triggerSetup?${encodeURIComponent(JSON.stringify([true]))}`);

From 253145591b4f998449ec2d6db4fe5c4c3ae0b30c Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Tue, 10 Dec 2024 21:48:12 +0100
Subject: [PATCH 083/479] Git - export stash methods in the extension API
 (#235773)

---
 extensions/git/src/api/api1.ts  | 12 ++++++++++++
 extensions/git/src/api/git.d.ts |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/extensions/git/src/api/api1.ts b/extensions/git/src/api/api1.ts
index 62e3182b515..a8a8fb694b1 100644
--- a/extensions/git/src/api/api1.ts
+++ b/extensions/git/src/api/api1.ts
@@ -272,6 +272,18 @@ export class ApiRepository implements Repository {
 	mergeAbort(): Promise<void> {
 		return this.repository.mergeAbort();
 	}
+
+	applyStash(index?: number): Promise<void> {
+		return this.repository.applyStash(index);
+	}
+
+	popStash(index?: number): Promise<void> {
+		return this.repository.popStash(index);
+	}
+
+	dropStash(index?: number): Promise<void> {
+		return this.repository.dropStash(index);
+	}
 }
 
 export class ApiGit implements Git {
diff --git a/extensions/git/src/api/git.d.ts b/extensions/git/src/api/git.d.ts
index ee45e7a893a..851d5734977 100644
--- a/extensions/git/src/api/git.d.ts
+++ b/extensions/git/src/api/git.d.ts
@@ -266,6 +266,10 @@ export interface Repository {
 	commit(message: string, opts?: CommitOptions): Promise<void>;
 	merge(ref: string): Promise<void>;
 	mergeAbort(): Promise<void>;
+
+	applyStash(index?: number): Promise<void>;
+	popStash(index?: number): Promise<void>;
+	dropStash(index?: number): Promise<void>;
 }
 
 export interface RemoteSource {

From 75e8699bf901d7ca9ddd882d045dfbe309470ee5 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 10 Dec 2024 15:10:10 -0800
Subject: [PATCH 084/479] Add extra type check in `findFiles2` (#235692)

For https://github.com/microsoft/vscode-copilot-release/issues/2493

Looking at the code I'm still not sure how this can happen but it seems like we end up trying to call `.map` on a value that is not an array. Adding a more explicit exception here to hopefully track this down
---
 .../workbench/api/common/extHostWorkspace.ts  | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/vs/workbench/api/common/extHostWorkspace.ts b/src/vs/workbench/api/common/extHostWorkspace.ts
index 2f40bb8a392..b490bf7a242 100644
--- a/src/vs/workbench/api/common/extHostWorkspace.ts
+++ b/src/vs/workbench/api/common/extHostWorkspace.ts
@@ -468,7 +468,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 		}
 
 		// todo: consider exclude baseURI if available
-		return this._findFilesImpl(include, undefined, {
+		return this._findFilesImpl({ type: 'include', value: include }, {
 			exclude: [excludeString],
 			maxResults,
 			useExcludeSettings: useFileExcludes ? ExcludeSettingOptions.FilesExclude : ExcludeSettingOptions.None,
@@ -484,23 +484,26 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 		extensionId: ExtensionIdentifier,
 		token: vscode.CancellationToken = CancellationToken.None): Promise<vscode.Uri[]> {
 		this._logService.trace(`extHostWorkspace#findFiles2New: fileSearch, extension: ${extensionId.value}, entryPoint: findFiles2New`);
-		return this._findFilesImpl(undefined, filePatterns, options, token);
+		return this._findFilesImpl({ type: 'filePatterns', value: filePatterns }, options, token);
 	}
 
 	private async _findFilesImpl(
 		// the old `findFiles` used `include` to query, but the new `findFiles2` uses `filePattern` to query.
 		// `filePattern` is the proper way to handle this, since it takes less precedence than the ignore files.
-		include: vscode.GlobPattern | undefined,
-		filePatterns: vscode.GlobPattern[] | undefined,
+		query: { type: 'include'; value: vscode.GlobPattern | undefined } | { type: 'filePatterns'; value: vscode.GlobPattern[] },
 		options: vscode.FindFiles2Options,
-		token: vscode.CancellationToken = CancellationToken.None): Promise<vscode.Uri[]> {
-		if (token && token.isCancellationRequested) {
+		token: vscode.CancellationToken
+	): Promise<vscode.Uri[]> {
+		if (token.isCancellationRequested) {
 			return Promise.resolve([]);
 		}
 
+		const filePatternsToUse = query.type === 'include' ? [query.value] : query.value ?? [];
+		if (!Array.isArray(filePatternsToUse)) {
+			throw new Error(`Invalid file pattern provided ${filePatternsToUse}`);
+		}
 
-		const filePatternsToUse = include !== undefined ? [include] : filePatterns;
-		const queryOptions: QueryOptions<IFileQueryBuilderOptions>[] = filePatternsToUse?.map(filePattern => {
+		const queryOptions: QueryOptions<IFileQueryBuilderOptions>[] = filePatternsToUse.map(filePattern => {
 
 			const excludePatterns = globsToISearchPatternBuilder(options.exclude);
 
@@ -514,21 +517,22 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac
 				maxResults: options.maxResults,
 				excludePattern: excludePatterns.length > 0 ? excludePatterns : undefined,
 				_reason: 'startFileSearch',
-				shouldGlobSearch: include ? undefined : true,
+				shouldGlobSearch: query.type === 'include' ? undefined : true,
 			};
 
 			const parseInclude = parseSearchExcludeInclude(GlobPattern.from(filePattern));
 			const folderToUse = parseInclude?.folder;
-			if (include) {
+			if (query.type === 'include') {
 				fileQueries.includePattern = parseInclude?.pattern;
 			} else {
 				fileQueries.filePattern = parseInclude?.pattern;
 			}
+
 			return {
 				folder: folderToUse,
 				options: fileQueries
 			};
-		}) ?? [];
+		});
 
 		return this._findFilesBase(queryOptions, token);
 	}

From 5ece69fbf32e95c919af2ebeb8b00bb3b4c1eefc Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Wed, 11 Dec 2024 13:21:01 +0900
Subject: [PATCH 085/479] ci: fix flaky client module installation in legacy
 stage (#235786)

---
 build/.cachesalt                              |  2 +-
 .../product-build-linux-legacy-server.yml     | 28 ++++---------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/build/.cachesalt b/build/.cachesalt
index 3c6029dc2f4..5a294f35396 100644
--- a/build/.cachesalt
+++ b/build/.cachesalt
@@ -1 +1 @@
-2024-09-04T10:21:29.952Z
+2024-12-11T00:28:56.838Z
diff --git a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml b/build/azure-pipelines/linux/product-build-linux-legacy-server.yml
index fcbdb3254f0..6e4022b4064 100644
--- a/build/azure-pipelines/linux/product-build-linux-legacy-server.yml
+++ b/build/azure-pipelines/linux/product-build-linux-legacy-server.yml
@@ -42,7 +42,9 @@ steps:
         libxkbfile-dev \
         libkrb5-dev \
         libgbm1 \
-        rpm
+        rpm \
+        gcc-10 \
+        g++-10
       sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
       sudo chmod +x /etc/init.d/xvfb
       sudo update-rc.d xvfb defaults
@@ -83,28 +85,6 @@ steps:
         imageName: vscode-linux-build-agent:centos7-devtoolset8-$(VSCODE_ARCH)
         containerCommand: uname
 
-  - ${{ if or(eq(parameters.VSCODE_ARCH, 'arm64'), eq(parameters.VSCODE_ARCH, 'armhf')) }}:
-    - script: |
-        set -e
-        includes=$(cat << 'EOF'
-        {
-          "target_defaults": {
-            "conditions": [
-              ["OS=='linux'", {
-                'cflags_cc!': [ '-std=gnu++20' ],
-                'cflags_cc': [ '-std=gnu++2a' ],
-              }]
-            ]
-          }
-        }
-        EOF
-        )
-        if [ ! -d "$HOME/.gyp" ]; then
-          mkdir -p "$HOME/.gyp"
-        fi
-        echo "$includes" > "$HOME/.gyp/include.gypi"
-      displayName: Override gnu target for arm64 and arm
-
   - script: |
       set -e
 
@@ -123,6 +103,8 @@ steps:
       set -e
 
       export VSCODE_SYSROOT_PREFIX='-glibc-2.17'
+      export CC=$(which gcc-10)
+      export CXX=$(which g++-10)
       source ./build/azure-pipelines/linux/setup-env.sh --skip-sysroot
 
       for i in {1..5}; do # try 5 times

From 9394d9716792e04a47f917b1760d5c4048170f7c Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 10 Dec 2024 20:22:33 -0800
Subject: [PATCH 086/479] Remove event from MarkdownRenderer (#235046)

Fixes #234539

`render` already supports passing in a callback so I don't think we need an event
---
 .../browser/markdownRenderer.ts               | 19 +++++--------------
 .../contrib/hover/browser/glyphHoverWidget.ts |  2 +-
 .../hover/browser/markdownHoverParticipant.ts | 12 +++++++-----
 .../browser/hintsWidget/hoverParticipant.ts   | 14 +++++++-------
 .../browser/parameterHintsWidget.ts           |  2 +-
 .../suggest/browser/suggestWidgetDetails.ts   | 11 ++++++-----
 .../chatConfirmationWidget.ts                 |  2 +-
 .../contrib/chat/browser/chatListRenderer.ts  |  2 +-
 .../contrib/chat/browser/chatSetup.ts         |  2 +-
 .../viewsWelcome/chatViewWelcomeController.ts |  2 +-
 .../comments/browser/commentThreadBody.ts     |  2 +-
 .../preferences/browser/settingsTree.ts       |  2 +-
 .../contrib/scm/browser/scmViewPane.ts        |  2 +-
 .../testResultsView/testResultsOutput.ts      |  2 +-
 .../browser/gettingStarted.ts                 |  1 -
 15 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/src/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer.ts b/src/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer.ts
index 61ece2ec8e1..4bd0ef15ad0 100644
--- a/src/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer.ts
+++ b/src/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer.ts
@@ -6,17 +6,16 @@
 import { MarkdownRenderOptions, MarkedOptions, renderMarkdown } from '../../../../../base/browser/markdownRenderer.js';
 import { createTrustedTypesPolicy } from '../../../../../base/browser/trustedTypes.js';
 import { onUnexpectedError } from '../../../../../base/common/errors.js';
-import { Emitter } from '../../../../../base/common/event.js';
 import { IMarkdownString, MarkdownStringTrustedOptions } from '../../../../../base/common/htmlContent.js';
 import { DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
-import './renderedMarkdown.css';
-import { applyFontInfo } from '../../../config/domFontInfo.js';
-import { ICodeEditor } from '../../../editorBrowser.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
 import { EditorOption } from '../../../../common/config/editorOptions.js';
 import { ILanguageService } from '../../../../common/languages/language.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../../../../common/languages/modesRegistry.js';
 import { tokenizeToString } from '../../../../common/languages/textToHtmlTokenizer.js';
-import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { applyFontInfo } from '../../../config/domFontInfo.js';
+import { ICodeEditor } from '../../../editorBrowser.js';
+import './renderedMarkdown.css';
 
 export interface IMarkdownRenderResult extends IDisposable {
 	readonly element: HTMLElement;
@@ -32,7 +31,7 @@ export interface IMarkdownRendererOptions {
  * Markdown renderer that can render codeblocks with the editor mechanics. This
  * renderer should always be preferred.
  */
-export class MarkdownRenderer implements IDisposable {
+export class MarkdownRenderer {
 
 	private static _ttpTokenizer = createTrustedTypesPolicy('tokenizeToString', {
 		createHTML(html: string) {
@@ -40,19 +39,12 @@ export class MarkdownRenderer implements IDisposable {
 		}
 	});
 
-	private readonly _onDidRenderAsync = new Emitter<void>();
-	readonly onDidRenderAsync = this._onDidRenderAsync.event;
-
 	constructor(
 		private readonly _options: IMarkdownRendererOptions,
 		@ILanguageService private readonly _languageService: ILanguageService,
 		@IOpenerService private readonly _openerService: IOpenerService,
 	) { }
 
-	dispose(): void {
-		this._onDidRenderAsync.dispose();
-	}
-
 	render(markdown: IMarkdownString | undefined, options?: MarkdownRenderOptions, markedOptions?: MarkedOptions): IMarkdownRenderResult {
 		if (!markdown) {
 			const element = document.createElement('span');
@@ -103,7 +95,6 @@ export class MarkdownRenderer implements IDisposable {
 
 				return element;
 			},
-			asyncRenderCallback: () => this._onDidRenderAsync.fire(),
 			actionHandler: {
 				callback: (link) => this.openMarkdownLink(link, markdown),
 				disposables: disposables
diff --git a/src/vs/editor/contrib/hover/browser/glyphHoverWidget.ts b/src/vs/editor/contrib/hover/browser/glyphHoverWidget.ts
index f5b8fbb2fc5..a6a120b040a 100644
--- a/src/vs/editor/contrib/hover/browser/glyphHoverWidget.ts
+++ b/src/vs/editor/contrib/hover/browser/glyphHoverWidget.ts
@@ -48,7 +48,7 @@ export class GlyphHoverWidget extends Disposable implements IOverlayWidget, IHov
 		this._hover = this._register(new HoverWidget(true));
 		this._hover.containerDomNode.classList.toggle('hidden', !this._isVisible);
 
-		this._markdownRenderer = this._register(new MarkdownRenderer({ editor: this._editor }, languageService, openerService));
+		this._markdownRenderer = new MarkdownRenderer({ editor: this._editor }, languageService, openerService);
 		this._hoverOperation = this._register(new HoverOperation(this._editor, new GlyphHoverComputer(this._editor)));
 		this._register(this._hoverOperation.onResult((result) => this._withResult(result)));
 
diff --git a/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts b/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts
index 7e01b664105..481e7791355 100644
--- a/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts
+++ b/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts
@@ -489,12 +489,14 @@ function renderMarkdownInContainer(
 		}
 		const markdownHoverElement = $('div.markdown-hover');
 		const hoverContentsElement = dom.append(markdownHoverElement, $('div.hover-contents'));
-		const renderer = disposables.add(new MarkdownRenderer({ editor }, languageService, openerService));
-		disposables.add(renderer.onDidRenderAsync(() => {
-			hoverContentsElement.className = 'hover-contents code-hover-contents';
-			onFinishedRendering();
+		const renderer = new MarkdownRenderer({ editor }, languageService, openerService);
+
+		const renderedContents = disposables.add(renderer.render(markdownString, {
+			asyncRenderCallback: () => {
+				hoverContentsElement.className = 'hover-contents code-hover-contents';
+				onFinishedRendering();
+			}
 		}));
-		const renderedContents = disposables.add(renderer.render(markdownString));
 		hoverContentsElement.appendChild(renderedContents.element);
 		renderedMarkdownContents.appendChild(markdownHoverElement);
 	}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/hoverParticipant.ts b/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/hoverParticipant.ts
index fefa9400dfc..66d3c143c01 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/hoverParticipant.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/hoverParticipant.ts
@@ -138,15 +138,15 @@ export class InlineCompletionsHoverParticipant implements IEditorHoverParticipan
 		const $ = dom.$;
 		const markdownHoverElement = $('div.hover-row.markdown-hover');
 		const hoverContentsElement = dom.append(markdownHoverElement, $('div.hover-contents', { ['aria-live']: 'assertive' }));
-		const renderer = disposables.add(new MarkdownRenderer({ editor: this._editor }, this._languageService, this._openerService));
+		const renderer = new MarkdownRenderer({ editor: this._editor }, this._languageService, this._openerService);
 		const render = (code: string) => {
-			disposables.add(renderer.onDidRenderAsync(() => {
-				hoverContentsElement.className = 'hover-contents code-hover-contents';
-				context.onContentsChanged();
-			}));
-
 			const inlineSuggestionAvailable = nls.localize('inlineSuggestionFollows', "Suggestion:");
-			const renderedContents = disposables.add(renderer.render(new MarkdownString().appendText(inlineSuggestionAvailable).appendCodeblock('text', code)));
+			const renderedContents = disposables.add(renderer.render(new MarkdownString().appendText(inlineSuggestionAvailable).appendCodeblock('text', code), {
+				asyncRenderCallback: () => {
+					hoverContentsElement.className = 'hover-contents code-hover-contents';
+					context.onContentsChanged();
+				}
+			}));
 			hoverContentsElement.replaceChildren(renderedContents.element);
 		};
 
diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts b/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts
index b2f044f2f5c..67334742dad 100644
--- a/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts
+++ b/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.ts
@@ -67,7 +67,7 @@ export class ParameterHintsWidget extends Disposable implements IContentWidget {
 	) {
 		super();
 
-		this.markdownRenderer = this._register(new MarkdownRenderer({ editor }, languageService, openerService));
+		this.markdownRenderer = new MarkdownRenderer({ editor }, languageService, openerService);
 
 		this.keyVisible = Context.Visible.bindTo(contextKeyService);
 		this.keyMultipleSignatures = Context.MultipleSignatures.bindTo(contextKeyService);
diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.ts b/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.ts
index 22f29a981c5..ac2af6022b0 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.ts
@@ -174,13 +174,14 @@ export class SuggestDetailsWidget {
 		} else if (documentation) {
 			this._docs.classList.add('markdown-docs');
 			dom.clearNode(this._docs);
-			const renderedContents = this._markdownRenderer.render(documentation);
+			const renderedContents = this._markdownRenderer.render(documentation, {
+				asyncRenderCallback: () => {
+					this.layout(this._size.width, this._type.clientHeight + this._docs.clientHeight);
+					this._onDidChangeContents.fire(this);
+				}
+			});
 			this._docs.appendChild(renderedContents.element);
 			this._renderDisposeable.add(renderedContents);
-			this._renderDisposeable.add(this._markdownRenderer.onDidRenderAsync(() => {
-				this.layout(this._size.width, this._type.clientHeight + this._docs.clientHeight);
-				this._onDidChangeContents.fire(this);
-			}));
 		}
 
 		this.domNode.style.userSelect = 'text';
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts
index 44fd960a147..df2b54b53e1 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.ts
@@ -46,7 +46,7 @@ export class ChatConfirmationWidget extends Disposable {
 			dom.h('.chat-confirmation-buttons-container@buttonsContainer'),
 		]);
 		this._domNode = elements.root;
-		const renderer = this._register(this.instantiationService.createInstance(MarkdownRenderer, {}));
+		const renderer = this.instantiationService.createInstance(MarkdownRenderer, {});
 
 		const renderedTitle = this._register(renderer.render(new MarkdownString(title)));
 		elements.title.appendChild(renderedTitle.element);
diff --git a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
index 527aba95f06..2bc16470629 100644
--- a/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatListRenderer.ts
@@ -157,7 +157,7 @@ export class ChatListItemRenderer extends Disposable implements ITreeRenderer<Ch
 	) {
 		super();
 
-		this.renderer = this._register(this.instantiationService.createInstance(ChatMarkdownRenderer, undefined));
+		this.renderer = this.instantiationService.createInstance(ChatMarkdownRenderer, undefined);
 		this.markdownDecorationsRenderer = this.instantiationService.createInstance(ChatMarkdownDecorationsRenderer);
 		this._editorPool = this._register(this.instantiationService.createInstance(EditorPool, editorOptions, delegate, overflowWidgetsDomNode));
 		this._diffEditorPool = this._register(this.instantiationService.createInstance(DiffEditorPool, editorOptions, delegate, overflowWidgetsDomNode));
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index ecd84a1ab9d..14e5cf66a58 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -836,7 +836,7 @@ class ChatSetupWelcomeContent extends Disposable {
 	}
 
 	private create(): void {
-		const markdown = this._register(this.instantiationService.createInstance(MarkdownRenderer, {}));
+		const markdown = this.instantiationService.createInstance(MarkdownRenderer, {});
 
 		// Header
 		{
diff --git a/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController.ts b/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController.ts
index 892607054e5..6942c082ded 100644
--- a/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController.ts
+++ b/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController.ts
@@ -132,7 +132,7 @@ export class ChatViewWelcomePart extends Disposable {
 		this.element = dom.$('.chat-welcome-view');
 
 		try {
-			const renderer = this._register(this.instantiationService.createInstance(MarkdownRenderer, {}));
+			const renderer = this.instantiationService.createInstance(MarkdownRenderer, {});
 
 			// Icon
 			const icon = dom.append(this.element, $('.chat-welcome-view-icon'));
diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadBody.ts b/src/vs/workbench/contrib/comments/browser/commentThreadBody.ts
index 1ee553714bf..fa68fe09303 100644
--- a/src/vs/workbench/contrib/comments/browser/commentThreadBody.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentThreadBody.ts
@@ -63,7 +63,7 @@ export class CommentThreadBody<T extends IRange | ICellRange = IRange> extends D
 			this.commentService.setActiveEditingCommentThread(this._commentThread);
 		}));
 
-		this._markdownRenderer = this._register(new MarkdownRenderer(this._options, this.languageService, this.openerService));
+		this._markdownRenderer = new MarkdownRenderer(this._options, this.languageService, this.openerService);
 	}
 
 	focus(commentUniqueId?: number) {
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
index 7a1f0adcdaa..eb600aa17e9 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
@@ -841,7 +841,7 @@ export abstract class AbstractSettingRenderer extends Disposable implements ITre
 	) {
 		super();
 
-		this.markdownRenderer = this._register(_instantiationService.createInstance(MarkdownRenderer, {}));
+		this.markdownRenderer = _instantiationService.createInstance(MarkdownRenderer, {});
 
 		this.ignoredSettings = getIgnoredSettings(getDefaultIgnoredSettings(), this._configService);
 		this._register(this._configService.onDidChangeConfiguration(e => {
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index 4ee1c3aa7bf..fd25da9f13c 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -1957,7 +1957,7 @@ class SCMInputWidget {
 						this.contextViewService.hideContextView();
 					}));
 
-					const renderer = disposables.add(this.instantiationService.createInstance(MarkdownRenderer, {}));
+					const renderer = this.instantiationService.createInstance(MarkdownRenderer, {});
 					const renderedMarkdown = renderer.render(message, {
 						actionHandler: {
 							callback: (link) => {
diff --git a/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsOutput.ts b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsOutput.ts
index ac9eefb824b..4f06c5ee9ca 100644
--- a/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsOutput.ts
+++ b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsOutput.ts
@@ -206,7 +206,7 @@ export class DiffContentProvider extends Disposable implements IPeekOutputRender
 
 export class MarkdownTestMessagePeek extends Disposable implements IPeekOutputRenderer {
 	private readonly markdown = new Lazy(
-		() => this._register(this.instantiationService.createInstance(MarkdownRenderer, {})),
+		() => this.instantiationService.createInstance(MarkdownRenderer, {}),
 	);
 	private readonly rendered = this._register(new DisposableStore());
 
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
index cb25dc9d925..b0f5b5f009b 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
@@ -1511,7 +1511,6 @@ export class GettingStartedPage extends EditorPane {
 			"{0} collects usage data. Read our {1} and learn how to {2}.", this.productService.nameShort, privacyStatementButton, optOutButton);
 
 		parent.append(mdRenderer.render({ value: text, isTrusted: true }).element);
-		mdRenderer.dispose();
 	}
 
 	private getKeybindingLabel(command: string) {

From 4cb01939683a850cf023948a8d6e430ef53b361d Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 11 Dec 2024 08:21:05 +0100
Subject: [PATCH 087/479] Context menu on simple text editor does not have the
 standard options (fix #191628) (#235791)

---
 src/vs/editor/browser/editorExtensions.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/vs/editor/browser/editorExtensions.ts b/src/vs/editor/browser/editorExtensions.ts
index c8453d78c1f..3751b26de7d 100644
--- a/src/vs/editor/browser/editorExtensions.ts
+++ b/src/vs/editor/browser/editorExtensions.ts
@@ -652,6 +652,11 @@ export const UndoCommand = registerCommand(new MultiCommand({
 		group: '',
 		title: nls.localize('undo', "Undo"),
 		order: 1
+	}, {
+		menuId: MenuId.SimpleEditorContext,
+		group: '1_do',
+		title: nls.localize('undo', "Undo"),
+		order: 1
 	}]
 }));
 
@@ -676,6 +681,11 @@ export const RedoCommand = registerCommand(new MultiCommand({
 		group: '',
 		title: nls.localize('redo', "Redo"),
 		order: 1
+	}, {
+		menuId: MenuId.SimpleEditorContext,
+		group: '1_do',
+		title: nls.localize('redo', "Redo"),
+		order: 2
 	}]
 }));
 
@@ -699,5 +709,10 @@ export const SelectAllCommand = registerCommand(new MultiCommand({
 		group: '',
 		title: nls.localize('selectAll', "Select All"),
 		order: 1
+	}, {
+		menuId: MenuId.SimpleEditorContext,
+		group: '9_select',
+		title: nls.localize('selectAll', "Select All"),
+		order: 1
 	}]
 }));

From 679a9f1aceeb8b1aa3bcd0542eb5e5aca6046600 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 11 Dec 2024 09:19:48 +0100
Subject: [PATCH 088/479] :up: `@parcel/watcher@2.5.0` (#235710)

---
 build/npm/postinstall.js                      |  21 +-
 extensions/package-lock.json                  | 325 +++++++++++++++++-
 extensions/package.json                       |   7 +-
 package-lock.json                             | 310 ++++++++++++++++-
 package.json                                  |   5 +-
 remote/package-lock.json                      | 310 ++++++++++++++++-
 remote/package.json                           |   5 +-
 .../files/test/node/parcelWatcher.test.ts     |   4 +-
 8 files changed, 921 insertions(+), 66 deletions(-)

diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
index 88e3c9eb1bb..c1f22aa5002 100644
--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
@@ -62,6 +62,7 @@ function npmInstall(dir, opts) {
 		log(dir, 'Installing dependencies...');
 		run(npm, command.split(' '), opts);
 	}
+	removeParcelWatcherPrebuild(dir);
 }
 
 function setNpmrcConfig(dir, env) {
@@ -96,11 +97,27 @@ function setNpmrcConfig(dir, env) {
 	}
 }
 
+function removeParcelWatcherPrebuild(dir) {
+	const parcelModuleFolder = path.join(root, dir, 'node_modules', '@parcel');
+	if (!fs.existsSync(parcelModuleFolder)) {
+		return;
+	}
+
+	const parcelModules = fs.readdirSync(parcelModuleFolder);
+	for (const moduleName of parcelModules) {
+		if (moduleName.startsWith('watcher-')) {
+			const modulePath = path.join(parcelModuleFolder, moduleName);
+			fs.rmSync(modulePath, { recursive: true, force: true });
+			log(dir, `Removed @parcel/watcher prebuilt module ${modulePath}`);
+		}
+	}
+}
+
 for (let dir of dirs) {
 
 	if (dir === '') {
-		// already executed in root
-		continue;
+		removeParcelWatcherPrebuild(dir);
+		continue; // already executed in root
 	}
 
 	let opts;
diff --git a/extensions/package-lock.json b/extensions/package-lock.json
index 765f26586a3..04f0bfcde5c 100644
--- a/extensions/package-lock.json
+++ b/extensions/package-lock.json
@@ -13,7 +13,7 @@
         "typescript": "^5.7.2"
       },
       "devDependencies": {
-        "@parcel/watcher": "2.1.0",
+        "@parcel/watcher": "2.5.0",
         "esbuild": "0.23.0",
         "vscode-grammar-updater": "^1.1.0"
       }
@@ -403,17 +403,306 @@
       }
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.1.0.tgz",
-      "integrity": "sha512-8s8yYjd19pDSsBpbkOHnT6Z2+UJSuLQx61pCFM0s5wSRvKCEMDjd/cHY3/GI1szHIWbpXpsJdg3V6ISGGx9xDw==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.0.tgz",
+      "integrity": "sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "dependencies": {
+        "detect-libc": "^1.0.3",
         "is-glob": "^4.0.3",
         "micromatch": "^4.0.5",
-        "node-addon-api": "^3.2.1",
-        "node-gyp-build": "^4.3.0"
+        "node-addon-api": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       },
+      "optionalDependencies": {
+        "@parcel/watcher-android-arm64": "2.5.0",
+        "@parcel/watcher-darwin-arm64": "2.5.0",
+        "@parcel/watcher-darwin-x64": "2.5.0",
+        "@parcel/watcher-freebsd-x64": "2.5.0",
+        "@parcel/watcher-linux-arm-glibc": "2.5.0",
+        "@parcel/watcher-linux-arm-musl": "2.5.0",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.0",
+        "@parcel/watcher-linux-arm64-musl": "2.5.0",
+        "@parcel/watcher-linux-x64-glibc": "2.5.0",
+        "@parcel/watcher-linux-x64-musl": "2.5.0",
+        "@parcel/watcher-win32-arm64": "2.5.0",
+        "@parcel/watcher-win32-ia32": "2.5.0",
+        "@parcel/watcher-win32-x64": "2.5.0"
+      }
+    },
+    "node_modules/@parcel/watcher-android-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.0.tgz",
+      "integrity": "sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.0.tgz",
+      "integrity": "sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.0.tgz",
+      "integrity": "sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-freebsd-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.0.tgz",
+      "integrity": "sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.0.tgz",
+      "integrity": "sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.0.tgz",
+      "integrity": "sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.0.tgz",
+      "integrity": "sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.0.tgz",
+      "integrity": "sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.0.tgz",
+      "integrity": "sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.0.tgz",
+      "integrity": "sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.0.tgz",
+      "integrity": "sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-ia32": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.0.tgz",
+      "integrity": "sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.0.tgz",
+      "integrity": "sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
         "node": ">= 10.0.0"
       },
@@ -459,6 +748,19 @@
         "node": ">=10.13"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/esbuild": {
       "version": "0.23.0",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.0.tgz",
@@ -570,17 +872,6 @@
         "node": "^16 || ^18 || >= 20"
       }
     },
-    "node_modules/node-gyp-build": {
-      "version": "4.8.1",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.1.tgz",
-      "integrity": "sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==",
-      "dev": true,
-      "bin": {
-        "node-gyp-build": "bin.js",
-        "node-gyp-build-optional": "optional.js",
-        "node-gyp-build-test": "build-test.js"
-      }
-    },
     "node_modules/picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
diff --git a/extensions/package.json b/extensions/package.json
index 1d189197e74..e70678990af 100644
--- a/extensions/package.json
+++ b/extensions/package.json
@@ -10,14 +10,11 @@
     "postinstall": "node ./postinstall.mjs"
   },
   "devDependencies": {
-    "@parcel/watcher": "2.1.0",
+    "@parcel/watcher": "2.5.0",
     "esbuild": "0.23.0",
     "vscode-grammar-updater": "^1.1.0"
   },
   "overrides": {
-    "node-gyp-build": "4.8.1",
-    "@parcel/watcher@2.1.0": {
-      "node-addon-api": "7.1.0"
-    }
+    "node-gyp-build": "4.8.1"
   }
 }
diff --git a/package-lock.json b/package-lock.json
index a16b3ecf06f..e659e5506fa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
       "dependencies": {
         "@microsoft/1ds-core-js": "^3.2.13",
         "@microsoft/1ds-post-js": "^3.2.13",
-        "@parcel/watcher": "2.1.0",
+        "@parcel/watcher": "2.5.0",
         "@types/semver": "^7.5.8",
         "@vscode/deviceid": "^0.1.1",
         "@vscode/iconv-lite-umd": "0.7.0",
@@ -1727,24 +1727,312 @@
       }
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.1.0.tgz",
-      "integrity": "sha512-8s8yYjd19pDSsBpbkOHnT6Z2+UJSuLQx61pCFM0s5wSRvKCEMDjd/cHY3/GI1szHIWbpXpsJdg3V6ISGGx9xDw==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.0.tgz",
+      "integrity": "sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==",
       "hasInstallScript": true,
+      "license": "MIT",
       "dependencies": {
+        "detect-libc": "^1.0.3",
         "is-glob": "^4.0.3",
         "micromatch": "^4.0.5",
-        "node-addon-api": "^3.2.1",
-        "node-gyp-build": "^4.3.0"
+        "node-addon-api": "^7.0.0"
       },
       "engines": {
         "node": ">= 10.0.0"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher-android-arm64": "2.5.0",
+        "@parcel/watcher-darwin-arm64": "2.5.0",
+        "@parcel/watcher-darwin-x64": "2.5.0",
+        "@parcel/watcher-freebsd-x64": "2.5.0",
+        "@parcel/watcher-linux-arm-glibc": "2.5.0",
+        "@parcel/watcher-linux-arm-musl": "2.5.0",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.0",
+        "@parcel/watcher-linux-arm64-musl": "2.5.0",
+        "@parcel/watcher-linux-x64-glibc": "2.5.0",
+        "@parcel/watcher-linux-x64-musl": "2.5.0",
+        "@parcel/watcher-win32-arm64": "2.5.0",
+        "@parcel/watcher-win32-ia32": "2.5.0",
+        "@parcel/watcher-win32-x64": "2.5.0"
+      }
+    },
+    "node_modules/@parcel/watcher-android-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.0.tgz",
+      "integrity": "sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/parcel"
       }
     },
+    "node_modules/@parcel/watcher-darwin-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.0.tgz",
+      "integrity": "sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.0.tgz",
+      "integrity": "sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-freebsd-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.0.tgz",
+      "integrity": "sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.0.tgz",
+      "integrity": "sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.0.tgz",
+      "integrity": "sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.0.tgz",
+      "integrity": "sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.0.tgz",
+      "integrity": "sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.0.tgz",
+      "integrity": "sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.0.tgz",
+      "integrity": "sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.0.tgz",
+      "integrity": "sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-ia32": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.0.tgz",
+      "integrity": "sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.0.tgz",
+      "integrity": "sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher/node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "license": "Apache-2.0",
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -12351,16 +12639,6 @@
         }
       }
     },
-    "node_modules/node-gyp-build": {
-      "version": "4.8.1",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.1.tgz",
-      "integrity": "sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==",
-      "bin": {
-        "node-gyp-build": "bin.js",
-        "node-gyp-build-optional": "optional.js",
-        "node-gyp-build-test": "build-test.js"
-      }
-    },
     "node_modules/node-html-markdown": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/node-html-markdown/-/node-html-markdown-1.3.0.tgz",
diff --git a/package.json b/package.json
index f283587b8c5..12ff0ff2f0b 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
   "dependencies": {
     "@microsoft/1ds-core-js": "^3.2.13",
     "@microsoft/1ds-post-js": "^3.2.13",
-    "@parcel/watcher": "2.1.0",
+    "@parcel/watcher": "2.5.0",
     "@types/semver": "^7.5.8",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.0",
@@ -224,9 +224,6 @@
     "node-gyp-build": "4.8.1",
     "kerberos@2.1.1": {
       "node-addon-api": "7.1.0"
-    },
-    "@parcel/watcher@2.1.0": {
-      "node-addon-api": "7.1.0"
     }
   },
   "repository": {
diff --git a/remote/package-lock.json b/remote/package-lock.json
index f0ed1ccef11..dfbff101a88 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -10,7 +10,7 @@
       "dependencies": {
         "@microsoft/1ds-core-js": "^3.2.13",
         "@microsoft/1ds-post-js": "^3.2.13",
-        "@parcel/watcher": "2.1.0",
+        "@parcel/watcher": "2.5.0",
         "@vscode/deviceid": "^0.1.1",
         "@vscode/iconv-lite-umd": "0.7.0",
         "@vscode/proxy-agent": "^0.27.0",
@@ -88,16 +88,232 @@
       "integrity": "sha512-n1VPsljTSkthsAFYdiWfC+DKzK2WwcRp83Y1YAqdX552BstvsDjft9YXppjUzp11BPsapDoO1LDgrDB0XVsfNQ=="
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.1.0.tgz",
-      "integrity": "sha512-8s8yYjd19pDSsBpbkOHnT6Z2+UJSuLQx61pCFM0s5wSRvKCEMDjd/cHY3/GI1szHIWbpXpsJdg3V6ISGGx9xDw==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.0.tgz",
+      "integrity": "sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==",
       "hasInstallScript": true,
+      "license": "MIT",
       "dependencies": {
+        "detect-libc": "^1.0.3",
         "is-glob": "^4.0.3",
         "micromatch": "^4.0.5",
-        "node-addon-api": "^3.2.1",
-        "node-gyp-build": "^4.3.0"
+        "node-addon-api": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher-android-arm64": "2.5.0",
+        "@parcel/watcher-darwin-arm64": "2.5.0",
+        "@parcel/watcher-darwin-x64": "2.5.0",
+        "@parcel/watcher-freebsd-x64": "2.5.0",
+        "@parcel/watcher-linux-arm-glibc": "2.5.0",
+        "@parcel/watcher-linux-arm-musl": "2.5.0",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.0",
+        "@parcel/watcher-linux-arm64-musl": "2.5.0",
+        "@parcel/watcher-linux-x64-glibc": "2.5.0",
+        "@parcel/watcher-linux-x64-musl": "2.5.0",
+        "@parcel/watcher-win32-arm64": "2.5.0",
+        "@parcel/watcher-win32-ia32": "2.5.0",
+        "@parcel/watcher-win32-x64": "2.5.0"
+      }
+    },
+    "node_modules/@parcel/watcher-android-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.0.tgz",
+      "integrity": "sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.0.tgz",
+      "integrity": "sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.0.tgz",
+      "integrity": "sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-freebsd-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.0.tgz",
+      "integrity": "sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.0.tgz",
+      "integrity": "sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.0.tgz",
+      "integrity": "sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.0.tgz",
+      "integrity": "sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.0.tgz",
+      "integrity": "sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-glibc": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.0.tgz",
+      "integrity": "sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-musl": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.0.tgz",
+      "integrity": "sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
         "node": ">= 10.0.0"
       },
@@ -106,6 +322,78 @@
         "url": "https://opencollective.com/parcel"
       }
     },
+    "node_modules/@parcel/watcher-win32-arm64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.0.tgz",
+      "integrity": "sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-ia32": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.0.tgz",
+      "integrity": "sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-x64": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.0.tgz",
+      "integrity": "sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher/node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "license": "Apache-2.0",
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/@tootallnate/once": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-3.0.0.tgz",
@@ -797,16 +1085,6 @@
         "node": "^16 || ^18 || >= 20"
       }
     },
-    "node_modules/node-gyp-build": {
-      "version": "4.8.1",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.1.tgz",
-      "integrity": "sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==",
-      "bin": {
-        "node-gyp-build": "bin.js",
-        "node-gyp-build-optional": "optional.js",
-        "node-gyp-build-test": "build-test.js"
-      }
-    },
     "node_modules/node-pty": {
       "version": "1.1.0-beta22",
       "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta22.tgz",
diff --git a/remote/package.json b/remote/package.json
index 33afee907a6..b5ebb761e09 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "@microsoft/1ds-core-js": "^3.2.13",
     "@microsoft/1ds-post-js": "^3.2.13",
-    "@parcel/watcher": "2.1.0",
+    "@parcel/watcher": "2.5.0",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.0",
     "@vscode/proxy-agent": "^0.27.0",
@@ -43,9 +43,6 @@
     "node-gyp-build": "4.8.1",
     "kerberos@2.1.1": {
       "node-addon-api": "7.1.0"
-    },
-    "@parcel/watcher@2.1.0": {
-      "node-addon-api": "7.1.0"
     }
   }
 }
diff --git a/src/vs/platform/files/test/node/parcelWatcher.test.ts b/src/vs/platform/files/test/node/parcelWatcher.test.ts
index 7a9533e0d8a..558b81e19a9 100644
--- a/src/vs/platform/files/test/node/parcelWatcher.test.ts
+++ b/src/vs/platform/files/test/node/parcelWatcher.test.ts
@@ -745,7 +745,7 @@ suite.skip('File Watcher (parcel)', function () {
 		assert.strictEqual(instance.failed, true);
 	});
 
-	test('watch requests support suspend/resume (folder, does not exist in beginning, not reusing watcher)', async () => {
+	(isWindows /* Windows: times out for some reason */ ? test.skip : test)('watch requests support suspend/resume (folder, does not exist in beginning, not reusing watcher)', async () => {
 		await testWatchFolderDoesNotExist(false);
 	});
 
@@ -800,7 +800,7 @@ suite.skip('File Watcher (parcel)', function () {
 		await basicCrudTest(filePath);
 	}
 
-	test('watch requests support suspend/resume (folder, exist in beginning, not reusing watcher)', async () => {
+	(isWindows /* Windows: times out for some reason */ ? test.skip : test)('watch requests support suspend/resume (folder, exist in beginning, not reusing watcher)', async () => {
 		await testWatchFolderExists(false);
 	});
 

From ae176274ac92eb4c0bfb93343eca18e4ebb46ea7 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Wed, 11 Dec 2024 09:49:45 +0100
Subject: [PATCH 089/479] Increasing the default accessibility page size to 500
 (#235798)

increasing the default accessibility page size to 500
---
 src/vs/editor/common/config/editorOptions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index a1c42699069..3fca8a3fc7b 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -5553,7 +5553,7 @@ export const EditorOptions = {
 		}
 	)),
 	accessibilitySupport: register(new EditorAccessibilitySupport()),
-	accessibilityPageSize: register(new EditorIntOption(EditorOption.accessibilityPageSize, 'accessibilityPageSize', 10, 1, Constants.MAX_SAFE_SMALL_INTEGER,
+	accessibilityPageSize: register(new EditorIntOption(EditorOption.accessibilityPageSize, 'accessibilityPageSize', 500, 1, Constants.MAX_SAFE_SMALL_INTEGER,
 		{
 			description: nls.localize('accessibilityPageSize', "Controls the number of lines in the editor that can be read out by a screen reader at once. When we detect a screen reader we automatically set the default to be 500. Warning: this has a performance implication for numbers larger than the default."),
 			tags: ['accessibility']

From 4ccaaa8dfd5fff29c8e6b01926601a2558006443 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Wed, 11 Dec 2024 10:53:16 +0100
Subject: [PATCH 090/479] Add ~ escape hatch to simple file picker (#235802)

Fixes #122197
---
 .../services/dialogs/browser/simpleFileDialog.ts     | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
index 0fc6fad2c5a..11b428f7f8e 100644
--- a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
+++ b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
@@ -422,7 +422,7 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 			// onDidChangeValue can also be triggered by the auto complete, so if it looks like the auto complete, don't do anything
 			if (this.isValueChangeFromUser()) {
 				// If the user has just entered more bad path, don't change anything
-				if (!equalsIgnoreCase(value, this.constructFullUserPath()) && !this.isBadSubpath(value)) {
+				if (!equalsIgnoreCase(value, this.constructFullUserPath()) && (!this.isBadSubpath(value) || this.canTildaEscapeHatch(value))) {
 					this.filePickBox.validationMessage = undefined;
 					const filePickBoxUri = this.filePickBoxValue();
 					let updated: UpdateResult = UpdateResult.NotUpdated;
@@ -555,10 +555,16 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 		return dir;
 	}
 
+	private canTildaEscapeHatch(value: string): boolean {
+		return !!(value.endsWith('~') && this.isBadSubpath(value));
+	}
+
 	private tildaReplace(value: string): URI {
 		const home = this.trueHome;
 		if ((value.length > 0) && (value[0] === '~')) {
 			return resources.joinPath(home, value.substring(1));
+		} else if (this.canTildaEscapeHatch(value)) {
+			return home;
 		}
 		return this.remoteUriFrom(value);
 	}
@@ -574,7 +580,7 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 	}
 
 	private async tryUpdateItems(value: string, valueUri: URI): Promise<UpdateResult> {
-		if ((value.length > 0) && (value[0] === '~')) {
+		if ((value.length > 0) && ((value[0] === '~') || this.canTildaEscapeHatch(value))) {
 			const newDir = this.tildaReplace(value);
 			return await this.updateItems(newDir, true) ? UpdateResult.UpdatedWithTrailing : UpdateResult.Updated;
 		} else if (value === '\\') {
@@ -598,7 +604,7 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 					return await this.updateItems(valueUri) ? UpdateResult.UpdatedWithTrailing : UpdateResult.Updated;
 				} else if (this.endsWithSlash(value)) {
 					// The input box contains a path that doesn't exist on the system.
-					this.filePickBox.validationMessage = nls.localize('remoteFileDialog.badPath', 'The path does not exist.');
+					this.filePickBox.validationMessage = nls.localize('remoteFileDialog.badPath', 'The path does not exist. Use ~ to go to your home directory.');
 					// Save this bad path. It can take too long to a stat on every user entered character, but once a user enters a bad path they are likely
 					// to keep typing more bad path. We can compare against this bad path and see if the user entered path starts with it.
 					this.badPath = value;

From cc746fd86fe4887cfa38b1a4589bf56f3e46f557 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Wed, 11 Dec 2024 11:04:00 +0100
Subject: [PATCH 091/479] sticky scroll: Fixing folding icon placement issue
 (#235804)

fixing folding icon placement issue
---
 src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css     | 2 ++
 .../editor/contrib/stickyScroll/browser/stickyScrollWidget.ts   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css b/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css
index 276082256f6..ffe968fdb57 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css
@@ -37,6 +37,8 @@
 .monaco-editor .sticky-line-number .codicon-folding-collapsed {
 	float: right;
 	transition: var(--vscode-editorStickyScroll-foldingOpacityTransition);
+	display: flex;
+	align-items: center;
 }
 
 .monaco-editor .sticky-line-content {
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
index 8dff7940199..3d1d583cb28 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
@@ -333,7 +333,7 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 		}
 
 		this._editor.applyFontInfo(lineHTMLNode);
-		this._editor.applyFontInfo(innerLineNumberHTML);
+		this._editor.applyFontInfo(lineNumberHTMLNode);
 
 
 		lineNumberHTMLNode.style.lineHeight = `${this._lineHeight}px`;

From 74a879d760ff188575b2216ff634261f0f40ddd4 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Wed, 11 Dec 2024 11:13:01 +0100
Subject: [PATCH 092/479] Should ports status bar entry only show up when ports
 are or have been used (#235805)

Fixes #231402
---
 .../contrib/remote/browser/remoteExplorer.ts          | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts b/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
index ef741a340d3..480feea12ad 100644
--- a/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
+++ b/src/vs/workbench/contrib/remote/browser/remoteExplorer.ts
@@ -44,6 +44,7 @@ export class ForwardedPortsView extends Disposable implements IWorkbenchContribu
 	private readonly contextKeyListener = this._register(new MutableDisposable<IDisposable>());
 	private readonly activityBadge = this._register(new MutableDisposable<IDisposable>());
 	private entryAccessor: IStatusbarEntryAccessor | undefined;
+	private hasPortsInSession: boolean = false;
 
 	constructor(
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
@@ -60,6 +61,11 @@ export class ForwardedPortsView extends Disposable implements IWorkbenchContribu
 		}));
 		this.enableBadgeAndStatusBar();
 		this.enableForwardedPortsFeatures();
+		if (!this.environmentService.remoteAuthority) {
+			this._register(Event.once(this.tunnelService.onTunnelOpened)(() => {
+				this.hasPortsInSession = true;
+			}));
+		}
 	}
 
 	private async getViewContainer(): Promise<ViewContainer | null> {
@@ -131,6 +137,11 @@ export class ForwardedPortsView extends Disposable implements IWorkbenchContribu
 	}
 
 	private updateStatusBar() {
+		if (!this.environmentService.remoteAuthority && !this.hasPortsInSession) {
+			// We only want to show the ports status bar entry when the user has taken an action that indicates that they might care about it.
+			return;
+		}
+
 		if (!this.entryAccessor) {
 			this._register(this.entryAccessor = this.statusbarService.addEntry(this.entry, 'status.forwardedPorts', StatusbarAlignment.LEFT, 40));
 		} else {

From a97e00ea3b47c1062048baba4deb26d4fcc17600 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Wed, 11 Dec 2024 11:16:38 +0100
Subject: [PATCH 093/479] Adding action to hide the hover (#235806)

adding action to hide the hover
---
 .../contrib/hover/browser/hoverActionIds.ts   |  1 +
 .../contrib/hover/browser/hoverActions.ts     | 21 ++++++++++++++++++-
 .../hover/browser/hoverContribution.ts        |  3 ++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/vs/editor/contrib/hover/browser/hoverActionIds.ts b/src/vs/editor/contrib/hover/browser/hoverActionIds.ts
index 95cd48dda49..75b3930c791 100644
--- a/src/vs/editor/contrib/hover/browser/hoverActionIds.ts
+++ b/src/vs/editor/contrib/hover/browser/hoverActionIds.ts
@@ -6,6 +6,7 @@ import * as nls from '../../../../nls.js';
 
 export const SHOW_OR_FOCUS_HOVER_ACTION_ID = 'editor.action.showHover';
 export const SHOW_DEFINITION_PREVIEW_HOVER_ACTION_ID = 'editor.action.showDefinitionPreviewHover';
+export const HIDE_HOVER_ACTION_ID = 'editor.action.hideHover';
 export const SCROLL_UP_HOVER_ACTION_ID = 'editor.action.scrollUpHover';
 export const SCROLL_DOWN_HOVER_ACTION_ID = 'editor.action.scrollDownHover';
 export const SCROLL_LEFT_HOVER_ACTION_ID = 'editor.action.scrollLeftHover';
diff --git a/src/vs/editor/contrib/hover/browser/hoverActions.ts b/src/vs/editor/contrib/hover/browser/hoverActions.ts
index 8368eae643f..a2f16bc0c4c 100644
--- a/src/vs/editor/contrib/hover/browser/hoverActions.ts
+++ b/src/vs/editor/contrib/hover/browser/hoverActions.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DECREASE_HOVER_VERBOSITY_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACTION_LABEL, GO_TO_BOTTOM_HOVER_ACTION_ID, GO_TO_TOP_HOVER_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_LABEL, PAGE_DOWN_HOVER_ACTION_ID, PAGE_UP_HOVER_ACTION_ID, SCROLL_DOWN_HOVER_ACTION_ID, SCROLL_LEFT_HOVER_ACTION_ID, SCROLL_RIGHT_HOVER_ACTION_ID, SCROLL_UP_HOVER_ACTION_ID, SHOW_DEFINITION_PREVIEW_HOVER_ACTION_ID, SHOW_OR_FOCUS_HOVER_ACTION_ID } from './hoverActionIds.js';
+import { DECREASE_HOVER_VERBOSITY_ACTION_ID, DECREASE_HOVER_VERBOSITY_ACTION_LABEL, GO_TO_BOTTOM_HOVER_ACTION_ID, GO_TO_TOP_HOVER_ACTION_ID, HIDE_HOVER_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_LABEL, PAGE_DOWN_HOVER_ACTION_ID, PAGE_UP_HOVER_ACTION_ID, SCROLL_DOWN_HOVER_ACTION_ID, SCROLL_LEFT_HOVER_ACTION_ID, SCROLL_RIGHT_HOVER_ACTION_ID, SCROLL_UP_HOVER_ACTION_ID, SHOW_DEFINITION_PREVIEW_HOVER_ACTION_ID, SHOW_OR_FOCUS_HOVER_ACTION_ID } from './hoverActionIds.js';
 import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import { ICodeEditor } from '../../../browser/editorBrowser.js';
 import { EditorAction, ServicesAccessor } from '../../../browser/editorExtensions.js';
@@ -149,6 +149,25 @@ export class ShowDefinitionPreviewHoverAction extends EditorAction {
 	}
 }
 
+export class HideContentHoverAction extends EditorAction {
+
+	constructor() {
+		super({
+			id: HIDE_HOVER_ACTION_ID,
+			label: nls.localize2({
+				key: 'hideHover',
+				comment: ['Label for action that will hide the hover in the editor.']
+			}, "Hide Hover"),
+			alias: 'Hide Content Hover',
+			precondition: undefined
+		});
+	}
+
+	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+		ContentHoverController.get(editor)?.hideContentHover();
+	}
+}
+
 export class ScrollUpHoverAction extends EditorAction {
 
 	constructor() {
diff --git a/src/vs/editor/contrib/hover/browser/hoverContribution.ts b/src/vs/editor/contrib/hover/browser/hoverContribution.ts
index 0143aa6ac24..9e4168a1be0 100644
--- a/src/vs/editor/contrib/hover/browser/hoverContribution.ts
+++ b/src/vs/editor/contrib/hover/browser/hoverContribution.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DecreaseHoverVerbosityLevel, GoToBottomHoverAction, GoToTopHoverAction, IncreaseHoverVerbosityLevel, PageDownHoverAction, PageUpHoverAction, ScrollDownHoverAction, ScrollLeftHoverAction, ScrollRightHoverAction, ScrollUpHoverAction, ShowDefinitionPreviewHoverAction, ShowOrFocusHoverAction } from './hoverActions.js';
+import { DecreaseHoverVerbosityLevel, GoToBottomHoverAction, GoToTopHoverAction, HideContentHoverAction, IncreaseHoverVerbosityLevel, PageDownHoverAction, PageUpHoverAction, ScrollDownHoverAction, ScrollLeftHoverAction, ScrollRightHoverAction, ScrollUpHoverAction, ShowDefinitionPreviewHoverAction, ShowOrFocusHoverAction } from './hoverActions.js';
 import { EditorContributionInstantiation, registerEditorAction, registerEditorContribution } from '../../../browser/editorExtensions.js';
 import { editorHoverBorder } from '../../../../platform/theme/common/colorRegistry.js';
 import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
@@ -20,6 +20,7 @@ registerEditorContribution(ContentHoverController.ID, ContentHoverController, Ed
 registerEditorContribution(GlyphHoverController.ID, GlyphHoverController, EditorContributionInstantiation.BeforeFirstInteraction);
 registerEditorAction(ShowOrFocusHoverAction);
 registerEditorAction(ShowDefinitionPreviewHoverAction);
+registerEditorAction(HideContentHoverAction);
 registerEditorAction(ScrollUpHoverAction);
 registerEditorAction(ScrollDownHoverAction);
 registerEditorAction(ScrollLeftHoverAction);

From 1b4662bc51d7ec7e89a6e1a228e5ac140e253c20 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Wed, 11 Dec 2024 11:22:47 +0100
Subject: [PATCH 094/479] a11y view is blank after running `focus comment on
 line` (#235807)

Fixes #229857
---
 .../contrib/comments/browser/commentThreadZoneWidget.ts         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts b/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
index 6790337c79a..eb2a0396eee 100644
--- a/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
@@ -188,7 +188,7 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 
 	public reveal(commentUniqueId?: number, focus: CommentWidgetFocus = CommentWidgetFocus.None) {
 		this.makeVisible(commentUniqueId, focus);
-		const comment = this._commentThread.comments?.find(comment => comment.uniqueIdInThread === commentUniqueId);
+		const comment = this._commentThread.comments?.find(comment => comment.uniqueIdInThread === commentUniqueId) ?? this._commentThread.comments?.[0];
 		this.commentService.setActiveCommentAndThread(this.uniqueOwner, { thread: this._commentThread, comment });
 	}
 

From a40e594f25e47cf52621ae0914376636372d69f0 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 11 Dec 2024 11:26:59 +0100
Subject: [PATCH 095/479] Check for cyclic dependencies during compile
 (#235808)

* Check for cyclic dependencies during compile

Changes gulp-tsb to check the emitted JS code for cyclic dependencies. Historically we never cared about cycles between TS files as long as they dissappeared after compile (e.g type-dependencies, not runtime dependencies)

https://github.com/microsoft/vscode-internalbacklog/issues/5271

* fix cycling dependencies

fyi @aeschli @aiday-mar

* remove cyclic dependency with unused `BasedTextEdit` fyi @hediet

* remove cycle between chatEditService and chatEditingSession

fyi @alexdima

* remove cyclic dependency between chatSetup and chatViewPane

fyi @roblourens

* better cycle detection

* don't check cycles when not needed

* clear graph when reprocessing file dependencies

* remove cycle between with `notebookChatEditController` fyi @DonJayamanne

* modernize and cleanup tsb/utils
---
 build/lib/tsb/builder.js                      |  64 ++++++-
 build/lib/tsb/builder.ts                      |  78 +++++++-
 build/lib/tsb/utils.js                        | 155 +++++++---------
 build/lib/tsb/utils.ts                        | 171 ++++++++----------
 src/vs/editor/common/core/textEdit.ts         |  14 --
 .../hoverColorPicker/hoverColorPicker.ts      |  15 ++
 .../hoverColorPickerContribution.ts           |  11 +-
 .../hover/browser/contentHoverController.ts   |   2 +-
 .../browser/actions/chatCodeblockActions.ts   |  37 +++-
 .../browser/chatEditing/chatEditingService.ts |  10 +-
 .../browser/chatEditing/chatEditingSession.ts |   5 +-
 .../contrib/chat/browser/chatEditorActions.ts |   2 +-
 .../contrib/chat/browser/chatSetup.ts         |  21 +--
 .../contrib/chat/browser/chatViewPane.ts      |  23 ++-
 .../contrib/chat/browser/codeBlockPart.ts     |  36 +---
 .../contrib/chat/common/chatEditingService.ts |   7 +
 .../chatEdit/notebookChatEditContext.ts       |   9 +
 .../chatEdit/notebookChatEditController.ts    |   6 +-
 18 files changed, 358 insertions(+), 308 deletions(-)
 create mode 100644 src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPicker.ts
 create mode 100644 src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditContext.ts

diff --git a/build/lib/tsb/builder.js b/build/lib/tsb/builder.js
index cee2758e896..e7a2519d1c9 100644
--- a/build/lib/tsb/builder.js
+++ b/build/lib/tsb/builder.js
@@ -26,6 +26,8 @@ function normalize(path) {
 function createTypeScriptBuilder(config, projectFile, cmd) {
     const _log = config.logFn;
     const host = new LanguageServiceHost(cmd, projectFile, _log);
+    const outHost = new LanguageServiceHost({ ...cmd, options: { ...cmd.options, sourceRoot: cmd.options.outDir } }, cmd.options.outDir ?? '', _log);
+    let lastCycleCheckVersion;
     const service = ts.createLanguageService(host, ts.createDocumentRegistry());
     const lastBuildVersion = Object.create(null);
     const lastDtsHash = Object.create(null);
@@ -251,6 +253,11 @@ function createTypeScriptBuilder(config, projectFile, cmd) {
                             lastDtsHash[fileName] = value.signature;
                             filesWithChangedSignature.push(fileName);
                         }
+                        // line up for cycle check
+                        const jsValue = value.files.find(candidate => candidate.basename.endsWith('.js'));
+                        if (jsValue) {
+                            outHost.addScriptSnapshot(jsValue.path, new ScriptSnapshot(String(jsValue.contents), new Date()));
+                        }
                     }).catch(e => {
                         // can't just skip this or make a result up..
                         host.error(`ERROR emitting ${fileName}`);
@@ -341,16 +348,37 @@ function createTypeScriptBuilder(config, projectFile, cmd) {
                 });
             }
             workOnNext();
+        }).then(() => {
+            // check for cyclic dependencies
+            const thisCycleCheckVersion = outHost.getProjectVersion();
+            if (thisCycleCheckVersion === lastCycleCheckVersion) {
+                return;
+            }
+            const oneCycle = outHost.hasCyclicDependency();
+            lastCycleCheckVersion = thisCycleCheckVersion;
+            delete oldErrors[projectFile];
+            if (oneCycle) {
+                const cycleError = {
+                    category: ts.DiagnosticCategory.Error,
+                    code: 1,
+                    file: undefined,
+                    start: undefined,
+                    length: undefined,
+                    messageText: `CYCLIC dependency between ${oneCycle}`
+                };
+                onError(cycleError);
+                newErrors[projectFile] = [cycleError];
+            }
         }).then(() => {
             // store the build versions to not rebuilt the next time
             newLastBuildVersion.forEach((value, key) => {
                 lastBuildVersion[key] = value;
             });
             // print old errors and keep them
-            utils.collections.forEach(oldErrors, entry => {
-                entry.value.forEach(diag => onError(diag));
-                newErrors[entry.key] = entry.value;
-            });
+            for (const [key, value] of Object.entries(oldErrors)) {
+                value.forEach(diag => onError(diag));
+                newErrors[key] = value;
+            }
             oldErrors = newErrors;
             // print stats
             const headNow = process.memoryUsage().heapUsed;
@@ -415,7 +443,7 @@ class LanguageServiceHost {
         this._snapshots = Object.create(null);
         this._filesInProject = new Set(_cmdLine.fileNames);
         this._filesAdded = new Set();
-        this._dependencies = new utils.graph.Graph(s => s);
+        this._dependencies = new utils.graph.Graph();
         this._dependenciesRecomputeList = [];
         this._fileNameToDeclaredModule = Object.create(null);
         this._projectVersion = 1;
@@ -478,10 +506,6 @@ class LanguageServiceHost {
         }
         if (!old || old.getVersion() !== snapshot.getVersion()) {
             this._dependenciesRecomputeList.push(filename);
-            const node = this._dependencies.lookup(filename);
-            if (node) {
-                node.outgoing = Object.create(null);
-            }
             // (cheap) check for declare module
             LanguageServiceHost._declareModule.lastIndex = 0;
             let match;
@@ -523,9 +547,19 @@ class LanguageServiceHost {
         filename = normalize(filename);
         const node = this._dependencies.lookup(filename);
         if (node) {
-            utils.collections.forEach(node.incoming, entry => target.push(entry.key));
+            node.incoming.forEach(entry => target.push(entry.data));
         }
     }
+    hasCyclicDependency() {
+        // Ensure dependencies are up to date
+        while (this._dependenciesRecomputeList.length) {
+            this._processFile(this._dependenciesRecomputeList.pop());
+        }
+        const cycle = this._dependencies.findCycle();
+        return cycle
+            ? cycle.join(' -> ')
+            : undefined;
+    }
     _processFile(filename) {
         if (filename.match(/.*\.d\.ts$/)) {
             return;
@@ -537,6 +571,8 @@ class LanguageServiceHost {
             return;
         }
         const info = ts.preProcessFile(snapshot.getText(0, snapshot.getLength()), true);
+        // (0) clear out old dependencies
+        this._dependencies.resetNode(filename);
         // (1) ///-references
         info.referencedFiles.forEach(ref => {
             const resolvedPath = path.resolve(path.dirname(filename), ref.fileName);
@@ -545,6 +581,10 @@ class LanguageServiceHost {
         });
         // (2) import-require statements
         info.importedFiles.forEach(ref => {
+            if (!ref.fileName.startsWith('.') || path.extname(ref.fileName) === '') {
+                // node module?
+                return;
+            }
             const stopDirname = normalize(this.getCurrentDirectory());
             let dirname = filename;
             let found = false;
@@ -563,6 +603,10 @@ class LanguageServiceHost {
                     this._dependencies.inertEdge(filename, normalizedPath + '.d.ts');
                     found = true;
                 }
+                else if (this.getScriptSnapshot(normalizedPath + '.js')) {
+                    this._dependencies.inertEdge(filename, normalizedPath + '.js');
+                    found = true;
+                }
             }
             if (!found) {
                 for (const key in this._fileNameToDeclaredModule) {
diff --git a/build/lib/tsb/builder.ts b/build/lib/tsb/builder.ts
index 70c71591a6e..509284d0cdc 100644
--- a/build/lib/tsb/builder.ts
+++ b/build/lib/tsb/builder.ts
@@ -42,6 +42,10 @@ export function createTypeScriptBuilder(config: IConfiguration, projectFile: str
 	const _log = config.logFn;
 
 	const host = new LanguageServiceHost(cmd, projectFile, _log);
+
+	const outHost = new LanguageServiceHost({ ...cmd, options: { ...cmd.options, sourceRoot: cmd.options.outDir } }, cmd.options.outDir ?? '', _log);
+	let lastCycleCheckVersion: string;
+
 	const service = ts.createLanguageService(host, ts.createDocumentRegistry());
 	const lastBuildVersion: { [path: string]: string } = Object.create(null);
 	const lastDtsHash: { [path: string]: string } = Object.create(null);
@@ -305,6 +309,13 @@ export function createTypeScriptBuilder(config: IConfiguration, projectFile: str
 							lastDtsHash[fileName] = value.signature;
 							filesWithChangedSignature.push(fileName);
 						}
+
+						// line up for cycle check
+						const jsValue = value.files.find(candidate => candidate.basename.endsWith('.js'));
+						if (jsValue) {
+							outHost.addScriptSnapshot(jsValue.path, new ScriptSnapshot(String(jsValue.contents), new Date()));
+						}
+
 					}).catch(e => {
 						// can't just skip this or make a result up..
 						host.error(`ERROR emitting ${fileName}`);
@@ -389,6 +400,7 @@ export function createTypeScriptBuilder(config: IConfiguration, projectFile: str
 					}
 				}
 
+
 				// (last) done
 				else {
 					resolve();
@@ -410,16 +422,40 @@ export function createTypeScriptBuilder(config: IConfiguration, projectFile: str
 			workOnNext();
 
 		}).then(() => {
+			// check for cyclic dependencies
+			const thisCycleCheckVersion = outHost.getProjectVersion();
+			if (thisCycleCheckVersion === lastCycleCheckVersion) {
+				return;
+			}
+			const oneCycle = outHost.hasCyclicDependency();
+			lastCycleCheckVersion = thisCycleCheckVersion;
+			delete oldErrors[projectFile];
+
+			if (oneCycle) {
+				const cycleError: ts.Diagnostic = {
+					category: ts.DiagnosticCategory.Error,
+					code: 1,
+					file: undefined,
+					start: undefined,
+					length: undefined,
+					messageText: `CYCLIC dependency between ${oneCycle}`
+				};
+				onError(cycleError);
+				newErrors[projectFile] = [cycleError];
+			}
+
+		}).then(() => {
+
 			// store the build versions to not rebuilt the next time
 			newLastBuildVersion.forEach((value, key) => {
 				lastBuildVersion[key] = value;
 			});
 
 			// print old errors and keep them
-			utils.collections.forEach(oldErrors, entry => {
-				entry.value.forEach(diag => onError(diag));
-				newErrors[entry.key] = entry.value;
-			});
+			for (const [key, value] of Object.entries(oldErrors)) {
+				value.forEach(diag => onError(diag));
+				newErrors[key] = value;
+			}
 			oldErrors = newErrors;
 
 			// print stats
@@ -503,7 +539,7 @@ class LanguageServiceHost implements ts.LanguageServiceHost {
 		this._snapshots = Object.create(null);
 		this._filesInProject = new Set(_cmdLine.fileNames);
 		this._filesAdded = new Set();
-		this._dependencies = new utils.graph.Graph<string>(s => s);
+		this._dependencies = new utils.graph.Graph<string>();
 		this._dependenciesRecomputeList = [];
 		this._fileNameToDeclaredModule = Object.create(null);
 
@@ -576,10 +612,6 @@ class LanguageServiceHost implements ts.LanguageServiceHost {
 		}
 		if (!old || old.getVersion() !== snapshot.getVersion()) {
 			this._dependenciesRecomputeList.push(filename);
-			const node = this._dependencies.lookup(filename);
-			if (node) {
-				node.outgoing = Object.create(null);
-			}
 
 			// (cheap) check for declare module
 			LanguageServiceHost._declareModule.lastIndex = 0;
@@ -628,10 +660,21 @@ class LanguageServiceHost implements ts.LanguageServiceHost {
 		filename = normalize(filename);
 		const node = this._dependencies.lookup(filename);
 		if (node) {
-			utils.collections.forEach(node.incoming, entry => target.push(entry.key));
+			node.incoming.forEach(entry => target.push(entry.data));
 		}
 	}
 
+	hasCyclicDependency(): string | undefined {
+		// Ensure dependencies are up to date
+		while (this._dependenciesRecomputeList.length) {
+			this._processFile(this._dependenciesRecomputeList.pop()!);
+		}
+		const cycle = this._dependencies.findCycle();
+		return cycle
+			? cycle.join(' -> ')
+			: undefined;
+	}
+
 	_processFile(filename: string): void {
 		if (filename.match(/.*\.d\.ts$/)) {
 			return;
@@ -644,6 +687,9 @@ class LanguageServiceHost implements ts.LanguageServiceHost {
 		}
 		const info = ts.preProcessFile(snapshot.getText(0, snapshot.getLength()), true);
 
+		// (0) clear out old dependencies
+		this._dependencies.resetNode(filename);
+
 		// (1) ///-references
 		info.referencedFiles.forEach(ref => {
 			const resolvedPath = path.resolve(path.dirname(filename), ref.fileName);
@@ -654,10 +700,18 @@ class LanguageServiceHost implements ts.LanguageServiceHost {
 
 		// (2) import-require statements
 		info.importedFiles.forEach(ref => {
+
+			if (!ref.fileName.startsWith('.') || path.extname(ref.fileName) === '') {
+				// node module?
+				return;
+			}
+
+
 			const stopDirname = normalize(this.getCurrentDirectory());
 			let dirname = filename;
 			let found = false;
 
+
 			while (!found && dirname.indexOf(stopDirname) === 0) {
 				dirname = path.dirname(dirname);
 				let resolvedPath = path.resolve(dirname, ref.fileName);
@@ -673,6 +727,10 @@ class LanguageServiceHost implements ts.LanguageServiceHost {
 				} else if (this.getScriptSnapshot(normalizedPath + '.d.ts')) {
 					this._dependencies.inertEdge(filename, normalizedPath + '.d.ts');
 					found = true;
+
+				} else if (this.getScriptSnapshot(normalizedPath + '.js')) {
+					this._dependencies.inertEdge(filename, normalizedPath + '.js');
+					found = true;
 				}
 			}
 
diff --git a/build/lib/tsb/utils.js b/build/lib/tsb/utils.js
index 6ea66221b1b..29cccf0f833 100644
--- a/build/lib/tsb/utils.js
+++ b/build/lib/tsb/utils.js
@@ -4,54 +4,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.graph = exports.strings = exports.collections = void 0;
-var collections;
-(function (collections) {
-    const hasOwnProperty = Object.prototype.hasOwnProperty;
-    function lookup(collection, key) {
-        if (hasOwnProperty.call(collection, key)) {
-            return collection[key];
-        }
-        return null;
-    }
-    collections.lookup = lookup;
-    function insert(collection, key, value) {
-        collection[key] = value;
-    }
-    collections.insert = insert;
-    function lookupOrInsert(collection, key, value) {
-        if (hasOwnProperty.call(collection, key)) {
-            return collection[key];
-        }
-        else {
-            collection[key] = value;
-            return value;
-        }
-    }
-    collections.lookupOrInsert = lookupOrInsert;
-    function forEach(collection, callback) {
-        for (const key in collection) {
-            if (hasOwnProperty.call(collection, key)) {
-                callback({
-                    key: key,
-                    value: collection[key]
-                });
-            }
-        }
-    }
-    collections.forEach = forEach;
-    function contains(collection, key) {
-        return hasOwnProperty.call(collection, key);
-    }
-    collections.contains = contains;
-})(collections || (exports.collections = collections = {}));
+exports.graph = exports.strings = void 0;
 var strings;
 (function (strings) {
-    /**
-     * The empty string. The one and only.
-     */
-    strings.empty = '';
-    strings.eolUnix = '\r\n';
     function format(value, ...rest) {
         return value.replace(/({\d+})/g, function (match) {
             const index = Number(match.substring(1, match.length - 1));
@@ -62,63 +17,83 @@ var strings;
 })(strings || (exports.strings = strings = {}));
 var graph;
 (function (graph) {
-    function newNode(data) {
-        return {
-            data: data,
-            incoming: {},
-            outgoing: {}
-        };
+    class Node {
+        data;
+        incoming = new Map();
+        outgoing = new Map();
+        constructor(data) {
+            this.data = data;
+        }
     }
-    graph.newNode = newNode;
+    graph.Node = Node;
     class Graph {
-        _hashFn;
-        _nodes = {};
-        constructor(_hashFn) {
-            this._hashFn = _hashFn;
-            // empty
-        }
-        traverse(start, inwards, callback) {
-            const startNode = this.lookup(start);
-            if (!startNode) {
-                return;
-            }
-            this._traverse(startNode, inwards, {}, callback);
-        }
-        _traverse(node, inwards, seen, callback) {
-            const key = this._hashFn(node.data);
-            if (collections.contains(seen, key)) {
-                return;
-            }
-            seen[key] = true;
-            callback(node.data);
-            const nodes = inwards ? node.outgoing : node.incoming;
-            collections.forEach(nodes, (entry) => this._traverse(entry.value, inwards, seen, callback));
-        }
+        _nodes = new Map();
         inertEdge(from, to) {
             const fromNode = this.lookupOrInsertNode(from);
             const toNode = this.lookupOrInsertNode(to);
-            fromNode.outgoing[this._hashFn(to)] = toNode;
-            toNode.incoming[this._hashFn(from)] = fromNode;
+            fromNode.outgoing.set(toNode.data, toNode);
+            toNode.incoming.set(fromNode.data, fromNode);
         }
-        removeNode(data) {
-            const key = this._hashFn(data);
-            delete this._nodes[key];
-            collections.forEach(this._nodes, (entry) => {
-                delete entry.value.outgoing[key];
-                delete entry.value.incoming[key];
-            });
+        resetNode(data) {
+            const node = this._nodes.get(data);
+            if (!node) {
+                return;
+            }
+            for (const outDep of node.outgoing.values()) {
+                outDep.incoming.delete(node.data);
+            }
+            node.outgoing.clear();
         }
         lookupOrInsertNode(data) {
-            const key = this._hashFn(data);
-            let node = collections.lookup(this._nodes, key);
+            let node = this._nodes.get(data);
             if (!node) {
-                node = newNode(data);
-                this._nodes[key] = node;
+                node = new Node(data);
+                this._nodes.set(data, node);
             }
             return node;
         }
         lookup(data) {
-            return collections.lookup(this._nodes, this._hashFn(data));
+            return this._nodes.get(data) ?? null;
+        }
+        findCycle() {
+            let result;
+            let foundStartNodes = false;
+            const checked = new Set();
+            for (const [_start, value] of this._nodes) {
+                if (Object.values(value.incoming).length > 0) {
+                    continue;
+                }
+                foundStartNodes = true;
+                const dfs = (node, visited) => {
+                    if (checked.has(node)) {
+                        return;
+                    }
+                    if (visited.has(node)) {
+                        result = [...visited, node].map(n => n.data);
+                        const idx = result.indexOf(node.data);
+                        result = result.slice(idx);
+                        return;
+                    }
+                    visited.add(node);
+                    for (const child of Object.values(node.outgoing)) {
+                        dfs(child, visited);
+                        if (result) {
+                            break;
+                        }
+                    }
+                    visited.delete(node);
+                    checked.add(node);
+                };
+                dfs(value, new Set());
+                if (result) {
+                    break;
+                }
+            }
+            if (!foundStartNodes) {
+                // everything is a cycle
+                return Array.from(this._nodes.keys());
+            }
+            return result;
         }
     }
     graph.Graph = Graph;
diff --git a/build/lib/tsb/utils.ts b/build/lib/tsb/utils.ts
index 3b003e3a6e1..59d1cab36d3 100644
--- a/build/lib/tsb/utils.ts
+++ b/build/lib/tsb/utils.ts
@@ -3,54 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-export module collections {
-
-    const hasOwnProperty = Object.prototype.hasOwnProperty;
-
-    export function lookup<T>(collection: { [keys: string]: T }, key: string): T | null {
-        if (hasOwnProperty.call(collection, key)) {
-            return collection[key];
-        }
-        return null;
-    }
-
-    export function insert<T>(collection: { [keys: string]: T }, key: string, value: T): void {
-        collection[key] = value;
-    }
-
-    export function lookupOrInsert<T>(collection: { [keys: string]: T }, key: string, value: T): T {
-        if (hasOwnProperty.call(collection, key)) {
-            return collection[key];
-        } else {
-            collection[key] = value;
-            return value;
-        }
-    }
-
-    export function forEach<T>(collection: { [keys: string]: T }, callback: (entry: { key: string; value: T }) => void): void {
-        for (const key in collection) {
-            if (hasOwnProperty.call(collection, key)) {
-                callback({
-                    key: key,
-                    value: collection[key]
-                });
-            }
-        }
-    }
-
-    export function contains(collection: { [keys: string]: any }, key: string): boolean {
-        return hasOwnProperty.call(collection, key);
-    }
-}
-
-export module strings {
-
-    /**
-     * The empty string. The one and only.
-     */
-    export const empty = '';
-
-    export const eolUnix = '\r\n';
+export namespace strings {
 
     export function format(value: string, ...rest: any[]): string {
         return value.replace(/({\d+})/g, function (match) {
@@ -60,80 +13,104 @@ export module strings {
     }
 }
 
-export module graph {
+export namespace graph {
 
-    export interface Node<T> {
-        data: T;
-        incoming: { [key: string]: Node<T> };
-        outgoing: { [key: string]: Node<T> };
-    }
+    export class Node<T> {
 
-    export function newNode<T>(data: T): Node<T> {
-        return {
-            data: data,
-            incoming: {},
-            outgoing: {}
-        };
-    }
+        readonly incoming = new Map<T, Node<T>>();
+        readonly outgoing = new Map<T, Node<T>>();
 
-    export class Graph<T> {
-
-        private _nodes: { [key: string]: Node<T> } = {};
+        constructor(readonly data: T) {
 
-        constructor(private _hashFn: (element: T) => string) {
-            // empty
         }
+    }
 
-        traverse(start: T, inwards: boolean, callback: (data: T) => void): void {
-            const startNode = this.lookup(start);
-            if (!startNode) {
-                return;
-            }
-            this._traverse(startNode, inwards, {}, callback);
-        }
+    export class Graph<T> {
 
-        private _traverse(node: Node<T>, inwards: boolean, seen: { [key: string]: boolean }, callback: (data: T) => void): void {
-            const key = this._hashFn(node.data);
-            if (collections.contains(seen, key)) {
-                return;
-            }
-            seen[key] = true;
-            callback(node.data);
-            const nodes = inwards ? node.outgoing : node.incoming;
-            collections.forEach(nodes, (entry) => this._traverse(entry.value, inwards, seen, callback));
-        }
+        private _nodes = new Map<T, Node<T>>();
 
         inertEdge(from: T, to: T): void {
             const fromNode = this.lookupOrInsertNode(from);
             const toNode = this.lookupOrInsertNode(to);
 
-            fromNode.outgoing[this._hashFn(to)] = toNode;
-            toNode.incoming[this._hashFn(from)] = fromNode;
+            fromNode.outgoing.set(toNode.data, toNode);
+            toNode.incoming.set(fromNode.data, fromNode);
         }
 
-        removeNode(data: T): void {
-            const key = this._hashFn(data);
-            delete this._nodes[key];
-            collections.forEach(this._nodes, (entry) => {
-                delete entry.value.outgoing[key];
-                delete entry.value.incoming[key];
-            });
+        resetNode(data: T): void {
+            const node = this._nodes.get(data);
+            if (!node) {
+                return;
+            }
+            for (const outDep of node.outgoing.values()) {
+                outDep.incoming.delete(node.data);
+            }
+            node.outgoing.clear();
         }
 
         lookupOrInsertNode(data: T): Node<T> {
-            const key = this._hashFn(data);
-            let node = collections.lookup(this._nodes, key);
+            let node = this._nodes.get(data);
 
             if (!node) {
-                node = newNode(data);
-                this._nodes[key] = node;
+                node = new Node(data);
+                this._nodes.set(data, node);
             }
 
             return node;
         }
 
         lookup(data: T): Node<T> | null {
-            return collections.lookup(this._nodes, this._hashFn(data));
+            return this._nodes.get(data) ?? null;
+        }
+
+        findCycle(): T[] | undefined {
+
+            let result: T[] | undefined;
+            let foundStartNodes = false;
+            const checked = new Set<Node<T>>();
+
+            for (const [_start, value] of this._nodes) {
+
+                if (Object.values(value.incoming).length > 0) {
+                    continue;
+                }
+
+                foundStartNodes = true;
+
+                const dfs = (node: Node<T>, visited: Set<Node<T>>) => {
+
+                    if (checked.has(node)) {
+                        return;
+                    }
+
+                    if (visited.has(node)) {
+                        result = [...visited, node].map(n => n.data);
+                        const idx = result.indexOf(node.data);
+                        result = result.slice(idx);
+                        return;
+                    }
+                    visited.add(node);
+                    for (const child of Object.values(node.outgoing)) {
+                        dfs(child, visited);
+                        if (result) {
+                            break;
+                        }
+                    }
+                    visited.delete(node);
+                    checked.add(node);
+                };
+                dfs(value, new Set());
+                if (result) {
+                    break;
+                }
+            }
+
+            if (!foundStartNodes) {
+                // everything is a cycle
+                return Array.from(this._nodes.keys());
+            }
+
+            return result;
         }
     }
 
diff --git a/src/vs/editor/common/core/textEdit.ts b/src/vs/editor/common/core/textEdit.ts
index 9307784837f..83baa3bff43 100644
--- a/src/vs/editor/common/core/textEdit.ts
+++ b/src/vs/editor/common/core/textEdit.ts
@@ -8,7 +8,6 @@ import { assert, assertFn, checkAdjacentItems } from '../../../base/common/asser
 import { BugIndicatingError } from '../../../base/common/errors.js';
 import { commonPrefixLength, commonSuffixLength, splitLines } from '../../../base/common/strings.js';
 import { ISingleEditOperation } from './editOperation.js';
-import { LineEdit } from './lineEdit.js';
 import { LineRange } from './lineRange.js';
 import { OffsetEdit } from './offsetEdit.js';
 import { Position } from './position.js';
@@ -399,16 +398,3 @@ export class StringText extends AbstractText {
 		return this._t.textLength;
 	}
 }
-
-export class BasedTextEdit {
-	constructor(
-		public readonly base: AbstractText,
-		public readonly edit: TextEdit,
-	) {
-	}
-
-	toString() {
-		const lineEdit = LineEdit.fromTextEdit(this.edit, this.base);
-		return lineEdit.humanReadablePatch(this.base.getLines());
-	}
-}
diff --git a/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPicker.ts b/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPicker.ts
new file mode 100644
index 00000000000..031e481cf24
--- /dev/null
+++ b/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPicker.ts
@@ -0,0 +1,15 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IPartialEditorMouseEvent, MouseTargetType } from '../../../../browser/editorBrowser.js';
+import { ColorDecorationInjectedTextMarker } from '../colorDetector.js';
+
+
+export function isOnColorDecorator(mouseEvent: IPartialEditorMouseEvent): boolean {
+	const target = mouseEvent.target;
+	return !!target
+		&& target.type === MouseTargetType.CONTENT_TEXT
+		&& target.detail.injectedText?.options.attachedData === ColorDecorationInjectedTextMarker;
+}
diff --git a/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerContribution.ts b/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerContribution.ts
index 63ed7dc7259..bef71cbf912 100644
--- a/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerContribution.ts
+++ b/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerContribution.ts
@@ -4,13 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Disposable } from '../../../../../base/common/lifecycle.js';
-import { ICodeEditor, IEditorMouseEvent, IPartialEditorMouseEvent, MouseTargetType } from '../../../../browser/editorBrowser.js';
+import { ICodeEditor, IEditorMouseEvent } from '../../../../browser/editorBrowser.js';
 import { EditorOption } from '../../../../common/config/editorOptions.js';
 import { Range } from '../../../../common/core/range.js';
 import { IEditorContribution } from '../../../../common/editorCommon.js';
-import { ColorDecorationInjectedTextMarker } from '../colorDetector.js';
 import { ContentHoverController } from '../../../hover/browser/contentHoverController.js';
 import { HoverStartMode, HoverStartSource } from '../../../hover/browser/hoverOperation.js';
+import { isOnColorDecorator } from './hoverColorPicker.js';
 
 export class HoverColorPickerContribution extends Disposable implements IEditorContribution {
 
@@ -52,10 +52,3 @@ export class HoverColorPickerContribution extends Disposable implements IEditorC
 		hoverController.showContentHover(range, HoverStartMode.Immediate, HoverStartSource.Click, false);
 	}
 }
-
-export function isOnColorDecorator(mouseEvent: IPartialEditorMouseEvent): boolean {
-	const target = mouseEvent.target;
-	return !!target
-		&& target.type === MouseTargetType.CONTENT_TEXT
-		&& target.detail.injectedText?.options.attachedData === ColorDecorationInjectedTextMarker;
-}
diff --git a/src/vs/editor/contrib/hover/browser/contentHoverController.ts b/src/vs/editor/contrib/hover/browser/contentHoverController.ts
index 9b8252eec14..26a7115f3ad 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverController.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverController.ts
@@ -22,7 +22,7 @@ import { isMousePositionWithinElement } from './hoverUtils.js';
 import { ContentHoverWidgetWrapper } from './contentHoverWidgetWrapper.js';
 import './hover.css';
 import { Emitter } from '../../../../base/common/event.js';
-import { isOnColorDecorator } from '../../colorPicker/browser/hoverColorPicker/hoverColorPickerContribution.js';
+import { isOnColorDecorator } from '../../colorPicker/browser/hoverColorPicker/hoverColorPicker.js';
 
 // sticky hover widget which doesn't disappear on focus out and such
 const _sticky = false
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts
index 8880e5c4d59..248bbd7da53 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.ts
@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { AsyncIterableObject } from '../../../../../base/common/async.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
 import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
@@ -20,6 +22,7 @@ import { TerminalLocation } from '../../../../../platform/terminal/common/termin
 import { IUntitledTextResourceEditorInput } from '../../../../common/editor.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
 import { accessibleViewInCodeBlock } from '../../../accessibility/browser/accessibilityConfiguration.js';
+import { InlineChatController } from '../../../inlineChat/browser/inlineChatController.js';
 import { ITerminalEditorService, ITerminalGroupService, ITerminalService } from '../../../terminal/browser/terminal.js';
 import { ChatAgentLocation } from '../../common/chatAgents.js';
 import { ChatContextKeys } from '../../common/chatContextKeys.js';
@@ -529,10 +532,38 @@ export function registerChatCodeCompareBlockActions() {
 
 		async runWithContext(accessor: ServicesAccessor, context: ICodeCompareBlockActionContext): Promise<any> {
 
-			const instaService = accessor.get(IInstantiationService);
+			const editorService = accessor.get(ICodeEditorService);
 
-			const editor = instaService.createInstance(DefaultChatTextEditor);
-			await editor.preview(context.element, context.edit);
+			const item = context.edit;
+			const response = context.element;
+
+			if (item.state?.applied) {
+				// already applied
+				return false;
+			}
+
+			if (!response.response.value.includes(item)) {
+				// bogous item
+				return false;
+			}
+
+			const firstEdit = item.edits[0]?.[0];
+			if (!firstEdit) {
+				return false;
+			}
+			const textEdits = AsyncIterableObject.fromArray(item.edits);
+
+			const editorToApply = await editorService.openCodeEditor({ resource: item.uri }, null);
+			if (editorToApply) {
+				const inlineChatController = InlineChatController.get(editorToApply);
+				if (inlineChatController) {
+					editorToApply.revealLineInCenterIfOutsideViewport(firstEdit.range.startLineNumber);
+					inlineChatController.reviewEdits(firstEdit.range, textEdits, CancellationToken.None);
+					response.setEditApplied(item, 1);
+					return true;
+				}
+			}
+			return false;
 		}
 	});
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts
index 912b37c6624..af6ffc0640e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts
@@ -487,14 +487,6 @@ class ChatDecorationsProvider extends Disposable implements IDecorationsProvider
 }
 
 export class ChatEditingMultiDiffSourceResolver implements IMultiDiffSourceResolver {
-	public static readonly scheme = CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME;
-
-	public static getMultiDiffSourceUri(): URI {
-		return URI.from({
-			scheme: ChatEditingMultiDiffSourceResolver.scheme,
-			path: '',
-		});
-	}
 
 	constructor(
 		private readonly _currentSession: IObservable<ChatEditingSession | null>,
@@ -502,7 +494,7 @@ export class ChatEditingMultiDiffSourceResolver implements IMultiDiffSourceResol
 	) { }
 
 	canHandleUri(uri: URI): boolean {
-		return uri.scheme === ChatEditingMultiDiffSourceResolver.scheme;
+		return uri.scheme === CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME;
 	}
 
 	async resolveDiffSource(uri: URI): Promise<IResolvedMultiDiffSource> {
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index 7b770ec4e97..6f24595cbad 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -30,9 +30,8 @@ import { IEditorService } from '../../../../services/editor/common/editorService
 import { MultiDiffEditor } from '../../../multiDiffEditor/browser/multiDiffEditor.js';
 import { MultiDiffEditorInput } from '../../../multiDiffEditor/browser/multiDiffEditorInput.js';
 import { ChatAgentLocation, IChatAgentService } from '../../common/chatAgents.js';
-import { ChatEditingSessionChangeType, ChatEditingSessionState, ChatEditKind, IChatEditingSession, IModifiedFileEntry, WorkingSetDisplayMetadata, WorkingSetEntryRemovalReason, WorkingSetEntryState } from '../../common/chatEditingService.js';
+import { ChatEditingSessionChangeType, ChatEditingSessionState, ChatEditKind, getMultiDiffSourceUri, IChatEditingSession, IModifiedFileEntry, WorkingSetDisplayMetadata, WorkingSetEntryRemovalReason, WorkingSetEntryState } from '../../common/chatEditingService.js';
 import { IChatResponseModel } from '../../common/chatModel.js';
-import { ChatEditingMultiDiffSourceResolver } from './chatEditingService.js';
 import { ChatEditingModifiedFileEntry, IModifiedEntryTelemetryInfo, ISnapshotEntry } from './chatEditingModifiedFileEntry.js';
 import { ChatEditingTextModelContentProvider } from './chatEditingTextModelContentProviders.js';
 import { Schemas } from '../../../../../base/common/network.js';
@@ -484,7 +483,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 			}
 		}
 		const input = MultiDiffEditorInput.fromResourceMultiDiffEditorInput({
-			multiDiffSource: ChatEditingMultiDiffSourceResolver.getMultiDiffSourceUri(),
+			multiDiffSource: getMultiDiffSourceUri(),
 			label: localize('multiDiffEditorInput.name', "Suggested Edits")
 		}, this._instantiationService);
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditorActions.ts b/src/vs/workbench/contrib/chat/browser/chatEditorActions.ts
index 0646a4ed503..b7f3ae1d0b4 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditorActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditorActions.ts
@@ -19,7 +19,7 @@ import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { getNotebookEditorFromEditorPane } from '../../notebook/browser/notebookBrowser.js';
-import { ctxNotebookHasEditorModification } from '../../notebook/browser/contrib/chatEdit/notebookChatEditController.js';
+import { ctxNotebookHasEditorModification } from '../../notebook/browser/contrib/chatEdit/notebookChatEditContext.js';
 
 abstract class NavigateAction extends Action2 {
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 14e5cf66a58..ee062a4c359 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -52,7 +52,7 @@ import { IChatAgentService } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { CHAT_CATEGORY } from './actions/chatActions.js';
 import { ChatViewId, EditsViewId, ensureSideBarChatViewSize, IChatWidget, showChatView, showEditsView } from './chat.js';
-import { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID } from './chatViewPane.js';
+import { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID, SetupWelcomeViewCondition } from './chatViewPane.js';
 import { ChatViewsWelcomeExtensions, IChatViewsWelcomeContributionRegistry } from './viewsWelcome/chatViewsWelcome.js';
 import { IChatQuotasService } from './chatQuotasService.js';
 import { mainWindow } from '../../../../base/browser/window.js';
@@ -95,25 +95,6 @@ enum ChatEntitlement {
 const TRIGGER_SETUP_COMMAND_ID = 'workbench.action.chat.triggerSetup';
 const TRIGGER_SETUP_COMMAND_LABEL = localize2('triggerChatSetup', "Use AI Features with Copilot for Free...");
 
-export const SetupWelcomeViewKeys = new Set([ChatContextKeys.Setup.triggered.key, ChatContextKeys.Setup.installed.key, ChatContextKeys.Setup.signedOut.key, ChatContextKeys.Setup.canSignUp.key]);
-export const SetupWelcomeViewCondition = ContextKeyExpr.and(
-	ContextKeyExpr.has('config.chat.experimental.offerSetup'),
-	ContextKeyExpr.or(
-		ContextKeyExpr.and(
-			ChatContextKeys.Setup.triggered,
-			ChatContextKeys.Setup.installed.negate()
-		),
-		ContextKeyExpr.and(
-			ChatContextKeys.Setup.canSignUp,
-			ChatContextKeys.Setup.installed
-		),
-		ContextKeyExpr.and(
-			ChatContextKeys.Setup.signedOut,
-			ChatContextKeys.Setup.installed
-		)
-	)
-)!;
-
 export class ChatSetupContribution extends Disposable implements IWorkbenchContribution {
 
 	static readonly ID = 'workbench.chat.setup';
diff --git a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
index 485adf05ab9..8e0e8bd85ff 100644
--- a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
@@ -8,7 +8,7 @@ import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { MarshalledId } from '../../../../base/common/marshallingIds.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -27,10 +27,10 @@ import { SIDE_BAR_FOREGROUND } from '../../../common/theme.js';
 import { IViewDescriptorService } from '../../../common/views.js';
 import { IChatViewTitleActionContext } from '../common/chatActions.js';
 import { ChatAgentLocation, IChatAgentService } from '../common/chatAgents.js';
+import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { ChatModelInitState, IChatModel } from '../common/chatModel.js';
 import { CHAT_PROVIDER_ID } from '../common/chatParticipantContribTypes.js';
 import { IChatService } from '../common/chatService.js';
-import { SetupWelcomeViewCondition, SetupWelcomeViewKeys } from './chatSetup.js';
 import { ChatWidget, IChatViewState } from './chatWidget.js';
 import { ChatViewWelcomeController, IViewWelcomeDelegate } from './viewsWelcome/chatViewWelcomeController.js';
 
@@ -279,3 +279,22 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 		}
 	}
 }
+
+export const SetupWelcomeViewKeys = new Set([ChatContextKeys.Setup.triggered.key, ChatContextKeys.Setup.installed.key, ChatContextKeys.Setup.signedOut.key, ChatContextKeys.Setup.canSignUp.key]);
+export const SetupWelcomeViewCondition = ContextKeyExpr.and(
+	ContextKeyExpr.has('config.chat.experimental.offerSetup'),
+	ContextKeyExpr.or(
+		ContextKeyExpr.and(
+			ChatContextKeys.Setup.triggered,
+			ChatContextKeys.Setup.installed.negate()
+		),
+		ContextKeyExpr.and(
+			ChatContextKeys.Setup.canSignUp,
+			ChatContextKeys.Setup.installed
+		),
+		ContextKeyExpr.and(
+			ChatContextKeys.Setup.signedOut,
+			ChatContextKeys.Setup.installed
+		)
+	)
+)!;
diff --git a/src/vs/workbench/contrib/chat/browser/codeBlockPart.ts b/src/vs/workbench/contrib/chat/browser/codeBlockPart.ts
index 1c05029923c..6f34a50203b 100644
--- a/src/vs/workbench/contrib/chat/browser/codeBlockPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/codeBlockPart.ts
@@ -8,7 +8,7 @@ import './codeBlockPart.css';
 import * as dom from '../../../../base/browser/dom.js';
 import { renderFormattedText } from '../../../../base/browser/formattedTextRenderer.js';
 import { Button } from '../../../../base/browser/ui/button/button.js';
-import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { combinedDisposable, Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
@@ -69,8 +69,6 @@ import { ChatTreeItem } from './chat.js';
 import { IChatRendererDelegate } from './chatListRenderer.js';
 import { ChatEditorOptions } from './chatOptions.js';
 import { emptyProgressRunner, IEditorProgressService } from '../../../../platform/progress/common/progress.js';
-import { AsyncIterableObject } from '../../../../base/common/async.js';
-import { InlineChatController } from '../../inlineChat/browser/inlineChatController.js';
 
 const $ = dom.$;
 
@@ -941,37 +939,5 @@ export class DefaultChatTextEditor {
 		response.setEditApplied(item, -1);
 	}
 
-	async preview(response: IChatResponseModel | IChatResponseViewModel, item: IChatTextEditGroup) {
-		if (item.state?.applied) {
-			// already applied
-			return false;
-		}
 
-		if (!response.response.value.includes(item)) {
-			// bogous item
-			return false;
-		}
-
-		const firstEdit = item.edits[0]?.[0];
-		if (!firstEdit) {
-			return false;
-		}
-		const textEdits = AsyncIterableObject.fromArray(item.edits);
-
-		const editorToApply = await this.editorService.openCodeEditor({ resource: item.uri }, null);
-		if (editorToApply) {
-			const inlineChatController = InlineChatController.get(editorToApply);
-			if (inlineChatController) {
-				const tokenSource = new CancellationTokenSource();
-				editorToApply.revealLineInCenterIfOutsideViewport(firstEdit.range.startLineNumber);
-				const promise = inlineChatController.reviewEdits(firstEdit.range, textEdits, tokenSource.token);
-				response.setEditApplied(item, 1);
-				promise.finally(() => {
-					tokenSource.dispose();
-				});
-				return true;
-			}
-		}
-		return false;
-	}
 }
diff --git a/src/vs/workbench/contrib/chat/common/chatEditingService.ts b/src/vs/workbench/contrib/chat/common/chatEditingService.ts
index c0598e39eba..ed970c30625 100644
--- a/src/vs/workbench/contrib/chat/common/chatEditingService.ts
+++ b/src/vs/workbench/contrib/chat/common/chatEditingService.ts
@@ -163,3 +163,10 @@ export interface IChatEditingActionContext {
 export function isChatEditingActionContext(thing: unknown): thing is IChatEditingActionContext {
 	return typeof thing === 'object' && !!thing && 'sessionId' in thing;
 }
+
+export function getMultiDiffSourceUri(): URI {
+	return URI.from({
+		scheme: CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME,
+		path: '',
+	});
+}
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditContext.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditContext.ts
new file mode 100644
index 00000000000..ff706d889be
--- /dev/null
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditContext.ts
@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize } from '../../../../../../nls.js';
+import { RawContextKey } from '../../../../../../platform/contextkey/common/contextkey.js';
+
+export const ctxNotebookHasEditorModification = new RawContextKey<boolean>('chat.hasNotebookEditorModifications', undefined, localize('chat.hasNotebookEditorModifications', "The current Notebook editor contains chat modifications"));
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.ts
index 3185b503d56..766e43a951c 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.ts
@@ -17,14 +17,12 @@ import { INotebookOriginalModelReferenceFactory, NotebookOriginalModelReferenceF
 import { debouncedObservable2 } from '../../../../../../base/common/observableInternal/utils.js';
 import { CellDiffInfo } from '../../diff/notebookDiffViewModel.js';
 import { NotebookChatActionsOverlayController } from './notebookChatActionsOverlay.js';
-import { IContextKey, IContextKeyService, RawContextKey } from '../../../../../../platform/contextkey/common/contextkey.js';
-import { localize } from '../../../../../../nls.js';
+import { IContextKey, IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
 import { registerNotebookContribution } from '../../notebookEditorExtensions.js';
 import { InstantiationType, registerSingleton } from '../../../../../../platform/instantiation/common/extensions.js';
 import { INotebookOriginalCellModelFactory, OriginalNotebookCellModelFactory } from './notebookOriginalCellModelFactory.js';
 import { Event } from '../../../../../../base/common/event.js';
-
-export const ctxNotebookHasEditorModification = new RawContextKey<boolean>('chat.hasNotebookEditorModifications', undefined, localize('chat.hasNotebookEditorModifications', "The current Notebook editor contains chat modifications"));
+import { ctxNotebookHasEditorModification } from './notebookChatEditContext.js';
 
 export class NotebookChatEditorControllerContrib extends Disposable implements INotebookEditorContribution {
 

From d18a40011bb2425429a3abf8b719cb8d5bcc558c Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Wed, 11 Dec 2024 11:34:16 +0100
Subject: [PATCH 096/479] fix #235763 (#235810)

---
 .../common/abstractExtensionManagementService.ts           | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
index d78d2ef9c73..59f359d659c 100644
--- a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
@@ -76,10 +76,9 @@ export abstract class CommontExtensionManagementService extends Disposable imple
 		}
 
 		if (!(await this.isExtensionPlatformCompatible(extension))) {
-			const productName = isWeb ? nls.localize('VS Code for Web', "{0} for the Web", this.productService.nameLong) : this.productService.nameLong;
 			const learnLink = isWeb ? 'https://aka.ms/vscode-web-extensions-guide' : 'https://aka.ms/vscode-platform-specific-extensions';
-			return new MarkdownString(`${nls.localize('incompatible platform', "The '{0}' extension is not available in {1} for {2}.",
-				extension.displayName ?? extension.identifier.id, productName, TargetPlatformToString(await this.getTargetPlatform()))} [${nls.localize('learn why', "Learn Why")}](${learnLink})`);
+			return new MarkdownString(`${nls.localize('incompatible platform', "The '{0}' extension is not available in {1} for the {2}.",
+				extension.displayName ?? extension.identifier.id, this.productService.nameLong, TargetPlatformToString(await this.getTargetPlatform()))} [${nls.localize('learn why', "Learn Why")}](${learnLink})`);
 		}
 
 		return true;
@@ -657,7 +656,7 @@ export abstract class AbstractExtensionManagementService extends CommontExtensio
 		else {
 			if (await this.canInstall(extension) !== true) {
 				const targetPlatform = await this.getTargetPlatform();
-				throw new ExtensionManagementError(nls.localize('incompatible platform', "The '{0}' extension is not available in {1} for {2}.", extension.identifier.id, this.productService.nameLong, TargetPlatformToString(targetPlatform)), ExtensionManagementErrorCode.IncompatibleTargetPlatform);
+				throw new ExtensionManagementError(nls.localize('incompatible platform', "The '{0}' extension is not available in {1} for the {2}.", extension.identifier.id, this.productService.nameLong, TargetPlatformToString(targetPlatform)), ExtensionManagementErrorCode.IncompatibleTargetPlatform);
 			}
 
 			compatibleExtension = await this.getCompatibleVersion(extension, sameVersion, installPreRelease, productVersion);

From efb1463cb5013b44b275b601936d9dfb3054c7da Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Wed, 11 Dec 2024 11:39:14 +0100
Subject: [PATCH 097/479] Finalize file level comments Fixes #214327

---
 .../common/extensionsApiProposals.ts          |  3 --
 .../workbench/api/common/extHostComments.ts   |  5 +--
 src/vscode-dts/vscode.d.ts                    | 22 ++++++++--
 .../vscode.proposed.fileComments.d.ts         | 42 -------------------
 4 files changed, 20 insertions(+), 52 deletions(-)
 delete mode 100644 src/vscode-dts/vscode.proposed.fileComments.d.ts

diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts
index 1aec67707c7..9a6636005b3 100644
--- a/src/vs/platform/extensions/common/extensionsApiProposals.ts
+++ b/src/vs/platform/extensions/common/extensionsApiProposals.ts
@@ -189,9 +189,6 @@ const _allApiProposals = {
 	externalUriOpener: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.externalUriOpener.d.ts',
 	},
-	fileComments: {
-		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.fileComments.d.ts',
-	},
 	fileSearchProvider: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.fileSearchProvider.d.ts',
 	},
diff --git a/src/vs/workbench/api/common/extHostComments.ts b/src/vs/workbench/api/common/extHostComments.ts
index 74eca08c943..908d094ec00 100644
--- a/src/vs/workbench/api/common/extHostComments.ts
+++ b/src/vs/workbench/api/common/extHostComments.ts
@@ -211,7 +211,7 @@ export function createExtHostComments(mainContext: IMainContext, commands: ExtHo
 
 			const document = await documents.ensureDocumentData(URI.revive(uriComponents));
 			return asPromise(async () => {
-				const rangesResult = await (commentController.commentingRangeProvider as vscode.CommentingRangeProvider2).provideCommentingRanges(document.document, token);
+				const rangesResult = await commentController.commentingRangeProvider?.provideCommentingRanges(document.document, token);
 				let ranges: { ranges: vscode.Range[]; fileComments: boolean } | undefined;
 				if (Array.isArray(rangesResult)) {
 					ranges = {
@@ -695,9 +695,6 @@ export function createExtHostComments(mainContext: IMainContext, commands: ExtHo
 		}
 
 		createCommentThread(resource: vscode.Uri, range: vscode.Range | undefined, comments: vscode.Comment[]): ExtHostCommentThread {
-			if (range === undefined) {
-				checkProposedApiEnabled(this._extension, 'fileComments');
-			}
 			const commentThread = new ExtHostCommentThread(this.id, this.handle, undefined, resource, range, comments, this._extension, false);
 			this._threads.set(commentThread.handle, commentThread);
 			return commentThread;
diff --git a/src/vscode-dts/vscode.d.ts b/src/vscode-dts/vscode.d.ts
index 4fd34315755..c9ecff2b0b9 100644
--- a/src/vscode-dts/vscode.d.ts
+++ b/src/vscode-dts/vscode.d.ts
@@ -16810,9 +16810,10 @@ declare module 'vscode' {
 
 		/**
 		 * The range the comment thread is located within the document. The thread icon will be shown
-		 * at the last line of the range.
+		 * at the last line of the range. When set to undefined, the comment will be associated with the
+		 * file, and not a specific range.
 		 */
-		range: Range;
+		range: Range | undefined;
 
 		/**
 		 * The ordered comments of the thread.
@@ -16981,6 +16982,21 @@ declare module 'vscode' {
 		text: string;
 	}
 
+	/**
+	 * The ranges a CommentingRangeProvider enables commenting on.
+	 */
+	export interface CommentingRanges {
+		/**
+		 * Enables comments to be added to a file without a specific range.
+		 */
+		enableFileComments: boolean;
+
+		/**
+		 * The ranges which allow new comment threads creation.
+		 */
+		ranges?: Range[];
+	}
+
 	/**
 	 * Commenting range provider for a {@link CommentController comment controller}.
 	 */
@@ -16988,7 +17004,7 @@ declare module 'vscode' {
 		/**
 		 * Provide a list of ranges which allow new comment threads creation or null for a given document
 		 */
-		provideCommentingRanges(document: TextDocument, token: CancellationToken): ProviderResult<Range[]>;
+		provideCommentingRanges(document: TextDocument, token: CancellationToken): ProviderResult<Range[] | CommentingRanges>;
 	}
 
 	/**
diff --git a/src/vscode-dts/vscode.proposed.fileComments.d.ts b/src/vscode-dts/vscode.proposed.fileComments.d.ts
deleted file mode 100644
index 96e9b181bc6..00000000000
--- a/src/vscode-dts/vscode.proposed.fileComments.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-declare module 'vscode' {
-
-	export interface CommentThread2 {
-		/**
-		 * The range the comment thread is located within the document. The thread icon will be shown
-		 * at the last line of the range. When set to undefined, the comment will be associated with the
-		 * file, and not a specific range.
-		 */
-		range: Range | undefined;
-	}
-
-	/**
-	 * The ranges a CommentingRangeProvider enables commenting on.
-	 */
-	export interface CommentingRanges {
-		/**
-		 * Enables comments to be added to a file without a specific range.
-		 */
-		enableFileComments: boolean;
-
-		/**
-		 * The ranges which allow new comment threads creation.
-		 */
-		ranges?: Range[];
-	}
-
-	export interface CommentController {
-		createCommentThread(uri: Uri, range: Range | undefined, comments: readonly Comment[]): CommentThread | CommentThread2;
-	}
-
-	export interface CommentingRangeProvider2 {
-		/**
-		 * Provide a list of ranges which allow new comment threads creation or null for a given document
-		 */
-		provideCommentingRanges(document: TextDocument, token: CancellationToken): ProviderResult<Range[] | CommentingRanges>;
-	}
-}

From 4fb4fc90310a408a4f5c6216372e634634ae8ea0 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Wed, 11 Dec 2024 11:42:59 +0100
Subject: [PATCH 098/479] Comment text cut off in Comments view (#235813)

Fixes #226415
---
 src/vs/workbench/contrib/comments/browser/media/panel.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/vs/workbench/contrib/comments/browser/media/panel.css b/src/vs/workbench/contrib/comments/browser/media/panel.css
index 8527341bdae..37930e9119f 100644
--- a/src/vs/workbench/contrib/comments/browser/media/panel.css
+++ b/src/vs/workbench/contrib/comments/browser/media/panel.css
@@ -94,10 +94,6 @@
 	padding-right: 5px;
 }
 
-.comments-panel .comments-panel-container .tree-container .comment-thread-container .comment-metadata .text * {
-	max-width: 700px;
-}
-
 .comments-panel .comments-panel-container .tree-container .comment-thread-container .range {
 	opacity: 0.8;
 }

From 06abfd26c8eed3c6ca6e0fafddd736848ae5ce6d Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 11 Dec 2024 12:52:05 +0100
Subject: [PATCH 099/479] fixes
 https://github.com/microsoft/vscode-copilot/issues/7665 (#235818)

---
 src/vs/workbench/contrib/chat/browser/media/chat.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index 502ef69725e..fdcc82938f1 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -1015,6 +1015,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 
 .interactive-session .interactive-input-part.compact .chat-attached-context {
 	padding-top: 8px;
+	padding-bottom: 0px;
 	display: flex;
 	gap: 4px;
 	flex-wrap: wrap;

From a444d2419c3ba82688fe04b422c48cbc0a17bf43 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 11 Dec 2024 12:54:17 +0100
Subject: [PATCH 100/479] :up: distro (#235817)

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

diff --git a/package.json b/package.json
index 12ff0ff2f0b..5237906a2c7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.97.0",
-  "distro": "c883c91dadf5f063b26c86ffe01851acee3747c6",
+  "distro": "45ffe59ad7c51acf28b541a2aa76cc73437ff118",
   "author": {
     "name": "Microsoft Corporation"
   },

From b4364975530e0bae1d70a64e9ef87a001b8530b3 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 11 Dec 2024 12:56:37 +0100
Subject: [PATCH 101/479] chat - setup tweaks (#235797)

---
 .../contrib/chat/browser/chatSetup.ts         | 38 ++++++++++++-------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index ee062a4c359..d23c468f229 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -36,7 +36,7 @@ import { IProgressService, ProgressLocation } from '../../../../platform/progres
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { asText, IRequestService } from '../../../../platform/request/common/request.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { ITelemetryService, TelemetryLevel } from '../../../../platform/telemetry/common/telemetry.js';
 import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
@@ -67,12 +67,14 @@ const defaultChat = {
 	termsStatementUrl: product.defaultChatAgent?.termsStatementUrl ?? '',
 	privacyStatementUrl: product.defaultChatAgent?.privacyStatementUrl ?? '',
 	skusDocumentationUrl: product.defaultChatAgent?.skusDocumentationUrl ?? '',
+	publicCodeMatchesUrl: product.defaultChatAgent?.publicCodeMatchesUrl ?? '',
 	upgradePlanUrl: product.defaultChatAgent?.upgradePlanUrl ?? '',
 	providerId: product.defaultChatAgent?.providerId ?? '',
 	providerName: product.defaultChatAgent?.providerName ?? '',
 	providerScopes: product.defaultChatAgent?.providerScopes ?? [[]],
 	entitlementUrl: product.defaultChatAgent?.entitlementUrl ?? '',
 	entitlementSignupLimitedUrl: product.defaultChatAgent?.entitlementSignupLimitedUrl ?? '',
+	manageSettingsUrl: product.defaultChatAgent?.manageSettingsUrl ?? '',
 };
 
 enum ChatEntitlement {
@@ -562,7 +564,7 @@ class ChatSetupRequests extends Disposable {
 
 	async signUpLimited(session: AuthenticationSession): Promise<boolean> {
 		const body = {
-			restricted_telemetry: 'disabled',
+			restricted_telemetry: this.telemetryService.telemetryLevel === TelemetryLevel.NONE ? 'disabled' : 'enabled',
 			public_code_suggestions: 'enabled'
 		};
 
@@ -809,7 +811,8 @@ class ChatSetupWelcomeContent extends Disposable {
 		private readonly context: ChatSetupContext,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
 		@IContextMenuService private readonly contextMenuService: IContextMenuService,
-		@ICommandService private readonly commandService: ICommandService
+		@ICommandService private readonly commandService: ICommandService,
+		@ITelemetryService private readonly telemetryService: ITelemetryService,
 	) {
 		super();
 
@@ -847,9 +850,9 @@ class ChatSetupWelcomeContent extends Disposable {
 		}
 
 		// Limited SKU
-		const limitedSkuHeader = localize({ key: 'limitedSkuHeader', comment: ['{Locked="[]({0})"}'] }, "$(sparkle-filled) We now offer [Copilot for free]({0}).", defaultChat.skusDocumentationUrl);
-		const limitedSkuHeaderContainer = this.element.appendChild($('p'));
-		limitedSkuHeaderContainer.appendChild(this._register(markdown.render(new MarkdownString(limitedSkuHeader, { isTrusted: true, supportThemeIcons: true }))).element);
+		const free = localize({ key: 'limitedSkuHeader', comment: ['{Locked="[]({0})"}'] }, "$(sparkle-filled) We now offer [Copilot for free]({0}).", defaultChat.skusDocumentationUrl);
+		const freeContainer = this.element.appendChild($('p'));
+		freeContainer.appendChild(this._register(markdown.render(new MarkdownString(free, { isTrusted: true, supportThemeIcons: true }))).element);
 
 		// Setup Button
 		const actions: IAction[] = [];
@@ -875,31 +878,37 @@ class ChatSetupWelcomeContent extends Disposable {
 		const terms = localize({ key: 'termsLabel', comment: ['{Locked="["}', '{Locked="]({0})"}', '{Locked="]({1})"}'] }, "By continuing, you agree to the [Terms]({0}) and [Privacy Policy]({1}).", defaultChat.termsStatementUrl, defaultChat.privacyStatementUrl);
 		this.element.appendChild($('p')).appendChild(this._register(markdown.render(new MarkdownString(terms, { isTrusted: true }))).element);
 
+		// SKU Settings
+		const settings = localize({ key: 'termsLabelWithTelemetry', comment: ['{Locked="["}', '{Locked="]({0})"}', '{Locked="]({1})"}'] }, "Copilot may show [public code]({0}) suggestions and collect usage data. You can change these [settings]({1}) at any time.", defaultChat.publicCodeMatchesUrl, defaultChat.manageSettingsUrl);
+		const settingsContainer = this.element.appendChild($('p'));
+		settingsContainer.appendChild(this._register(markdown.render(new MarkdownString(settings, { isTrusted: true }))).element);
+
 		// Update based on model state
-		this._register(Event.runAndSubscribe(this.controller.onDidChange, () => this.update(limitedSkuHeaderContainer, button)));
+		this._register(Event.runAndSubscribe(this.controller.onDidChange, () => this.update(freeContainer, settingsContainer, button)));
 	}
 
-	private update(limitedSkuHeaderContainer: HTMLElement, button: Button | ButtonWithDropdown): void {
-		let showLimitedSkuHeader: boolean;
+	private update(freeContainer: HTMLElement, settingsContainer: HTMLElement, button: Button | ButtonWithDropdown): void {
+		const showSettings = this.telemetryService.telemetryLevel !== TelemetryLevel.NONE;
+		let showFree: boolean;
 		let buttonLabel: string;
 
 		switch (this.context.state.entitlement) {
 			case ChatEntitlement.Unknown:
-				showLimitedSkuHeader = true;
+				showFree = true;
 				buttonLabel = this.context.state.registered ? localize('signUp', "Sign in to Use Copilot") : localize('signUpFree', "Sign in to Use Copilot for Free");
 				break;
 			case ChatEntitlement.Unresolved:
-				showLimitedSkuHeader = true;
+				showFree = true;
 				buttonLabel = this.context.state.registered ? localize('startUp', "Use Copilot") : localize('startUpLimited', "Use Copilot for Free");
 				break;
 			case ChatEntitlement.Available:
 			case ChatEntitlement.Limited:
-				showLimitedSkuHeader = true;
+				showFree = true;
 				buttonLabel = localize('startUpLimited', "Use Copilot for Free");
 				break;
 			case ChatEntitlement.Pro:
 			case ChatEntitlement.Unavailable:
-				showLimitedSkuHeader = false;
+				showFree = false;
 				buttonLabel = localize('startUp', "Use Copilot");
 				break;
 		}
@@ -913,7 +922,8 @@ class ChatSetupWelcomeContent extends Disposable {
 				break;
 		}
 
-		setVisibility(showLimitedSkuHeader, limitedSkuHeaderContainer);
+		setVisibility(showFree, freeContainer);
+		setVisibility(showSettings, settingsContainer);
 
 		button.label = buttonLabel;
 		button.enabled = this.controller.step === ChatSetupStep.Initial;

From 7b7be41b4c64977c1f3ff666748dbb3736ce4b49 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Wed, 11 Dec 2024 13:22:25 +0100
Subject: [PATCH 102/479] Toggle Reaction doesn't always show on first load of
 comments (#235822)

Fixes #235821
---
 src/vs/workbench/contrib/comments/browser/commentNode.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/comments/browser/commentNode.ts b/src/vs/workbench/contrib/comments/browser/commentNode.ts
index e014be03658..a8598ae91e4 100644
--- a/src/vs/workbench/contrib/comments/browser/commentNode.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentNode.ts
@@ -339,9 +339,8 @@ export class CommentNode<T extends IRange | ICellRange> extends Disposable {
 		const actions: IAction[] = [];
 
 		const hasReactionHandler = this.commentService.hasReactionHandler(this.owner);
-
-		if (hasReactionHandler) {
-			const toggleReactionAction = this.createReactionPicker(this.comment.commentReactions || []);
+		const toggleReactionAction = hasReactionHandler ? this.createReactionPicker(this.comment.commentReactions || []) : undefined;
+		if (toggleReactionAction) {
 			actions.push(toggleReactionAction);
 		}
 
@@ -352,7 +351,9 @@ export class CommentNode<T extends IRange | ICellRange> extends Disposable {
 			if (!this.toolbar && (primary.length || secondary.length)) {
 				this.createToolbar();
 			}
-
+			if (toggleReactionAction) {
+				primary.unshift(toggleReactionAction);
+			}
 			this.toolbar!.setActions(primary, secondary);
 		}));
 

From fc52d27a89df1975fd48da2e07d7a22d0e972c0c Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Wed, 11 Dec 2024 13:55:40 +0100
Subject: [PATCH 103/479] Disposing the color picker disposables on rerender
 (#235820)

disposing the color picker disposables on rerender
---
 .../hoverColorPickerParticipant.ts            |  6 +-
 .../standaloneColorPickerParticipant.ts       | 86 ++++++++++++-------
 .../standaloneColorPickerWidget.ts            | 23 +++--
 .../contrib/hover/browser/hoverTypes.ts       |  2 +-
 4 files changed, 70 insertions(+), 47 deletions(-)

diff --git a/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerParticipant.ts b/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerParticipant.ts
index 119810b7b6d..c850d374443 100644
--- a/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerParticipant.ts
+++ b/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerParticipant.ts
@@ -112,10 +112,8 @@ export class HoverColorPickerParticipant implements IEditorHoverParticipant<Colo
 		if (hoverParts.length === 0 || !editor.hasModel()) {
 			return new RenderedHoverParts([]);
 		}
-		if (context.setMinimumDimensions) {
-			const minimumHeight = editor.getOption(EditorOption.lineHeight) + 8;
-			context.setMinimumDimensions(new Dimension(302, minimumHeight));
-		}
+		const minimumHeight = editor.getOption(EditorOption.lineHeight) + 8;
+		context.setMinimumDimensions(new Dimension(302, minimumHeight));
 
 		const disposables = new DisposableStore();
 		const colorHover = hoverParts[0];
diff --git a/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerParticipant.ts b/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerParticipant.ts
index 517c0ba0116..8e66ff8b1b2 100644
--- a/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerParticipant.ts
+++ b/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerParticipant.ts
@@ -5,9 +5,9 @@
 
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { Color } from '../../../../../base/common/color.js';
-import { DisposableStore, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
-import { ICodeEditor } from '../../../../browser/editorBrowser.js';
+import { IActiveCodeEditor, ICodeEditor } from '../../../../browser/editorBrowser.js';
 import { LanguageFeatureRegistry } from '../../../../common/languageFeatureRegistry.js';
 import { DocumentColorProvider, IColorInformation } from '../../../../common/languages.js';
 import { IEditorHoverRenderContext } from '../../../hover/browser/hoverTypes.js';
@@ -33,10 +33,49 @@ export class StandaloneColorPickerHover implements BaseColor {
 	}
 }
 
+export class StandaloneColorPickerRenderedParts extends Disposable {
+
+	public color: Color;
+
+	public colorPicker: ColorPickerWidget;
+
+	constructor(editor: IActiveCodeEditor, context: IEditorHoverRenderContext, colorHover: StandaloneColorPickerHover, themeService: IThemeService) {
+		super();
+		const editorModel = editor.getModel();
+		const colorPickerModel = colorHover.model;
+
+		this.color = colorHover.model.color;
+		this.colorPicker = this._register(new ColorPickerWidget(
+			context.fragment,
+			colorPickerModel,
+			editor.getOption(EditorOption.pixelRatio),
+			themeService,
+			ColorPickerWidgetType.Standalone
+		));
+
+		this._register(colorPickerModel.onColorFlushed((color: Color) => {
+			this.color = color;
+		}));
+		this._register(colorPickerModel.onDidChangeColor((color: Color) => {
+			updateColorPresentations(editorModel, colorPickerModel, color, colorHover.range, colorHover);
+		}));
+		let editorUpdatedByColorPicker = false;
+		this._register(editor.onDidChangeModelContent((e) => {
+			if (editorUpdatedByColorPicker) {
+				editorUpdatedByColorPicker = false;
+			} else {
+				context.hide();
+				editor.focus();
+			}
+		}));
+		updateColorPresentations(editorModel, colorPickerModel, this.color, colorHover.range, colorHover);
+	}
+}
+
 export class StandaloneColorPickerParticipant {
 
 	public readonly hoverOrdinal: number = 2;
-	private _color: Color | null = null;
+	private _renderedParts: StandaloneColorPickerRenderedParts | undefined;
 
 	constructor(
 		private readonly _editor: ICodeEditor,
@@ -80,40 +119,21 @@ export class StandaloneColorPickerParticipant {
 		}
 	}
 
-	public renderHoverParts(context: IEditorHoverRenderContext, hoverParts: StandaloneColorPickerHover[]): { disposables: IDisposable; hoverPart: StandaloneColorPickerHover; colorPicker: ColorPickerWidget } | undefined {
+	public renderHoverParts(context: IEditorHoverRenderContext, hoverParts: StandaloneColorPickerHover[]): StandaloneColorPickerRenderedParts | undefined {
 		if (hoverParts.length === 0 || !this._editor.hasModel()) {
 			return undefined;
 		}
-		if (context.setMinimumDimensions) {
-			const minimumHeight = this._editor.getOption(EditorOption.lineHeight) + 8;
-			context.setMinimumDimensions(new Dimension(302, minimumHeight));
-		}
+		this._setMinimumDimensions(context);
+		this._renderedParts = new StandaloneColorPickerRenderedParts(this._editor, context, hoverParts[0], this._themeService);
+		return this._renderedParts;
+	}
 
-		const disposables = new DisposableStore();
-		const colorHover = hoverParts[0];
-		const editorModel = this._editor.getModel();
-		const model = colorHover.model;
-		const colorPicker = disposables.add(new ColorPickerWidget(context.fragment, model, this._editor.getOption(EditorOption.pixelRatio), this._themeService, ColorPickerWidgetType.Standalone));
+	private _setMinimumDimensions(context: IEditorHoverRenderContext): void {
+		const minimumHeight = this._editor.getOption(EditorOption.lineHeight) + 8;
+		context.setMinimumDimensions(new Dimension(302, minimumHeight));
+	}
 
-		let editorUpdatedByColorPicker = false;
-		const range = new Range(colorHover.range.startLineNumber, colorHover.range.startColumn, colorHover.range.endLineNumber, colorHover.range.endColumn);
-		const color = colorHover.model.color;
-		this._color = color;
-		updateColorPresentations(editorModel, model, color, range, colorHover);
-		disposables.add(model.onColorFlushed((color: Color) => {
-			this._color = color;
-		}));
-		disposables.add(model.onDidChangeColor((color: Color) => {
-			updateColorPresentations(editorModel, model, color, range, colorHover);
-		}));
-		disposables.add(this._editor.onDidChangeModelContent((e) => {
-			if (editorUpdatedByColorPicker) {
-				editorUpdatedByColorPicker = false;
-			} else {
-				context.hide();
-				this._editor.focus();
-			}
-		}));
-		return { hoverPart: colorHover, colorPicker, disposables };
+	private get _color(): Color | undefined {
+		return this._renderedParts?.color;
 	}
 }
diff --git a/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerWidget.ts b/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerWidget.ts
index 8fcb698b940..c26966a842f 100644
--- a/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerWidget.ts
+++ b/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerWidget.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import '../colorPicker.css';
-import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { Disposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
 import { IEditorHoverRenderContext } from '../../../hover/browser/hoverTypes.js';
 import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from '../../../../browser/editorBrowser.js';
 import { PositionAffinity } from '../../../../common/model.js';
@@ -20,7 +20,7 @@ import { IContextKey } from '../../../../../platform/contextkey/common/contextke
 import { IRange } from '../../../../common/core/range.js';
 import { DefaultDocumentColorProvider } from '../defaultDocumentColorProvider.js';
 import { IEditorWorkerService } from '../../../../common/services/editorWorker.js';
-import { StandaloneColorPickerHover, StandaloneColorPickerParticipant } from './standaloneColorPickerParticipant.js';
+import { StandaloneColorPickerHover, StandaloneColorPickerParticipant, StandaloneColorPickerRenderedParts } from './standaloneColorPickerParticipant.js';
 import * as dom from '../../../../../base/browser/dom.js';
 import { InsertButton } from '../colorPickerParts/colorPickerInsertButton.js';
 import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
@@ -51,6 +51,9 @@ export class StandaloneColorPickerWidget extends Disposable implements IContentW
 	private readonly _onResult = this._register(new Emitter<StandaloneColorPickerResult>());
 	public readonly onResult = this._onResult.event;
 
+	private readonly _renderedHoverParts: MutableDisposable<StandaloneColorPickerRenderedParts> = this._register(new MutableDisposable());
+	private readonly _renderedStatusBar: MutableDisposable<EditorHoverStatusBar> = this._register(new MutableDisposable());
+
 	constructor(
 		private readonly _editor: ICodeEditor,
 		private readonly _standaloneColorPickerVisible: IContextKey<boolean>,
@@ -168,22 +171,24 @@ export class StandaloneColorPickerWidget extends Disposable implements IContentW
 
 	private _render(colorHover: StandaloneColorPickerHover, foundInEditor: boolean) {
 		const fragment = document.createDocumentFragment();
-		const statusBar = this._register(new EditorHoverStatusBar(this._keybindingService, this._hoverService));
+		this._renderedStatusBar.value = this._register(new EditorHoverStatusBar(this._keybindingService, this._hoverService));
 
 		const context: IEditorHoverRenderContext = {
 			fragment,
-			statusBar,
+			statusBar: this._renderedStatusBar.value,
 			onContentsChanged: () => { },
-			hide: () => this.hide()
+			setMinimumDimensions: () => { },
+			hide: () => this.hide(),
 		};
 
 		this._colorHover = colorHover;
-		const renderedHoverPart = this._standaloneColorPickerParticipant.renderHoverParts(context, [colorHover]);
-		if (!renderedHoverPart) {
+		this._renderedHoverParts.value = this._standaloneColorPickerParticipant.renderHoverParts(context, [colorHover]);
+		if (!this._renderedHoverParts.value) {
+			this._renderedStatusBar.clear();
+			this._renderedHoverParts.clear();
 			return;
 		}
-		this._register(renderedHoverPart.disposables);
-		const colorPicker = renderedHoverPart.colorPicker;
+		const colorPicker = this._renderedHoverParts.value.colorPicker;
 		this._body.classList.add('standalone-colorpicker-body');
 		this._body.style.maxHeight = Math.max(this._editor.getLayoutInfo().height / 4, 250) + 'px';
 		this._body.style.maxWidth = Math.max(this._editor.getLayoutInfo().width * 0.66, 500) + 'px';
diff --git a/src/vs/editor/contrib/hover/browser/hoverTypes.ts b/src/vs/editor/contrib/hover/browser/hoverTypes.ts
index e67fdbe9ff1..a82edb31852 100644
--- a/src/vs/editor/contrib/hover/browser/hoverTypes.ts
+++ b/src/vs/editor/contrib/hover/browser/hoverTypes.ts
@@ -103,7 +103,7 @@ export interface IEditorHoverContext {
 	/**
 	 * Set the minimum dimensions of the resizable hover
 	 */
-	setMinimumDimensions?(dimensions: Dimension): void;
+	setMinimumDimensions(dimensions: Dimension): void;
 	/**
 	 * Hide the hover.
 	 */

From 0c7bdaaae9b654d97ee5b212bbf4b81bd871540f Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 11 Dec 2024 15:19:43 +0100
Subject: [PATCH 104/479] fix https://github.com/microsoft/vscode/issues/209764
 (#235827)

---
 src/vs/editor/contrib/codelens/browser/codelensWidget.css | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/vs/editor/contrib/codelens/browser/codelensWidget.css b/src/vs/editor/contrib/codelens/browser/codelensWidget.css
index 14711df31af..ab6a97ab7bc 100644
--- a/src/vs/editor/contrib/codelens/browser/codelensWidget.css
+++ b/src/vs/editor/contrib/codelens/browser/codelensWidget.css
@@ -22,6 +22,8 @@
 	-webkit-user-select: none;
 	white-space: nowrap;
 	vertical-align: sub;
+	display: inline-flex;
+	align-items: center;
 }
 
 .monaco-editor .codelens-decoration > a {
@@ -37,7 +39,7 @@
 	color: var(--vscode-editorLink-activeForeground) !important;
 }
 
-.monaco-editor .codelens-decoration .codicon {
+.monaco-editor .codelens-decoration .codicon[class*='codicon-'] {
 	vertical-align: middle;
 	color: currentColor !important;
 	color: var(--vscode-editorCodeLens-foreground);
@@ -45,6 +47,7 @@
 	font-size: var(--vscode-editorCodeLens-fontSize);
 }
 
+
 .monaco-editor .codelens-decoration > a:hover .codicon::before {
 	cursor: pointer;
 }

From 0011fcfed59d372e2ef0e4730afd05f20c73b22f Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 11 Dec 2024 16:06:07 +0100
Subject: [PATCH 105/479] prevent `null` from being used as language name
 (#235832)

https://github.com/microsoft/vscode/issues/226053
---
 .../contrib/snippets/browser/commands/configureSnippets.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/snippets/browser/commands/configureSnippets.ts b/src/vs/workbench/contrib/snippets/browser/commands/configureSnippets.ts
index c579cace7e4..29f82cafa74 100644
--- a/src/vs/workbench/contrib/snippets/browser/commands/configureSnippets.ts
+++ b/src/vs/workbench/contrib/snippets/browser/commands/configureSnippets.ts
@@ -101,7 +101,7 @@ async function computePicks(snippetService: ISnippetsService, userDataProfileSer
 			const mode = basename(file.location).replace(/\.json$/, '');
 			existing.push({
 				label: basename(file.location),
-				description: `(${languageService.getLanguageName(mode)})`,
+				description: `(${languageService.getLanguageName(mode) ?? mode})`,
 				filepath: file.location
 			});
 			seen.add(mode);

From 20bed5838f77a7526429fb04dbe7eb7323c702da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Wed, 11 Dec 2024 16:19:41 +0100
Subject: [PATCH 106/479] fix python codicon size (#235833)

---
 .../browser/ui/codicons/codicon/codicon.ttf   | Bin 82588 -> 82548 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/vs/base/browser/ui/codicons/codicon/codicon.ttf b/src/vs/base/browser/ui/codicons/codicon/codicon.ttf
index 01f7648ad16f1fe1a31451e092708832703edd89..f60b260e0402715b055fd642ceac4c8143bb9161 100644
GIT binary patch
delta 861
zcmah_TS${(82;Yx|NevK+$x>RYSA1^RBSBgI>;Q+iHMxj&AH`a?clGQne*S8^RNgj
z7!jI6VHOfy#4fsUB@rSL)Wzs3B%%x1MMQ*j5favg_RWjvsxID#?|q){dES?I<~qAJ
z#*SM~)SR5ZiBNeJLL1LSzsKjiJKKa1%F?P8DS_P#eWC?gTCrD(X``Dz5rS2O_~uZb
z*YhZpU6>ftXmwf2u3zpOkftilqX^1BAhc@+0cB}+4mUR^GHRl=j0Y!Hcfn?wgSTvY
zgFJ@GvqUlZmAp(_@}BQaM9;r($Zwcx_-<{s-mt!J#EoL(y~ahG(q^z(Y`>a1o5q?p
zn&Zt&cD-G+&)U}=I)}sYxy8~l)AGZqb{=;IoQuwtR@~}nooiinRk>`g8?GgHzFTxp
zyI;81E?m9vwawR-X|HIXZU4}*qa)Oj?bLPN@sxV9o{hxCJ>Gn8o!91#d0+ViU%Aia
zd+4wBTm4CY#{Vr)8mJ3|yM(T~F0t#W7!b$172W5$=et*WR6VzQGQq;2HFzudE~E}c
zL(`#8y~DlBearpH{`vlo;ZxyD;py;PI6Gh%=p2}ntWr{%mQvD7DHExP^h8pTwdj$f
z(NuK#iss6b*ol}FdlOq9tQkxWzKyHmhvTXEw;}ydaws+QWw>bg((tVj>&VjR#nF!m
zb;6adDv#bzY~6Y{lp+JFM-g-lA(QTa&Sb`>T2t*YFqRp0H6}CA&I|@ME>S~KA?CSC
z$l+cn)0k?F2ca5xPFbQflu+PvO72JTp<-nbUq~einreKY8jPkIGt>hOHstb+riAg3
zf#-_%ftrq>gEjh{0s}yJBIGf8eLVm$3|qj<baI&tV*pm*F}5qVaSWC-XILr=ga?k{
zuK&kK7=js9MH$(_V)$cCY<cbce%W@JLeBCS1Pn@+%VRjY29N@tC=3MxOB;sc2&aF*
m@B|Z#894*0f7(=9R>*A(TpnTNn!k;?qm!-6r%%7OkNgIV5#Sa8

delta 896
zcmah_Ur3Wt6u<X=_xm?=>d*~A7pZJ&Lt^GWl3WrdQeso*ob&J8w>jt3oS$=U(}h@s
zR47V>$q<R~Atao=gzO>62Z<g+dZ-YeL_{P+NFuhbKKdf}oOAE_o%8#h!#$az7a!9z
zl~qF7{c!*abpRxOxt(^=`f{le0I*Bk;3fdFQRE3Wh!?o~r9i=G@(%#;5CGQf9dy`N
zruMdHr}7H496?VX4h~E6*NhVY77;@BB7g)X+GjDDnB7uiMQO{=*~4s@h%xXBjgpDj
zZ@diW?&0*g1N<>o$$!X=OxGPeP(N5PF($WZ!E{istPj_}tN+$e+)&+MZj?7ljjzlK
z^9%EKQ&m&AY2A`yDYtkmf1AzC@2xVc-fFQ1t>3K2Ey@;8%cc$3Ds3*?f^EB1-5PFP
zZT-^5wavFB+5_!79mbCJj>Aq(=cCS(uJW$8_7eL^w<6Mg-Jy1v94^N*$9FMDyd@5Z
zYtB1P(HV8_xR9&FWpX{~$>}lmgnK@@gYGxI1-)IpTfN5~ooCsz)0fvL_AT}8dG+3D
z@2dB-f2MzbaDON|v^8|(v-u`{tG-R&$#C_sG`uN^QdC-%;?h@XXT&%%F%tK4{+o6F
zxPO1tFuD=22A&3fjHQg#j77(GgSudCFdjmos!%i(5B&=lh9|>I<Kp=Cgn!~FqK^#3
zbcO!ckz^v7geBzL1#lNcz;gfujaDNV;caLT$SD=dv}Kwb1R$9a>Xj-rB$g>hY+gRg
zuyV*Uxv&^&NwETIOGv6zDGe$TNG%OAq=(68vs78i%=2av@-(E6SOqjjkWfly=+DI~
zU^!HgdhXc-!9ez4u4eHVLK<U4aWX6jH4s7yGpW2>m(FtO2$3SsA<C|xIToW7j%uP1
zqIjBv9O7PG%8o#cX@r>SB07`Y7x=ZTCM`2f!Lt;_lSv$eD4XVZ%u*ynl$@h8%2Q<w
sMH0lYm@~jNM0UlPqHqT3$+?t&B_pSZ;m_nCE2CwpnhOds<>!v^|45nU_5c6?


From 2d47752d6b2b0f331eeb8fc09e6ffd28db62d344 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Wed, 11 Dec 2024 16:47:43 +0100
Subject: [PATCH 107/479] Enhance drop feedback for empty panel (#235834)

fix #99052
---
 .../browser/parts/media/paneCompositePart.css | 10 +++++---
 .../browser/parts/paneCompositePart.ts        | 24 +++++++++++++++----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/vs/workbench/browser/parts/media/paneCompositePart.css b/src/vs/workbench/browser/parts/media/paneCompositePart.css
index 854c02e6bd5..a57bdd617ce 100644
--- a/src/vs/workbench/browser/parts/media/paneCompositePart.css
+++ b/src/vs/workbench/browser/parts/media/paneCompositePart.css
@@ -20,17 +20,21 @@
 	display: none;
 }
 
+.monaco-workbench .pane-composite-part.empty > .title.has-composite-bar > .title-label {
+	border-bottom: none !important;
+}
+
 .monaco-workbench .pane-composite-part > .header-or-footer {
 	padding-left: 4px;
 	padding-right: 4px;
 	background-color: var(--vscode-activityBarTop-background);
 }
 
-.monaco-workbench .pane-composite-part > .header {
+.monaco-workbench .pane-composite-part:not(.empty) > .header {
 	border-bottom: 1px solid var(--vscode-sideBarActivityBarTop-border);
 }
 
-.monaco-workbench .pane-composite-part > .footer {
+.monaco-workbench .pane-composite-part:not(.empty) > .footer {
 	border-top: 1px solid var(--vscode-sideBarActivityBarTop-border);
 }
 
@@ -325,7 +329,7 @@
 	width: 100%;
 }
 
-.monaco-workbench .pane-composite-part .empty-pane-message-area.visible {
+.monaco-workbench .pane-composite-part.empty .empty-pane-message-area {
 	display: flex;
 	align-items: center;
 	align-content: center;
diff --git a/src/vs/workbench/browser/parts/paneCompositePart.ts b/src/vs/workbench/browser/parts/paneCompositePart.ts
index cfad7c02b95..c8780871219 100644
--- a/src/vs/workbench/browser/parts/paneCompositePart.ts
+++ b/src/vs/workbench/browser/parts/paneCompositePart.ts
@@ -275,6 +275,20 @@ export abstract class AbstractPaneCompositePart extends CompositePart<PaneCompos
 		this.emptyPaneMessageElement.appendChild(messageElement);
 		parent.appendChild(this.emptyPaneMessageElement);
 
+		const setDropBackgroundFeedback = (visible: boolean) => {
+			const updateActivityBarBackground = !this.getActiveComposite() || !visible;
+			const backgroundColor = visible ? this.theme.getColor(EDITOR_DRAG_AND_DROP_BACKGROUND)?.toString() || '' : '';
+
+			if (this.titleContainer && updateActivityBarBackground) {
+				this.titleContainer.style.backgroundColor = backgroundColor;
+			}
+			if (this.headerFooterCompositeBarContainer && updateActivityBarBackground) {
+				this.headerFooterCompositeBarContainer.style.backgroundColor = backgroundColor;
+			}
+
+			this.emptyPaneMessageElement!.style.backgroundColor = backgroundColor;
+		};
+
 		this._register(CompositeDragAndDropObserver.INSTANCE.registerTarget(this.element, {
 			onDragOver: (e) => {
 				EventHelper.stop(e.eventData, true);
@@ -287,20 +301,20 @@ export abstract class AbstractPaneCompositePart extends CompositePart<PaneCompos
 				EventHelper.stop(e.eventData, true);
 				if (this.paneCompositeBar.value) {
 					const validDropTarget = this.paneCompositeBar.value.dndHandler.onDragEnter(e.dragAndDropData, undefined, e.eventData);
-					this.emptyPaneMessageElement!.style.backgroundColor = validDropTarget ? this.theme.getColor(EDITOR_DRAG_AND_DROP_BACKGROUND)?.toString() || '' : '';
+					setDropBackgroundFeedback(validDropTarget);
 				}
 			},
 			onDragLeave: (e) => {
 				EventHelper.stop(e.eventData, true);
-				this.emptyPaneMessageElement!.style.backgroundColor = '';
+				setDropBackgroundFeedback(false);
 			},
 			onDragEnd: (e) => {
 				EventHelper.stop(e.eventData, true);
-				this.emptyPaneMessageElement!.style.backgroundColor = '';
+				setDropBackgroundFeedback(false);
 			},
 			onDrop: (e) => {
 				EventHelper.stop(e.eventData, true);
-				this.emptyPaneMessageElement!.style.backgroundColor = '';
+				setDropBackgroundFeedback(false);
 				if (this.paneCompositeBar.value) {
 					this.paneCompositeBar.value.dndHandler.drop(e.dragAndDropData, undefined, e.eventData);
 				} else {
@@ -596,7 +610,7 @@ export abstract class AbstractPaneCompositePart extends CompositePart<PaneCompos
 
 	private layoutEmptyMessage(): void {
 		const visible = !this.getActiveComposite();
-		this.emptyPaneMessageElement?.classList.toggle('visible', visible);
+		this.element.classList.toggle('empty', visible);
 		if (visible) {
 			this.titleLabel?.updateTitle('', '');
 		}

From 28603ba8ff869105968dc01209f06839e52fd578 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Wed, 11 Dec 2024 17:05:06 +0100
Subject: [PATCH 108/479] when only one hover part, focus that hover part
 (#235829)

---
 .../editor/contrib/hover/browser/contentHoverRendered.ts  | 8 ++++++++
 .../contrib/hover/browser/contentHoverWidgetWrapper.ts    | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/src/vs/editor/contrib/hover/browser/contentHoverRendered.ts b/src/vs/editor/contrib/hover/browser/contentHoverRendered.ts
index c72ecfb5910..dde3cb77bb6 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverRendered.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverRendered.ts
@@ -79,6 +79,10 @@ export class RenderedContentHover extends Disposable {
 		return this._renderedHoverParts.focusedHoverPartIndex;
 	}
 
+	public get hoverPartsCount(): number {
+		return this._renderedHoverParts.hoverPartsCount;
+	}
+
 	public focusHoverPartWithIndex(index: number): void {
 		this._renderedHoverParts.focusHoverPartWithIndex(index);
 	}
@@ -436,4 +440,8 @@ class RenderedContentHoverParts extends Disposable {
 	public get focusedHoverPartIndex(): number {
 		return this._focusedHoverPartIndex;
 	}
+
+	public get hoverPartsCount(): number {
+		return this._renderedParts.length;
+	}
 }
diff --git a/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts b/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts
index 5beccabb33b..cd2fedb338d 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts
@@ -329,6 +329,11 @@ export class ContentHoverWidgetWrapper extends Disposable implements IHoverWidge
 	}
 
 	public focus(): void {
+		const hoverPartsCount = this._renderedContentHover?.hoverPartsCount;
+		if (hoverPartsCount === 1) {
+			this.focusHoverPartWithIndex(0);
+			return;
+		}
 		this._contentHoverWidget.focus();
 	}
 

From d9cf59b66d040d45cc8cc7a2d1de3134f5f4b0c0 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Wed, 11 Dec 2024 17:41:51 +0100
Subject: [PATCH 109/479] Not clear how to add additional reactions to PR
 comments (#235828)

Fixes #133601
---
 src/vs/workbench/contrib/comments/browser/commentNode.ts  | 8 ++------
 .../workbench/contrib/comments/browser/media/review.css   | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/contrib/comments/browser/commentNode.ts b/src/vs/workbench/contrib/comments/browser/commentNode.ts
index a8598ae91e4..37958bce7d8 100644
--- a/src/vs/workbench/contrib/comments/browser/commentNode.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentNode.ts
@@ -145,9 +145,7 @@ export class CommentNode<T extends IRange | ICellRange> extends Disposable {
 		this.createScroll(this._commentDetailsContainer, this._body);
 		this.updateCommentBody(this.comment.body);
 
-		if (this.comment.commentReactions && this.comment.commentReactions.length && this.comment.commentReactions.filter(reaction => !!reaction.count).length) {
-			this.createReactionsContainer(this._commentDetailsContainer);
-		}
+		this.createReactionsContainer(this._commentDetailsContainer);
 
 		this._domNode.setAttribute('aria-label', `${comment.userName}, ${this.commentBodyValue}`);
 		this._domNode.setAttribute('role', 'treeitem');
@@ -744,9 +742,7 @@ export class CommentNode<T extends IRange | ICellRange> extends Disposable {
 
 		this._reactionsActionBar?.clear();
 
-		if (this.comment.commentReactions && this.comment.commentReactions.some(reaction => !!reaction.count)) {
-			this.createReactionsContainer(this._commentDetailsContainer);
-		}
+		this.createReactionsContainer(this._commentDetailsContainer);
 
 		if (this.comment.contextValue) {
 			this._commentContextValue.set(this.comment.contextValue);
diff --git a/src/vs/workbench/contrib/comments/browser/media/review.css b/src/vs/workbench/contrib/comments/browser/media/review.css
index 7ffd420fbd3..e062349f9de 100644
--- a/src/vs/workbench/contrib/comments/browser/media/review.css
+++ b/src/vs/workbench/contrib/comments/browser/media/review.css
@@ -183,7 +183,7 @@
 	border: none;
 }
 
-.review-widget .body .review-comment .review-comment-contents .comment-reactions:hover .action-item a.action-label.toolbar-toggle-pickReactions {
+.review-widget .body .review-comment .review-comment-contents:hover .comment-reactions .action-item a.action-label.toolbar-toggle-pickReactions {
 	display: inline-block;
 	background-size: 16px;
 }

From 09fe3fcbc1514bc35742dc4325d05b7d7adfcad2 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Wed, 11 Dec 2024 17:53:04 +0100
Subject: [PATCH 110/479] Adopt new Ruby grammar (#235732)

---
 extensions/ruby/cgmanifest.json               |   57 +-
 extensions/ruby/package.json                  |    2 +-
 extensions/ruby/syntaxes/ruby.tmLanguage.json | 4540 +++++++++--------
 .../theme-defaults/themes/dark_plus.json      |    3 +-
 .../theme-defaults/themes/hc_black.json       |    3 +-
 .../theme-defaults/themes/hc_light.json       |    3 +-
 .../theme-defaults/themes/light_plus.json     |    3 +-
 .../themes/kimbie-dark-color-theme.json       |    3 +-
 .../themes/dimmed-monokai-color-theme.json    |    5 +-
 .../themes/monokai-color-theme.json           |    5 +-
 .../themes/quietlight-color-theme.json        |    1 +
 .../theme-red/themes/Red-color-theme.json     |    7 +-
 .../themes/solarized-dark-color-theme.json    |    5 +-
 .../themes/solarized-light-color-theme.json   |    5 +-
 .../tomorrow-night-blue-color-theme.json      |    2 +-
 .../test/colorize-results/test_rb.json        | 1002 +++-
 16 files changed, 3298 insertions(+), 2348 deletions(-)

diff --git a/extensions/ruby/cgmanifest.json b/extensions/ruby/cgmanifest.json
index 2cd9595e4e5..49719a8afe9 100644
--- a/extensions/ruby/cgmanifest.json
+++ b/extensions/ruby/cgmanifest.json
@@ -4,27 +4,56 @@
 			"component": {
 				"type": "git",
 				"git": {
-					"name": "textmate/ruby.tmbundle",
-					"repositoryUrl": "https://github.com/textmate/ruby.tmbundle",
-					"commitHash": "efcb8941c701343f1b2e9fb105c678152fea6892"
+					"name": "Shopify/ruby-lsp",
+					"repositoryUrl": "https://github.com/Shopify/ruby-lsp",
+					"commitHash": "01a8ecf608b7d8607adcd89c32db72ae3852f33b"
 				}
 			},
 			"licenseDetail": [
-				"Copyright (c) textmate-ruby.tmbundle project authors",
+				"The MIT License (MIT)",
 				"",
-				"If not otherwise specified (see below), files in this folder fall under the following license: ",
+				"Copyright (c) 2022-present, Shopify Inc.",
 				"",
-				"Permission to copy, use, modify, sell and distribute this",
-				"software is granted. This software is provided \"as is\" without",
-				"express or implied warranty, and with no claim as to its",
-				"suitability for any purpose.",
+				"Permission is hereby granted, free of charge, to any person obtaining a copy",
+				"of this software and associated documentation files (the \"Software\"), to deal",
+				"in the Software without restriction, including without limitation the rights",
+				"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
+				"copies of the Software, and to permit persons to whom the Software is",
+				"furnished to do so, subject to the following conditions:",
 				"",
-				"An exception is made for files in readable text which contain their own license information, ",
-				"or files where an accompanying file exists (in the same directory) with a \"-license\" suffix added ",
-				"to the base-name name of the original file, and an extension of txt, html, or similar. For example ",
-				"\"tidy\" is accompanied by \"tidy-license.txt\"."
+				"The above copyright notice and this permission notice shall be included in",
+				"all copies or substantial portions of the Software.",
+				"",
+				"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+				"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+				"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+				"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
+				"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,",
+				"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN",
+				"THE SOFTWARE.",
+				"",
+				"================================================================================",
+				"The following files and related configuration in package.json are based on a",
+				"sequence of adaptions: grammars/ruby.cson.json, grammars/erb.cson.json,",
+				"languages/erb.json.",
+				"",
+				"Copyright (c) 2016 Peng Lv",
+				"Copyright (c) 2017-2019 Stafford Brunk",
+				"https://github.com/rubyide/vscode-ruby",
+				"",
+				"    Released under the MIT license",
+				"    https://github.com/rubyide/vscode-ruby/blob/main/LICENSE.txt",
+				"",
+				"Copyright (c) 2014 GitHub Inc.",
+				"https://github.com/atom/language-ruby",
+				"",
+				"    Released under the MIT license",
+				"    https://github.com/atom/language-ruby/blob/master/LICENSE.md",
+				"",
+				"https://github.com/textmate/ruby.tmbundle",
+				"    https://github.com/textmate/ruby.tmbundle#license"
 			],
-			"license": "TextMate Bundle License",
+			"license": "MIT License",
 			"version": "0.0.0"
 		}
 	],
diff --git a/extensions/ruby/package.json b/extensions/ruby/package.json
index 8210a7825af..8dc105b3481 100644
--- a/extensions/ruby/package.json
+++ b/extensions/ruby/package.json
@@ -9,7 +9,7 @@
     "vscode": "*"
   },
   "scripts": {
-    "update-grammar": "node ../node_modules/vscode-grammar-updater/bin textmate/ruby.tmbundle Syntaxes/Ruby.plist ./syntaxes/ruby.tmLanguage.json"
+    "update-grammar": "node ../node_modules/vscode-grammar-updater/bin Shopify/ruby-lsp vscode/grammars/ruby.cson.json ./syntaxes/ruby.tmLanguage.json"
   },
   "categories": ["Programming Languages"],
   "contributes": {
diff --git a/extensions/ruby/syntaxes/ruby.tmLanguage.json b/extensions/ruby/syntaxes/ruby.tmLanguage.json
index 84d619cc51a..84fb37228e6 100644
--- a/extensions/ruby/syntaxes/ruby.tmLanguage.json
+++ b/extensions/ruby/syntaxes/ruby.tmLanguage.json
@@ -1,13 +1,12 @@
 {
 	"information_for_contributors": [
-		"This file has been converted from https://github.com/textmate/ruby.tmbundle/blob/master/Syntaxes/Ruby.plist",
+		"This file has been converted from https://github.com/Shopify/ruby-lsp/blob/master/vscode/grammars/ruby.cson.json",
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/textmate/ruby.tmbundle/commit/efcb8941c701343f1b2e9fb105c678152fea6892",
+	"version": "https://github.com/Shopify/ruby-lsp/commit/01a8ecf608b7d8607adcd89c32db72ae3852f33b",
 	"name": "Ruby",
 	"scopeName": "source.ruby",
-	"comment": "\n\tTODO: unresolved issues\n\n\ttext:\n\t\"p <<end\n\tprint me!\n\tend\"\n\tsymptoms:\n\tnot recognized as a heredoc\n\tsolution:\n\tthere is no way to distinguish perfectly between the << operator and the start\n\tof a heredoc. Currently, we require assignment to recognize a heredoc. More\n\trefinement is possible.\n\t• Heredocs with indented terminators (<<-) are always distinguishable, however.\n\t• Nested heredocs are not really supportable at present\n\n\ttext:\n\tprint <<-'THERE' \n\tThis is single quoted. \n\tThe above used #{Time.now} \n\tTHERE \n\tsymtoms:\n\tFrom Programming Ruby p306; should be a non-interpolated heredoc.\n\t\n    text:\n    val?(a):p(b)\n    val?'a':'b'\n    symptoms:\n    ':p' is recognized as a symbol.. its 2 things ':' and 'p'.\n    :'b' has same problem.\n    solution:\n    ternary operator rule, precedence stuff, symbol rule.\n    but also consider 'a.b?(:c)' ??\n",
 	"patterns": [
 		{
 			"captures": {
@@ -17,20 +16,21 @@
 				"2": {
 					"name": "entity.name.type.class.ruby"
 				},
-				"3": {
-					"name": "keyword.operator.other.ruby"
+				"5": {
+					"name": "punctuation.separator.namespace.ruby"
 				},
-				"4": {
-					"name": "entity.other.inherited-class.ruby"
+				"7": {
+					"name": "punctuation.separator.inheritance.ruby"
 				},
-				"5": {
-					"name": "keyword.operator.other.ruby"
+				"8": {
+					"name": "entity.other.inherited-class.ruby"
 				},
-				"6": {
-					"name": "variable.other.object.ruby"
+				"11": {
+					"name": "punctuation.separator.namespace.ruby"
 				}
 			},
-			"match": "^\\s*(class)\\s+(?:([.a-zA-Z0-9_:]+)(?:\\s*(<)\\s*([.a-zA-Z0-9_:]+))?|(<<)\\s*([.a-zA-Z0-9_:]+))",
+			"comment": "class Namespace::ClassName < OtherNamespace::OtherClassName",
+			"match": "\b(class)\\s+(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*)\\s*((<)\\s*(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*))?",
 			"name": "meta.class.ruby"
 		},
 		{
@@ -41,42 +41,114 @@
 				"2": {
 					"name": "entity.name.type.module.ruby"
 				},
-				"3": {
-					"name": "entity.other.inherited-class.module.first.ruby"
+				"5": {
+					"name": "punctuation.separator.namespace.ruby"
+				}
+			},
+			"match": "\b(module)\\s+(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*)",
+			"name": "meta.module.ruby"
+		},
+		{
+			"captures": {
+				"1": {
+					"name": "keyword.control.class.ruby"
 				},
-				"4": {
+				"2": {
 					"name": "punctuation.separator.inheritance.ruby"
+				}
+			},
+			"match": "\b(class)\\s*(<<)\\s*",
+			"name": "meta.class.ruby"
+		},
+		{
+			"comment": "else if is a common mistake carried over from other languages. it works if you put in a second end, but it’s never what you want.",
+			"match": "(?<!\\.)\\belse(\\s)+if\\b",
+			"name": "invalid.deprecated.ruby"
+		},
+		{
+			"captures": {
+				"1": {
+					"name": "variable.ruby"
+				},
+				"3": {
+					"name": "keyword.operator.assignment.augmented.ruby"
+				}
+			},
+			"match": "^\\s*([a-z]([A-Za-z0-9_])*)\\s*((&&|\\|\\|)=)",
+			"comment": "A local variable and/or assignment"
+		},
+		{
+			"captures": {
+				"1": {
+					"name": "keyword.control.ruby"
+				},
+				"3": {
+					"name": "variable.ruby"
 				},
 				"5": {
-					"name": "entity.other.inherited-class.module.second.ruby"
+					"name": "keyword.operator.assignment.augmented.ruby"
+				}
+			},
+			"match": "(?<!\\.)\\b(case|if|elsif|unless|until|while)\\b\\s*(\\()*?\\s*([a-z]([A-Za-z0-9_])*)\\s*((&&|\\|\\|)=)",
+			"comment": "A local variable and/or assignment in a condition"
+		},
+		{
+			"captures": {
+				"1": {
+					"name": "variable.ruby"
 				},
-				"6": {
-					"name": "punctuation.separator.inheritance.ruby"
+				"3": {
+					"name": "keyword.operator.assignment.augmented.ruby"
+				}
+			},
+			"match": "^\\s*([a-z]([A-Za-z0-9_])*)\\s*((\\+|\\*|-|\\/|%|\\*\\*|&|\\||\\^|<<|>>)=)",
+			"comment": "A local variable operation assignment (+=, -=, *=, /=)"
+		},
+		{
+			"captures": {
+				"1": {
+					"name": "keyword.control.ruby"
 				},
-				"7": {
-					"name": "entity.other.inherited-class.module.third.ruby"
+				"3": {
+					"name": "variable.ruby"
 				},
-				"8": {
-					"name": "punctuation.separator.inheritance.ruby"
+				"5": {
+					"name": "keyword.operator.assignment.augmented.ruby"
 				}
 			},
-			"match": "^\\s*(module)\\s+(([A-Z]\\w*(::))?([A-Z]\\w*(::))?([A-Z]\\w*(::))*[A-Z]\\w*)",
-			"name": "meta.module.ruby"
+			"match": "(?<!\\.)\\b(case|if|elsif|unless|until|while)\\b\\s*(\\()*?\\s*([a-z]([A-Za-z0-9_])*)\\s*((\\+|\\*|-|\\/|%|\\*\\*|&|\\||\\^|<<|>>)=)",
+			"comment": "A local variable operation assignment in a condition"
 		},
 		{
-			"comment": "else if is a common mistake carried over from other languages. it works if you put in a second end, but it’s never what you want.",
-			"match": "(?<!\\.)\\belse(\\s)+if\\b",
-			"name": "invalid.deprecated.ruby"
+			"captures": {
+				"1": {
+					"name": "variable.ruby"
+				}
+			},
+			"match": "^\\s*([a-z]([A-Za-z0-9_])*)\\s*=[^=>]",
+			"comment": "A local variable assignment"
 		},
 		{
 			"captures": {
 				"1": {
-					"name": "punctuation.definition.constant.ruby"
+					"name": "keyword.control.ruby"
+				},
+				"3": {
+					"name": "variable.ruby"
+				}
+			},
+			"match": "(?<!\\.)\\b(case|if|elsif|unless|until|while)\\b\\s*(\\()*?\\s*([a-z]([A-Za-z0-9_])*)\\s*=[^=>]",
+			"comment": "A local variable assignment in a condition"
+		},
+		{
+			"captures": {
+				"1": {
+					"name": "punctuation.definition.constant.hashkey.ruby"
 				}
 			},
 			"comment": "symbols as hash key (1.9 syntax)",
 			"match": "(?>[a-zA-Z_]\\w*(?>[?!])?)(:)(?!:)",
-			"name": "constant.other.symbol.hashkey.ruby"
+			"name": "constant.language.symbol.hashkey.ruby"
 		},
 		{
 			"captures": {
@@ -86,7 +158,7 @@
 			},
 			"comment": "symbols as hash key (1.8 syntax)",
 			"match": "(?<!:)(:)(?>[a-zA-Z_]\\w*(?>[?!])?)(?=\\s*=>)",
-			"name": "constant.other.symbol.hashkey.ruby"
+			"name": "constant.language.symbol.hashkey.ruby"
 		},
 		{
 			"comment": "everything being a reserved word, not a value and needing a 'end' is a..",
@@ -100,61 +172,42 @@
 		},
 		{
 			"comment": "contextual smart pair support",
-			"match": "(?<=\\{)(\\s+)",
+			"match": "(?<={)(\\s+)",
 			"name": "meta.syntax.ruby.start-block"
 		},
 		{
-			"match": "(?<!\\.)\\b(alias|alias_method|block_given[?]|break|defined[?]|iterator[?]|next|redo|retry|return|super|undef|yield)(\\b|(?<=[?]))(?![?!])",
+			"match": "(?<!\\.)\\b(alias|alias_method|break|next|redo|retry|return|super|undef|yield)\\b(?![?!])|\\bdefined\\?|\\b(block_given|iterator)\\?",
 			"name": "keyword.control.pseudo-method.ruby"
 		},
 		{
-			"match": "\\b(nil|true|false)\\b(?![?!])",
-			"name": "constant.language.ruby"
+			"match": "\\bnil\\b(?![?!])",
+			"name": "constant.language.nil.ruby"
 		},
 		{
-			"match": "\\b(__(dir|FILE|LINE)__)\\b(?![?!])",
-			"name": "variable.language.ruby"
+			"match": "\\b(true|false)\\b(?![?!])",
+			"name": "constant.language.boolean.ruby"
 		},
 		{
-			"begin": "^__END__\\n",
-			"captures": {
-				"0": {
-					"name": "string.unquoted.program-block.ruby"
-				}
-			},
-			"comment": "__END__ marker",
-			"contentName": "text.plain",
-			"end": "(?=not)impossible",
-			"patterns": [
-				{
-					"begin": "(?=<?xml|<(?i:html\\b)|!DOCTYPE (?i:html\\b))",
-					"end": "(?=not)impossible",
-					"name": "text.html.embedded.ruby",
-					"patterns": [
-						{
-							"include": "text.html.basic"
-						}
-					]
-				}
-			]
+			"match": "\\b(__(FILE|LINE)__)\\b(?![?!])",
+			"name": "variable.language.ruby"
 		},
 		{
-			"match": "\\b(self)\\b(?![?!])",
+			"match": "\\bself\\b(?![?!])",
 			"name": "variable.language.self.ruby"
 		},
 		{
 			"comment": " everything being a method but having a special function is a..",
-			"match": "\\b(initialize|new|loop|include|extend|prepend|fail|raise|attr_reader|attr_writer|attr_accessor|attr|catch|throw|private|private_class_method|module_function|public|public_class_method|protected|refine|using)\\b(?![?!])",
+			"match": "\\b(initialize|new|loop|include|extend|prepend|raise|fail|attr_reader|attr_writer|attr_accessor|attr|catch|throw|private|private_class_method|module_function|public|public_class_method|protected|refine|using)\\b(?![?!])",
 			"name": "keyword.other.special-method.ruby"
 		},
 		{
-			"begin": "\\b(?<!\\.|::)(require|require_relative)\\b",
+			"begin": "\\b(?<!\\.|::)(require|require_relative)\\b(?![?!])",
 			"captures": {
 				"1": {
 					"name": "keyword.other.special-method.ruby"
 				}
 			},
-			"end": "$|(?=#|\\})",
+			"end": "$|(?=#|})",
 			"name": "meta.require.ruby",
 			"patterns": [
 				{
@@ -195,7 +248,7 @@
 					"name": "punctuation.definition.variable.ruby"
 				}
 			},
-			"match": "(\\$)(!|@|&|`|'|\\+|\\d+|~|=|/|\\\\|,|;|\\.|<|>|_|\\*|\\$|\\?|:|\"|-[0adFiIlpvw])",
+			"match": "(\\$)(!|@|&|`|'|\\+|\\d+|~|=|/|\\\\|,|;|\\.|<|>|_|\\*|\\$|\\?|:|\"|-[0adFiIlpv])",
 			"name": "variable.other.readwrite.global.pre-defined.ruby"
 		},
 		{
@@ -205,7 +258,7 @@
 					"name": "variable.other.constant.ruby"
 				}
 			},
-			"end": "\\]",
+			"end": "]",
 			"name": "meta.environment-variable.ruby",
 			"patterns": [
 				{
@@ -218,15 +271,39 @@
 			"name": "support.class.ruby"
 		},
 		{
-			"match": "\\b(abort|at_exit|autoload[?]?|binding|callcc|caller|caller_locations|chomp|chop|eval|exec|exit|exit!|fork|format|gets|global_variables|gsub|lambda|load|local_variables|open|p|print|printf|proc|putc|puts|rand|readline|readlines|select|set_trace_func|sleep|spawn|sprintf|srand|sub|syscall|system|test|trace_var|trap|untrace_var|warn)(\\b|(?<=[?!]))(?![?!])",
+			"match": "\\b((abort|at_exit|autoload|binding|callcc|caller|caller_locations|chomp|chop|eval|exec|exit|fork|format|gets|global_variables|gsub|lambda|load|local_variables|open|p|print|printf|proc|putc|puts|rand|readline|readlines|select|set_trace_func|sleep|spawn|sprintf|srand|sub|syscall|system|test|trace_var|trap|untrace_var|warn)\\b(?![?!])|autoload\\?|exit!)",
 			"name": "support.function.kernel.ruby"
 		},
 		{
-			"match": "\\b[A-Z]\\w*\\b",
+			"match": "\\b[_A-Z]\\w*\\b",
 			"name": "variable.other.constant.ruby"
 		},
 		{
-			"begin": "(?x)\n\t\t\t         (?=def\\b)                                                      # an optimization to help Oniguruma fail fast\n\t\t\t         (?<=^|\\s)(def)\\s+                                              # the def keyword\n\t\t\t         ( (?>[a-zA-Z_]\\w*(?>\\.|::))?                                   # a method name prefix\n\t\t\t           (?>[a-zA-Z_]\\w*(?>[?!]|=(?!>))?                              # the method name\n\t\t\t           |===?|!=|!~|>[>=]?|<=>|<[<=]?|[%&`/\\|^]|\\*\\*?|=?~|[-+]@?|\\[\\]=?) )  # …or an operator method\n\t\t\t         \\s*(\\()                                                        # the openning parenthesis for arguments\n\t\t\t        ",
+			"begin": "(->)\\(",
+			"beginCaptures": {
+				"1": {
+					"name": "support.function.kernel.ruby"
+				}
+			},
+			"comment": "Lambda parameters.",
+			"end": "\\)",
+			"patterns": [
+				{
+					"begin": "(?=[&*_a-zA-Z])",
+					"end": "(?=[,)])",
+					"patterns": [
+						{
+							"include": "#method_parameters"
+						}
+					]
+				},
+				{
+					"include": "#method_parameters"
+				}
+			]
+		},
+		{
+			"begin": "(?x)\n(?=def\\b)                          # optimization to help Oniguruma fail fast\n(?<=^|\\s)(def)\\s+\n(\n  (?>[a-zA-Z_]\\w*(?>\\.|::))?      # method prefix\n  (?>                               # method name\n    [a-zA-Z_]\\w*(?>[?!]|=(?!>))?\n    |\n    ===?|!=|>[>=]?|<=>|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[]=?\n  )\n)\n\\s*(\\()",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.def.ruby"
@@ -238,7 +315,7 @@
 					"name": "punctuation.definition.parameters.ruby"
 				}
 			},
-			"comment": "the method pattern comes from the symbol pattern, see there for a explaination",
+			"comment": "The method pattern comes from the symbol pattern. See there for an explanation.",
 			"end": "\\)",
 			"endCaptures": {
 				"0": {
@@ -252,89 +329,17 @@
 					"end": "(?=[,)])",
 					"patterns": [
 						{
-							"captures": {
-								"1": {
-									"name": "storage.type.variable.ruby"
-								},
-								"2": {
-									"name": "constant.other.symbol.hashkey.parameter.function.ruby"
-								},
-								"3": {
-									"name": "punctuation.definition.constant.ruby"
-								},
-								"4": {
-									"name": "variable.parameter.function.ruby"
-								}
-							},
-							"match": "\\G([&*]?)(?:([_a-zA-Z]\\w*(:))|([_a-zA-Z]\\w*))"
-						},
-						{
-							"include": "#parens"
-						},
-						{
-							"include": "#braces"
-						},
-						{
-							"include": "$self"
-						}
-					]
-				}
-			],
-			"repository": {
-				"braces": {
-					"begin": "\\{",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.section.function.begin.ruby"
-						}
-					},
-					"end": "\\}",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.section.function.end.ruby"
-						}
-					},
-					"patterns": [
-						{
-							"include": "#parens"
-						},
-						{
-							"include": "#braces"
-						},
-						{
-							"include": "$self"
+							"include": "#method_parameters"
 						}
 					]
 				},
-				"parens": {
-					"begin": "\\(",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.section.function.begin.ruby"
-						}
-					},
-					"end": "\\)",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.section.function.end.ruby"
-						}
-					},
-					"patterns": [
-						{
-							"include": "#parens"
-						},
-						{
-							"include": "#braces"
-						},
-						{
-							"include": "$self"
-						}
-					]
+				{
+					"include": "#method_parameters"
 				}
-			}
+			]
 		},
 		{
-			"begin": "(?x)\n\t\t\t         (?=def\\b)                                                      # an optimization to help Oniguruma fail fast\n\t\t\t         (?<=^|\\s)(def)\\s+                                              # the def keyword\n\t\t\t         ( (?>[a-zA-Z_]\\w*(?>\\.|::))?                                   # a method name prefix\n\t\t\t           (?>[a-zA-Z_]\\w*(?>[?!]|=(?!>))?                              # the method name\n\t\t\t           |===?|!=|!~|>[>=]?|<=>|<[<=]?|[%&`/\\|^]|\\*\\*?|=?~|[-+]@?|\\[\\]=?) )  # …or an operator method\n\t\t\t         [ \\t]                                                          # the space separating the arguments\n\t\t\t         (?=[ \\t]*[^\\s#;])                                              # make sure arguments and not a comment follow\n\t\t\t        ",
+			"begin": "(?x)\n(?=def\\b)                          # optimization to help Oniguruma fail fast\n(?<=^|\\s)(def)\\s+\n(\n  (?>[a-zA-Z_]\\w*(?>\\.|::))?      # method prefix\n  (?>                               # method name\n    [a-zA-Z_]\\w*(?>[?!]|=(?!>))?\n    |\n    ===?|!=|>[>=]?|<=>|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[]=?\n  )\n)\n[ \\t]\n(?=[ \\t]*[^\\s#;])                 # make sure the following is not comment",
 			"beginCaptures": {
 				"1": {
 					"name": "keyword.control.def.ruby"
@@ -344,35 +349,20 @@
 				}
 			},
 			"comment": "same as the previous rule, but without parentheses around the arguments",
-			"end": "$",
+			"end": "(?=;)|(?<=[\\w\\])}`'\"!?])(?=\\s*#|\\s*$)",
 			"name": "meta.function.method.with-arguments.ruby",
 			"patterns": [
 				{
-					"begin": "(?![\\s,])",
-					"end": "(?=,|$)",
+					"begin": "(?=[&*_a-zA-Z])",
+					"end": "(?=,|;|\\s*#|\\s*$)",
 					"patterns": [
 						{
-							"captures": {
-								"1": {
-									"name": "storage.type.variable.ruby"
-								},
-								"2": {
-									"name": "constant.other.symbol.hashkey.parameter.function.ruby"
-								},
-								"3": {
-									"name": "punctuation.definition.constant.ruby"
-								},
-								"4": {
-									"name": "variable.parameter.function.ruby"
-								}
-							},
-							"match": "\\G([&*]?)(?:([_a-zA-Z]\\w*(:))|([_a-zA-Z]\\w*))",
-							"name": "variable.parameter.function.ruby"
-						},
-						{
-							"include": "$self"
+							"include": "#method_parameters"
 						}
 					]
+				},
+				{
+					"include": "#method_parameters"
 				}
 			]
 		},
@@ -386,38 +376,28 @@
 				}
 			},
 			"comment": " the optional name is just to catch the def also without a method-name",
-			"match": "(?x)\n\t\t\t         (?=def\\b)                                                           # an optimization to help Oniguruma fail fast\n\t\t\t         (?<=^|\\s)(def)\\b                                                    # the def keyword\n\t\t\t         ( \\s+                                                               # an optional group of whitespace followed by…\n\t\t\t           ( (?>[a-zA-Z_]\\w*(?>\\.|::))?                                      # a method name prefix\n\t\t\t             (?>[a-zA-Z_]\\w*(?>[?!]|=(?!>))?                                 # the method name\n\t\t\t             |===?|!=|!~|>[>=]?|<=>|<[<=]?|[%&`/\\|^]|\\*\\*?|=?~|[-+]@?|\\[\\]=?) ) )?  # …or an operator method\n\t\t\t        ",
+			"match": "(?x)\n(?=def\\b)                            # optimization to help Oniguruma fail fast\n(?<=^|\\s)(def)\\b\n(\n  \\s+\n  (\n    (?>[a-zA-Z_]\\w*(?>\\.|::))?      # method prefix\n    (?>                               # method name\n      [a-zA-Z_]\\w*(?>[?!]|=(?!>))?\n      |\n      ===?|!=|>[>=]?|<=>|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[]=?\n    )\n  )\n)?",
 			"name": "meta.function.method.without-arguments.ruby"
 		},
 		{
-			"match": "\\b\\d(?>_?\\d)*(?=\\.\\d|[eE])(\\.\\d(?>_?\\d)*)?([eE][-+]?\\d(?>_?\\d)*)?r?i?\\b",
-			"name": "constant.numeric.float.ruby"
-		},
-		{
-			"match": "\\b(0|(0[dD]\\d|[1-9])(?>_?\\d)*)r?i?\\b",
-			"name": "constant.numeric.integer.ruby"
-		},
-		{
-			"match": "\\b0[xX]\\h(?>_?\\h)*r?i?\\b",
-			"name": "constant.numeric.hex.ruby"
-		},
-		{
-			"match": "\\b0[bB][01](?>_?[01])*r?i?\\b",
-			"name": "constant.numeric.binary.ruby"
-		},
-		{
-			"match": "\\b0([oO]?[0-7](?>_?[0-7])*)?r?i?\\b",
-			"name": "constant.numeric.octal.ruby"
+			"match": "(?x)\n\\b\n(\n  [\\d](?>_?\\d)*                             # 100_000\n  (\\.(?![^[:space:][:digit:]])(?>_?\\d)*)?   # fractional part\n  ([eE][-+]?\\d(?>_?\\d)*)?                   # 1.23e-4\n  |\n  0\n  (?:\n    [xX]\\h(?>_?\\h)*|\n    [oO]?[0-7](?>_?[0-7])*|\n    [bB][01](?>_?[01])*|\n    [dD]\\d(?>_?\\d)*\n  )                                           # A base indicator can only be used with an integer\n)\\b",
+			"name": "constant.numeric.ruby"
 		},
 		{
 			"begin": ":'",
-			"captures": {
+			"beginCaptures": {
 				"0": {
-					"name": "punctuation.definition.constant.ruby"
+					"name": "punctuation.definition.symbol.begin.ruby"
 				}
 			},
+			"comment": "symbol literal with '' delimiter",
 			"end": "'",
-			"name": "constant.other.symbol.single-quoted.ruby",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.symbol.end.ruby"
+				}
+			},
+			"name": "constant.language.symbol.ruby",
 			"patterns": [
 				{
 					"match": "\\\\['\\\\]",
@@ -427,13 +407,19 @@
 		},
 		{
 			"begin": ":\"",
-			"captures": {
+			"beginCaptures": {
 				"0": {
-					"name": "punctuation.definition.constant.ruby"
+					"name": "punctuation.section.symbol.begin.ruby"
 				}
 			},
+			"comment": "symbol literal with \"\" delimiter",
 			"end": "\"",
-			"name": "constant.other.symbol.double-quoted.ruby",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.symbol.end.ruby"
+				}
+			},
+			"name": "constant.language.symbol.interpolated.ruby",
 			"patterns": [
 				{
 					"include": "#interpolated_ruby"
@@ -455,7 +441,7 @@
 					"name": "punctuation.definition.string.begin.ruby"
 				}
 			},
-			"comment": "single quoted string (does not allow interpolation)",
+			"comment": "string literal with '' delimiter",
 			"end": "'",
 			"endCaptures": {
 				"0": {
@@ -477,14 +463,14 @@
 					"name": "punctuation.definition.string.begin.ruby"
 				}
 			},
-			"comment": "double quoted string (allows for interpolation)",
+			"comment": "string literal with interpolation and \"\" delimiter",
 			"end": "\"",
 			"endCaptures": {
 				"0": {
 					"name": "punctuation.definition.string.end.ruby"
 				}
 			},
-			"name": "string.quoted.double.ruby",
+			"name": "string.quoted.double.interpolated.ruby",
 			"patterns": [
 				{
 					"include": "#interpolated_ruby"
@@ -495,7 +481,7 @@
 			]
 		},
 		{
-			"begin": "`",
+			"begin": "(?<!\\.)`",
 			"beginCaptures": {
 				"0": {
 					"name": "punctuation.definition.string.begin.ruby"
@@ -519,20 +505,17 @@
 			]
 		},
 		{
-			"include": "#percent_literals"
-		},
-		{
-			"begin": "(?x)\n\t\t\t   (?:\n\t\t\t     ^                      # beginning of line\n\t\t\t   | (?<=                   # or look-behind on:\n\t\t\t       [=>~(?:\\[,|&;]\n\t\t\t     | [\\s;]if\\s\t\t\t# keywords\n\t\t\t     | [\\s;]elsif\\s\n\t\t\t     | [\\s;]while\\s\n\t\t\t     | [\\s;]unless\\s\n\t\t\t     | [\\s;]when\\s\n\t\t\t     | [\\s;]assert_match\\s\n\t\t\t     | [\\s;]or\\s\t\t\t# boolean opperators\n\t\t\t     | [\\s;]and\\s\n\t\t\t     | [\\s;]not\\s\n\t\t\t     | [\\s.]index\\s\t\t\t# methods\n\t\t\t     | [\\s.]scan\\s\n\t\t\t     | [\\s.]sub\\s\n\t\t\t     | [\\s.]sub!\\s\n\t\t\t     | [\\s.]gsub\\s\n\t\t\t     | [\\s.]gsub!\\s\n\t\t\t     | [\\s.]match\\s\n\t\t\t     )\n\t\t\t   | (?<=                  # or a look-behind with line anchor:\n\t\t\t        ^when\\s            # duplication necessary due to limits of regex\n\t\t\t      | ^if\\s\n\t\t\t      | ^elsif\\s\n\t\t\t      | ^while\\s\n\t\t\t      | ^unless\\s\n\t\t\t      )\n\t\t\t   )\n\t\t\t   \\s*((/))(?![*+{}?])\n\t\t\t",
+			"begin": "(?x)\n(?<![\\w)])((/))(?![?*+])\n(?=\n  (?:\\\\/|[^/])*+          # Do NOT change the order\n  /[eimnosux]*\\s*\n  (?:\n    [)\\]}#.,?:]|\\|\\||&&|<=>|=>|==|=~|!~|!=|;|$|\n    if|else|elsif|then|do|end|unless|while|until|or|and\n  )\n  |\n  $\n)",
 			"captures": {
 				"1": {
-					"name": "string.regexp.classic.ruby"
+					"name": "string.regexp.interpolated.ruby"
 				},
 				"2": {
-					"name": "punctuation.definition.string.ruby"
+					"name": "punctuation.section.regexp.ruby"
 				}
 			},
-			"comment": "regular expressions (normal)\n\t\t\twe only start a regexp if the character before it (excluding whitespace)\n\t\t\tis what we think is before a regexp\n\t\t\t",
-			"contentName": "string.regexp.classic.ruby",
+			"comment": "regular expression literal with interpolation",
+			"contentName": "string.regexp.interpolated.ruby",
 			"end": "((/[eimnosux]*))",
 			"patterns": [
 				{
@@ -541,2145 +524,2272 @@
 			]
 		},
 		{
-			"captures": {
-				"1": {
-					"name": "punctuation.definition.constant.ruby"
+			"begin": "%r{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.regexp.begin.ruby"
 				}
 			},
-			"comment": "symbols",
-			"match": "(?<!:)(:)(?>[a-zA-Z_]\\w*(?>[?!]|=(?![>=]))?|===?|>[>=]?|<=>|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[\\]=?|(@@?|\\$)[a-zA-Z_]\\w*)",
-			"name": "constant.other.symbol.ruby"
-		},
-		{
-			"begin": "^=begin",
-			"captures": {
+			"end": "}[eimnosux]*",
+			"endCaptures": {
 				"0": {
-					"name": "punctuation.definition.comment.ruby"
+					"name": "punctuation.section.regexp.end.ruby"
 				}
 			},
-			"comment": "multiline comments",
-			"end": "^=end",
-			"name": "comment.block.documentation.ruby"
-		},
+			"name": "string.regexp.interpolated.ruby",
+			"patterns": [
+				{
+					"include": "#regex_sub"
+				},
+				{
+					"include": "#nest_curly_r"
+				}
+			]
+		},
 		{
-			"begin": "(^[ \\t]+)?(?=#)",
+			"begin": "%r\\[",
 			"beginCaptures": {
-				"1": {
-					"name": "punctuation.whitespace.comment.leading.ruby"
+				"0": {
+					"name": "punctuation.section.regexp.begin.ruby"
 				}
 			},
-			"end": "(?!\\G)",
+			"end": "][eimnosux]*",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.regexp.end.ruby"
+				}
+			},
+			"name": "string.regexp.interpolated.ruby",
 			"patterns": [
 				{
-					"begin": "#",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.comment.ruby"
-						}
-					},
-					"end": "\\n",
-					"name": "comment.line.number-sign.ruby"
+					"include": "#regex_sub"
+				},
+				{
+					"include": "#nest_brackets_r"
 				}
 			]
 		},
 		{
-			"comment": "\n\t\t\tmatches questionmark-letters.\n\n\t\t\texamples (1st alternation = hex):\n\t\t\t?\\x1     ?\\x61\n\n\t\t\texamples (2nd alternation = octal):\n\t\t\t?\\0      ?\\07     ?\\017\n\n\t\t\texamples (3rd alternation = escaped):\n\t\t\t?\\n      ?\\b\n\n\t\t\texamples (4th alternation = meta-ctrl):\n\t\t\t?\\C-a    ?\\M-a    ?\\C-\\M-\\C-\\M-a\n\n\t\t\texamples (4th alternation = normal):\n\t\t\t?a       ?A       ?0 \n\t\t\t?*       ?\"       ?( \n\t\t\t?.       ?#\n\t\t\t\n\t\t\t\n\t\t\tthe negative lookbehind prevents against matching\n\t\t\tp(42.tainted?)\n\t\t\t",
-			"match": "(?<!\\w)\\?(\\\\(x\\h{1,2}(?!\\h)\\b|0[0-7]{0,2}(?![0-7])\\b|[^x0MC])|(\\\\[MC]-)+\\w|[^\\s\\\\])",
-			"name": "constant.numeric.ruby"
+			"begin": "%r\\(",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.regexp.begin.ruby"
+				}
+			},
+			"end": "\\)[eimnosux]*",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.regexp.end.ruby"
+				}
+			},
+			"name": "string.regexp.interpolated.ruby",
+			"patterns": [
+				{
+					"include": "#regex_sub"
+				},
+				{
+					"include": "#nest_parens_r"
+				}
+			]
 		},
 		{
-			"begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)HTML)\\b\\1))",
-			"comment": "Heredoc with embedded html",
-			"end": "(?!\\G)",
-			"name": "meta.embedded.block.html",
+			"begin": "%r<",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.regexp.begin.ruby"
+				}
+			},
+			"end": ">[eimnosux]*",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.regexp.end.ruby"
+				}
+			},
+			"name": "string.regexp.interpolated.ruby",
 			"patterns": [
 				{
-					"begin": "(?><<[-~](\"?)((?:[_\\w]+_|)HTML)\\b\\1)",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.ruby"
-						}
-					},
-					"contentName": "text.html",
-					"end": "\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.ruby"
-						}
-					},
-					"name": "string.unquoted.heredoc.ruby",
-					"patterns": [
-						{
-							"include": "#heredoc"
-						},
-						{
-							"include": "#interpolated_ruby"
-						},
-						{
-							"include": "text.html.basic"
-						},
-						{
-							"include": "#escaped_char"
-						}
-					]
+					"include": "#regex_sub"
+				},
+				{
+					"include": "#nest_ltgt_r"
 				}
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)XML)\\b\\1))",
-			"comment": "Heredoc with embedded xml",
-			"end": "(?!\\G)",
-			"name": "meta.embedded.block.xml",
+			"begin": "%r([^\\w])",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.regexp.begin.ruby"
+				}
+			},
+			"end": "\\1[eimnosux]*",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.regexp.end.ruby"
+				}
+			},
+			"name": "string.regexp.interpolated.ruby",
 			"patterns": [
 				{
-					"begin": "(?><<[-~](\"?)((?:[_\\w]+_|)XML)\\b\\1)",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.ruby"
-						}
-					},
-					"contentName": "text.xml",
-					"end": "\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.ruby"
-						}
-					},
-					"name": "string.unquoted.heredoc.ruby",
-					"patterns": [
-						{
-							"include": "#heredoc"
-						},
-						{
-							"include": "#interpolated_ruby"
-						},
-						{
-							"include": "text.xml"
-						},
-						{
-							"include": "#escaped_char"
-						}
-					]
+					"include": "#regex_sub"
 				}
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)SQL)\\b\\1))",
-			"comment": "Heredoc with embedded sql",
-			"end": "(?!\\G)",
-			"name": "meta.embedded.block.sql",
+			"begin": "%I\\[",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.array.begin.ruby"
+				}
+			},
+			"end": "]",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.array.end.ruby"
+				}
+			},
+			"name": "constant.language.symbol.interpolated.ruby",
 			"patterns": [
 				{
-					"begin": "(?><<[-~](\"?)((?:[_\\w]+_|)SQL)\\b\\1)",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.ruby"
-						}
-					},
-					"contentName": "source.sql",
-					"end": "\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.ruby"
-						}
-					},
-					"name": "string.unquoted.heredoc.ruby",
-					"patterns": [
-						{
-							"include": "#heredoc"
-						},
-						{
-							"include": "#interpolated_ruby"
-						},
-						{
-							"include": "source.sql"
-						},
-						{
-							"include": "#escaped_char"
-						}
-					]
+					"include": "#interpolated_ruby"
+				},
+				{
+					"include": "#escaped_char"
+				},
+				{
+					"include": "#nest_brackets_i"
 				}
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)CSS)\\b\\1))",
-			"comment": "Heredoc with embedded css",
-			"end": "(?!\\G)",
-			"name": "meta.embedded.block.css",
+			"begin": "%I\\(",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.array.begin.ruby"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.array.end.ruby"
+				}
+			},
+			"name": "constant.language.symbol.interpolated.ruby",
 			"patterns": [
 				{
-					"begin": "(?><<[-~](\"?)((?:[_\\w]+_|)CSS)\\b\\1)",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.ruby"
-						}
-					},
-					"contentName": "source.css",
-					"end": "\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.ruby"
-						}
-					},
-					"name": "string.unquoted.heredoc.ruby",
-					"patterns": [
-						{
-							"include": "#heredoc"
-						},
-						{
-							"include": "#interpolated_ruby"
-						},
-						{
-							"include": "source.css"
-						},
-						{
-							"include": "#escaped_char"
-						}
-					]
+					"include": "#interpolated_ruby"
+				},
+				{
+					"include": "#escaped_char"
+				},
+				{
+					"include": "#nest_parens_i"
 				}
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)CPP)\\b\\1))",
-			"comment": "Heredoc with embedded c++",
-			"end": "(?!\\G)",
-			"name": "meta.embedded.block.c++",
+			"begin": "%I<",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.array.begin.ruby"
+				}
+			},
+			"end": ">",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.array.end.ruby"
+				}
+			},
+			"name": "constant.language.symbol.interpolated.ruby",
 			"patterns": [
 				{
-					"begin": "(?><<[-~](\"?)((?:[_\\w]+_|)CPP)\\b\\1)",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.ruby"
-						}
-					},
-					"contentName": "source.c++",
-					"end": "\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.ruby"
-						}
-					},
-					"name": "string.unquoted.heredoc.ruby",
-					"patterns": [
-						{
-							"include": "#heredoc"
-						},
-						{
-							"include": "#interpolated_ruby"
-						},
-						{
-							"include": "source.c++"
-						},
-						{
-							"include": "#escaped_char"
-						}
-					]
+					"include": "#interpolated_ruby"
+				},
+				{
+					"include": "#escaped_char"
+				},
+				{
+					"include": "#nest_ltgt_i"
 				}
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)C)\\b\\1))",
-			"comment": "Heredoc with embedded c",
-			"end": "(?!\\G)",
-			"name": "meta.embedded.block.c",
+			"begin": "%I{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.array.begin.ruby"
+				}
+			},
+			"end": "}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.array.end.ruby"
+				}
+			},
+			"name": "constant.language.symbol.interpolated.ruby",
 			"patterns": [
 				{
-					"begin": "(?><<[-~](\"?)((?:[_\\w]+_|)C)\\b\\1)",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.ruby"
-						}
-					},
-					"contentName": "source.c",
-					"end": "\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.ruby"
-						}
-					},
-					"name": "string.unquoted.heredoc.ruby",
-					"patterns": [
-						{
-							"include": "#heredoc"
-						},
-						{
-							"include": "#interpolated_ruby"
-						},
-						{
-							"include": "source.c"
-						},
-						{
-							"include": "#escaped_char"
-						}
-					]
-				}
-			]
-		},
-		{
-			"begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)(?:JS|JAVASCRIPT))\\b\\1))",
-			"comment": "Heredoc with embedded javascript",
-			"end": "(?!\\G)",
-			"name": "meta.embedded.block.js",
-			"patterns": [
+					"include": "#interpolated_ruby"
+				},
 				{
-					"begin": "(?><<[-~](\"?)((?:[_\\w]+_|)(?:JS|JAVASCRIPT))\\b\\1)",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.ruby"
-						}
-					},
-					"contentName": "source.js",
-					"end": "\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.ruby"
-						}
-					},
-					"name": "string.unquoted.heredoc.ruby",
-					"patterns": [
-						{
-							"include": "#heredoc"
-						},
-						{
-							"include": "#interpolated_ruby"
-						},
-						{
-							"include": "source.js"
-						},
-						{
-							"include": "#escaped_char"
-						}
-					]
+					"include": "#escaped_char"
+				},
+				{
+					"include": "#nest_curly_i"
 				}
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)JQUERY)\\b\\1))",
-			"comment": "Heredoc with embedded jQuery javascript",
-			"end": "(?!\\G)",
-			"name": "meta.embedded.block.js.jquery",
+			"begin": "%I([^\\w])",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.array.begin.ruby"
+				}
+			},
+			"end": "\\1",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.array.end.ruby"
+				}
+			},
+			"name": "constant.language.symbol.interpolated.ruby",
 			"patterns": [
 				{
-					"begin": "(?><<[-~](\"?)((?:[_\\w]+_|)JQUERY)\\b\\1)",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.ruby"
-						}
-					},
-					"contentName": "source.js.jquery",
-					"end": "\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.ruby"
-						}
-					},
-					"name": "string.unquoted.heredoc.ruby",
-					"patterns": [
-						{
-							"include": "#heredoc"
-						},
-						{
-							"include": "#interpolated_ruby"
-						},
-						{
-							"include": "source.js.jquery"
-						},
-						{
-							"include": "#escaped_char"
-						}
-					]
+					"include": "#interpolated_ruby"
+				},
+				{
+					"include": "#escaped_char"
 				}
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)(?:SH|SHELL))\\b\\1))",
-			"comment": "Heredoc with embedded shell",
-			"end": "(?!\\G)",
-			"name": "meta.embedded.block.shell",
+			"begin": "%i\\[",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.array.begin.ruby"
+				}
+			},
+			"end": "]",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.array.end.ruby"
+				}
+			},
+			"name": "constant.language.symbol.ruby",
 			"patterns": [
 				{
-					"begin": "(?><<[-~](\"?)((?:[_\\w]+_|)(?:SH|SHELL))\\b\\1)",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.ruby"
-						}
-					},
-					"contentName": "source.shell",
-					"end": "\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.ruby"
-						}
-					},
-					"name": "string.unquoted.heredoc.ruby",
-					"patterns": [
-						{
-							"include": "#heredoc"
-						},
-						{
-							"include": "#interpolated_ruby"
-						},
-						{
-							"include": "source.shell"
-						},
-						{
-							"include": "#escaped_char"
-						}
-					]
+					"match": "\\\\]|\\\\\\\\",
+					"name": "constant.character.escape.ruby"
+				},
+				{
+					"include": "#nest_brackets"
 				}
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)LUA)\\b\\1))",
-			"comment": "Heredoc with embedded lua",
-			"end": "(?!\\G)",
-			"name": "meta.embedded.block.lua",
+			"begin": "%i\\(",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.array.begin.ruby"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.array.end.ruby"
+				}
+			},
+			"name": "constant.language.symbol.ruby",
 			"patterns": [
 				{
-					"begin": "(?><<[-~](\"?)((?:[_\\w]+_|)LUA)\\b\\1)",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.ruby"
-						}
-					},
-					"contentName": "source.lua",
-					"end": "\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.ruby"
-						}
-					},
-					"name": "string.unquoted.heredoc.ruby",
-					"patterns": [
-						{
-							"include": "#heredoc"
-						},
-						{
-							"include": "#interpolated_ruby"
-						},
-						{
-							"include": "source.lua"
-						},
-						{
-							"include": "#escaped_char"
-						}
-					]
+					"match": "\\\\\\)|\\\\\\\\",
+					"name": "constant.character.escape.ruby"
+				},
+				{
+					"include": "#nest_parens"
 				}
 			]
 		},
 		{
-			"begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)RUBY)\\b\\1))",
-			"comment": "Heredoc with embedded ruby",
-			"end": "(?!\\G)",
-			"name": "meta.embedded.block.ruby",
+			"begin": "%i<",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.array.begin.ruby"
+				}
+			},
+			"end": ">",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.array.end.ruby"
+				}
+			},
+			"name": "constant.language.symbol.ruby",
 			"patterns": [
 				{
-					"begin": "(?><<[-~](\"?)((?:[_\\w]+_|)RUBY)\\b\\1)",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.ruby"
-						}
-					},
-					"contentName": "source.ruby",
-					"end": "\\s*\\2$\\n?",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.ruby"
-						}
-					},
-					"name": "string.unquoted.heredoc.ruby",
-					"patterns": [
-						{
-							"include": "#heredoc"
-						},
-						{
-							"include": "#interpolated_ruby"
-						},
-						{
-							"include": "source.ruby"
-						},
-						{
-							"include": "#escaped_char"
-						}
-					]
+					"match": "\\\\>|\\\\\\\\",
+					"name": "constant.character.escape.ruby"
+				},
+				{
+					"include": "#nest_ltgt"
 				}
 			]
 		},
 		{
-			"begin": "(?>=\\s*<<(\\w+))",
+			"begin": "%i{",
 			"beginCaptures": {
 				"0": {
-					"name": "punctuation.definition.string.begin.ruby"
+					"name": "punctuation.section.array.begin.ruby"
 				}
 			},
-			"end": "^\\1$",
+			"end": "}",
 			"endCaptures": {
 				"0": {
-					"name": "punctuation.definition.string.end.ruby"
+					"name": "punctuation.section.array.end.ruby"
 				}
 			},
-			"name": "string.unquoted.heredoc.ruby",
+			"name": "constant.language.symbol.ruby",
 			"patterns": [
 				{
-					"include": "#heredoc"
-				},
-				{
-					"include": "#interpolated_ruby"
+					"match": "\\\\}|\\\\\\\\",
+					"name": "constant.character.escape.ruby"
 				},
 				{
-					"include": "#escaped_char"
+					"include": "#nest_curly"
 				}
 			]
 		},
 		{
-			"begin": "(?><<[-~](\\w+))",
+			"begin": "%i([^\\w])",
 			"beginCaptures": {
 				"0": {
-					"name": "punctuation.definition.string.begin.ruby"
+					"name": "punctuation.section.array.begin.ruby"
 				}
 			},
-			"comment": "heredoc with indented terminator",
-			"end": "\\s*\\1$",
+			"end": "\\1",
 			"endCaptures": {
 				"0": {
-					"name": "punctuation.definition.string.end.ruby"
+					"name": "punctuation.section.array.end.ruby"
 				}
 			},
-			"name": "string.unquoted.heredoc.ruby",
+			"name": "constant.language.symbol.ruby",
 			"patterns": [
 				{
-					"include": "#heredoc"
-				},
-				{
-					"include": "#interpolated_ruby"
-				},
-				{
-					"include": "#escaped_char"
+					"comment": "Cant be named because its not necessarily an escape.",
+					"match": "\\\\."
 				}
 			]
 		},
 		{
-			"begin": "(?<=\\{|do|\\{\\s|do\\s)(\\|)",
-			"captures": {
-				"1": {
-					"name": "punctuation.separator.arguments.ruby"
+			"begin": "%W\\[",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.array.begin.ruby"
 				}
 			},
-			"end": "(?<!\\|)(\\|)(?!\\|)",
+			"end": "]",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.array.end.ruby"
+				}
+			},
+			"name": "string.quoted.other.interpolated.ruby",
 			"patterns": [
 				{
-					"include": "$self"
+					"include": "#interpolated_ruby"
 				},
 				{
-					"match": "[_a-zA-Z][_a-zA-Z0-9]*",
-					"name": "variable.other.block.ruby"
+					"include": "#escaped_char"
 				},
 				{
-					"match": ",",
-					"name": "punctuation.separator.variable.ruby"
+					"include": "#nest_brackets_i"
 				}
 			]
 		},
 		{
-			"match": "=>",
-			"name": "punctuation.separator.key-value"
-		},
-		{
-			"match": "->",
-			"name": "support.function.kernel.lambda.ruby"
-		},
-		{
-			"match": "<<=|%=|&{1,2}=|\\*=|\\*\\*=|\\+=|-=|\\^=|\\|{1,2}=|<<",
-			"name": "keyword.operator.assignment.augmented.ruby"
-		},
-		{
-			"match": "<=>|<(?!<|=)|>(?!<|=|>)|<=|>=|===|==|=~|!=|!~|(?<=[ \\t])\\?",
-			"name": "keyword.operator.comparison.ruby"
-		},
-		{
-			"match": "(?<!\\.)\\b(and|not|or)\\b(?![?!])",
-			"name": "keyword.operator.logical.ruby"
-		},
-		{
-			"comment": "Make sure this goes after assignment and comparison",
-			"match": "(?<=^|[ \\t])!|&&|\\|\\||\\^",
-			"name": "keyword.operator.logical.ruby"
-		},
-		{
-			"captures": {
-				"1": {
-					"name": "punctuation.separator.method.ruby"
+			"begin": "%W\\(",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.array.begin.ruby"
 				}
 			},
-			"comment": "Safe navigation operator - Added in 2.3",
-			"match": "(&\\.)\\s*(?![A-Z])"
-		},
-		{
-			"match": "(%|&|\\*\\*|\\*|\\+|-|/)",
-			"name": "keyword.operator.arithmetic.ruby"
-		},
-		{
-			"match": "=",
-			"name": "keyword.operator.assignment.ruby"
-		},
-		{
-			"match": "\\||~|>>",
-			"name": "keyword.operator.other.ruby"
-		},
-		{
-			"match": ";",
-			"name": "punctuation.separator.statement.ruby"
-		},
-		{
-			"match": ",",
-			"name": "punctuation.separator.object.ruby"
-		},
-		{
-			"captures": {
-				"1": {
-					"name": "punctuation.separator.namespace.ruby"
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.array.end.ruby"
 				}
 			},
-			"comment": "Mark as namespace separator if double colons followed by capital letter",
-			"match": "(::)\\s*(?=[A-Z])"
+			"name": "string.quoted.other.interpolated.ruby",
+			"patterns": [
+				{
+					"include": "#interpolated_ruby"
+				},
+				{
+					"include": "#escaped_char"
+				},
+				{
+					"include": "#nest_parens_i"
+				}
+			]
 		},
 		{
-			"captures": {
-				"1": {
-					"name": "punctuation.separator.method.ruby"
+			"begin": "%W<",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.array.begin.ruby"
 				}
 			},
-			"comment": "Mark as method separator if double colons not followed by capital letter",
-			"match": "(\\.|::)\\s*(?![A-Z])"
-		},
-		{
-			"comment": "Must come after method and constant separators to prefer double colons",
-			"match": ":",
-			"name": "punctuation.separator.other.ruby"
-		},
-		{
-			"match": "\\{",
-			"name": "punctuation.section.scope.begin.ruby"
+			"end": ">",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.array.end.ruby"
+				}
+			},
+			"name": "string.quoted.other.interpolated.ruby",
+			"patterns": [
+				{
+					"include": "#interpolated_ruby"
+				},
+				{
+					"include": "#escaped_char"
+				},
+				{
+					"include": "#nest_ltgt_i"
+				}
+			]
 		},
 		{
-			"match": "\\}",
-			"name": "punctuation.section.scope.end.ruby"
+			"begin": "%W{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.array.begin.ruby"
+				}
+			},
+			"end": "}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.array.end.ruby"
+				}
+			},
+			"name": "string.quoted.other.interpolated.ruby",
+			"patterns": [
+				{
+					"include": "#interpolated_ruby"
+				},
+				{
+					"include": "#escaped_char"
+				},
+				{
+					"include": "#nest_curly_i"
+				}
+			]
 		},
 		{
-			"match": "\\[",
-			"name": "punctuation.section.array.begin.ruby"
+			"begin": "%W([^\\w])",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.array.begin.ruby"
+				}
+			},
+			"end": "\\1",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.array.end.ruby"
+				}
+			},
+			"name": "string.quoted.other.interpolated.ruby",
+			"patterns": [
+				{
+					"include": "#interpolated_ruby"
+				},
+				{
+					"include": "#escaped_char"
+				}
+			]
 		},
 		{
-			"match": "\\]",
-			"name": "punctuation.section.array.end.ruby"
+			"begin": "%w\\[",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.array.begin.ruby"
+				}
+			},
+			"end": "]",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.array.end.ruby"
+				}
+			},
+			"name": "string.quoted.other.ruby",
+			"patterns": [
+				{
+					"match": "\\\\]|\\\\\\\\",
+					"name": "constant.character.escape.ruby"
+				},
+				{
+					"include": "#nest_brackets"
+				}
+			]
 		},
 		{
-			"match": "\\(|\\)",
-			"name": "punctuation.section.function.ruby"
-		}
-	],
-	"repository": {
-		"escaped_char": {
-			"match": "\\\\(?:[0-7]{1,3}|x[\\da-fA-F]{1,2}|.)",
-			"name": "constant.character.escape.ruby"
-		},
-		"heredoc": {
-			"begin": "^<<[-~]?\\w+",
-			"end": "$",
+			"begin": "%w\\(",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.array.begin.ruby"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.array.end.ruby"
+				}
+			},
+			"name": "string.quoted.other.ruby",
 			"patterns": [
 				{
-					"include": "$self"
+					"match": "\\\\\\)|\\\\\\\\",
+					"name": "constant.character.escape.ruby"
+				},
+				{
+					"include": "#nest_parens"
 				}
 			]
 		},
-		"interpolated_ruby": {
+		{
+			"begin": "%w<",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.array.begin.ruby"
+				}
+			},
+			"end": ">",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.array.end.ruby"
+				}
+			},
+			"name": "string.quoted.other.ruby",
 			"patterns": [
 				{
-					"begin": "#\\{",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.section.embedded.begin.ruby"
-						}
-					},
-					"contentName": "source.ruby",
-					"end": "(\\})",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.section.embedded.end.ruby"
-						},
-						"1": {
-							"name": "source.ruby"
-						}
-					},
-					"name": "meta.embedded.line.ruby",
-					"patterns": [
-						{
-							"include": "#nest_curly_and_self"
-						},
-						{
-							"include": "$self"
-						}
-					],
-					"repository": {
-						"nest_curly_and_self": {
-							"patterns": [
-								{
-									"begin": "\\{",
-									"captures": {
-										"0": {
-											"name": "punctuation.section.scope.ruby"
-										}
-									},
-									"end": "\\}",
-									"patterns": [
-										{
-											"include": "#nest_curly_and_self"
-										}
-									]
-								},
-								{
-									"include": "$self"
-								}
-							]
-						}
-					}
+					"match": "\\\\>|\\\\\\\\",
+					"name": "constant.character.escape.ruby"
 				},
 				{
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.variable.ruby"
-						}
-					},
-					"match": "(#@)[a-zA-Z_]\\w*",
-					"name": "variable.other.readwrite.instance.ruby"
-				},
+					"include": "#nest_ltgt"
+				}
+			]
+		},
+		{
+			"begin": "%w{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.array.begin.ruby"
+				}
+			},
+			"end": "}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.array.end.ruby"
+				}
+			},
+			"name": "string.quoted.other.ruby",
+			"patterns": [
 				{
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.variable.ruby"
-						}
-					},
-					"match": "(#@@)[a-zA-Z_]\\w*",
-					"name": "variable.other.readwrite.class.ruby"
+					"match": "\\\\}|\\\\\\\\",
+					"name": "constant.character.escape.ruby"
 				},
 				{
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.variable.ruby"
-						}
-					},
-					"match": "(#\\$)[a-zA-Z_]\\w*",
-					"name": "variable.other.readwrite.global.ruby"
+					"include": "#nest_curly"
 				}
 			]
 		},
-		"percent_literals": {
+		{
+			"begin": "%w([^\\w])",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.section.array.begin.ruby"
+				}
+			},
+			"end": "\\1",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.section.array.end.ruby"
+				}
+			},
+			"name": "string.quoted.other.ruby",
 			"patterns": [
 				{
-					"begin": "%i(?:([(\\[{<])|([^\\w\\s]|_))",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.section.array.begin.ruby"
-						}
-					},
-					"end": "[)\\]}>]\\2|\\1\\2",
+					"comment": "Cant be named because its not necessarily an escape.",
+					"match": "\\\\."
+				}
+			]
+		},
+		{
+			"begin": "%[Qx]?\\(",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.ruby"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.ruby"
+				}
+			},
+			"name": "string.quoted.other.interpolated.ruby",
+			"patterns": [
+				{
+					"include": "#interpolated_ruby"
+				},
+				{
+					"include": "#escaped_char"
+				},
+				{
+					"include": "#nest_parens_i"
+				}
+			]
+		},
+		{
+			"begin": "%[Qx]?\\[",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.ruby"
+				}
+			},
+			"end": "]",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.ruby"
+				}
+			},
+			"name": "string.quoted.other.interpolated.ruby",
+			"patterns": [
+				{
+					"include": "#interpolated_ruby"
+				},
+				{
+					"include": "#escaped_char"
+				},
+				{
+					"include": "#nest_brackets_i"
+				}
+			]
+		},
+		{
+			"begin": "%[Qx]?{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.ruby"
+				}
+			},
+			"end": "}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.ruby"
+				}
+			},
+			"name": "string.quoted.other.interpolated.ruby",
+			"patterns": [
+				{
+					"include": "#interpolated_ruby"
+				},
+				{
+					"include": "#escaped_char"
+				},
+				{
+					"include": "#nest_curly_i"
+				}
+			]
+		},
+		{
+			"begin": "%[Qx]?<",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.ruby"
+				}
+			},
+			"end": ">",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.ruby"
+				}
+			},
+			"name": "string.quoted.other.interpolated.ruby",
+			"patterns": [
+				{
+					"include": "#interpolated_ruby"
+				},
+				{
+					"include": "#escaped_char"
+				},
+				{
+					"include": "#nest_ltgt_i"
+				}
+			]
+		},
+		{
+			"begin": "%[Qx]([^\\w])",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.ruby"
+				}
+			},
+			"end": "\\1",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.ruby"
+				}
+			},
+			"name": "string.quoted.other.interpolated.ruby",
+			"patterns": [
+				{
+					"include": "#interpolated_ruby"
+				},
+				{
+					"include": "#escaped_char"
+				}
+			]
+		},
+		{
+			"begin": "%([^\\w\\s=])",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.ruby"
+				}
+			},
+			"end": "\\1",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.ruby"
+				}
+			},
+			"name": "string.quoted.other.interpolated.ruby",
+			"patterns": [
+				{
+					"include": "#interpolated_ruby"
+				},
+				{
+					"include": "#escaped_char"
+				}
+			]
+		},
+		{
+			"begin": "%q\\(",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.ruby"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.ruby"
+				}
+			},
+			"name": "string.quoted.other.ruby",
+			"patterns": [
+				{
+					"match": "\\\\\\)|\\\\\\\\",
+					"name": "constant.character.escape.ruby"
+				},
+				{
+					"include": "#nest_parens"
+				}
+			]
+		},
+		{
+			"begin": "%q<",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.ruby"
+				}
+			},
+			"end": ">",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.ruby"
+				}
+			},
+			"name": "string.quoted.other.ruby",
+			"patterns": [
+				{
+					"match": "\\\\>|\\\\\\\\",
+					"name": "constant.character.escape.ruby"
+				},
+				{
+					"include": "#nest_ltgt"
+				}
+			]
+		},
+		{
+			"begin": "%q\\[",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.ruby"
+				}
+			},
+			"end": "]",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.ruby"
+				}
+			},
+			"name": "string.quoted.other.ruby",
+			"patterns": [
+				{
+					"match": "\\\\]|\\\\\\\\",
+					"name": "constant.character.escape.ruby"
+				},
+				{
+					"include": "#nest_brackets"
+				}
+			]
+		},
+		{
+			"begin": "%q{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.ruby"
+				}
+			},
+			"end": "}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.ruby"
+				}
+			},
+			"name": "string.quoted.other.ruby",
+			"patterns": [
+				{
+					"match": "\\\\}|\\\\\\\\",
+					"name": "constant.character.escape.ruby"
+				},
+				{
+					"include": "#nest_curly"
+				}
+			]
+		},
+		{
+			"begin": "%q([^\\w])",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.ruby"
+				}
+			},
+			"end": "\\1",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.ruby"
+				}
+			},
+			"name": "string.quoted.other.ruby",
+			"patterns": [
+				{
+					"comment": "Cant be named because its not necessarily an escape.",
+					"match": "\\\\."
+				}
+			]
+		},
+		{
+			"begin": "%s\\(",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.symbol.begin.ruby"
+				}
+			},
+			"end": "\\)",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.symbol.end.ruby"
+				}
+			},
+			"name": "constant.language.symbol.ruby",
+			"patterns": [
+				{
+					"match": "\\\\\\)|\\\\\\\\",
+					"name": "constant.character.escape.ruby"
+				},
+				{
+					"include": "#nest_parens"
+				}
+			]
+		},
+		{
+			"begin": "%s<",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.symbol.begin.ruby"
+				}
+			},
+			"end": ">",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.symbol.end.ruby"
+				}
+			},
+			"name": "constant.language.symbol.ruby",
+			"patterns": [
+				{
+					"match": "\\\\>|\\\\\\\\",
+					"name": "constant.character.escape.ruby"
+				},
+				{
+					"include": "#nest_ltgt"
+				}
+			]
+		},
+		{
+			"begin": "%s\\[",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.symbol.begin.ruby"
+				}
+			},
+			"end": "]",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.symbol.end.ruby"
+				}
+			},
+			"name": "constant.language.symbol.ruby",
+			"patterns": [
+				{
+					"match": "\\\\]|\\\\\\\\",
+					"name": "constant.character.escape.ruby"
+				},
+				{
+					"include": "#nest_brackets"
+				}
+			]
+		},
+		{
+			"begin": "%s{",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.symbol.begin.ruby"
+				}
+			},
+			"end": "}",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.symbol.end.ruby"
+				}
+			},
+			"name": "constant.language.symbol.ruby",
+			"patterns": [
+				{
+					"match": "\\\\}|\\\\\\\\",
+					"name": "constant.character.escape.ruby"
+				},
+				{
+					"include": "#nest_curly"
+				}
+			]
+		},
+		{
+			"begin": "%s([^\\w])",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.symbol.begin.ruby"
+				}
+			},
+			"end": "\\1",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.symbol.end.ruby"
+				}
+			},
+			"name": "constant.language.symbol.ruby",
+			"patterns": [
+				{
+					"comment": "Cant be named because its not necessarily an escape.",
+					"match": "\\\\."
+				}
+			]
+		},
+		{
+			"captures": {
+				"1": {
+					"name": "punctuation.definition.constant.ruby"
+				}
+			},
+			"comment": "symbols",
+			"match": "(?x)\n(?<!:)(:)\n(?>\n  [$a-zA-Z_]\\w*(?>[?!]|=(?![>=]))?\n  |\n  ===?|<=>|>[>=]?|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[]=?\n  |\n  @@?[a-zA-Z_]\\w*\n)",
+			"name": "constant.language.symbol.ruby"
+		},
+		{
+			"begin": "^=begin",
+			"captures": {
+				"0": {
+					"name": "punctuation.definition.comment.ruby"
+				}
+			},
+			"comment": "multiline comments",
+			"end": "^=end",
+			"name": "comment.block.documentation.ruby"
+		},
+		{
+			"include": "#yard"
+		},
+		{
+			"begin": "(^[ \\t]+)?(?=#)",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.whitespace.comment.leading.ruby"
+				}
+			},
+			"end": "(?!\\G)",
+			"patterns": [
+				{
+					"begin": "#",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.comment.ruby"
+						}
+					},
+					"end": "\\n",
+					"name": "comment.line.number-sign.ruby"
+				}
+			]
+		},
+		{
+			"comment": "\n\t\t\tmatches questionmark-letters.\n\n\t\t\texamples (1st alternation = hex):\n\t\t\t?\\x1     ?\\x61\n\n\t\t\texamples (2nd alternation = octal):\n\t\t\t?\\0      ?\\07     ?\\017\n\n\t\t\texamples (3rd alternation = escaped):\n\t\t\t?\\n      ?\\b\n\n\t\t\texamples (4th alternation = meta-ctrl):\n\t\t\t?\\C-a    ?\\M-a    ?\\C-\\M-\\C-\\M-a\n\n\t\t\texamples (4th alternation = normal):\n\t\t\t?a       ?A       ?0 \n\t\t\t?*       ?\"       ?( \n\t\t\t?.       ?#\n\t\t\t\n\t\t\t\n\t\t\tthe negative lookbehind prevents against matching\n\t\t\tp(42.tainted?)\n\t\t\t",
+			"match": "(?<!\\w)\\?(\\\\(x\\h{1,2}(?!\\h)\\b|0[0-7]{0,2}(?![0-7])\\b|[^x0MC])|(\\\\[MC]-)+\\w|[^\\s\\\\])",
+			"name": "constant.numeric.ruby"
+		},
+		{
+			"begin": "^__END__\\n",
+			"captures": {
+				"0": {
+					"name": "string.unquoted.program-block.ruby"
+				}
+			},
+			"comment": "__END__ marker",
+			"contentName": "text.plain",
+			"end": "(?=not)impossible",
+			"patterns": [
+				{
+					"begin": "(?=<?xml|<(?i:html\\b)|!DOCTYPE (?i:html\\b))",
+					"end": "(?=not)impossible",
+					"name": "text.html.embedded.ruby",
+					"patterns": [
+						{
+							"include": "text.html.basic"
+						}
+					]
+				}
+			]
+		},
+		{
+			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)HTML)\\b\\1))",
+			"comment": "Heredoc with embedded HTML",
+			"end": "(?!\\G)",
+			"name": "meta.embedded.block.html",
+			"patterns": [
+				{
+					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)HTML)\\b\\1)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.ruby"
+						}
+					},
+					"contentName": "text.html",
+					"end": "^\\s*\\2$\\n?",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.ruby"
+						}
+					},
+					"name": "string.unquoted.heredoc.ruby",
+					"patterns": [
+						{
+							"include": "#heredoc"
+						},
+						{
+							"include": "#interpolated_ruby"
+						},
+						{
+							"include": "text.html.basic"
+						},
+						{
+							"include": "#escaped_char"
+						}
+					]
+				}
+			]
+		},
+		{
+			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)HAML)\\b\\1))",
+			"comment": "Heredoc with embedded HAML",
+			"end": "(?!\\G)",
+			"name": "meta.embedded.block.haml",
+			"patterns": [
+				{
+					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)HAML)\\b\\1)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.ruby"
+						}
+					},
+					"contentName": "text.haml",
+					"end": "^\\s*\\2$\\n?",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.ruby"
+						}
+					},
+					"name": "string.unquoted.heredoc.ruby",
+					"patterns": [
+						{
+							"include": "#heredoc"
+						},
+						{
+							"include": "#interpolated_ruby"
+						},
+						{
+							"include": "text.haml"
+						},
+						{
+							"include": "#escaped_char"
+						}
+					]
+				}
+			]
+		},
+		{
+			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)XML)\\b\\1))",
+			"comment": "Heredoc with embedded XML",
+			"end": "(?!\\G)",
+			"name": "meta.embedded.block.xml",
+			"patterns": [
+				{
+					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)XML)\\b\\1)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.ruby"
+						}
+					},
+					"contentName": "text.xml",
+					"end": "^\\s*\\2$\\n?",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.ruby"
+						}
+					},
+					"name": "string.unquoted.heredoc.ruby",
+					"patterns": [
+						{
+							"include": "#heredoc"
+						},
+						{
+							"include": "#interpolated_ruby"
+						},
+						{
+							"include": "text.xml"
+						},
+						{
+							"include": "#escaped_char"
+						}
+					]
+				}
+			]
+		},
+		{
+			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)SQL)\\b\\1))",
+			"comment": "Heredoc with embedded SQL",
+			"end": "(?!\\G)",
+			"name": "meta.embedded.block.sql",
+			"patterns": [
+				{
+					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)SQL)\\b\\1)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.ruby"
+						}
+					},
+					"contentName": "source.sql",
+					"end": "^\\s*\\2$\\n?",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.ruby"
+						}
+					},
+					"name": "string.unquoted.heredoc.ruby",
+					"patterns": [
+						{
+							"include": "#heredoc"
+						},
+						{
+							"include": "#interpolated_ruby"
+						},
+						{
+							"include": "source.sql"
+						},
+						{
+							"include": "#escaped_char"
+						}
+					]
+				}
+			]
+		},
+		{
+			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:GRAPHQL|GQL))\\b\\1))",
+			"comment": "Heredoc with embedded GraphQL",
+			"end": "(?!\\G)",
+			"name": "meta.embedded.block.graphql",
+			"patterns": [
+				{
+					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:GRAPHQL|GQL))\\b\\1)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.ruby"
+						}
+					},
+					"contentName": "source.graphql",
+					"end": "^\\s*\\2$\\n?",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.ruby"
+						}
+					},
+					"name": "string.unquoted.heredoc.ruby",
+					"patterns": [
+						{
+							"include": "#heredoc"
+						},
+						{
+							"include": "#interpolated_ruby"
+						},
+						{
+							"include": "source.graphql"
+						},
+						{
+							"include": "#escaped_char"
+						}
+					]
+				}
+			]
+		},
+		{
+			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)CSS)\\b\\1))",
+			"comment": "Heredoc with embedded CSS",
+			"end": "(?!\\G)",
+			"name": "meta.embedded.block.css",
+			"patterns": [
+				{
+					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)CSS)\\b\\1)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.ruby"
+						}
+					},
+					"contentName": "source.css",
+					"end": "^\\s*\\2$\\n?",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.ruby"
+						}
+					},
+					"name": "string.unquoted.heredoc.ruby",
+					"patterns": [
+						{
+							"include": "#heredoc"
+						},
+						{
+							"include": "#interpolated_ruby"
+						},
+						{
+							"include": "source.css"
+						},
+						{
+							"include": "#escaped_char"
+						}
+					]
+				}
+			]
+		},
+		{
+			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)CPP)\\b\\1))",
+			"comment": "Heredoc with embedded C++",
+			"end": "(?!\\G)",
+			"name": "meta.embedded.block.cpp",
+			"patterns": [
+				{
+					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)CPP)\\b\\1)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.ruby"
+						}
+					},
+					"contentName": "source.cpp",
+					"end": "^\\s*\\2$\\n?",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.ruby"
+						}
+					},
+					"name": "string.unquoted.heredoc.ruby",
+					"patterns": [
+						{
+							"include": "#heredoc"
+						},
+						{
+							"include": "#interpolated_ruby"
+						},
+						{
+							"include": "source.cpp"
+						},
+						{
+							"include": "#escaped_char"
+						}
+					]
+				}
+			]
+		},
+		{
+			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)C)\\b\\1))",
+			"comment": "Heredoc with embedded C",
+			"end": "(?!\\G)",
+			"name": "meta.embedded.block.c",
+			"patterns": [
+				{
+					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)C)\\b\\1)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.ruby"
+						}
+					},
+					"contentName": "source.c",
+					"end": "^\\s*\\2$\\n?",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.ruby"
+						}
+					},
+					"name": "string.unquoted.heredoc.ruby",
+					"patterns": [
+						{
+							"include": "#heredoc"
+						},
+						{
+							"include": "#interpolated_ruby"
+						},
+						{
+							"include": "source.c"
+						},
+						{
+							"include": "#escaped_char"
+						}
+					]
+				}
+			]
+		},
+		{
+			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:JS|JAVASCRIPT))\\b\\1))",
+			"comment": "Heredoc with embedded Javascript",
+			"end": "(?!\\G)",
+			"name": "meta.embedded.block.js",
+			"patterns": [
+				{
+					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:JS|JAVASCRIPT))\\b\\1)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.ruby"
+						}
+					},
+					"contentName": "source.js",
+					"end": "^\\s*\\2$\\n?",
 					"endCaptures": {
 						"0": {
-							"name": "punctuation.section.array.end.ruby"
+							"name": "punctuation.definition.string.end.ruby"
 						}
 					},
-					"name": "meta.array.symbol.ruby",
+					"name": "string.unquoted.heredoc.ruby",
 					"patterns": [
 						{
-							"begin": "\\G(?<=\\()(?!\\))",
-							"end": "(?=\\))",
-							"patterns": [
-								{
-									"include": "#parens"
-								},
-								{
-									"include": "#symbol"
-								}
-							]
+							"include": "#heredoc"
 						},
 						{
-							"begin": "\\G(?<=\\[)(?!\\])",
-							"end": "(?=\\])",
-							"patterns": [
-								{
-									"include": "#brackets"
-								},
-								{
-									"include": "#symbol"
-								}
-							]
+							"include": "#interpolated_ruby"
 						},
 						{
-							"begin": "\\G(?<=\\{)(?!\\})",
-							"end": "(?=\\})",
-							"patterns": [
-								{
-									"include": "#braces"
-								},
-								{
-									"include": "#symbol"
-								}
-							]
+							"include": "source.js"
 						},
 						{
-							"begin": "\\G(?<=<)(?!>)",
-							"end": "(?=>)",
-							"patterns": [
-								{
-									"include": "#angles"
-								},
-								{
-									"include": "#symbol"
-								}
-							]
-						},
+							"include": "#escaped_char"
+						}
+					]
+				}
+			]
+		},
+		{
+			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)JQUERY)\\b\\1))",
+			"comment": "Heredoc with embedded jQuery Javascript",
+			"end": "(?!\\G)",
+			"name": "meta.embedded.block.js.jquery",
+			"patterns": [
+				{
+					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)JQUERY)\\b\\1)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.ruby"
+						}
+					},
+					"contentName": "source.js.jquery",
+					"end": "^\\s*\\2$\\n?",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.ruby"
+						}
+					},
+					"name": "string.unquoted.heredoc.ruby",
+					"patterns": [
 						{
-							"include": "#symbol"
-						}
-					],
-					"repository": {
-						"angles": {
-							"patterns": [
-								{
-									"captures": {
-										"0": {
-											"name": "constant.character.escape.ruby"
-										}
-									},
-									"match": "\\\\<|\\\\>",
-									"name": "constant.other.symbol.ruby"
-								},
-								{
-									"begin": "<",
-									"captures": {
-										"0": {
-											"name": "constant.other.symbol.ruby"
-										}
-									},
-									"end": ">",
-									"patterns": [
-										{
-											"include": "#angles"
-										},
-										{
-											"include": "#symbol"
-										}
-									]
-								}
-							]
-						},
-						"braces": {
-							"patterns": [
-								{
-									"captures": {
-										"0": {
-											"name": "constant.character.escape.ruby"
-										}
-									},
-									"match": "\\\\\\{|\\\\\\}",
-									"name": "constant.other.symbol.ruby"
-								},
-								{
-									"begin": "\\{",
-									"captures": {
-										"0": {
-											"name": "constant.other.symbol.ruby"
-										}
-									},
-									"end": "\\}",
-									"patterns": [
-										{
-											"include": "#braces"
-										},
-										{
-											"include": "#symbol"
-										}
-									]
-								}
-							]
+							"include": "#heredoc"
 						},
-						"brackets": {
-							"patterns": [
-								{
-									"captures": {
-										"0": {
-											"name": "constant.character.escape.ruby"
-										}
-									},
-									"match": "\\\\\\[|\\\\\\]",
-									"name": "constant.other.symbol.ruby"
-								},
-								{
-									"begin": "\\[",
-									"captures": {
-										"0": {
-											"name": "constant.other.symbol.ruby"
-										}
-									},
-									"end": "\\]",
-									"patterns": [
-										{
-											"include": "#brackets"
-										},
-										{
-											"include": "#symbol"
-										}
-									]
-								}
-							]
+						{
+							"include": "#interpolated_ruby"
 						},
-						"parens": {
-							"patterns": [
-								{
-									"captures": {
-										"0": {
-											"name": "constant.character.escape.ruby"
-										}
-									},
-									"match": "\\\\\\(|\\\\\\)",
-									"name": "constant.other.symbol.ruby"
-								},
-								{
-									"begin": "\\(",
-									"captures": {
-										"0": {
-											"name": "constant.other.symbol.ruby"
-										}
-									},
-									"end": "\\)",
-									"patterns": [
-										{
-											"include": "#parens"
-										},
-										{
-											"include": "#symbol"
-										}
-									]
-								}
-							]
+						{
+							"include": "source.js.jquery"
 						},
-						"symbol": {
-							"patterns": [
-								{
-									"captures": {
-										"0": {
-											"name": "constant.character.escape.ruby"
-										}
-									},
-									"match": "\\\\\\\\|\\\\[ ]",
-									"name": "constant.other.symbol.ruby"
-								},
-								{
-									"match": "\\S\\w*",
-									"name": "constant.other.symbol.ruby"
-								}
-							]
+						{
+							"include": "#escaped_char"
 						}
-					}
-				},
+					]
+				}
+			]
+		},
+		{
+			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:SH|SHELL))\\b\\1))",
+			"comment": "Heredoc with embedded Shell",
+			"end": "(?!\\G)",
+			"name": "meta.embedded.block.shell",
+			"patterns": [
 				{
-					"begin": "%I(?:([(\\[{<])|([^\\w\\s]|_))",
+					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:SH|SHELL))\\b\\1)",
 					"beginCaptures": {
 						"0": {
-							"name": "punctuation.section.array.begin.ruby"
+							"name": "punctuation.definition.string.begin.ruby"
 						}
 					},
-					"end": "[)\\]}>]\\2|\\1\\2",
+					"contentName": "source.shell",
+					"end": "^\\s*\\2$\\n?",
 					"endCaptures": {
 						"0": {
-							"name": "punctuation.section.array.end.ruby"
+							"name": "punctuation.definition.string.end.ruby"
 						}
 					},
-					"name": "meta.array.symbol.interpolated.ruby",
+					"name": "string.unquoted.heredoc.ruby",
 					"patterns": [
 						{
-							"begin": "\\G(?<=\\()(?!\\))",
-							"end": "(?=\\))",
-							"patterns": [
-								{
-									"include": "#parens"
-								},
-								{
-									"include": "#symbol"
-								}
-							]
+							"include": "#heredoc"
 						},
 						{
-							"begin": "\\G(?<=\\[)(?!\\])",
-							"end": "(?=\\])",
-							"patterns": [
-								{
-									"include": "#brackets"
-								},
-								{
-									"include": "#symbol"
-								}
-							]
+							"include": "#interpolated_ruby"
 						},
 						{
-							"begin": "\\G(?<=\\{)(?!\\})",
-							"end": "(?=\\})",
-							"patterns": [
-								{
-									"include": "#braces"
-								},
-								{
-									"include": "#symbol"
-								}
-							]
+							"include": "source.shell"
 						},
 						{
-							"begin": "\\G(?<=<)(?!>)",
-							"end": "(?=>)",
-							"patterns": [
-								{
-									"include": "#angles"
-								},
-								{
-									"include": "#symbol"
-								}
-							]
+							"include": "#escaped_char"
+						}
+					]
+				}
+			]
+		},
+		{
+			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)LUA)\\b\\1))",
+			"comment": "Heredoc with embedded Lua",
+			"end": "(?!\\G)",
+			"name": "meta.embedded.block.lua",
+			"patterns": [
+				{
+					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)LUA)\\b\\1)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.ruby"
+						}
+					},
+					"contentName": "source.lua",
+					"end": "^\\s*\\2$\\n?",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.ruby"
+						}
+					},
+					"name": "string.unquoted.heredoc.ruby",
+					"patterns": [
+						{
+							"include": "#heredoc"
 						},
 						{
-							"include": "#symbol"
-						}
-					],
-					"repository": {
-						"angles": {
-							"patterns": [
-								{
-									"begin": "<",
-									"captures": {
-										"0": {
-											"name": "constant.other.symbol.ruby"
-										}
-									},
-									"end": ">",
-									"patterns": [
-										{
-											"include": "#angles"
-										},
-										{
-											"include": "#symbol"
-										}
-									]
-								}
-							]
+							"include": "#interpolated_ruby"
 						},
-						"braces": {
-							"patterns": [
-								{
-									"begin": "\\{",
-									"captures": {
-										"0": {
-											"name": "constant.other.symbol.ruby"
-										}
-									},
-									"end": "\\}",
-									"patterns": [
-										{
-											"include": "#braces"
-										},
-										{
-											"include": "#symbol"
-										}
-									]
-								}
-							]
+						{
+							"include": "source.lua"
 						},
-						"brackets": {
-							"patterns": [
-								{
-									"begin": "\\[",
-									"captures": {
-										"0": {
-											"name": "constant.other.symbol.ruby"
-										}
-									},
-									"end": "\\]",
-									"patterns": [
-										{
-											"include": "#brackets"
-										},
-										{
-											"include": "#symbol"
-										}
-									]
-								}
-							]
+						{
+							"include": "#escaped_char"
+						}
+					]
+				}
+			]
+		},
+		{
+			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)RUBY)\\b\\1))",
+			"comment": "Heredoc with embedded Ruby",
+			"end": "(?!\\G)",
+			"name": "meta.embedded.block.ruby",
+			"patterns": [
+				{
+					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)RUBY)\\b\\1)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.ruby"
+						}
+					},
+					"contentName": "source.ruby",
+					"end": "^\\s*\\2$\\n?",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.ruby"
+						}
+					},
+					"name": "string.unquoted.heredoc.ruby",
+					"patterns": [
+						{
+							"include": "#heredoc"
 						},
-						"parens": {
-							"patterns": [
-								{
-									"begin": "\\(",
-									"captures": {
-										"0": {
-											"name": "constant.other.symbol.ruby"
-										}
-									},
-									"end": "\\)",
-									"patterns": [
-										{
-											"include": "#parens"
-										},
-										{
-											"include": "#symbol"
-										}
-									]
-								}
-							]
+						{
+							"include": "#interpolated_ruby"
 						},
-						"symbol": {
-							"patterns": [
-								{
-									"begin": "(?=\\\\|#\\{)",
-									"end": "(?!\\G)",
-									"name": "constant.other.symbol.ruby",
-									"patterns": [
-										{
-											"include": "#escaped_char"
-										},
-										{
-											"include": "#interpolated_ruby"
-										}
-									]
-								},
-								{
-									"match": "\\S\\w*",
-									"name": "constant.other.symbol.ruby"
-								}
-							]
+						{
+							"include": "source.ruby"
+						},
+						{
+							"include": "#escaped_char"
 						}
-					}
-				},
+					]
+				}
+			]
+		},
+		{
+			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:YAML|YML))\\b\\1))",
+			"comment": "Heredoc with embedded YAML",
+			"end": "(?!\\G)",
+			"name": "meta.embedded.block.yaml",
+			"patterns": [
 				{
-					"begin": "%q(?:([(\\[{<])|([^\\w\\s]|_))",
+					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)(?:YAML|YML))\\b\\1)",
 					"beginCaptures": {
 						"0": {
 							"name": "punctuation.definition.string.begin.ruby"
 						}
 					},
-					"end": "[)\\]}>]\\2|\\1\\2",
+					"contentName": "source.yaml",
+					"end": "^\\s*\\2$\\n?",
 					"endCaptures": {
 						"0": {
 							"name": "punctuation.definition.string.end.ruby"
 						}
 					},
-					"name": "string.quoted.other.ruby",
+					"name": "string.unquoted.heredoc.ruby",
 					"patterns": [
 						{
-							"begin": "\\G(?<=\\()(?!\\))",
-							"end": "(?=\\))",
-							"patterns": [
-								{
-									"include": "#parens"
-								}
-							]
+							"include": "#heredoc"
 						},
 						{
-							"begin": "\\G(?<=\\[)(?!\\])",
-							"end": "(?=\\])",
-							"patterns": [
-								{
-									"include": "#brackets"
-								}
-							]
+							"include": "#interpolated_ruby"
 						},
 						{
-							"begin": "\\G(?<=\\{)(?!\\})",
-							"end": "(?=\\})",
-							"patterns": [
-								{
-									"include": "#braces"
-								}
-							]
+							"include": "source.yaml"
 						},
 						{
-							"begin": "\\G(?<=<)(?!>)",
-							"end": "(?=>)",
-							"patterns": [
-								{
-									"include": "#angles"
-								}
-							]
-						}
-					],
-					"repository": {
-						"angles": {
-							"patterns": [
-								{
-									"match": "\\\\<|\\\\>|\\\\\\\\",
-									"name": "constant.character.escape.ruby"
-								},
-								{
-									"begin": "<",
-									"end": ">",
-									"patterns": [
-										{
-											"include": "#angles"
-										}
-									]
-								}
-							]
+							"include": "#escaped_char"
+						}
+					]
+				}
+			]
+		},
+		{
+			"begin": "(?=(?><<[-~]([\"'`]?)((?:[_\\w]+_|)SLIM)\\b\\1))",
+			"comment": "Heredoc with embedded Slim",
+			"end": "(?!\\G)",
+			"name": "meta.embedded.block.slim",
+			"patterns": [
+				{
+					"begin": "(?><<[-~]([\"'`]?)((?:[_\\w]+_|)SLIM)\\b\\1)",
+					"beginCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.begin.ruby"
+						}
+					},
+					"contentName": "text.slim",
+					"end": "^\\s*\\2$\\n?",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.string.end.ruby"
+						}
+					},
+					"name": "string.unquoted.heredoc.ruby",
+					"patterns": [
+						{
+							"include": "#heredoc"
 						},
-						"braces": {
-							"patterns": [
-								{
-									"match": "\\\\\\{|\\\\\\}|\\\\\\\\",
-									"name": "constant.character.escape.ruby"
-								},
-								{
-									"begin": "\\{",
-									"end": "\\}",
-									"patterns": [
-										{
-											"include": "#braces"
-										}
-									]
-								}
-							]
+						{
+							"include": "#interpolated_ruby"
 						},
-						"brackets": {
-							"patterns": [
-								{
-									"match": "\\\\\\[|\\\\\\]|\\\\\\\\",
-									"name": "constant.character.escape.ruby"
-								},
-								{
-									"begin": "\\[",
-									"end": "\\]",
-									"patterns": [
-										{
-											"include": "#brackets"
-										}
-									]
-								}
-							]
+						{
+							"include": "text.slim"
 						},
-						"parens": {
-							"patterns": [
-								{
-									"match": "\\\\\\(|\\\\\\)|\\\\\\\\",
-									"name": "constant.character.escape.ruby"
-								},
-								{
-									"begin": "\\(",
-									"end": "\\)",
-									"patterns": [
-										{
-											"include": "#parens"
-										}
-									]
-								}
-							]
+						{
+							"include": "#escaped_char"
+						}
+					]
+				}
+			]
+		},
+		{
+			"begin": "(?>=\\s*<<([\"'`]?)(\\w+)\\1)",
+			"beginCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.begin.ruby"
+				}
+			},
+			"end": "^\\2$",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.ruby"
+				}
+			},
+			"name": "string.unquoted.heredoc.ruby",
+			"patterns": [
+				{
+					"include": "#heredoc"
+				},
+				{
+					"include": "#interpolated_ruby"
+				},
+				{
+					"include": "#escaped_char"
+				}
+			]
+		},
+		{
+			"begin": "(?>((<<[-~]([\"'`]?)(\\w+)\\3,\\s?)*<<[-~]([\"'`]?)(\\w+)\\5))(.*)",
+			"beginCaptures": {
+				"1": {
+					"name": "punctuation.definition.string.begin.ruby"
+				},
+				"7": {
+					"patterns": [
+						{
+							"include": "source.ruby"
 						}
-					}
+					]
+				}
+			},
+			"comment": "heredoc with multiple inputs and indented terminator",
+			"end": "^\\s*\\6$",
+			"endCaptures": {
+				"0": {
+					"name": "punctuation.definition.string.end.ruby"
+				}
+			},
+			"name": "string.unquoted.heredoc.ruby",
+			"patterns": [
+				{
+					"include": "#heredoc"
 				},
 				{
-					"begin": "%Q?(?:([(\\[{<])|([^\\w\\s=]|_))",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.ruby"
-						}
-					},
-					"end": "[)\\]}>]\\2|\\1\\2",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.ruby"
-						}
-					},
-					"name": "string.quoted.other.interpolated.ruby",
+					"include": "#interpolated_ruby"
+				},
+				{
+					"include": "#escaped_char"
+				}
+			]
+		},
+		{
+			"begin": "(?<={|{\\s|[^A-Za-z0-9_:@$]do|^do|[^A-Za-z0-9_:@$]do\\s|^do\\s)(\\|)",
+			"name": "meta.block.parameters.ruby",
+			"captures": {
+				"1": {
+					"name": "punctuation.separator.variable.ruby"
+				}
+			},
+			"end": "(?<!\\|)(\\|)(?!\\|)",
+			"patterns": [
+				{
+					"begin": "(?![\\s,|(])",
+					"end": "(?=,|\\|\\s*)",
 					"patterns": [
 						{
-							"begin": "\\G(?<=\\()(?!\\))",
-							"end": "(?=\\))",
-							"patterns": [
-								{
-									"include": "#parens"
-								}
-							]
-						},
-						{
-							"begin": "\\G(?<=\\[)(?!\\])",
-							"end": "(?=\\])",
-							"patterns": [
-								{
-									"include": "#brackets"
-								}
-							]
-						},
-						{
-							"begin": "\\G(?<=\\{)(?!\\})",
-							"end": "(?=\\})",
-							"patterns": [
-								{
-									"include": "#braces"
-								}
-							]
-						},
-						{
-							"begin": "\\G(?<=<)(?!>)",
-							"end": "(?=>)",
-							"patterns": [
-								{
-									"include": "#angles"
-								}
-							]
-						},
-						{
-							"include": "#escaped_char"
-						},
-						{
-							"include": "#interpolated_ruby"
-						}
-					],
-					"repository": {
-						"angles": {
-							"patterns": [
-								{
-									"include": "#escaped_char"
+							"match": "\\G([&*]?)([a-zA-Z][\\w_]*)|(_[\\w_]*)",
+							"captures": {
+								"1": {
+									"name": "storage.type.variable.ruby"
 								},
-								{
-									"include": "#interpolated_ruby"
+								"2": {
+									"name": "variable.other.block.ruby"
 								},
-								{
-									"begin": "<",
-									"end": ">",
-									"patterns": [
-										{
-											"include": "#angles"
-										}
-									]
+								"3": {
+									"name": "variable.other.block.unused.ruby variable.other.constant.ruby"
 								}
-							]
+							}
+						}
+					]
+				},
+				{
+					"match": ",",
+					"name": "punctuation.separator.variable.ruby"
+				}
+			]
+		},
+		{
+			"match": "=>",
+			"name": "punctuation.separator.key-value"
+		},
+		{
+			"match": "->",
+			"name": "support.function.kernel.ruby"
+		},
+		{
+			"match": "<<=|%=|&{1,2}=|\\*=|\\*\\*=|\\+=|-=|\\^=|\\|{1,2}=|<<",
+			"name": "keyword.operator.assignment.augmented.ruby"
+		},
+		{
+			"match": "<=>|<(?!<|=)|>(?!<|=|>)|<=|>=|===|==|=~|!=|!~|(?<=[ \\t])\\?",
+			"name": "keyword.operator.comparison.ruby"
+		},
+		{
+			"match": "(?<!\\.)\\b(and|not|or)\\b(?![?!])",
+			"name": "keyword.operator.logical.ruby"
+		},
+		{
+			"match": "(?<=^|[ \\t!])!|&&|\\|\\||\\^",
+			"name": "keyword.operator.logical.ruby"
+		},
+		{
+			"comment": "Safe navigation operator",
+			"match": "(&\\.)\\s*(?![A-Z])",
+			"captures": {
+				"1": {
+					"name": "keyword.operator.logical.ruby"
+				}
+			}
+		},
+		{
+			"match": "(%|&|\\*\\*|\\*|\\+|-|/)",
+			"name": "keyword.operator.arithmetic.ruby"
+		},
+		{
+			"match": "=",
+			"name": "keyword.operator.assignment.ruby"
+		},
+		{
+			"match": "\\||~|>>",
+			"name": "keyword.operator.other.ruby"
+		},
+		{
+			"match": ";",
+			"name": "punctuation.separator.statement.ruby"
+		},
+		{
+			"match": ",",
+			"name": "punctuation.separator.object.ruby"
+		},
+		{
+			"comment": "Mark as namespace separator if double colons followed by capital letter",
+			"match": "(::)\\s*(?=[A-Z])",
+			"captures": {
+				"1": {
+					"name": "punctuation.separator.namespace.ruby"
+				}
+			}
+		},
+		{
+			"comment": "Mark as method separator if double colons not followed by capital letter",
+			"match": "(\\.|::)\\s*(?![A-Z])",
+			"captures": {
+				"1": {
+					"name": "punctuation.separator.method.ruby"
+				}
+			}
+		},
+		{
+			"comment": "Must come after method and constant separators to prefer double colons",
+			"match": ":",
+			"name": "punctuation.separator.other.ruby"
+		},
+		{
+			"match": "{",
+			"name": "punctuation.section.scope.begin.ruby"
+		},
+		{
+			"match": "}",
+			"name": "punctuation.section.scope.end.ruby"
+		},
+		{
+			"match": "\\[",
+			"name": "punctuation.section.array.begin.ruby"
+		},
+		{
+			"match": "]",
+			"name": "punctuation.section.array.end.ruby"
+		},
+		{
+			"match": "\\(|\\)",
+			"name": "punctuation.section.function.ruby"
+		},
+		{
+			"name": "meta.function-call.ruby",
+			"begin": "(?<=[^\\.]\\.|::)(?=[a-zA-Z][a-zA-Z0-9_!?]*[^a-zA-Z0-9_!?])",
+			"end": "(?<=[a-zA-Z0-9_!?])(?=[^a-zA-Z0-9_!?])",
+			"patterns": [
+				{
+					"name": "entity.name.function.ruby",
+					"match": "([a-zA-Z][a-zA-Z0-9_!?]*)(?=[^a-zA-Z0-9_!?])"
+				}
+			]
+		},
+		{
+			"begin": "([a-zA-Z]\\w*[!?]?)(\\()",
+			"beginCaptures": {
+				"1": {
+					"name": "entity.name.function.ruby"
+				},
+				"2": {
+					"name": "punctuation.section.function.ruby"
+				}
+			},
+			"end": "(\\))",
+			"endCaptures": {
+				"1": {
+					"name": "punctuation.section.function.ruby"
+				}
+			},
+			"name": "meta.function-call.ruby",
+			"patterns": [
+				{
+					"include": "$self"
+				}
+			]
+		}
+	],
+	"repository": {
+		"method_parameters": {
+			"patterns": [
+				{
+					"include": "#parens"
+				},
+				{
+					"include": "#braces"
+				},
+				{
+					"include": "#brackets"
+				},
+				{
+					"include": "#params"
+				},
+				{
+					"include": "$self"
+				}
+			],
+			"repository": {
+				"params": {
+					"captures": {
+						"1": {
+							"name": "storage.type.variable.ruby"
 						},
-						"braces": {
-							"patterns": [
-								{
-									"include": "#escaped_char"
-								},
-								{
-									"include": "#interpolated_ruby"
-								},
-								{
-									"begin": "\\{",
-									"end": "\\}",
-									"patterns": [
-										{
-											"include": "#braces"
-										}
-									]
-								}
-							]
+						"2": {
+							"name": "constant.other.symbol.hashkey.parameter.function.ruby"
 						},
-						"brackets": {
-							"patterns": [
-								{
-									"include": "#escaped_char"
-								},
-								{
-									"include": "#interpolated_ruby"
-								},
-								{
-									"begin": "\\[",
-									"end": "\\]",
-									"patterns": [
-										{
-											"include": "#brackets"
-										}
-									]
-								}
-							]
+						"3": {
+							"name": "punctuation.definition.constant.ruby"
 						},
-						"parens": {
-							"patterns": [
-								{
-									"include": "#escaped_char"
-								},
-								{
-									"include": "#interpolated_ruby"
-								},
-								{
-									"begin": "\\(",
-									"end": "\\)",
-									"patterns": [
-										{
-											"include": "#parens"
-										}
-									]
-								}
-							]
+						"4": {
+							"name": "variable.parameter.function.ruby"
 						}
-					}
+					},
+					"match": "\\G(&|\\*\\*?)?(?:([_a-zA-Z]\\w*[?!]?(:))|([_a-zA-Z]\\w*))"
 				},
-				{
-					"begin": "%r(?:([(\\[{<])|([^\\w\\s]|_))",
+				"braces": {
+					"begin": "\\{",
 					"beginCaptures": {
 						"0": {
-							"name": "punctuation.definition.string.begin.ruby"
+							"name": "punctuation.section.scope.begin.ruby"
 						}
 					},
-					"end": "([)\\]}>]\\2|\\1\\2)[eimnosux]*",
+					"end": "\\}",
 					"endCaptures": {
 						"0": {
-							"name": "punctuation.definition.string.end.ruby"
+							"name": "punctuation.section.scope.end.ruby"
 						}
 					},
-					"name": "string.regexp.percent.ruby",
 					"patterns": [
 						{
-							"begin": "\\G(?<=\\()(?!\\))",
-							"end": "(?=\\))",
-							"patterns": [
-								{
-									"include": "#parens"
-								}
-							]
-						},
-						{
-							"begin": "\\G(?<=\\[)(?!\\])",
-							"end": "(?=\\])",
-							"patterns": [
-								{
-									"include": "#brackets"
-								}
-							]
+							"include": "#parens"
 						},
 						{
-							"begin": "\\G(?<=\\{)(?!\\})",
-							"end": "(?=\\})",
-							"patterns": [
-								{
-									"include": "#braces"
-								}
-							]
+							"include": "#braces"
 						},
 						{
-							"begin": "\\G(?<=<)(?!>)",
-							"end": "(?=>)",
-							"patterns": [
-								{
-									"include": "#angles"
-								}
-							]
+							"include": "#brackets"
 						},
 						{
-							"include": "#regex_sub"
-						}
-					],
-					"repository": {
-						"angles": {
-							"patterns": [
-								{
-									"include": "#regex_sub"
-								},
-								{
-									"begin": "<",
-									"end": ">",
-									"patterns": [
-										{
-											"include": "#angles"
-										}
-									]
-								}
-							]
-						},
-						"braces": {
-							"patterns": [
-								{
-									"include": "#regex_sub"
-								},
-								{
-									"begin": "\\{",
-									"end": "\\}",
-									"patterns": [
-										{
-											"include": "#braces"
-										}
-									]
-								}
-							]
-						},
-						"brackets": {
-							"patterns": [
-								{
-									"include": "#regex_sub"
-								},
-								{
-									"begin": "\\[",
-									"end": "\\]",
-									"patterns": [
-										{
-											"include": "#brackets"
-										}
-									]
-								}
-							]
-						},
-						"parens": {
-							"patterns": [
-								{
-									"include": "#regex_sub"
-								},
-								{
-									"begin": "\\(",
-									"end": "\\)",
-									"patterns": [
-										{
-											"include": "#parens"
-										}
-									]
-								}
-							]
+							"include": "$self"
 						}
-					}
+					]
 				},
-				{
-					"begin": "%s(?:([(\\[{<])|([^\\w\\s]|_))",
+				"brackets": {
+					"begin": "\\[",
 					"beginCaptures": {
 						"0": {
-							"name": "punctuation.definition.constant.begin.ruby"
+							"name": "punctuation.section.array.begin.ruby"
 						}
 					},
-					"end": "[)\\]}>]\\2|\\1\\2",
+					"end": "\\]",
 					"endCaptures": {
 						"0": {
-							"name": "punctuation.definition.constant.end.ruby"
+							"name": "punctuation.section.array.end.ruby"
 						}
 					},
-					"name": "constant.other.symbol.percent.ruby",
 					"patterns": [
 						{
-							"begin": "\\G(?<=\\()(?!\\))",
-							"end": "(?=\\))",
-							"patterns": [
-								{
-									"include": "#parens"
-								}
-							]
+							"include": "#parens"
 						},
 						{
-							"begin": "\\G(?<=\\[)(?!\\])",
-							"end": "(?=\\])",
-							"patterns": [
-								{
-									"include": "#brackets"
-								}
-							]
+							"include": "#braces"
 						},
 						{
-							"begin": "\\G(?<=\\{)(?!\\})",
-							"end": "(?=\\})",
-							"patterns": [
-								{
-									"include": "#braces"
-								}
-							]
+							"include": "#brackets"
 						},
 						{
-							"begin": "\\G(?<=<)(?!>)",
-							"end": "(?=>)",
-							"patterns": [
-								{
-									"include": "#angles"
-								}
-							]
-						}
-					],
-					"repository": {
-						"angles": {
-							"patterns": [
-								{
-									"match": "\\\\<|\\\\>|\\\\\\\\",
-									"name": "constant.character.escape.ruby"
-								},
-								{
-									"begin": "<",
-									"end": ">",
-									"patterns": [
-										{
-											"include": "#angles"
-										}
-									]
-								}
-							]
-						},
-						"braces": {
-							"patterns": [
-								{
-									"match": "\\\\\\{|\\\\\\}|\\\\\\\\",
-									"name": "constant.character.escape.ruby"
-								},
-								{
-									"begin": "\\{",
-									"end": "\\}",
-									"patterns": [
-										{
-											"include": "#braces"
-										}
-									]
-								}
-							]
-						},
-						"brackets": {
-							"patterns": [
-								{
-									"match": "\\\\\\[|\\\\\\]|\\\\\\\\",
-									"name": "constant.character.escape.ruby"
-								},
-								{
-									"begin": "\\[",
-									"end": "\\]",
-									"patterns": [
-										{
-											"include": "#brackets"
-										}
-									]
-								}
-							]
-						},
-						"parens": {
-							"patterns": [
-								{
-									"match": "\\\\\\(|\\\\\\)|\\\\\\\\",
-									"name": "constant.character.escape.ruby"
-								},
-								{
-									"begin": "\\(",
-									"end": "\\)",
-									"patterns": [
-										{
-											"include": "#parens"
-										}
-									]
-								}
-							]
+							"include": "$self"
 						}
-					}
+					]
 				},
-				{
-					"begin": "%w(?:([(\\[{<])|([^\\w\\s]|_))",
+				"parens": {
+					"begin": "\\(",
 					"beginCaptures": {
 						"0": {
-							"name": "punctuation.section.array.begin.ruby"
+							"name": "punctuation.section.function.begin.ruby"
 						}
 					},
-					"end": "[)\\]}>]\\2|\\1\\2",
+					"end": "\\)",
 					"endCaptures": {
 						"0": {
-							"name": "punctuation.section.array.end.ruby"
+							"name": "punctuation.section.function.end.ruby"
 						}
 					},
-					"name": "meta.array.string.ruby",
 					"patterns": [
 						{
-							"begin": "\\G(?<=\\()(?!\\))",
-							"end": "(?=\\))",
-							"patterns": [
-								{
-									"include": "#parens"
-								},
-								{
-									"include": "#string"
-								}
-							]
-						},
-						{
-							"begin": "\\G(?<=\\[)(?!\\])",
-							"end": "(?=\\])",
-							"patterns": [
-								{
-									"include": "#brackets"
-								},
-								{
-									"include": "#string"
-								}
-							]
+							"include": "#parens"
 						},
 						{
-							"begin": "\\G(?<=\\{)(?!\\})",
-							"end": "(?=\\})",
-							"patterns": [
-								{
-									"include": "#braces"
-								},
-								{
-									"include": "#string"
-								}
-							]
+							"include": "#braces"
 						},
 						{
-							"begin": "\\G(?<=<)(?!>)",
-							"end": "(?=>)",
-							"patterns": [
-								{
-									"include": "#angles"
-								},
-								{
-									"include": "#string"
-								}
-							]
+							"include": "#brackets"
 						},
 						{
-							"include": "#string"
-						}
-					],
-					"repository": {
-						"angles": {
-							"patterns": [
-								{
-									"captures": {
-										"0": {
-											"name": "constant.character.escape.ruby"
-										}
-									},
-									"match": "\\\\<|\\\\>",
-									"name": "string.other.ruby"
-								},
-								{
-									"begin": "<",
-									"captures": {
-										"0": {
-											"name": "string.other.ruby"
-										}
-									},
-									"end": ">",
-									"patterns": [
-										{
-											"include": "#angles"
-										},
-										{
-											"include": "#string"
-										}
-									]
-								}
-							]
-						},
-						"braces": {
-							"patterns": [
-								{
-									"captures": {
-										"0": {
-											"name": "constant.character.escape.ruby"
-										}
-									},
-									"match": "\\\\\\{|\\\\\\}",
-									"name": "string.other.ruby"
-								},
-								{
-									"begin": "\\{",
-									"captures": {
-										"0": {
-											"name": "string.other.ruby"
-										}
-									},
-									"end": "\\}",
-									"patterns": [
-										{
-											"include": "#braces"
-										},
-										{
-											"include": "#string"
-										}
-									]
-								}
-							]
-						},
-						"brackets": {
-							"patterns": [
-								{
-									"captures": {
-										"0": {
-											"name": "constant.character.escape.ruby"
-										}
-									},
-									"match": "\\\\\\[|\\\\\\]",
-									"name": "string.other.ruby"
-								},
-								{
-									"begin": "\\[",
-									"captures": {
-										"0": {
-											"name": "string.other.ruby"
-										}
-									},
-									"end": "\\]",
-									"patterns": [
-										{
-											"include": "#brackets"
-										},
-										{
-											"include": "#string"
-										}
-									]
-								}
-							]
-						},
-						"parens": {
-							"patterns": [
-								{
-									"captures": {
-										"0": {
-											"name": "constant.character.escape.ruby"
-										}
-									},
-									"match": "\\\\\\(|\\\\\\)",
-									"name": "string.other.ruby"
-								},
-								{
-									"begin": "\\(",
-									"captures": {
-										"0": {
-											"name": "string.other.ruby"
-										}
-									},
-									"end": "\\)",
-									"patterns": [
-										{
-											"include": "#parens"
-										},
-										{
-											"include": "#string"
-										}
-									]
-								}
-							]
-						},
-						"string": {
-							"patterns": [
-								{
-									"captures": {
-										"0": {
-											"name": "constant.character.escape.ruby"
-										}
-									},
-									"match": "\\\\\\\\|\\\\[ ]",
-									"name": "string.other.ruby"
-								},
-								{
-									"match": "\\S\\w*",
-									"name": "string.other.ruby"
-								}
-							]
+							"include": "$self"
 						}
-					}
-				},
+					]
+				}
+			}
+		},
+		"escaped_char": {
+			"match": "\\\\(?:[0-7]{1,3}|x[\\da-fA-F]{1,2}|.)",
+			"name": "constant.character.escape.ruby"
+		},
+		"heredoc": {
+			"begin": "^<<[-~]?\\w+",
+			"end": "$",
+			"patterns": [
+				{
+					"include": "$self"
+				}
+			]
+		},
+		"interpolated_ruby": {
+			"patterns": [
 				{
-					"begin": "%W(?:([(\\[{<])|([^\\w\\s]|_))",
+					"begin": "#{",
 					"beginCaptures": {
 						"0": {
-							"name": "punctuation.section.array.begin.ruby"
+							"name": "punctuation.section.embedded.begin.ruby"
 						}
 					},
-					"end": "[)\\]}>]\\2|\\1\\2",
+					"contentName": "source.ruby",
+					"end": "}",
 					"endCaptures": {
 						"0": {
-							"name": "punctuation.section.array.end.ruby"
+							"name": "punctuation.section.embedded.end.ruby"
 						}
 					},
-					"name": "meta.array.string.interpolated.ruby",
+					"name": "meta.embedded.line.ruby",
 					"patterns": [
 						{
-							"begin": "\\G(?<=\\()(?!\\))",
-							"end": "(?=\\))",
-							"patterns": [
-								{
-									"include": "#parens"
-								},
-								{
-									"include": "#string"
-								}
-							]
-						},
-						{
-							"begin": "\\G(?<=\\[)(?!\\])",
-							"end": "(?=\\])",
-							"patterns": [
-								{
-									"include": "#brackets"
-								},
-								{
-									"include": "#string"
-								}
-							]
-						},
-						{
-							"begin": "\\G(?<=\\{)(?!\\})",
-							"end": "(?=\\})",
-							"patterns": [
-								{
-									"include": "#braces"
-								},
-								{
-									"include": "#string"
-								}
-							]
+							"include": "#nest_curly_and_self"
 						},
 						{
-							"begin": "\\G(?<=<)(?!>)",
-							"end": "(?=>)",
-							"patterns": [
-								{
-									"include": "#angles"
-								},
-								{
-									"include": "#string"
-								}
-							]
-						},
+							"include": "$self"
+						}
+					]
+				},
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.variable.ruby"
+						}
+					},
+					"match": "(#@)[a-zA-Z_]\\w*",
+					"name": "variable.other.readwrite.instance.ruby"
+				},
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.variable.ruby"
+						}
+					},
+					"match": "(#@@)[a-zA-Z_]\\w*",
+					"name": "variable.other.readwrite.class.ruby"
+				},
+				{
+					"captures": {
+						"1": {
+							"name": "punctuation.definition.variable.ruby"
+						}
+					},
+					"match": "(#\\$)[a-zA-Z_]\\w*",
+					"name": "variable.other.readwrite.global.ruby"
+				}
+			]
+		},
+		"nest_brackets": {
+			"begin": "\\[",
+			"captures": {
+				"0": {
+					"name": "punctuation.section.scope.ruby"
+				}
+			},
+			"end": "]",
+			"patterns": [
+				{
+					"include": "#nest_brackets"
+				}
+			]
+		},
+		"nest_brackets_i": {
+			"begin": "\\[",
+			"captures": {
+				"0": {
+					"name": "punctuation.section.scope.ruby"
+				}
+			},
+			"end": "]",
+			"patterns": [
+				{
+					"include": "#interpolated_ruby"
+				},
+				{
+					"include": "#escaped_char"
+				},
+				{
+					"include": "#nest_brackets_i"
+				}
+			]
+		},
+		"nest_brackets_r": {
+			"begin": "\\[",
+			"captures": {
+				"0": {
+					"name": "punctuation.section.scope.ruby"
+				}
+			},
+			"end": "]",
+			"patterns": [
+				{
+					"include": "#regex_sub"
+				},
+				{
+					"include": "#nest_brackets_r"
+				}
+			]
+		},
+		"nest_curly": {
+			"begin": "{",
+			"captures": {
+				"0": {
+					"name": "punctuation.section.scope.ruby"
+				}
+			},
+			"end": "}",
+			"patterns": [
+				{
+					"include": "#nest_curly"
+				}
+			]
+		},
+		"nest_curly_and_self": {
+			"patterns": [
+				{
+					"begin": "{",
+					"captures": {
+						"0": {
+							"name": "punctuation.section.scope.ruby"
+						}
+					},
+					"end": "}",
+					"patterns": [
 						{
-							"include": "#string"
-						}
-					],
-					"repository": {
-						"angles": {
-							"patterns": [
-								{
-									"begin": "<",
-									"captures": {
-										"0": {
-											"name": "string.other.ruby"
-										}
-									},
-									"end": ">",
-									"patterns": [
-										{
-											"include": "#angles"
-										},
-										{
-											"include": "#string"
-										}
-									]
-								}
-							]
-						},
-						"braces": {
-							"patterns": [
-								{
-									"begin": "\\{",
-									"captures": {
-										"0": {
-											"name": "string.other.ruby"
-										}
-									},
-									"end": "\\}",
-									"patterns": [
-										{
-											"include": "#braces"
-										},
-										{
-											"include": "#string"
-										}
-									]
-								}
-							]
-						},
-						"brackets": {
-							"patterns": [
-								{
-									"begin": "\\[",
-									"captures": {
-										"0": {
-											"name": "string.other.ruby"
-										}
-									},
-									"end": "\\]",
-									"patterns": [
-										{
-											"include": "#brackets"
-										},
-										{
-											"include": "#string"
-										}
-									]
-								}
-							]
-						},
-						"parens": {
-							"patterns": [
-								{
-									"begin": "\\(",
-									"captures": {
-										"0": {
-											"name": "string.other.ruby"
-										}
-									},
-									"end": "\\)",
-									"patterns": [
-										{
-											"include": "#parens"
-										},
-										{
-											"include": "#string"
-										}
-									]
-								}
-							]
-						},
-						"string": {
-							"patterns": [
-								{
-									"begin": "(?=\\\\|#\\{)",
-									"end": "(?!\\G)",
-									"name": "string.other.ruby",
-									"patterns": [
-										{
-											"include": "#escaped_char"
-										},
-										{
-											"include": "#interpolated_ruby"
-										}
-									]
-								},
-								{
-									"match": "\\S\\w*",
-									"name": "string.other.ruby"
-								}
-							]
+							"include": "#nest_curly_and_self"
 						}
-					}
+					]
+				},
+				{
+					"include": "$self"
+				}
+			]
+		},
+		"nest_curly_i": {
+			"begin": "{",
+			"captures": {
+				"0": {
+					"name": "punctuation.section.scope.ruby"
+				}
+			},
+			"end": "}",
+			"patterns": [
+				{
+					"include": "#interpolated_ruby"
+				},
+				{
+					"include": "#escaped_char"
+				},
+				{
+					"include": "#nest_curly_i"
+				}
+			]
+		},
+		"nest_curly_r": {
+			"begin": "{",
+			"captures": {
+				"0": {
+					"name": "punctuation.section.scope.ruby"
+				}
+			},
+			"end": "}",
+			"patterns": [
+				{
+					"include": "#regex_sub"
+				},
+				{
+					"include": "#nest_curly_r"
+				}
+			]
+		},
+		"nest_ltgt": {
+			"begin": "<",
+			"captures": {
+				"0": {
+					"name": "punctuation.section.scope.ruby"
+				}
+			},
+			"end": ">",
+			"patterns": [
+				{
+					"include": "#nest_ltgt"
+				}
+			]
+		},
+		"nest_ltgt_i": {
+			"begin": "<",
+			"captures": {
+				"0": {
+					"name": "punctuation.section.scope.ruby"
+				}
+			},
+			"end": ">",
+			"patterns": [
+				{
+					"include": "#interpolated_ruby"
+				},
+				{
+					"include": "#escaped_char"
+				},
+				{
+					"include": "#nest_ltgt_i"
+				}
+			]
+		},
+		"nest_ltgt_r": {
+			"begin": "<",
+			"captures": {
+				"0": {
+					"name": "punctuation.section.scope.ruby"
+				}
+			},
+			"end": ">",
+			"patterns": [
+				{
+					"include": "#regex_sub"
+				},
+				{
+					"include": "#nest_ltgt_r"
+				}
+			]
+		},
+		"nest_parens": {
+			"begin": "\\(",
+			"captures": {
+				"0": {
+					"name": "punctuation.section.scope.ruby"
+				}
+			},
+			"end": "\\)",
+			"patterns": [
+				{
+					"include": "#nest_parens"
+				}
+			]
+		},
+		"nest_parens_i": {
+			"begin": "\\(",
+			"captures": {
+				"0": {
+					"name": "punctuation.section.scope.ruby"
+				}
+			},
+			"end": "\\)",
+			"patterns": [
+				{
+					"include": "#interpolated_ruby"
 				},
 				{
-					"begin": "%x(?:([(\\[{<])|([^\\w\\s]|_))",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.begin.ruby"
-						}
-					},
-					"end": "[)\\]}>]\\2|\\1\\2",
-					"endCaptures": {
-						"0": {
-							"name": "punctuation.definition.string.end.ruby"
-						}
-					},
-					"name": "string.interpolated.percent.ruby",
-					"patterns": [
-						{
-							"begin": "\\G(?<=\\()(?!\\))",
-							"end": "(?=\\))",
-							"patterns": [
-								{
-									"include": "#parens"
-								}
-							]
-						},
-						{
-							"begin": "\\G(?<=\\[)(?!\\])",
-							"end": "(?=\\])",
-							"patterns": [
-								{
-									"include": "#brackets"
-								}
-							]
-						},
-						{
-							"begin": "\\G(?<=\\{)(?!\\})",
-							"end": "(?=\\})",
-							"patterns": [
-								{
-									"include": "#braces"
-								}
-							]
-						},
-						{
-							"begin": "\\G(?<=<)(?!>)",
-							"end": "(?=>)",
-							"patterns": [
-								{
-									"include": "#angles"
-								}
-							]
-						},
-						{
-							"include": "#escaped_char"
-						},
-						{
-							"include": "#interpolated_ruby"
-						}
-					],
-					"repository": {
-						"angles": {
-							"patterns": [
-								{
-									"include": "#escaped_char"
-								},
-								{
-									"include": "#interpolated_ruby"
-								},
-								{
-									"begin": "<",
-									"end": ">",
-									"patterns": [
-										{
-											"include": "#angles"
-										}
-									]
-								}
-							]
-						},
-						"braces": {
-							"patterns": [
-								{
-									"include": "#escaped_char"
-								},
-								{
-									"include": "#interpolated_ruby"
-								},
-								{
-									"begin": "\\{",
-									"end": "\\}",
-									"patterns": [
-										{
-											"include": "#braces"
-										}
-									]
-								}
-							]
-						},
-						"brackets": {
-							"patterns": [
-								{
-									"include": "#escaped_char"
-								},
-								{
-									"include": "#interpolated_ruby"
-								},
-								{
-									"begin": "\\[",
-									"end": "\\]",
-									"patterns": [
-										{
-											"include": "#brackets"
-										}
-									]
-								}
-							]
-						},
-						"parens": {
-							"patterns": [
-								{
-									"include": "#escaped_char"
-								},
-								{
-									"include": "#interpolated_ruby"
-								},
-								{
-									"begin": "\\(",
-									"end": "\\)",
-									"patterns": [
-										{
-											"include": "#parens"
-										}
-									]
-								}
-							]
-						}
-					}
+					"include": "#escaped_char"
+				},
+				{
+					"include": "#nest_parens_i"
+				}
+			]
+		},
+		"nest_parens_r": {
+			"begin": "\\(",
+			"captures": {
+				"0": {
+					"name": "punctuation.section.scope.ruby"
+				}
+			},
+			"end": "\\)",
+			"patterns": [
+				{
+					"include": "#regex_sub"
+				},
+				{
+					"include": "#nest_parens_r"
 				}
 			]
 		},
@@ -2694,29 +2804,24 @@
 				{
 					"captures": {
 						"1": {
-							"name": "punctuation.definition.quantifier.begin.ruby"
+							"name": "punctuation.definition.arbitrary-repetition.ruby"
 						},
 						"3": {
-							"name": "punctuation.definition.quantifier.end.ruby"
+							"name": "punctuation.definition.arbitrary-repetition.ruby"
 						}
 					},
-					"match": "(\\{)\\d+(,\\d+)?(\\})",
-					"name": "keyword.operator.quantifier.ruby"
+					"match": "({)\\d+(,\\d+)?(})",
+					"name": "string.regexp.arbitrary-repetition.ruby"
 				},
 				{
-					"begin": "\\[\\^?",
-					"beginCaptures": {
-						"0": {
-							"name": "punctuation.definition.character-class.begin.ruby"
-						}
-					},
-					"end": "\\]",
-					"endCaptures": {
+					"begin": "\\[(?:\\^?])?",
+					"captures": {
 						"0": {
-							"name": "punctuation.definition.character-class.end.ruby"
+							"name": "punctuation.definition.character-class.ruby"
 						}
 					},
-					"name": "constant.other.character-class.set.ruby",
+					"end": "]",
+					"name": "string.regexp.character-class.ruby",
 					"patterns": [
 						{
 							"include": "#escaped_char"
@@ -2751,7 +2856,7 @@
 						}
 					},
 					"end": "\\)",
-					"name": "meta.group.regexp.ruby",
+					"name": "string.regexp.group.ruby",
 					"patterns": [
 						{
 							"include": "#regex_sub"
@@ -2767,9 +2872,328 @@
 					},
 					"comment": "We are restrictive in what we allow to go after the comment character to avoid false positives, since the availability of comments depend on regexp flags.",
 					"end": "$\\n?",
+					"endCaptures": {
+						"0": {
+							"name": "punctuation.definition.comment.ruby"
+						}
+					},
 					"name": "comment.line.number-sign.ruby"
 				}
 			]
+		},
+		"yard": {
+			"patterns": [
+				{
+					"include": "#yard_comment"
+				},
+				{
+					"include": "#yard_param_types"
+				},
+				{
+					"include": "#yard_option"
+				},
+				{
+					"include": "#yard_tag"
+				},
+				{
+					"include": "#yard_types"
+				},
+				{
+					"include": "#yard_directive"
+				},
+				{
+					"include": "#yard_see"
+				},
+				{
+					"include": "#yard_macro_attribute"
+				}
+			]
+		},
+		"yard_see": {
+			"comment": "separate rule for @see because name could contain url",
+			"begin": "^(\\s*)(#)(\\s*)(@)(see)(?=\\s)(\\s+(.+?))?(?=\\s|$)",
+			"beginCaptures": {
+				"2": {
+					"name": "punctuation.definition.comment.ruby"
+				},
+				"4": {
+					"name": "comment.line.keyword.punctuation.yard.ruby"
+				},
+				"5": {
+					"name": "comment.line.keyword.yard.ruby"
+				},
+				"7": {
+					"name": "comment.line.parameter.yard.ruby"
+				}
+			},
+			"end": "^(?!\\s*#\\3\\s{2,}|\\s*#\\s*$)",
+			"contentName": "comment.line.string.yard.ruby",
+			"name": "comment.line.number-sign.ruby",
+			"patterns": [
+				{
+					"include": "#yard"
+				},
+				{
+					"include": "#yard_continuation"
+				}
+			]
+		},
+		"yard_macro_attribute": {
+			"comment": "separate rule for attribute and macro tags because name goes after []",
+			"begin": "^(\\s*)(#)(\\s*)(@!)(attribute|macro)(\\s+((\\[).+(])))?(?=\\s)(\\s+([a-z_]\\w*:?))?",
+			"beginCaptures": {
+				"2": {
+					"name": "punctuation.definition.comment.ruby"
+				},
+				"4": {
+					"name": "comment.line.keyword.punctuation.yard.ruby"
+				},
+				"5": {
+					"name": "comment.line.keyword.yard.ruby"
+				},
+				"7": {
+					"name": "comment.line.type.yard.ruby"
+				},
+				"8": {
+					"name": "comment.line.punctuation.yard.ruby"
+				},
+				"9": {
+					"name": "comment.line.punctuation.yard.ruby"
+				},
+				"11": {
+					"name": "comment.line.parameter.yard.ruby"
+				}
+			},
+			"end": "^(?!\\s*#\\3\\s{2,}|\\s*#\\s*$)",
+			"contentName": "comment.line.string.yard.ruby",
+			"name": "comment.line.number-sign.ruby",
+			"patterns": [
+				{
+					"include": "#yard"
+				},
+				{
+					"include": "#yard_continuation"
+				}
+			]
+		},
+		"yard_comment": {
+			"comment": "For YARD tags that follow the tag-comment pattern",
+			"begin": "^(\\s*)(#)(\\s*)(@)(abstract|api|author|deprecated|example|macro|note|overload|since|todo|version)(?=\\s|$)",
+			"beginCaptures": {
+				"2": {
+					"name": "punctuation.definition.comment.ruby"
+				},
+				"4": {
+					"name": "comment.line.keyword.punctuation.yard.ruby"
+				},
+				"5": {
+					"name": "comment.line.keyword.yard.ruby"
+				}
+			},
+			"end": "^(?!\\s*#\\3\\s{2,}|\\s*#\\s*$)",
+			"contentName": "comment.line.string.yard.ruby",
+			"name": "comment.line.number-sign.ruby",
+			"patterns": [
+				{
+					"include": "#yard"
+				},
+				{
+					"include": "#yard_continuation"
+				}
+			]
+		},
+		"yard_param_types": {
+			"comment": "For YARD tags that follow the tag-name-types-description or tag-types-name-description pattern",
+			"begin": "^(\\s*)(#)(\\s*)(@)(attr|attr_reader|attr_writer|yieldparam|param)(?=\\s)(?>\\s+(?>([a-z_]\\w*:?)|((\\[).+(]))))?(?>\\s+(?>((\\[).+(]))|([a-z_]\\w*:?)))?",
+			"beginCaptures": {
+				"2": {
+					"name": "punctuation.definition.comment.ruby"
+				},
+				"4": {
+					"name": "comment.line.keyword.punctuation.yard.ruby"
+				},
+				"5": {
+					"name": "comment.line.keyword.yard.ruby"
+				},
+				"6": {
+					"name": "comment.line.parameter.yard.ruby"
+				},
+				"7": {
+					"name": "comment.line.type.yard.ruby"
+				},
+				"8": {
+					"name": "comment.line.punctuation.yard.ruby"
+				},
+				"9": {
+					"name": "comment.line.punctuation.yard.ruby"
+				},
+				"10": {
+					"name": "comment.line.type.yard.ruby"
+				},
+				"11": {
+					"name": "comment.line.punctuation.yard.ruby"
+				},
+				"12": {
+					"name": "comment.line.punctuation.yard.ruby"
+				},
+				"13": {
+					"name": "comment.line.parameter.yard.ruby"
+				}
+			},
+			"end": "^(?!\\s*#\\3\\s{2,}|\\s*#\\s*$)",
+			"contentName": "comment.line.string.yard.ruby",
+			"name": "comment.line.number-sign.ruby",
+			"patterns": [
+				{
+					"include": "#yard"
+				},
+				{
+					"include": "#yard_continuation"
+				}
+			]
+		},
+		"yard_option": {
+			"comment": "For YARD option tag that follow the tag-name-types-key-(value)-description pattern",
+			"begin": "^(\\s*)(#)(\\s*)(@)(option)(?=\\s)(?>\\s+([a-z_]\\w*:?))?(?>\\s+((\\[).+(])))?(?>\\s+((\\S*)))?(?>\\s+((\\().+(\\))))?",
+			"beginCaptures": {
+				"2": {
+					"name": "punctuation.definition.comment.ruby"
+				},
+				"4": {
+					"name": "comment.line.keyword.punctuation.yard.ruby"
+				},
+				"5": {
+					"name": "comment.line.keyword.yard.ruby"
+				},
+				"6": {
+					"name": "comment.line.parameter.yard.ruby"
+				},
+				"7": {
+					"name": "comment.line.type.yard.ruby"
+				},
+				"8": {
+					"name": "comment.line.punctuation.yard.ruby"
+				},
+				"9": {
+					"name": "comment.line.punctuation.yard.ruby"
+				},
+				"10": {
+					"name": "comment.line.keyword.yard.ruby"
+				},
+				"11": {
+					"name": "comment.line.hashkey.yard.ruby"
+				},
+				"12": {
+					"name": "comment.line.defaultvalue.yard.ruby"
+				},
+				"13": {
+					"name": "comment.line.punctuation.yard.ruby"
+				},
+				"14": {
+					"name": "comment.line.punctuation.yard.ruby"
+				}
+			},
+			"end": "^(?!\\s*#\\3\\s{2,}|\\s*#\\s*$)",
+			"contentName": "comment.line.string.yard.ruby",
+			"name": "comment.line.number-sign.ruby",
+			"patterns": [
+				{
+					"include": "#yard"
+				},
+				{
+					"include": "#yard_continuation"
+				}
+			]
+		},
+		"yard_tag": {
+			"comment": "For YARD tags that are just the tag",
+			"match": "^(\\s*)(#)(\\s*)(@)(private)$",
+			"captures": {
+				"2": {
+					"name": "punctuation.definition.comment.ruby"
+				},
+				"4": {
+					"name": "comment.line.keyword.punctuation.yard.ruby"
+				},
+				"5": {
+					"name": "comment.line.keyword.yard.ruby"
+				}
+			},
+			"name": "comment.line.number-sign.ruby"
+		},
+		"yard_types": {
+			"comment": "For YARD tags that follow the tag-types-comment pattern",
+			"begin": "^(\\s*)(#)(\\s*)(@)(raise|return|yield(?:return)?)(?=\\s)(\\s+((\\[).+(])))?",
+			"beginCaptures": {
+				"2": {
+					"name": "punctuation.definition.comment.ruby"
+				},
+				"4": {
+					"name": "comment.line.keyword.punctuation.yard.ruby"
+				},
+				"5": {
+					"name": "comment.line.keyword.yard.ruby"
+				},
+				"7": {
+					"name": "comment.line.type.yard.ruby"
+				},
+				"8": {
+					"name": "comment.line.punctuation.yard.ruby"
+				},
+				"9": {
+					"name": "comment.line.punctuation.yard.ruby"
+				}
+			},
+			"end": "^(?!\\s*#\\3\\s{2,}|\\s*#\\s*$)",
+			"contentName": "comment.line.string.yard.ruby",
+			"name": "comment.line.number-sign.ruby",
+			"patterns": [
+				{
+					"include": "#yard"
+				},
+				{
+					"include": "#yard_continuation"
+				}
+			]
+		},
+		"yard_directive": {
+			"comment": "For YARD directives",
+			"begin": "^(\\s*)(#)(\\s*)(@!)(endgroup|group|method|parse|scope|visibility)(\\s+((\\[).+(])))?(?=\\s)",
+			"beginCaptures": {
+				"2": {
+					"name": "punctuation.definition.comment.ruby"
+				},
+				"4": {
+					"name": "comment.line.keyword.punctuation.yard.ruby"
+				},
+				"5": {
+					"name": "comment.line.keyword.yard.ruby"
+				},
+				"7": {
+					"name": "comment.line.type.yard.ruby"
+				},
+				"8": {
+					"name": "comment.line.punctuation.yard.ruby"
+				},
+				"9": {
+					"name": "comment.line.punctuation.yard.ruby"
+				}
+			},
+			"end": "^(?!\\s*#\\3\\s{2,}|\\s*#\\s*$)",
+			"contentName": "comment.line.string.yard.ruby",
+			"name": "comment.line.number-sign.ruby",
+			"patterns": [
+				{
+					"include": "#yard"
+				},
+				{
+					"include": "#yard_continuation"
+				}
+			]
+		},
+		"yard_continuation": {
+			"match": "^\\s*#",
+			"name": "punctuation.definition.comment.ruby"
 		}
 	}
 }
\ No newline at end of file
diff --git a/extensions/theme-defaults/themes/dark_plus.json b/extensions/theme-defaults/themes/dark_plus.json
index 5565e2dbec6..8328860a9ff 100644
--- a/extensions/theme-defaults/themes/dark_plus.json
+++ b/extensions/theme-defaults/themes/dark_plus.json
@@ -64,7 +64,8 @@
 				"support.constant.math",
 				"support.constant.dom",
 				"support.constant.json",
-				"entity.other.inherited-class"
+				"entity.other.inherited-class",
+				"punctuation.separator.namespace.ruby"
 			],
 			"settings": {
 				"foreground": "#4EC9B0"
diff --git a/extensions/theme-defaults/themes/hc_black.json b/extensions/theme-defaults/themes/hc_black.json
index ebb49d98644..b3a1a1f065f 100644
--- a/extensions/theme-defaults/themes/hc_black.json
+++ b/extensions/theme-defaults/themes/hc_black.json
@@ -395,7 +395,8 @@
 				"support.constant.math",
 				"support.constant.dom",
 				"support.constant.json",
-				"entity.other.inherited-class"
+				"entity.other.inherited-class",
+				"punctuation.separator.namespace.ruby"
 			],
 			"settings": {
 				"foreground": "#4EC9B0"
diff --git a/extensions/theme-defaults/themes/hc_light.json b/extensions/theme-defaults/themes/hc_light.json
index 460f26ad738..6d192e76757 100644
--- a/extensions/theme-defaults/themes/hc_light.json
+++ b/extensions/theme-defaults/themes/hc_light.json
@@ -429,7 +429,8 @@
 				"support.constant.math",
 				"support.constant.dom",
 				"support.constant.json",
-				"entity.other.inherited-class"
+				"entity.other.inherited-class",
+				"punctuation.separator.namespace.ruby"
 			],
 			"settings": {
 				"foreground": "#185E73"
diff --git a/extensions/theme-defaults/themes/light_plus.json b/extensions/theme-defaults/themes/light_plus.json
index 7f77883f3ee..b1b4e45c2fe 100644
--- a/extensions/theme-defaults/themes/light_plus.json
+++ b/extensions/theme-defaults/themes/light_plus.json
@@ -64,7 +64,8 @@
 				"support.constant.math",
 				"support.constant.dom",
 				"support.constant.json",
-				"entity.other.inherited-class"
+				"entity.other.inherited-class",
+				"punctuation.separator.namespace.ruby"
 			],
 			"settings": {
 				"foreground": "#267f99"
diff --git a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
index ec50a96586a..d526a33e9a8 100644
--- a/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
+++ b/extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json
@@ -187,7 +187,8 @@
 			"scope": [
 				"string",
 				"constant.other.symbol",
-				"entity.other.inherited-class"
+				"entity.other.inherited-class",
+				"punctuation.separator.namespace.ruby"
 			],
 			"settings": {
 				"foreground": "#889b4a"
diff --git a/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json b/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json
index 3f41fb052e0..a79ad385326 100644
--- a/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json
+++ b/extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json
@@ -160,7 +160,10 @@
 		},
 		{
 			"name": "Inherited class",
-			"scope": "entity.other.inherited-class",
+			"scope": [
+				"entity.other.inherited-class",
+				"punctuation.separator.namespace.ruby"
+			],
 			"settings": {
 				"fontStyle": "",
 				"foreground": "#C7444A"
diff --git a/extensions/theme-monokai/themes/monokai-color-theme.json b/extensions/theme-monokai/themes/monokai-color-theme.json
index 9a510748714..829b33b9355 100644
--- a/extensions/theme-monokai/themes/monokai-color-theme.json
+++ b/extensions/theme-monokai/themes/monokai-color-theme.json
@@ -213,7 +213,10 @@
 		},
 		{
 			"name": "Inherited class",
-			"scope": "entity.other.inherited-class",
+			"scope": [
+				"entity.other.inherited-class",
+				"punctuation.separator.namespace.ruby"
+			],
 			"settings": {
 				"fontStyle": "italic underline",
 				"foreground": "#A6E22E"
diff --git a/extensions/theme-quietlight/themes/quietlight-color-theme.json b/extensions/theme-quietlight/themes/quietlight-color-theme.json
index 0b6cd0be740..47d78a679cb 100644
--- a/extensions/theme-quietlight/themes/quietlight-color-theme.json
+++ b/extensions/theme-quietlight/themes/quietlight-color-theme.json
@@ -127,6 +127,7 @@
 				"entity.name.namespace",
 				"entity.name.scope-resolution",
 				"entity.other.inherited-class",
+				"punctuation.separator.namespace.ruby",
 				"support.class"
 			],
 			"settings": {
diff --git a/extensions/theme-red/themes/Red-color-theme.json b/extensions/theme-red/themes/Red-color-theme.json
index 233fd9e83da..4625df1a5d5 100644
--- a/extensions/theme-red/themes/Red-color-theme.json
+++ b/extensions/theme-red/themes/Red-color-theme.json
@@ -150,8 +150,11 @@
 		},
 		{
 			"name": "Entity inherited-class",
-			"scope": "entity.other.inherited-class",
-			"settings": {
+			"scope": [
+				"entity.other.inherited-class",
+				"punctuation.separator.namespace.ruby"
+			],
+		"settings": {
 				"fontStyle": "underline",
 				"foreground": "#aa5507ff"
 			}
diff --git a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
index e67135a9d99..af1e7a913ff 100644
--- a/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
+++ b/extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json
@@ -140,7 +140,10 @@
 		},
 		{
 			"name": "Inherited class",
-			"scope": "entity.other.inherited-class",
+			"scope": [
+				"entity.other.inherited-class",
+				"punctuation.separator.namespace.ruby"
+			],
 			"settings": {
 				"foreground": "#6C71C4"
 			}
diff --git a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
index d5f6dc11bf0..11a71e6635b 100644
--- a/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
+++ b/extensions/theme-solarized-light/themes/solarized-light-color-theme.json
@@ -140,7 +140,10 @@
 		},
 		{
 			"name": "Inherited class",
-			"scope": "entity.other.inherited-class",
+			"scope": [
+				"entity.other.inherited-class",
+				"punctuation.separator.namespace.ruby",
+			],
 			"settings": {
 				"foreground": "#6C71C4"
 			}
diff --git a/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-color-theme.json b/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-color-theme.json
index 89bc8acd36f..3d313ef2e1e 100644
--- a/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-color-theme.json
+++ b/extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-color-theme.json
@@ -117,7 +117,7 @@
 		},
 		{
 			"name": "String, Symbols, Inherited Class, Markup Heading, GitGutter inserted",
-			"scope": "string, constant.other.symbol, entity.other.inherited-class, markup.heading, markup.inserted.git_gutter",
+			"scope": "string, constant.other.symbol, entity.other.inherited-class, punctuation.separator.namespace.ruby, markup.heading, markup.inserted.git_gutter",
 			"settings": {
 				"fontStyle": "",
 				"foreground": "#D1F1A9"
diff --git a/extensions/vscode-colorize-tests/test/colorize-results/test_rb.json b/extensions/vscode-colorize-tests/test/colorize-results/test_rb.json
index d36726f9866..6230a5f14b3 100644
--- a/extensions/vscode-colorize-tests/test/colorize-results/test_rb.json
+++ b/extensions/vscode-colorize-tests/test/colorize-results/test_rb.json
@@ -113,7 +113,7 @@
 	},
 	{
 		"c": "module",
-		"t": "source.ruby meta.module.ruby keyword.control.module.ruby",
+		"t": "source.ruby keyword.control.ruby",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -127,7 +127,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.ruby meta.module.ruby",
+		"t": "source.ruby",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -141,72 +141,72 @@
 	},
 	{
 		"c": "Azure",
-		"t": "source.ruby meta.module.ruby entity.name.type.module.ruby entity.other.inherited-class.module.first.ruby",
+		"t": "source.ruby support.class.ruby",
 		"r": {
-			"dark_plus": "entity.other.inherited-class: #4EC9B0",
-			"light_plus": "entity.other.inherited-class: #267F99",
+			"dark_plus": "support.class: #4EC9B0",
+			"light_plus": "support.class: #267F99",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "entity.other.inherited-class: #4EC9B0",
-			"dark_modern": "entity.other.inherited-class: #4EC9B0",
-			"hc_light": "entity.other.inherited-class: #185E73",
-			"light_modern": "entity.other.inherited-class: #267F99"
+			"hc_black": "support.class: #4EC9B0",
+			"dark_modern": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_modern": "support.class: #267F99"
 		}
 	},
 	{
 		"c": "::",
-		"t": "source.ruby meta.module.ruby entity.name.type.module.ruby entity.other.inherited-class.module.first.ruby punctuation.separator.inheritance.ruby",
+		"t": "source.ruby punctuation.separator.namespace.ruby",
 		"r": {
-			"dark_plus": "entity.other.inherited-class: #4EC9B0",
-			"light_plus": "entity.other.inherited-class: #267F99",
+			"dark_plus": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"light_plus": "punctuation.separator.namespace.ruby: #267F99",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "entity.other.inherited-class: #4EC9B0",
-			"dark_modern": "entity.other.inherited-class: #4EC9B0",
-			"hc_light": "entity.other.inherited-class: #185E73",
-			"light_modern": "entity.other.inherited-class: #267F99"
+			"hc_black": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"dark_modern": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"hc_light": "punctuation.separator.namespace.ruby: #185E73",
+			"light_modern": "punctuation.separator.namespace.ruby: #267F99"
 		}
 	},
 	{
 		"c": "ARM",
-		"t": "source.ruby meta.module.ruby entity.name.type.module.ruby entity.other.inherited-class.module.second.ruby",
+		"t": "source.ruby support.class.ruby",
 		"r": {
-			"dark_plus": "entity.other.inherited-class: #4EC9B0",
-			"light_plus": "entity.other.inherited-class: #267F99",
+			"dark_plus": "support.class: #4EC9B0",
+			"light_plus": "support.class: #267F99",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "entity.other.inherited-class: #4EC9B0",
-			"dark_modern": "entity.other.inherited-class: #4EC9B0",
-			"hc_light": "entity.other.inherited-class: #185E73",
-			"light_modern": "entity.other.inherited-class: #267F99"
+			"hc_black": "support.class: #4EC9B0",
+			"dark_modern": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_modern": "support.class: #267F99"
 		}
 	},
 	{
 		"c": "::",
-		"t": "source.ruby meta.module.ruby entity.name.type.module.ruby entity.other.inherited-class.module.second.ruby punctuation.separator.inheritance.ruby",
+		"t": "source.ruby punctuation.separator.namespace.ruby",
 		"r": {
-			"dark_plus": "entity.other.inherited-class: #4EC9B0",
-			"light_plus": "entity.other.inherited-class: #267F99",
+			"dark_plus": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"light_plus": "punctuation.separator.namespace.ruby: #267F99",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "entity.other.inherited-class: #4EC9B0",
-			"dark_modern": "entity.other.inherited-class: #4EC9B0",
-			"hc_light": "entity.other.inherited-class: #185E73",
-			"light_modern": "entity.other.inherited-class: #267F99"
+			"hc_black": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"dark_modern": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"hc_light": "punctuation.separator.namespace.ruby: #185E73",
+			"light_modern": "punctuation.separator.namespace.ruby: #267F99"
 		}
 	},
 	{
 		"c": "Scheduler",
-		"t": "source.ruby meta.module.ruby entity.name.type.module.ruby",
+		"t": "source.ruby variable.other.constant.ruby",
 		"r": {
-			"dark_plus": "entity.name.type: #4EC9B0",
-			"light_plus": "entity.name.type: #267F99",
+			"dark_plus": "variable.other.constant: #4FC1FF",
+			"light_plus": "variable.other.constant: #0070C1",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "entity.name.type: #4EC9B0",
-			"dark_modern": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable.other.constant: #4FC1FF",
+			"hc_light": "variable.other.constant: #02715D",
+			"light_modern": "variable.other.constant: #0070C1"
 		}
 	},
 	{
@@ -309,7 +309,7 @@
 	},
 	{
 		"c": "  ",
-		"t": "source.ruby meta.class.ruby",
+		"t": "source.ruby",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -323,7 +323,7 @@
 	},
 	{
 		"c": "class",
-		"t": "source.ruby meta.class.ruby keyword.control.class.ruby",
+		"t": "source.ruby keyword.control.ruby",
 		"r": {
 			"dark_plus": "keyword.control: #C586C0",
 			"light_plus": "keyword.control: #AF00DB",
@@ -337,7 +337,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.ruby meta.class.ruby",
+		"t": "source.ruby",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -351,21 +351,21 @@
 	},
 	{
 		"c": "SchedulerManagementClient",
-		"t": "source.ruby meta.class.ruby entity.name.type.class.ruby",
+		"t": "source.ruby variable.other.constant.ruby",
 		"r": {
-			"dark_plus": "entity.name.type: #4EC9B0",
-			"light_plus": "entity.name.type: #267F99",
+			"dark_plus": "variable.other.constant: #4FC1FF",
+			"light_plus": "variable.other.constant: #0070C1",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "entity.name.type: #4EC9B0",
-			"dark_modern": "entity.name.type: #4EC9B0",
-			"hc_light": "entity.name.type: #185E73",
-			"light_modern": "entity.name.type: #267F99"
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable.other.constant: #4FC1FF",
+			"hc_light": "variable.other.constant: #02715D",
+			"light_modern": "variable.other.constant: #0070C1"
 		}
 	},
 	{
 		"c": " ",
-		"t": "source.ruby meta.class.ruby",
+		"t": "source.ruby",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -379,7 +379,7 @@
 	},
 	{
 		"c": "<",
-		"t": "source.ruby meta.class.ruby keyword.operator.other.ruby",
+		"t": "source.ruby keyword.operator.comparison.ruby",
 		"r": {
 			"dark_plus": "keyword.operator: #D4D4D4",
 			"light_plus": "keyword.operator: #000000",
@@ -393,7 +393,7 @@
 	},
 	{
 		"c": " ",
-		"t": "source.ruby meta.class.ruby",
+		"t": "source.ruby",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
 			"light_plus": "default: #000000",
@@ -406,17 +406,45 @@
 		}
 	},
 	{
-		"c": "MsRestAzure::AzureServiceClient",
-		"t": "source.ruby meta.class.ruby entity.other.inherited-class.ruby",
+		"c": "MsRestAzure",
+		"t": "source.ruby support.class.ruby",
+		"r": {
+			"dark_plus": "support.class: #4EC9B0",
+			"light_plus": "support.class: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.class: #4EC9B0",
+			"dark_modern": "support.class: #4EC9B0",
+			"hc_light": "support.class: #185E73",
+			"light_modern": "support.class: #267F99"
+		}
+	},
+	{
+		"c": "::",
+		"t": "source.ruby punctuation.separator.namespace.ruby",
+		"r": {
+			"dark_plus": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"light_plus": "punctuation.separator.namespace.ruby: #267F99",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"dark_modern": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"hc_light": "punctuation.separator.namespace.ruby: #185E73",
+			"light_modern": "punctuation.separator.namespace.ruby: #267F99"
+		}
+	},
+	{
+		"c": "AzureServiceClient",
+		"t": "source.ruby variable.other.constant.ruby",
 		"r": {
-			"dark_plus": "entity.other.inherited-class: #4EC9B0",
-			"light_plus": "entity.other.inherited-class: #267F99",
+			"dark_plus": "variable.other.constant: #4FC1FF",
+			"light_plus": "variable.other.constant: #0070C1",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "entity.other.inherited-class: #4EC9B0",
-			"dark_modern": "entity.other.inherited-class: #4EC9B0",
-			"hc_light": "entity.other.inherited-class: #185E73",
-			"light_modern": "entity.other.inherited-class: #267F99"
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable.other.constant: #4FC1FF",
+			"hc_light": "variable.other.constant: #02715D",
+			"light_modern": "variable.other.constant: #0070C1"
 		}
 	},
 	{
@@ -479,14 +507,14 @@
 		"c": "::",
 		"t": "source.ruby punctuation.separator.namespace.ruby",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"light_plus": "punctuation.separator.namespace.ruby: #267F99",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"hc_black": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"dark_modern": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"hc_light": "punctuation.separator.namespace.ruby: #185E73",
+			"light_modern": "punctuation.separator.namespace.ruby: #267F99"
 		}
 	},
 	{
@@ -507,14 +535,14 @@
 		"c": "::",
 		"t": "source.ruby punctuation.separator.namespace.ruby",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"light_plus": "punctuation.separator.namespace.ruby: #267F99",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"hc_black": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"dark_modern": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"hc_light": "punctuation.separator.namespace.ruby: #185E73",
+			"light_modern": "punctuation.separator.namespace.ruby: #267F99"
 		}
 	},
 	{
@@ -535,14 +563,14 @@
 		"c": "::",
 		"t": "source.ruby punctuation.separator.namespace.ruby",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"light_plus": "punctuation.separator.namespace.ruby: #267F99",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"hc_black": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"dark_modern": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"hc_light": "punctuation.separator.namespace.ruby: #185E73",
+			"light_modern": "punctuation.separator.namespace.ruby: #267F99"
 		}
 	},
 	{
@@ -617,16 +645,16 @@
 	},
 	{
 		"c": "    ",
-		"t": "source.ruby punctuation.whitespace.comment.leading.ruby",
+		"t": "source.ruby comment.line.number-sign.ruby",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
 		}
 	},
 	{
@@ -644,7 +672,7 @@
 		}
 	},
 	{
-		"c": " @return job_collections",
+		"c": " ",
 		"t": "source.ruby comment.line.number-sign.ruby",
 		"r": {
 			"dark_plus": "comment: #6A9955",
@@ -657,6 +685,48 @@
 			"light_modern": "comment: #008000"
 		}
 	},
+	{
+		"c": "@",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.keyword.punctuation.yard.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": "return",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.keyword.yard.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": " job_collections",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.string.yard.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
 	{
 		"c": "    ",
 		"t": "source.ruby",
@@ -701,30 +771,30 @@
 	},
 	{
 		"c": ":",
-		"t": "source.ruby constant.other.symbol.ruby punctuation.definition.constant.ruby",
+		"t": "source.ruby constant.language.symbol.ruby punctuation.definition.constant.ruby",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
 		}
 	},
 	{
 		"c": "job_collections",
-		"t": "source.ruby constant.other.symbol.ruby",
+		"t": "source.ruby constant.language.symbol.ruby",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
 		}
 	},
 	{
@@ -784,7 +854,385 @@
 		}
 	},
 	{
-		"c": " Creates initializes a new instance of the SchedulerManagementClient class.",
+		"c": " Creates initializes a new instance of the SchedulerManagementClient class.",
+		"t": "source.ruby comment.line.number-sign.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": "    ",
+		"t": "source.ruby comment.line.number-sign.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": "#",
+		"t": "source.ruby comment.line.number-sign.ruby punctuation.definition.comment.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ruby comment.line.number-sign.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": "@",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.keyword.punctuation.yard.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": "param",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.keyword.yard.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ruby comment.line.number-sign.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": "credentials",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.parameter.yard.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ruby comment.line.number-sign.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": "[",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.type.yard.ruby comment.line.punctuation.yard.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": "MsRest::ServiceClientCredentials",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.type.yard.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": "]",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.type.yard.ruby comment.line.punctuation.yard.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": " credentials to authorize HTTP requests made by the service client.",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.string.yard.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": "    ",
+		"t": "source.ruby comment.line.number-sign.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": "#",
+		"t": "source.ruby comment.line.number-sign.ruby punctuation.definition.comment.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ruby comment.line.number-sign.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": "@",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.keyword.punctuation.yard.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": "param",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.keyword.yard.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ruby comment.line.number-sign.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": "base_url",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.parameter.yard.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.ruby comment.line.number-sign.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": "[",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.type.yard.ruby comment.line.punctuation.yard.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": "String",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.type.yard.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": "]",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.type.yard.ruby comment.line.punctuation.yard.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": " the base URI of the service.",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.string.yard.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": "    ",
+		"t": "source.ruby comment.line.number-sign.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": "#",
+		"t": "source.ruby comment.line.number-sign.ruby punctuation.definition.comment.ruby",
+		"r": {
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
+		}
+	},
+	{
+		"c": " ",
 		"t": "source.ruby comment.line.number-sign.ruby",
 		"r": {
 			"dark_plus": "comment: #6A9955",
@@ -798,22 +1246,22 @@
 		}
 	},
 	{
-		"c": "    ",
-		"t": "source.ruby punctuation.whitespace.comment.leading.ruby",
+		"c": "@",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.keyword.punctuation.yard.ruby",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
 		}
 	},
 	{
-		"c": "#",
-		"t": "source.ruby comment.line.number-sign.ruby punctuation.definition.comment.ruby",
+		"c": "param",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.keyword.yard.ruby",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -826,7 +1274,7 @@
 		}
 	},
 	{
-		"c": " @param credentials [MsRest::ServiceClientCredentials] credentials to authorize HTTP requests made by the service client.",
+		"c": " ",
 		"t": "source.ruby comment.line.number-sign.ruby",
 		"r": {
 			"dark_plus": "comment: #6A9955",
@@ -840,22 +1288,8 @@
 		}
 	},
 	{
-		"c": "    ",
-		"t": "source.ruby punctuation.whitespace.comment.leading.ruby",
-		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
-		}
-	},
-	{
-		"c": "#",
-		"t": "source.ruby comment.line.number-sign.ruby punctuation.definition.comment.ruby",
+		"c": "options",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.parameter.yard.ruby",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -868,7 +1302,7 @@
 		}
 	},
 	{
-		"c": " @param base_url [String] the base URI of the service.",
+		"c": " ",
 		"t": "source.ruby comment.line.number-sign.ruby",
 		"r": {
 			"dark_plus": "comment: #6A9955",
@@ -882,22 +1316,22 @@
 		}
 	},
 	{
-		"c": "    ",
-		"t": "source.ruby punctuation.whitespace.comment.leading.ruby",
+		"c": "[",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.type.yard.ruby comment.line.punctuation.yard.ruby",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
 		}
 	},
 	{
-		"c": "#",
-		"t": "source.ruby comment.line.number-sign.ruby punctuation.definition.comment.ruby",
+		"c": "Array",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.type.yard.ruby",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -910,8 +1344,8 @@
 		}
 	},
 	{
-		"c": " @param options [Array] filters to be applied to the HTTP requests.",
-		"t": "source.ruby comment.line.number-sign.ruby",
+		"c": "]",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.type.yard.ruby comment.line.punctuation.yard.ruby",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -924,22 +1358,22 @@
 		}
 	},
 	{
-		"c": "    ",
-		"t": "source.ruby punctuation.whitespace.comment.leading.ruby",
+		"c": " filters to be applied to the HTTP requests.",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.string.yard.ruby",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "comment: #6A9955",
+			"light_plus": "comment: #008000",
+			"dark_vs": "comment: #6A9955",
+			"light_vs": "comment: #008000",
+			"hc_black": "comment: #7CA668",
+			"dark_modern": "comment: #6A9955",
+			"hc_light": "comment: #515151",
+			"light_modern": "comment: #008000"
 		}
 	},
 	{
-		"c": "#",
-		"t": "source.ruby comment.line.number-sign.ruby punctuation.definition.comment.ruby",
+		"c": "    #",
+		"t": "source.ruby comment.line.number-sign.ruby comment.line.string.yard.ruby punctuation.definition.comment.ruby",
 		"r": {
 			"dark_plus": "comment: #6A9955",
 			"light_plus": "comment: #008000",
@@ -1036,7 +1470,21 @@
 		}
 	},
 	{
-		"c": ", ",
+		"c": ",",
+		"t": "source.ruby meta.function.method.with-arguments.ruby punctuation.separator.object.ruby",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
 		"t": "source.ruby meta.function.method.with-arguments.ruby",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -1107,7 +1555,7 @@
 	},
 	{
 		"c": "nil",
-		"t": "source.ruby meta.function.method.with-arguments.ruby constant.language.ruby",
+		"t": "source.ruby meta.function.method.with-arguments.ruby constant.language.nil.ruby",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -1120,7 +1568,21 @@
 		}
 	},
 	{
-		"c": ", ",
+		"c": ",",
+		"t": "source.ruby meta.function.method.with-arguments.ruby punctuation.separator.object.ruby",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF",
+			"dark_modern": "default: #CCCCCC",
+			"hc_light": "default: #292929",
+			"light_modern": "default: #3B3B3B"
+		}
+	},
+	{
+		"c": " ",
 		"t": "source.ruby meta.function.method.with-arguments.ruby",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -1191,7 +1653,7 @@
 	},
 	{
 		"c": "nil",
-		"t": "source.ruby meta.function.method.with-arguments.ruby constant.language.ruby",
+		"t": "source.ruby meta.function.method.with-arguments.ruby constant.language.nil.ruby",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -1653,16 +2115,16 @@
 	},
 	{
 		"c": "nil?",
-		"t": "source.ruby",
+		"t": "source.ruby meta.function-call.ruby entity.name.function.ruby",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1849,16 +2311,16 @@
 	},
 	{
 		"c": "is_a?",
-		"t": "source.ruby",
+		"t": "source.ruby meta.function-call.ruby entity.name.function.ruby",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
 		}
 	},
 	{
@@ -1893,14 +2355,14 @@
 		"c": "::",
 		"t": "source.ruby punctuation.separator.namespace.ruby",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
+			"dark_plus": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"light_plus": "punctuation.separator.namespace.ruby: #267F99",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"hc_black": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"dark_modern": "punctuation.separator.namespace.ruby: #4EC9B0",
+			"hc_light": "punctuation.separator.namespace.ruby: #185E73",
+			"light_modern": "punctuation.separator.namespace.ruby: #267F99"
 		}
 	},
 	{
@@ -2563,7 +3025,7 @@
 	},
 	{
 		"c": "30",
-		"t": "source.ruby constant.numeric.integer.ruby",
+		"t": "source.ruby constant.numeric.ruby",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -2661,7 +3123,7 @@
 	},
 	{
 		"c": "true",
-		"t": "source.ruby constant.language.ruby",
+		"t": "source.ruby constant.language.boolean.ruby",
 		"r": {
 			"dark_plus": "constant.language: #569CD6",
 			"light_plus": "constant.language: #0000FF",
@@ -2744,7 +3206,21 @@
 		}
 	},
 	{
-		"c": "version ",
+		"c": "version",
+		"t": "source.ruby meta.function-call.ruby entity.name.function.ruby",
+		"r": {
+			"dark_plus": "entity.name.function: #DCDCAA",
+			"light_plus": "entity.name.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "entity.name.function: #DCDCAA",
+			"dark_modern": "entity.name.function: #DCDCAA",
+			"hc_light": "entity.name.function: #5E2CBC",
+			"light_modern": "entity.name.function: #795E26"
+		}
+	},
+	{
+		"c": " ",
 		"t": "source.ruby",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -2787,34 +3263,34 @@
 	},
 	{
 		"c": ":",
-		"t": "source.ruby constant.other.symbol.ruby punctuation.definition.constant.ruby",
+		"t": "source.ruby constant.language.symbol.ruby punctuation.definition.constant.ruby",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
 		}
 	},
 	{
 		"c": "mavericks",
-		"t": "source.ruby constant.other.symbol.ruby",
+		"t": "source.ruby constant.language.symbol.ruby",
 		"r": {
-			"dark_plus": "default: #D4D4D4",
-			"light_plus": "default: #000000",
-			"dark_vs": "default: #D4D4D4",
-			"light_vs": "default: #000000",
-			"hc_black": "default: #FFFFFF",
-			"dark_modern": "default: #CCCCCC",
-			"hc_light": "default: #292929",
-			"light_modern": "default: #3B3B3B"
+			"dark_plus": "constant.language: #569CD6",
+			"light_plus": "constant.language: #0000FF",
+			"dark_vs": "constant.language: #569CD6",
+			"light_vs": "constant.language: #0000FF",
+			"hc_black": "constant.language: #569CD6",
+			"dark_modern": "constant.language: #569CD6",
+			"hc_light": "constant.language: #0F4A85",
+			"light_modern": "constant.language: #0000FF"
 		}
 	},
 	{
-		"c": "        version ",
+		"c": "        ",
 		"t": "source.ruby",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -2828,21 +3304,21 @@
 		}
 	},
 	{
-		"c": "=",
-		"t": "source.ruby keyword.operator.assignment.ruby",
+		"c": "version",
+		"t": "source.ruby variable.ruby",
 		"r": {
-			"dark_plus": "keyword.operator: #D4D4D4",
-			"light_plus": "keyword.operator: #000000",
-			"dark_vs": "keyword.operator: #D4D4D4",
-			"light_vs": "keyword.operator: #000000",
-			"hc_black": "keyword.operator: #D4D4D4",
-			"dark_modern": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
 		}
 	},
 	{
-		"c": " ",
+		"c": " = ",
 		"t": "source.ruby",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -2899,7 +3375,7 @@
 	},
 	{
 		"c": "}",
-		"t": "source.ruby string.interpolated.ruby meta.embedded.line.ruby punctuation.section.embedded.end.ruby source.ruby",
+		"t": "source.ruby string.interpolated.ruby meta.embedded.line.ruby punctuation.section.embedded.end.ruby",
 		"r": {
 			"dark_plus": "punctuation.section.embedded: #569CD6",
 			"light_plus": "punctuation.section.embedded: #0000FF",
@@ -2968,7 +3444,7 @@
 		}
 	},
 	{
-		"c": "        version ",
+		"c": "        ",
 		"t": "source.ruby",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -2982,21 +3458,21 @@
 		}
 	},
 	{
-		"c": "=",
-		"t": "source.ruby keyword.operator.assignment.ruby",
+		"c": "version",
+		"t": "source.ruby variable.ruby",
 		"r": {
-			"dark_plus": "keyword.operator: #D4D4D4",
-			"light_plus": "keyword.operator: #000000",
-			"dark_vs": "keyword.operator: #D4D4D4",
-			"light_vs": "keyword.operator: #000000",
-			"hc_black": "keyword.operator: #D4D4D4",
-			"dark_modern": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
 		}
 	},
 	{
-		"c": " ",
+		"c": " = ",
 		"t": "source.ruby",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -3080,7 +3556,7 @@
 		}
 	},
 	{
-		"c": "      version ",
+		"c": "      ",
 		"t": "source.ruby",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -3094,21 +3570,21 @@
 		}
 	},
 	{
-		"c": "=",
-		"t": "source.ruby keyword.operator.assignment.ruby",
+		"c": "version",
+		"t": "source.ruby variable.ruby",
 		"r": {
-			"dark_plus": "keyword.operator: #D4D4D4",
-			"light_plus": "keyword.operator: #000000",
-			"dark_vs": "keyword.operator: #D4D4D4",
-			"light_vs": "keyword.operator: #000000",
-			"hc_black": "keyword.operator: #D4D4D4",
-			"dark_modern": "keyword.operator: #D4D4D4",
-			"hc_light": "keyword.operator: #000000",
-			"light_modern": "keyword.operator: #000000"
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE",
+			"dark_modern": "variable: #9CDCFE",
+			"hc_light": "variable: #001080",
+			"light_modern": "variable: #001080"
 		}
 	},
 	{
-		"c": " version",
+		"c": " = version",
 		"t": "source.ruby",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -3137,7 +3613,7 @@
 	},
 	{
 		"c": "/",
-		"t": "source.ruby string.regexp.classic.ruby punctuation.definition.string.ruby",
+		"t": "source.ruby string.regexp.interpolated.ruby punctuation.section.regexp.ruby",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -3151,7 +3627,7 @@
 	},
 	{
 		"c": "clang-",
-		"t": "source.ruby string.regexp.classic.ruby",
+		"t": "source.ruby string.regexp.interpolated.ruby",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -3165,7 +3641,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.ruby string.regexp.classic.ruby meta.group.regexp.ruby punctuation.definition.group.ruby",
+		"t": "source.ruby string.regexp.interpolated.ruby string.regexp.group.ruby punctuation.definition.group.ruby",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -3179,7 +3655,7 @@
 	},
 	{
 		"c": "\\d",
-		"t": "source.ruby string.regexp.classic.ruby meta.group.regexp.ruby constant.character.escape.ruby",
+		"t": "source.ruby string.regexp.interpolated.ruby string.regexp.group.ruby constant.character.escape.ruby",
 		"r": {
 			"dark_plus": "constant.character.escape: #D7BA7D",
 			"light_plus": "constant.character.escape: #EE0000",
@@ -3193,7 +3669,7 @@
 	},
 	{
 		"c": "+",
-		"t": "source.ruby string.regexp.classic.ruby meta.group.regexp.ruby",
+		"t": "source.ruby string.regexp.interpolated.ruby string.regexp.group.ruby",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -3207,7 +3683,7 @@
 	},
 	{
 		"c": "\\.\\d",
-		"t": "source.ruby string.regexp.classic.ruby meta.group.regexp.ruby constant.character.escape.ruby",
+		"t": "source.ruby string.regexp.interpolated.ruby string.regexp.group.ruby constant.character.escape.ruby",
 		"r": {
 			"dark_plus": "constant.character.escape: #D7BA7D",
 			"light_plus": "constant.character.escape: #EE0000",
@@ -3221,7 +3697,7 @@
 	},
 	{
 		"c": "+",
-		"t": "source.ruby string.regexp.classic.ruby meta.group.regexp.ruby",
+		"t": "source.ruby string.regexp.interpolated.ruby string.regexp.group.ruby",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -3235,7 +3711,7 @@
 	},
 	{
 		"c": "\\.\\d",
-		"t": "source.ruby string.regexp.classic.ruby meta.group.regexp.ruby constant.character.escape.ruby",
+		"t": "source.ruby string.regexp.interpolated.ruby string.regexp.group.ruby constant.character.escape.ruby",
 		"r": {
 			"dark_plus": "constant.character.escape: #D7BA7D",
 			"light_plus": "constant.character.escape: #EE0000",
@@ -3249,7 +3725,7 @@
 	},
 	{
 		"c": "+",
-		"t": "source.ruby string.regexp.classic.ruby meta.group.regexp.ruby",
+		"t": "source.ruby string.regexp.interpolated.ruby string.regexp.group.ruby",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -3263,7 +3739,7 @@
 	},
 	{
 		"c": "(",
-		"t": "source.ruby string.regexp.classic.ruby meta.group.regexp.ruby meta.group.regexp.ruby punctuation.definition.group.ruby",
+		"t": "source.ruby string.regexp.interpolated.ruby string.regexp.group.ruby string.regexp.group.ruby punctuation.definition.group.ruby",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -3277,7 +3753,7 @@
 	},
 	{
 		"c": "\\.\\d",
-		"t": "source.ruby string.regexp.classic.ruby meta.group.regexp.ruby meta.group.regexp.ruby constant.character.escape.ruby",
+		"t": "source.ruby string.regexp.interpolated.ruby string.regexp.group.ruby string.regexp.group.ruby constant.character.escape.ruby",
 		"r": {
 			"dark_plus": "constant.character.escape: #D7BA7D",
 			"light_plus": "constant.character.escape: #EE0000",
@@ -3291,7 +3767,7 @@
 	},
 	{
 		"c": "+",
-		"t": "source.ruby string.regexp.classic.ruby meta.group.regexp.ruby meta.group.regexp.ruby",
+		"t": "source.ruby string.regexp.interpolated.ruby string.regexp.group.ruby string.regexp.group.ruby",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -3305,7 +3781,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.ruby string.regexp.classic.ruby meta.group.regexp.ruby meta.group.regexp.ruby punctuation.definition.group.ruby",
+		"t": "source.ruby string.regexp.interpolated.ruby string.regexp.group.ruby string.regexp.group.ruby punctuation.definition.group.ruby",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -3319,7 +3795,7 @@
 	},
 	{
 		"c": "?",
-		"t": "source.ruby string.regexp.classic.ruby meta.group.regexp.ruby",
+		"t": "source.ruby string.regexp.interpolated.ruby string.regexp.group.ruby",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -3333,7 +3809,7 @@
 	},
 	{
 		"c": ")",
-		"t": "source.ruby string.regexp.classic.ruby meta.group.regexp.ruby punctuation.definition.group.ruby",
+		"t": "source.ruby string.regexp.interpolated.ruby string.regexp.group.ruby punctuation.definition.group.ruby",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -3347,7 +3823,7 @@
 	},
 	{
 		"c": "/",
-		"t": "source.ruby string.regexp.classic.ruby punctuation.definition.string.ruby",
+		"t": "source.ruby string.regexp.interpolated.ruby punctuation.section.regexp.ruby",
 		"r": {
 			"dark_plus": "string.regexp: #D16969",
 			"light_plus": "string.regexp: #811F3F",
@@ -3389,7 +3865,7 @@
 	},
 	{
 		"c": "1",
-		"t": "source.ruby constant.numeric.integer.ruby",
+		"t": "source.ruby constant.numeric.ruby",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #098658",
@@ -3459,7 +3935,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.ruby string.quoted.double.ruby punctuation.definition.string.begin.ruby",
+		"t": "source.ruby string.quoted.double.interpolated.ruby punctuation.definition.string.begin.ruby",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -3473,7 +3949,7 @@
 	},
 	{
 		"c": "0",
-		"t": "source.ruby string.quoted.double.ruby",
+		"t": "source.ruby string.quoted.double.interpolated.ruby",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",
@@ -3487,7 +3963,7 @@
 	},
 	{
 		"c": "\"",
-		"t": "source.ruby string.quoted.double.ruby punctuation.definition.string.end.ruby",
+		"t": "source.ruby string.quoted.double.interpolated.ruby punctuation.definition.string.end.ruby",
 		"r": {
 			"dark_plus": "string: #CE9178",
 			"light_plus": "string: #A31515",

From 4e8fbaef741afebd24684b88cac47c2f44dfb8eb Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 11 Dec 2024 17:58:52 +0100
Subject: [PATCH 111/479] update doc comment (#235835)

fixes https://github.com/microsoft/vscode/issues/209888
---
 src/vs/editor/common/languages.ts | 3 ---
 src/vs/monaco.d.ts                | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/src/vs/editor/common/languages.ts b/src/vs/editor/common/languages.ts
index 889a89a5d68..9d97fb451a8 100644
--- a/src/vs/editor/common/languages.ts
+++ b/src/vs/editor/common/languages.ts
@@ -556,9 +556,6 @@ export interface CompletionItem {
 	/**
 	 * A range of text that should be replaced by this completion item.
 	 *
-	 * Defaults to a range from the start of the {@link TextDocument.getWordRangeAtPosition current word} to the
-	 * current position.
-	 *
 	 * *Note:* The range must be a {@link Range.isSingleLine single line} and it must
 	 * {@link Range.contains contain} the position at which completion has been {@link CompletionItemProvider.provideCompletionItems requested}.
 	 */
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index 7dddce76da2..eba21bfb561 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -7103,9 +7103,6 @@ declare namespace monaco.languages {
 		/**
 		 * A range of text that should be replaced by this completion item.
 		 *
-		 * Defaults to a range from the start of the {@link TextDocument.getWordRangeAtPosition current word} to the
-		 * current position.
-		 *
 		 * *Note:* The range must be a {@link Range.isSingleLine single line} and it must
 		 * {@link Range.contains contain} the position at which completion has been {@link CompletionItemProvider.provideCompletionItems requested}.
 		 */

From 22a35bc9c40c476e63eaf95f5494476920185f1b Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Wed, 11 Dec 2024 18:20:10 +0100
Subject: [PATCH 112/479] [json] jsonValidation isnt working in multi extension
 host setup (#235845)

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

diff --git a/extensions/json-language-features/client/src/jsonClient.ts b/extensions/json-language-features/client/src/jsonClient.ts
index 90aafc89b84..cc5b27339ac 100644
--- a/extensions/json-language-features/client/src/jsonClient.ts
+++ b/extensions/json-language-features/client/src/jsonClient.ts
@@ -597,7 +597,7 @@ async function startClientWithParticipants(context: ExtensionContext, languagePa
 
 function getSchemaAssociations(_context: ExtensionContext): ISchemaAssociation[] {
 	const associations: ISchemaAssociation[] = [];
-	extensions.all.forEach(extension => {
+	extensions.allAcrossExtensionHosts.forEach(extension => {
 		const packageJSON = extension.packageJSON;
 		if (packageJSON && packageJSON.contributes && packageJSON.contributes.jsonValidation) {
 			const jsonValidation = packageJSON.contributes.jsonValidation;

From 7a2c521c77a4e8f809ad0793f160aaceb5c10a09 Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Wed, 11 Dec 2024 18:31:44 +0100
Subject: [PATCH 113/479] Also reveal horizontally (#235841)

---
 .../inlineCompletions/browser/model/inlineCompletionsModel.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
index ed98294be69..f40e12bdf88 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
@@ -742,7 +742,7 @@ export class InlineCompletionsModel extends Disposable {
 			this._jumpedTo.set(true, tx);
 			this.dontRefetchSignal.trigger(tx);
 			this._editor.setPosition(s.inlineEdit.range.getStartPosition(), 'inlineCompletions.jump');
-			this._editor.revealLine(s.inlineEdit.range.startLineNumber);
+			this._editor.revealPosition(s.inlineEdit.range.getStartPosition());
 			this._editor.focus();
 		});
 	}

From 3c1a4ddfd8dab46425f67c6af037eb5037628a00 Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Wed, 11 Dec 2024 18:43:36 +0100
Subject: [PATCH 114/479] Remove default background colors and allow to style
 the borders independently (#235847)

---
 .../view/inlineEdits/inlineEditsView.ts       | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
index 3ea99c7e16a..8b081fe0c11 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
@@ -22,7 +22,7 @@ import './inlineEditsView.css';
 import { IOriginalEditorInlineDiffViewState, OriginalEditorInlineDiffView } from './inlineDiffView.js';
 import { applyEditToModifiedRangeMappings, createReindentEdit, getOffsetForPos, maxContentWidthInRange, PathBuilder, Point, StatusBarViewItem } from './utils.js';
 import { IInlineEditsIndicatorState, InlineEditsIndicator } from './inlineEditsIndicatorView.js';
-import { darken, lighten, registerColor, transparent } from '../../../../../../platform/theme/common/colorUtils.js';
+import { darken, lighten, registerColor } from '../../../../../../platform/theme/common/colorUtils.js';
 import { diffInserted, diffRemoved } from '../../../../../../platform/theme/common/colorRegistry.js';
 import { CustomizedMenuWorkbenchToolBar } from '../../hintsWidget/inlineCompletionsHintsWidget.js';
 import { Command } from '../../../../../common/languages.js';
@@ -38,13 +38,13 @@ import { Color } from '../../../../../../base/common/color.js';
 
 export const originalBackgroundColor = registerColor(
 	'inlineEdit.originalBackground',
-	transparent(diffRemoved, 0.4),
+	Color.transparent,
 	'',
 	true
 );
 export const modifiedBackgroundColor = registerColor(
 	'inlineEdit.modifiedBackground',
-	transparent(diffInserted, 0.4),
+	Color.transparent,
 	'',
 	true
 );
@@ -77,8 +77,19 @@ export const modifiedChangedTextOverlayColor = registerColor(
 	true
 );
 
-export const border = registerColor(
-	'inlineEdit.border',
+export const originalBorder = registerColor(
+	'inlineEdit.originalBorder',
+	{
+		light: darken(editorLineHighlightBorder, 0.15),
+		dark: lighten(editorLineHighlightBorder, 0.50),
+		hcDark: editorLineHighlightBorder,
+		hcLight: editorLineHighlightBorder
+	},
+	''
+);
+
+export const modifiedBorder = registerColor(
+	'inlineEdit.modifiedBorder',
 	{
 		light: darken(editorLineHighlightBorder, 0.15),
 		dark: lighten(editorLineHighlightBorder, 0.50),
@@ -174,14 +185,14 @@ export class InlineEditsView extends Disposable {
 			const path1 = document.createElementNS('http://www.w3.org/2000/svg', 'path');
 			path1.setAttribute('d', pathBuilder1.build());
 			path1.style.fill = 'var(--vscode-inlineEdit-originalBackground, transparent)';
-			path1.style.stroke = 'var(--vscode-inlineEdit-border)';
+			path1.style.stroke = 'var(--vscode-inlineEdit-originalBorder)';
 			path1.style.strokeWidth = '1px';
 
 
 			const path2 = document.createElementNS('http://www.w3.org/2000/svg', 'path');
 			path2.setAttribute('d', pathBuilder2.build());
 			path2.style.fill = 'var(--vscode-inlineEdit-modifiedBackground, transparent)';
-			path2.style.stroke = 'var(--vscode-inlineEdit-border)';
+			path2.style.stroke = 'var(--vscode-inlineEdit-modifiedBorder)';
 			path2.style.strokeWidth = '1px';
 
 			const pathModifiedBackground = document.createElementNS('http://www.w3.org/2000/svg', 'path');
@@ -201,11 +212,11 @@ export class InlineEditsView extends Disposable {
 
 				const stop1 = document.createElementNS('http://www.w3.org/2000/svg', 'stop');
 				stop1.setAttribute('offset', '0%');
-				stop1.setAttribute('style', 'stop-color:var(--vscode-inlineEdit-border);stop-opacity:0');
+				stop1.setAttribute('style', 'stop-color:var(--vscode-inlineEdit-modifiedBorder);stop-opacity:0');
 
 				const stop2 = document.createElementNS('http://www.w3.org/2000/svg', 'stop');
 				stop2.setAttribute('offset', '100%');
-				stop2.setAttribute('style', 'stop-color:var(--vscode-inlineEdit-border);stop-opacity:1');
+				stop2.setAttribute('style', 'stop-color:var(--vscode-inlineEdit-modifiedBorder);stop-opacity:1');
 
 				linearGradient.appendChild(stop1);
 				linearGradient.appendChild(stop2);
@@ -230,7 +241,7 @@ export class InlineEditsView extends Disposable {
 
 				const path3 = document.createElementNS('http://www.w3.org/2000/svg', 'path');
 				path3.setAttribute('d', pathBuilder3.build());
-				path3.style.stroke = 'var(--vscode-inlineEdit-border)';
+				path3.style.stroke = 'var(--vscode-inlineEdit-modifiedBorder)';
 				path3.style.strokeWidth = '1px';
 				elements.push(path3);
 			}

From 5fb587f8bc595065e163aa9ddef113c73211dc7b Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Wed, 11 Dec 2024 11:02:36 -0800
Subject: [PATCH 115/479] Tweaks to sign up and 'retry' buttons (#235855)

* Tweaks to sign up and 'retry' buttons

* Update label
---
 .../chatContentParts/chatQuotaExceededPart.ts | 72 +++++++++++++------
 .../contrib/chat/browser/media/chat.css       | 10 ++-
 2 files changed, 61 insertions(+), 21 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatQuotaExceededPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatQuotaExceededPart.ts
index e3e06c9b05a..da3c7ae323b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatQuotaExceededPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatQuotaExceededPart.ts
@@ -22,6 +22,16 @@ import { IChatContentPart } from './chatContentParts.js';
 
 const $ = dom.$;
 
+/**
+ * Once the sign up button is clicked, and the retry button has been shown, it should be shown every time.
+ */
+let shouldShowRetryButton = false;
+
+/**
+ * Once the 'retry' button is clicked, the wait warning should be shown every time.
+ */
+let shouldShowWaitWarning = false;
+
 export class ChatQuotaExceededPart extends Disposable implements IChatContentPart {
 	public readonly domNode: HTMLElement;
 
@@ -51,30 +61,52 @@ export class ChatQuotaExceededPart extends Disposable implements IChatContentPar
 		button1.label = localize('upgradeToCopilotPro', "Upgrade to Copilot Pro");
 		button1.element.classList.add('chat-quota-error-button');
 
-		let didAddSecondary = false;
+		let hasAddedWaitWarning = false;
+		const addWaitWarningIfNeeded = () => {
+			if (!shouldShowWaitWarning || hasAddedWaitWarning) {
+				return;
+			}
+
+			hasAddedWaitWarning = true;
+			dom.append(messageContainer, $('.chat-quota-wait-warning', undefined, localize('waitWarning', "Signing up may take a few minutes to take effect.")));
+		};
+
+		let hasAddedRetryButton = false;
+		const addRetryButtonIfNeeded = () => {
+			if (!shouldShowRetryButton || hasAddedRetryButton) {
+				return;
+			}
+
+			hasAddedRetryButton = true;
+			const button2 = this._register(new Button(messageContainer, {
+				buttonBackground: undefined,
+				buttonForeground: asCssVariable(textLinkForeground)
+			}));
+			button2.element.classList.add('chat-quota-error-secondary-button');
+			button2.label = localize('signedUpClickToContinue', "Signed up? Click to retry");
+			this._onDidChangeHeight.fire();
+			this._register(button2.onDidClick(() => {
+				const widget = chatWidgetService.getWidgetBySessionId(element.sessionId);
+				if (!widget) {
+					return;
+				}
+
+				widget.rerunLastRequest();
+
+				shouldShowWaitWarning = true;
+				addWaitWarningIfNeeded();
+			}));
+		};
+
 		this._register(button1.onDidClick(async () => {
 			await commandService.executeCommand('workbench.action.chat.upgradePlan');
 
-			if (!didAddSecondary) {
-				didAddSecondary = true;
-
-				const button2 = this._register(new Button(messageContainer, {
-					buttonBackground: undefined,
-					buttonForeground: asCssVariable(textLinkForeground)
-				}));
-				button2.element.classList.add('chat-quota-error-secondary-button');
-				button2.label = localize('signedUpClickToContinue', "Signed up? Click to continue!");
-				this._onDidChangeHeight.fire();
-				this._register(button2.onDidClick(() => {
-					const widget = chatWidgetService.getWidgetBySessionId(element.sessionId);
-					if (!widget) {
-						return;
-					}
-
-					widget.rerunLastRequest();
-				}));
-			}
+			shouldShowRetryButton = true;
+			addRetryButtonIfNeeded();
 		}));
+
+		addRetryButtonIfNeeded();
+		addWaitWarningIfNeeded();
 	}
 
 	hasSameContent(other: unknown): boolean {
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index fdcc82938f1..b93329f8ddf 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -1474,11 +1474,19 @@ have to be updated for changes to the rules above, or to support more deeply nes
 
 	.chat-quota-error-secondary-button {
 		margin-top: 6px;
-		font-size: 12px;
 		padding: 0px;
 		border: none;
 	}
 
+	.chat-quota-error-secondary-button,
+	.chat-quota-wait-warning {
+		font-size: 12px;
+	}
+
+	.chat-quota-wait-warning {
+		margin-top: 2px;
+	}
+
 	.chat-quota-error-message {
 		.rendered-markdown p {
 			margin: 0px;

From 079df18bc89a113d831a43fa36c2f472136d5b40 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Wed, 11 Dec 2024 20:17:42 +0100
Subject: [PATCH 116/479] Adding possibility to update all verbose hovers at
 once (#235848)

adding possibility to update all verbose hovers at once
---
 .../standaloneColorPickerWidget.ts            |  1 +
 .../hover/browser/contentHoverRendered.ts     | 48 ++++++++++++++-----
 .../browser/contentHoverWidgetWrapper.ts      |  3 +-
 .../contrib/hover/browser/hoverTypes.ts       |  4 ++
 .../hover/browser/markdownHoverParticipant.ts | 29 +++++------
 5 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerWidget.ts b/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerWidget.ts
index c26966a842f..f15557441bd 100644
--- a/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerWidget.ts
+++ b/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerWidget.ts
@@ -179,6 +179,7 @@ export class StandaloneColorPickerWidget extends Disposable implements IContentW
 			onContentsChanged: () => { },
 			setMinimumDimensions: () => { },
 			hide: () => this.hide(),
+			focus: () => this.focus()
 		};
 
 		this._colorHover = colorHover;
diff --git a/src/vs/editor/contrib/hover/browser/contentHoverRendered.ts b/src/vs/editor/contrib/hover/browser/contentHoverRendered.ts
index dde3cb77bb6..81ccfcbc60b 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverRendered.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverRendered.ts
@@ -22,6 +22,7 @@ import { InlayHintsHover } from '../../inlayHints/browser/inlayHintsHover.js';
 import { BugIndicatingError } from '../../../../base/common/errors.js';
 import { HoverAction } from '../../../../base/browser/ui/hover/hoverWidget.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IOffsetRange } from '../../../common/core/offsetRange.js';
 
 export class RenderedContentHover extends Disposable {
 
@@ -378,20 +379,35 @@ class RenderedContentHoverParts extends Disposable {
 		if (!this._markdownHoverParticipant) {
 			return;
 		}
-		const normalizedMarkdownHoverIndex = this._normalizedIndexToMarkdownHoverIndexRange(this._markdownHoverParticipant, index);
-		if (normalizedMarkdownHoverIndex === undefined) {
-			return;
+		let rangeOfIndicesToUpdate: IOffsetRange;
+		if (index >= 0) {
+			rangeOfIndicesToUpdate = { start: index, endExclusive: index + 1 };
+		} else {
+			rangeOfIndicesToUpdate = this._findRangeOfMarkdownHoverParts(this._markdownHoverParticipant);
 		}
-		const renderedPart = await this._markdownHoverParticipant.updateMarkdownHoverVerbosityLevel(action, normalizedMarkdownHoverIndex, focus);
-		if (!renderedPart) {
-			return;
+		for (let i = rangeOfIndicesToUpdate.start; i < rangeOfIndicesToUpdate.endExclusive; i++) {
+			const normalizedMarkdownHoverIndex = this._normalizedIndexToMarkdownHoverIndexRange(this._markdownHoverParticipant, i);
+			if (normalizedMarkdownHoverIndex === undefined) {
+				continue;
+			}
+			const renderedPart = await this._markdownHoverParticipant.updateMarkdownHoverVerbosityLevel(action, normalizedMarkdownHoverIndex);
+			if (!renderedPart) {
+				continue;
+			}
+			this._renderedParts[i] = {
+				type: 'hoverPart',
+				participant: this._markdownHoverParticipant,
+				hoverPart: renderedPart.hoverPart,
+				hoverElement: renderedPart.hoverElement,
+			};
+		}
+		if (focus) {
+			if (index >= 0) {
+				this.focusHoverPartWithIndex(index);
+			} else {
+				this._context.focus();
+			}
 		}
-		this._renderedParts[index] = {
-			type: 'hoverPart',
-			participant: this._markdownHoverParticipant,
-			hoverPart: renderedPart.hoverPart,
-			hoverElement: renderedPart.hoverElement,
-		};
 		this._context.onContentsChanged();
 	}
 
@@ -429,6 +445,14 @@ class RenderedContentHoverParts extends Disposable {
 		return index - firstIndexOfMarkdownHovers;
 	}
 
+	private _findRangeOfMarkdownHoverParts(markdownHoverParticipant: MarkdownHoverParticipant): IOffsetRange {
+		const copiedRenderedParts = this._renderedParts.slice();
+		const firstIndexOfMarkdownHovers = copiedRenderedParts.findIndex(renderedPart => renderedPart.type === 'hoverPart' && renderedPart.participant === markdownHoverParticipant);
+		const inversedLastIndexOfMarkdownHovers = copiedRenderedParts.reverse().findIndex(renderedPart => renderedPart.type === 'hoverPart' && renderedPart.participant === markdownHoverParticipant);
+		const lastIndexOfMarkdownHovers = inversedLastIndexOfMarkdownHovers >= 0 ? copiedRenderedParts.length - inversedLastIndexOfMarkdownHovers : inversedLastIndexOfMarkdownHovers;
+		return { start: firstIndexOfMarkdownHovers, endExclusive: lastIndexOfMarkdownHovers + 1 };
+	}
+
 	public get domNode(): DocumentFragment {
 		return this._fragment;
 	}
diff --git a/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts b/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts
index cd2fedb338d..ad9a9920967 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts
@@ -231,7 +231,8 @@ export class ContentHoverWidgetWrapper extends Disposable implements IHoverWidge
 		const setMinimumDimensions = (dimensions: dom.Dimension) => {
 			this._contentHoverWidget.setMinimumDimensions(dimensions);
 		};
-		return { hide, onContentsChanged, setMinimumDimensions };
+		const focus = () => this.focus();
+		return { hide, onContentsChanged, setMinimumDimensions, focus };
 	}
 
 
diff --git a/src/vs/editor/contrib/hover/browser/hoverTypes.ts b/src/vs/editor/contrib/hover/browser/hoverTypes.ts
index a82edb31852..ad5442f1fa2 100644
--- a/src/vs/editor/contrib/hover/browser/hoverTypes.ts
+++ b/src/vs/editor/contrib/hover/browser/hoverTypes.ts
@@ -108,6 +108,10 @@ export interface IEditorHoverContext {
 	 * Hide the hover.
 	 */
 	hide(): void;
+	/**
+	 * Focus the hover.
+	 */
+	focus(): void;
 }
 
 export interface IEditorHoverRenderContext extends IEditorHoverContext {
diff --git a/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts b/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts
index 481e7791355..3fd5876cfe4 100644
--- a/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts
+++ b/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts
@@ -204,8 +204,8 @@ export class MarkdownHoverParticipant implements IEditorHoverParticipant<Markdow
 		return this._renderedHoverParts?.doesMarkdownHoverAtIndexSupportVerbosityAction(index, action) ?? false;
 	}
 
-	public updateMarkdownHoverVerbosityLevel(action: HoverVerbosityAction, index: number, focus?: boolean): Promise<{ hoverPart: MarkdownHover; hoverElement: HTMLElement } | undefined> {
-		return Promise.resolve(this._renderedHoverParts?.updateMarkdownHoverPartVerbosityLevel(action, index, focus));
+	public updateMarkdownHoverVerbosityLevel(action: HoverVerbosityAction, index: number): Promise<{ hoverPart: MarkdownHover; hoverElement: HTMLElement } | undefined> {
+		return Promise.resolve(this._renderedHoverParts?.updateMarkdownHoverPartVerbosityLevel(action, index));
 	}
 }
 
@@ -327,13 +327,13 @@ class MarkdownRenderedHoverParts implements IRenderedHoverParts<MarkdownHover> {
 			return store;
 		}
 		actionElement.classList.add('enabled');
-		const actionFunction = () => this._commandService.executeCommand(action === HoverVerbosityAction.Increase ? INCREASE_HOVER_VERBOSITY_ACTION_ID : DECREASE_HOVER_VERBOSITY_ACTION_ID);
+		const actionFunction = () => this._commandService.executeCommand(action === HoverVerbosityAction.Increase ? INCREASE_HOVER_VERBOSITY_ACTION_ID : DECREASE_HOVER_VERBOSITY_ACTION_ID, { focus: true });
 		store.add(new ClickAction(actionElement, actionFunction));
 		store.add(new KeyDownAction(actionElement, actionFunction, [KeyCode.Enter, KeyCode.Space]));
 		return store;
 	}
 
-	public async updateMarkdownHoverPartVerbosityLevel(action: HoverVerbosityAction, index: number, focus: boolean = true): Promise<{ hoverPart: MarkdownHover; hoverElement: HTMLElement } | undefined> {
+	public async updateMarkdownHoverPartVerbosityLevel(action: HoverVerbosityAction, index: number): Promise<{ hoverPart: MarkdownHover; hoverElement: HTMLElement } | undefined> {
 		const model = this._editor.getModel();
 		if (!model) {
 			return undefined;
@@ -357,13 +357,9 @@ class MarkdownRenderedHoverParts implements IRenderedHoverParts<MarkdownHover> {
 			initialHoverPart.ordinal,
 			newHoverSource
 		);
-		const newHoverRenderedPart = this._renderHoverPart(
-			newHoverPart,
-			this._onFinishedRendering
-		);
-		this._replaceRenderedHoverPartAtIndex(index, newHoverRenderedPart, newHoverPart);
-		if (focus) {
-			this._focusOnHoverPartWithIndex(index);
+		const newHoverRenderedPart = this._updateRenderedHoverPart(index, newHoverPart);
+		if (!newHoverRenderedPart) {
+			return undefined;
 		}
 		return {
 			hoverPart: newHoverPart,
@@ -416,10 +412,11 @@ class MarkdownRenderedHoverParts implements IRenderedHoverParts<MarkdownHover> {
 		return hover;
 	}
 
-	private _replaceRenderedHoverPartAtIndex(index: number, renderedHoverPart: RenderedMarkdownHoverPart, hoverPart: MarkdownHover): void {
+	private _updateRenderedHoverPart(index: number, hoverPart: MarkdownHover): RenderedMarkdownHoverPart | undefined {
 		if (index >= this.renderedHoverParts.length || index < 0) {
-			return;
+			return undefined;
 		}
+		const renderedHoverPart = this._renderHoverPart(hoverPart, this._onFinishedRendering);
 		const currentRenderedHoverPart = this.renderedHoverParts[index];
 		const currentRenderedMarkdown = currentRenderedHoverPart.hoverElement;
 		const renderedMarkdown = renderedHoverPart.hoverElement;
@@ -430,13 +427,9 @@ class MarkdownRenderedHoverParts implements IRenderedHoverParts<MarkdownHover> {
 			currentRenderedMarkdown,
 			renderedHoverPart.disposables
 		);
-		currentRenderedMarkdown.focus();
 		currentRenderedHoverPart.dispose();
 		this.renderedHoverParts[index] = newRenderedHoverPart;
-	}
-
-	private _focusOnHoverPartWithIndex(index: number): void {
-		this.renderedHoverParts[index].hoverElement.focus();
+		return newRenderedHoverPart;
 	}
 
 	private _getRenderedHoverPartAtIndex(index: number): RenderedMarkdownHoverPart | undefined {

From 5da3e1776978225f199b6fa2df6ec92f320abc7e Mon Sep 17 00:00:00 2001
From: tobil4sk <tobil4sk@outlook.com>
Date: Wed, 11 Dec 2024 20:51:18 +0000
Subject: [PATCH 117/479] Merge diverging findExecutable functions (#228373)

---
 src/vs/base/node/processes.ts                 | 105 +++++++++---------
 .../node/externalTerminalService.ts           |   3 +-
 .../terminal/node/terminalEnvironment.ts      |  56 ----------
 .../platform/terminal/node/terminalProcess.ts |   3 +-
 .../terminal/node/terminalProfiles.ts         |   3 +-
 src/vs/workbench/api/node/extHostTask.ts      |  23 ++--
 .../tasks/browser/terminalTaskSystem.ts       |  11 +-
 7 files changed, 81 insertions(+), 123 deletions(-)

diff --git a/src/vs/base/node/processes.ts b/src/vs/base/node/processes.ts
index bbf15d0db8e..ea1cafb9748 100644
--- a/src/vs/base/node/processes.ts
+++ b/src/vs/base/node/processes.ts
@@ -5,6 +5,7 @@
 
 import * as cp from 'child_process';
 import { Stats, promises } from 'fs';
+import { getCaseInsensitive } from '../common/objects.js';
 import * as path from '../common/path.js';
 import * as Platform from '../common/platform.js';
 import * as process from '../common/process.js';
@@ -64,58 +65,61 @@ export function createQueuedSender(childProcess: cp.ChildProcess): IQueuedSender
 	return { send };
 }
 
-export namespace win32 {
-	export async function findExecutable(command: string, cwd?: string, paths?: string[]): Promise<string> {
-		// If we have an absolute path then we take it.
-		if (path.isAbsolute(command)) {
-			return command;
-		}
-		if (cwd === undefined) {
-			cwd = process.cwd();
-		}
-		const dir = path.dirname(command);
-		if (dir !== '.') {
-			// We have a directory and the directory is relative (see above). Make the path absolute
-			// to the current working directory.
-			return path.join(cwd, command);
-		}
-		if (paths === undefined && Types.isString(process.env['PATH'])) {
-			paths = process.env['PATH'].split(path.delimiter);
-		}
-		// No PATH environment. Make path absolute to the cwd.
-		if (paths === undefined || paths.length === 0) {
-			return path.join(cwd, command);
-		}
-
-		async function fileExists(path: string): Promise<boolean> {
-			if (await pfs.Promises.exists(path)) {
-				let statValue: Stats | undefined;
-				try {
-					statValue = await promises.stat(path);
-				} catch (e) {
-					if (e.message.startsWith('EACCES')) {
-						// it might be symlink
-						statValue = await promises.lstat(path);
-					}
-				}
-				return statValue ? !statValue.isDirectory() : false;
+async function fileExistsDefault(path: string): Promise<boolean> {
+	if (await pfs.Promises.exists(path)) {
+		let statValue: Stats | undefined;
+		try {
+			statValue = await promises.stat(path);
+		} catch (e) {
+			if (e.message.startsWith('EACCES')) {
+				// it might be symlink
+				statValue = await promises.lstat(path);
 			}
-			return false;
 		}
+		return statValue ? !statValue.isDirectory() : false;
+	}
+	return false;
+}
 
-		// We have a simple file name. We get the path variable from the env
-		// and try to find the executable on the path.
-		for (const pathEntry of paths) {
-			// The path entry is absolute.
-			let fullPath: string;
-			if (path.isAbsolute(pathEntry)) {
-				fullPath = path.join(pathEntry, command);
-			} else {
-				fullPath = path.join(cwd, pathEntry, command);
-			}
-			if (await fileExists(fullPath)) {
-				return fullPath;
-			}
+export async function findExecutable(command: string, cwd?: string, paths?: string[], env: Platform.IProcessEnvironment = process.env as Platform.IProcessEnvironment, fileExists: (path: string) => Promise<boolean> = fileExistsDefault): Promise<string | undefined> {
+	// If we have an absolute path then we take it.
+	if (path.isAbsolute(command)) {
+		return await fileExists(command) ? command : undefined;
+	}
+	if (cwd === undefined) {
+		cwd = process.cwd();
+	}
+	const dir = path.dirname(command);
+	if (dir !== '.') {
+		// We have a directory and the directory is relative (see above). Make the path absolute
+		// to the current working directory.
+		const fullPath = path.join(cwd, command);
+		return await fileExists(fullPath) ? fullPath : undefined;
+	}
+	const envPath = getCaseInsensitive(env, 'PATH');
+	if (paths === undefined && Types.isString(envPath)) {
+		paths = envPath.split(path.delimiter);
+	}
+	// No PATH environment. Make path absolute to the cwd.
+	if (paths === undefined || paths.length === 0) {
+		const fullPath = path.join(cwd, command);
+		return await fileExists(fullPath) ? fullPath : undefined;
+	}
+
+	// We have a simple file name. We get the path variable from the env
+	// and try to find the executable on the path.
+	for (const pathEntry of paths) {
+		// The path entry is absolute.
+		let fullPath: string;
+		if (path.isAbsolute(pathEntry)) {
+			fullPath = path.join(pathEntry, command);
+		} else {
+			fullPath = path.join(cwd, pathEntry, command);
+		}
+		if (await fileExists(fullPath)) {
+			return fullPath;
+		}
+		if (Platform.isWindows) {
 			let withExtension = fullPath + '.com';
 			if (await fileExists(withExtension)) {
 				return withExtension;
@@ -125,6 +129,7 @@ export namespace win32 {
 				return withExtension;
 			}
 		}
-		return path.join(cwd, command);
 	}
+	const fullPath = path.join(cwd, command);
+	return await fileExists(fullPath) ? fullPath : undefined;
 }
diff --git a/src/vs/platform/externalTerminal/node/externalTerminalService.ts b/src/vs/platform/externalTerminal/node/externalTerminalService.ts
index 47c12711f8c..ca6c82b31d7 100644
--- a/src/vs/platform/externalTerminal/node/externalTerminalService.ts
+++ b/src/vs/platform/externalTerminal/node/externalTerminalService.ts
@@ -134,8 +134,7 @@ export class WindowsExternalTerminalService extends ExternalTerminalService impl
 	@memoize
 	private static async getWtExePath() {
 		try {
-			const wtPath = await processes.win32.findExecutable('wt');
-			return await pfs.Promises.exists(wtPath) ? wtPath : undefined;
+			return await processes.findExecutable('wt');
 		} catch {
 			return undefined;
 		}
diff --git a/src/vs/platform/terminal/node/terminalEnvironment.ts b/src/vs/platform/terminal/node/terminalEnvironment.ts
index 3d6cdfc82cf..3688900dc2b 100644
--- a/src/vs/platform/terminal/node/terminalEnvironment.ts
+++ b/src/vs/platform/terminal/node/terminalEnvironment.ts
@@ -5,13 +5,10 @@
 
 import * as os from 'os';
 import { FileAccess } from '../../../base/common/network.js';
-import { getCaseInsensitive } from '../../../base/common/objects.js';
 import * as path from '../../../base/common/path.js';
 import { IProcessEnvironment, isMacintosh, isWindows } from '../../../base/common/platform.js';
 import * as process from '../../../base/common/process.js';
 import { format } from '../../../base/common/strings.js';
-import { isString } from '../../../base/common/types.js';
-import * as pfs from '../../../base/node/pfs.js';
 import { ILogService } from '../../log/common/log.js';
 import { IProductService } from '../../product/common/productService.js';
 import { IShellLaunchConfig, ITerminalEnvironment, ITerminalProcessOptions } from '../common/terminal.js';
@@ -28,59 +25,6 @@ export function getWindowsBuildNumber(): number {
 	return buildNumber;
 }
 
-export async function findExecutable(command: string, cwd?: string, paths?: string[], env: IProcessEnvironment = process.env as IProcessEnvironment, exists: (path: string) => Promise<boolean> = pfs.Promises.exists): Promise<string | undefined> {
-	// If we have an absolute path then we take it.
-	if (path.isAbsolute(command)) {
-		return await exists(command) ? command : undefined;
-	}
-	if (cwd === undefined) {
-		cwd = process.cwd();
-	}
-	const dir = path.dirname(command);
-	if (dir !== '.') {
-		// We have a directory and the directory is relative (see above). Make the path absolute
-		// to the current working directory.
-		const fullPath = path.join(cwd, command);
-		return await exists(fullPath) ? fullPath : undefined;
-	}
-	const envPath = getCaseInsensitive(env, 'PATH');
-	if (paths === undefined && isString(envPath)) {
-		paths = envPath.split(path.delimiter);
-	}
-	// No PATH environment. Make path absolute to the cwd.
-	if (paths === undefined || paths.length === 0) {
-		const fullPath = path.join(cwd, command);
-		return await exists(fullPath) ? fullPath : undefined;
-	}
-	// We have a simple file name. We get the path variable from the env
-	// and try to find the executable on the path.
-	for (const pathEntry of paths) {
-		// The path entry is absolute.
-		let fullPath: string;
-		if (path.isAbsolute(pathEntry)) {
-			fullPath = path.join(pathEntry, command);
-		} else {
-			fullPath = path.join(cwd, pathEntry, command);
-		}
-
-		if (await exists(fullPath)) {
-			return fullPath;
-		}
-		if (isWindows) {
-			let withExtension = fullPath + '.com';
-			if (await exists(withExtension)) {
-				return withExtension;
-			}
-			withExtension = fullPath + '.exe';
-			if (await exists(withExtension)) {
-				return withExtension;
-			}
-		}
-	}
-	const fullPath = path.join(cwd, command);
-	return await exists(fullPath) ? fullPath : undefined;
-}
-
 export interface IShellIntegrationConfigInjection {
 	/**
 	 * A new set of arguments to use.
diff --git a/src/vs/platform/terminal/node/terminalProcess.ts b/src/vs/platform/terminal/node/terminalProcess.ts
index d7a470d5bf6..a57acc78b17 100644
--- a/src/vs/platform/terminal/node/terminalProcess.ts
+++ b/src/vs/platform/terminal/node/terminalProcess.ts
@@ -10,13 +10,14 @@ import { Emitter, Event } from '../../../base/common/event.js';
 import { Disposable, toDisposable } from '../../../base/common/lifecycle.js';
 import * as path from '../../../base/common/path.js';
 import { IProcessEnvironment, isLinux, isMacintosh, isWindows } from '../../../base/common/platform.js';
+import { findExecutable } from '../../../base/node/processes.js';
 import { URI } from '../../../base/common/uri.js';
 import { localize } from '../../../nls.js';
 import { ILogService, LogLevel } from '../../log/common/log.js';
 import { IProductService } from '../../product/common/productService.js';
 import { FlowControlConstants, IShellLaunchConfig, ITerminalChildProcess, ITerminalLaunchError, IProcessProperty, IProcessPropertyMap as IProcessPropertyMap, ProcessPropertyType, TerminalShellType, IProcessReadyEvent, ITerminalProcessOptions, PosixShellType, IProcessReadyWindowsPty, GeneralShellType } from '../common/terminal.js';
 import { ChildProcessMonitor } from './childProcessMonitor.js';
-import { findExecutable, getShellIntegrationInjection, getWindowsBuildNumber, IShellIntegrationConfigInjection } from './terminalEnvironment.js';
+import { getShellIntegrationInjection, getWindowsBuildNumber, IShellIntegrationConfigInjection } from './terminalEnvironment.js';
 import { WindowsShellHelper } from './windowsShellHelper.js';
 import { IPty, IPtyForkOptions, IWindowsPtyForkOptions, spawn } from 'node-pty';
 import { chunkInput } from '../common/terminalProcess.js';
diff --git a/src/vs/platform/terminal/node/terminalProfiles.ts b/src/vs/platform/terminal/node/terminalProfiles.ts
index 76e77d9174c..fd5d14a71fb 100644
--- a/src/vs/platform/terminal/node/terminalProfiles.ts
+++ b/src/vs/platform/terminal/node/terminalProfiles.ts
@@ -8,6 +8,7 @@ import * as cp from 'child_process';
 import { Codicon } from '../../../base/common/codicons.js';
 import { basename, delimiter, normalize } from '../../../base/common/path.js';
 import { isLinux, isWindows } from '../../../base/common/platform.js';
+import { findExecutable } from '../../../base/node/processes.js';
 import { isString } from '../../../base/common/types.js';
 import { URI } from '../../../base/common/uri.js';
 import * as pfs from '../../../base/node/pfs.js';
@@ -15,7 +16,7 @@ import { enumeratePowerShellInstallations } from '../../../base/node/powershell.
 import { IConfigurationService } from '../../configuration/common/configuration.js';
 import { ILogService } from '../../log/common/log.js';
 import { ITerminalEnvironment, ITerminalExecutable, ITerminalProfile, ITerminalProfileSource, ITerminalUnsafePath, ProfileSource, TerminalIcon, TerminalSettingId } from '../common/terminal.js';
-import { findExecutable, getWindowsBuildNumber } from './terminalEnvironment.js';
+import { getWindowsBuildNumber } from './terminalEnvironment.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
 import { dirname, resolve } from 'path';
 
diff --git a/src/vs/workbench/api/node/extHostTask.ts b/src/vs/workbench/api/node/extHostTask.ts
index 1e1f0637a26..b6cfc881ec4 100644
--- a/src/vs/workbench/api/node/extHostTask.ts
+++ b/src/vs/workbench/api/node/extHostTask.ts
@@ -6,7 +6,7 @@
 import * as path from '../../../base/common/path.js';
 
 import { URI, UriComponents } from '../../../base/common/uri.js';
-import { win32 } from '../../../base/node/processes.js';
+import { findExecutable } from '../../../base/node/processes.js';
 import * as types from '../common/extHostTypes.js';
 import { IExtHostWorkspace } from '../common/extHostWorkspace.js';
 import type * as vscode from 'vscode';
@@ -144,7 +144,7 @@ export class ExtHostTask extends ExtHostTaskBase {
 	public async $resolveVariables(uriComponents: UriComponents, toResolve: { process?: { name: string; cwd?: string; path?: string }; variables: string[] }): Promise<{ process?: string; variables: { [key: string]: string } }> {
 		const uri: URI = URI.revive(uriComponents);
 		const result = {
-			process: <unknown>undefined as string,
+			process: undefined as string | undefined,
 			variables: Object.create(null)
 		};
 		const workspaceFolder = await this._workspaceProvider.resolveWorkspaceFolder(uri);
@@ -171,11 +171,16 @@ export class ExtHostTask extends ExtHostTaskBase {
 					paths[i] = await resolver.resolveAsync(ws, paths[i]);
 				}
 			}
-			result.process = await win32.findExecutable(
-				await resolver.resolveAsync(ws, toResolve.process.name),
-				toResolve.process.cwd !== undefined ? await resolver.resolveAsync(ws, toResolve.process.cwd) : undefined,
-				paths
-			);
+			const processName = await resolver.resolveAsync(ws, toResolve.process.name);
+			const cwd = toResolve.process.cwd !== undefined ? await resolver.resolveAsync(ws, toResolve.process.cwd) : undefined;
+			const foundExecutable = await findExecutable(processName, cwd, paths);
+			if (foundExecutable) {
+				result.process = foundExecutable;
+			} else if (path.isAbsolute(processName)) {
+				result.process = processName;
+			} else {
+				result.process = path.join(cwd ?? '', processName);
+			}
 		}
 		return result;
 	}
@@ -184,7 +189,7 @@ export class ExtHostTask extends ExtHostTaskBase {
 		return true;
 	}
 
-	public async $findExecutable(command: string, cwd?: string, paths?: string[]): Promise<string> {
-		return win32.findExecutable(command, cwd, paths);
+	public async $findExecutable(command: string, cwd?: string, paths?: string[]): Promise<string | undefined> {
+		return findExecutable(command, cwd, paths);
 	}
 }
diff --git a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
index db362d7fb92..045a9e63b44 100644
--- a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
+++ b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
@@ -620,11 +620,14 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 		const command = await this._configurationResolverService.resolveAsync(workspaceFolder, CommandString.value(task.command.name!));
 		cwd = cwd ? await this._configurationResolverService.resolveAsync(workspaceFolder, cwd) : undefined;
 		const paths = envPath ? await Promise.all(envPath.split(path.delimiter).map(p => this._configurationResolverService.resolveAsync(workspaceFolder, p))) : undefined;
-		let foundExecutable = await systemInfo?.findExecutable(command, cwd, paths);
-		if (!foundExecutable) {
-			foundExecutable = path.join(cwd ?? '', command);
+		const foundExecutable = await systemInfo?.findExecutable(command, cwd, paths);
+		if (foundExecutable) {
+			return foundExecutable;
 		}
-		return foundExecutable;
+		if (path.isAbsolute(command)) {
+			return command;
+		}
+		return path.join(cwd ?? '', command);
 	}
 
 	private _findUnresolvedVariables(variables: Set<string>, alreadyResolved: Map<string, string>): Set<string> {

From 0d84cd0d8da60b395d57894fc6cf9ad135aca942 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 11 Dec 2024 21:58:34 +0100
Subject: [PATCH 118/479] chat - setup tweaks (#235861)

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

diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index d23c468f229..ee5c1d8ff0b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -824,7 +824,7 @@ class ChatSetupWelcomeContent extends Disposable {
 
 		// Header
 		{
-			const header = localize({ key: 'setupHeader', comment: ['{Locked="[Copilot]({0})"}'] }, "[Copilot]({0}) is your AI pair programmer.", this.context.state.installed ? 'command:github.copilot.open.walkthrough' : defaultChat.documentationUrl);
+			const header = localize({ key: 'header', comment: ['{Locked="[Copilot]({0})"}'] }, "[Copilot]({0}) is your AI pair programmer.", this.context.state.installed ? 'command:github.copilot.open.walkthrough' : defaultChat.documentationUrl);
 			this.element.appendChild($('p')).appendChild(this._register(markdown.render(new MarkdownString(header, { isTrusted: true }))).element);
 
 			const features = this.element.appendChild($('div.chat-features-container'));
@@ -850,7 +850,7 @@ class ChatSetupWelcomeContent extends Disposable {
 		}
 
 		// Limited SKU
-		const free = localize({ key: 'limitedSkuHeader', comment: ['{Locked="[]({0})"}'] }, "$(sparkle-filled) We now offer [Copilot for free]({0}).", defaultChat.skusDocumentationUrl);
+		const free = localize({ key: 'free', comment: ['{Locked="[]({0})"}'] }, "$(sparkle-filled) We now offer [Copilot for free]({0}).", defaultChat.skusDocumentationUrl);
 		const freeContainer = this.element.appendChild($('p'));
 		freeContainer.appendChild(this._register(markdown.render(new MarkdownString(free, { isTrusted: true, supportThemeIcons: true }))).element);
 
@@ -875,11 +875,11 @@ class ChatSetupWelcomeContent extends Disposable {
 		this._register(button.onDidClick(() => this.controller.setup()));
 
 		// Terms
-		const terms = localize({ key: 'termsLabel', comment: ['{Locked="["}', '{Locked="]({0})"}', '{Locked="]({1})"}'] }, "By continuing, you agree to the [Terms]({0}) and [Privacy Policy]({1}).", defaultChat.termsStatementUrl, defaultChat.privacyStatementUrl);
+		const terms = localize({ key: 'terms', comment: ['{Locked="["}', '{Locked="]({0})"}', '{Locked="]({1})"}'] }, "By continuing, you agree to the [Terms]({0}) and [Privacy Policy]({1}).", defaultChat.termsStatementUrl, defaultChat.privacyStatementUrl);
 		this.element.appendChild($('p')).appendChild(this._register(markdown.render(new MarkdownString(terms, { isTrusted: true }))).element);
 
 		// SKU Settings
-		const settings = localize({ key: 'termsLabelWithTelemetry', comment: ['{Locked="["}', '{Locked="]({0})"}', '{Locked="]({1})"}'] }, "Copilot may show [public code]({0}) suggestions and collect usage data. You can change these [settings]({1}) at any time.", defaultChat.publicCodeMatchesUrl, defaultChat.manageSettingsUrl);
+		const settings = localize({ key: 'settings', comment: ['{Locked="["}', '{Locked="]({0})"}', '{Locked="]({1})"}'] }, "Copilot may show [public code]({0}) suggestions and collect telemetry. You can change these [settings]({1}) at any time.", defaultChat.publicCodeMatchesUrl, defaultChat.manageSettingsUrl);
 		const settingsContainer = this.element.appendChild($('p'));
 		settingsContainer.appendChild(this._register(markdown.render(new MarkdownString(settings, { isTrusted: true }))).element);
 

From c5b2d919e3d59e83257adacd04f08527621fdad9 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Wed, 11 Dec 2024 21:59:59 +0100
Subject: [PATCH 119/479] Enable visibility toggling for terminal and other
 views (#235846)

fix #141405
---
 src/vs/workbench/contrib/debug/browser/debug.contribution.ts    | 2 +-
 .../workbench/contrib/markers/browser/markers.contribution.ts   | 2 +-
 src/vs/workbench/contrib/output/browser/output.contribution.ts  | 2 +-
 .../workbench/contrib/terminal/browser/terminal.contribution.ts | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
index 06d29a3a774..7c501db354f 100644
--- a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
@@ -395,7 +395,7 @@ Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry).registerViews([{
 	id: REPL_VIEW_ID,
 	name: nls.localize2({ comment: ['Debug is a noun in this context, not a verb.'], key: 'debugPanel' }, "Debug Console"),
 	containerIcon: icons.debugConsoleViewIcon,
-	canToggleVisibility: false,
+	canToggleVisibility: true,
 	canMoveView: true,
 	when: CONTEXT_DEBUGGERS_AVAILABLE,
 	ctorDescriptor: new SyncDescriptor(Repl),
diff --git a/src/vs/workbench/contrib/markers/browser/markers.contribution.ts b/src/vs/workbench/contrib/markers/browser/markers.contribution.ts
index 40b664bc78d..6543d59ee29 100644
--- a/src/vs/workbench/contrib/markers/browser/markers.contribution.ts
+++ b/src/vs/workbench/contrib/markers/browser/markers.contribution.ts
@@ -140,7 +140,7 @@ Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry).registerViews
 	id: Markers.MARKERS_VIEW_ID,
 	containerIcon: markersViewIcon,
 	name: Messages.MARKERS_PANEL_TITLE_PROBLEMS,
-	canToggleVisibility: false,
+	canToggleVisibility: true,
 	canMoveView: true,
 	ctorDescriptor: new SyncDescriptor(MarkersView),
 	openCommandActionDescriptor: {
diff --git a/src/vs/workbench/contrib/output/browser/output.contribution.ts b/src/vs/workbench/contrib/output/browser/output.contribution.ts
index a06d596b9b0..7288357d606 100644
--- a/src/vs/workbench/contrib/output/browser/output.contribution.ts
+++ b/src/vs/workbench/contrib/output/browser/output.contribution.ts
@@ -72,7 +72,7 @@ Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry).registerViews
 	name: nls.localize2('output', "Output"),
 	containerIcon: outputViewIcon,
 	canMoveView: true,
-	canToggleVisibility: false,
+	canToggleVisibility: true,
 	ctorDescriptor: new SyncDescriptor(OutputViewPane),
 	openCommandActionDescriptor: {
 		id: 'workbench.action.output.toggleOutput',
diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
index 452daef0e18..cee30a6d28b 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts
@@ -116,7 +116,7 @@ Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry).registerViews
 	id: TERMINAL_VIEW_ID,
 	name: nls.localize2('terminal', "Terminal"),
 	containerIcon: terminalViewIcon,
-	canToggleVisibility: false,
+	canToggleVisibility: true,
 	canMoveView: true,
 	ctorDescriptor: new SyncDescriptor(TerminalViewPane),
 	openCommandActionDescriptor: {

From 605672003f4881813e9a426efc520621ab9f8a5a Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Wed, 11 Dec 2024 22:09:33 +0100
Subject: [PATCH 120/479] Erroneous description for setting "CSS Format:
 Preseve New Lines" (#235864)

---
 extensions/css-language-features/package.nls.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/css-language-features/package.nls.json b/extensions/css-language-features/package.nls.json
index d6e25a57a43..057ec214bc2 100644
--- a/extensions/css-language-features/package.nls.json
+++ b/extensions/css-language-features/package.nls.json
@@ -35,7 +35,7 @@
 	"css.format.newlineBetweenRules.desc": "Separate rulesets by a blank line.",
 	"css.format.spaceAroundSelectorSeparator.desc": "Ensure a space character around selector separators '>', '+', '~' (e.g. `a > b`).",
 	"css.format.braceStyle.desc": "Put braces on the same line as rules (`collapse`) or put braces on own line (`expand`).",
-	"css.format.preserveNewLines.desc": "Whether existing line breaks before elements should be preserved.",
+	"css.format.preserveNewLines.desc": "Whether existing line breaks before rules and declarations should be preserved.",
 	"css.format.maxPreserveNewLines.desc": "Maximum number of line breaks to be preserved in one chunk, when `#css.format.preserveNewLines#` is enabled.",
 	"less.title": "LESS",
 	"less.completion.triggerPropertyValueCompletion.desc": "By default, VS Code triggers property value completion after selecting a CSS property. Use this setting to disable this behavior.",
@@ -69,7 +69,7 @@
 	"less.format.newlineBetweenRules.desc": "Separate rulesets by a blank line.",
 	"less.format.spaceAroundSelectorSeparator.desc": "Ensure a space character around selector separators '>', '+', '~' (e.g. `a > b`).",
 	"less.format.braceStyle.desc": "Put braces on the same line as rules (`collapse`) or put braces on own line (`expand`).",
-	"less.format.preserveNewLines.desc": "Whether existing line breaks before elements should be preserved.",
+	"less.format.preserveNewLines.desc": "Whether existing line breaks before rules and declarations should be preserved.",
 	"less.format.maxPreserveNewLines.desc": "Maximum number of line breaks to be preserved in one chunk, when `#less.format.preserveNewLines#` is enabled.",
 	"scss.title": "SCSS (Sass)",
 	"scss.completion.triggerPropertyValueCompletion.desc": "By default, VS Code triggers property value completion after selecting a CSS property. Use this setting to disable this behavior.",
@@ -103,7 +103,7 @@
 	"scss.format.newlineBetweenRules.desc": "Separate rulesets by a blank line.",
 	"scss.format.spaceAroundSelectorSeparator.desc": "Ensure a space character around selector separators '>', '+', '~' (e.g. `a > b`).",
 	"scss.format.braceStyle.desc": "Put braces on the same line as rules (`collapse`) or put braces on own line (`expand`).",
-	"scss.format.preserveNewLines.desc": "Whether existing line breaks before elements should be preserved.",
+	"scss.format.preserveNewLines.desc": "Whether existing line breaks before rules and declarations should be preserved.",
 	"scss.format.maxPreserveNewLines.desc": "Maximum number of line breaks to be preserved in one chunk, when `#scss.format.preserveNewLines#` is enabled.",
 	"css.colorDecorators.enable.deprecationMessage": "The setting `css.colorDecorators.enable` has been deprecated in favor of `editor.colorDecorators`.",
 	"scss.colorDecorators.enable.deprecationMessage": "The setting `scss.colorDecorators.enable` has been deprecated in favor of `editor.colorDecorators`.",

From 3912f7a2b7fd1f54fde675d2462b54b719073cc7 Mon Sep 17 00:00:00 2001
From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com>
Date: Wed, 11 Dec 2024 14:59:27 -0800
Subject: [PATCH 121/479] chore: place assignee in its own variable (#235866)

---
 .vscode/notebooks/grooming.github-issues | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.vscode/notebooks/grooming.github-issues b/.vscode/notebooks/grooming.github-issues
index 6e2e81b21a5..4b2f8c6750f 100644
--- a/.vscode/notebooks/grooming.github-issues
+++ b/.vscode/notebooks/grooming.github-issues
@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "// list of repos we work in\r\n$repos=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\r\n"
+    "value": "// list of repos we work in\r\n$repos=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\r\n\r\n$assignee=@me\r\n"
   },
   {
     "kind": 1,
@@ -17,7 +17,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos assignee:@me is:open type:issue -label:bug -label:\"info-needed\" -label:feature-request -label:under-discussion -label:debt -label:plan-item -label:upstream -label:polish -label:testplan-item -label:error-telemetry -label:engineering -label:endgame-plan\r\n"
+    "value": "$repos assignee:$assignee is:open type:issue -label:bug -label:\"info-needed\" -label:feature-request -label:under-discussion -label:debt -label:plan-item -label:upstream -label:polish -label:testplan-item -label:error-telemetry -label:engineering -label:endgame-plan\r\n"
   },
   {
     "kind": 1,
@@ -27,7 +27,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode assignee:@me is:open type:issue -label:\"info-needed\" -label:api -label:api-finalization -label:api-proposal -label:authentication -label:bisect-ext -label:bracket-pair-colorization -label:bracket-pair-guides -label:breadcrumbs -label:callhierarchy -label:chrome-devtools -label:cloud-changes -label:code-lens -label:command-center -label:comments -label:config -label:containers -label:context-keys -label:continue-working-on -label:css-less-scss -label:custom-editors -label:debug -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor-api -label:editor-autoclosing -label:editor-autoindent -label:editor-bracket-matching -label:editor-clipboard -label:editor-code-actions -label:editor-color-picker -label:editor-columnselect -label:editor-commands -label:editor-comments -label:editor-contrib -label:editor-core -label:editor-drag-and-drop -label:editor-error-widget -label:editor-find -label:editor-folding -label:editor-highlight -label:editor-hover -label:editor-indent-detection -label:editor-indent-guides -label:editor-input -label:editor-input-IME -label:editor-insets -label:editor-minimap -label:editor-multicursor -label:editor-parameter-hints -label:editor-render-whitespace -label:editor-rendering -label:editor-widgets -label:editor-RTL -label:editor-scrollbar -label:editor-sorting -label:editor-sticky-scroll -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet -label:emmet-parse -label:error-list -label:extension-activation -label:extension-host -label:extension-prerelease -label:extension-recommendations -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-io -label:file-nesting -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:github-repositories -label:gpu -label:grammar -label:grid-widget -label:html -label:icon-brand -label:icons-product -label:image-preview -label:inlay-hints -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-playground -label:interactive-window -label:issue-bot -label:issue-reporter -label:javascript -label:json -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:L10N -label:l10n-platform -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list-widget -label:live-preview -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:merge-editor -label:merge-editor-workbench -label:monaco-editor -label:native-file-dialog -label:network -label:notebook -label:notebook-accessibility -label:notebook-api -label:notebook-builtin-renderers -label:notebook-cell-editor -label:notebook-celltoolbar -label:notebook-clipboard -label:notebook-commands -label:notebook-commenting -label:notebook-debugging -label:notebook-diff -label:notebook-dnd -label:notebook-execution -label:notebook-find -label:notebook-folding -label:notebook-getting-started -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-kernel-picker -label:notebook-language -label:notebook-layout -label:notebook-markdown -label:notebook-math -label:notebook-minimap -label:notebook-multiselect -label:notebook-output -label:notebook-perf -label:notebook-remote -label:notebook-rendering -label:notebook-serialization -label:notebook-serverless-web -label:notebook-statusbar -label:notebook-toc-outline -label:notebook-undo-redo -label:notebook-variables -label:notebook-workbench-integration -label:notebook-workflow -label:notebook-sticky-scroll -label:notebook-format -label:notebook-code-actions -label:open-editors -label:opener -label:outline -label:output -label:packaging -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-open -label:quick-pick -label:references-viewlet -label:release-notes -label:remote -label:remote-connection -label:remote-explorer -label:remote-tunnel -label:rename -label:runCommands -label:sandbox -label:sash-widget -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:server -label:settings-editor -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview-widget -label:ssh -label:suggest -label:table-widget -label:tasks -label:telemetry -label:terminal -label:terminal-accessibility -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-find -label:terminal-input -label:terminal-layout -label:terminal-links -label:terminal-local-echo -label:terminal-persistence -label:terminal-process -label:terminal-profiles -label:terminal-quick-fix -label:terminal-rendering -label:terminal-shell-bash -label:terminal-shell-cmd -label:terminal-shell-fish -label:terminal-shell-git-bash -label:terminal-shell-integration -label:terminal-shell-pwsh -label:terminal-shell-zsh -label:terminal-sticky-scroll -label:terminal-tabs -label:testing -label:themes -label:timeline -label:timeline-git -label:timeline-local-history -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typescript -label:undo-redo -label:unicode-highlight -label:uri -label:user-profiles -label:ux -label:variable-resolving -label:VIM -label:virtual-workspaces -label:vscode-website -label:vscode.dev -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-banner -label:workbench-cli -label:workbench-diagnostics -label:workbench-dnd -label:workbench-editor-grid -label:workbench-editor-groups -label:workbench-editor-resolver -label:workbench-editors -label:workbench-electron -label:workbench-fonts -label:workbench-history -label:workbench-hot-exit -label:workbench-hover -label:workbench-launch -label:workbench-link -label:workbench-multiroot -label:workbench-notifications -label:workbench-os-integration -label:workbench-rapid-render -label:workbench-run-as-admin -label:workbench-state -label:workbench-status -label:workbench-tabs -label:workbench-touchbar -label:workbench-untitled-editors -label:workbench-views -label:workbench-welcome -label:workbench-window -label:workbench-workspace -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom -label:inline-chat -label:panel-chat -label:quick-chat -label:audio-cue -label:tasks -label:error-list -label:winget -label:tree-views -label:freeze-slow-crash-leak -label:engineering"
+    "value": "repo:microsoft/vscode assignee:$assignee is:open type:issue -label:\"info-needed\" -label:api -label:api-finalization -label:api-proposal -label:authentication -label:bisect-ext -label:bracket-pair-colorization -label:bracket-pair-guides -label:breadcrumbs -label:callhierarchy -label:chrome-devtools -label:cloud-changes -label:code-lens -label:command-center -label:comments -label:config -label:containers -label:context-keys -label:continue-working-on -label:css-less-scss -label:custom-editors -label:debug -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor-api -label:editor-autoclosing -label:editor-autoindent -label:editor-bracket-matching -label:editor-clipboard -label:editor-code-actions -label:editor-color-picker -label:editor-columnselect -label:editor-commands -label:editor-comments -label:editor-contrib -label:editor-core -label:editor-drag-and-drop -label:editor-error-widget -label:editor-find -label:editor-folding -label:editor-highlight -label:editor-hover -label:editor-indent-detection -label:editor-indent-guides -label:editor-input -label:editor-input-IME -label:editor-insets -label:editor-minimap -label:editor-multicursor -label:editor-parameter-hints -label:editor-render-whitespace -label:editor-rendering -label:editor-widgets -label:editor-RTL -label:editor-scrollbar -label:editor-sorting -label:editor-sticky-scroll -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet -label:emmet-parse -label:error-list -label:extension-activation -label:extension-host -label:extension-prerelease -label:extension-recommendations -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-io -label:file-nesting -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:github-repositories -label:gpu -label:grammar -label:grid-widget -label:html -label:icon-brand -label:icons-product -label:image-preview -label:inlay-hints -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-playground -label:interactive-window -label:issue-bot -label:issue-reporter -label:javascript -label:json -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:L10N -label:l10n-platform -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list-widget -label:live-preview -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:merge-editor -label:merge-editor-workbench -label:monaco-editor -label:native-file-dialog -label:network -label:notebook -label:notebook-accessibility -label:notebook-api -label:notebook-builtin-renderers -label:notebook-cell-editor -label:notebook-celltoolbar -label:notebook-clipboard -label:notebook-commands -label:notebook-commenting -label:notebook-debugging -label:notebook-diff -label:notebook-dnd -label:notebook-execution -label:notebook-find -label:notebook-folding -label:notebook-getting-started -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-kernel-picker -label:notebook-language -label:notebook-layout -label:notebook-markdown -label:notebook-math -label:notebook-minimap -label:notebook-multiselect -label:notebook-output -label:notebook-perf -label:notebook-remote -label:notebook-rendering -label:notebook-serialization -label:notebook-serverless-web -label:notebook-statusbar -label:notebook-toc-outline -label:notebook-undo-redo -label:notebook-variables -label:notebook-workbench-integration -label:notebook-workflow -label:notebook-sticky-scroll -label:notebook-format -label:notebook-code-actions -label:open-editors -label:opener -label:outline -label:output -label:packaging -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-open -label:quick-pick -label:references-viewlet -label:release-notes -label:remote -label:remote-connection -label:remote-explorer -label:remote-tunnel -label:rename -label:runCommands -label:sandbox -label:sash-widget -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:server -label:settings-editor -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview-widget -label:ssh -label:suggest -label:table-widget -label:tasks -label:telemetry -label:terminal -label:terminal-accessibility -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-find -label:terminal-input -label:terminal-layout -label:terminal-links -label:terminal-local-echo -label:terminal-persistence -label:terminal-process -label:terminal-profiles -label:terminal-quick-fix -label:terminal-rendering -label:terminal-shell-bash -label:terminal-shell-cmd -label:terminal-shell-fish -label:terminal-shell-git-bash -label:terminal-shell-integration -label:terminal-shell-pwsh -label:terminal-shell-zsh -label:terminal-sticky-scroll -label:terminal-tabs -label:testing -label:themes -label:timeline -label:timeline-git -label:timeline-local-history -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typescript -label:undo-redo -label:unicode-highlight -label:uri -label:user-profiles -label:ux -label:variable-resolving -label:VIM -label:virtual-workspaces -label:vscode-website -label:vscode.dev -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-banner -label:workbench-cli -label:workbench-diagnostics -label:workbench-dnd -label:workbench-editor-grid -label:workbench-editor-groups -label:workbench-editor-resolver -label:workbench-editors -label:workbench-electron -label:workbench-fonts -label:workbench-history -label:workbench-hot-exit -label:workbench-hover -label:workbench-launch -label:workbench-link -label:workbench-multiroot -label:workbench-notifications -label:workbench-os-integration -label:workbench-rapid-render -label:workbench-run-as-admin -label:workbench-state -label:workbench-status -label:workbench-tabs -label:workbench-touchbar -label:workbench-untitled-editors -label:workbench-views -label:workbench-welcome -label:workbench-window -label:workbench-workspace -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom -label:inline-chat -label:panel-chat -label:quick-chat -label:audio-cue -label:tasks -label:error-list -label:winget -label:tree-views -label:freeze-slow-crash-leak -label:engineering"
   },
   {
     "kind": 1,
@@ -37,7 +37,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos assignee:@me is:open type:issue no:milestone -label:info-needed -label:triage-needed -label:confirmation-pending -label:under-discussion\r\n"
+    "value": "$repos assignee:$assignee is:open type:issue no:milestone -label:info-needed -label:triage-needed -label:confirmation-pending -label:under-discussion\r\n"
   },
   {
     "kind": 1,
@@ -47,6 +47,6 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$repos assignee:@me is:open label:\"info-needed\"\r\n"
+    "value": "$repos assignee:$assignee is:open label:\"info-needed\"\r\n"
   }
 ]
\ No newline at end of file

From e095f631eb35af4fa32d39f0578184208f49ff15 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Wed, 11 Dec 2024 15:04:36 -0800
Subject: [PATCH 122/479] Add period to new button label (#235872)

---
 .../chat/browser/chatContentParts/chatQuotaExceededPart.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatQuotaExceededPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatQuotaExceededPart.ts
index da3c7ae323b..97985ca4969 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatQuotaExceededPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatQuotaExceededPart.ts
@@ -83,7 +83,7 @@ export class ChatQuotaExceededPart extends Disposable implements IChatContentPar
 				buttonForeground: asCssVariable(textLinkForeground)
 			}));
 			button2.element.classList.add('chat-quota-error-secondary-button');
-			button2.label = localize('signedUpClickToContinue', "Signed up? Click to retry");
+			button2.label = localize('signedUpClickToContinue', "Signed up? Click to retry.");
 			this._onDidChangeHeight.fire();
 			this._register(button2.onDidClick(() => {
 				const widget = chatWidgetService.getWidgetBySessionId(element.sessionId);

From 9fbfe5db10740b5ac96d89268afc8b4467879d26 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Thu, 12 Dec 2024 01:24:32 +0100
Subject: [PATCH 123/479] Add okLabel to pick input (#235744)

Fixes #194519
---
 src/vs/platform/quickinput/browser/quickInput.ts      | 11 +++++++++++
 src/vs/platform/quickinput/common/quickInput.ts       |  5 +++++
 .../services/dialogs/browser/simpleFileDialog.ts      |  1 +
 3 files changed, 17 insertions(+)

diff --git a/src/vs/platform/quickinput/browser/quickInput.ts b/src/vs/platform/quickinput/browser/quickInput.ts
index 6d7096e85ea..432416a5a11 100644
--- a/src/vs/platform/quickinput/browser/quickInput.ts
+++ b/src/vs/platform/quickinput/browser/quickInput.ts
@@ -562,6 +562,7 @@ export class QuickPick<T extends IQuickPickItem, O extends { useSeparators: bool
 	private _valueSelection: Readonly<[number, number]> | undefined;
 	private valueSelectionUpdated = true;
 	private _ok: boolean | 'default' = 'default';
+	private _okLabel: string | undefined;
 	private _customButton = false;
 	private _customButtonLabel: string | undefined;
 	private _customButtonHover: string | undefined;
@@ -812,6 +813,15 @@ export class QuickPick<T extends IQuickPickItem, O extends { useSeparators: bool
 		this.update();
 	}
 
+	get okLabel() {
+		return this._okLabel ?? localize('ok', "OK");
+	}
+
+	set okLabel(okLabel: string | undefined) {
+		this._okLabel = okLabel;
+		this.update();
+	}
+
 	inputHasFocus(): boolean {
 		return this.visible ? this.ui.inputBox.hasFocus() : false;
 	}
@@ -1101,6 +1111,7 @@ export class QuickPick<T extends IQuickPickItem, O extends { useSeparators: bool
 				this.selectedItemsToConfirm = null;
 			}
 		}
+		this.ui.ok.label = this.okLabel || '';
 		this.ui.customButton.label = this.customLabel || '';
 		this.ui.customButton.element.title = this.customHover || '';
 		if (!visibilities.inputBox) {
diff --git a/src/vs/platform/quickinput/common/quickInput.ts b/src/vs/platform/quickinput/common/quickInput.ts
index 8f2e1c0ac9b..39490182051 100644
--- a/src/vs/platform/quickinput/common/quickInput.ts
+++ b/src/vs/platform/quickinput/common/quickInput.ts
@@ -477,6 +477,11 @@ export interface IQuickPick<T extends IQuickPickItem, O extends { useSeparators:
 	 */
 	ok: boolean | 'default';
 
+	/**
+	 * The OK button label.
+	 */
+	okLabel: string | undefined;
+
 	/**
 	 * An event that is fired when the custom button is triggered. The custom button is a button with text rendered to the right of the input.
 	 */
diff --git a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
index 11b428f7f8e..af5292d7982 100644
--- a/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
+++ b/src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
@@ -283,6 +283,7 @@ export class SimpleFileDialog extends Disposable implements ISimpleFileDialog {
 			this.filePickBox.sortByLabel = false;
 			this.filePickBox.ignoreFocusOut = true;
 			this.filePickBox.ok = true;
+			this.filePickBox.okLabel = this.options.openLabel;
 			if ((this.scheme !== Schemas.file) && this.options && this.options.availableFileSystems && (this.options.availableFileSystems.length > 1) && (this.options.availableFileSystems.indexOf(Schemas.file) > -1)) {
 				this.filePickBox.customButton = true;
 				this.filePickBox.customLabel = nls.localize('remoteFileDialog.local', 'Show Local');

From e38f760f3d66339120c9665e27e168c44a84e2ff Mon Sep 17 00:00:00 2001
From: RedCMD <TheRedCMD@gmail.com>
Date: Thu, 12 Dec 2024 14:04:59 +1300
Subject: [PATCH 124/479] Fix extension preview codeblock language getter

---
 .../markdown/browser/markdownDocumentRenderer.ts     | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.ts b/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.ts
index 30f5fd50407..e80722d7993 100644
--- a/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.ts
+++ b/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.ts
@@ -234,7 +234,7 @@ export async function renderMarkdownDocument(
 namespace MarkedHighlight {
 	// Copied from https://github.com/markedjs/marked-highlight/blob/main/src/index.js
 
-	export function markedHighlight(options: marked.MarkedOptions & { highlight: (code: string, lang: string, info: string) => string | Promise<string> }): marked.MarkedExtension {
+	export function markedHighlight(options: marked.MarkedOptions & { highlight: (code: string, lang: string) => string | Promise<string> }): marked.MarkedExtension {
 		if (typeof options === 'function') {
 			options = {
 				highlight: options,
@@ -252,13 +252,11 @@ namespace MarkedHighlight {
 					return;
 				}
 
-				const lang = getLang(token.lang);
-
 				if (options.async) {
-					return Promise.resolve(options.highlight(token.text, lang, token.lang || '')).then(updateToken(token));
+					return Promise.resolve(options.highlight(token.text, token.lang)).then(updateToken(token));
 				}
 
-				const code = options.highlight(token.text, lang, token.lang || '');
+				const code = options.highlight(token.text, token.lang);
 				if (code instanceof Promise) {
 					throw new Error('markedHighlight is not set to async but the highlight function is async. Set the async option to true on markedHighlight to await the async highlight function.');
 				}
@@ -276,10 +274,6 @@ namespace MarkedHighlight {
 		};
 	}
 
-	function getLang(lang: string) {
-		return (lang || '').match(/\S*/)![0];
-	}
-
 	function updateToken(token: any) {
 		return (code: string) => {
 			if (typeof code === 'string' && code !== token.text) {

From 6a5c8cf95aa814b5cb92de617096144b1f45af2d Mon Sep 17 00:00:00 2001
From: jaymroy <90058409+jaymroy@users.noreply.github.com>
Date: Wed, 11 Dec 2024 22:48:03 -0500
Subject: [PATCH 125/479] Issue: #214481 Add Option to Ignore Code Blocks in
 Text-to-Speech (#235697)

* Add Option to Ignore Code Blocks in Text-to-Speech

* Add Option to Ignore Code Blocks in Text-to-Speech

* clean up

---------

Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com>
Co-authored-by: Benjamin Pasero <benjamin.pasero@gmail.com>
---
 .../browser/accessibilityConfiguration.ts     |  6 ++++
 .../actions/voiceChatActions.ts               | 31 +++++++++++++++++--
 .../contrib/speech/common/speechService.ts    |  1 +
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts b/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
index 9e64c7226d7..840442b7bac 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
@@ -789,6 +789,12 @@ export class DynamicSpeechAccessibilityConfiguration extends Disposable implemen
 					'minimum': 0,
 					'tags': ['accessibility']
 				},
+				[AccessibilityVoiceSettingId.IgnoreCodeBlocks]: {
+					'markdownDescription': localize('voice.ignoreCodeBlocks', "Whether to ignore code snippets in text-to-speech synthesis."),
+					'type': 'boolean',
+					'default': false,
+					'tags': ['accessibility']
+				},
 				[AccessibilityVoiceSettingId.SpeechLanguage]: {
 					'markdownDescription': localize('voice.speechLanguage', "The language that text-to-speech and speech-to-text should use. Select `auto` to use the configured display language if possible. Note that not all display languages maybe supported by speech recognition and synthesizers."),
 					'type': 'string',
diff --git a/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts b/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
index 198a49bb869..1b55c9d89df 100644
--- a/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
+++ b/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
@@ -707,6 +707,11 @@ class ChatSynthesizerSessionController {
 	}
 }
 
+interface IChatSyntheSizerContext {
+	readonly ignoreCodeBlocks: boolean;
+	insideCodeBlock: boolean;
+}
+
 class ChatSynthesizerSessions {
 
 	private static instance: ChatSynthesizerSessions | undefined = undefined;
@@ -722,6 +727,7 @@ class ChatSynthesizerSessions {
 
 	constructor(
 		@ISpeechService private readonly speechService: ISpeechService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService
 	) { }
 
@@ -768,11 +774,16 @@ class ChatSynthesizerSessions {
 	}
 
 	private async *nextChatResponseChunk(response: IChatResponseModel, token: CancellationToken): AsyncIterable<string> {
+		const context: IChatSyntheSizerContext = {
+			ignoreCodeBlocks: this.configurationService.getValue<boolean>(AccessibilityVoiceSettingId.IgnoreCodeBlocks),
+			insideCodeBlock: false
+		};
+
 		let totalOffset = 0;
 		let complete = false;
 		do {
 			const responseLength = response.response.toString().length;
-			const { chunk, offset } = this.parseNextChatResponseChunk(response, totalOffset);
+			const { chunk, offset } = this.parseNextChatResponseChunk(response, totalOffset, context);
 			totalOffset = offset;
 			complete = response.isComplete;
 
@@ -790,7 +801,7 @@ class ChatSynthesizerSessions {
 		} while (!token.isCancellationRequested && !complete);
 	}
 
-	private parseNextChatResponseChunk(response: IChatResponseModel, offset: number): { readonly chunk: string | undefined; readonly offset: number } {
+	private parseNextChatResponseChunk(response: IChatResponseModel, offset: number, context: IChatSyntheSizerContext): { readonly chunk: string | undefined; readonly offset: number } {
 		let chunk: string | undefined = undefined;
 
 		const text = response.response.toString();
@@ -804,12 +815,28 @@ class ChatSynthesizerSessions {
 			offset = res.offset;
 		}
 
+		if (chunk && context.ignoreCodeBlocks) {
+			chunk = this.filterCodeBlocks(chunk, context);
+		}
+
 		return {
 			chunk: chunk ? renderStringAsPlaintext({ value: chunk }) : chunk, // convert markdown to plain text
 			offset
 		};
 	}
 
+	private filterCodeBlocks(chunk: string, context: IChatSyntheSizerContext): string {
+		return chunk.split('\n')
+			.filter(line => {
+				if (line.trimStart().startsWith('```')) {
+					context.insideCodeBlock = !context.insideCodeBlock;
+					return false;
+				}
+				return !context.insideCodeBlock;
+			})
+			.join('\n');
+	}
+
 	stop(): void {
 		this.activeSession?.dispose(true);
 		this.activeSession = undefined;
diff --git a/src/vs/workbench/contrib/speech/common/speechService.ts b/src/vs/workbench/contrib/speech/common/speechService.ts
index 4df439533b5..03c9d1a305b 100644
--- a/src/vs/workbench/contrib/speech/common/speechService.ts
+++ b/src/vs/workbench/contrib/speech/common/speechService.ts
@@ -138,6 +138,7 @@ export const enum AccessibilityVoiceSettingId {
 	SpeechTimeout = 'accessibility.voice.speechTimeout',
 	AutoSynthesize = 'accessibility.voice.autoSynthesize',
 	SpeechLanguage = 'accessibility.voice.speechLanguage',
+	IgnoreCodeBlocks = 'accessibility.voice.ignoreCodeBlocks'
 }
 
 export const SPEECH_LANGUAGE_CONFIG = AccessibilityVoiceSettingId.SpeechLanguage;

From 2c7408dac485f923fefa6c9e8833f94f3a60261b Mon Sep 17 00:00:00 2001
From: Tomer Chachamu <tomer.chachamu@gmail.com>
Date: Thu, 12 Dec 2024 05:13:30 +0000
Subject: [PATCH 126/479] Fix revealing a notebook cell from the debugger
 stopping and revealing active statement (Fixes #225290) (#225292)

Co-authored-by: Don Jayamanne <don.jayamanne@outlook.com>
---
 .../contrib/notebook/common/notebookEditorInput.ts         | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/notebook/common/notebookEditorInput.ts b/src/vs/workbench/contrib/notebook/common/notebookEditorInput.ts
index e6fdd481218..92c066a28e7 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookEditorInput.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookEditorInput.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as glob from '../../../../base/common/glob.js';
-import { GroupIdentifier, ISaveOptions, IMoveResult, IRevertOptions, EditorInputCapabilities, Verbosity, IUntypedEditorInput, IFileLimitedEditorInputOptions } from '../../../common/editor.js';
+import { GroupIdentifier, ISaveOptions, IMoveResult, IRevertOptions, EditorInputCapabilities, Verbosity, IUntypedEditorInput, IFileLimitedEditorInputOptions, isResourceEditorInput } from '../../../common/editor.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { INotebookService, SimpleNotebookProviderInfo } from './notebookService.js';
 import { URI } from '../../../../base/common/uri.js';
@@ -13,7 +13,7 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { INotebookEditorModelResolverService } from './notebookEditorModelResolverService.js';
 import { IDisposable, IReference } from '../../../../base/common/lifecycle.js';
-import { CellEditType, IResolvedNotebookEditorModel } from './notebookCommon.js';
+import { CellEditType, CellUri, IResolvedNotebookEditorModel } from './notebookCommon.js';
 import { ILabelService } from '../../../../platform/label/common/label.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
@@ -358,6 +358,9 @@ export class NotebookEditorInput extends AbstractResourceEditorInput {
 		if (otherInput instanceof NotebookEditorInput) {
 			return this.viewType === otherInput.viewType && isEqual(this.resource, otherInput.resource);
 		}
+		if (isResourceEditorInput(otherInput) && otherInput.resource.scheme === CellUri.scheme) {
+			return isEqual(this.resource, CellUri.parse(otherInput.resource)?.notebook);
+		}
 		return false;
 	}
 }

From ebc661ee13acc1f00ca1223a93bf931e9f5d6491 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 12 Dec 2024 08:54:11 +0100
Subject: [PATCH 127/479] Rename IChatSyntheSizerContext to
 IChatSynthesizerContext for consistency (#235897)

---
 .../chat/electron-sandbox/actions/voiceChatActions.ts     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts b/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
index 1b55c9d89df..568f6a693cc 100644
--- a/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
+++ b/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
@@ -707,7 +707,7 @@ class ChatSynthesizerSessionController {
 	}
 }
 
-interface IChatSyntheSizerContext {
+interface IChatSynthesizerContext {
 	readonly ignoreCodeBlocks: boolean;
 	insideCodeBlock: boolean;
 }
@@ -774,7 +774,7 @@ class ChatSynthesizerSessions {
 	}
 
 	private async *nextChatResponseChunk(response: IChatResponseModel, token: CancellationToken): AsyncIterable<string> {
-		const context: IChatSyntheSizerContext = {
+		const context: IChatSynthesizerContext = {
 			ignoreCodeBlocks: this.configurationService.getValue<boolean>(AccessibilityVoiceSettingId.IgnoreCodeBlocks),
 			insideCodeBlock: false
 		};
@@ -801,7 +801,7 @@ class ChatSynthesizerSessions {
 		} while (!token.isCancellationRequested && !complete);
 	}
 
-	private parseNextChatResponseChunk(response: IChatResponseModel, offset: number, context: IChatSyntheSizerContext): { readonly chunk: string | undefined; readonly offset: number } {
+	private parseNextChatResponseChunk(response: IChatResponseModel, offset: number, context: IChatSynthesizerContext): { readonly chunk: string | undefined; readonly offset: number } {
 		let chunk: string | undefined = undefined;
 
 		const text = response.response.toString();
@@ -825,7 +825,7 @@ class ChatSynthesizerSessions {
 		};
 	}
 
-	private filterCodeBlocks(chunk: string, context: IChatSyntheSizerContext): string {
+	private filterCodeBlocks(chunk: string, context: IChatSynthesizerContext): string {
 		return chunk.split('\n')
 			.filter(line => {
 				if (line.trimStart().startsWith('```')) {

From 9b22156745c792eaffaa39d94b7dc88c259ef8b9 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 12 Dec 2024 09:24:43 +0100
Subject: [PATCH 128/479] chat - setup settings tweaks (#235900)

---
 src/vs/workbench/contrib/chat/browser/chatSetup.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index ee5c1d8ff0b..ba55f935c5e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -879,7 +879,7 @@ class ChatSetupWelcomeContent extends Disposable {
 		this.element.appendChild($('p')).appendChild(this._register(markdown.render(new MarkdownString(terms, { isTrusted: true }))).element);
 
 		// SKU Settings
-		const settings = localize({ key: 'settings', comment: ['{Locked="["}', '{Locked="]({0})"}', '{Locked="]({1})"}'] }, "Copilot may show [public code]({0}) suggestions and collect telemetry. You can change these [settings]({1}) at any time.", defaultChat.publicCodeMatchesUrl, defaultChat.manageSettingsUrl);
+		const settings = localize({ key: 'settings', comment: ['{Locked="["}', '{Locked="]({0})"}', '{Locked="]({1})"}'] }, "Copilot Free and Pro may show [public code]({0}) suggestions and we may use your data for product improvement. You can change these [settings]({1}) at any time.", defaultChat.publicCodeMatchesUrl, defaultChat.manageSettingsUrl);
 		const settingsContainer = this.element.appendChild($('p'));
 		settingsContainer.appendChild(this._register(markdown.render(new MarkdownString(settings, { isTrusted: true }))).element);
 

From c8379a73fffb9e4ed5ccb753e91611c6307e6d9f Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 12 Dec 2024 09:47:48 +0100
Subject: [PATCH 129/479] Fix punctuation in quota exceeded messages for
 clarity (#235906)

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

diff --git a/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts b/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
index 87b4eb19f7f..51cee3588ca 100644
--- a/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
@@ -119,9 +119,9 @@ export class ChatQuotasService extends Disposable implements IChatQuotasService
 				let message: string;
 				const { chatQuotaExceeded, completionsQuotaExceeded } = that.quotas;
 				if (chatQuotaExceeded && !completionsQuotaExceeded) {
-					message = localize('chatQuotaExceeded', "You've run out of free chat messages. You still have free code completions available in the Copilot Free plan. These limits will reset on {0}", dateFormatter.format(that.quotas.quotaResetDate));
+					message = localize('chatQuotaExceeded', "You've run out of free chat messages. You still have free code completions available in the Copilot Free plan. These limits will reset on {0}.", dateFormatter.format(that.quotas.quotaResetDate));
 				} else if (completionsQuotaExceeded && !chatQuotaExceeded) {
-					message = localize('completionsQuotaExceeded', "You've run out of free code completions. You still have free chat messages available in the Copilot Free plan. These limits will reset on {0}", dateFormatter.format(that.quotas.quotaResetDate));
+					message = localize('completionsQuotaExceeded', "You've run out of free code completions. You still have free chat messages available in the Copilot Free plan. These limits will reset on {0}.", dateFormatter.format(that.quotas.quotaResetDate));
 				} else {
 					message = localize('chatAndCompletionsQuotaExceeded', "You've reached the limit of the Copilot Free plan. These limits will reset on {0}.", dateFormatter.format(that.quotas.quotaResetDate));
 				}

From 516c29d18e1dd58359a4c7d38bd5df6cd00512ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Thu, 12 Dec 2024 09:50:44 +0100
Subject: [PATCH 130/479] fixes #235895 (#235905)

---
 src/vs/workbench/contrib/update/browser/update.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/update/browser/update.ts b/src/vs/workbench/contrib/update/browser/update.ts
index 2ff75f4594c..d824df32c93 100644
--- a/src/vs/workbench/contrib/update/browser/update.ts
+++ b/src/vs/workbench/contrib/update/browser/update.ts
@@ -259,13 +259,13 @@ export class UpdateContribution extends Disposable implements IWorkbenchContribu
 		if (state.type === StateType.AvailableForDownload || state.type === StateType.Downloaded || state.type === StateType.Ready) {
 			badge = new NumberBadge(1, () => nls.localize('updateIsReady', "New {0} update available.", this.productService.nameShort));
 		} else if (state.type === StateType.CheckingForUpdates) {
-			badge = new ProgressBadge(() => nls.localize('checkingForUpdates', "Checking for Updates..."));
+			badge = new ProgressBadge(() => nls.localize('checkingForUpdates', "Checking for {0} updates...", this.productService.nameShort));
 			priority = 1;
 		} else if (state.type === StateType.Downloading) {
-			badge = new ProgressBadge(() => nls.localize('downloading', "Downloading..."));
+			badge = new ProgressBadge(() => nls.localize('downloading', "Downloading {0} update...", this.productService.nameShort));
 			priority = 1;
 		} else if (state.type === StateType.Updating) {
-			badge = new ProgressBadge(() => nls.localize('updating', "Updating..."));
+			badge = new ProgressBadge(() => nls.localize('updating', "Updating {0}...", this.productService.nameShort));
 			priority = 1;
 		}
 
@@ -427,7 +427,7 @@ export class UpdateContribution extends Disposable implements IWorkbenchContribu
 			group: '7_update',
 			command: {
 				id: 'update.checking',
-				title: nls.localize('checkingForUpdates', "Checking for Updates..."),
+				title: nls.localize('checkingForUpdates2', "Checking for Updates..."),
 				precondition: ContextKeyExpr.false()
 			},
 			when: CONTEXT_UPDATE_STATE.isEqualTo(StateType.CheckingForUpdates)

From 82d1ef937686fcb7bca342410f9071f84fbdb3a1 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Thu, 12 Dec 2024 10:42:39 +0100
Subject: [PATCH 131/479] Render expanded hovers always on the same side, so
 does not jump around (#235851)

* add code always rendered on one side

* update size after contents change

* not allowing recomputation on verbosity request
---
 .../editor/contrib/hover/browser/contentHoverRendered.ts  | 2 +-
 src/vs/editor/contrib/hover/browser/contentHoverWidget.ts | 6 ++++--
 .../contrib/hover/browser/contentHoverWidgetWrapper.ts    | 6 +++---
 src/vs/editor/contrib/hover/browser/hoverTypes.ts         | 6 +++++-
 .../contrib/hover/browser/markdownHoverParticipant.ts     | 8 ++++----
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/vs/editor/contrib/hover/browser/contentHoverRendered.ts b/src/vs/editor/contrib/hover/browser/contentHoverRendered.ts
index 81ccfcbc60b..32d72a6693e 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverRendered.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverRendered.ts
@@ -408,7 +408,7 @@ class RenderedContentHoverParts extends Disposable {
 				this._context.focus();
 			}
 		}
-		this._context.onContentsChanged();
+		this._context.onContentsChanged({ allowPositionPreferenceRecomputation: false });
 	}
 
 	public doesHoverAtIndexSupportVerbosityAction(index: number, action: HoverVerbosityAction): boolean {
diff --git a/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts b/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts
index ffb8aaa9f11..063e4d108fe 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts
@@ -17,6 +17,7 @@ import { getHoverAccessibleViewHint, HoverWidget } from '../../../../base/browse
 import { PositionAffinity } from '../../../common/model.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { RenderedContentHover } from './contentHoverRendered.js';
+import { IContentsChangeOptions } from './hoverTypes.js';
 
 const HORIZONTAL_SCROLLING_BY = 30;
 
@@ -392,7 +393,7 @@ export class ContentHoverWidget extends ResizableContentWidget {
 		this._resizableNode.minSize = new dom.Dimension(width, this._minimumSize.height);
 	}
 
-	public onContentsChanged(): void {
+	public onContentsChanged(opts: IContentsChangeOptions = { allowPositionPreferenceRecomputation: true }): void {
 		this._removeConstraintsRenderNormally();
 		const contentsDomNode = this._hover.contentsDomNode;
 
@@ -407,8 +408,9 @@ export class ContentHoverWidget extends ResizableContentWidget {
 		this._contentWidth = width;
 		this._updateMinimumWidth();
 		this._resizableNode.layout(height, width);
+		this._updateResizableNodeMaxDimensions();
 
-		if (this._renderedHover?.showAtPosition) {
+		if (opts.allowPositionPreferenceRecomputation && this._renderedHover?.showAtPosition) {
 			const widgetHeight = dom.getTotalHeight(this._hover.containerDomNode);
 			this._positionPreference = this._findPositionPreference(widgetHeight, this._renderedHover.showAtPosition);
 		}
diff --git a/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts b/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts
index ad9a9920967..d8439510336 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts
@@ -11,7 +11,7 @@ import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
 import { TokenizationRegistry } from '../../../common/languages.js';
 import { HoverOperation, HoverResult, HoverStartMode, HoverStartSource } from './hoverOperation.js';
-import { HoverAnchor, HoverParticipantRegistry, HoverRangeAnchor, IEditorHoverContext, IEditorHoverParticipant, IHoverPart, IHoverWidget } from './hoverTypes.js';
+import { HoverAnchor, HoverParticipantRegistry, HoverRangeAnchor, IContentsChangeOptions, IEditorHoverContext, IEditorHoverParticipant, IHoverPart, IHoverWidget } from './hoverTypes.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { HoverVerbosityAction } from '../../../common/standalone/standaloneEnums.js';
@@ -224,9 +224,9 @@ export class ContentHoverWidgetWrapper extends Disposable implements IHoverWidge
 		const hide = () => {
 			this.hide();
 		};
-		const onContentsChanged = () => {
+		const onContentsChanged = (opts: IContentsChangeOptions) => {
 			this._onContentsChanged.fire();
-			this._contentHoverWidget.onContentsChanged();
+			this._contentHoverWidget.onContentsChanged(opts);
 		};
 		const setMinimumDimensions = (dimensions: dom.Dimension) => {
 			this._contentHoverWidget.setMinimumDimensions(dimensions);
diff --git a/src/vs/editor/contrib/hover/browser/hoverTypes.ts b/src/vs/editor/contrib/hover/browser/hoverTypes.ts
index ad5442f1fa2..babdf0f5556 100644
--- a/src/vs/editor/contrib/hover/browser/hoverTypes.ts
+++ b/src/vs/editor/contrib/hover/browser/hoverTypes.ts
@@ -95,11 +95,15 @@ export interface IEditorHoverColorPickerWidget {
 	layout(): void;
 }
 
+export interface IContentsChangeOptions {
+	allowPositionPreferenceRecomputation: boolean;
+}
+
 export interface IEditorHoverContext {
 	/**
 	 * The contents rendered inside the fragment have been changed, which means that the hover should relayout.
 	 */
-	onContentsChanged(): void;
+	onContentsChanged(opts?: IContentsChangeOptions): void;
 	/**
 	 * Set the minimum dimensions of the resizable hover
 	 */
diff --git a/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts b/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts
index 3fd5876cfe4..e98b45195e2 100644
--- a/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts
+++ b/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts
@@ -15,7 +15,7 @@ import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { IModelDecoration, ITextModel } from '../../../common/model.js';
 import { ILanguageService } from '../../../common/languages/language.js';
-import { HoverAnchor, HoverAnchorType, HoverRangeAnchor, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart, IRenderedHoverPart, IRenderedHoverParts, RenderedHoverParts } from './hoverTypes.js';
+import { HoverAnchor, HoverAnchorType, HoverRangeAnchor, IContentsChangeOptions, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart, IRenderedHoverPart, IRenderedHoverParts, RenderedHoverParts } from './hoverTypes.js';
 import * as nls from '../../../../nls.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
@@ -245,9 +245,9 @@ class MarkdownRenderedHoverParts implements IRenderedHoverParts<MarkdownHover> {
 		private readonly _keybindingService: IKeybindingService,
 		private readonly _hoverService: IHoverService,
 		private readonly _configurationService: IConfigurationService,
-		private readonly _onFinishedRendering: () => void,
+		private readonly onContentsChanged: (opts?: IContentsChangeOptions | undefined) => void,
 	) {
-		this.renderedHoverParts = this._renderHoverParts(hoverParts, hoverPartsContainer, this._onFinishedRendering);
+		this.renderedHoverParts = this._renderHoverParts(hoverParts, hoverPartsContainer, this.onContentsChanged);
 		this._disposables.add(toDisposable(() => {
 			this.renderedHoverParts.forEach(renderedHoverPart => {
 				renderedHoverPart.dispose();
@@ -416,7 +416,7 @@ class MarkdownRenderedHoverParts implements IRenderedHoverParts<MarkdownHover> {
 		if (index >= this.renderedHoverParts.length || index < 0) {
 			return undefined;
 		}
-		const renderedHoverPart = this._renderHoverPart(hoverPart, this._onFinishedRendering);
+		const renderedHoverPart = this._renderHoverPart(hoverPart, () => this.onContentsChanged({ allowPositionPreferenceRecomputation: false }));
 		const currentRenderedHoverPart = this.renderedHoverParts[index];
 		const currentRenderedMarkdown = currentRenderedHoverPart.hoverElement;
 		const renderedMarkdown = renderedHoverPart.hoverElement;

From 492692eed34e610999cb5d481b137fc035e68dbe Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 12 Dec 2024 10:44:59 +0100
Subject: [PATCH 132/479] Refactor chat setup context keys for consistency and
 clarity (#235909)

---
 .../contrib/chat/browser/chatSetup.ts         |  4 +--
 .../contrib/chat/browser/chatViewPane.ts      | 25 +++----------------
 .../contrib/chat/common/chatContextKeys.ts    | 21 +++++++++++++++-
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index ba55f935c5e..37544c7ec93 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -52,7 +52,7 @@ import { IChatAgentService } from '../common/chatAgents.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { CHAT_CATEGORY } from './actions/chatActions.js';
 import { ChatViewId, EditsViewId, ensureSideBarChatViewSize, IChatWidget, showChatView, showEditsView } from './chat.js';
-import { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID, SetupWelcomeViewCondition } from './chatViewPane.js';
+import { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID } from './chatViewPane.js';
 import { ChatViewsWelcomeExtensions, IChatViewsWelcomeContributionRegistry } from './viewsWelcome/chatViewsWelcome.js';
 import { IChatQuotasService } from './chatQuotasService.js';
 import { mainWindow } from '../../../../base/browser/window.js';
@@ -122,7 +122,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 	private registerChatWelcome(): void {
 		Registry.as<IChatViewsWelcomeContributionRegistry>(ChatViewsWelcomeExtensions.ChatViewsWelcomeRegistry).register({
 			title: localize('welcomeChat', "Welcome to Copilot"),
-			when: SetupWelcomeViewCondition,
+			when: ChatContextKeys.SetupViewCondition,
 			icon: Codicon.copilotLarge,
 			content: disposables => disposables.add(this.instantiationService.createInstance(ChatSetupWelcomeContent, this.controller.value, this.context)).element,
 		});
diff --git a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
index 8e0e8bd85ff..742ae8cbf6b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatViewPane.ts
@@ -8,7 +8,7 @@ import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { MarshalledId } from '../../../../base/common/marshallingIds.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -104,7 +104,7 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 		}));
 
 		this._register(this.contextKeyService.onDidChangeContext(e => {
-			if (e.affectsSome(SetupWelcomeViewKeys)) {
+			if (e.affectsSome(ChatContextKeys.SetupViewKeys)) {
 				this._onDidChangeViewWelcomeState.fire();
 			}
 		}));
@@ -139,7 +139,7 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 	}
 
 	override shouldShowWelcome(): boolean {
-		const showSetup = this.contextKeyService.contextMatchesRules(SetupWelcomeViewCondition);
+		const showSetup = this.contextKeyService.contextMatchesRules(ChatContextKeys.SetupViewCondition);
 		const noPersistedSessions = !this.chatService.hasSessions();
 		const shouldShow = this.didUnregisterProvider || !this._widget?.viewModel && noPersistedSessions || this.defaultParticipantRegistrationFailed || showSetup;
 		this.logService.trace(`ChatViewPane#shouldShowWelcome(${this.chatOptions.location}) = ${shouldShow}: didUnregister=${this.didUnregisterProvider} || noViewModel:${!this._widget?.viewModel} && noPersistedSessions=${noPersistedSessions} || defaultParticipantRegistrationFailed=${this.defaultParticipantRegistrationFailed} || showSetup=${showSetup}`);
@@ -279,22 +279,3 @@ export class ChatViewPane extends ViewPane implements IViewWelcomeDelegate {
 		}
 	}
 }
-
-export const SetupWelcomeViewKeys = new Set([ChatContextKeys.Setup.triggered.key, ChatContextKeys.Setup.installed.key, ChatContextKeys.Setup.signedOut.key, ChatContextKeys.Setup.canSignUp.key]);
-export const SetupWelcomeViewCondition = ContextKeyExpr.and(
-	ContextKeyExpr.has('config.chat.experimental.offerSetup'),
-	ContextKeyExpr.or(
-		ContextKeyExpr.and(
-			ChatContextKeys.Setup.triggered,
-			ChatContextKeys.Setup.installed.negate()
-		),
-		ContextKeyExpr.and(
-			ChatContextKeys.Setup.canSignUp,
-			ChatContextKeys.Setup.installed
-		),
-		ContextKeyExpr.and(
-			ChatContextKeys.Setup.signedOut,
-			ChatContextKeys.Setup.installed
-		)
-	)
-)!;
diff --git a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
index de13af60b8b..047a5824af2 100644
--- a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
+++ b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { localize } from '../../../../nls.js';
-import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { ChatAgentLocation } from './chatAgents.js';
 
 export namespace ChatContextKeys {
@@ -51,6 +51,25 @@ export namespace ChatContextKeys {
 		installed: new RawContextKey<boolean>('chatSetupInstalled', false, true),  	// True when the chat extension is installed.
 	};
 
+	export const SetupViewKeys = new Set([ChatContextKeys.Setup.triggered.key, ChatContextKeys.Setup.installed.key, ChatContextKeys.Setup.signedOut.key, ChatContextKeys.Setup.canSignUp.key]);
+	export const SetupViewCondition = ContextKeyExpr.and(
+		ContextKeyExpr.has('config.chat.experimental.offerSetup'),
+		ContextKeyExpr.or(
+			ContextKeyExpr.and(
+				ChatContextKeys.Setup.triggered,
+				ChatContextKeys.Setup.installed.negate()
+			),
+			ContextKeyExpr.and(
+				ChatContextKeys.Setup.canSignUp,
+				ChatContextKeys.Setup.installed
+			),
+			ContextKeyExpr.and(
+				ChatContextKeys.Setup.signedOut,
+				ChatContextKeys.Setup.installed
+			)
+		)
+	)!;
+
 	export const chatQuotaExceeded = new RawContextKey<boolean>('chatQuotaExceeded', false, true);
 	export const completionsQuotaExceeded = new RawContextKey<boolean>('completionsQuotaExceeded', false, true);
 }

From 39b0575e393f0897d28574df0fa0da23ef3006be Mon Sep 17 00:00:00 2001
From: Remco Haszing <remcohaszing@gmail.com>
Date: Thu, 12 Dec 2024 10:46:25 +0100
Subject: [PATCH 133/479] Mark bun.lock as jsonc

Bun added support for a new lockfile format using the jsonc language. It
uses an unconventional file extension, but it would be nice if VSCode
understands it by default anyway.

See https://github.com/oven-sh/bun/pull/15705
---
 extensions/json/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extensions/json/package.json b/extensions/json/package.json
index 8844345d672..63ee0078c6b 100644
--- a/extensions/json/package.json
+++ b/extensions/json/package.json
@@ -62,6 +62,7 @@
         ],
         "filenames": [
           "babel.config.json",
+          "bun.lock",
           ".babelrc.json",
           ".ember-cli",
           "typedoc.json"

From 92fbd7a2288ea3d14faded3d765b7094cc30c3b0 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Thu, 12 Dec 2024 10:50:44 +0100
Subject: [PATCH 134/479] fix #114994 (#235910)

---
 .../workbench/browser/parts/views/viewPaneContainer.ts   | 9 ++++++++-
 src/vs/workbench/browser/parts/views/viewsViewlet.ts     | 6 ++++--
 src/vs/workbench/contrib/debug/browser/debugViewlet.ts   | 4 +++-
 .../contrib/extensions/browser/extensionsViewlet.ts      | 5 +++--
 .../workbench/contrib/files/browser/explorerViewlet.ts   | 6 ++++--
 src/vs/workbench/contrib/remote/browser/remote.ts        | 5 +++--
 .../contrib/scm/browser/scmViewPaneContainer.ts          | 6 ++++--
 .../contrib/testing/browser/testingViewPaneContainer.ts  | 4 +++-
 8 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts b/src/vs/workbench/browser/parts/views/viewPaneContainer.ts
index 1ca314af9d2..bdac0037f3f 100644
--- a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts
+++ b/src/vs/workbench/browser/parts/views/viewPaneContainer.ts
@@ -41,6 +41,7 @@ import { FocusedViewContext } from '../../../common/contextkeys.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { isHorizontal, IWorkbenchLayoutService, LayoutSettings } from '../../../services/layout/browser/layoutService.js';
 import { IBaseActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 
 export const ViewsSubMenu = new MenuId('Views');
 MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
@@ -380,6 +381,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 		@IStorageService protected storageService: IStorageService,
 		@IWorkspaceContextService protected contextService: IWorkspaceContextService,
 		@IViewDescriptorService protected viewDescriptorService: IViewDescriptorService,
+		@ILogService protected readonly logService: ILogService,
 	) {
 
 		super(id, themeService, storageService);
@@ -793,7 +795,12 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 					singleViewPaneContainerTitle: viewDescriptor.singleViewPaneContainerTitle,
 				});
 
-			pane.render();
+			try {
+				pane.render();
+			} catch (error) {
+				this.logService.error(`Fail to render view ${viewDescriptor.id}`, error);
+				continue;
+			}
 			const contextMenuDisposable = addDisposableListener(pane.draggableElement, 'contextmenu', e => {
 				e.stopPropagation();
 				e.preventDefault();
diff --git a/src/vs/workbench/browser/parts/views/viewsViewlet.ts b/src/vs/workbench/browser/parts/views/viewsViewlet.ts
index b08338ccac6..6afc8eb55d8 100644
--- a/src/vs/workbench/browser/parts/views/viewsViewlet.ts
+++ b/src/vs/workbench/browser/parts/views/viewsViewlet.ts
@@ -17,6 +17,7 @@ import { Event } from '../../../../base/common/event.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
 import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 
 export interface IViewletViewOptions extends IViewPaneOptions {
 	readonly fromExtensionId?: ExtensionIdentifier;
@@ -39,10 +40,11 @@ export abstract class FilterViewPaneContainer extends ViewPaneContainer {
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@IExtensionService extensionService: IExtensionService,
 		@IWorkspaceContextService contextService: IWorkspaceContextService,
-		@IViewDescriptorService viewDescriptorService: IViewDescriptorService
+		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
+		@ILogService logService: ILogService,
 	) {
 
-		super(viewletId, { mergeViewWithContainerWhenSingleView: false }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService);
+		super(viewletId, { mergeViewWithContainerWhenSingleView: false }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService, logService);
 		this._register(onDidChangeFilterValue(newFilterValue => {
 			this.filterValue = newFilterValue;
 			this.onFilterChanged(newFilterValue);
diff --git a/src/vs/workbench/contrib/debug/browser/debugViewlet.ts b/src/vs/workbench/contrib/debug/browser/debugViewlet.ts
index 6db69ee2dfb..10b8d244b2e 100644
--- a/src/vs/workbench/contrib/debug/browser/debugViewlet.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugViewlet.ts
@@ -35,6 +35,7 @@ import { IExtensionService } from '../../../services/extensions/common/extension
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
 import { IBaseActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 
 export class DebugViewPaneContainer extends ViewPaneContainer {
 
@@ -60,8 +61,9 @@ export class DebugViewPaneContainer extends ViewPaneContainer {
 		@IContextViewService private readonly contextViewService: IContextViewService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
+		@ILogService logService: ILogService,
 	) {
-		super(VIEWLET_ID, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService);
+		super(VIEWLET_ID, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService, logService);
 
 		// When there are potential updates to the docked debug toolbar we need to update it
 		this._register(this.debugService.onDidChangeState(state => this.onDebugServiceStateChange(state)));
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
index 5fafa931213..7ae9f77168d 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
@@ -525,9 +525,10 @@ export class ExtensionsViewPaneContainer extends ViewPaneContainer implements IE
 		@IExtensionService extensionService: IExtensionService,
 		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
 		@IPreferencesService private readonly preferencesService: IPreferencesService,
-		@ICommandService private readonly commandService: ICommandService
+		@ICommandService private readonly commandService: ICommandService,
+		@ILogService logService: ILogService,
 	) {
-		super(VIEWLET_ID, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService);
+		super(VIEWLET_ID, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService, logService);
 
 		this.searchDelayer = new Delayer(500);
 		this.extensionsSearchValueContextKey = ExtensionsSearchValueContext.bindTo(contextKeyService);
diff --git a/src/vs/workbench/contrib/files/browser/explorerViewlet.ts b/src/vs/workbench/contrib/files/browser/explorerViewlet.ts
index 18b860dbafe..48d50144a3b 100644
--- a/src/vs/workbench/contrib/files/browser/explorerViewlet.ts
+++ b/src/vs/workbench/contrib/files/browser/explorerViewlet.ts
@@ -38,6 +38,7 @@ import { isMacintosh, isWeb } from '../../../../base/common/platform.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { isMouseEvent } from '../../../../base/browser/dom.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 
 const explorerViewIcon = registerIcon('explorer-view-icon', Codicon.files, localize('explorerViewIcon', 'View icon of the explorer view.'));
 const openEditorsViewIcon = registerIcon('open-editors-view-icon', Codicon.book, localize('openEditorsIcon', 'View icon of the open editors view.'));
@@ -167,10 +168,11 @@ export class ExplorerViewPaneContainer extends ViewPaneContainer {
 		@IThemeService themeService: IThemeService,
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@IExtensionService extensionService: IExtensionService,
-		@IViewDescriptorService viewDescriptorService: IViewDescriptorService
+		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
+		@ILogService logService: ILogService,
 	) {
 
-		super(VIEWLET_ID, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService);
+		super(VIEWLET_ID, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService, logService);
 
 		this.viewletVisibleContextKey = ExplorerViewletVisibleContext.bindTo(contextKeyService);
 		this._register(this.contextService.onDidChangeWorkspaceName(e => this.updateTitleArea()));
diff --git a/src/vs/workbench/contrib/remote/browser/remote.ts b/src/vs/workbench/contrib/remote/browser/remote.ts
index 8fef141d4e7..d2d6835f722 100644
--- a/src/vs/workbench/contrib/remote/browser/remote.ts
+++ b/src/vs/workbench/contrib/remote/browser/remote.ts
@@ -540,9 +540,10 @@ class RemoteViewPaneContainer extends FilterViewPaneContainer implements IViewMo
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@IExtensionService extensionService: IExtensionService,
 		@IRemoteExplorerService private readonly remoteExplorerService: IRemoteExplorerService,
-		@IViewDescriptorService viewDescriptorService: IViewDescriptorService
+		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
+		@ILogService logService: ILogService,
 	) {
-		super(VIEWLET_ID, remoteExplorerService.onDidChangeTargetType, configurationService, layoutService, telemetryService, storageService, instantiationService, themeService, contextMenuService, extensionService, contextService, viewDescriptorService);
+		super(VIEWLET_ID, remoteExplorerService.onDidChangeTargetType, configurationService, layoutService, telemetryService, storageService, instantiationService, themeService, contextMenuService, extensionService, contextService, viewDescriptorService, logService);
 		this.addConstantViewDescriptors([this.helpPanelDescriptor]);
 		this._register(this.remoteSwitcher = this.instantiationService.createInstance(SwitchRemoteViewItem));
 		this.remoteExplorerService.onDidChangeHelpInformation(extensions => {
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.ts b/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.ts
index 6f6fccf828b..5f813a68b26 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.ts
@@ -17,6 +17,7 @@ import { IExtensionService } from '../../../services/extensions/common/extension
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { IViewDescriptorService } from '../../../common/views.js';
 import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 
 export class SCMViewPaneContainer extends ViewPaneContainer {
 
@@ -30,9 +31,10 @@ export class SCMViewPaneContainer extends ViewPaneContainer {
 		@IConfigurationService configurationService: IConfigurationService,
 		@IExtensionService extensionService: IExtensionService,
 		@IWorkspaceContextService contextService: IWorkspaceContextService,
-		@IViewDescriptorService viewDescriptorService: IViewDescriptorService
+		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
+		@ILogService logService: ILogService,
 	) {
-		super(VIEWLET_ID, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService);
+		super(VIEWLET_ID, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService, logService);
 	}
 
 	override create(parent: HTMLElement): void {
diff --git a/src/vs/workbench/contrib/testing/browser/testingViewPaneContainer.ts b/src/vs/workbench/contrib/testing/browser/testingViewPaneContainer.ts
index 60f217ad9e4..4c179a5669b 100644
--- a/src/vs/workbench/contrib/testing/browser/testingViewPaneContainer.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingViewPaneContainer.ts
@@ -16,6 +16,7 @@ import { IViewDescriptorService } from '../../../common/views.js';
 import { Testing } from '../common/constants.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 
 export class TestingViewPaneContainer extends ViewPaneContainer {
 
@@ -30,8 +31,9 @@ export class TestingViewPaneContainer extends ViewPaneContainer {
 		@IExtensionService extensionService: IExtensionService,
 		@IWorkspaceContextService contextService: IWorkspaceContextService,
 		@IViewDescriptorService viewDescriptorService: IViewDescriptorService,
+		@ILogService logService: ILogService,
 	) {
-		super(Testing.ViewletId, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService);
+		super(Testing.ViewletId, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService, logService);
 	}
 
 	override create(parent: HTMLElement): void {

From 494787526e40d1b8f6782ff9975ed64c43499928 Mon Sep 17 00:00:00 2001
From: Remco Haszing <remcohaszing@gmail.com>
Date: Thu, 12 Dec 2024 10:54:34 +0100
Subject: [PATCH 135/479] Allow the .ndjson extension for the jsonl language
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

NDJSON is a specification that is essentially the same thing as JSON
lines. The spec can be found on https://github.com/ndjson/ndjson-spec.

The NDJSON website is down. The project seems pretty much dead. The
status is best described by this comment:
https://github.com/ndjson/ndjson-spec/issues/35#issuecomment-1285673417

However, this doesn’t mean there aren’t any `.ndjson` files out there.
This changes adds `.ndjson` to the list of `jsonl` file extensions.
---
 extensions/json/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extensions/json/package.json b/extensions/json/package.json
index 8844345d672..6bc5311740e 100644
--- a/extensions/json/package.json
+++ b/extensions/json/package.json
@@ -74,7 +74,8 @@
           "JSON Lines"
         ],
         "extensions": [
-          ".jsonl"
+          ".jsonl",
+          ".ndjson"
         ],
         "filenames": [],
         "configuration": "./language-configuration.json"

From 87d4b889cc311e95e7bef84080fdca96e24b89d6 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Thu, 12 Dec 2024 10:54:53 +0100
Subject: [PATCH 136/479] [Bug] Certain inline codeblocks are not displayed in
 release notes (#235911)

Fixes #235886
---
 src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts b/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
index e31ef89c55b..d8c9fbd63bb 100644
--- a/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
+++ b/src/vs/workbench/contrib/update/browser/releaseNotesEditor.ts
@@ -288,10 +288,6 @@ export class ReleaseNotesManager {
 
 					/* codesetting */
 
-					code:has(.codesetting)+code:not(:has(.codesetting)) {
-						display: none;
-					}
-
 					code:has(.codesetting) {
 						background-color: var(--vscode-textPreformat-background);
 						color: var(--vscode-textPreformat-foreground);

From 0b7b0c3ca5c917f08e858f1a620df7c9b2de02fe Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Thu, 12 Dec 2024 11:02:57 +0100
Subject: [PATCH 137/479] Fix `setting()` showing in release notes for
 non-existant settings (#235914)

---
 .../contrib/markdown/browser/markdownSettingRenderer.ts         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/markdown/browser/markdownSettingRenderer.ts b/src/vs/workbench/contrib/markdown/browser/markdownSettingRenderer.ts
index c2d223869d9..14dfabbd451 100644
--- a/src/vs/workbench/contrib/markdown/browser/markdownSettingRenderer.ts
+++ b/src/vs/workbench/contrib/markdown/browser/markdownSettingRenderer.ts
@@ -121,7 +121,7 @@ export class SimpleSettingRenderer {
 	private render(settingId: string, newValue: string): string | undefined {
 		const setting = this.getSetting(settingId);
 		if (!setting) {
-			return '';
+			return `<code>${settingId}</code>`;
 		}
 
 		return this.renderSetting(setting, newValue);

From fda1af2e8fe691a2a222d1d0100c91bfeb6b8027 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Thu, 12 Dec 2024 11:28:53 +0100
Subject: [PATCH 138/479] [theme] avoid flashing when starting up with a new OS
 color scheme (#235913)

* avoid flickering when autoDetectColorScheme is on

* update
---
 src/vs/platform/theme/common/theme.ts         |   8 +
 src/vs/platform/theme/common/themeService.ts  |  14 +-
 .../theme/electron-main/themeMainService.ts   |  58 +++++---
 .../themes/browser/themes.contribution.ts     | 137 +-----------------
 .../themes/browser/workbenchThemeService.ts   |  29 ++--
 .../services/themes/common/colorThemeData.ts  |  16 +-
 .../themes/common/themeExtensionPoints.ts     |   7 +-
 .../themes/common/workbenchThemeService.ts    |  10 +-
 .../nativeHostColorSchemeService.ts           |  20 +--
 9 files changed, 80 insertions(+), 219 deletions(-)

diff --git a/src/vs/platform/theme/common/theme.ts b/src/vs/platform/theme/common/theme.ts
index 856b2f12eb5..0f298890998 100644
--- a/src/vs/platform/theme/common/theme.ts
+++ b/src/vs/platform/theme/common/theme.ts
@@ -13,6 +13,14 @@ export enum ColorScheme {
 	HIGH_CONTRAST_LIGHT = 'hcLight'
 }
 
+export enum ThemeTypeSelector {
+	VS = 'vs',
+	VS_DARK = 'vs-dark',
+	HC_BLACK = 'hc-black',
+	HC_LIGHT = 'hc-light'
+}
+
+
 export function isHighContrast(scheme: ColorScheme): boolean {
 	return scheme === ColorScheme.HIGH_CONTRAST_DARK || scheme === ColorScheme.HIGH_CONTRAST_LIGHT;
 }
diff --git a/src/vs/platform/theme/common/themeService.ts b/src/vs/platform/theme/common/themeService.ts
index cf850e7726e..bca5b3b3b3e 100644
--- a/src/vs/platform/theme/common/themeService.ts
+++ b/src/vs/platform/theme/common/themeService.ts
@@ -12,7 +12,7 @@ import { createDecorator } from '../../instantiation/common/instantiation.js';
 import * as platform from '../../registry/common/platform.js';
 import { ColorIdentifier } from './colorRegistry.js';
 import { IconContribution, IconDefinition } from './iconRegistry.js';
-import { ColorScheme } from './theme.js';
+import { ColorScheme, ThemeTypeSelector } from './theme.js';
 
 export const IThemeService = createDecorator<IThemeService>('themeService');
 
@@ -23,12 +23,12 @@ export function themeColorFromId(id: ColorIdentifier) {
 export const FileThemeIcon = Codicon.file;
 export const FolderThemeIcon = Codicon.folder;
 
-export function getThemeTypeSelector(type: ColorScheme): string {
+export function getThemeTypeSelector(type: ColorScheme): ThemeTypeSelector {
 	switch (type) {
-		case ColorScheme.DARK: return 'vs-dark';
-		case ColorScheme.HIGH_CONTRAST_DARK: return 'hc-black';
-		case ColorScheme.HIGH_CONTRAST_LIGHT: return 'hc-light';
-		default: return 'vs';
+		case ColorScheme.DARK: return ThemeTypeSelector.VS_DARK;
+		case ColorScheme.HIGH_CONTRAST_DARK: return ThemeTypeSelector.HC_BLACK;
+		case ColorScheme.HIGH_CONTRAST_LIGHT: return ThemeTypeSelector.HC_LIGHT;
+		default: return ThemeTypeSelector.VS;
 	}
 }
 
@@ -208,7 +208,7 @@ export class Themable extends Disposable {
 
 export interface IPartsSplash {
 	zoomLevel: number | undefined;
-	baseTheme: string;
+	baseTheme: ThemeTypeSelector;
 	colorInfo: {
 		background: string;
 		foreground: string | undefined;
diff --git a/src/vs/platform/theme/electron-main/themeMainService.ts b/src/vs/platform/theme/electron-main/themeMainService.ts
index aea7ebbb82b..3cc4fb246e1 100644
--- a/src/vs/platform/theme/electron-main/themeMainService.ts
+++ b/src/vs/platform/theme/electron-main/themeMainService.ts
@@ -12,6 +12,7 @@ import { createDecorator } from '../../instantiation/common/instantiation.js';
 import { IStateService } from '../../state/node/state.js';
 import { IPartsSplash } from '../common/themeService.js';
 import { IColorScheme } from '../../window/common/window.js';
+import { ThemeTypeSelector } from '../common/theme.js';
 
 // These default colors match our default themes
 // editor background color ("Dark Modern", etc...)
@@ -26,6 +27,7 @@ const THEME_WINDOW_SPLASH = 'windowSplash';
 
 namespace ThemeSettings {
 	export const DETECT_COLOR_SCHEME = 'window.autoDetectColorScheme';
+	export const DETECT_HC = 'window.autoDetectHighContrast';
 	export const SYSTEM_COLOR_THEME = 'window.systemColorTheme';
 }
 
@@ -82,9 +84,9 @@ export class ThemeMainService extends Disposable implements IThemeMainService {
 					electron.nativeTheme.themeSource = 'light';
 					break;
 				case 'auto':
-					switch (this.getBaseTheme()) {
-						case 'vs': electron.nativeTheme.themeSource = 'light'; break;
-						case 'vs-dark': electron.nativeTheme.themeSource = 'dark'; break;
+					switch (this.getPreferredBaseTheme() ?? this.getStoredBaseTheme()) {
+						case ThemeTypeSelector.VS: electron.nativeTheme.themeSource = 'light'; break;
+						case ThemeTypeSelector.VS_DARK: electron.nativeTheme.themeSource = 'dark'; break;
 						default: electron.nativeTheme.themeSource = 'system';
 					}
 					break;
@@ -98,7 +100,7 @@ export class ThemeMainService extends Disposable implements IThemeMainService {
 
 	getColorScheme(): IColorScheme {
 		if (isWindows) {
-			// high contrast is refelected by the shouldUseInvertedColorScheme property
+			// high contrast is reflected by the shouldUseInvertedColorScheme property
 			if (electron.nativeTheme.shouldUseHighContrastColors) {
 				// shouldUseInvertedColorScheme is dark, !shouldUseInvertedColorScheme is light
 				return { dark: electron.nativeTheme.shouldUseInvertedColorScheme, highContrast: true };
@@ -120,32 +122,44 @@ export class ThemeMainService extends Disposable implements IThemeMainService {
 		};
 	}
 
-	getBackgroundColor(): string {
+	getPreferredBaseTheme(): ThemeTypeSelector | undefined {
 		const colorScheme = this.getColorScheme();
-		if (colorScheme.highContrast && this.configurationService.getValue('window.autoDetectHighContrast')) {
-			return colorScheme.dark ? DEFAULT_BG_HC_BLACK : DEFAULT_BG_HC_LIGHT;
+		if (this.configurationService.getValue(ThemeSettings.DETECT_HC) && colorScheme.highContrast) {
+			return colorScheme.dark ? ThemeTypeSelector.HC_BLACK : ThemeTypeSelector.HC_LIGHT;
+		}
+		if (this.configurationService.getValue(ThemeSettings.DETECT_COLOR_SCHEME)) {
+			return colorScheme.dark ? ThemeTypeSelector.VS_DARK : ThemeTypeSelector.VS;
 		}
+		return undefined;
+	}
 
-		let background = this.stateService.getItem<string | null>(THEME_BG_STORAGE_KEY, null);
-		if (!background) {
-			switch (this.getBaseTheme()) {
-				case 'vs': background = DEFAULT_BG_LIGHT; break;
-				case 'hc-black': background = DEFAULT_BG_HC_BLACK; break;
-				case 'hc-light': background = DEFAULT_BG_HC_LIGHT; break;
-				default: background = DEFAULT_BG_DARK;
+	getBackgroundColor(): string {
+		const preferred = this.getPreferredBaseTheme();
+		const stored = this.getStoredBaseTheme();
+
+		// If the stored theme has the same base as the preferred, we can return the stored background
+		if (preferred === undefined || preferred === stored) {
+			const storedBackground = this.stateService.getItem<string | null>(THEME_BG_STORAGE_KEY, null);
+			if (storedBackground) {
+				return storedBackground;
 			}
 		}
-
-		return background;
+		// Otherwise we return the default background for the preferred base theme. If there's no preferred, use the stored one.
+		switch (preferred ?? stored) {
+			case ThemeTypeSelector.VS: return DEFAULT_BG_LIGHT;
+			case ThemeTypeSelector.HC_BLACK: return DEFAULT_BG_HC_BLACK;
+			case ThemeTypeSelector.HC_LIGHT: return DEFAULT_BG_HC_LIGHT;
+			default: return DEFAULT_BG_DARK;
+		}
 	}
 
-	private getBaseTheme(): 'vs' | 'vs-dark' | 'hc-black' | 'hc-light' {
-		const baseTheme = this.stateService.getItem<string>(THEME_STORAGE_KEY, 'vs-dark').split(' ')[0];
+	private getStoredBaseTheme(): ThemeTypeSelector {
+		const baseTheme = this.stateService.getItem<ThemeTypeSelector>(THEME_STORAGE_KEY, ThemeTypeSelector.VS_DARK).split(' ')[0];
 		switch (baseTheme) {
-			case 'vs': return 'vs';
-			case 'hc-black': return 'hc-black';
-			case 'hc-light': return 'hc-light';
-			default: return 'vs-dark';
+			case ThemeTypeSelector.VS: return ThemeTypeSelector.VS;
+			case ThemeTypeSelector.HC_BLACK: return ThemeTypeSelector.HC_BLACK;
+			case ThemeTypeSelector.HC_LIGHT: return ThemeTypeSelector.HC_LIGHT;
+			default: return ThemeTypeSelector.VS_DARK;
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
index 8549b93b80c..e8e7b606c86 100644
--- a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
+++ b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
@@ -9,7 +9,7 @@ import { MenuRegistry, MenuId, Action2, registerAction2, ISubmenuItem } from '..
 import { equalsIgnoreCase } from '../../../../base/common/strings.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
-import { IWorkbenchThemeService, IWorkbenchTheme, ThemeSettingTarget, IWorkbenchColorTheme, IWorkbenchFileIconTheme, IWorkbenchProductIconTheme, ThemeSettings, ThemeSettingDefaults } from '../../../services/themes/common/workbenchThemeService.js';
+import { IWorkbenchThemeService, IWorkbenchTheme, ThemeSettingTarget, IWorkbenchColorTheme, IWorkbenchFileIconTheme, IWorkbenchProductIconTheme, ThemeSettings } from '../../../services/themes/common/workbenchThemeService.js';
 import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
 import { IExtensionGalleryService, IExtensionManagementService, IGalleryExtension } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { IColorRegistry, Extensions as ColorRegistryExtensions } from '../../../../platform/theme/common/colorRegistry.js';
@@ -31,17 +31,12 @@ import { Emitter } from '../../../../base/common/event.js';
 import { IExtensionResourceLoaderService } from '../../../../platform/extensionResourceLoader/common/extensionResourceLoader.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
-import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { FileIconThemeData } from '../../../services/themes/browser/fileIconThemeData.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
-import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions } from '../../../common/contributions.js';
-import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
-import { INotificationService, IPromptChoice, Severity } from '../../../../platform/notification/common/notification.js';
-import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { isWeb } from '../../../../base/common/platform.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { IHostService } from '../../../services/host/browser/host.js';
+import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+
 import { mainWindow } from '../../../../base/browser/window.js';
 import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
 import { Toggle } from '../../../../base/browser/ui/toggle/toggle.js';
@@ -843,127 +838,3 @@ MenuRegistry.appendMenuItem(ThemesSubMenu, {
 	},
 	order: 3
 });
-
-type DefaultThemeUpdatedNotificationReaction = 'keepNew' | 'keepOld' | 'tryNew' | 'cancel' | 'browse';
-
-class DefaultThemeUpdatedNotificationContribution implements IWorkbenchContribution {
-
-	static STORAGE_KEY = 'themeUpdatedNotificationShown';
-
-	constructor(
-		@INotificationService private readonly _notificationService: INotificationService,
-		@IWorkbenchThemeService private readonly _workbenchThemeService: IWorkbenchThemeService,
-		@IStorageService private readonly _storageService: IStorageService,
-		@ICommandService private readonly _commandService: ICommandService,
-		@ITelemetryService private readonly _telemetryService: ITelemetryService,
-		@IHostService private readonly _hostService: IHostService,
-	) {
-		if (_storageService.getBoolean(DefaultThemeUpdatedNotificationContribution.STORAGE_KEY, StorageScope.APPLICATION)) {
-			return;
-		}
-		setTimeout(async () => {
-			if (_storageService.getBoolean(DefaultThemeUpdatedNotificationContribution.STORAGE_KEY, StorageScope.APPLICATION)) {
-				return;
-			}
-			if (await this._hostService.hadLastFocus()) {
-				this._storageService.store(DefaultThemeUpdatedNotificationContribution.STORAGE_KEY, true, StorageScope.APPLICATION, StorageTarget.USER);
-				if (this._workbenchThemeService.hasUpdatedDefaultThemes()) {
-					this._showYouGotMigratedNotification();
-				} else {
-					const currentTheme = this._workbenchThemeService.getColorTheme().settingsId;
-					if (currentTheme === ThemeSettingDefaults.COLOR_THEME_LIGHT_OLD || currentTheme === ThemeSettingDefaults.COLOR_THEME_DARK_OLD) {
-						this._tryNewThemeNotification();
-					}
-				}
-			}
-		}, 3000);
-	}
-
-	private async _showYouGotMigratedNotification(): Promise<void> {
-		const usingLight = this._workbenchThemeService.getColorTheme().type === ColorScheme.LIGHT;
-		const newThemeSettingsId = usingLight ? ThemeSettingDefaults.COLOR_THEME_LIGHT : ThemeSettingDefaults.COLOR_THEME_DARK;
-		const newTheme = (await this._workbenchThemeService.getColorThemes()).find(theme => theme.settingsId === newThemeSettingsId);
-		if (newTheme) {
-			const choices = [
-				{
-					label: localize('button.keep', "Keep New Theme"),
-					run: () => {
-						this._writeTelemetry('keepNew');
-					}
-				},
-				{
-					label: localize('button.browse', "Browse Themes"),
-					run: () => {
-						this._writeTelemetry('browse');
-						this._commandService.executeCommand(SelectColorThemeCommandId);
-					}
-				},
-				{
-					label: localize('button.revert', "Revert"),
-					run: async () => {
-						this._writeTelemetry('keepOld');
-						const oldSettingsId = usingLight ? ThemeSettingDefaults.COLOR_THEME_LIGHT_OLD : ThemeSettingDefaults.COLOR_THEME_DARK_OLD;
-						const oldTheme = (await this._workbenchThemeService.getColorThemes()).find(theme => theme.settingsId === oldSettingsId);
-						if (oldTheme) {
-							this._workbenchThemeService.setColorTheme(oldTheme, 'auto');
-						}
-					}
-				}
-			];
-			await this._notificationService.prompt(
-				Severity.Info,
-				localize({ key: 'themeUpdatedNotification', comment: ['{0} is the name of the new default theme'] }, "Visual Studio Code now ships with a new default theme '{0}'. If you prefer, you can switch back to the old theme or try one of the many other color themes available.", newTheme.label),
-				choices,
-				{
-					onCancel: () => this._writeTelemetry('cancel')
-				}
-			);
-		}
-	}
-
-	private async _tryNewThemeNotification(): Promise<void> {
-		const newThemeSettingsId = this._workbenchThemeService.getColorTheme().type === ColorScheme.LIGHT ? ThemeSettingDefaults.COLOR_THEME_LIGHT : ThemeSettingDefaults.COLOR_THEME_DARK;
-		const theme = (await this._workbenchThemeService.getColorThemes()).find(theme => theme.settingsId === newThemeSettingsId);
-		if (theme) {
-			const choices: IPromptChoice[] = [{
-				label: localize('button.tryTheme', "Try New Theme"),
-				run: () => {
-					this._writeTelemetry('tryNew');
-					this._workbenchThemeService.setColorTheme(theme, 'auto');
-				}
-			},
-			{
-				label: localize('button.cancel', "Cancel"),
-				run: () => {
-					this._writeTelemetry('cancel');
-				}
-			}];
-			await this._notificationService.prompt(
-				Severity.Info,
-				localize({ key: 'newThemeNotification', comment: ['{0} is the name of the new default theme'] }, "Visual Studio Code now ships with a new default theme '{0}'. Do you want to give it a try?", theme.label),
-				choices,
-				{ onCancel: () => this._writeTelemetry('cancel') }
-			);
-		}
-	}
-
-	private _writeTelemetry(outcome: DefaultThemeUpdatedNotificationReaction): void {
-		type ThemeUpdatedNoticationClassification = {
-			owner: 'aeschli';
-			comment: 'Reaction to the notification that theme has updated to a new default theme';
-			web: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Whether this is running on web' };
-			reaction: { classification: 'SystemMetaData'; purpose: 'PerformanceAndHealth'; comment: 'Outcome of the notification' };
-		};
-		type ThemeUpdatedNoticationEvent = {
-			web: boolean;
-			reaction: DefaultThemeUpdatedNotificationReaction;
-		};
-
-		this._telemetryService.publicLog2<ThemeUpdatedNoticationEvent, ThemeUpdatedNoticationClassification>('themeUpdatedNotication', {
-			web: isWeb,
-			reaction: outcome
-		});
-	}
-}
-const workbenchRegistry = Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench);
-workbenchRegistry.registerWorkbenchContribution(DefaultThemeUpdatedNotificationContribution, LifecyclePhase.Eventually);
diff --git a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
index a74a0b263c2..baf78a990da 100644
--- a/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/browser/workbenchThemeService.ts
@@ -6,7 +6,7 @@
 import * as nls from '../../../../nls.js';
 import * as types from '../../../../base/common/types.js';
 import { IExtensionService } from '../../extensions/common/extensions.js';
-import { IWorkbenchThemeService, IWorkbenchColorTheme, IWorkbenchFileIconTheme, ExtensionData, VS_LIGHT_THEME, VS_DARK_THEME, VS_HC_THEME, VS_HC_LIGHT_THEME, ThemeSettings, IWorkbenchProductIconTheme, ThemeSettingTarget, ThemeSettingDefaults, COLOR_THEME_DARK_INITIAL_COLORS, COLOR_THEME_LIGHT_INITIAL_COLORS } from '../common/workbenchThemeService.js';
+import { IWorkbenchThemeService, IWorkbenchColorTheme, IWorkbenchFileIconTheme, ExtensionData, ThemeSettings, IWorkbenchProductIconTheme, ThemeSettingTarget, ThemeSettingDefaults, COLOR_THEME_DARK_INITIAL_COLORS, COLOR_THEME_LIGHT_INITIAL_COLORS } from '../common/workbenchThemeService.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
@@ -34,7 +34,7 @@ import { ProductIconThemeData, DEFAULT_PRODUCT_ICON_THEME_ID } from './productIc
 import { registerProductIconThemeSchemas } from '../common/productIconThemeSchema.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { isWeb } from '../../../../base/common/platform.js';
-import { ColorScheme } from '../../../../platform/theme/common/theme.js';
+import { ColorScheme, ThemeTypeSelector } from '../../../../platform/theme/common/theme.js';
 import { IHostColorSchemeService } from '../common/hostColorSchemeService.js';
 import { RunOnceScheduler, Sequencer } from '../../../../base/common/async.js';
 import { IUserDataInitializationService } from '../../userData/browser/userDataInit.js';
@@ -59,10 +59,10 @@ const themingRegistry = Registry.as<IThemingRegistry>(ThemingExtensions.ThemingC
 function validateThemeId(theme: string): string {
 	// migrations
 	switch (theme) {
-		case VS_LIGHT_THEME: return `vs ${defaultThemeExtensionId}-themes-light_vs-json`;
-		case VS_DARK_THEME: return `vs-dark ${defaultThemeExtensionId}-themes-dark_vs-json`;
-		case VS_HC_THEME: return `hc-black ${defaultThemeExtensionId}-themes-hc_black-json`;
-		case VS_HC_LIGHT_THEME: return `hc-light ${defaultThemeExtensionId}-themes-hc_light-json`;
+		case ThemeTypeSelector.VS: return `vs ${defaultThemeExtensionId}-themes-light_vs-json`;
+		case ThemeTypeSelector.VS_DARK: return `vs-dark ${defaultThemeExtensionId}-themes-dark_vs-json`;
+		case ThemeTypeSelector.HC_BLACK: return `hc-black ${defaultThemeExtensionId}-themes-hc_black-json`;
+		case ThemeTypeSelector.HC_LIGHT: return `hc-light ${defaultThemeExtensionId}-themes-hc_light-json`;
 	}
 	return theme;
 }
@@ -97,8 +97,6 @@ export class WorkbenchThemeService extends Disposable implements IWorkbenchTheme
 	private readonly productIconThemeWatcher: ThemeFileWatcher;
 	private readonly productIconThemeSequencer: Sequencer;
 
-	private hasDefaultUpdated: boolean = false;
-
 	constructor(
 		@IExtensionService extensionService: IExtensionService,
 		@IStorageService private readonly storageService: IStorageService,
@@ -143,15 +141,11 @@ export class WorkbenchThemeService extends Disposable implements IWorkbenchTheme
 		// a color theme document with good defaults until the theme is loaded
 		let themeData: ColorThemeData | undefined = ColorThemeData.fromStorageData(this.storageService);
 		const colorThemeSetting = this.settings.colorTheme;
-		if (themeData && colorThemeSetting !== themeData.settingsId && this.settings.isDefaultColorTheme()) {
-			this.hasDefaultUpdated = themeData.settingsId === ThemeSettingDefaults.COLOR_THEME_DARK_OLD || themeData.settingsId === ThemeSettingDefaults.COLOR_THEME_LIGHT_OLD;
-
-			// the web has different defaults than the desktop, therefore do not restore when the setting is the default theme and the storage doesn't match that.
+		if (themeData && colorThemeSetting !== themeData.settingsId) {
 			themeData = undefined;
 		}
 
 		const defaultColorMap = colorThemeSetting === ThemeSettingDefaults.COLOR_THEME_LIGHT ? COLOR_THEME_LIGHT_INITIAL_COLORS : colorThemeSetting === ThemeSettingDefaults.COLOR_THEME_DARK ? COLOR_THEME_DARK_INITIAL_COLORS : undefined;
-
 		if (!themeData) {
 			const initialColorTheme = environmentService.options?.initialColorTheme;
 			if (initialColorTheme) {
@@ -159,7 +153,8 @@ export class WorkbenchThemeService extends Disposable implements IWorkbenchTheme
 			}
 		}
 		if (!themeData) {
-			themeData = ColorThemeData.createUnloadedThemeForThemeType(isWeb ? ColorScheme.LIGHT : ColorScheme.DARK, defaultColorMap);
+			const colorScheme = this.settings.getPreferredColorScheme() ?? (isWeb ? ColorScheme.LIGHT : ColorScheme.DARK);
+			themeData = ColorThemeData.createUnloadedThemeForThemeType(colorScheme, defaultColorMap);
 		}
 		themeData.setCustomizations(this.settings);
 		this.applyTheme(themeData, undefined, true);
@@ -367,10 +362,6 @@ export class WorkbenchThemeService extends Disposable implements IWorkbenchTheme
 		}));
 	}
 
-	public hasUpdatedDefaultThemes(): boolean {
-		return this.hasDefaultUpdated;
-	}
-
 	public getColorTheme(): IWorkbenchColorTheme {
 		return this.currentColorTheme;
 	}
@@ -497,7 +488,7 @@ export class WorkbenchThemeService extends Disposable implements IWorkbenchTheme
 		if (this.currentColorTheme.id) {
 			this.container.classList.remove(...this.currentColorTheme.classNames);
 		} else {
-			this.container.classList.remove(VS_DARK_THEME, VS_LIGHT_THEME, VS_HC_THEME, VS_HC_LIGHT_THEME);
+			this.container.classList.remove(ThemeTypeSelector.VS, ThemeTypeSelector.VS_DARK, ThemeTypeSelector.HC_BLACK, ThemeTypeSelector.HC_LIGHT);
 		}
 		this.container.classList.add(...newTheme.classNames);
 
diff --git a/src/vs/workbench/services/themes/common/colorThemeData.ts b/src/vs/workbench/services/themes/common/colorThemeData.ts
index d6674cb5ab0..c0e9de4ef17 100644
--- a/src/vs/workbench/services/themes/common/colorThemeData.ts
+++ b/src/vs/workbench/services/themes/common/colorThemeData.ts
@@ -6,7 +6,7 @@
 import { basename } from '../../../../base/common/path.js';
 import * as Json from '../../../../base/common/json.js';
 import { Color } from '../../../../base/common/color.js';
-import { ExtensionData, ITokenColorCustomizations, ITextMateThemingRule, IWorkbenchColorTheme, IColorMap, IThemeExtensionPoint, VS_LIGHT_THEME, VS_HC_THEME, IColorCustomizations, ISemanticTokenRules, ISemanticTokenColorizationSetting, ISemanticTokenColorCustomizations, IThemeScopableCustomizations, IThemeScopedCustomizations, THEME_SCOPE_CLOSE_PAREN, THEME_SCOPE_OPEN_PAREN, themeScopeRegex, THEME_SCOPE_WILDCARD, VS_HC_LIGHT_THEME } from './workbenchThemeService.js';
+import { ExtensionData, ITokenColorCustomizations, ITextMateThemingRule, IWorkbenchColorTheme, IColorMap, IThemeExtensionPoint, IColorCustomizations, ISemanticTokenRules, ISemanticTokenColorizationSetting, ISemanticTokenColorCustomizations, IThemeScopableCustomizations, IThemeScopedCustomizations, THEME_SCOPE_CLOSE_PAREN, THEME_SCOPE_OPEN_PAREN, themeScopeRegex, THEME_SCOPE_WILDCARD } from './workbenchThemeService.js';
 import { convertSettings } from './themeCompatibility.js';
 import * as nls from '../../../../nls.js';
 import * as types from '../../../../base/common/types.js';
@@ -23,7 +23,7 @@ import { IExtensionResourceLoaderService } from '../../../../platform/extensionR
 import { CharCode } from '../../../../base/common/charCode.js';
 import { StorageScope, IStorageService, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { ThemeConfiguration } from './themeConfiguration.js';
-import { ColorScheme } from '../../../../platform/theme/common/theme.js';
+import { ColorScheme, ThemeTypeSelector } from '../../../../platform/theme/common/theme.js';
 import { ColorId, FontStyle, MetadataConsts } from '../../../../editor/common/encodedTokenAttributes.js';
 import { toStandardTokenType } from '../../../../editor/common/languages/supports/tokenization.js';
 
@@ -584,8 +584,8 @@ export class ColorThemeData implements IWorkbenchColorTheme {
 		storageService.store(ColorThemeData.STORAGE_KEY, value, StorageScope.PROFILE, StorageTarget.USER);
 	}
 
-	get baseTheme(): string {
-		return this.classNames[0];
+	get themeTypeSelector(): ThemeTypeSelector {
+		return this.classNames[0] as ThemeTypeSelector;
 	}
 
 	get classNames(): string[] {
@@ -593,10 +593,10 @@ export class ColorThemeData implements IWorkbenchColorTheme {
 	}
 
 	get type(): ColorScheme {
-		switch (this.baseTheme) {
-			case VS_LIGHT_THEME: return ColorScheme.LIGHT;
-			case VS_HC_THEME: return ColorScheme.HIGH_CONTRAST_DARK;
-			case VS_HC_LIGHT_THEME: return ColorScheme.HIGH_CONTRAST_LIGHT;
+		switch (this.themeTypeSelector) {
+			case ThemeTypeSelector.VS: return ColorScheme.LIGHT;
+			case ThemeTypeSelector.HC_BLACK: return ColorScheme.HIGH_CONTRAST_DARK;
+			case ThemeTypeSelector.HC_LIGHT: return ColorScheme.HIGH_CONTRAST_LIGHT;
 			default: return ColorScheme.DARK;
 		}
 	}
diff --git a/src/vs/workbench/services/themes/common/themeExtensionPoints.ts b/src/vs/workbench/services/themes/common/themeExtensionPoints.ts
index 8ab53a63902..028e88c2a29 100644
--- a/src/vs/workbench/services/themes/common/themeExtensionPoints.ts
+++ b/src/vs/workbench/services/themes/common/themeExtensionPoints.ts
@@ -8,7 +8,7 @@ import * as nls from '../../../../nls.js';
 import * as types from '../../../../base/common/types.js';
 import * as resources from '../../../../base/common/resources.js';
 import { ExtensionMessageCollector, IExtensionPoint, ExtensionsRegistry } from '../../extensions/common/extensionsRegistry.js';
-import { ExtensionData, IThemeExtensionPoint, VS_LIGHT_THEME, VS_DARK_THEME, VS_HC_THEME, VS_HC_LIGHT_THEME } from './workbenchThemeService.js';
+import { ExtensionData, IThemeExtensionPoint } from './workbenchThemeService.js';
 
 import { Event, Emitter } from '../../../../base/common/event.js';
 import { URI } from '../../../../base/common/uri.js';
@@ -18,6 +18,7 @@ import { IExtensionManifest } from '../../../../platform/extensions/common/exten
 import { IMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
+import { ThemeTypeSelector } from '../../../../platform/theme/common/theme.js';
 
 export function registerColorThemeExtensionPoint() {
 	return ExtensionsRegistry.registerExtensionPoint<IThemeExtensionPoint[]>({
@@ -27,7 +28,7 @@ export function registerColorThemeExtensionPoint() {
 			type: 'array',
 			items: {
 				type: 'object',
-				defaultSnippets: [{ body: { label: '${1:label}', id: '${2:id}', uiTheme: VS_DARK_THEME, path: './themes/${3:id}.tmTheme.' } }],
+				defaultSnippets: [{ body: { label: '${1:label}', id: '${2:id}', uiTheme: ThemeTypeSelector.VS_DARK, path: './themes/${3:id}.tmTheme.' } }],
 				properties: {
 					id: {
 						description: nls.localize('vscode.extension.contributes.themes.id', 'Id of the color theme as used in the user settings.'),
@@ -39,7 +40,7 @@ export function registerColorThemeExtensionPoint() {
 					},
 					uiTheme: {
 						description: nls.localize('vscode.extension.contributes.themes.uiTheme', 'Base theme defining the colors around the editor: \'vs\' is the light color theme, \'vs-dark\' is the dark color theme. \'hc-black\' is the dark high contrast theme, \'hc-light\' is the light high contrast theme.'),
-						enum: [VS_LIGHT_THEME, VS_DARK_THEME, VS_HC_THEME, VS_HC_LIGHT_THEME]
+						enum: [ThemeTypeSelector.VS, ThemeTypeSelector.VS_DARK, ThemeTypeSelector.HC_BLACK, ThemeTypeSelector.HC_LIGHT]
 					},
 					path: {
 						description: nls.localize('vscode.extension.contributes.themes.path', 'Path of the tmTheme file. The path is relative to the extension folder and is typically \'./colorthemes/awesome-color-theme.json\'.'),
diff --git a/src/vs/workbench/services/themes/common/workbenchThemeService.ts b/src/vs/workbench/services/themes/common/workbenchThemeService.ts
index ba0808026b4..3806f1a2d6c 100644
--- a/src/vs/workbench/services/themes/common/workbenchThemeService.ts
+++ b/src/vs/workbench/services/themes/common/workbenchThemeService.ts
@@ -10,15 +10,10 @@ import { IColorTheme, IThemeService, IFileIconTheme, IProductIconTheme } from '.
 import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
 import { isBoolean, isString } from '../../../../base/common/types.js';
 import { IconContribution, IconDefinition } from '../../../../platform/theme/common/iconRegistry.js';
-import { ColorScheme } from '../../../../platform/theme/common/theme.js';
+import { ColorScheme, ThemeTypeSelector } from '../../../../platform/theme/common/theme.js';
 
 export const IWorkbenchThemeService = refineServiceDecorator<IThemeService, IWorkbenchThemeService>(IThemeService);
 
-export const VS_LIGHT_THEME = 'vs';
-export const VS_DARK_THEME = 'vs-dark';
-export const VS_HC_THEME = 'hc-black';
-export const VS_HC_LIGHT_THEME = 'hc-light';
-
 export const THEME_SCOPE_OPEN_PAREN = '[';
 export const THEME_SCOPE_CLOSE_PAREN = ']';
 export const THEME_SCOPE_WILDCARD = '*';
@@ -147,7 +142,6 @@ export interface IWorkbenchThemeService extends IThemeService {
 	getMarketplaceColorThemes(publisher: string, name: string, version: string): Promise<IWorkbenchColorTheme[]>;
 	onDidColorThemeChange: Event<IWorkbenchColorTheme>;
 
-	hasUpdatedDefaultThemes(): boolean;
 	getPreferredColorScheme(): ColorScheme | undefined;
 
 	setFileIconTheme(iconThemeId: string | undefined | IWorkbenchFileIconTheme, settingsTarget: ThemeSettingTarget): Promise<IWorkbenchFileIconTheme>;
@@ -281,6 +275,6 @@ export interface IThemeExtensionPoint {
 	label?: string;
 	description?: string;
 	path: string;
-	uiTheme?: typeof VS_LIGHT_THEME | typeof VS_DARK_THEME | typeof VS_HC_THEME | typeof VS_HC_LIGHT_THEME;
+	uiTheme?: ThemeTypeSelector;
 	_watch: boolean; // unsupported options to watch location
 }
diff --git a/src/vs/workbench/services/themes/electron-sandbox/nativeHostColorSchemeService.ts b/src/vs/workbench/services/themes/electron-sandbox/nativeHostColorSchemeService.ts
index 2357d240fd7..efb620ad13f 100644
--- a/src/vs/workbench/services/themes/electron-sandbox/nativeHostColorSchemeService.ts
+++ b/src/vs/workbench/services/themes/electron-sandbox/nativeHostColorSchemeService.ts
@@ -9,8 +9,6 @@ import { InstantiationType, registerSingleton } from '../../../../platform/insta
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { IHostColorSchemeService } from '../common/hostColorSchemeService.js';
 import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js';
-import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { isBoolean, isObject } from '../../../../base/common/types.js';
 import { IColorScheme } from '../../../../platform/window/common/window.js';
 
 export class NativeHostColorSchemeService extends Disposable implements IHostColorSchemeService {
@@ -28,14 +26,13 @@ export class NativeHostColorSchemeService extends Disposable implements IHostCol
 	constructor(
 		@INativeHostService private readonly nativeHostService: INativeHostService,
 		@INativeWorkbenchEnvironmentService environmentService: INativeWorkbenchEnvironmentService,
-		@IStorageService private storageService: IStorageService
 	) {
 		super();
 
 		// register listener with the OS
 		this._register(this.nativeHostService.onDidChangeColorScheme(scheme => this.update(scheme)));
 
-		const initial = this.getStoredValue() ?? environmentService.window.colorScheme;
+		const initial = environmentService.window.colorScheme;
 		this.dark = initial.dark;
 		this.highContrast = initial.highContrast;
 
@@ -43,27 +40,12 @@ export class NativeHostColorSchemeService extends Disposable implements IHostCol
 		this.nativeHostService.getOSColorScheme().then(scheme => this.update(scheme));
 	}
 
-	private getStoredValue(): IColorScheme | undefined {
-		const stored = this.storageService.get(NativeHostColorSchemeService.STORAGE_KEY, StorageScope.APPLICATION);
-		if (stored) {
-			try {
-				const scheme = JSON.parse(stored);
-				if (isObject(scheme) && isBoolean(scheme.highContrast) && isBoolean(scheme.dark)) {
-					return scheme as IColorScheme;
-				}
-			} catch (e) {
-				// ignore
-			}
-		}
-		return undefined;
-	}
 
 	private update({ highContrast, dark }: IColorScheme) {
 		if (dark !== this.dark || highContrast !== this.highContrast) {
 
 			this.dark = dark;
 			this.highContrast = highContrast;
-			this.storageService.store(NativeHostColorSchemeService.STORAGE_KEY, JSON.stringify({ highContrast, dark }), StorageScope.APPLICATION, StorageTarget.MACHINE);
 			this._onDidChangeColorScheme.fire();
 		}
 	}

From d590c7493372ec9913c3017555269ad1107017f7 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 12 Dec 2024 11:46:56 +0100
Subject: [PATCH 139/479] don't spread huge arrays, use insertInto to avoid
 runtime failure (#235926)

https://github.com/microsoft/vscode/issues/235889
---
 src/vs/base/browser/ui/tree/abstractTree.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts
index 64efdcaabea..38570ae882d 100644
--- a/src/vs/base/browser/ui/tree/abstractTree.ts
+++ b/src/vs/base/browser/ui/tree/abstractTree.ts
@@ -20,7 +20,7 @@ import { IToggleStyles, Toggle, unthemedToggleStyles } from '../toggle/toggle.js
 import { getVisibleState, isFilterResult } from './indexTreeModel.js';
 import { ICollapseStateChangeEvent, ITreeContextMenuEvent, ITreeDragAndDrop, ITreeEvent, ITreeFilter, ITreeModel, ITreeModelSpliceEvent, ITreeMouseEvent, ITreeNavigator, ITreeNode, ITreeRenderer, TreeDragOverBubble, TreeError, TreeFilterResult, TreeMouseEventTarget, TreeVisibility } from './tree.js';
 import { Action } from '../../../common/actions.js';
-import { distinct, equals, range } from '../../../common/arrays.js';
+import { distinct, equals, insertInto, range } from '../../../common/arrays.js';
 import { Delayer, disposableTimeout, timeout } from '../../../common/async.js';
 import { Codicon } from '../../../common/codicons.js';
 import { ThemeIcon } from '../../../common/themables.js';
@@ -3089,7 +3089,7 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 				state.expanded[getId(node.element)] = node.collapsed ? 0 : 1;
 			}
 
-			queue.push(...node.children);
+			insertInto(queue, queue.length, node.children);
 		}
 
 		return state;

From fc3cc5b1c6eb2f56a8ff194cef8844da393652cf Mon Sep 17 00:00:00 2001
From: Tony <68118705+Legend-Master@users.noreply.github.com>
Date: Thu, 12 Dec 2024 19:02:45 +0800
Subject: [PATCH 140/479] Fix custom task shell doesn't work without manually
 passing in "run command" arg/flag (#181760)

---
 .../tasks/browser/terminalTaskSystem.ts       | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
index 045a9e63b44..45a7b5d022c 100644
--- a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
+++ b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
@@ -1111,7 +1111,6 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 				color: task.configurationProperties.icon?.color || undefined,
 				waitOnExit
 			};
-			let shellSpecified: boolean = false;
 			const shellOptions: IShellConfiguration | undefined = task.command.options && task.command.options.shell;
 			if (shellOptions) {
 				if (shellOptions.executable) {
@@ -1120,12 +1119,12 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 						shellLaunchConfig.args = undefined;
 					}
 					shellLaunchConfig.executable = await this._resolveVariable(variableResolver, shellOptions.executable);
-					shellSpecified = true;
 				}
 				if (shellOptions.args) {
 					shellLaunchConfig.args = await this._resolveVariables(variableResolver, shellOptions.args.slice());
 				}
 			}
+			const shellArgsSpecified: boolean = shellLaunchConfig.args !== undefined;
 			if (shellLaunchConfig.args === undefined) {
 				shellLaunchConfig.args = [];
 			}
@@ -1138,29 +1137,29 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 				windowsShellArgs = true;
 				// If we don't have a cwd, then the terminal uses the home dir.
 				const userHome = await this._pathService.userHome();
-				if (basename === 'cmd.exe' && ((options.cwd && isUNC(options.cwd)) || (!options.cwd && isUNC(userHome.fsPath)))) {
-					return undefined;
-				}
-				if ((basename === 'powershell.exe') || (basename === 'pwsh.exe')) {
-					if (!shellSpecified) {
+				if (basename === 'cmd.exe') {
+					if ((options.cwd && isUNC(options.cwd)) || (!options.cwd && isUNC(userHome.fsPath))) {
+						return undefined;
+					}
+					if (!shellArgsSpecified) {
+						toAdd.push('/d', '/c');
+					}
+				} else if ((basename === 'powershell.exe') || (basename === 'pwsh.exe')) {
+					if (!shellArgsSpecified) {
 						toAdd.push('-Command');
 					}
 				} else if ((basename === 'bash.exe') || (basename === 'zsh.exe')) {
 					windowsShellArgs = false;
-					if (!shellSpecified) {
+					if (!shellArgsSpecified) {
 						toAdd.push('-c');
 					}
 				} else if (basename === 'wsl.exe') {
-					if (!shellSpecified) {
+					if (!shellArgsSpecified) {
 						toAdd.push('-e');
 					}
-				} else {
-					if (!shellSpecified) {
-						toAdd.push('/d', '/c');
-					}
 				}
 			} else {
-				if (!shellSpecified) {
+				if (!shellArgsSpecified) {
 					// Under Mac remove -l to not start it as a login shell.
 					if (platform === Platform.Platform.Mac) {
 						// Background on -l on osx https://github.com/microsoft/vscode/issues/107563
@@ -1267,11 +1266,12 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 		const combinedShellArgs: string[] = Objects.deepClone(configuredShellArgs);
 		shellCommandArgs.forEach(element => {
 			const shouldAddShellCommandArg = configuredShellArgs.every((arg, index) => {
-				if ((arg.toLowerCase() === element) && (configuredShellArgs.length > index + 1)) {
+				const isDuplicated = arg.toLowerCase() === element.toLowerCase();
+				if (isDuplicated && (configuredShellArgs.length > index + 1)) {
 					// We can still add the argument, but only if not all of the following arguments begin with "-".
 					return !configuredShellArgs.slice(index + 1).every(testArg => testArg.startsWith('-'));
 				} else {
-					return arg.toLowerCase() !== element;
+					return !isDuplicated;
 				}
 			});
 			if (shouldAddShellCommandArg) {

From d44a823588d5cf49676184848bfc1ad1fb37b062 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 12 Dec 2024 12:24:25 +0100
Subject: [PATCH 141/479] hide tree when showing message, no specal zindex for
 message (#235929)

fixes https://github.com/microsoft/vscode/issues/209757
---
 src/vs/workbench/contrib/outline/browser/outlinePane.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/outline/browser/outlinePane.css b/src/vs/workbench/contrib/outline/browser/outlinePane.css
index 7cdae3e8811..86e1465b0b2 100644
--- a/src/vs/workbench/contrib/outline/browser/outlinePane.css
+++ b/src/vs/workbench/contrib/outline/browser/outlinePane.css
@@ -25,13 +25,13 @@
 	opacity: 0.5;
 	position: absolute;
 	pointer-events: none;
-	z-index: 1;
 }
 
 .monaco-workbench .outline-pane.message .outline-message {
 	display: inherit;
 }
 
-.monaco-workbench .outline-pane.message .outline-progress {
+.monaco-workbench .outline-pane.message .outline-progress,
+.monaco-workbench .outline-pane.message .outline-tree {
 	display: none;
 }

From 8d21c9df9dcf5f2b80680d2ef8c1925eaae91f30 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 12 Dec 2024 12:25:29 +0100
Subject: [PATCH 142/479] validate preview range using model (#235932)

fixes https://github.com/microsoft/vscode/issues/205611
---
 .../contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.ts b/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.ts
index 70c093ee9d8..ea3d4987eeb 100644
--- a/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.ts
+++ b/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.ts
@@ -229,7 +229,7 @@ export class GotoDefinitionAtPositionEditorContribution implements IEditorContri
 		if (numberOfLinesInRange >= GotoDefinitionAtPositionEditorContribution.MAX_SOURCE_PREVIEW_LINES) {
 			rangeToUse = this.getPreviewRangeBasedOnIndentation(textEditorModel, startLineNumber);
 		}
-
+		rangeToUse = textEditorModel.validateRange(rangeToUse);
 		const previewValue = this.stripIndentationFromPreviewRange(textEditorModel, startLineNumber, rangeToUse);
 		return previewValue;
 	}

From 1d3cd67ef43a4aebd2330ebd57cfd9e8f6745fa0 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Thu, 12 Dec 2024 12:47:13 +0100
Subject: [PATCH 143/479] Fix aria-activedescendant attribute in suggestion
 dropdown (#235933)

fixes https://github.com/microsoft/monaco-editor/issues/3961
---
 src/vs/editor/contrib/suggest/browser/suggestWidget.ts       | 4 ++--
 .../editor/contrib/suggest/browser/suggestWidgetRenderer.ts  | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
index 048572143b1..e1bf843a994 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts
@@ -32,7 +32,7 @@ import { CompletionModel } from './completionModel.js';
 import { ResizableHTMLElement } from '../../../../base/browser/ui/resizable/resizable.js';
 import { CompletionItem, Context as SuggestContext, suggestWidgetStatusbarMenu } from './suggest.js';
 import { canExpandCompletionItem, SuggestDetailsOverlay, SuggestDetailsWidget } from './suggestWidgetDetails.js';
-import { getAriaId, ItemRenderer } from './suggestWidgetRenderer.js';
+import { ItemRenderer } from './suggestWidgetRenderer.js';
 import { getListStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { status } from '../../../../base/browser/ui/aria/aria.js';
 
@@ -434,7 +434,7 @@ export class SuggestWidget implements IDisposable {
 					this.element.domNode.classList.remove('docs-side');
 				}
 
-				this.editor.setAriaOptions({ activeDescendant: getAriaId(index) });
+				this.editor.setAriaOptions({ activeDescendant: this._list.getElementID(index) });
 			}).catch(onUnexpectedError);
 		}
 
diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.ts b/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.ts
index 24fb6d3106f..3d0850da13b 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.ts
@@ -25,10 +25,6 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.js
 import { CompletionItem } from './suggest.js';
 import { canExpandCompletionItem } from './suggestWidgetDetails.js';
 
-export function getAriaId(index: number): string {
-	return `suggest-aria-id:${index}`;
-}
-
 const suggestMoreInfoIcon = registerIcon('suggest-more-info', Codicon.chevronRight, nls.localize('suggestMoreInfoIcon', 'Icon for more information in the suggest widget.'));
 
 const _completionItemColor = new class ColorExtractor {
@@ -167,7 +163,6 @@ export class ItemRenderer implements IListRenderer<CompletionItem, ISuggestionTe
 		data.configureFont();
 
 		const { completion } = element;
-		data.root.id = getAriaId(index);
 		data.colorspan.style.backgroundColor = '';
 
 		const labelOptions: IIconLabelValueOptions = {

From 1971faa4064ed8711b4fc29a8f43bc18d7a11778 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Thu, 12 Dec 2024 12:51:05 +0100
Subject: [PATCH 144/479] autoDetectColorScheme enabled: fix flicker on window
 reload (#235935)

---
 .../nativeHostColorSchemeService.ts           | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/services/themes/electron-sandbox/nativeHostColorSchemeService.ts b/src/vs/workbench/services/themes/electron-sandbox/nativeHostColorSchemeService.ts
index efb620ad13f..b22de86f799 100644
--- a/src/vs/workbench/services/themes/electron-sandbox/nativeHostColorSchemeService.ts
+++ b/src/vs/workbench/services/themes/electron-sandbox/nativeHostColorSchemeService.ts
@@ -9,10 +9,14 @@ import { InstantiationType, registerSingleton } from '../../../../platform/insta
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { IHostColorSchemeService } from '../common/hostColorSchemeService.js';
 import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { isBoolean, isObject } from '../../../../base/common/types.js';
 import { IColorScheme } from '../../../../platform/window/common/window.js';
+import { ILifecycleService, StartupKind } from '../../lifecycle/common/lifecycle.js';
 
 export class NativeHostColorSchemeService extends Disposable implements IHostColorSchemeService {
 
+	// we remember the last color scheme value to restore for reloaded window
 	static readonly STORAGE_KEY = 'HostColorSchemeData';
 
 	declare readonly _serviceBrand: undefined;
@@ -26,13 +30,18 @@ export class NativeHostColorSchemeService extends Disposable implements IHostCol
 	constructor(
 		@INativeHostService private readonly nativeHostService: INativeHostService,
 		@INativeWorkbenchEnvironmentService environmentService: INativeWorkbenchEnvironmentService,
+		@IStorageService private storageService: IStorageService,
+		@ILifecycleService lifecycleService: ILifecycleService
 	) {
 		super();
 
 		// register listener with the OS
 		this._register(this.nativeHostService.onDidChangeColorScheme(scheme => this.update(scheme)));
 
-		const initial = environmentService.window.colorScheme;
+		let initial = environmentService.window.colorScheme;
+		if (lifecycleService.startupKind === StartupKind.ReloadedWindow) {
+			initial = this.getStoredValue(initial);
+		}
 		this.dark = initial.dark;
 		this.highContrast = initial.highContrast;
 
@@ -40,12 +49,27 @@ export class NativeHostColorSchemeService extends Disposable implements IHostCol
 		this.nativeHostService.getOSColorScheme().then(scheme => this.update(scheme));
 	}
 
+	private getStoredValue(dftl: IColorScheme): IColorScheme {
+		const stored = this.storageService.get(NativeHostColorSchemeService.STORAGE_KEY, StorageScope.APPLICATION);
+		if (stored) {
+			try {
+				const scheme = JSON.parse(stored);
+				if (isObject(scheme) && isBoolean(scheme.highContrast) && isBoolean(scheme.dark)) {
+					return scheme as IColorScheme;
+				}
+			} catch (e) {
+				// ignore
+			}
+		}
+		return dftl;
+	}
 
 	private update({ highContrast, dark }: IColorScheme) {
 		if (dark !== this.dark || highContrast !== this.highContrast) {
 
 			this.dark = dark;
 			this.highContrast = highContrast;
+			this.storageService.store(NativeHostColorSchemeService.STORAGE_KEY, JSON.stringify({ highContrast, dark }), StorageScope.APPLICATION, StorageTarget.MACHINE);
 			this._onDidChangeColorScheme.fire();
 		}
 	}

From a63f68cebd2132f624ae9d02230b646b005635bb Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 12 Dec 2024 13:04:08 +0100
Subject: [PATCH 145/479] fix https://github.com/microsoft/vscode/issues/212089
 (#235936)

---
 src/vs/editor/contrib/gotoSymbol/browser/goToCommands.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.ts b/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.ts
index b48cef6910c..15dc3bf04e6 100644
--- a/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.ts
+++ b/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.ts
@@ -130,7 +130,7 @@ export abstract class SymbolNavigationAction extends EditorAction2 {
 			let altAction: SymbolNavigationAction | null | undefined;
 			if (references.referenceAt(model.uri, position)) {
 				const altActionId = this._getAlternativeCommand(editor);
-				if (!SymbolNavigationAction._activeAlternativeCommands.has(altActionId) && SymbolNavigationAction._allSymbolNavigationCommands.has(altActionId)) {
+				if (altActionId !== undefined && !SymbolNavigationAction._activeAlternativeCommands.has(altActionId) && SymbolNavigationAction._allSymbolNavigationCommands.has(altActionId)) {
 					altAction = SymbolNavigationAction._allSymbolNavigationCommands.get(altActionId)!;
 				}
 			}
@@ -170,7 +170,7 @@ export abstract class SymbolNavigationAction extends EditorAction2 {
 
 	protected abstract _getNoResultFoundMessage(info: IWordAtPosition | null): string;
 
-	protected abstract _getAlternativeCommand(editor: IActiveCodeEditor): string;
+	protected abstract _getAlternativeCommand(editor: IActiveCodeEditor): string | undefined;
 
 	protected abstract _getGoToPreference(editor: IActiveCodeEditor): GoToLocationValues;
 
@@ -761,7 +761,9 @@ class GenericGoToLocationAction extends SymbolNavigationAction {
 		return this._gotoMultipleBehaviour ?? editor.getOption(EditorOption.gotoLocation).multipleReferences;
 	}
 
-	protected _getAlternativeCommand() { return ''; }
+	protected _getAlternativeCommand(): undefined {
+		return undefined;
+	}
 }
 
 CommandsRegistry.registerCommand({

From 822dba4bbc0f9cfb294c8aa0cba1d8eab7e83209 Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Thu, 12 Dec 2024 13:12:57 +0100
Subject: [PATCH 146/479] Don't try instantiating an `InlineEditWithChanges`
 when there are no effective changes (#235937)

---
 .../view/inlineEdits/inlineEditsViewAndDiffProducer.ts        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewAndDiffProducer.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewAndDiffProducer.ts
index ea3c17e867b..a4e52c22af7 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewAndDiffProducer.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewAndDiffProducer.ts
@@ -70,6 +70,10 @@ export class InlineEditsViewAndDiffProducer extends Disposable {
 
 			const rangeStartPos = edit.range.getStartPosition();
 			const innerChanges = result.changes.flatMap(c => c.innerChanges!);
+			if (innerChanges.length === 0) {
+				// there are no changes
+				return undefined;
+			}
 
 			function addRangeToPos(pos: Position, range: Range): Range {
 				const start = TextLength.fromPosition(range.getStartPosition());

From a05c4434d70872d660e97a5f542b9ac2a20a5003 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Thu, 12 Dec 2024 13:17:16 +0100
Subject: [PATCH 147/479] Hover - fix input box hover (#235939)

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

diff --git a/src/vs/base/browser/ui/inputbox/inputBox.ts b/src/vs/base/browser/ui/inputbox/inputBox.ts
index 2f427923269..5ccf89beee4 100644
--- a/src/vs/base/browser/ui/inputbox/inputBox.ts
+++ b/src/vs/base/browser/ui/inputbox/inputBox.ts
@@ -237,7 +237,7 @@ export class InputBox extends Widget {
 		this.tooltip = tooltip;
 		if (!this.hover.value) {
 			this.hover.value = this._register(getBaseLayerHoverDelegate().setupDelayedHoverAtMouse(this.input, () => ({
-				content: tooltip,
+				content: this.tooltip,
 				appearance: {
 					compact: true,
 				}

From f6e97b7c977d5043aacec308fadd4847d062988d Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 12 Dec 2024 14:47:59 +0100
Subject: [PATCH 148/479] debt - go over todos (#235924)

* debt - go over todos

* fix hygiene
---
 build/lib/inlineMeta.js                                   | 2 +-
 build/lib/inlineMeta.ts                                   | 2 +-
 .../auxiliaryWindow/electron-main/auxiliaryWindow.ts      | 6 +++---
 .../files/node/watcher/nodejs/nodejsWatcherLib.ts         | 8 ++++----
 src/vs/workbench/browser/layout.ts                        | 5 +----
 .../workbench/browser/parts/titlebar/titlebarActions.ts   | 2 +-
 .../accessibility/browser/accessibilityConfiguration.ts   | 2 +-
 .../chat/electron-sandbox/actions/voiceChatActions.ts     | 4 ++--
 .../multiDiffEditor/browser/multiDiffEditorInput.ts       | 6 +++---
 src/vs/workbench/contrib/output/browser/outputView.ts     | 2 +-
 10 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/build/lib/inlineMeta.js b/build/lib/inlineMeta.js
index f1dbfa83a7e..5ec7e9e9c07 100644
--- a/build/lib/inlineMeta.js
+++ b/build/lib/inlineMeta.js
@@ -8,7 +8,7 @@ exports.inlineMeta = inlineMeta;
 const es = require("event-stream");
 const path_1 = require("path");
 const packageJsonMarkerId = 'BUILD_INSERT_PACKAGE_CONFIGURATION';
-// TODO@bpasero in order to inline `product.json`, more work is
+// TODO in order to inline `product.json`, more work is
 // needed to ensure that we cover all cases where modifications
 // are done to the product configuration during build. There are
 // at least 2 more changes that kick in very late:
diff --git a/build/lib/inlineMeta.ts b/build/lib/inlineMeta.ts
index ef3987fc32e..dc061aca8d1 100644
--- a/build/lib/inlineMeta.ts
+++ b/build/lib/inlineMeta.ts
@@ -15,7 +15,7 @@ export interface IInlineMetaContext {
 
 const packageJsonMarkerId = 'BUILD_INSERT_PACKAGE_CONFIGURATION';
 
-// TODO@bpasero in order to inline `product.json`, more work is
+// TODO in order to inline `product.json`, more work is
 // needed to ensure that we cover all cases where modifications
 // are done to the product configuration during build. There are
 // at least 2 more changes that kick in very late:
diff --git a/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow.ts b/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow.ts
index 698f5c817a6..971d5cd6b2e 100644
--- a/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow.ts
+++ b/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow.ts
@@ -62,9 +62,9 @@ export class AuxiliaryWindow extends BaseWindow implements IAuxiliaryWindow {
 				y: options.y,
 				width: options.width,
 				height: options.height,
-				// TODO@bpasero We currently do not support restoring fullscreen state for
-				// auxiliary windows because we do not get hold of the original `features`
-				// string that contains that info in `window-fullscreen`. However, we can
+				// We currently do not support restoring fullscreen state for auxiliary
+				// windows because we do not get hold of the original `features` string
+				// that contains that info in `window-fullscreen`. However, we can
 				// probe the `options.show` value for whether the window should be maximized
 				// or not because we never show maximized windows initially to reduce flicker.
 				mode: options.show === false ? WindowMode.Maximized : WindowMode.Normal
diff --git a/src/vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts b/src/vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts
index 69792c99623..a7c89ceb00e 100644
--- a/src/vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts
+++ b/src/vs/platform/files/node/watcher/nodejs/nodejsWatcherLib.ts
@@ -147,10 +147,10 @@ export class NodeJSFileWatcherLibrary extends Disposable {
 
 	private doWatchWithExistingWatcher(realPath: string, isDirectory: boolean, disposables: DisposableStore): boolean {
 		if (isDirectory) {
-			// TODO@bpasero recursive watcher re-use is currently not enabled
-			// for when folders are watched. this is because the dispatching
-			// in the recursive watcher for non-recurive requests is optimized
-			// for file changes  where we really only match on the exact path
+			// Recursive watcher re-use is currently not enabled for when
+			// folders are watched. this is because the dispatching in the
+			// recursive watcher for non-recurive requests is optimized for
+			// file changes  where we really only match on the exact path
 			// and not child paths.
 			return false;
 		}
diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index 782d0f48f38..8d731c24025 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -707,11 +707,8 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 
 		// Auxiliary Panel to restore
 		if (this.isVisible(Parts.AUXILIARYBAR_PART)) {
-			let viewContainerToRestore = this.storageService.get(AuxiliaryBarPart.activePanelSettingsKey, StorageScope.WORKSPACE, this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.AuxiliaryBar)?.id);
+			const viewContainerToRestore = this.storageService.get(AuxiliaryBarPart.activePanelSettingsKey, StorageScope.WORKSPACE, this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.AuxiliaryBar)?.id);
 			if (viewContainerToRestore) {
-				if (viewContainerToRestore === 'workbench.panel.chatSidebar') {
-					viewContainerToRestore = 'workbench.panel.chat'; // TODO@bpasero remove me after some months
-				}
 				this.state.initialization.views.containerToRestore.auxiliaryBar = viewContainerToRestore;
 			} else {
 				this.stateModel.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN, true);
diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts b/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts
index 20e940cd05f..f84bf3f06b7 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts
@@ -259,7 +259,7 @@ registerAction2(class ToggleEditorActions extends Action2 {
 	}
 });
 
-if (isLinux && isNative) { // TODO@bpasero remove me later
+if (isLinux && isNative) {
 	registerAction2(class ToggleCustomTitleBar extends Action2 {
 		constructor() {
 			super({
diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts b/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
index 840442b7bac..32eff1e1594 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
@@ -813,7 +813,7 @@ export class DynamicSpeechAccessibilityConfiguration extends Disposable implemen
 						localize('accessibility.voice.autoSynthesize.auto', "When a screen reader is detected, disable the feature. Otherwise, enable the feature.")
 					],
 					'markdownDescription': localize('autoSynthesize', "Whether a textual response should automatically be read out aloud when speech was used as input. For example in a chat session, a response is automatically synthesized when voice was used as chat request."),
-					'default': this.productService.quality !== 'stable' ? 'auto' : 'off', // TODO@bpasero decide on a default
+					'default': this.productService.quality !== 'stable' ? 'auto' : 'off',
 					'tags': ['accessibility']
 				}
 			}
diff --git a/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts b/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
index 568f6a693cc..57310027bc9 100644
--- a/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
+++ b/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
@@ -373,7 +373,7 @@ class VoiceChatSessions {
 		if (autoSynthesize === 'on' || autoSynthesize === 'auto' && !this.accessibilityService.isScreenReaderOptimized()) {
 			let context: IVoiceChatSessionController | 'focused';
 			if (controller.context === 'inline') {
-				// TODO@bpasero this is ugly, but the lightweight inline chat turns into
+				// This is ugly, but the lightweight inline chat turns into
 				// a different widget as soon as a response comes in, so we fallback to
 				// picking up from the focused chat widget
 				context = 'focused';
@@ -695,7 +695,7 @@ class ChatSynthesizerSessionController {
 		const contextKeyService = accessor.get(IContextKeyService);
 		let chatWidget = chatWidgetService.getWidgetBySessionId(response.session.sessionId);
 		if (chatWidget?.location === ChatAgentLocation.Editor) {
-			// TODO@bpasero workaround for https://github.com/microsoft/vscode/issues/212785
+			// workaround for https://github.com/microsoft/vscode/issues/212785
 			chatWidget = chatWidgetService.lastFocusedWidget;
 		}
 
diff --git a/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.ts b/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.ts
index 0ab8f25019b..35847cd444a 100644
--- a/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.ts
+++ b/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.ts
@@ -280,9 +280,9 @@ export class MultiDiffEditorInput extends EditorInput implements ILanguageSuppor
 
 	override readonly closeHandler: IEditorCloseHandler = {
 
-		// TODO@bpasero TODO@hediet this is a workaround for
-		// not having a better way to figure out if the
-		// editors this input wraps around are opened or not
+		// This is a workaround for not having a better way
+		// to figure out if the editors this input wraps
+		// around are opened or not
 
 		async confirm() {
 			return ConfirmResult.DONT_SAVE;
diff --git a/src/vs/workbench/contrib/output/browser/outputView.ts b/src/vs/workbench/contrib/output/browser/outputView.ts
index 3876b25ea9e..4d280d00857 100644
--- a/src/vs/workbench/contrib/output/browser/outputView.ts
+++ b/src/vs/workbench/contrib/output/browser/outputView.ts
@@ -164,7 +164,7 @@ class OutputEditor extends AbstractTextResourceEditor {
 		@IEditorService editorService: IEditorService,
 		@IFileService fileService: IFileService
 	) {
-		super(OUTPUT_VIEW_ID, editorGroupService.activeGroup /* TODO@bpasero this is wrong */, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorGroupService, editorService, fileService);
+		super(OUTPUT_VIEW_ID, editorGroupService.activeGroup /* this is not correct but pragmatic */, telemetryService, instantiationService, storageService, textResourceConfigurationService, themeService, editorGroupService, editorService, fileService);
 
 		this.resourceContext = this._register(instantiationService.createInstance(ResourceContextKey));
 	}

From 3b30f94f4f129e67be9b6c677aac582923da1fab Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 12 Dec 2024 05:54:20 -0800
Subject: [PATCH 149/479] Only allow shellCommand for high confidence

Fixes #235899
---
 src/vs/platform/terminal/common/capabilities/capabilities.ts  | 1 +
 .../common/capabilities/commandDetectionCapability.ts         | 4 ++++
 src/vs/workbench/contrib/terminal/browser/terminalInstance.ts | 4 +++-
 .../contrib/terminal/common/terminalConfiguration.ts          | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/vs/platform/terminal/common/capabilities/capabilities.ts b/src/vs/platform/terminal/common/capabilities/capabilities.ts
index b6d91be1408..6de15be87fa 100644
--- a/src/vs/platform/terminal/common/capabilities/capabilities.ts
+++ b/src/vs/platform/terminal/common/capabilities/capabilities.ts
@@ -167,6 +167,7 @@ export interface ICommandDetectionCapability {
 	/** The command currently being executed, otherwise undefined. */
 	readonly executingCommand: string | undefined;
 	readonly executingCommandObject: ITerminalCommand | undefined;
+	readonly executingCommandConfidence: 'low' | 'medium' | 'high' | undefined;
 	/** The current cwd at the cursor's position. */
 	readonly cwd: string | undefined;
 	readonly currentCommand: ICurrentPartialCommand | undefined;
diff --git a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
index 422607b4de6..8f9d90cf49b 100644
--- a/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
+++ b/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts
@@ -49,6 +49,10 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 		}
 		return undefined;
 	}
+	get executingCommandConfidence(): 'low' | 'medium' | 'high' | undefined {
+		const casted = this._currentCommand as PartialTerminalCommand | ITerminalCommand;
+		return 'commandLineConfidence' in casted ? casted.commandLineConfidence : undefined;
+	}
 	get currentCommand(): ICurrentPartialCommand {
 		return this._currentCommand;
 	}
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
index 6c11d5d3ccd..0a1646792a0 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
@@ -2515,9 +2515,11 @@ export class TerminalLabelComputer extends Disposable {
 				: (instance.fixedRows ? `\u2195${instance.fixedRows}` : ''),
 			separator: { label: this._terminalConfigurationService.config.tabs.separator },
 			shellType: instance.shellType,
-			shellCommand: commandDetection?.executingCommand && promptInputModel
+			// Shell command requires high confidence
+			shellCommand: commandDetection?.executingCommand && commandDetection.executingCommandConfidence === 'high' && promptInputModel
 				? promptInputModel.value + nonTaskSpinner
 				: undefined,
+			// Shell prompt input does not require high confidence as it's largely for VS Code developers
 			shellPromptInput: commandDetection?.executingCommand && promptInputModel
 				? promptInputModel.getCombinedString(true) + nonTaskSpinner
 				: promptInputModel?.getCombinedString(true),
diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index 54c79186f02..beea86681fb 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -25,7 +25,7 @@ const terminalDescriptors = '\n- ' + [
 	'`\${sequence}`: ' + localize('sequence', "the name provided to the terminal by the process"),
 	'`\${task}`: ' + localize('task', "indicates this terminal is associated with a task"),
 	'`\${shellType}`: ' + localize('shellType', "the detected shell type"),
-	'`\${shellCommand}`: ' + localize('shellCommand', "the command being executed according to shell integration"),
+	'`\${shellCommand}`: ' + localize('shellCommand', "the command being executed according to shell integration. This also requires high confidence in the detected command line which may not work in some prompt frameworks."),
 	'`\${shellPromptInput}`: ' + localize('shellPromptInput', "the shell's full prompt input according to shell integration"),
 ].join('\n- '); // intentionally concatenated to not produce a string that is too long for translations
 

From a212efb7a6f3e6145c7e9a010c1fc2b13ec0099c Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 12 Dec 2024 15:19:37 +0100
Subject: [PATCH 150/479] chat - trigger commands to refresh tokens as needed
 (#235952)

---
 src/vs/workbench/contrib/chat/browser/chatSetup.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 37544c7ec93..3af2ce5f98c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -266,7 +266,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 
 					const entitlement = await that.requests.forceResolveEntitlement(undefined);
 					if (entitlement === ChatEntitlement.Pro) {
-						commandService.executeCommand('github.copilot.refreshToken'); // ugly, but we need to signal to the extension that entitlements changed
+						refreshTokens(commandService);
 					}
 				}
 			}
@@ -787,7 +787,7 @@ class ChatSetupController extends Disposable {
 			installResult = isCancellationError(error) ? 'cancelled' : 'failedInstall';
 		} finally {
 			if (wasInstalled && didSignUp) {
-				this.commandService.executeCommand('github.copilot.refreshToken'); // ugly, but we need to signal to the extension that sign-up happened
+				refreshTokens(this.commandService);
 			}
 
 			if (installResult === 'installed') {
@@ -1088,3 +1088,9 @@ function showCopilotView(viewsService: IViewsService, layoutService: IWorkbenchL
 		return showChatView(viewsService);
 	}
 }
+
+function refreshTokens(commandService: ICommandService): void {
+	// ugly, but we need to signal to the extension that entitlements changed
+	commandService.executeCommand('github.copilot.signIn');
+	commandService.executeCommand('github.copilot.refreshToken');
+}

From 7c3b79da7f8ca28e61c57d17751f9494b5d6649c Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Thu, 12 Dec 2024 16:01:23 +0100
Subject: [PATCH 151/479] inline edit view refactoring (#235836)

* inline edit view refactoring

* Allows NES to overflow.

* Fixes file name casing

* Adds missing file

* fixes types

* Fixes type error
---
 src/vs/base/browser/dom.ts                    |   9 +-
 .../browser/view/inlineCompletionsView.ts     |   2 +-
 ...EditsIndicatorView.ts => indicatorView.ts} |  14 +-
 .../view/inlineEdits/inlineEditsView.ts       | 557 ------------------
 .../view/inlineEdits/sideBySideDiff.ts        | 531 +++++++++++++++++
 .../browser/view/inlineEdits/utils.ts         | 270 ++++++++-
 .../{inlineEditsView.css => view.css}         |   2 -
 .../browser/view/inlineEdits/view.ts          | 143 +++++
 ...DiffProducer.ts => viewAndDiffProducer.ts} |   2 +-
 9 files changed, 955 insertions(+), 575 deletions(-)
 rename src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/{inlineEditsIndicatorView.ts => indicatorView.ts} (90%)
 delete mode 100644 src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
 create mode 100644 src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
 rename src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/{inlineEditsView.css => view.css} (98%)
 create mode 100644 src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.ts
 rename src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/{inlineEditsViewAndDiffProducer.ts => viewAndDiffProducer.ts} (99%)

diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
index ecf1d194cdc..65a672b0d8c 100644
--- a/src/vs/base/browser/dom.ts
+++ b/src/vs/base/browser/dom.ts
@@ -2189,22 +2189,23 @@ export function h(tag: string, ...args: [] | [attributes: { $: string } & Partia
 	return result;
 }
 
+/** @deprecated This is a duplication of the h function. Needs cleanup. */
 export function svgElem<TTag extends string>
 	(tag: TTag):
 	TagToRecord<TTag> extends infer Y ? { [TKey in keyof Y]: Y[TKey] } : never;
-
+/** @deprecated This is a duplication of the h function. Needs cleanup. */
 export function svgElem<TTag extends string, T extends Child[]>
 	(tag: TTag, children: [...T]):
 	(ArrayToObj<T> & TagToRecord<TTag>) extends infer Y ? { [TKey in keyof Y]: Y[TKey] } : never;
-
+/** @deprecated This is a duplication of the h function. Needs cleanup. */
 export function svgElem<TTag extends string>
 	(tag: TTag, attributes: Partial<ElementAttributes<TagToElement<TTag>>>):
 	TagToRecord<TTag> extends infer Y ? { [TKey in keyof Y]: Y[TKey] } : never;
-
+/** @deprecated This is a duplication of the h function. Needs cleanup. */
 export function svgElem<TTag extends string, T extends Child[]>
 	(tag: TTag, attributes: Partial<ElementAttributes<TagToElement<TTag>>>, children: [...T]):
 	(ArrayToObj<T> & TagToRecord<TTag>) extends infer Y ? { [TKey in keyof Y]: Y[TKey] } : never;
-
+/** @deprecated This is a duplication of the h function. Needs cleanup. */
 export function svgElem(tag: string, ...args: [] | [attributes: { $: string } & Partial<ElementAttributes<HTMLElement>> | Record<string, any>, children?: any[]] | [children: any[]]): Record<string, HTMLElement> {
 	let attributes: { $?: string } & Partial<ElementAttributes<HTMLElement>>;
 	let children: (Record<string, HTMLElement> | HTMLElement)[] | undefined;
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts
index 59773742bbb..baaf3c08205 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts
@@ -15,7 +15,7 @@ import { InlineCompletionsHintsWidget } from '../hintsWidget/inlineCompletionsHi
 import { InlineCompletionsModel } from '../model/inlineCompletionsModel.js';
 import { convertItemsToStableObservables } from '../utils.js';
 import { GhostTextView } from './ghostText/ghostTextView.js';
-import { InlineEditsViewAndDiffProducer } from './inlineEdits/inlineEditsViewAndDiffProducer.js';
+import { InlineEditsViewAndDiffProducer } from './inlineEdits/viewAndDiffProducer.js';
 
 export class InlineCompletionsView extends Disposable {
 	private readonly _ghostTexts = derived(this, (reader) => {
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsIndicatorView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/indicatorView.ts
similarity index 90%
rename from src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsIndicatorView.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/indicatorView.ts
index d6aa3988cca..052451f326d 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsIndicatorView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/indicatorView.ts
@@ -13,10 +13,9 @@ import { registerColor } from '../../../../../../platform/theme/common/colorUtil
 import { ObservableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
 import { OffsetRange } from '../../../../../common/core/offsetRange.js';
 import { InlineCompletionsModel } from '../../model/inlineCompletionsModel.js';
-import { Point } from './utils.js';
 
 export interface IInlineEditsIndicatorState {
-	editTopLeft: Point;
+	editTop: number;
 	showAlways: boolean;
 }
 
@@ -73,15 +72,14 @@ export class InlineEditsIndicator extends Disposable {
 
 			const range = new OffsetRange(0, i.height - 30);
 
-			const topEdit = state.editTopLeft;
-			this._indicator.root.classList.toggle('top', topEdit.y < range.start);
-			this._indicator.root.classList.toggle('bottom', topEdit.y > range.endExclusive);
+			const topEdit = state.editTop;
+			this._indicator.root.classList.toggle('top', topEdit < range.start);
+			this._indicator.root.classList.toggle('bottom', topEdit > range.endExclusive);
 			const showAnyway = state.showAlways;
 			this._indicator.root.classList.toggle('visible', showAnyway);
-			this._indicator.root.classList.toggle('contained', range.contains(topEdit.y));
+			this._indicator.root.classList.toggle('contained', range.contains(topEdit));
 
-
-			this._indicator.root.style.top = `${range.clip(topEdit.y)}px`;
+			this._indicator.root.style.top = `${range.clip(topEdit)}px`;
 			this._indicator.root.style.right = `${i.minimap.minimapWidth + i.verticalScrollbarWidth}px`;
 		}));
 	}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
deleted file mode 100644
index 8b081fe0c11..00000000000
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.ts
+++ /dev/null
@@ -1,557 +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 { h, svgElem } from '../../../../../../base/browser/dom.js';
-import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { autorun, constObservable, derived, derivedOpts, IObservable, observableFromEvent } from '../../../../../../base/common/observable.js';
-import { MenuId, MenuItemAction } from '../../../../../../platform/actions/common/actions.js';
-import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { ICodeEditor } from '../../../../../browser/editorBrowser.js';
-import { observableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
-import { EmbeddedCodeEditorWidget } from '../../../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
-import { appendRemoveOnDispose } from '../../../../../browser/widget/diffEditor/utils.js';
-import { EditorOption } from '../../../../../common/config/editorOptions.js';
-import { LineRange } from '../../../../../common/core/lineRange.js';
-import { Range } from '../../../../../common/core/range.js';
-import { StringText } from '../../../../../common/core/textEdit.js';
-import { lineRangeMappingFromRangeMappings, RangeMapping } from '../../../../../common/diff/rangeMapping.js';
-import { TextModel } from '../../../../../common/model/textModel.js';
-import './inlineEditsView.css';
-import { IOriginalEditorInlineDiffViewState, OriginalEditorInlineDiffView } from './inlineDiffView.js';
-import { applyEditToModifiedRangeMappings, createReindentEdit, getOffsetForPos, maxContentWidthInRange, PathBuilder, Point, StatusBarViewItem } from './utils.js';
-import { IInlineEditsIndicatorState, InlineEditsIndicator } from './inlineEditsIndicatorView.js';
-import { darken, lighten, registerColor } from '../../../../../../platform/theme/common/colorUtils.js';
-import { diffInserted, diffRemoved } from '../../../../../../platform/theme/common/colorRegistry.js';
-import { CustomizedMenuWorkbenchToolBar } from '../../hintsWidget/inlineCompletionsHintsWidget.js';
-import { Command } from '../../../../../common/languages.js';
-import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
-import { structuralEquals } from '../../../../../../base/common/equals.js';
-import { IAction } from '../../../../../../base/common/actions.js';
-import { editorLineHighlightBorder } from '../../../../../common/core/editorColorRegistry.js';
-import { ActionViewItem } from '../../../../../../base/browser/ui/actionbar/actionViewItems.js';
-import { InlineCompletionsModel } from '../../model/inlineCompletionsModel.js';
-import { InlineEditWithChanges } from './inlineEditsViewAndDiffProducer.js';
-import { OffsetRange } from '../../../../../common/core/offsetRange.js';
-import { Color } from '../../../../../../base/common/color.js';
-
-export const originalBackgroundColor = registerColor(
-	'inlineEdit.originalBackground',
-	Color.transparent,
-	'',
-	true
-);
-export const modifiedBackgroundColor = registerColor(
-	'inlineEdit.modifiedBackground',
-	Color.transparent,
-	'',
-	true
-);
-
-export const originalChangedLineBackgroundColor = registerColor(
-	'inlineEdit.originalChangedLineBackground',
-	Color.transparent,
-	'',
-	true
-);
-
-export const originalChangedTextOverlayColor = registerColor(
-	'inlineEdit.originalChangedTextBackground',
-	diffRemoved,
-	'',
-	true
-);
-
-export const modifiedChangedLineBackgroundColor = registerColor(
-	'inlineEdit.modifiedChangedLineBackground',
-	Color.transparent,
-	'',
-	true
-);
-
-export const modifiedChangedTextOverlayColor = registerColor(
-	'inlineEdit.modifiedChangedTextBackground',
-	diffInserted,
-	'',
-	true
-);
-
-export const originalBorder = registerColor(
-	'inlineEdit.originalBorder',
-	{
-		light: darken(editorLineHighlightBorder, 0.15),
-		dark: lighten(editorLineHighlightBorder, 0.50),
-		hcDark: editorLineHighlightBorder,
-		hcLight: editorLineHighlightBorder
-	},
-	''
-);
-
-export const modifiedBorder = registerColor(
-	'inlineEdit.modifiedBorder',
-	{
-		light: darken(editorLineHighlightBorder, 0.15),
-		dark: lighten(editorLineHighlightBorder, 0.50),
-		hcDark: editorLineHighlightBorder,
-		hcLight: editorLineHighlightBorder
-	},
-	''
-);
-
-export class InlineEditsView extends Disposable {
-	private readonly _editorObs = observableCodeEditor(this._editor);
-
-	private readonly _elements = h('div.inline-edits-view', {
-		style: {
-			position: 'absolute',
-			overflow: 'visible',
-			top: '0px',
-			left: '0px',
-		},
-	}, [
-		svgElem('svg@svg', { transform: 'translate(-0.5 -0.5)', style: { overflow: 'visible', pointerEvents: 'none', position: 'absolute' }, }, []),
-		h('div.editorContainer@editorContainer', { style: { position: 'absolute' } }, [
-			h('div.preview@editor', { style: {} }),
-			h('div.toolbar@toolbar', { style: {} }),
-		]),
-		svgElem('svg@svg2', { transform: 'translate(-0.5 -0.5)', style: { overflow: 'visible', pointerEvents: 'none', position: 'absolute' }, }, []),
-	]);
-
-	private readonly _useMixedLinesDiff = observableCodeEditor(this._editor).getOption(EditorOption.inlineSuggest).map(s => s.edits.experimental.useMixedLinesDiff);
-	private readonly _useInterleavedLinesDiff = observableCodeEditor(this._editor).getOption(EditorOption.inlineSuggest).map(s => s.edits.experimental.useInterleavedLinesDiff);
-
-	constructor(
-		private readonly _editor: ICodeEditor,
-		private readonly _edit: IObservable<InlineEditWithChanges | undefined>,
-		private readonly _model: IObservable<InlineCompletionsModel | undefined>,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@ICommandService private readonly _commandService: ICommandService,
-	) {
-		super();
-
-		this._register(appendRemoveOnDispose(this._editor.getDomNode()!, this._elements.root));
-
-		this._register(this._editorObs.createOverlayWidget({
-			domNode: this._elements.root,
-			position: constObservable(null),
-			allowEditorOverflow: false,
-			minContentWidthInPx: derived(reader => {
-				const x = this._previewEditorLayoutInfo.read(reader)?.maxContentWidth;
-				if (x === undefined) { return 0; }
-				return x;
-			}),
-		}));
-
-		this._previewEditor.setModel(this._previewTextModel);
-
-
-		this._register(autorun(reader => {
-			const layoutInfo = this._previewEditorLayoutInfo.read(reader);
-			if (!layoutInfo) {
-				this._elements.svg.replaceChildren();
-				return;
-			}
-
-			const topEdit = layoutInfo.edit1;
-			const editHeight = layoutInfo.editHeight;
-
-			const width = this._previewEditorWidth.read(reader);
-
-			const pathBuilder1 = new PathBuilder();
-			pathBuilder1.moveTo(layoutInfo.code2);
-			pathBuilder1.lineTo(layoutInfo.codeStart2);
-			pathBuilder1.lineTo(layoutInfo.codeStart1);
-			pathBuilder1.lineTo(layoutInfo.code1);
-
-
-			const pathBuilder2 = new PathBuilder();
-			pathBuilder2.moveTo(layoutInfo.code1);
-			pathBuilder2.lineTo(layoutInfo.edit1);
-			pathBuilder2.lineTo(layoutInfo.edit1.deltaX(width));
-			pathBuilder2.lineTo(layoutInfo.edit2.deltaX(width));
-			pathBuilder2.lineTo(layoutInfo.edit2);
-			if (layoutInfo.edit2.y !== layoutInfo.code2.y) {
-				pathBuilder2.curveTo2(layoutInfo.edit2.deltaX(-20), layoutInfo.code2.deltaX(20), layoutInfo.code2.deltaX(0));
-			}
-			pathBuilder2.lineTo(layoutInfo.code2);
-
-			const pathBuilder4 = new PathBuilder();
-			pathBuilder4.moveTo(layoutInfo.code1);
-			pathBuilder4.lineTo(layoutInfo.code1.deltaX(1000));
-			pathBuilder4.lineTo(layoutInfo.code2.deltaX(1000));
-			pathBuilder4.lineTo(layoutInfo.code2);
-
-			const path1 = document.createElementNS('http://www.w3.org/2000/svg', 'path');
-			path1.setAttribute('d', pathBuilder1.build());
-			path1.style.fill = 'var(--vscode-inlineEdit-originalBackground, transparent)';
-			path1.style.stroke = 'var(--vscode-inlineEdit-originalBorder)';
-			path1.style.strokeWidth = '1px';
-
-
-			const path2 = document.createElementNS('http://www.w3.org/2000/svg', 'path');
-			path2.setAttribute('d', pathBuilder2.build());
-			path2.style.fill = 'var(--vscode-inlineEdit-modifiedBackground, transparent)';
-			path2.style.stroke = 'var(--vscode-inlineEdit-modifiedBorder)';
-			path2.style.strokeWidth = '1px';
-
-			const pathModifiedBackground = document.createElementNS('http://www.w3.org/2000/svg', 'path');
-			pathModifiedBackground.setAttribute('d', pathBuilder2.build());
-			pathModifiedBackground.style.fill = 'var(--vscode-editor-background, transparent)';
-			pathModifiedBackground.style.strokeWidth = '1px';
-
-
-
-			const elements: SVGElement[] = [];
-			if (layoutInfo.shouldShowShadow) {
-				const defs = document.createElementNS('http://www.w3.org/2000/svg', 'defs');
-				const linearGradient = document.createElementNS('http://www.w3.org/2000/svg', 'linearGradient');
-				linearGradient.setAttribute('id', 'gradient');
-				linearGradient.setAttribute('x1', '0%');
-				linearGradient.setAttribute('x2', '100%');
-
-				const stop1 = document.createElementNS('http://www.w3.org/2000/svg', 'stop');
-				stop1.setAttribute('offset', '0%');
-				stop1.setAttribute('style', 'stop-color:var(--vscode-inlineEdit-modifiedBorder);stop-opacity:0');
-
-				const stop2 = document.createElementNS('http://www.w3.org/2000/svg', 'stop');
-				stop2.setAttribute('offset', '100%');
-				stop2.setAttribute('style', 'stop-color:var(--vscode-inlineEdit-modifiedBorder);stop-opacity:1');
-
-				linearGradient.appendChild(stop1);
-				linearGradient.appendChild(stop2);
-				defs.appendChild(linearGradient);
-
-				const width = 6;
-				const rect = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
-				rect.setAttribute('x', `${layoutInfo.code1.x - width}`);
-				rect.setAttribute('y', `${layoutInfo.code1.y}`);
-				rect.setAttribute('width', `${width}`);
-				rect.setAttribute('height', `${layoutInfo.code2.y - layoutInfo.code1.y}`);
-				rect.setAttribute('fill', 'url(#gradient)');
-				rect.style.strokeWidth = '0';
-				rect.style.stroke = 'transparent';
-
-				elements.push(defs);
-				elements.push(rect);
-			} else {
-				const pathBuilder3 = new PathBuilder();
-				pathBuilder3.moveTo(layoutInfo.code1);
-				pathBuilder3.lineTo(layoutInfo.code2);
-
-				const path3 = document.createElementNS('http://www.w3.org/2000/svg', 'path');
-				path3.setAttribute('d', pathBuilder3.build());
-				path3.style.stroke = 'var(--vscode-inlineEdit-modifiedBorder)';
-				path3.style.strokeWidth = '1px';
-				elements.push(path3);
-			}
-
-			const path4 = document.createElementNS('http://www.w3.org/2000/svg', 'path');
-			path4.setAttribute('d', pathBuilder4.build());
-			path4.style.fill = 'var(--vscode-editor-background, transparent)';
-
-			this._elements.svg.replaceChildren(path4, pathModifiedBackground);
-			this._elements.svg2.replaceChildren(path1, path2, ...elements);
-
-			this._elements.editorContainer.style.top = `${topEdit.y}px`;
-			this._elements.editorContainer.style.left = `${topEdit.x}px`;
-
-			this._previewEditor.layout({ height: editHeight, width });
-		}));
-
-		const toolbarDropdownVisible = observableFromEvent(this, this._toolbar.onDidChangeDropdownVisibility, (e) => e ?? false);
-
-		this._register(autorun(reader => {
-			this._elements.root.classList.toggle('toolbarDropdownVisible', toolbarDropdownVisible.read(reader));
-		}));
-	}
-
-	private readonly _uiState = derived(this, reader => {
-		const edit = this._edit.read(reader);
-		if (!edit) { return undefined; }
-
-		this._model.get()?.handleInlineCompletionShown(edit.inlineCompletion);
-
-		let mappings = RangeMapping.fromEdit(edit.edit);
-		let newText = edit.edit.apply(edit.originalText);
-		let diff = lineRangeMappingFromRangeMappings(mappings, edit.originalText, new StringText(newText));
-
-		let state: 'collapsed' | 'mixedLines' | 'interleavedLines' | 'sideBySide';
-		if (edit.isCollapsed) {
-			state = 'collapsed';
-		} else if (diff.every(m => OriginalEditorInlineDiffView.supportsInlineDiffRendering(m)) &&
-			(this._useMixedLinesDiff.read(reader) === 'whenPossible' || (edit.userJumpedToIt && this._useMixedLinesDiff.read(reader) === 'afterJumpWhenPossible'))) {
-			state = 'mixedLines';
-		} else if ((this._useInterleavedLinesDiff.read(reader) === 'always' || (edit.userJumpedToIt && this._useInterleavedLinesDiff.read(reader) === 'afterJump'))) {
-			state = 'interleavedLines';
-		} else {
-			state = 'sideBySide';
-		}
-
-		if (state === 'sideBySide') {
-			const indentationAdjustmentEdit = createReindentEdit(newText, edit.modifiedLineRange);
-			newText = indentationAdjustmentEdit.applyToString(newText);
-
-			mappings = applyEditToModifiedRangeMappings(mappings, indentationAdjustmentEdit);
-			diff = lineRangeMappingFromRangeMappings(mappings, edit.originalText, new StringText(newText));
-		}
-
-		const originalDisplayRange = edit.originalText.lineRange.intersect(
-			edit.originalLineRange.join(
-				LineRange.ofLength(edit.originalLineRange.startLineNumber, edit.lineEdit.newLines.length)
-			)
-		)!;
-
-		return {
-			state,
-			diff,
-			edit,
-			newText,
-			newTextLineCount: edit.modifiedLineRange.length,
-			originalDisplayRange: originalDisplayRange,
-		};
-	});
-
-	protected readonly _toolbar = this._register(this._instantiationService.createInstance(CustomizedMenuWorkbenchToolBar, this._elements.toolbar, MenuId.InlineEditsActions, {
-		menuOptions: { renderShortTitle: true },
-		toolbarOptions: {
-			primaryGroup: g => g.startsWith('primary'),
-		},
-		actionViewItemProvider: (action, options) => {
-			if (action instanceof MenuItemAction) {
-				return this._instantiationService.createInstance(StatusBarViewItem, action, undefined);
-			}
-			if (action.class === undefined) {
-				return this._instantiationService.createInstance(ActionViewItem, {}, action, { icon: false });
-			}
-			return undefined;
-		},
-		telemetrySource: 'inlineEditsToolbar'
-	}));
-
-	private readonly _extraCommands = derivedOpts<readonly Command[]>({ owner: this, equalsFn: structuralEquals }, reader => {
-		return this._uiState.read(reader)?.edit.commands ?? [];
-	});
-
-	protected readonly _updateToolbarAutorun = this._register(autorun(reader => {
-		/** @description extra commands */
-		const extraCommands = this._extraCommands.read(reader);
-		const primaryExtraActions: IAction[] = [];
-		const secondaryExtraActions: IAction[] = [];
-		for (const c of extraCommands) {
-			const action: IAction = {
-				class: undefined,
-				id: c.id,
-				enabled: true,
-				tooltip: c.tooltip || '',
-				label: c.title,
-				run: (event) => {
-					return this._commandService.executeCommand(c.id, ...(c.arguments ?? []));
-				},
-			};
-			// TODO this is a hack just to make the feedback action more visible.
-			if (c.title.toLowerCase().indexOf('feedback') !== -1) {
-				primaryExtraActions.push(action);
-			} else {
-				secondaryExtraActions.push(action);
-			}
-		}
-
-		this._toolbar.setAdditionalPrimaryActions(primaryExtraActions);
-		this._toolbar.setAdditionalSecondaryActions(secondaryExtraActions);
-	}));
-
-	// #region preview editor
-
-	private readonly _previewTextModel = this._register(this._instantiationService.createInstance(
-		TextModel,
-		'',
-		this._editor.getModel()!.getLanguageId(),
-		{ ...TextModel.DEFAULT_CREATION_OPTIONS, bracketPairColorizationOptions: { enabled: true, independentColorPoolPerBracketType: false } },
-		null
-	));
-
-	private readonly _previewEditor = this._register(this._instantiationService.createInstance(
-		EmbeddedCodeEditorWidget,
-		this._elements.editor,
-		{
-			glyphMargin: false,
-			lineNumbers: 'off',
-			minimap: { enabled: false },
-			guides: {
-				indentation: false,
-				bracketPairs: false,
-				bracketPairsHorizontal: false,
-				highlightActiveIndentation: false,
-			},
-			folding: false,
-			selectOnLineNumbers: false,
-			selectionHighlight: false,
-			columnSelection: false,
-			overviewRulerBorder: false,
-			overviewRulerLanes: 0,
-			lineDecorationsWidth: 0,
-			lineNumbersMinChars: 0,
-			bracketPairColorization: { enabled: true, independentColorPoolPerBracketType: false },
-			scrollBeyondLastLine: false,
-			scrollbar: {
-				vertical: 'hidden',
-				horizontal: 'hidden',
-				handleMouseWheel: false,
-			},
-			readOnly: true,
-			wordWrap: 'off',
-		},
-		{ contributions: [], },
-		this._editor
-	));
-
-	private readonly _previewEditorObs = observableCodeEditor(this._previewEditor);
-
-	private readonly _previewEditorRootVisibility = derived(this, reader => this._uiState.read(reader)?.state === 'sideBySide' ? 'block' : 'none');
-	private readonly _updatePreviewEditorRootVisibility = derived(reader => {
-		this._elements.root.style.display = this._previewEditorRootVisibility.read(reader);
-	});
-
-	private readonly _updatePreviewEditor = derived(reader => {
-		this._updatePreviewEditorRootVisibility.read(reader);
-
-		const uiState = this._uiState.read(reader);
-		if (!uiState) { return; }
-
-
-		this._previewTextModel.setLanguage(this._editor.getModel()!.getLanguageId());
-		this._previewTextModel.setValue(uiState.newText);
-		const range = uiState.edit.originalLineRange;
-
-		const hiddenAreas: Range[] = [];
-		if (range.startLineNumber > 1) {
-			hiddenAreas.push(new Range(1, 1, range.startLineNumber - 1, 1));
-		}
-		if (range.startLineNumber + uiState.newTextLineCount < this._previewTextModel.getLineCount() + 1) {
-			hiddenAreas.push(new Range(range.startLineNumber + uiState.newTextLineCount, 1, this._previewTextModel.getLineCount() + 1, 1));
-		}
-
-		this._previewEditor.setHiddenAreas(hiddenAreas, undefined, true);
-
-	}).recomputeInitiallyAndOnChange(this._store);
-
-	private readonly _previewEditorWidth = derived(this, reader => {
-		const edit = this._edit.read(reader);
-		if (!edit) { return 0; }
-		this._updatePreviewEditor.read(reader);
-
-		return maxContentWidthInRange(this._previewEditorObs, edit.modifiedLineRange, reader) + 10;
-	});
-
-	private readonly _cursorPosIfTouchesEdit = derived(this, reader => {
-		const cursorPos = this._editorObs.cursorPosition.read(reader);
-		const edit = this._edit.read(reader);
-		if (!edit || !cursorPos) { return undefined; }
-		return edit.modifiedLineRange.contains(cursorPos.lineNumber) ? cursorPos : undefined;
-	});
-
-	/**
-	 * ![test](./layout.dio.svg)
-	*/
-	private readonly _previewEditorLayoutInfo = derived(this, (reader) => {
-		const inlineEdit = this._edit.read(reader);
-		if (!inlineEdit) {
-			return null;
-		}
-		const state = this._uiState.read(reader);
-		if (!state) {
-			return null;
-		}
-
-		const range = inlineEdit.originalLineRange;
-
-		const horizontalScrollOffset = this._editorObs.scrollLeft.read(reader);
-
-		const editorContentMaxWidthInRange = maxContentWidthInRange(this._editorObs, state.originalDisplayRange, reader);
-		const editorLayout = this._editorObs.layoutInfo.read(reader);
-		const previewWidth = this._previewEditorWidth.read(reader);
-		const editorContentAreaWidth = editorLayout.width - editorLayout.contentLeft - editorLayout.minimap.minimapWidth - editorLayout.verticalScrollbarWidth;
-
-		const cursorPos = this._cursorPosIfTouchesEdit.read(reader);
-
-		const maxPreviewEditorLeft = Math.max(
-			editorContentAreaWidth * 0.65 + horizontalScrollOffset - 10,
-			editorContentAreaWidth - previewWidth - 70 + horizontalScrollOffset - 10,
-			cursorPos ? getOffsetForPos(this._editorObs, cursorPos, reader) + 50 : 0,
-		);
-		const previewEditorLeftInTextArea = Math.min(editorContentMaxWidthInRange + 20, maxPreviewEditorLeft);
-
-		const previewEditorLeft = editorLayout.contentLeft + previewEditorLeftInTextArea;
-		const maxContentWidth = editorContentMaxWidthInRange + 20 + previewWidth + 70;
-
-		const dist = maxPreviewEditorLeft - previewEditorLeftInTextArea;
-
-		const left = Math.max(editorLayout.contentLeft, previewEditorLeft - horizontalScrollOffset);
-
-		const selectionTop = this._editor.getTopForLineNumber(range.startLineNumber) - this._editorObs.scrollTop.read(reader);
-		const selectionBottom = this._editor.getTopForLineNumber(range.endLineNumberExclusive) - this._editorObs.scrollTop.read(reader);
-
-		const codeLeft = editorLayout.contentLeft;
-
-		const code1 = new Point(left, selectionTop);
-		const codeStart1 = new Point(codeLeft, selectionTop);
-		const code2 = new Point(left, selectionBottom);
-		const codeStart2 = new Point(codeLeft, selectionBottom);
-		const codeHeight = selectionBottom - selectionTop;
-
-		const codeEditDistRange =
-			inlineEdit.modifiedLineRange.length === inlineEdit.originalLineRange.length
-				? new OffsetRange(4, 61)
-				: new OffsetRange(60, 61);
-
-		const clipped = dist === 0;
-
-		const codeEditDist = codeEditDistRange.clip(dist);
-		const editHeight = this._editor.getOption(EditorOption.lineHeight) * inlineEdit.modifiedLineRange.length;
-
-		const edit1 = new Point(left + codeEditDist, selectionTop);
-		const edit2 = new Point(left + codeEditDist, selectionTop + editHeight);
-
-		return {
-			code1,
-			codeStart1,
-			code2,
-			codeStart2,
-			codeHeight,
-
-			edit1,
-			edit2,
-			editHeight,
-			previewEditorLeft,
-			maxContentWidth,
-			shouldShowShadow: clipped,
-		};
-	});
-
-	// #endregion
-
-	private readonly _inlineDiffViewState = derived<IOriginalEditorInlineDiffViewState | undefined>(this, reader => {
-		const e = this._uiState.read(reader);
-		if (!e) { return undefined; }
-
-		return {
-			modifiedText: new StringText(e.newText),
-			diff: e.diff,
-			mode: e.state === 'collapsed' ? 'sideBySide' : e.state,
-			modifiedCodeEditor: this._previewEditor,
-		};
-	});
-	protected readonly _inlineDiffView = this._register(new OriginalEditorInlineDiffView(this._editor, this._inlineDiffViewState, this._previewTextModel));
-
-	protected readonly _indicator = this._register(new InlineEditsIndicator(
-		this._editorObs,
-		derived<IInlineEditsIndicatorState | undefined>(reader => {
-			const state = this._uiState.read(reader);
-			const edit1 = this._previewEditorLayoutInfo.read(reader)?.edit1;
-			if (!edit1 || !state) { return undefined; }
-			return { editTopLeft: edit1, showAlways: state.state !== 'sideBySide' };
-		}),
-		this._model,
-	));
-}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
new file mode 100644
index 00000000000..90f026719a3
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
@@ -0,0 +1,531 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { ActionViewItem } from '../../../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { IAction } from '../../../../../../base/common/actions.js';
+import { Color } from '../../../../../../base/common/color.js';
+import { structuralEquals } from '../../../../../../base/common/equals.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { IObservable, constObservable, derived, autorun, derivedOpts, observableValue } from '../../../../../../base/common/observable.js';
+import { MenuId, MenuItemAction } from '../../../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { diffRemoved, diffInserted } from '../../../../../../platform/theme/common/colorRegistry.js';
+import { registerColor, darken, lighten } from '../../../../../../platform/theme/common/colorUtils.js';
+import { ICodeEditor } from '../../../../../browser/editorBrowser.js';
+import { observableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
+import { EmbeddedCodeEditorWidget } from '../../../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { EditorOption } from '../../../../../common/config/editorOptions.js';
+import { editorLineHighlightBorder } from '../../../../../common/core/editorColorRegistry.js';
+import { LineRange } from '../../../../../common/core/lineRange.js';
+import { OffsetRange } from '../../../../../common/core/offsetRange.js';
+import { Range } from '../../../../../common/core/range.js';
+import { Command } from '../../../../../common/languages.js';
+import { ITextModel } from '../../../../../common/model.js';
+import { CustomizedMenuWorkbenchToolBar } from '../../hintsWidget/inlineCompletionsHintsWidget.js';
+import { InlineEditWithChanges } from './viewAndDiffProducer.js';
+import { StatusBarViewItem, maxContentWidthInRange, getOffsetForPos, Point, n, PathBuilder, mapOutFalsy } from './utils.js';
+
+
+export const originalBackgroundColor = registerColor(
+	'inlineEdit.originalBackground',
+	Color.transparent,
+	'',
+	true
+);
+export const modifiedBackgroundColor = registerColor(
+	'inlineEdit.modifiedBackground',
+	Color.transparent,
+	'',
+	true
+);
+
+export const originalChangedLineBackgroundColor = registerColor(
+	'inlineEdit.originalChangedLineBackground',
+	Color.transparent,
+	'',
+	true
+);
+
+export const originalChangedTextOverlayColor = registerColor(
+	'inlineEdit.originalChangedTextBackground',
+	diffRemoved,
+	'',
+	true
+);
+
+export const modifiedChangedLineBackgroundColor = registerColor(
+	'inlineEdit.modifiedChangedLineBackground',
+	Color.transparent,
+	'',
+	true
+);
+
+export const modifiedChangedTextOverlayColor = registerColor(
+	'inlineEdit.modifiedChangedTextBackground',
+	diffInserted,
+	'',
+	true
+);
+
+export const originalBorder = registerColor(
+	'inlineEdit.originalBorder',
+	{
+		light: darken(editorLineHighlightBorder, 0.15),
+		dark: lighten(editorLineHighlightBorder, 0.50),
+		hcDark: editorLineHighlightBorder,
+		hcLight: editorLineHighlightBorder
+	},
+	''
+);
+
+export const modifiedBorder = registerColor(
+	'inlineEdit.modifiedBorder',
+	{
+		light: darken(editorLineHighlightBorder, 0.15),
+		dark: lighten(editorLineHighlightBorder, 0.50),
+		hcDark: editorLineHighlightBorder,
+		hcLight: editorLineHighlightBorder
+	},
+	''
+);
+
+export class InlineEditsSideBySideDiff extends Disposable {
+	private readonly _editorObs = observableCodeEditor(this._editor);
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		private readonly _edit: IObservable<InlineEditWithChanges | undefined>,
+		private readonly _previewTextModel: ITextModel,
+		private readonly _uiState: IObservable<{
+			edit: InlineEditWithChanges;
+			newTextLineCount: number;
+			originalDisplayRange: LineRange;
+		} | undefined>,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@ICommandService private readonly _commandService: ICommandService
+	) {
+		super();
+
+		this._register(this._editorObs.createOverlayWidget({
+			domNode: this._overflowView.element,
+			position: constObservable(null),
+			allowEditorOverflow: true,
+			minContentWidthInPx: constObservable(0),
+		}));
+
+		this._register(this._editorObs.createOverlayWidget({
+			domNode: this._nonOverflowView.element,
+			position: constObservable(null),
+			allowEditorOverflow: false,
+			minContentWidthInPx: derived(reader => {
+				const x = this._previewEditorLayoutInfo.read(reader)?.maxContentWidth;
+				if (x === undefined) { return 0; }
+				return x;
+			}),
+		}));
+
+		this.previewEditor.setModel(this._previewTextModel);
+
+		this._register(autorun(reader => {
+
+			const layoutInfo = this._previewEditorLayoutInfo.read(reader);
+			if (!layoutInfo) {
+				//this._elements.svg.replaceChildren();
+				return;
+			}
+
+			const editHeight = layoutInfo.editHeight;
+			const width = this._previewEditorWidth.read(reader);
+			this.previewEditor.layout({ height: editHeight, width });
+
+			const topEdit = layoutInfo.edit1;
+			this._editorContainer.element.style.top = `${topEdit.y}px`;
+			this._editorContainer.element.style.left = `${topEdit.x}px`;
+		}));
+
+		/*const toolbarDropdownVisible = observableFromEvent(this, this._toolbar.onDidChangeDropdownVisibility, (e) => e ?? false);
+
+		this._register(autorun(reader => {
+			this._elements.root.classList.toggle('toolbarDropdownVisible', toolbarDropdownVisible.read(reader));
+		}));*/
+
+		this._editorContainerTopLeft.set(this._previewEditorLayoutInfo.map(i => i?.edit1), undefined);
+	}
+
+	private readonly previewRef = n.ref<HTMLDivElement>();
+	private readonly toolbarRef = n.ref<HTMLDivElement>();
+
+	private readonly _editorContainerTopLeft = observableValue<IObservable<Point | undefined> | undefined>(this, undefined);
+
+	private readonly _editorContainer = n.div({
+		class: 'editorContainer',
+		style: { position: 'absolute' },
+	}, [
+		n.div({ class: 'preview', style: {}, ref: this.previewRef }),
+		n.div({ class: 'toolbar', style: {}, ref: this.toolbarRef }),
+	]).keepUpdated(this._store);
+
+	protected readonly _toolbar = this._register(this._instantiationService.createInstance(CustomizedMenuWorkbenchToolBar, this.toolbarRef.element, MenuId.InlineEditsActions, {
+		menuOptions: { renderShortTitle: true },
+		toolbarOptions: {
+			primaryGroup: g => g.startsWith('primary'),
+		},
+		actionViewItemProvider: (action, options) => {
+			if (action instanceof MenuItemAction) {
+				return this._instantiationService.createInstance(StatusBarViewItem, action, undefined);
+			}
+			if (action.class === undefined) {
+				return this._instantiationService.createInstance(ActionViewItem, {}, action, { icon: false });
+			}
+			return undefined;
+		},
+		telemetrySource: 'inlineEditsToolbar'
+	}));
+
+	private readonly _extraCommands = derivedOpts<readonly Command[]>({ owner: this, equalsFn: structuralEquals }, reader => {
+		return this._uiState.read(reader)?.edit.commands ?? [];
+	});
+
+	protected readonly _updateToolbarAutorun = this._register(autorun(reader => {
+		/** @description extra commands */
+		const extraCommands = this._extraCommands.read(reader);
+		const primaryExtraActions: IAction[] = [];
+		const secondaryExtraActions: IAction[] = [];
+		for (const c of extraCommands) {
+			const action: IAction = {
+				class: undefined,
+				id: c.id,
+				enabled: true,
+				tooltip: c.tooltip || '',
+				label: c.title,
+				run: (event) => {
+					return this._commandService.executeCommand(c.id, ...(c.arguments ?? []));
+				},
+			};
+			// TODO this is a hack just to make the feedback action more visible.
+			if (c.title.toLowerCase().indexOf('feedback') !== -1) {
+				primaryExtraActions.push(action);
+			} else {
+				secondaryExtraActions.push(action);
+			}
+		}
+
+		this._toolbar.setAdditionalPrimaryActions(primaryExtraActions);
+		this._toolbar.setAdditionalSecondaryActions(secondaryExtraActions);
+	}));
+
+	public readonly previewEditor = this._register(this._instantiationService.createInstance(
+		EmbeddedCodeEditorWidget,
+		this.previewRef.element,
+		{
+			glyphMargin: false,
+			lineNumbers: 'off',
+			minimap: { enabled: false },
+			guides: {
+				indentation: false,
+				bracketPairs: false,
+				bracketPairsHorizontal: false,
+				highlightActiveIndentation: false,
+			},
+			folding: false,
+			selectOnLineNumbers: false,
+			selectionHighlight: false,
+			columnSelection: false,
+			overviewRulerBorder: false,
+			overviewRulerLanes: 0,
+			lineDecorationsWidth: 0,
+			lineNumbersMinChars: 0,
+			bracketPairColorization: { enabled: true, independentColorPoolPerBracketType: false },
+			scrollBeyondLastLine: false,
+			scrollbar: {
+				vertical: 'hidden',
+				horizontal: 'hidden',
+				handleMouseWheel: false,
+			},
+			readOnly: true,
+			wordWrap: 'off',
+		},
+		{ contributions: [], },
+		this._editor
+	));
+
+	private readonly _previewEditorObs = observableCodeEditor(this.previewEditor);
+
+	private readonly _updatePreviewEditor = derived(reader => {
+		this._editorContainer.readEffect(reader);
+
+		const uiState = this._uiState.read(reader);
+		if (!uiState) {
+			return;
+		}
+
+		const range = uiState.edit.originalLineRange;
+
+		const hiddenAreas: Range[] = [];
+		if (range.startLineNumber > 1) {
+			hiddenAreas.push(new Range(1, 1, range.startLineNumber - 1, 1));
+		}
+		if (range.startLineNumber + uiState.newTextLineCount < this._previewTextModel.getLineCount() + 1) {
+			hiddenAreas.push(new Range(range.startLineNumber + uiState.newTextLineCount, 1, this._previewTextModel.getLineCount() + 1, 1));
+		}
+
+		this.previewEditor.setHiddenAreas(hiddenAreas, undefined, true);
+
+	}).recomputeInitiallyAndOnChange(this._store);
+
+	private readonly _previewEditorWidth = derived(this, reader => {
+		const edit = this._edit.read(reader);
+		if (!edit) { return 0; }
+		this._updatePreviewEditor.read(reader);
+
+		return maxContentWidthInRange(this._previewEditorObs, edit.modifiedLineRange, reader) + 10;
+	});
+
+	private readonly _cursorPosIfTouchesEdit = derived(this, reader => {
+		const cursorPos = this._editorObs.cursorPosition.read(reader);
+		const edit = this._edit.read(reader);
+		if (!edit || !cursorPos) { return undefined; }
+		return edit.modifiedLineRange.contains(cursorPos.lineNumber) ? cursorPos : undefined;
+	});
+
+	/**
+	 * ![test](./layout.dio.svg)
+	*/
+	private readonly _previewEditorLayoutInfo = derived(this, (reader) => {
+		const inlineEdit = this._edit.read(reader);
+		if (!inlineEdit) {
+			return null;
+		}
+		const state = this._uiState.read(reader);
+		if (!state) {
+			return null;
+		}
+
+		const range = inlineEdit.originalLineRange;
+
+		const horizontalScrollOffset = this._editorObs.scrollLeft.read(reader);
+
+		const editorContentMaxWidthInRange = maxContentWidthInRange(this._editorObs, state.originalDisplayRange, reader);
+		const editorLayout = this._editorObs.layoutInfo.read(reader);
+		const previewWidth = this._previewEditorWidth.read(reader);
+		const editorContentAreaWidth = editorLayout.width - editorLayout.contentLeft - editorLayout.minimap.minimapWidth - editorLayout.verticalScrollbarWidth;
+
+		const cursorPos = this._cursorPosIfTouchesEdit.read(reader);
+
+		const maxPreviewEditorLeft = Math.max(
+			editorContentAreaWidth * 0.65 + horizontalScrollOffset - 10,
+			editorContentAreaWidth - previewWidth - 70 + horizontalScrollOffset - 10,
+			cursorPos ? getOffsetForPos(this._editorObs, cursorPos, reader) + 50 : 0
+		);
+		const previewEditorLeftInTextArea = Math.min(editorContentMaxWidthInRange + 20, maxPreviewEditorLeft);
+
+		const previewEditorLeft = editorLayout.contentLeft + previewEditorLeftInTextArea;
+		const maxContentWidth = editorContentMaxWidthInRange + 20 + previewWidth + 70;
+
+		const dist = maxPreviewEditorLeft - previewEditorLeftInTextArea;
+
+		const left = Math.max(editorLayout.contentLeft, previewEditorLeft - horizontalScrollOffset);
+
+		const selectionTop = this._editor.getTopForLineNumber(range.startLineNumber) - this._editorObs.scrollTop.read(reader);
+		const selectionBottom = this._editor.getTopForLineNumber(range.endLineNumberExclusive) - this._editorObs.scrollTop.read(reader);
+
+		const codeLeft = editorLayout.contentLeft;
+
+		const code1 = new Point(left, selectionTop);
+		const codeStart1 = new Point(codeLeft, selectionTop);
+		const code2 = new Point(left, selectionBottom);
+		const codeStart2 = new Point(codeLeft, selectionBottom);
+		const codeHeight = selectionBottom - selectionTop;
+
+		const codeEditDistRange = inlineEdit.modifiedLineRange.length === inlineEdit.originalLineRange.length
+			? new OffsetRange(4, 61)
+			: new OffsetRange(60, 61);
+
+		const clipped = dist === 0;
+
+		const codeEditDist = codeEditDistRange.clip(dist);
+		const editHeight = this._editor.getOption(EditorOption.lineHeight) * inlineEdit.modifiedLineRange.length;
+
+		const edit1 = new Point(left + codeEditDist, selectionTop);
+		const edit2 = new Point(left + codeEditDist, selectionTop + editHeight);
+
+		return {
+			code1,
+			codeStart1,
+			code2,
+			codeStart2,
+			codeHeight,
+
+			edit1,
+			edit2,
+			editHeight,
+			previewEditorLeft,
+			maxContentWidth,
+			shouldShowShadow: clipped,
+		};
+	});
+
+	private readonly _shouldOverflow = derived(reader => {
+		const range = this._edit.read(reader)?.originalLineRange;
+		if (!range) {
+			return false;
+		}
+		const top = this._editor.getTopForLineNumber(range.startLineNumber) - this._editorObs.scrollTop.read(reader);
+		return top > 0;
+	});
+
+
+	private readonly _extendedModifiedPath = derived(reader => {
+		const layoutInfo = this._previewEditorLayoutInfo.read(reader);
+		if (!layoutInfo) { return undefined; }
+		const width = this._previewEditorWidth.read(reader);
+		const extendedModifiedPathBuilder = new PathBuilder()
+			.moveTo(layoutInfo.code1)
+			.lineTo(layoutInfo.edit1)
+			.lineTo(layoutInfo.edit1.deltaX(width))
+			.lineTo(layoutInfo.edit2.deltaX(width))
+			.lineTo(layoutInfo.edit2);
+		if (layoutInfo.edit2.y !== layoutInfo.code2.y) {
+			extendedModifiedPathBuilder.curveTo2(layoutInfo.edit2.deltaX(-20), layoutInfo.code2.deltaX(20), layoutInfo.code2.deltaX(0));
+		}
+		extendedModifiedPathBuilder.lineTo(layoutInfo.code2);
+		return extendedModifiedPathBuilder.build();
+	});
+
+	private readonly _backgroundSvg = n.svg({
+		transform: 'translate(-0.5 -0.5)',
+		style: { overflow: 'visible', pointerEvents: 'none', position: 'absolute' },
+	}, [
+		n.svgElem('path', {
+			class: 'extendedModifiedBackgroundCoverUp',
+			d: this._extendedModifiedPath,
+			style: {
+				fill: 'var(--vscode-editor-background, transparent)',
+				strokeWidth: '1px',
+			}
+		}),
+		n.svgElem('path', {
+			class: 'rightOfModifiedBackgroundCoverUp',
+			d: this._previewEditorLayoutInfo.map(layoutInfo => layoutInfo && new PathBuilder()
+				.moveTo(layoutInfo.code1)
+				.lineTo(layoutInfo.code1.deltaX(1000))
+				.lineTo(layoutInfo.code2.deltaX(1000))
+				.lineTo(layoutInfo.code2)
+				.build()
+			),
+			style: {
+				fill: 'var(--vscode-editor-background, transparent)',
+			}
+		}),
+	]).keepUpdated(this._store);
+
+	private readonly _foregroundSvg = n.svg({
+		transform: 'translate(-0.5 -0.5)',
+		style: { overflow: 'visible', pointerEvents: 'none', position: 'absolute' },
+	}, derived(reader => {
+		const layoutInfoObs = mapOutFalsy(this._previewEditorLayoutInfo).read(reader);
+		if (!layoutInfoObs) { return undefined; }
+
+		const shadowWidth = 6;
+		return [
+			n.svgElem('path', {
+				class: 'originalOverlay',
+				d: layoutInfoObs.map(layoutInfo => new PathBuilder()
+					.moveTo(layoutInfo.code2)
+					.lineTo(layoutInfo.codeStart2)
+					.lineTo(layoutInfo.codeStart1)
+					.lineTo(layoutInfo.code1)
+					.build()
+				),
+				style: {
+					fill: 'var(--vscode-inlineEdit-originalBackground, transparent)',
+					stroke: 'var(--vscode-inlineEdit-originalBorder)',
+					strokeWidth: '1px',
+				}
+			}),
+
+			n.svgElem('path', {
+				class: 'extendedModifiedOverlay',
+				d: this._extendedModifiedPath,
+				style: {
+					fill: 'var(--vscode-inlineEdit-modifiedBackground, transparent)',
+					stroke: 'var(--vscode-inlineEdit-modifiedBorder)',
+					strokeWidth: '1px',
+				}
+			}),
+
+			...(!layoutInfoObs.map(i => i.shouldShowShadow).read(reader)
+				? [
+					n.svgElem('path', {
+						class: 'middleBorder',
+						d: layoutInfoObs.map(layoutInfo => new PathBuilder()
+							.moveTo(layoutInfo.code1)
+							.lineTo(layoutInfo.code2)
+							.build()
+						),
+						style: {
+							stroke: 'var(--vscode-inlineEdit-modifiedBorder)',
+							strokeWidth: '1px'
+						}
+					})
+				]
+				: [
+					n.svgElem('defs', {}, [
+						n.svgElem('linearGradient', { id: 'gradient', x1: '0%', x2: '100%', }, [
+							n.svgElem('stop', {
+								offset: '0%',
+								style: { stopColor: 'var(--vscode-inlineEdit-modifiedBorder)', stopOpacity: '0', }
+							}),
+							n.svgElem('stop', {
+								offset: '100%',
+								style: { stopColor: 'var(--vscode-inlineEdit-modifiedBorder)', stopOpacity: '1', }
+							})
+						])
+					]),
+					n.svgElem('rect', {
+						class: 'middleBorderWithShadow',
+						x: layoutInfoObs.map(layoutInfo => layoutInfo.code1.x - shadowWidth),
+						y: layoutInfoObs.map(layoutInfo => layoutInfo.code1.y),
+						width: shadowWidth,
+						height: layoutInfoObs.map(layoutInfo => layoutInfo.code2.y - layoutInfo.code1.y),
+						fill: 'url(#gradient)',
+						style: { strokeWidth: '0', stroke: 'transparent', }
+					})
+				]
+			)
+		];
+	})).keepUpdated(this._store);
+
+	private readonly _display = derived(this, reader => !!this._uiState.read(reader) ? 'block' : 'none');
+
+	private readonly _nonOverflowView = n.div({
+		class: 'inline-edits-view',
+		style: {
+			position: 'absolute',
+			overflow: 'visible',
+			top: '0px',
+			left: '0px',
+			zIndex: '0',
+			display: this._display,
+		},
+	}, [
+		this._backgroundSvg,
+		derived(this, reader => this._shouldOverflow.read(reader) ? [] : [this._editorContainer, this._foregroundSvg]),
+	]).keepUpdated(this._store);
+
+	private readonly _overflowView = n.div({
+		class: 'inline-edits-view',
+		style: {
+			position: 'absolute',
+			overflow: 'visible',
+			top: '0px',
+			left: '0px',
+			zIndex: '100',
+			display: this._display,
+		},
+	}, [
+		derived(this, reader => this._shouldOverflow.read(reader) ? [this._editorContainer, this._foregroundSvg] : []),
+	]).keepUpdated(this._store);
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
index bd79ca27bf7..e350ade4807 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
@@ -3,11 +3,11 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { h } from '../../../../../../base/browser/dom.js';
+import { h, isSVGElement } from '../../../../../../base/browser/dom.js';
 import { KeybindingLabel, unthemedKeybindingLabelOptions } from '../../../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
 import { numberComparator } from '../../../../../../base/common/arrays.js';
 import { findFirstMin } from '../../../../../../base/common/arraysFind.js';
-import { IReader } from '../../../../../../base/common/observable.js';
+import { derived, IObservable, IReader } from '../../../../../../base/common/observable.js';
 import { OS } from '../../../../../../base/common/platform.js';
 import { splitLines, getIndentationLength } from '../../../../../../base/common/strings.js';
 import { URI } from '../../../../../../base/common/uri.js';
@@ -19,6 +19,8 @@ import { SingleTextEdit, TextEdit } from '../../../../../common/core/textEdit.js
 import { RangeMapping } from '../../../../../common/diff/rangeMapping.js';
 import { Range } from '../../../../../common/core/range.js';
 import { Position } from '../../../../../common/core/position.js';
+import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { BugIndicatingError } from '../../../../../../base/common/errors.js';
 
 export function maxContentWidthInRange(editor: ObservableCodeEditor, range: LineRange, reader: IReader): number {
 	editor.layoutInfo.read(reader);
@@ -170,3 +172,267 @@ export class PathBuilder {
 		return this._data;
 	}
 }
+
+type Value<T> = T | IObservable<T>;
+type ValueOrList<T> = Value<T> | Value<T>[];
+type ValueOrList2<T> = ValueOrList<T> | ValueOrList<ValueOrList<T>>;
+
+type Element = HTMLElement | SVGElement;
+
+type SVGElementTagNameMap2 = {
+	svg: SVGElement & {
+		width: number;
+		height: number;
+		transform: string;
+	};
+	path: SVGElement & {
+		d: string;
+	};
+	linearGradient: SVGElement & {
+		id: string;
+		x1: string | number;
+		x2: string | number;
+	};
+	stop: SVGElement & {
+		offset: string;
+	};
+	rect: SVGElement & {
+		x: number;
+		y: number;
+		width: number;
+		height: number;
+		fill: string;
+	};
+	defs: SVGElement;
+};
+
+type DomTagCreateFn<TMap extends Record<string, any>> =
+	<TTag extends keyof TMap>(
+		tag: TTag,
+		attributes: ElementAttributeKeys<TMap[TTag]> & { class?: Value<string | string[]>; ref?: IRef<TMap[TTag]> },
+		children?: ValueOrList2<Element | string | ObserverNode | undefined>,
+	) => ObserverNode<TMap[TTag]>;
+
+type DomCreateFn<TAttributes, TResult extends Element> =
+	(
+		attributes: ElementAttributeKeys<TAttributes> & { class?: Value<string | string[]>; ref?: IRef<TResult> },
+		children?: ValueOrList2<Element | string | ObserverNode | undefined>,
+	) => ObserverNode<TResult>;
+
+export namespace n {
+	function nodeNs<TMap extends Record<string, any>>(elementNs: string | undefined = undefined): DomTagCreateFn<TMap> {
+		return (tag, attributes, children) => {
+			const className = attributes.class;
+			delete attributes.class;
+			const ref = attributes.ref;
+			delete attributes.ref;
+
+			return new ObserverNodeWithElement(tag as any, ref, elementNs, className, attributes, children);
+		};
+	}
+
+	function node<TMap extends Record<string, any>, TKey extends keyof TMap>(tag: TKey, elementNs: string | undefined = undefined): DomCreateFn<TMap[TKey], TMap[TKey]> {
+		const f = nodeNs(elementNs) as any;
+		return (attributes, children) => {
+			return f(tag, attributes, children);
+		};
+	}
+
+	export const div: DomCreateFn<HTMLDivElement, HTMLDivElement> = node<HTMLElementTagNameMap, 'div'>('div');
+	export const svg: DomCreateFn<SVGElementTagNameMap2['svg'], SVGElement> = node<SVGElementTagNameMap2, 'svg'>('svg', 'http://www.w3.org/2000/svg');
+
+	export const svgElem = nodeNs<SVGElementTagNameMap2>('http://www.w3.org/2000/svg');
+
+	export function ref<T = Element>(): Ref<T> {
+		return new Ref<T>();
+	}
+}
+
+export interface IRef<T> {
+	setValue(value: T): void;
+}
+
+export class Ref<T> implements IRef<T> {
+	private _value: T | undefined = undefined;
+
+	public setValue(value: T): void {
+		this._value = value;
+	}
+
+	public get element(): T {
+		if (!this._value) {
+			throw new BugIndicatingError('Make sure the ref is set before accessing the element. Maybe wrong initialization order?');
+		}
+		return this._value;
+	}
+}
+
+export abstract class ObserverNode<T extends Element = Element> extends Disposable {
+	private readonly _deriveds: (IObservable<any>)[] = [];
+
+	protected readonly _element: T;
+
+	constructor(
+		tag: string,
+		ref: IRef<T> | undefined,
+		ns: string | undefined,
+		className: Value<string | string[]> | undefined,
+		attributes: ElementAttributeKeys<T>,
+		children: ValueOrList2<Element | string | ObserverNode | undefined> | undefined,
+	) {
+		super();
+
+		this._element = (ns ? document.createElementNS(ns, tag) : document.createElement(tag)) as unknown as T;
+		if (ref) {
+			ref.setValue(this._element);
+		}
+
+		function setClassName(domNode: Element, className: string | string[]) {
+			if (isSVGElement(domNode)) {
+				if (Array.isArray(className)) {
+					domNode.setAttribute('class', className.join(' '));
+				} else {
+					domNode.setAttribute('class', className);
+				}
+			} else {
+				if (Array.isArray(className)) {
+					domNode.className = className.join(' ');
+				} else {
+					domNode.className = className;
+				}
+			}
+		}
+
+		if (className) {
+			if (isObservable(className)) {
+				this._deriveds.push(derived(this, reader => {
+					setClassName(this._element, className.read(reader));
+				}));
+			} else {
+				setClassName(this._element, className);
+			}
+		}
+
+		function convertCssValue(value: any): string {
+			if (typeof value === 'number') {
+				return value + 'px';
+			}
+			return value;
+		}
+
+		for (const [key, value] of Object.entries(attributes)) {
+			if (key === 'style') {
+				for (const [cssKey, cssValue] of Object.entries(value)) {
+					const key = camelCaseToHyphenCase(cssKey);
+					if (isObservable(cssValue)) {
+						this._deriveds.push(derived(this, reader => {
+							this._element.style.setProperty(key, convertCssValue(cssValue.read(reader)));
+						}));
+					} else {
+						this._element.style.setProperty(key, convertCssValue(cssValue));
+					}
+				}
+			} else if (key === 'tabIndex') {
+				if (isObservable(value)) {
+					this._deriveds.push(derived(this, reader => {
+						this._element.tabIndex = value.read(reader) as any;
+					}));
+				} else {
+					this._element.tabIndex = value;
+				}
+			} else {
+				if (isObservable(value)) {
+					this._deriveds.push(derived(this, reader => {
+						this._element.setAttribute(camelCaseToHyphenCase(key), value.read(reader) as any);
+					}));
+				} else {
+					this._element.setAttribute(camelCaseToHyphenCase(key), value.toString());
+				}
+			}
+		}
+
+		function getChildren(reader: IReader | undefined, children: ValueOrList2<Element | string | ObserverNode | undefined>): (Element | string)[] {
+			if (isObservable(children)) {
+				return getChildren(reader, children.read(reader));
+			}
+			if (Array.isArray(children)) {
+				return children.flatMap(c => getChildren(reader, c));
+			}
+			if (children instanceof ObserverNode) {
+				if (reader) {
+					children.readEffect(reader);
+				}
+				return [children._element];
+			}
+			if (children) {
+				return [children];
+			}
+			return [];
+		}
+
+		function childrenIsObservable(children: ValueOrList2<Element | string | ObserverNode | undefined>): boolean {
+			if (isObservable(children)) {
+				return true;
+			}
+			if (Array.isArray(children)) {
+				return children.some(c => childrenIsObservable(c));
+			}
+			return false;
+		}
+
+		if (children) {
+			const d = derived(this, reader => {
+				this._element.replaceChildren(...getChildren(reader, children));
+			});
+			this._deriveds.push(d);
+			if (!childrenIsObservable(children)) {
+				d.get();
+			}
+		}
+	}
+
+	readEffect(reader: IReader | undefined): void {
+		for (const d of this._deriveds) {
+			d.read(reader);
+		}
+	}
+
+	keepUpdated(store: DisposableStore): ObserverNodeWithElement<T> {
+		derived(reader => {
+			this.readEffect(reader);
+		}).recomputeInitiallyAndOnChange(store);
+		return this as unknown as ObserverNodeWithElement<T>;
+	}
+}
+
+export class ObserverNodeWithElement<T extends Element = Element> extends ObserverNode<T> {
+	public get element() {
+		return this._element;
+	}
+}
+
+function camelCaseToHyphenCase(str: string) {
+	return str.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
+}
+
+function isObservable<T>(obj: any): obj is IObservable<T> {
+	return obj && typeof obj === 'object' && obj['read'] !== undefined && obj['reportChanges'] !== undefined;
+}
+
+type ElementAttributeKeys<T> = Partial<{
+	[K in keyof T]: T[K] extends Function
+	? never
+	: T[K] extends object
+	? ElementAttributeKeys<T[K]>
+	: Value<T[K] | undefined | null>
+}>;
+
+export function mapOutFalsy<T>(obs: IObservable<T | undefined | null | false>): IObservable<IObservable<T> | undefined | null | false> {
+	return derived(reader => {
+		const val = obs.read(reader);
+		if (!val) {
+			return undefined;
+		}
+		return obs as IObservable<T>;
+	});
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.css b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.css
similarity index 98%
rename from src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.css
rename to src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.css
index e4b742e9391..e5531dc7b4b 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.css
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.css
@@ -131,8 +131,6 @@
 					.current-line-margin {
 						border: none;
 					}
-
-					--vscode-editor-background: transparent;
 				}
 			}
 		}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.ts
new file mode 100644
index 00000000000..391cf7516b7
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.ts
@@ -0,0 +1,143 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { derived, IObservable } from '../../../../../../base/common/observable.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
+import { ICodeEditor } from '../../../../../browser/editorBrowser.js';
+import { observableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
+import { EditorOption } from '../../../../../common/config/editorOptions.js';
+import { LineRange } from '../../../../../common/core/lineRange.js';
+import { StringText } from '../../../../../common/core/textEdit.js';
+import { DetailedLineRangeMapping, lineRangeMappingFromRangeMappings, RangeMapping } from '../../../../../common/diff/rangeMapping.js';
+import { TextModel } from '../../../../../common/model/textModel.js';
+import './view.css';
+import { IOriginalEditorInlineDiffViewState, OriginalEditorInlineDiffView } from './inlineDiffView.js';
+import { applyEditToModifiedRangeMappings, createReindentEdit } from './utils.js';
+import { IInlineEditsIndicatorState, InlineEditsIndicator } from './indicatorView.js';
+import { InlineCompletionsModel } from '../../model/inlineCompletionsModel.js';
+import { InlineEditWithChanges } from './viewAndDiffProducer.js';
+import { InlineEditsSideBySideDiff } from './sideBySideDiff.js';
+
+export class InlineEditsView extends Disposable {
+	private readonly _editorObs = observableCodeEditor(this._editor);
+
+	private readonly _useMixedLinesDiff = observableCodeEditor(this._editor).getOption(EditorOption.inlineSuggest).map(s => s.edits.experimental.useMixedLinesDiff);
+	private readonly _useInterleavedLinesDiff = observableCodeEditor(this._editor).getOption(EditorOption.inlineSuggest).map(s => s.edits.experimental.useInterleavedLinesDiff);
+
+	constructor(
+		private readonly _editor: ICodeEditor,
+		private readonly _edit: IObservable<InlineEditWithChanges | undefined>,
+		private readonly _model: IObservable<InlineCompletionsModel | undefined>,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+	) {
+		super();
+	}
+
+	private readonly _uiState = derived<{
+		state: 'collapsed' | 'mixedLines' | 'interleavedLines' | 'sideBySide';
+		diff: DetailedLineRangeMapping[];
+		edit: InlineEditWithChanges;
+		newText: string;
+		newTextLineCount: number;
+		originalDisplayRange: LineRange;
+	} | undefined>(this, reader => {
+		const edit = this._edit.read(reader);
+		if (!edit) {
+			return undefined;
+		}
+
+		this._model.get()?.handleInlineCompletionShown(edit.inlineCompletion);
+
+		let mappings = RangeMapping.fromEdit(edit.edit);
+		let newText = edit.edit.apply(edit.originalText);
+		let diff = lineRangeMappingFromRangeMappings(mappings, edit.originalText, new StringText(newText));
+
+		let state: 'collapsed' | 'mixedLines' | 'interleavedLines' | 'sideBySide';
+		if (edit.isCollapsed) {
+			state = 'collapsed';
+		} else if (diff.every(m => OriginalEditorInlineDiffView.supportsInlineDiffRendering(m)) &&
+			(this._useMixedLinesDiff.read(reader) === 'whenPossible' || (edit.userJumpedToIt && this._useMixedLinesDiff.read(reader) === 'afterJumpWhenPossible'))) {
+			state = 'mixedLines';
+		} else if ((this._useInterleavedLinesDiff.read(reader) === 'always' || (edit.userJumpedToIt && this._useInterleavedLinesDiff.read(reader) === 'afterJump'))) {
+			state = 'interleavedLines';
+		} else {
+			state = 'sideBySide';
+		}
+
+		if (state === 'sideBySide') {
+			const indentationAdjustmentEdit = createReindentEdit(newText, edit.modifiedLineRange);
+			newText = indentationAdjustmentEdit.applyToString(newText);
+
+			mappings = applyEditToModifiedRangeMappings(mappings, indentationAdjustmentEdit);
+			diff = lineRangeMappingFromRangeMappings(mappings, edit.originalText, new StringText(newText));
+		}
+
+		const originalDisplayRange = edit.originalText.lineRange.intersect(
+			edit.originalLineRange.join(
+				LineRange.ofLength(edit.originalLineRange.startLineNumber, edit.lineEdit.newLines.length)
+			)
+		)!;
+
+		this._previewTextModel.setLanguage(this._editor.getModel()!.getLanguageId());
+		this._previewTextModel.setValue(newText);
+
+		return {
+			state,
+			diff,
+			edit,
+			newText,
+			newTextLineCount: edit.modifiedLineRange.length,
+			originalDisplayRange: originalDisplayRange,
+		};
+	});
+
+	private readonly _previewTextModel = this._register(this._instantiationService.createInstance(
+		TextModel,
+		'',
+		this._editor.getModel()!.getLanguageId(),
+		{ ...TextModel.DEFAULT_CREATION_OPTIONS, bracketPairColorizationOptions: { enabled: true, independentColorPoolPerBracketType: false } },
+		null
+	));
+
+	private readonly _sideBySide = this._register(this._instantiationService.createInstance(InlineEditsSideBySideDiff,
+		this._editor,
+		this._edit,
+		this._previewTextModel,
+		this._uiState.map(s => s && s.state === 'sideBySide' ? ({
+			edit: s.edit,
+			newTextLineCount: s.newTextLineCount,
+			originalDisplayRange: s.originalDisplayRange,
+		}) : undefined),
+	));
+
+	private readonly _inlineDiffViewState = derived<IOriginalEditorInlineDiffViewState | undefined>(this, reader => {
+		const e = this._uiState.read(reader);
+		if (!e) { return undefined; }
+
+		return {
+			modifiedText: new StringText(e.newText),
+			diff: e.diff,
+			mode: e.state === 'collapsed' ? 'sideBySide' : e.state,
+			modifiedCodeEditor: this._sideBySide.previewEditor,
+		};
+	});
+
+	protected readonly _inlineDiffView = this._register(new OriginalEditorInlineDiffView(this._editor, this._inlineDiffViewState, this._previewTextModel));
+
+	protected readonly _indicator = this._register(new InlineEditsIndicator(
+		this._editorObs,
+		derived<IInlineEditsIndicatorState | undefined>(reader => {
+			const state = this._uiState.read(reader);
+			if (!state) { return undefined; }
+
+			const range = state.originalDisplayRange;
+			const top = this._editor.getTopForLineNumber(range.startLineNumber) - this._editorObs.scrollTop.read(reader);
+
+			return { editTop: top, showAlways: state.state !== 'sideBySide' };
+		}),
+		this._model,
+	));
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewAndDiffProducer.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/viewAndDiffProducer.ts
similarity index 99%
rename from src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewAndDiffProducer.ts
rename to src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/viewAndDiffProducer.ts
index a4e52c22af7..3f31d826857 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewAndDiffProducer.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/viewAndDiffProducer.ts
@@ -23,7 +23,7 @@ import { IModelService } from '../../../../../common/services/model.js';
 import { InlineCompletionsModel } from '../../model/inlineCompletionsModel.js';
 import { InlineEdit } from '../../model/inlineEdit.js';
 import { InlineCompletionItem } from '../../model/provideInlineCompletions.js';
-import { InlineEditsView } from './inlineEditsView.js';
+import { InlineEditsView } from './view.js';
 import { UniqueUriGenerator } from './utils.js';
 
 export class InlineEditsViewAndDiffProducer extends Disposable {

From d3145c5087eeb8777b80cda7f38651e1242b2f81 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Thu, 12 Dec 2024 16:02:39 +0100
Subject: [PATCH 152/479] workspaceFolder variable substitution in launch.json
 or tasks.json should use URI for virtual filesystems (#235954)

Fixes #197377
---
 .../api/common/extHostVariableResolverService.ts    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/api/common/extHostVariableResolverService.ts b/src/vs/workbench/api/common/extHostVariableResolverService.ts
index 1acc6ab696f..47345d32b75 100644
--- a/src/vs/workbench/api/common/extHostVariableResolverService.ts
+++ b/src/vs/workbench/api/common/extHostVariableResolverService.ts
@@ -18,6 +18,7 @@ import { IConfigurationResolverService } from '../../services/configurationResol
 import { AbstractVariableResolverService } from '../../services/configurationResolver/common/variableResolver.js';
 import * as vscode from 'vscode';
 import { ExtHostConfigProvider, IExtHostConfiguration } from './extHostConfiguration.js';
+import { Schemas } from '../../../base/common/network.js';
 
 export interface IExtHostVariableResolverProvider {
 	readonly _serviceBrand: undefined;
@@ -83,7 +84,11 @@ class ExtHostVariableResolverService extends AbstractVariableResolverService {
 			getFilePath: (): string | undefined => {
 				const activeUri = getActiveUri();
 				if (activeUri) {
-					return path.normalize(activeUri.fsPath);
+					if (activeUri.scheme === Schemas.file) {
+						return path.normalize(activeUri.fsPath);
+					} else {
+						return activeUri.toString();
+					}
 				}
 				return undefined;
 			},
@@ -93,7 +98,11 @@ class ExtHostVariableResolverService extends AbstractVariableResolverService {
 					if (activeUri) {
 						const ws = workspaceService.getWorkspaceFolder(activeUri);
 						if (ws) {
-							return path.normalize(ws.uri.fsPath);
+							if (activeUri.scheme === Schemas.file) {
+								return path.normalize(ws.uri.fsPath);
+							} else {
+								return ws.uri.toString();
+							}
 						}
 					}
 				}

From 2de8e8ec77e13266c4f9e25abe73a2775ea27939 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 12 Dec 2024 16:31:21 +0100
Subject: [PATCH 153/479] fix https://github.com/microsoft/vscode/issues/216924
 (#235956)

---
 .../contrib/gotoError/browser/markerNavigationService.ts       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/vs/editor/contrib/gotoError/browser/markerNavigationService.ts b/src/vs/editor/contrib/gotoError/browser/markerNavigationService.ts
index 61b92a3e865..bb3be6eb6ac 100644
--- a/src/vs/editor/contrib/gotoError/browser/markerNavigationService.ts
+++ b/src/vs/editor/contrib/gotoError/browser/markerNavigationService.ts
@@ -137,6 +137,9 @@ export class MarkerList {
 		if (!found) {
 			// after the last change
 			this._nextIdx = fwd ? 0 : this._markers.length - 1;
+		} else if (found && !fwd) {
+			// we went past and have to go one back
+			this._nextIdx -= 1;
 		}
 		if (this._nextIdx < 0) {
 			this._nextIdx = this._markers.length - 1;

From ded87f9d8e5b59a4a0bc47745947c5154ad207f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Thu, 12 Dec 2024 16:46:14 +0100
Subject: [PATCH 154/479] update unique names generator (#235958)

---
 extensions/git/package-lock.json | 9 +++++----
 extensions/git/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
index b15b708e618..cf05db079db 100644
--- a/extensions/git/package-lock.json
+++ b/extensions/git/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@joaomoreno/unique-names-generator": "^5.1.0",
+        "@joaomoreno/unique-names-generator": "^5.2.0",
         "@vscode/extension-telemetry": "^0.9.0",
         "@vscode/iconv-lite-umd": "0.7.0",
         "byline": "^5.0.0",
@@ -31,9 +31,10 @@
       }
     },
     "node_modules/@joaomoreno/unique-names-generator": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@joaomoreno/unique-names-generator/-/unique-names-generator-5.1.0.tgz",
-      "integrity": "sha512-KEVThTpUIKPb7dBKJ9mJ3WYnD1mJZZsEinCSp9CVEPlWbDagurFv1RKRjvvujrLfJzsGc0HkBHS9W8Bughao4A==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@joaomoreno/unique-names-generator/-/unique-names-generator-5.2.0.tgz",
+      "integrity": "sha512-JEh3qZ85Z6syFvQlhRGRyTPI1M5VticiiP8Xl8EV0XfyfI4Mwzd6Zw28BBrEgUJCYv/cpKCQClVj3J8Tn0KFiA==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
diff --git a/extensions/git/package.json b/extensions/git/package.json
index 5e7caad22bb..81c825251a4 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -3470,7 +3470,7 @@
     ]
   },
   "dependencies": {
-    "@joaomoreno/unique-names-generator": "^5.1.0",
+    "@joaomoreno/unique-names-generator": "^5.2.0",
     "@vscode/extension-telemetry": "^0.9.0",
     "@vscode/iconv-lite-umd": "0.7.0",
     "byline": "^5.0.0",

From 4920694eceb2bf01b0e2316b0fbd2b965947d7e3 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Thu, 12 Dec 2024 16:48:37 +0100
Subject: [PATCH 155/479] fix #234843 (#235955)

* fix #234843

* fix lint error
---
 cli/src/bin/code/legacy_args.rs                   | 2 ++
 cli/src/commands/args.rs                          | 7 +++++++
 cli/src/tunnels/code_server.rs                    | 1 +
 src/vs/code/node/cliProcessMain.ts                | 2 +-
 src/vs/platform/environment/common/argv.ts        | 1 +
 src/vs/platform/environment/node/argv.ts          | 1 +
 src/vs/server/node/remoteExtensionHostAgentCli.ts | 2 +-
 src/vs/server/node/server.cli.ts                  | 1 +
 src/vs/server/node/serverEnvironmentService.ts    | 3 +++
 9 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/cli/src/bin/code/legacy_args.rs b/cli/src/bin/code/legacy_args.rs
index 0bd92c92fd3..b61611a8057 100644
--- a/cli/src/bin/code/legacy_args.rs
+++ b/cli/src/bin/code/legacy_args.rs
@@ -85,6 +85,8 @@ pub fn try_parse_legacy(
 				subcommand: ExtensionSubcommand::Install(InstallExtensionArgs {
 					id_or_path: exts,
 					pre_release: args.contains_key("pre-release"),
+					donot_include_pack_and_dependencies: args
+						.contains_key("do-not-include-pack-dependencies"),
 					force: args.contains_key("force"),
 				}),
 				desktop_code_options,
diff --git a/cli/src/commands/args.rs b/cli/src/commands/args.rs
index 21efc1c6667..b9f7b3b7875 100644
--- a/cli/src/commands/args.rs
+++ b/cli/src/commands/args.rs
@@ -293,6 +293,9 @@ impl ExtensionSubcommand {
 				if args.pre_release {
 					target.push("--pre-release".to_string());
 				}
+				if args.donot_include_pack_and_dependencies {
+					target.push("do-not-include-pack-dependencies".to_string());
+				}
 				if args.force {
 					target.push("--force".to_string());
 				}
@@ -333,6 +336,10 @@ pub struct InstallExtensionArgs {
 	#[clap(long)]
 	pub pre_release: bool,
 
+	/// Don't include installing pack and dependencies of the extension
+	#[clap(long)]
+	pub donot_include_pack_and_dependencies: bool,
+
 	/// Update to the latest version of the extension if it's already installed.
 	#[clap(long)]
 	pub force: bool,
diff --git a/cli/src/tunnels/code_server.rs b/cli/src/tunnels/code_server.rs
index d7d91a83c55..cf00bc42835 100644
--- a/cli/src/tunnels/code_server.rs
+++ b/cli/src/tunnels/code_server.rs
@@ -67,6 +67,7 @@ pub struct CodeServerArgs {
 	pub show_versions: bool,
 	pub category: Option<String>,
 	pub pre_release: bool,
+	pub donot_include_pack_and_dependencies: bool,
 	pub force: bool,
 	pub start_server: bool,
 	// connection tokens
diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
index decb23f830f..e6f25b20b53 100644
--- a/src/vs/code/node/cliProcessMain.ts
+++ b/src/vs/code/node/cliProcessMain.ts
@@ -286,7 +286,7 @@ class CliMain extends Disposable {
 
 		// Install Extension
 		else if (this.argv['install-extension'] || this.argv['install-builtin-extension']) {
-			const installOptions: InstallOptions = { isMachineScoped: !!this.argv['do-not-sync'], installPreReleaseVersion: !!this.argv['pre-release'], profileLocation };
+			const installOptions: InstallOptions = { isMachineScoped: !!this.argv['do-not-sync'], installPreReleaseVersion: !!this.argv['pre-release'], donotIncludePackAndDependencies: !!this.argv['do-not-include-pack-dependencies'], profileLocation };
 			return instantiationService.createInstance(ExtensionManagementCLI, new ConsoleLogger(LogLevel.Info, false)).installExtensions(this.asExtensionIdOrVSIX(this.argv['install-extension'] || []), this.asExtensionIdOrVSIX(this.argv['install-builtin-extension'] || []), installOptions, !!this.argv['force']);
 		}
 
diff --git a/src/vs/platform/environment/common/argv.ts b/src/vs/platform/environment/common/argv.ts
index 818021ff0c1..87825ee7d2c 100644
--- a/src/vs/platform/environment/common/argv.ts
+++ b/src/vs/platform/environment/common/argv.ts
@@ -82,6 +82,7 @@ export interface NativeParsedArgs {
 	'install-builtin-extension'?: string[]; // undefined or array of 1 or more
 	'uninstall-extension'?: string[]; // undefined or array of 1 or more
 	'update-extensions'?: boolean;
+	'do-not-include-pack-dependencies'?: boolean;
 	'locate-extension'?: string[]; // undefined or array of 1 or more
 	'enable-proposed-api'?: string[]; // undefined or array of 1 or more
 	'open-url'?: boolean;
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
index 379e327c646..4ef107c79bc 100644
--- a/src/vs/platform/environment/node/argv.ts
+++ b/src/vs/platform/environment/node/argv.ts
@@ -164,6 +164,7 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
 	'install-builtin-extension': { type: 'string[]' },
 	'force': { type: 'boolean' },
 	'do-not-sync': { type: 'boolean' },
+	'do-not-include-pack-dependencies': { type: 'boolean' },
 	'trace': { type: 'boolean' },
 	'trace-category-filter': { type: 'string' },
 	'trace-options': { type: 'string' },
diff --git a/src/vs/server/node/remoteExtensionHostAgentCli.ts b/src/vs/server/node/remoteExtensionHostAgentCli.ts
index cd1fca04f58..87ceb0788c9 100644
--- a/src/vs/server/node/remoteExtensionHostAgentCli.ts
+++ b/src/vs/server/node/remoteExtensionHostAgentCli.ts
@@ -152,7 +152,7 @@ class CliMain extends Disposable {
 
 		// Install Extension
 		else if (this.args['install-extension'] || this.args['install-builtin-extension']) {
-			const installOptions: InstallOptions = { isMachineScoped: !!this.args['do-not-sync'], installPreReleaseVersion: !!this.args['pre-release'] };
+			const installOptions: InstallOptions = { isMachineScoped: !!this.args['do-not-sync'], installPreReleaseVersion: !!this.args['pre-release'], donotIncludePackAndDependencies: !!this.args['do-not-include-pack-dependencies'] };
 			return extensionManagementCLI.installExtensions(this.asExtensionIdOrVSIX(this.args['install-extension'] || []), this.asExtensionIdOrVSIX(this.args['install-builtin-extension'] || []), installOptions, !!this.args['force']);
 		}
 
diff --git a/src/vs/server/node/server.cli.ts b/src/vs/server/node/server.cli.ts
index 654a769cd27..324a92bf937 100644
--- a/src/vs/server/node/server.cli.ts
+++ b/src/vs/server/node/server.cli.ts
@@ -71,6 +71,7 @@ const isSupportedForPipe = (optionId: keyof RemoteParsedArgs) => {
 		case 'update-extensions':
 		case 'list-extensions':
 		case 'force':
+		case 'do-not-include-pack-dependencies':
 		case 'show-versions':
 		case 'category':
 		case 'verbose':
diff --git a/src/vs/server/node/serverEnvironmentService.ts b/src/vs/server/node/serverEnvironmentService.ts
index 2770df603e5..b3e97edc704 100644
--- a/src/vs/server/node/serverEnvironmentService.ts
+++ b/src/vs/server/node/serverEnvironmentService.ts
@@ -69,6 +69,7 @@ export const serverOptions: OptionDescriptions<Required<ServerParsedArgs>> = {
 	'category': OPTIONS['category'],
 	'force': OPTIONS['force'],
 	'do-not-sync': OPTIONS['do-not-sync'],
+	'do-not-include-pack-dependencies': OPTIONS['do-not-include-pack-dependencies'],
 	'pre-release': OPTIONS['pre-release'],
 	'start-server': { type: 'boolean', cat: 'e', description: nls.localize('start-server', "Start the server when installing or uninstalling extensions. To be used in combination with 'install-extension', 'install-builtin-extension' and 'uninstall-extension'.") },
 
@@ -194,6 +195,8 @@ export interface ServerParsedArgs {
 	force?: boolean; // used by install-extension
 	'do-not-sync'?: boolean; // used by install-extension
 	'pre-release'?: boolean; // used by install-extension
+	'do-not-include-pack-dependencies'?: boolean; // used by install-extension
+
 
 	'start-server'?: boolean;
 

From 69e1fe0d55d416a8ce2c30d13ba7b120c526de8a Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Thu, 12 Dec 2024 16:54:22 +0100
Subject: [PATCH 156/479] fix #227446 - timeout request after 10s (#235960)

---
 .../extensionManagement/common/extensionGalleryService.ts  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
index 38e689b9b88..9a9157545ce 100644
--- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
@@ -1516,7 +1516,12 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
 			return { malicious: [], deprecated: {}, search: [] };
 		}
 
-		const context = await this.requestService.request({ type: 'GET', url: this.extensionsControlUrl }, CancellationToken.None);
+		const context = await this.requestService.request({
+			type: 'GET',
+			url: this.extensionsControlUrl,
+			timeout: 10000 /*10s*/
+		}, CancellationToken.None);
+
 		if (context.res.statusCode !== 200) {
 			throw new Error('Could not get extensions report.');
 		}

From 4182e343f05580cb8230e9e0fe180ec2f16804e0 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Thu, 12 Dec 2024 17:11:37 +0100
Subject: [PATCH 157/479] polish: adding dot (#235962)

---
 src/vs/editor/common/config/editorOptions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index 3fca8a3fc7b..8bd08d2ee1a 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -5703,7 +5703,7 @@ export const EditorOptions = {
 			nls.localize('editor.colorDecoratorActivatedOn.hover', "Make the color picker appear on hover of the color decorator"),
 			nls.localize('editor.colorDecoratorActivatedOn.click', "Make the color picker appear on click of the color decorator")
 		],
-		description: nls.localize('colorDecoratorActivatedOn', "Controls the condition to make a color picker appear from a color decorator")
+		description: nls.localize('colorDecoratorActivatedOn', "Controls the condition to make a color picker appear from a color decorator.")
 	})),
 	colorDecoratorsLimit: register(new EditorIntOption(
 		EditorOption.colorDecoratorsLimit, 'colorDecoratorsLimit', 500, 1, 1000000,

From eb79f015555c391313d120013bf0b01feaec84d4 Mon Sep 17 00:00:00 2001
From: leopardracer <136604165+leopardracer@users.noreply.github.com>
Date: Thu, 12 Dec 2024 18:17:36 +0200
Subject: [PATCH 158/479] Update snippetSession.ts

---
 src/vs/editor/contrib/snippet/browser/snippetSession.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/editor/contrib/snippet/browser/snippetSession.ts b/src/vs/editor/contrib/snippet/browser/snippetSession.ts
index 34bf99e7d4a..79cf57b3abf 100644
--- a/src/vs/editor/contrib/snippet/browser/snippetSession.ts
+++ b/src/vs/editor/contrib/snippet/browser/snippetSession.ts
@@ -471,7 +471,7 @@ export class SnippetSession {
 		const readClipboardText = () => clipboardText;
 
 		// know what text the overwrite[Before|After] extensions
-		// of the primary curser have selected because only when
+		// of the primary cursor have selected because only when
 		// secondary selections extend to the same text we can grow them
 		const firstBeforeText = model.getValueInRange(SnippetSession.adjustSelection(model, editor.getSelection(), overwriteBefore, 0));
 		const firstAfterText = model.getValueInRange(SnippetSession.adjustSelection(model, editor.getSelection(), 0, overwriteAfter));
@@ -530,7 +530,7 @@ export class SnippetSession {
 			]));
 
 			// store snippets with the index of their originating selection.
-			// that ensures the primiary cursor stays primary despite not being
+			// that ensures the primary cursor stays primary despite not being
 			// the one with lowest start position
 			edits[idx] = EditOperation.replace(snippetSelection, snippet.toString());
 			edits[idx].identifier = { major: idx, minor: 0 }; // mark the edit so only our undo edits will be used to generate end cursors

From 7b9ca91c54d7f364cc7bac35cfb4fd5c86ee0026 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Thu, 12 Dec 2024 17:43:34 +0100
Subject: [PATCH 159/479] Focus on editor after sticky scroll disabled
 (#235967)

focus on editor
---
 .../stickyScroll/browser/stickyScrollActions.ts  | 16 ++++++++++------
 .../browser/stickyScrollController.ts            |  5 +++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.ts
index 5065cd8667f..ce50821ebf7 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.ts
@@ -7,7 +7,7 @@ import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { EditorAction2, ServicesAccessor } from '../../../browser/editorExtensions.js';
 import { localize, localize2 } from '../../../../nls.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
-import { Action2, MenuId } from '../../../../platform/actions/common/actions.js';
+import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
@@ -15,7 +15,7 @@ import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { ICodeEditor } from '../../../browser/editorBrowser.js';
 import { StickyScrollController } from './stickyScrollController.js';
 
-export class ToggleStickyScroll extends Action2 {
+export class ToggleStickyScroll extends EditorAction2 {
 
 	constructor() {
 		super({
@@ -41,10 +41,14 @@ export class ToggleStickyScroll extends Action2 {
 		});
 	}
 
-	override async run(accessor: ServicesAccessor): Promise<void> {
+	async runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void> {
 		const configurationService = accessor.get(IConfigurationService);
 		const newValue = !configurationService.getValue('editor.stickyScroll.enabled');
-		return configurationService.updateValue('editor.stickyScroll.enabled', newValue);
+		const isFocused = StickyScrollController.get(editor)?.isFocused();
+		configurationService.updateValue('editor.stickyScroll.enabled', newValue);
+		if (isFocused) {
+			editor.focus();
+		}
 	}
 }
 
@@ -56,8 +60,8 @@ export class FocusStickyScroll extends EditorAction2 {
 		super({
 			id: 'editor.action.focusStickyScroll',
 			title: {
-				...localize2('focusStickyScroll', "Focus on the editor sticky scroll"),
-				mnemonicTitle: localize({ key: 'mifocusStickyScroll', comment: ['&& denotes a mnemonic'] }, "&&Focus Sticky Scroll"),
+				...localize2('focusStickyScroll', "Focus Editor Sticky Scroll"),
+				mnemonicTitle: localize({ key: 'mifocusEditorStickyScroll', comment: ['&& denotes a mnemonic'] }, "&&Focus Editor Sticky Scroll"),
 			},
 			precondition: ContextKeyExpr.and(ContextKeyExpr.has('config.editor.stickyScroll.enabled'), EditorContextKeys.stickyScrollVisible),
 			menu: [
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
index 4f94c670552..b5074c87786 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
@@ -33,6 +33,7 @@ import { FoldingModel, toggleCollapseState } from '../../folding/browser/folding
 export interface IStickyScrollController {
 	get stickyScrollCandidateProvider(): IStickyLineCandidateProvider;
 	get stickyScrollWidgetState(): StickyScrollWidgetState;
+	isFocused(): boolean;
 	focus(): void;
 	focusNext(): void;
 	focusPrevious(): void;
@@ -141,6 +142,10 @@ export class StickyScrollController extends Disposable implements IEditorContrib
 		this._onMouseDown = false;
 	}
 
+	public isFocused(): boolean {
+		return this._focused;
+	}
+
 	public focus(): void {
 		// If the mouse is down, do not focus on the sticky scroll
 		if (this._onMouseDown) {

From de13422f41e460a16c8b466283b30a4519f6f7df Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 12 Dec 2024 18:09:09 +0100
Subject: [PATCH 160/479] fix https://github.com/microsoft/vscode/issues/235965
 and some modernising (#235975)

---
 .../contrib/gotoError/browser/gotoError.ts    | 66 ++++++++------
 .../browser/markerNavigationService.ts        | 91 ++++++++++++-------
 2 files changed, 95 insertions(+), 62 deletions(-)

diff --git a/src/vs/editor/contrib/gotoError/browser/gotoError.ts b/src/vs/editor/contrib/gotoError/browser/gotoError.ts
index 6c121121be5..eea7aa4931a 100644
--- a/src/vs/editor/contrib/gotoError/browser/gotoError.ts
+++ b/src/vs/editor/contrib/gotoError/browser/gotoError.ts
@@ -128,40 +128,46 @@ export class MarkerController implements IEditorContribution {
 	}
 
 	showAtMarker(marker: IMarker): void {
-		if (this._editor.hasModel()) {
-			const model = this._getOrCreateModel(this._editor.getModel().uri);
-			model.resetIndex();
-			model.move(true, this._editor.getModel(), new Position(marker.startLineNumber, marker.startColumn));
-			if (model.selected) {
-				this._widget!.showAtMarker(model.selected.marker, model.selected.index, model.selected.total);
-			}
+		if (!this._editor.hasModel()) {
+			return;
+		}
+
+		const textModel = this._editor.getModel();
+		const model = this._getOrCreateModel(textModel.uri);
+		model.resetIndex();
+		model.move(true, textModel, new Position(marker.startLineNumber, marker.startColumn));
+		if (model.selected) {
+			this._widget!.showAtMarker(model.selected.marker, model.selected.index, model.selected.total);
 		}
 	}
 
-	async nagivate(next: boolean, multiFile: boolean) {
-		if (this._editor.hasModel()) {
-			const model = this._getOrCreateModel(multiFile ? undefined : this._editor.getModel().uri);
-			model.move(next, this._editor.getModel(), this._editor.getPosition());
-			if (!model.selected) {
-				return;
-			}
-			if (model.selected.marker.resource.toString() !== this._editor.getModel().uri.toString()) {
-				// show in different editor
-				this._cleanUp();
-				const otherEditor = await this._editorService.openCodeEditor({
-					resource: model.selected.marker.resource,
-					options: { pinned: false, revealIfOpened: true, selectionRevealType: TextEditorSelectionRevealType.NearTop, selection: model.selected.marker }
-				}, this._editor);
-
-				if (otherEditor) {
-					MarkerController.get(otherEditor)?.close();
-					MarkerController.get(otherEditor)?.nagivate(next, multiFile);
-				}
+	async navigate(next: boolean, multiFile: boolean) {
+		if (!this._editor.hasModel()) {
+			return;
+		}
 
-			} else {
-				// show in this editor
-				this._widget!.showAtMarker(model.selected.marker, model.selected.index, model.selected.total);
+		const textModel = this._editor.getModel();
+		const model = this._getOrCreateModel(multiFile ? undefined : textModel.uri);
+		model.move(next, textModel, this._editor.getPosition());
+		if (!model.selected) {
+			return;
+		}
+		if (model.selected.marker.resource.toString() !== textModel.uri.toString()) {
+			// show in different editor
+			this._cleanUp();
+			const otherEditor = await this._editorService.openCodeEditor({
+				resource: model.selected.marker.resource,
+				options: { pinned: false, revealIfOpened: true, selectionRevealType: TextEditorSelectionRevealType.NearTop, selection: model.selected.marker }
+			}, this._editor);
+
+			if (otherEditor) {
+				MarkerController.get(otherEditor)?.close();
+				MarkerController.get(otherEditor)?.navigate(next, multiFile);
 			}
+
+		} else {
+			// show in this editor
+			this._widget!.showAtMarker(model.selected.marker, model.selected.index, model.selected.total);
 		}
 	}
 }
@@ -178,7 +184,7 @@ class MarkerNavigationAction extends EditorAction {
 
 	async run(_accessor: ServicesAccessor, editor: ICodeEditor): Promise<void> {
 		if (editor.hasModel()) {
-			MarkerController.get(editor)?.nagivate(this._next, this._multiFile);
+			await MarkerController.get(editor)?.navigate(this._next, this._multiFile);
 		}
 	}
 }
diff --git a/src/vs/editor/contrib/gotoError/browser/markerNavigationService.ts b/src/vs/editor/contrib/gotoError/browser/markerNavigationService.ts
index bb3be6eb6ac..bc02d0a62fa 100644
--- a/src/vs/editor/contrib/gotoError/browser/markerNavigationService.ts
+++ b/src/vs/editor/contrib/gotoError/browser/markerNavigationService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { binarySearch } from '../../../../base/common/arrays.js';
+import { binarySearch2, equals } from '../../../../base/common/arrays.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { LinkedList } from '../../../../base/common/linkedList.js';
@@ -16,6 +16,7 @@ import { InstantiationType, registerSingleton } from '../../../../platform/insta
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { IMarker, IMarkerService, MarkerSeverity } from '../../../../platform/markers/common/markers.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { isEqual } from '../../../../base/common/resources.js';
 
 export class MarkerCoordinate {
 	constructor(
@@ -61,23 +62,39 @@ export class MarkerList {
 		};
 
 		const updateMarker = () => {
-			this._markers = this._markerService.read({
+			let newMarkers = this._markerService.read({
 				resource: URI.isUri(resourceFilter) ? resourceFilter : undefined,
 				severities: MarkerSeverity.Error | MarkerSeverity.Warning | MarkerSeverity.Info
 			});
 			if (typeof resourceFilter === 'function') {
-				this._markers = this._markers.filter(m => this._resourceFilter!(m.resource));
+				newMarkers = newMarkers.filter(m => this._resourceFilter!(m.resource));
 			}
-			this._markers.sort(compareMarker);
+			newMarkers.sort(compareMarker);
+
+			if (equals(newMarkers, this._markers, (a, b) =>
+				a.resource.toString() === b.resource.toString()
+				&& a.startLineNumber === b.startLineNumber
+				&& a.startColumn === b.startColumn
+				&& a.endLineNumber === b.endLineNumber
+				&& a.endColumn === b.endColumn
+				&& a.severity === b.severity
+				&& a.message === b.message
+			)) {
+				return false;
+			}
+
+			this._markers = newMarkers;
+			return true;
 		};
 
 		updateMarker();
 
 		this._dispoables.add(_markerService.onMarkerChanged(uris => {
 			if (!this._resourceFilter || uris.some(uri => this._resourceFilter!(uri))) {
-				updateMarker();
-				this._nextIdx = -1;
-				this._onDidChange.fire();
+				if (updateMarker()) {
+					this._nextIdx = -1;
+					this._onDidChange.fire();
+				}
 			}
 		}));
 	}
@@ -103,44 +120,54 @@ export class MarkerList {
 	}
 
 	private _initIdx(model: ITextModel, position: Position, fwd: boolean): void {
-		let found = false;
 
-		let idx = this._markers.findIndex(marker => marker.resource.toString() === model.uri.toString());
+		let idx = this._markers.findIndex(marker => isEqual(marker.resource, model.uri));
 		if (idx < 0) {
-			idx = binarySearch(this._markers, <any>{ resource: model.uri }, (a, b) => compare(a.resource.toString(), b.resource.toString()));
+			// ignore model, position because this will be a different file
+			idx = binarySearch2(this._markers.length, idx => compare(this._markers[idx].resource.toString(), model.uri.toString()));
 			if (idx < 0) {
 				idx = ~idx;
 			}
-		}
-
-		for (let i = idx; i < this._markers.length; i++) {
-			let range = Range.lift(this._markers[i]);
+			if (fwd) {
+				this._nextIdx = idx;
+			} else {
+				this._nextIdx = (this._markers.length + idx - 1) % this._markers.length;
+			}
+		} else {
+			// find marker for file
+			let found = false;
+			let wentPast = false;
+			for (let i = idx; i < this._markers.length; i++) {
+				let range = Range.lift(this._markers[i]);
+
+				if (range.isEmpty()) {
+					const word = model.getWordAtPosition(range.getStartPosition());
+					if (word) {
+						range = new Range(range.startLineNumber, word.startColumn, range.startLineNumber, word.endColumn);
+					}
+				}
 
-			if (range.isEmpty()) {
-				const word = model.getWordAtPosition(range.getStartPosition());
-				if (word) {
-					range = new Range(range.startLineNumber, word.startColumn, range.startLineNumber, word.endColumn);
+				if (position && (range.containsPosition(position) || position.isBeforeOrEqual(range.getStartPosition()))) {
+					this._nextIdx = i;
+					found = true;
+					wentPast = !range.containsPosition(position);
+					break;
 				}
-			}
 
-			if (position && (range.containsPosition(position) || position.isBeforeOrEqual(range.getStartPosition()))) {
-				this._nextIdx = i;
-				found = true;
-				break;
+				if (this._markers[i].resource.toString() !== model.uri.toString()) {
+					break;
+				}
 			}
 
-			if (this._markers[i].resource.toString() !== model.uri.toString()) {
-				break;
+			if (!found) {
+				// after the last change
+				this._nextIdx = fwd ? 0 : this._markers.length - 1;
+			} else if (wentPast && !fwd) {
+				// we went past and have to go one back
+				this._nextIdx -= 1;
 			}
 		}
 
-		if (!found) {
-			// after the last change
-			this._nextIdx = fwd ? 0 : this._markers.length - 1;
-		} else if (found && !fwd) {
-			// we went past and have to go one back
-			this._nextIdx -= 1;
-		}
 		if (this._nextIdx < 0) {
 			this._nextIdx = this._markers.length - 1;
 		}

From 1ee0f190a18b334f8d6b339127e6321cd367bd72 Mon Sep 17 00:00:00 2001
From: Bhavya U <bhavyau@microsoft.com>
Date: Thu, 12 Dec 2024 09:16:36 -0800
Subject: [PATCH 161/479] Update walkthrough step (#235865)

---
 .../common/gettingStartedContent.ts                      | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
index 637e77f71f8..303905c9136 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
@@ -211,15 +211,14 @@ export const startEntries: GettingStartedStartEntryContent = [
 const Button = (title: string, href: string) => `[${title}](${href})`;
 
 const CopilotStepTitle = localize('gettingStarted.copilotSetup.title', "Use AI features with Copilot for free");
-const CopilotDescription = localize({ key: 'gettingStarted.copilotSetup.description', comment: ['{Locked="["}', '{Locked="]({0})"}'] }, "Write code faster and smarter using [Copilot]({0}) for free with your GitHub account.", product.defaultChatAgent?.documentationUrl ?? '');
-const CopilotTermsString = localize({ key: 'copilotTerms', comment: ['{Locked="["}', '{Locked="]({0})"}', '{Locked="]({1})"}'] }, "By continuing, you agree to Copilot [Terms]({0}) and [Privacy Policy]({1}).", product.defaultChatAgent?.termsStatementUrl ?? '', product.defaultChatAgent?.privacyStatementUrl ?? '');
-const CopilotSignedOutButton = Button(localize('setupCopilotButton.signIn', "Sign in to Use Copilot"), `command:workbench.action.chat.triggerSetup?${encodeURIComponent(JSON.stringify([true]))}`);
-const CopilotSignedInButton = Button(localize('setupCopilotButton.setup', "Set Up Copilot"), `command:workbench.action.chat.triggerSetup?${encodeURIComponent(JSON.stringify([true]))}`);
+const CopilotDescription = localize({ key: 'gettingStarted.copilotSetup.description', comment: ['{Locked="["}', '{Locked="]({0})"}'] }, "You can use [Copilot]({0}) to generate code across multiple files, fix errors, ask questions about your code and much more using natural language.", product.defaultChatAgent?.documentationUrl ?? '');
+const CopilotSignedOutButton = Button(localize('setupCopilotButton.signIn', "Set Up Copilot for Free"), `command:workbench.action.chat.triggerSetup`);
+const CopilotSignedInButton = Button(localize('setupCopilotButton.setup', "Set Up Copilot for Free"), `command:workbench.action.chat.triggerSetup`);
 const CopilotCompleteButton = Button(localize('setupCopilotButton.chatWithCopilot', "Chat with Copilot"), 'command:workbench.action.chat.open');
 
 function createCopilotSetupStep(id: string, button: string, when: string, includeTerms: boolean): BuiltinGettingStartedStep {
 	const description = includeTerms ?
-		`${CopilotDescription}\n\n${CopilotTermsString}\n${button}` :
+		`${CopilotDescription}\n\n${button}` :
 		`${CopilotDescription}\n${button}`;
 
 	return {

From 6a0fcdeca6cf8c4001b3ca822869e4817f496946 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 12 Dec 2024 09:17:26 -0800
Subject: [PATCH 162/479] Make `preparePasteEdits` interrupt diagnostics too

For #235959

Already done for the main paste request but we should do it for `preparePasteEdits`  too
---
 .../src/languageFeatures/copyPaste.ts                         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/typescript-language-features/src/languageFeatures/copyPaste.ts b/extensions/typescript-language-features/src/languageFeatures/copyPaste.ts
index 898e007bdb9..d253e8f9ac9 100644
--- a/extensions/typescript-language-features/src/languageFeatures/copyPaste.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/copyPaste.ts
@@ -60,10 +60,10 @@ class DocumentPasteProvider implements vscode.DocumentPasteEditProvider {
 			return;
 		}
 
-		const response = await this._client.execute('preparePasteEdits', {
+		const response = await this._client.interruptGetErr(() => this._client.execute('preparePasteEdits', {
 			file,
 			copiedTextSpan: ranges.map(typeConverters.Range.toTextSpan),
-		}, token);
+		}, token));
 		if (token.isCancellationRequested || response.type !== 'response' || !response.body) {
 			return;
 		}

From cd9144314e19156b99ba022a8d6b695764b8a75f Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Thu, 12 Dec 2024 18:19:36 +0100
Subject: [PATCH 163/479] fix #172251 (#235978)

---
 .../extensions/browser/extensionEditor.ts     | 20 +++++++++----------
 .../browser/media/extensionEditor.css         |  5 +++++
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
index 749790dd3a8..e73432b6040 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
@@ -1014,19 +1014,19 @@ export class ExtensionEditor extends EditorPane {
 		const installInfo = append(installInfoContainer, $('.more-info'));
 		append(installInfo,
 			$('.more-info-entry', undefined,
-				$('div', undefined, localize('id', "Identifier")),
+				$('div.more-info-entry-name', undefined, localize('id', "Identifier")),
 				$('code', undefined, extension.identifier.id)
 			));
 		append(installInfo,
 			$('.more-info-entry', undefined,
-				$('div', undefined, localize('Version', "Version")),
+				$('div.more-info-entry-name', undefined, localize('Version', "Version")),
 				$('code', undefined, extension.manifest.version)
 			)
 		);
 		if (extension.installedTimestamp) {
 			append(installInfo,
 				$('.more-info-entry', undefined,
-					$('div', undefined, localize('last updated', "Last Updated")),
+					$('div.more-info-entry-name', undefined, localize('last updated', "Last Updated")),
 					$('div', undefined, toDateString(new Date(extension.installedTimestamp)))
 				)
 			);
@@ -1035,7 +1035,7 @@ export class ExtensionEditor extends EditorPane {
 			const element = $('div', undefined, extension.source === 'vsix' ? localize('vsix', "VSIX") : localize('other', "Local"));
 			append(installInfo,
 				$('.more-info-entry', undefined,
-					$('div', undefined, localize('source', "Source")),
+					$('div.more-info-entry-name', undefined, localize('source', "Source")),
 					element
 				)
 			);
@@ -1049,7 +1049,7 @@ export class ExtensionEditor extends EditorPane {
 			const element = $('div', undefined, toMemoryString(extension.size));
 			append(installInfo,
 				$('.more-info-entry', undefined,
-					$('div', { title: localize('size when installed', "Size when installed") }, localize('size', "Size")),
+					$('div.more-info-entry-name', { title: localize('size when installed', "Size when installed") }, localize('size', "Size")),
 					element
 				)
 			);
@@ -1070,7 +1070,7 @@ export class ExtensionEditor extends EditorPane {
 				const element = $('div', undefined, toMemoryString(cacheSize));
 				append(installInfo,
 					$('.more-info-entry', undefined,
-						$('div', { title: localize('disk space used', "Cache size") }, localize('cache size', "Cache")),
+						$('div.more-info-entry-name', { title: localize('disk space used', "Cache size") }, localize('cache size', "Cache")),
 						element)
 				);
 				if (isNative && extension.location.scheme === Schemas.file) {
@@ -1103,23 +1103,23 @@ export class ExtensionEditor extends EditorPane {
 			if (!extension.local) {
 				append(moreInfo,
 					$('.more-info-entry', undefined,
-						$('div', undefined, localize('id', "Identifier")),
+						$('div.more-info-entry-name', undefined, localize('id', "Identifier")),
 						$('code', undefined, extension.identifier.id)
 					));
 				append(moreInfo,
 					$('.more-info-entry', undefined,
-						$('div', undefined, localize('Version', "Version")),
+						$('div.more-info-entry-name', undefined, localize('Version', "Version")),
 						$('code', undefined, gallery.version)
 					)
 				);
 			}
 			append(moreInfo,
 				$('.more-info-entry', undefined,
-					$('div', undefined, localize('published', "Published")),
+					$('div.more-info-entry-name', undefined, localize('published', "Published")),
 					$('div', undefined, toDateString(new Date(gallery.releaseDate)))
 				),
 				$('.more-info-entry', undefined,
-					$('div', undefined, localize('last released', "Last Released")),
+					$('div.more-info-entry-name', undefined, localize('last released', "Last Released")),
 					$('div', undefined, toDateString(new Date(gallery.lastUpdated)))
 				)
 			);
diff --git a/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css b/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css
index 1e1067588d8..49f5a412793 100644
--- a/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css
+++ b/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css
@@ -312,6 +312,11 @@
 	cursor: pointer;
 }
 
+.extension-editor > .body > .content > .details > .additional-details-container .more-info-container > .more-info > .more-info-entry > .more-info-entry-name {
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
 .extension-editor > .body > .content > .details > .additional-details-container .more-info-container > .more-info > .more-info-entry > .link,
 .extension-editor > .header > .details > .pre-release-text a,
 .extension-editor > .header > .details > .actions-status-container > .status a {

From 43d31daf41afdbde9b86806327a1bf512931e9b8 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Thu, 12 Dec 2024 18:24:19 +0100
Subject: [PATCH 164/479] inline completions debt from review of PR (#235980)

debt from review
---
 .../editor/contrib/inlineCompletions/browser/utils.ts | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/utils.ts b/src/vs/editor/contrib/inlineCompletions/browser/utils.ts
index 96706c5e3d5..0f37508a9a2 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/utils.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/utils.ts
@@ -7,10 +7,10 @@ import { Permutation, compareBy } from '../../../../base/common/arrays.js';
 import { BugIndicatingError } from '../../../../base/common/errors.js';
 import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
 import { IObservable, observableValue, ISettableObservable, autorun, transaction, IReader } from '../../../../base/common/observable.js';
-import { splitLinesIncludeSeparators } from '../../../../base/common/strings.js';
 import { ContextKeyValue, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { bindContextKey } from '../../../../platform/observable/common/platformObservableUtils.js';
 import { Position } from '../../../common/core/position.js';
+import { PositionOffsetTransformer } from '../../../common/core/positionToOffset.js';
 import { Range } from '../../../common/core/range.js';
 import { SingleTextEdit, TextEdit } from '../../../common/core/textEdit.js';
 
@@ -48,12 +48,9 @@ export function subtractPositions(pos1: Position, pos2: Position): Position {
 }
 
 export function substringPos(text: string, pos: Position): string {
-	let subtext = '';
-	const lines = splitLinesIncludeSeparators(text);
-	for (let i = pos.lineNumber - 1; i < lines.length; i++) {
-		subtext += lines[i].substring(i === pos.lineNumber - 1 ? pos.column - 1 : 0);
-	}
-	return subtext;
+	const transformer = new PositionOffsetTransformer(text);
+	const offset = transformer.getOffset(pos);
+	return text.substring(offset);
 }
 
 export function getEndPositionsAfterApplying(edits: readonly SingleTextEdit[]): Position[] {

From a897802b2d6c2da2bb012b3ab5b3db493ff9e63d Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Thu, 12 Dec 2024 18:26:39 +0100
Subject: [PATCH 165/479] Adresses #235977 (#235981)

---
 .../browser/controller/inlineCompletionsController.ts           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
index 41499ed6f9f..6be0ecd1c90 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
@@ -146,7 +146,7 @@ export class InlineCompletionsController extends Disposable {
 				}
 				const m = this.model.get();
 				if (!m) { return; }
-				if (m.inlineCompletionState.get()?.primaryGhostText) {
+				if (m.state.get()?.kind === 'ghostText') {
 					this.model.get()?.stop();
 				} else if (m.state.get()?.inlineCompletion) {
 					this.model.get()?.collapseInlineEdit();

From 8c7ca99740995aa43301fe50eccee6bd5b676661 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 12 Dec 2024 09:36:15 -0800
Subject: [PATCH 166/479] Make sure we sync file config before generating paste
 edits

This could explain why we occasionally see the wrong style of import being generated
---
 .../src/languageFeatures/copyPaste.ts         | 30 +++++++++++--------
 .../src/languageFeatures/formatting.ts        |  6 ++--
 .../src/languageProvider.ts                   |  2 +-
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/extensions/typescript-language-features/src/languageFeatures/copyPaste.ts b/extensions/typescript-language-features/src/languageFeatures/copyPaste.ts
index 898e007bdb9..806573db323 100644
--- a/extensions/typescript-language-features/src/languageFeatures/copyPaste.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/copyPaste.ts
@@ -5,12 +5,13 @@
 
 import * as vscode from 'vscode';
 import { DocumentSelector } from '../configuration/documentSelector';
+import { LanguageDescription } from '../configuration/languageDescription';
+import { API } from '../tsServer/api';
+import protocol from '../tsServer/protocol/protocol';
 import * as typeConverters from '../typeConverters';
 import { ClientCapability, ITypeScriptServiceClient } from '../typescriptService';
+import FileConfigurationManager from './fileConfigurationManager';
 import { conditionalRegistration, requireGlobalConfiguration, requireMinVersion, requireSomeCapability } from './util/dependentRegistration';
-import protocol from '../tsServer/protocol/protocol';
-import { API } from '../tsServer/api';
-import { LanguageDescription } from '../configuration/languageDescription';
 
 class CopyMetadata {
 	constructor(
@@ -48,6 +49,7 @@ class DocumentPasteProvider implements vscode.DocumentPasteEditProvider {
 	constructor(
 		private readonly _modeId: string,
 		private readonly _client: ITypeScriptServiceClient,
+		private readonly fileConfigurationManager: FileConfigurationManager,
 	) { }
 
 	async prepareDocumentPaste(document: vscode.TextDocument, ranges: readonly vscode.Range[], dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken) {
@@ -115,13 +117,17 @@ class DocumentPasteProvider implements vscode.DocumentPasteEditProvider {
 			return;
 		}
 
-		const response = await this._client.interruptGetErr(() => this._client.execute('getPasteEdits', {
-			file,
-			// TODO: only supports a single paste for now
-			pastedText: [text],
-			pasteLocations: ranges.map(typeConverters.Range.toTextSpan),
-			copiedFrom
-		}, token));
+		const response = await this._client.interruptGetErr(() => {
+			this.fileConfigurationManager.ensureConfigurationForDocument(document, token);
+
+			return this._client.execute('getPasteEdits', {
+				file,
+				// TODO: only supports a single paste for now
+				pastedText: [text],
+				pasteLocations: ranges.map(typeConverters.Range.toTextSpan),
+				copiedFrom
+			}, token);
+		});
 		if (response.type !== 'response' || !response.body?.edits.length || token.isCancellationRequested) {
 			return;
 		}
@@ -152,13 +158,13 @@ class DocumentPasteProvider implements vscode.DocumentPasteEditProvider {
 	}
 }
 
-export function register(selector: DocumentSelector, language: LanguageDescription, client: ITypeScriptServiceClient) {
+export function register(selector: DocumentSelector, language: LanguageDescription, client: ITypeScriptServiceClient, fileConfigurationManager: FileConfigurationManager) {
 	return conditionalRegistration([
 		requireSomeCapability(client, ClientCapability.Semantic),
 		requireMinVersion(client, API.v570),
 		requireGlobalConfiguration(language.id, enabledSettingId),
 	], () => {
-		return vscode.languages.registerDocumentPasteEditProvider(selector.semantic, new DocumentPasteProvider(language.id, client), {
+		return vscode.languages.registerDocumentPasteEditProvider(selector.semantic, new DocumentPasteProvider(language.id, client, fileConfigurationManager), {
 			providedPasteEditKinds: [DocumentPasteProvider.kind],
 			copyMimeTypes: [DocumentPasteProvider.metadataMimeType],
 			pasteMimeTypes: [DocumentPasteProvider.metadataMimeType],
diff --git a/extensions/typescript-language-features/src/languageFeatures/formatting.ts b/extensions/typescript-language-features/src/languageFeatures/formatting.ts
index 3b31499c37b..575487b502d 100644
--- a/extensions/typescript-language-features/src/languageFeatures/formatting.ts
+++ b/extensions/typescript-language-features/src/languageFeatures/formatting.ts
@@ -15,7 +15,7 @@ import { conditionalRegistration, requireGlobalConfiguration } from './util/depe
 class TypeScriptFormattingProvider implements vscode.DocumentRangeFormattingEditProvider, vscode.OnTypeFormattingEditProvider {
 	public constructor(
 		private readonly client: ITypeScriptServiceClient,
-		private readonly formattingOptionsManager: FileConfigurationManager
+		private readonly fileConfigurationManager: FileConfigurationManager
 	) { }
 
 	public async provideDocumentRangeFormattingEdits(
@@ -29,7 +29,7 @@ class TypeScriptFormattingProvider implements vscode.DocumentRangeFormattingEdit
 			return undefined;
 		}
 
-		await this.formattingOptionsManager.ensureConfigurationOptions(document, options, token);
+		await this.fileConfigurationManager.ensureConfigurationOptions(document, options, token);
 
 		const args = typeConverters.Range.toFormattingRequestArgs(file, range);
 		const response = await this.client.execute('format', args, token);
@@ -52,7 +52,7 @@ class TypeScriptFormattingProvider implements vscode.DocumentRangeFormattingEdit
 			return [];
 		}
 
-		await this.formattingOptionsManager.ensureConfigurationOptions(document, options, token);
+		await this.fileConfigurationManager.ensureConfigurationOptions(document, options, token);
 
 		const args: Proto.FormatOnKeyRequestArgs = {
 			...typeConverters.Position.toFileLocationRequestArgs(file, position),
diff --git a/extensions/typescript-language-features/src/languageProvider.ts b/extensions/typescript-language-features/src/languageProvider.ts
index 7b95591604b..feb47f09683 100644
--- a/extensions/typescript-language-features/src/languageProvider.ts
+++ b/extensions/typescript-language-features/src/languageProvider.ts
@@ -65,7 +65,7 @@ export default class LanguageProvider extends Disposable {
 			import('./languageFeatures/codeLens/implementationsCodeLens').then(provider => this._register(provider.register(selector, this.description, this.client, cachedNavTreeResponse))),
 			import('./languageFeatures/codeLens/referencesCodeLens').then(provider => this._register(provider.register(selector, this.description, this.client, cachedNavTreeResponse))),
 			import('./languageFeatures/completions').then(provider => this._register(provider.register(selector, this.description, this.client, this.typingsStatus, this.fileConfigurationManager, this.commandManager, this.telemetryReporter, this.onCompletionAccepted))),
-			import('./languageFeatures/copyPaste').then(provider => this._register(provider.register(selector, this.description, this.client))),
+			import('./languageFeatures/copyPaste').then(provider => this._register(provider.register(selector, this.description, this.client, this.fileConfigurationManager))),
 			import('./languageFeatures/definitions').then(provider => this._register(provider.register(selector, this.client))),
 			import('./languageFeatures/directiveCommentCompletions').then(provider => this._register(provider.register(selector, this.client))),
 			import('./languageFeatures/documentHighlight').then(provider => this._register(provider.register(selector, this.client))),

From 868a93160d9170d36006695e3cbded14d78f09bf Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Thu, 12 Dec 2024 13:31:21 -0600
Subject: [PATCH 167/479] Set dropdown container's `aria-disabled` property to
 announce its disabled state on keyboard focus to screen reader users
 (#235992)

fix #235203
---
 .../actions/browser/dropdownWithPrimaryActionViewItem.ts         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem.ts b/src/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem.ts
index f9dec8ce9b5..dbc78139471 100644
--- a/src/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem.ts
+++ b/src/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem.ts
@@ -87,6 +87,7 @@ export class DropdownWithPrimaryActionViewItem extends BaseActionViewItem {
 		this._container.classList.add('monaco-dropdown-with-primary');
 		const primaryContainer = DOM.$('.action-container');
 		primaryContainer.role = 'button';
+		primaryContainer.ariaDisabled = String(!this.action.enabled);
 		this._primaryAction.render(DOM.append(this._container, primaryContainer));
 		this._dropdownContainer = DOM.$('.dropdown-action-container');
 		this._dropdown.render(DOM.append(this._container, this._dropdownContainer));

From 1bf794addace3bd8db5c6ea10689e4ba1090e032 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Thu, 12 Dec 2024 14:13:41 -0600
Subject: [PATCH 168/479] change condition for adding terminal completion
 executables (#235994)

fix #235082
---
 extensions/terminal-suggest/src/terminalSuggestMain.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index 1fa2c0035da..04af5ff5da9 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -187,7 +187,7 @@ async function getCommandsInPath(): Promise<Set<string> | undefined> {
 			const files = await vscode.workspace.fs.readDirectory(vscode.Uri.file(path));
 
 			for (const [file, fileType] of files) {
-				if (fileType === vscode.FileType.File || fileType === vscode.FileType.SymbolicLink) {
+				if (fileType !== vscode.FileType.Unknown && fileType !== vscode.FileType.Directory) {
 					executables.add(file);
 				}
 			}

From c19df5b00b9408ca693eca5d7a1863668cb15d5e Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Thu, 12 Dec 2024 15:24:30 -0600
Subject: [PATCH 169/479] support showIcons setting in terminal completions,
 simple suggest widget (#235998)

support showIcons setting in terminal completions
---
 .../services/suggest/browser/simpleSuggestWidget.ts  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
index 97417bed34f..6f22b0d0d77 100644
--- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
@@ -19,6 +19,7 @@ import { localize } from '../../../../nls.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { SuggestWidgetStatus } from '../../../../editor/contrib/suggest/browser/suggestWidgetStatus.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 
 const $ = dom.$;
 
@@ -86,7 +87,8 @@ export class SimpleSuggestWidget extends Disposable {
 		private readonly _persistedSize: IPersistedWidgetSizeDelegate,
 		private readonly _getFontInfo: () => ISimpleSuggestWidgetFontInfo,
 		options: IWorkbenchSuggestWidgetOptions,
-		@IInstantiationService instantiationService: IInstantiationService
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IConfigurationService configurationService: IConfigurationService,
 	) {
 		super();
 
@@ -141,6 +143,9 @@ export class SimpleSuggestWidget extends Disposable {
 			state = undefined;
 		}));
 
+		const applyIconStyle = () => this.element.domNode.classList.toggle('no-icons', !configurationService.getValue('editor.suggest.showIcons'));
+		applyIconStyle();
+
 		const renderer = new SimpleSuggestWidgetItemRenderer(_getFontInfo);
 		this._register(renderer);
 		this._listElement = dom.append(this.element.domNode, $('.tree'));
@@ -196,6 +201,11 @@ export class SimpleSuggestWidget extends Disposable {
 		this._register(this._list.onMouseDown(e => this._onListMouseDownOrTap(e)));
 		this._register(this._list.onTap(e => this._onListMouseDownOrTap(e)));
 		this._register(this._list.onDidChangeSelection(e => this._onListSelection(e)));
+		this._register(configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('editor.suggest.showIcons')) {
+				applyIconStyle();
+			}
+		}));
 	}
 
 	private _cursorPosition?: { top: number; left: number; height: number };

From 5980b0f835c2dfa1d85925952cbc91e9ad1ff0b6 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 12 Dec 2024 14:46:28 -0800
Subject: [PATCH 170/479] Pick up latest markdown-it-katex

---
 extensions/markdown-math/package-lock.json | 9 +++++----
 extensions/markdown-math/package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extensions/markdown-math/package-lock.json b/extensions/markdown-math/package-lock.json
index 53a0866e61f..56d5bd40faa 100644
--- a/extensions/markdown-math/package-lock.json
+++ b/extensions/markdown-math/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@vscode/markdown-it-katex": "^1.1.0"
+        "@vscode/markdown-it-katex": "^1.1.1"
       },
       "devDependencies": {
         "@types/markdown-it": "^0.0.0",
@@ -32,9 +32,10 @@
       "dev": true
     },
     "node_modules/@vscode/markdown-it-katex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@vscode/markdown-it-katex/-/markdown-it-katex-1.1.0.tgz",
-      "integrity": "sha512-9cF2eJpsJOEs2V1cCAoJW/boKz9GQQLvZhNvI030K90z6ZE9lRGc9hDVvKut8zdFO2ObjwylPXXXVYvTdP2O2Q==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@vscode/markdown-it-katex/-/markdown-it-katex-1.1.1.tgz",
+      "integrity": "sha512-3KTlbsRBPJQLE2YmLL7K6nunTlU+W9T5+FjfNdWuIUKgxSS6HWLQHaO3L4MkJi7z7MpIPpY+g4N+cWNBPE/MSA==",
+      "license": "MIT",
       "dependencies": {
         "katex": "^0.16.4"
       }
diff --git a/extensions/markdown-math/package.json b/extensions/markdown-math/package.json
index 9669efc2435..5628816d6c3 100644
--- a/extensions/markdown-math/package.json
+++ b/extensions/markdown-math/package.json
@@ -109,7 +109,7 @@
     "build-notebook": "node ./esbuild"
   },
   "dependencies": {
-    "@vscode/markdown-it-katex": "^1.1.0"
+    "@vscode/markdown-it-katex": "^1.1.1"
   },
   "devDependencies": {
     "@types/markdown-it": "^0.0.0",

From 4452b11e2ff37f35227a120b412e99abf8e71035 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Thu, 12 Dec 2024 14:59:48 -0800
Subject: [PATCH 171/479] Pick up latest TS for building VS Code

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

diff --git a/package-lock.json b/package-lock.json
index e659e5506fa..fd395ebd432 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -153,7 +153,7 @@
         "ts-node": "^10.9.1",
         "tsec": "0.2.7",
         "tslib": "^2.6.3",
-        "typescript": "^5.8.0-dev.20241202",
+        "typescript": "^5.8.0-dev.20241212",
         "typescript-eslint": "^8.8.0",
         "util": "^0.12.4",
         "webpack": "^5.94.0",
@@ -17599,9 +17599,9 @@
       "dev": true
     },
     "node_modules/typescript": {
-      "version": "5.8.0-dev.20241202",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.0-dev.20241202.tgz",
-      "integrity": "sha512-4b4+FbKk5Wp51uwCztSyh68rdK1rv4afoC/P/g8HOmWmfHIdCgZNxzLS6TvjBU7e8XVzmW3jE/CJl1n59lcIhg==",
+      "version": "5.8.0-dev.20241212",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.0-dev.20241212.tgz",
+      "integrity": "sha512-DL+rd76Ze4iHIFTT6+f8SNdxkTYnR0cy6e0QRljOfyr2s0TrO2L9pAOB1dJnSizTAjxou7lIRpUWwxVOIyiMWg==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
diff --git a/package.json b/package.json
index 5237906a2c7..eb0abcc3221 100644
--- a/package.json
+++ b/package.json
@@ -211,7 +211,7 @@
     "ts-node": "^10.9.1",
     "tsec": "0.2.7",
     "tslib": "^2.6.3",
-    "typescript": "^5.8.0-dev.20241202",
+    "typescript": "^5.8.0-dev.20241212",
     "typescript-eslint": "^8.8.0",
     "util": "^0.12.4",
     "webpack": "^5.94.0",

From e8a0511293a864439898d53db45303a67b36cf6d Mon Sep 17 00:00:00 2001
From: Joyce Er <joyce.er@microsoft.com>
Date: Thu, 12 Dec 2024 17:33:16 -0800
Subject: [PATCH 172/479] chore: update grooming notebook areas label list
 (#236005)

* chore: update grooming notebook areas label list

* chore: update grooming notebook areas label list

* chore: update grooming notebook areas label list
---
 .vscode/notebooks/grooming.github-issues | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vscode/notebooks/grooming.github-issues b/.vscode/notebooks/grooming.github-issues
index 4b2f8c6750f..4a4955dd767 100644
--- a/.vscode/notebooks/grooming.github-issues
+++ b/.vscode/notebooks/grooming.github-issues
@@ -27,7 +27,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode assignee:$assignee is:open type:issue -label:\"info-needed\" -label:api -label:api-finalization -label:api-proposal -label:authentication -label:bisect-ext -label:bracket-pair-colorization -label:bracket-pair-guides -label:breadcrumbs -label:callhierarchy -label:chrome-devtools -label:cloud-changes -label:code-lens -label:command-center -label:comments -label:config -label:containers -label:context-keys -label:continue-working-on -label:css-less-scss -label:custom-editors -label:debug -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor-api -label:editor-autoclosing -label:editor-autoindent -label:editor-bracket-matching -label:editor-clipboard -label:editor-code-actions -label:editor-color-picker -label:editor-columnselect -label:editor-commands -label:editor-comments -label:editor-contrib -label:editor-core -label:editor-drag-and-drop -label:editor-error-widget -label:editor-find -label:editor-folding -label:editor-highlight -label:editor-hover -label:editor-indent-detection -label:editor-indent-guides -label:editor-input -label:editor-input-IME -label:editor-insets -label:editor-minimap -label:editor-multicursor -label:editor-parameter-hints -label:editor-render-whitespace -label:editor-rendering -label:editor-widgets -label:editor-RTL -label:editor-scrollbar -label:editor-sorting -label:editor-sticky-scroll -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet -label:emmet-parse -label:error-list -label:extension-activation -label:extension-host -label:extension-prerelease -label:extension-recommendations -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-io -label:file-nesting -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:github-repositories -label:gpu -label:grammar -label:grid-widget -label:html -label:icon-brand -label:icons-product -label:image-preview -label:inlay-hints -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-playground -label:interactive-window -label:issue-bot -label:issue-reporter -label:javascript -label:json -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:L10N -label:l10n-platform -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list-widget -label:live-preview -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:merge-editor -label:merge-editor-workbench -label:monaco-editor -label:native-file-dialog -label:network -label:notebook -label:notebook-accessibility -label:notebook-api -label:notebook-builtin-renderers -label:notebook-cell-editor -label:notebook-celltoolbar -label:notebook-clipboard -label:notebook-commands -label:notebook-commenting -label:notebook-debugging -label:notebook-diff -label:notebook-dnd -label:notebook-execution -label:notebook-find -label:notebook-folding -label:notebook-getting-started -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-kernel-picker -label:notebook-language -label:notebook-layout -label:notebook-markdown -label:notebook-math -label:notebook-minimap -label:notebook-multiselect -label:notebook-output -label:notebook-perf -label:notebook-remote -label:notebook-rendering -label:notebook-serialization -label:notebook-serverless-web -label:notebook-statusbar -label:notebook-toc-outline -label:notebook-undo-redo -label:notebook-variables -label:notebook-workbench-integration -label:notebook-workflow -label:notebook-sticky-scroll -label:notebook-format -label:notebook-code-actions -label:open-editors -label:opener -label:outline -label:output -label:packaging -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-open -label:quick-pick -label:references-viewlet -label:release-notes -label:remote -label:remote-connection -label:remote-explorer -label:remote-tunnel -label:rename -label:runCommands -label:sandbox -label:sash-widget -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:server -label:settings-editor -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview-widget -label:ssh -label:suggest -label:table-widget -label:tasks -label:telemetry -label:terminal -label:terminal-accessibility -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-find -label:terminal-input -label:terminal-layout -label:terminal-links -label:terminal-local-echo -label:terminal-persistence -label:terminal-process -label:terminal-profiles -label:terminal-quick-fix -label:terminal-rendering -label:terminal-shell-bash -label:terminal-shell-cmd -label:terminal-shell-fish -label:terminal-shell-git-bash -label:terminal-shell-integration -label:terminal-shell-pwsh -label:terminal-shell-zsh -label:terminal-sticky-scroll -label:terminal-tabs -label:testing -label:themes -label:timeline -label:timeline-git -label:timeline-local-history -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typescript -label:undo-redo -label:unicode-highlight -label:uri -label:user-profiles -label:ux -label:variable-resolving -label:VIM -label:virtual-workspaces -label:vscode-website -label:vscode.dev -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-banner -label:workbench-cli -label:workbench-diagnostics -label:workbench-dnd -label:workbench-editor-grid -label:workbench-editor-groups -label:workbench-editor-resolver -label:workbench-editors -label:workbench-electron -label:workbench-fonts -label:workbench-history -label:workbench-hot-exit -label:workbench-hover -label:workbench-launch -label:workbench-link -label:workbench-multiroot -label:workbench-notifications -label:workbench-os-integration -label:workbench-rapid-render -label:workbench-run-as-admin -label:workbench-state -label:workbench-status -label:workbench-tabs -label:workbench-touchbar -label:workbench-untitled-editors -label:workbench-views -label:workbench-welcome -label:workbench-window -label:workbench-workspace -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom -label:inline-chat -label:panel-chat -label:quick-chat -label:audio-cue -label:tasks -label:error-list -label:winget -label:tree-views -label:freeze-slow-crash-leak -label:engineering"
+    "value": "repo:microsoft/vscode assignee:$assignee is:open type:issue -label:\"info-needed\" -label:api -label:api-finalization -label:api-proposal -label:authentication -label:bisect-ext -label:bracket-pair-colorization -label:bracket-pair-guides -label:breadcrumbs -label:callhierarchy -label:chrome-devtools -label:cloud-changes -label:code-lens -label:command-center -label:comments -label:config -label:containers -label:context-keys -label:continue-working-on -label:css-less-scss -label:custom-editors -label:debug -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor-api -label:editor-autoclosing -label:editor-autoindent -label:editor-bracket-matching -label:editor-clipboard -label:editor-code-actions -label:editor-color-picker -label:editor-columnselect -label:editor-commands -label:editor-comments -label:editor-contrib -label:editor-core -label:editor-drag-and-drop -label:editor-error-widget -label:editor-find -label:editor-folding -label:editor-highlight -label:editor-hover -label:editor-indent-detection -label:editor-indent-guides -label:editor-input -label:editor-input-IME -label:editor-insets -label:editor-minimap -label:editor-multicursor -label:editor-parameter-hints -label:editor-render-whitespace -label:editor-rendering -label:editor-widgets -label:editor-RTL -label:editor-scrollbar -label:editor-sorting -label:editor-sticky-scroll -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet -label:emmet-parse -label:error-list -label:extension-activation -label:extension-host -label:extension-prerelease -label:extension-recommendations -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-io -label:file-nesting -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:github-repositories -label:gpu -label:grammar -label:grid-widget -label:html -label:icon-brand -label:icons-product -label:image-preview -label:inlay-hints -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-playground -label:interactive-window -label:issue-bot -label:issue-reporter -label:javascript -label:json -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:chat -label:l10n-platform -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list-widget -label:live-preview -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:merge-editor -label:merge-editor-workbench -label:monaco-editor -label:native-file-dialog -label:network -label:notebook -label:notebook-accessibility -label:notebook-api -label:notebook-builtin-renderers -label:notebook-cell-editor -label:notebook-celltoolbar -label:notebook-clipboard -label:notebook-commands -label:notebook-commenting -label:notebook-debugging -label:notebook-diff -label:notebook-dnd -label:notebook-execution -label:notebook-find -label:notebook-folding -label:notebook-getting-started -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-kernel-picker -label:notebook-language -label:notebook-layout -label:notebook-markdown -label:notebook-minimap -label:notebook-multiselect -label:notebook-output -label:notebook-perf -label:notebook-remote -label:notebook-rendering -label:notebook-serialization -label:notebook-statusbar -label:notebook-toc-outline -label:notebook-undo-redo -label:notebook-variables -label:notebook-workbench-integration -label:notebook-workflow -label:notebook-sticky-scroll -label:notebook-format -label:notebook-code-actions -label:open-editors -label:opener -label:outline -label:output -label:packaging -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-open -label:quick-pick -label:references-viewlet -label:release-notes -label:remote -label:remote-connection -label:remote-explorer -label:remote-tunnel -label:rename -label:runCommands -label:sandbox -label:sash-widget -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:server -label:settings-editor -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview-widget -label:ssh -label:suggest -label:table-widget -label:tasks -label:telemetry -label:terminal -label:terminal-accessibility -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-find -label:terminal-input -label:terminal-layout -label:terminal-links -label:terminal-local-echo -label:terminal-persistence -label:terminal-process -label:terminal-profiles -label:terminal-quick-fix -label:terminal-rendering -label:terminal-shell-bash -label:terminal-shell-cmd -label:terminal-shell-fish -label:terminal-shell-git-bash -label:terminal-shell-integration -label:terminal-shell-pwsh -label:terminal-shell-zsh -label:terminal-sticky-scroll -label:terminal-tabs -label:testing -label:themes -label:timeline -label:timeline-git -label:timeline-local-history -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typescript -label:undo-redo -label:unicode-highlight -label:uri -label:user-profiles -label:ux -label:variable-resolving -label:VIM -label:virtual-workspaces -label:vscode-website -label:vscode.dev -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-banner -label:workbench-cli -label:workbench-diagnostics -label:workbench-dnd -label:workbench-editor-grid -label:workbench-editor-groups -label:workbench-editor-resolver -label:workbench-editors -label:workbench-electron -label:workbench-fonts -label:workbench-history -label:workbench-hot-exit -label:workbench-hover -label:workbench-launch -label:workbench-link -label:workbench-multiroot -label:workbench-notifications -label:workbench-os-integration -label:workbench-rapid-render -label:workbench-run-as-admin -label:workbench-state -label:workbench-status -label:workbench-tabs -label:workbench-touchbar -label:workbench-untitled-editors -label:workbench-views -label:workbench-welcome -label:workbench-window -label:workbench-workspace -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom -label:inline-chat -label:panel-chat -label:quick-chat -label:tasks -label:error-list -label:winget -label:tree-views -label:freeze-slow-crash-leak -label:engineering -label:cross-file-editing"
   },
   {
     "kind": 1,

From b425f4802fcbcccb11ad991208fa262c06255be3 Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <me@tylerleonhardt.com>
Date: Thu, 12 Dec 2024 17:45:44 -0800
Subject: [PATCH 173/479] Check idtoken expiration (#236011)

and force expiration in a similar way to the way MSAL does it for access tokens.

Fixes https://github.com/microsoft/vscode/issues/229456
---
 .../src/node/cachedPublicClientApplication.ts   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts b/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
index 2f90e3af3aa..7396da17990 100644
--- a/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
+++ b/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
@@ -90,8 +90,23 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 
 	async acquireTokenSilent(request: SilentFlowRequest): Promise<AuthenticationResult> {
 		this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}] [${request.account.username}] starting...`);
-		const result = await this._sequencer.queue(() => this._pca.acquireTokenSilent(request));
+		let result = await this._sequencer.queue(() => this._pca.acquireTokenSilent(request));
 		this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}] [${request.account.username}] got result`);
+		// Check expiration of id token and if it's 5min before expiration, force a refresh.
+		// this is what MSAL does for access tokens already so we're just adding it for id tokens since we care about those.
+		const idTokenExpirationInSecs = (result.idTokenClaims as { exp?: number }).exp;
+		if (idTokenExpirationInSecs) {
+			const fiveMinutesBefore = new Date(
+				(idTokenExpirationInSecs - 5 * 60) // subtract 5 minutes
+				* 1000 // convert to milliseconds
+			);
+			if (fiveMinutesBefore < new Date()) {
+				this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}] [${request.account.username}] id token is expired or about to expire. Forcing refresh...`);
+				result = await this._sequencer.queue(() => this._pca.acquireTokenSilent({ ...request, forceRefresh: true }));
+				this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}] [${request.account.username}] got refreshed result`);
+			}
+		}
+
 		// this._setupRefresh(result);
 		if (result.account && !result.fromCache && this._verifyIfUsingBroker(result)) {
 			this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}] [${request.account.username}] firing event due to change`);

From 1e3788f49f234bc37296ce3c5c7b1645605cec08 Mon Sep 17 00:00:00 2001
From: Michael H <git@riskymh.dev>
Date: Fri, 13 Dec 2024 13:29:39 +1100
Subject: [PATCH 174/479] bun.lock

---
 extensions/npm/src/preferred-pm.ts                           | 4 ++++
 src/vs/workbench/contrib/files/browser/files.contribution.ts | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/extensions/npm/src/preferred-pm.ts b/extensions/npm/src/preferred-pm.ts
index c85b65b6ea3..452319671ea 100644
--- a/extensions/npm/src/preferred-pm.ts
+++ b/extensions/npm/src/preferred-pm.ts
@@ -28,6 +28,10 @@ async function isBunPreferred(pkgPath: string): Promise<PreferredProperties> {
 		return { isPreferred: true, hasLockfile: true };
 	}
 
+	if (await pathExists(path.join(pkgPath, 'bun.lock'))) {
+		return { isPreferred: true, hasLockfile: true };
+	}
+
 	return { isPreferred: false, hasLockfile: false };
 }
 
diff --git a/src/vs/workbench/contrib/files/browser/files.contribution.ts b/src/vs/workbench/contrib/files/browser/files.contribution.ts
index 266995ddc6d..689be82dc16 100644
--- a/src/vs/workbench/contrib/files/browser/files.contribution.ts
+++ b/src/vs/workbench/contrib/files/browser/files.contribution.ts
@@ -619,7 +619,7 @@ configurationRegistry.registerConfiguration({
 				'*.jsx': '${capture}.js',
 				'*.tsx': '${capture}.ts',
 				'tsconfig.json': 'tsconfig.*.json',
-				'package.json': 'package-lock.json, yarn.lock, pnpm-lock.yaml, bun.lockb',
+				'package.json': 'package-lock.json, yarn.lock, pnpm-lock.yaml, bun.lockb, bun.lock',
 			}
 		}
 	}

From fe929f1df2377e3c2c284886d002443d80223de4 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Fri, 13 Dec 2024 10:28:12 +0100
Subject: [PATCH 175/479] Fix panel focus loss when moving the panel (#235971)

* fix #111975
---
 src/vs/workbench/browser/layout.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index 8d731c24025..ca6cb860397 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -1787,6 +1787,8 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		const preMoveSideBarSize = !this.isVisible(Parts.SIDEBAR_PART) ? Sizing.Invisible(this.workbenchGrid.getViewCachedVisibleSize(this.sideBarPartView) ?? this.sideBarPartView.minimumWidth) : this.workbenchGrid.getViewSize(this.sideBarPartView).width;
 		const preMoveAuxiliaryBarSize = !this.isVisible(Parts.AUXILIARYBAR_PART) ? Sizing.Invisible(this.workbenchGrid.getViewCachedVisibleSize(this.auxiliaryBarPartView) ?? this.auxiliaryBarPartView.minimumWidth) : this.workbenchGrid.getViewSize(this.auxiliaryBarPartView).width;
 
+		const focusedPart = [Parts.PANEL_PART, Parts.SIDEBAR_PART, Parts.AUXILIARYBAR_PART].find(part => this.hasFocus(part)) as SINGLE_WINDOW_PARTS | undefined;
+
 		if (sideBarPosition === Position.LEFT) {
 			this.workbenchGrid.moveViewTo(this.activityBarPartView, [2, 0]);
 			this.workbenchGrid.moveView(this.sideBarPartView, preMoveSideBarSize, sideBarSiblingToEditor ? this.editorPartView : this.activityBarPartView, sideBarSiblingToEditor ? Direction.Left : Direction.Right);
@@ -1805,6 +1807,11 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			}
 		}
 
+		// Maintain focus after moving parts
+		if (focusedPart) {
+			this.focusPart(focusedPart);
+		}
+
 		// We moved all the side parts based on the editor and ignored the panel
 		// Now, we need to put the panel back in the right position when it is next to the editor
 		if (isPanelVertical) {
@@ -2122,6 +2129,8 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		const sideBarVisible = this.isVisible(Parts.SIDEBAR_PART);
 		const auxiliaryBarVisible = this.isVisible(Parts.AUXILIARYBAR_PART);
 
+		const hadFocus = this.hasFocus(Parts.PANEL_PART);
+
 		if (position === Position.BOTTOM) {
 			this.workbenchGrid.moveView(this.panelPartView, editorHidden ? size.height : this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_HEIGHT), this.editorPartView, Direction.Down);
 		} else if (position === Position.TOP) {
@@ -2132,6 +2141,10 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			this.workbenchGrid.moveView(this.panelPartView, editorHidden ? size.width : this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_WIDTH), this.editorPartView, Direction.Left);
 		}
 
+		if (hadFocus) {
+			this.focusPart(Parts.PANEL_PART);
+		}
+
 		// Reset sidebar to original size before shifting the panel
 		this.workbenchGrid.resizeView(this.sideBarPartView, sideBarSize);
 		if (!sideBarVisible) {

From 70af7c835c7c0c9f5982aa3bd5307fdabd816ebb Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Fri, 13 Dec 2024 11:04:05 +0100
Subject: [PATCH 176/479] Merge activity badge items on view containers
 (#235925)

merge activity badge items together and remove priority
---
 .../workbench/browser/parts/compositeBar.ts   |  2 +-
 .../browser/parts/compositeBarActions.ts      | 84 ++++++++++++-------
 .../browser/parts/globalCompositeBar.ts       | 32 +------
 .../browser/parts/paneCompositeBar.ts         |  3 +-
 .../contrib/chat/browser/chatSetup.ts         |  1 -
 .../contrib/update/browser/update.ts          |  6 +-
 .../userDataSync/browser/userDataSync.ts      |  7 +-
 .../activity/browser/activityService.ts       | 44 +++++-----
 .../services/activity/common/activity.ts      |  1 -
 .../progress/browser/progressService.ts       |  7 +-
 10 files changed, 81 insertions(+), 106 deletions(-)

diff --git a/src/vs/workbench/browser/parts/compositeBar.ts b/src/vs/workbench/browser/parts/compositeBar.ts
index 4da7a57e952..cbc65f19067 100644
--- a/src/vs/workbench/browser/parts/compositeBar.ts
+++ b/src/vs/workbench/browser/parts/compositeBar.ts
@@ -425,7 +425,7 @@ export class CompositeBar extends Widget implements ICompositeBar {
 		if (item) {
 			// TODO @lramos15 how do we tell the activity to re-render the badge? This triggers an onDidChange but isn't the right way to do it.
 			// I could add another specific function like `activity.updateBadgeEnablement` would then the activity store the sate?
-			item.activityAction.activity = item.activityAction.activity;
+			item.activityAction.activities = item.activityAction.activities;
 		}
 	}
 
diff --git a/src/vs/workbench/browser/parts/compositeBarActions.ts b/src/vs/workbench/browser/parts/compositeBarActions.ts
index e22d2dd19e6..726b76aeffd 100644
--- a/src/vs/workbench/browser/parts/compositeBarActions.ts
+++ b/src/vs/workbench/browser/parts/compositeBarActions.ts
@@ -83,10 +83,10 @@ export class CompositeBarAction extends Action {
 	private readonly _onDidChangeCompositeBarActionItem = this._register(new Emitter<CompositeBarAction>());
 	readonly onDidChangeCompositeBarActionItem = this._onDidChangeCompositeBarActionItem.event;
 
-	private readonly _onDidChangeActivity = this._register(new Emitter<IActivity | undefined>());
+	private readonly _onDidChangeActivity = this._register(new Emitter<IActivity[]>());
 	readonly onDidChangeActivity = this._onDidChangeActivity.event;
 
-	private _activity: IActivity | undefined;
+	private _activities: IActivity[] = [];
 
 	constructor(private item: ICompositeBarActionItem) {
 		super(item.id, item.name, item.classNames?.join(' '), true);
@@ -102,13 +102,13 @@ export class CompositeBarAction extends Action {
 		this._onDidChangeCompositeBarActionItem.fire(this);
 	}
 
-	get activity(): IActivity | undefined {
-		return this._activity;
+	get activities(): IActivity[] {
+		return this._activities;
 	}
 
-	set activity(activity: IActivity | undefined) {
-		this._activity = activity;
-		this._onDidChangeActivity.fire(activity);
+	set activities(activities: IActivity[]) {
+		this._activities = activities;
+		this._onDidChangeActivity.fire(activities);
 	}
 
 	activate(): void {
@@ -214,7 +214,7 @@ export class CompositeBarActionViewItem extends BaseActionViewItem {
 
 		// Badge
 		if (this.badgeContent) {
-			const badgeStyles = this.getActivity()?.badge.getColors(theme);
+			const badgeStyles = this.getActivities()[0]?.badge.getColors(theme);
 			const badgeFg = badgeStyles?.badgeForeground ?? colors.badgeForeground ?? theme.getColor(badgeForeground);
 			const badgeBg = badgeStyles?.badgeBackground ?? colors.badgeBackground ?? theme.getColor(badgeBackground);
 			const contrastBorderColor = badgeStyles?.badgeBorder ?? theme.getColor(contrastBorder);
@@ -300,11 +300,11 @@ export class CompositeBarActionViewItem extends BaseActionViewItem {
 		this.updateStyles();
 	}
 
-	private getActivity(): IActivity | undefined {
+	private getActivities(): IActivity[] {
 		if (this._action instanceof CompositeBarAction) {
-			return this._action.activity;
+			return this._action.activities;
 		}
-		return undefined;
+		return [];
 	}
 
 	protected updateActivity(): void {
@@ -312,7 +312,7 @@ export class CompositeBarActionViewItem extends BaseActionViewItem {
 			return;
 		}
 
-		const activity = this.getActivity();
+		const { badges, type } = this.getVisibleBadges(this.getActivities());
 
 		this.badgeDisposable.value = new DisposableStore();
 
@@ -321,9 +321,8 @@ export class CompositeBarActionViewItem extends BaseActionViewItem {
 
 		const shouldRenderBadges = this.badgesEnabled(this.compositeBarActionItem.id);
 
-		if (activity && shouldRenderBadges) {
+		if (badges.length > 0 && shouldRenderBadges) {
 
-			const { badge } = activity;
 			const classes: string[] = [];
 
 			if (this.options.compact) {
@@ -331,36 +330,33 @@ export class CompositeBarActionViewItem extends BaseActionViewItem {
 			}
 
 			// Progress
-			if (badge instanceof ProgressBadge) {
+			if (type === 'progress') {
 				show(this.badge);
 				classes.push('progress-badge');
 			}
 
 			// Number
-			else if (badge instanceof NumberBadge) {
-				if (badge.number) {
-					let number = badge.number.toString();
-					if (badge.number > 999) {
-						const noOfThousands = badge.number / 1000;
+			else if (type === 'number') {
+				const total = badges.reduce((r, b) => r + (b instanceof NumberBadge ? b.number : 0), 0);
+				if (total > 0) {
+					let badgeNumber = total.toString();
+					if (total > 999) {
+						const noOfThousands = total / 1000;
 						const floor = Math.floor(noOfThousands);
-						if (noOfThousands > floor) {
-							number = `${floor}K+`;
-						} else {
-							number = `${noOfThousands}K`;
-						}
+						badgeNumber = noOfThousands > floor ? `${floor}K+` : `${noOfThousands}K`;
 					}
-					if (this.options.compact && number.length >= 3) {
+					if (this.options.compact && badgeNumber.length >= 3) {
 						classes.push('compact-content');
 					}
-					this.badgeContent.textContent = number;
+					this.badgeContent.textContent = badgeNumber;
 					show(this.badge);
 				}
 			}
 
 			// Icon
-			else if (badge instanceof IconBadge) {
+			else if (type === 'icon') {
 				classes.push('icon-badge');
-				const badgeContentClassess = ['icon-overlay', ...ThemeIcon.asClassNameArray(badge.icon)];
+				const badgeContentClassess = ['icon-overlay', ...ThemeIcon.asClassNameArray((badges[0] as IconBadge).icon)];
 				this.badgeContent.classList.add(...badgeContentClassess);
 				this.badgeDisposable.value.add(toDisposable(() => this.badgeContent?.classList.remove(...badgeContentClassess)));
 				show(this.badge);
@@ -377,6 +373,25 @@ export class CompositeBarActionViewItem extends BaseActionViewItem {
 		this.updateStyles();
 	}
 
+	private getVisibleBadges(activities: IActivity[]): { badges: IBadge[]; type: 'progress' | 'icon' | 'number' | undefined } {
+		const progressBadges = activities.filter(activity => activity.badge instanceof ProgressBadge).map(activity => activity.badge);
+		if (progressBadges.length > 0) {
+			return { badges: progressBadges, type: 'progress' };
+		}
+
+		const iconBadges = activities.filter(activity => activity.badge instanceof IconBadge).map(activity => activity.badge);
+		if (iconBadges.length > 0) {
+			return { badges: iconBadges, type: 'icon' };
+		}
+
+		const numberBadges = activities.filter(activity => activity.badge instanceof NumberBadge).map(activity => activity.badge);
+		if (numberBadges.length > 0) {
+			return { badges: numberBadges, type: 'number' };
+		}
+
+		return { badges: [], type: undefined };
+	}
+
 	protected override updateLabel(): void {
 		this.label.className = 'action-label';
 
@@ -403,9 +418,14 @@ export class CompositeBarActionViewItem extends BaseActionViewItem {
 	protected computeTitle(): string {
 		this.keybindingLabel = this.computeKeybindingLabel();
 		let title = this.keybindingLabel ? localize('titleKeybinding', "{0} ({1})", this.compositeBarActionItem.name, this.keybindingLabel) : this.compositeBarActionItem.name;
-		const badge = (this.action as CompositeBarAction).activity?.badge;
-		if (badge?.getDescription()) {
-			title = localize('badgeTitle', "{0} - {1}", title, badge.getDescription());
+
+		const badges = this.getVisibleBadges((this.action as CompositeBarAction).activities).badges;
+		for (const badge of badges) {
+			const description = badge.getDescription();
+			if (!description) {
+				continue;
+			}
+			title = `${title} - ${badge.getDescription()}`;
 		}
 
 		return title;
diff --git a/src/vs/workbench/browser/parts/globalCompositeBar.ts b/src/vs/workbench/browser/parts/globalCompositeBar.ts
index d93cb9b1ef1..c026e158172 100644
--- a/src/vs/workbench/browser/parts/globalCompositeBar.ts
+++ b/src/vs/workbench/browser/parts/globalCompositeBar.ts
@@ -6,7 +6,7 @@
 import { localize } from '../../../nls.js';
 import { ActionBar, ActionsOrientation } from '../../../base/browser/ui/actionbar/actionbar.js';
 import { ACCOUNTS_ACTIVITY_ID, GLOBAL_ACTIVITY_ID } from '../../common/activity.js';
-import { IActivity, IActivityService, NumberBadge } from '../../services/activity/common/activity.js';
+import { IActivityService } from '../../services/activity/common/activity.js';
 import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
 import { DisposableStore, Disposable } from '../../../base/common/lifecycle.js';
 import { IColorTheme, IThemeService } from '../../../platform/theme/common/themeService.js';
@@ -183,33 +183,7 @@ abstract class AbstractGlobalActivityActionViewItem extends CompositeBarActionVi
 	}
 
 	private updateItemActivity(): void {
-		const activities = this.activityService.getActivity(this.compositeBarActionItem.id);
-		let activity = activities[0];
-		if (activity) {
-			const { badge, priority } = activity;
-			if (badge instanceof NumberBadge && activities.length > 1) {
-				const cumulativeNumberBadge = this.getCumulativeNumberBadge(activities, priority ?? 0);
-				activity = { badge: cumulativeNumberBadge };
-			}
-		}
-		(this.action as CompositeBarAction).activity = activity;
-	}
-
-	private getCumulativeNumberBadge(activityCache: IActivity[], priority: number): NumberBadge {
-		const numberActivities = activityCache.filter(activity => activity.badge instanceof NumberBadge && (activity.priority ?? 0) === priority);
-		const number = numberActivities.reduce((result, activity) => { return result + (<NumberBadge>activity.badge).number; }, 0);
-		const descriptorFn = (): string => {
-			return numberActivities.reduce((result, activity, index) => {
-				result = result + (<NumberBadge>activity.badge).getDescription();
-				if (index < numberActivities.length - 1) {
-					result = `${result}\n`;
-				}
-
-				return result;
-			}, '');
-		};
-
-		return new NumberBadge(number, descriptorFn);
+		(this.action as CompositeBarAction).activities = this.activityService.getActivity(this.compositeBarActionItem.id);
 	}
 
 	override render(container: HTMLElement): void {
@@ -595,7 +569,7 @@ export class GlobalActivityActionViewItem extends AbstractGlobalActivityActionVi
 			return;
 		}
 
-		if ((this.action as CompositeBarAction).activity) {
+		if ((this.action as CompositeBarAction).activities.length > 0) {
 			return;
 		}
 
diff --git a/src/vs/workbench/browser/parts/paneCompositeBar.ts b/src/vs/workbench/browser/parts/paneCompositeBar.ts
index db3d98034a0..05b43a296e1 100644
--- a/src/vs/workbench/browser/parts/paneCompositeBar.ts
+++ b/src/vs/workbench/browser/parts/paneCompositeBar.ts
@@ -795,8 +795,7 @@ class ViewContainerActivityAction extends CompositeBarAction {
 	}
 
 	private updateActivity(): void {
-		const activities = this.activityService.getViewContainerActivities(this.compositeBarActionItem.id);
-		this.activity = activities[0];
+		this.activities = this.activityService.getViewContainerActivities(this.compositeBarActionItem.id);
 	}
 
 	override async run(event: { preserveFocus: boolean }): Promise<void> {
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 3af2ce5f98c..0f9b0496a49 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -682,7 +682,6 @@ class ChatSetupController extends Disposable {
 		const title = localize('setupChatProgress', "Getting Copilot ready...");
 		const badge = this.activityService.showViewContainerActivity(isCopilotEditsViewActive(this.viewsService) ? CHAT_EDITING_SIDEBAR_PANEL_ID : CHAT_SIDEBAR_PANEL_ID, {
 			badge: new ProgressBadge(() => title),
-			priority: 100
 		});
 
 		try {
diff --git a/src/vs/workbench/contrib/update/browser/update.ts b/src/vs/workbench/contrib/update/browser/update.ts
index d824df32c93..fd3452f5f02 100644
--- a/src/vs/workbench/contrib/update/browser/update.ts
+++ b/src/vs/workbench/contrib/update/browser/update.ts
@@ -254,25 +254,21 @@ export class UpdateContribution extends Disposable implements IWorkbenchContribu
 		}
 
 		let badge: IBadge | undefined = undefined;
-		let priority: number | undefined = undefined;
 
 		if (state.type === StateType.AvailableForDownload || state.type === StateType.Downloaded || state.type === StateType.Ready) {
 			badge = new NumberBadge(1, () => nls.localize('updateIsReady', "New {0} update available.", this.productService.nameShort));
 		} else if (state.type === StateType.CheckingForUpdates) {
 			badge = new ProgressBadge(() => nls.localize('checkingForUpdates', "Checking for {0} updates...", this.productService.nameShort));
-			priority = 1;
 		} else if (state.type === StateType.Downloading) {
 			badge = new ProgressBadge(() => nls.localize('downloading', "Downloading {0} update...", this.productService.nameShort));
-			priority = 1;
 		} else if (state.type === StateType.Updating) {
 			badge = new ProgressBadge(() => nls.localize('updating', "Updating {0}...", this.productService.nameShort));
-			priority = 1;
 		}
 
 		this.badgeDisposable.clear();
 
 		if (badge) {
-			this.badgeDisposable.value = this.activityService.showGlobalActivity({ badge, priority });
+			this.badgeDisposable.value = this.activityService.showGlobalActivity({ badge });
 		}
 
 		this.state = state;
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
index c7f9cb61c25..6a2c8ceb17a 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
@@ -426,17 +426,14 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 		this.globalActivityBadgeDisposable.clear();
 
 		let badge: IBadge | undefined = undefined;
-		let priority: number | undefined = undefined;
-
 		if (this.userDataSyncService.conflicts.length && this.userDataSyncEnablementService.isEnabled()) {
 			badge = new NumberBadge(this.getConflictsCount(), () => localize('has conflicts', "{0}: Conflicts Detected", SYNC_TITLE.value));
 		} else if (this.turningOnSync) {
 			badge = new ProgressBadge(() => localize('turning on syncing', "Turning on Settings Sync..."));
-			priority = 1;
 		}
 
 		if (badge) {
-			this.globalActivityBadgeDisposable.value = this.activityService.showGlobalActivity({ badge, priority });
+			this.globalActivityBadgeDisposable.value = this.activityService.showGlobalActivity({ badge });
 		}
 	}
 
@@ -450,7 +447,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 		}
 
 		if (badge) {
-			this.accountBadgeDisposable.value = this.activityService.showAccountsActivity({ badge, priority: undefined });
+			this.accountBadgeDisposable.value = this.activityService.showAccountsActivity({ badge });
 		}
 	}
 
diff --git a/src/vs/workbench/services/activity/browser/activityService.ts b/src/vs/workbench/services/activity/browser/activityService.ts
index 2d6615626fe..03eedc1c3cc 100644
--- a/src/vs/workbench/services/activity/browser/activityService.ts
+++ b/src/vs/workbench/services/activity/browser/activityService.ts
@@ -10,7 +10,6 @@ import { IViewDescriptorService, ViewContainer } from '../../../common/views.js'
 import { GLOBAL_ACTIVITY_ID, ACCOUNTS_ACTIVITY_ID } from '../../../common/activity.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { isUndefined } from '../../../../base/common/types.js';
 
 class ViewContainerActivityByView extends Disposable {
 
@@ -77,31 +76,28 @@ export class ActivityService extends Disposable implements IActivityService {
 
 	showViewContainerActivity(viewContainerId: string, activity: IActivity): IDisposable {
 		const viewContainer = this.viewDescriptorService.getViewContainerById(viewContainerId);
-		if (viewContainer) {
-			let activities = this.viewContainerActivities.get(viewContainerId);
-			if (!activities) {
-				activities = [];
-				this.viewContainerActivities.set(viewContainerId, activities);
-			}
-			for (let i = 0; i <= activities.length; i++) {
-				if (i === activities.length || isUndefined(activity.priority)) {
-					activities.push(activity);
-					break;
-				} else if (isUndefined(activities[i].priority) || activities[i].priority! <= activity.priority) {
-					activities.splice(i, 0, activity);
-					break;
-				}
+		if (!viewContainer) {
+			return Disposable.None;
+		}
+
+		let activities = this.viewContainerActivities.get(viewContainerId);
+		if (!activities) {
+			activities = [];
+			this.viewContainerActivities.set(viewContainerId, activities);
+		}
+
+		// add activity
+		activities.push(activity);
+
+		this._onDidChangeActivity.fire(viewContainer);
+
+		return toDisposable(() => {
+			activities.splice(activities.indexOf(activity), 1);
+			if (activities.length === 0) {
+				this.viewContainerActivities.delete(viewContainerId);
 			}
 			this._onDidChangeActivity.fire(viewContainer);
-			return toDisposable(() => {
-				activities.splice(activities.indexOf(activity), 1);
-				if (activities.length === 0) {
-					this.viewContainerActivities.delete(viewContainerId);
-				}
-				this._onDidChangeActivity.fire(viewContainer);
-			});
-		}
-		return Disposable.None;
+		});
 	}
 
 	getViewContainerActivities(viewContainerId: string): IActivity[] {
diff --git a/src/vs/workbench/services/activity/common/activity.ts b/src/vs/workbench/services/activity/common/activity.ts
index 38e03498cb4..4b114f37b40 100644
--- a/src/vs/workbench/services/activity/common/activity.ts
+++ b/src/vs/workbench/services/activity/common/activity.ts
@@ -15,7 +15,6 @@ import { ViewContainer } from '../../../common/views.js';
 
 export interface IActivity {
 	readonly badge: IBadge;
-	readonly priority?: number;
 }
 
 export const IActivityService = createDecorator<IActivityService>('activityService');
diff --git a/src/vs/workbench/services/progress/browser/progressService.ts b/src/vs/workbench/services/progress/browser/progressService.ts
index c0f5fb3929c..872300d3937 100644
--- a/src/vs/workbench/services/progress/browser/progressService.ts
+++ b/src/vs/workbench/services/progress/browser/progressService.ts
@@ -454,11 +454,6 @@ export class ProgressService extends Disposable implements IProgressService {
 		const progressIndicator = this.viewsService.getViewProgressIndicator(viewId);
 		const promise = progressIndicator ? this.withCompositeProgress(progressIndicator, task, options) : task({ report: () => { } });
 
-		const location = this.viewDescriptorService.getViewLocationById(viewId);
-		if (location !== ViewContainerLocation.Sidebar) {
-			return promise;
-		}
-
 		const viewletId = this.viewDescriptorService.getViewContainerByViewId(viewId)?.id;
 		if (viewletId === undefined) {
 			return promise;
@@ -474,7 +469,7 @@ export class ProgressService extends Disposable implements IProgressService {
 		let activityProgress: IDisposable;
 		let delayHandle: any = setTimeout(() => {
 			delayHandle = undefined;
-			const handle = this.activityService.showViewContainerActivity(viewletId, { badge: new ProgressBadge(() => ''), priority: 100 });
+			const handle = this.activityService.showViewContainerActivity(viewletId, { badge: new ProgressBadge(() => '') });
 			const startTimeVisible = Date.now();
 			const minTimeVisible = 300;
 			activityProgress = {

From 2b5593f324fe46db692de77cfd173bb8699c9f4b Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Fri, 13 Dec 2024 11:09:10 +0100
Subject: [PATCH 177/479] Proper fix for #235977 (#235983)

---
 .../base/common/observableInternal/derived.ts | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/vs/base/common/observableInternal/derived.ts b/src/vs/base/common/observableInternal/derived.ts
index 5d7fc0a7bfb..80cc9a72124 100644
--- a/src/vs/base/common/observableInternal/derived.ts
+++ b/src/vs/base/common/observableInternal/derived.ts
@@ -365,6 +365,8 @@ export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> im
 		}
 	}
 
+	private _removedObserverToCallEndUpdateOn: Set<IObserver> | null = null;
+
 	public endUpdate<T>(_observable: IObservable<T>): void {
 		this.updateCount--;
 		if (this.updateCount === 0) {
@@ -373,6 +375,13 @@ export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> im
 			for (const r of observers) {
 				r.endUpdate(this);
 			}
+			if (this._removedObserverToCallEndUpdateOn) {
+				const observers = [...this._removedObserverToCallEndUpdateOn];
+				this._removedObserverToCallEndUpdateOn = null;
+				for (const r of observers) {
+					r.endUpdate(this);
+				}
+			}
 		}
 		assertFn(() => this.updateCount >= 0);
 	}
@@ -433,18 +442,22 @@ export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> im
 		super.addObserver(observer);
 
 		if (shouldCallBeginUpdate) {
-			observer.beginUpdate(this);
+			if (this._removedObserverToCallEndUpdateOn && this._removedObserverToCallEndUpdateOn.has(observer)) {
+				this._removedObserverToCallEndUpdateOn.delete(observer);
+			} else {
+				observer.beginUpdate(this);
+			}
 		}
 	}
 
 	public override removeObserver(observer: IObserver): void {
-		const shouldCallEndUpdate = this.observers.has(observer) && this.updateCount > 0;
-		super.removeObserver(observer);
-
-		if (shouldCallEndUpdate) {
-			// Calling end update after removing the observer makes sure endUpdate cannot be called twice here.
-			observer.endUpdate(this);
+		if (this.observers.has(observer) && this.updateCount > 0) {
+			if (!this._removedObserverToCallEndUpdateOn) {
+				this._removedObserverToCallEndUpdateOn = new Set();
+			}
+			this._removedObserverToCallEndUpdateOn.add(observer);
 		}
+		super.removeObserver(observer);
 	}
 }
 

From 1a5b1f329ad136ede86940844a48fc6f6600286a Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 13 Dec 2024 11:15:08 +0100
Subject: [PATCH 178/479] register command to open the active log with the
 macos native log viewer (#235963)

* register command to open the active log with the macos native log viewer

helps with https://github.com/microsoft/vscode-copilot/issues/11205

* make layer check happy
---
 .../electron-sandbox/output.contribution.ts   | 46 +++++++++++++++++++
 src/vs/workbench/workbench.desktop.main.ts    |  6 +--
 2 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 src/vs/workbench/contrib/output/electron-sandbox/output.contribution.ts

diff --git a/src/vs/workbench/contrib/output/electron-sandbox/output.contribution.ts b/src/vs/workbench/contrib/output/electron-sandbox/output.contribution.ts
new file mode 100644
index 00000000000..7305828c10f
--- /dev/null
+++ b/src/vs/workbench/contrib/output/electron-sandbox/output.contribution.ts
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Codicon } from '../../../../base/common/codicons.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
+import { localize2 } from '../../../../nls.js';
+import { registerAction2, Action2, MenuId } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IsMacNativeContext } from '../../../../platform/contextkey/common/contextkeys.js';
+import { INativeHostService } from '../../../../platform/native/common/native.js';
+import { OUTPUT_VIEW_ID, CONTEXT_ACTIVE_FILE_OUTPUT, IOutputService } from '../../../services/output/common/output.js';
+
+
+registerAction2(class OpenInConsoleAction extends Action2 {
+	constructor() {
+		super({
+			id: `workbench.action.openActiveLogOutputFileNative`,
+			title: localize2('openActiveOutputFileNative', "Open Output in Console"),
+			menu: [{
+				id: MenuId.ViewTitle,
+				when: ContextKeyExpr.and(ContextKeyExpr.equals('view', OUTPUT_VIEW_ID), IsMacNativeContext),
+				group: 'navigation',
+				order: 6,
+				isHiddenByDefault: true
+			}],
+			icon: Codicon.goToFile,
+			precondition: ContextKeyExpr.and(CONTEXT_ACTIVE_FILE_OUTPUT, IsMacNativeContext)
+		});
+	}
+
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const outputService = accessor.get(IOutputService);
+		const hostService = accessor.get(INativeHostService);
+		const channel = outputService.getActiveChannel();
+		if (!channel) {
+			return;
+		}
+		const descriptor = outputService.getChannelDescriptors().find(c => c.id === channel.id);
+		if (descriptor?.file && descriptor.file.scheme === Schemas.file) {
+			hostService.openExternal(descriptor.file.toString(true), 'open');
+		}
+	}
+});
diff --git a/src/vs/workbench/workbench.desktop.main.ts b/src/vs/workbench/workbench.desktop.main.ts
index 57bf9f0167c..755d3c95beb 100644
--- a/src/vs/workbench/workbench.desktop.main.ts
+++ b/src/vs/workbench/workbench.desktop.main.ts
@@ -127,20 +127,21 @@ import './contrib/remote/electron-sandbox/remote.contribution.js';
 // Configuration Exporter
 import './contrib/configExporter/electron-sandbox/configurationExportHelper.contribution.js';
 
+// Output View
+import './contrib/output/electron-sandbox/output.contribution.js';
+
 // Terminal
 import './contrib/terminal/electron-sandbox/terminal.contribution.js';
 
 // Themes
 import './contrib/themes/browser/themes.test.contribution.js';
 import './services/themes/electron-sandbox/themes.contribution.js';
-
 // User Data Sync
 import './contrib/userDataSync/electron-sandbox/userDataSync.contribution.js';
 
 // Tags
 import './contrib/tags/electron-sandbox/workspaceTagsService.js';
 import './contrib/tags/electron-sandbox/tags.contribution.js';
-
 // Performance
 import './contrib/performance/electron-sandbox/performance.contribution.js';
 
@@ -171,7 +172,6 @@ import './contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.js';
 // Chat
 import './contrib/chat/electron-sandbox/chat.contribution.js';
 import './contrib/inlineChat/electron-sandbox/inlineChat.contribution.js';
-
 // Encryption
 import './contrib/encryption/electron-sandbox/encryption.contribution.js';
 

From d608eb8aca4db80935f4f2a87338d5fa2239bbc5 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 13 Dec 2024 11:41:43 +0100
Subject: [PATCH 179/479] fix
 https://github.com/microsoft/vscode-copilot/issues/10983 (#236022)

---
 .../browser/contrib/chatInputCompletions.ts   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
index 6bde0e0e6d8..06a7bd3c912 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
@@ -86,7 +86,7 @@ class SlashCommandCompletions extends Disposable {
 						return {
 							label: withSlash,
 							insertText: c.executeImmediately ? '' : `${withSlash} `,
-							detail: c.detail,
+							documentation: c.detail,
 							range,
 							sortText: c.sortText ?? 'a'.repeat(i + 1),
 							kind: CompletionItemKind.Text, // The icons are disabled here anyway,
@@ -126,7 +126,7 @@ class SlashCommandCompletions extends Disposable {
 						return {
 							label: withSlash,
 							insertText: c.executeImmediately ? '' : `${withSlash} `,
-							detail: c.detail,
+							documentation: c.detail,
 							range,
 							filterText: `${chatAgentLeader}${c.command}`,
 							sortText: c.sortText ?? 'z'.repeat(i + 1),
@@ -193,7 +193,7 @@ class AgentCompletions extends Disposable {
 						return {
 							label: withSlash,
 							insertText: `${withSlash} `,
-							detail: c.description,
+							documentation: c.description,
 							range,
 							kind: CompletionItemKind.Text, // The icons are disabled here anyway
 						};
@@ -246,7 +246,7 @@ class AgentCompletions extends Disposable {
 							label: isDupe ?
 								{ label: agentLabel, description: agent.description, detail: ` (${agent.publisherDisplayName})` } :
 								agentLabel,
-							detail,
+							documentation: detail,
 							filterText: `${chatAgentLeader}${agent.name}`,
 							insertText: `${agentLabel} `,
 							range,
@@ -265,7 +265,7 @@ class AgentCompletions extends Disposable {
 								label: isDupe ?
 									{ label, description: c.description, detail: isDupe ? ` (${agent.publisherDisplayName})` : undefined } :
 									label,
-								detail: c.description,
+								documentation: c.description,
 								filterText: getFilterText(agent, c.name),
 								commitCharacters: [' '],
 								insertText: label + ' ',
@@ -280,7 +280,7 @@ class AgentCompletions extends Disposable {
 								const label = `${chatSubcommandLeader}${c.name}`;
 								item.label = label;
 								item.insertText = `${label} `;
-								item.detail = c.description;
+								item.documentation = c.description;
 							}
 
 							return item;
@@ -322,7 +322,7 @@ class AgentCompletions extends Disposable {
 							label: { label: withSlash, description: agentLabel, detail: isDupe ? ` (${agent.publisherDisplayName})` : undefined },
 							commitCharacters: [' '],
 							insertText: `${agentLabel} ${withSlash} `,
-							detail: `(${agentLabel}) ${c.description ?? ''}`,
+							documentation: `(${agentLabel}) ${c.description ?? ''}`,
 							range,
 							kind: CompletionItemKind.Text, // The icons are disabled here anyway
 							sortText,
@@ -334,7 +334,7 @@ class AgentCompletions extends Disposable {
 							const label = `${chatSubcommandLeader}${c.name}`;
 							item.label = label;
 							item.insertText = `${label} `;
-							item.detail = c.description;
+							item.documentation = c.description;
 						}
 
 						return item;
@@ -464,7 +464,7 @@ class BuiltinDynamicCompletions extends Disposable {
 					result.suggestions.push({
 						label: `${chatVariableLeader}file`,
 						insertText: `${chatVariableLeader}file:`,
-						detail: localize('pickFileLabel', "Pick a file"),
+						documentation: localize('pickFileLabel', "Pick a file"),
 						range,
 						kind: CompletionItemKind.Text,
 						command: { id: SelectAndInsertFileAction.ID, title: SelectAndInsertFileAction.ID, arguments: [{ widget, range: afterRange }] },
@@ -499,7 +499,7 @@ class BuiltinDynamicCompletions extends Disposable {
 					result.suggestions.push({
 						label: `${chatVariableLeader}sym`,
 						insertText: `${chatVariableLeader}sym:`,
-						detail: localize('pickSymbolLabel', "Pick a symbol"),
+						documentation: localize('pickSymbolLabel', "Pick a symbol"),
 						range,
 						kind: CompletionItemKind.Text,
 						command: { id: SelectAndInsertSymAction.ID, title: SelectAndInsertSymAction.ID, arguments: [{ widget, range: afterRangeSym }] },
@@ -798,7 +798,7 @@ class VariableCompletions extends Disposable {
 							label: withLeader,
 							range,
 							insertText: withLeader + ' ',
-							detail: v.description,
+							documentation: v.description,
 							kind: CompletionItemKind.Text, // The icons are disabled here anyway
 							sortText: 'z'
 						};
@@ -816,7 +816,7 @@ class VariableCompletions extends Disposable {
 							label: withLeader,
 							range,
 							insertText: withLeader + ' ',
-							detail: t.userDescription,
+							documentation: t.userDescription,
 							kind: CompletionItemKind.Text,
 							sortText: 'z'
 						};

From a793c5919550f11514c460dc58eaf1ea07629f00 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 13 Dec 2024 11:44:06 +0100
Subject: [PATCH 180/479] chat - handle error situations and present to user
 (#235918)

---
 .../contrib/chat/browser/chatSetup.ts         | 70 +++++++++++++++++--
 1 file changed, 63 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 0f9b0496a49..a9b5eafe8eb 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -59,6 +59,7 @@ import { mainWindow } from '../../../../base/browser/window.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IHostService } from '../../../services/host/browser/host.js';
+import Severity from '../../../../base/common/severity.js';
 
 const defaultChat = {
 	extensionId: product.defaultChatAgent?.extensionId ?? '',
@@ -346,6 +347,8 @@ class ChatSetupRequests extends Disposable {
 		@ILogService private readonly logService: ILogService,
 		@IRequestService private readonly requestService: IRequestService,
 		@IChatQuotasService private readonly chatQuotasService: IChatQuotasService,
+		@IDialogService private readonly dialogService: IDialogService,
+		@IOpenerService private readonly openerService: IOpenerService
 	) {
 		super();
 
@@ -467,7 +470,12 @@ class ChatSetupRequests extends Disposable {
 			return { entitlement: ChatEntitlement.Unresolved };
 		}
 
-		const responseText = await asText(response);
+		let responseText: string | null = null;
+		try {
+			responseText = await asText(response);
+		} catch (error) {
+			// ignore - handled below
+		}
 		if (token.isCancellationRequested) {
 			return undefined;
 		}
@@ -570,18 +578,38 @@ class ChatSetupRequests extends Disposable {
 
 		const response = await this.request(defaultChat.entitlementSignupLimitedUrl, 'POST', body, session, CancellationToken.None);
 		if (!response) {
-			this.logService.error('[chat setup] sign-up: no response');
+			this.onUnknownSignUpError('[chat setup] sign-up: no response');
 			return false;
 		}
 
 		if (response.res.statusCode && response.res.statusCode !== 200) {
-			this.logService.error(`[chat setup] sign-up: unexpected status code ${response.res.statusCode}`);
+			if (response.res.statusCode === 422) {
+				try {
+					const responseText = await asText(response);
+					if (responseText) {
+						const responseError: { message: string } = JSON.parse(responseText);
+						if (typeof responseError.message === 'string' && responseError.message) {
+							this.onUnprocessableSignUpError(`[chat setup] sign-up: unprocessable entity (${responseError.message})`, responseError.message);
+							return false;
+						}
+					}
+				} catch (error) {
+					// ignore - handled below
+				}
+			}
+			this.onUnknownSignUpError(`[chat setup] sign-up: unexpected status code ${response.res.statusCode}`);
 			return false;
 		}
 
-		const responseText = await asText(response);
+		let responseText: string | null = null;
+		try {
+			responseText = await asText(response);
+		} catch (error) {
+			// ignore - handled below
+		}
+
 		if (!responseText) {
-			this.logService.error('[chat setup] sign-up: response has no content');
+			this.onUnknownSignUpError('[chat setup] sign-up: response has no content');
 			return false;
 		}
 
@@ -590,7 +618,7 @@ class ChatSetupRequests extends Disposable {
 			parsedResult = JSON.parse(responseText);
 			this.logService.trace(`[chat setup] sign-up: response is ${responseText}`);
 		} catch (err) {
-			this.logService.error(`[chat setup] sign-up: error parsing response (${err})`);
+			this.onUnknownSignUpError(`[chat setup] sign-up: error parsing response (${err})`);
 		}
 
 		const subscribed = Boolean(parsedResult?.subscribed);
@@ -607,6 +635,30 @@ class ChatSetupRequests extends Disposable {
 		return subscribed;
 	}
 
+	private onUnknownSignUpError(logMessage: string): void {
+		this.dialogService.error(localize('unknownSignUpError', "An error occurred while signing up for Copilot Free."), localize('unknownSignUpErrorDetail', "Please try again."));
+		this.logService.error(logMessage);
+	}
+
+	private onUnprocessableSignUpError(logMessage: string, logDetails: string): void {
+		this.dialogService.prompt({
+			type: Severity.Error,
+			message: localize('unprocessableSignUpError', "An error occurred while signing up for Copilot Free."),
+			detail: logDetails,
+			buttons: [
+				{
+					label: localize('ok', "OK"),
+					run: () => { /* noop */ }
+				},
+				{
+					label: localize('learnMore', "Learn More"),
+					run: () => this.openerService.open(URI.parse(defaultChat.upgradePlanUrl))
+				}
+			]
+		});
+		this.logService.error(logMessage);
+	}
+
 	override dispose(): void {
 		this.pendingResolveCts.dispose(true);
 
@@ -625,7 +677,7 @@ type InstallChatClassification = {
 	signedIn: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the user did sign in prior to installing the extension.' };
 };
 type InstallChatEvent = {
-	installResult: 'installed' | 'cancelled' | 'failedInstall' | 'failedNotSignedIn';
+	installResult: 'installed' | 'cancelled' | 'failedInstall' | 'failedNotSignedIn' | 'failedSignUp';
 	signedIn: boolean;
 };
 
@@ -770,6 +822,10 @@ class ChatSetupController extends Disposable {
 
 			if (entitlement !== ChatEntitlement.Limited && entitlement !== ChatEntitlement.Pro && entitlement !== ChatEntitlement.Unavailable) {
 				didSignUp = await this.requests.signUpLimited(session);
+
+				if (!didSignUp) {
+					this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'failedSignUp', signedIn });
+				}
 			}
 
 			await this.extensionsWorkbenchService.install(defaultChat.extensionId, {

From 708f5ab818017bee22e6be822283f1c7b8a7813f Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Fri, 13 Dec 2024 11:54:06 +0100
Subject: [PATCH 181/479] Dim disabled SVG icons in action bar (#236024)

fix #209397
---
 src/vs/base/browser/ui/actionbar/actionbar.css | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/vs/base/browser/ui/actionbar/actionbar.css b/src/vs/base/browser/ui/actionbar/actionbar.css
index cf699047f02..6471258102e 100644
--- a/src/vs/base/browser/ui/actionbar/actionbar.css
+++ b/src/vs/base/browser/ui/actionbar/actionbar.css
@@ -52,12 +52,19 @@
 	border-radius: 5px;
 }
 
-.monaco-action-bar .action-item.disabled .action-label,
-.monaco-action-bar .action-item.disabled .action-label::before,
-.monaco-action-bar .action-item.disabled .action-label:hover {
+.monaco-action-bar .action-item.disabled .action-label:not(.icon) ,
+.monaco-action-bar .action-item.disabled .action-label:not(.icon)::before,
+.monaco-action-bar .action-item.disabled .action-label:not(.icon):hover {
 	color: var(--vscode-disabledForeground);
 }
 
+/* Unable to change color of SVGs, hence opacity is used */
+.monaco-action-bar .action-item.disabled .action-label.icon ,
+.monaco-action-bar .action-item.disabled .action-label.icon::before,
+.monaco-action-bar .action-item.disabled .action-label.icon:hover {
+	opacity: 0.6;
+}
+
 /* Vertical actions */
 
 .monaco-action-bar.vertical {

From bb212e4b0cc954d642270a14c9c436ec760ddb42 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Fri, 13 Dec 2024 11:54:54 +0100
Subject: [PATCH 182/479] Better react to conditions which would cause a line
 to change its position vertically

---
 src/vs/editor/browser/observableCodeEditor.ts | 34 +++++++++++++++++--
 src/vs/editor/browser/point.ts                | 28 +++++++++++++++
 .../view/inlineEdits/sideBySideDiff.ts        | 29 ++++++++++++----
 .../browser/view/inlineEdits/utils.ts         | 30 ++++------------
 4 files changed, 87 insertions(+), 34 deletions(-)
 create mode 100644 src/vs/editor/browser/point.ts

diff --git a/src/vs/editor/browser/observableCodeEditor.ts b/src/vs/editor/browser/observableCodeEditor.ts
index 324bdd0528b..404f10dbe46 100644
--- a/src/vs/editor/browser/observableCodeEditor.ts
+++ b/src/vs/editor/browser/observableCodeEditor.ts
@@ -12,7 +12,8 @@ import { Selection } from '../common/core/selection.js';
 import { ICursorSelectionChangedEvent } from '../common/cursorEvents.js';
 import { IModelDeltaDecoration, ITextModel } from '../common/model.js';
 import { IModelContentChangedEvent } from '../common/textModelEvents.js';
-import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition } from './editorBrowser.js';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IOverlayWidget, IOverlayWidgetPosition } from './editorBrowser.js';
+import { Point } from './point.js';
 
 /**
  * Returns a facade for the code editor that provides observables for various states/events.
@@ -241,10 +242,10 @@ export class ObservableCodeEditor extends Disposable {
 		return d;
 	}
 
-	private _overlayWidgetCounter = 0;
+	private _widgetCounter = 0;
 
 	public createOverlayWidget(widget: IObservableOverlayWidget): IDisposable {
-		const overlayWidgetId = 'observableOverlayWidget' + (this._overlayWidgetCounter++);
+		const overlayWidgetId = 'observableOverlayWidget' + (this._widgetCounter++);
 		const w: IOverlayWidget = {
 			getDomNode: () => widget.domNode,
 			getPosition: () => widget.position.get(),
@@ -263,6 +264,33 @@ export class ObservableCodeEditor extends Disposable {
 			this.editor.removeOverlayWidget(w);
 		});
 	}
+
+	public observePosition(position: IObservable<Position | null>, store: DisposableStore): IObservable<Point | null> {
+		const result = observableValueOpts<Point | null>({ owner: this, equalsFn: equalsIfDefined(Point.equals) }, new Point(0, 0));
+		const contentWidgetId = `observablePositionWidget` + (this._widgetCounter++);
+		const domNode = document.createElement('div');
+		const w: IContentWidget = {
+			getDomNode: () => domNode,
+			getPosition: () => {
+				const pos = position.get();
+				return pos ? { preference: [ContentWidgetPositionPreference.EXACT], position: position.get() } : null;
+			},
+			getId: () => contentWidgetId,
+			allowEditorOverflow: false,
+			afterRender(position, coordinate) {
+				result.set(coordinate ? new Point(coordinate.left, coordinate.top) : null, undefined);
+			},
+		};
+		this.editor.addContentWidget(w);
+		store.add(autorun(reader => {
+			position.read(reader);
+			this.editor.layoutContentWidget(w);
+		}));
+		store.add(toDisposable(() => {
+			this.editor.removeContentWidget(w);
+		}));
+		return result;
+	}
 }
 
 interface IObservableOverlayWidget {
diff --git a/src/vs/editor/browser/point.ts b/src/vs/editor/browser/point.ts
new file mode 100644
index 00000000000..d056d1218f8
--- /dev/null
+++ b/src/vs/editor/browser/point.ts
@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export class Point {
+
+	static equals(a: Point, b: Point): boolean {
+		return a.x === b.x && a.y === b.y;
+	}
+
+	constructor(
+		public readonly x: number,
+		public readonly y: number
+	) { }
+
+	public add(other: Point): Point {
+		return new Point(this.x + other.x, this.y + other.y);
+	}
+
+	public deltaX(delta: number): Point {
+		return new Point(this.x + delta, this.y);
+	}
+
+	public deltaY(delta: number): Point {
+		return new Point(this.x, this.y + delta);
+	}
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
index 90f026719a3..25b1d750fc4 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
@@ -7,25 +7,27 @@ import { IAction } from '../../../../../../base/common/actions.js';
 import { Color } from '../../../../../../base/common/color.js';
 import { structuralEquals } from '../../../../../../base/common/equals.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { IObservable, constObservable, derived, autorun, derivedOpts, observableValue } from '../../../../../../base/common/observable.js';
+import { IObservable, autorun, constObservable, derived, derivedOpts, observableValue } from '../../../../../../base/common/observable.js';
 import { MenuId, MenuItemAction } from '../../../../../../platform/actions/common/actions.js';
 import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
-import { diffRemoved, diffInserted } from '../../../../../../platform/theme/common/colorRegistry.js';
-import { registerColor, darken, lighten } from '../../../../../../platform/theme/common/colorUtils.js';
+import { diffInserted, diffRemoved } from '../../../../../../platform/theme/common/colorRegistry.js';
+import { darken, lighten, registerColor } from '../../../../../../platform/theme/common/colorUtils.js';
 import { ICodeEditor } from '../../../../../browser/editorBrowser.js';
 import { observableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
+import { Point } from '../../../../../browser/point.js';
 import { EmbeddedCodeEditorWidget } from '../../../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { EditorOption } from '../../../../../common/config/editorOptions.js';
 import { editorLineHighlightBorder } from '../../../../../common/core/editorColorRegistry.js';
 import { LineRange } from '../../../../../common/core/lineRange.js';
 import { OffsetRange } from '../../../../../common/core/offsetRange.js';
+import { Position } from '../../../../../common/core/position.js';
 import { Range } from '../../../../../common/core/range.js';
 import { Command } from '../../../../../common/languages.js';
 import { ITextModel } from '../../../../../common/model.js';
 import { CustomizedMenuWorkbenchToolBar } from '../../hintsWidget/inlineCompletionsHintsWidget.js';
+import { PathBuilder, StatusBarViewItem, getOffsetForPos, mapOutFalsy, maxContentWidthInRange, n } from './utils.js';
 import { InlineEditWithChanges } from './viewAndDiffProducer.js';
-import { StatusBarViewItem, maxContentWidthInRange, getOffsetForPos, Point, n, PathBuilder, mapOutFalsy } from './utils.js';
 
 
 export const originalBackgroundColor = registerColor(
@@ -290,10 +292,23 @@ export class InlineEditsSideBySideDiff extends Disposable {
 		return edit.modifiedLineRange.contains(cursorPos.lineNumber) ? cursorPos : undefined;
 	});
 
+	private readonly _originalStartPosition = derived(this, (reader) => {
+		const inlineEdit = this._edit.read(reader);
+		return inlineEdit ? new Position(inlineEdit.originalLineRange.startLineNumber, 1) : null;
+	});
+
+	private readonly _originalEndPosition = derived(this, (reader) => {
+		const inlineEdit = this._edit.read(reader);
+		return inlineEdit ? new Position(inlineEdit.originalLineRange.endLineNumberExclusive, 1) : null;
+	});
+
+	private readonly _originalVerticalStartPosition = this._editorObs.observePosition(this._originalStartPosition, this._store).map(p => p?.y);
+	private readonly _originalVerticalEndPosition = this._editorObs.observePosition(this._originalEndPosition, this._store).map(p => p?.y);
+
 	/**
 	 * ![test](./layout.dio.svg)
 	*/
-	private readonly _previewEditorLayoutInfo = derived(this, (reader) => {
+	private readonly _previewEditorLayoutInfo = derived(this, (reader) => {//
 		const inlineEdit = this._edit.read(reader);
 		if (!inlineEdit) {
 			return null;
@@ -328,8 +343,8 @@ export class InlineEditsSideBySideDiff extends Disposable {
 
 		const left = Math.max(editorLayout.contentLeft, previewEditorLeft - horizontalScrollOffset);
 
-		const selectionTop = this._editor.getTopForLineNumber(range.startLineNumber) - this._editorObs.scrollTop.read(reader);
-		const selectionBottom = this._editor.getTopForLineNumber(range.endLineNumberExclusive) - this._editorObs.scrollTop.read(reader);
+		const selectionTop = this._originalVerticalStartPosition.read(reader) ?? this._editor.getTopForLineNumber(range.startLineNumber) - this._editorObs.scrollTop.read(reader);
+		const selectionBottom = this._originalVerticalEndPosition.read(reader) ?? this._editor.getTopForLineNumber(range.endLineNumberExclusive) - this._editorObs.scrollTop.read(reader);
 
 		const codeLeft = editorLayout.contentLeft;
 
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
index e350ade4807..a97c9fe15f5 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
@@ -7,20 +7,21 @@ import { h, isSVGElement } from '../../../../../../base/browser/dom.js';
 import { KeybindingLabel, unthemedKeybindingLabelOptions } from '../../../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
 import { numberComparator } from '../../../../../../base/common/arrays.js';
 import { findFirstMin } from '../../../../../../base/common/arraysFind.js';
+import { BugIndicatingError } from '../../../../../../base/common/errors.js';
+import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
 import { derived, IObservable, IReader } from '../../../../../../base/common/observable.js';
 import { OS } from '../../../../../../base/common/platform.js';
-import { splitLines, getIndentationLength } from '../../../../../../base/common/strings.js';
+import { getIndentationLength, splitLines } from '../../../../../../base/common/strings.js';
 import { URI } from '../../../../../../base/common/uri.js';
 import { MenuEntryActionViewItem } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { ObservableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
+import { Point } from '../../../../../browser/point.js';
 import { LineRange } from '../../../../../common/core/lineRange.js';
 import { OffsetRange } from '../../../../../common/core/offsetRange.js';
+import { Position } from '../../../../../common/core/position.js';
+import { Range } from '../../../../../common/core/range.js';
 import { SingleTextEdit, TextEdit } from '../../../../../common/core/textEdit.js';
 import { RangeMapping } from '../../../../../common/diff/rangeMapping.js';
-import { Range } from '../../../../../common/core/range.js';
-import { Position } from '../../../../../common/core/position.js';
-import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
-import { BugIndicatingError } from '../../../../../../base/common/errors.js';
 
 export function maxContentWidthInRange(editor: ObservableCodeEditor, range: LineRange, reader: IReader): number {
 	editor.layoutInfo.read(reader);
@@ -82,25 +83,6 @@ export class StatusBarViewItem extends MenuEntryActionViewItem {
 	}
 }
 
-export class Point {
-	constructor(
-		public readonly x: number,
-		public readonly y: number,
-	) { }
-
-	public add(other: Point): Point {
-		return new Point(this.x + other.x, this.y + other.y);
-	}
-
-	public deltaX(delta: number): Point {
-		return new Point(this.x + delta, this.y);
-	}
-
-	public deltaY(delta: number): Point {
-		return new Point(this.x, this.y + delta);
-	}
-}
-
 export class UniqueUriGenerator {
 	private static _modelId = 0;
 

From 6cba7ebeed53ba13b1f4f3cd8c61c232262ecc45 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 13 Dec 2024 12:08:35 +0100
Subject: [PATCH 183/479] only extra-pad suggest header when also having doc
 (#236026)

fixes https://github.com/microsoft/vscode-copilot/issues/10984
---
 src/vs/editor/contrib/suggest/browser/media/suggest.css     | 6 +++++-
 .../editor/contrib/suggest/browser/suggestWidgetDetails.ts  | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/vs/editor/contrib/suggest/browser/media/suggest.css b/src/vs/editor/contrib/suggest/browser/media/suggest.css
index e836d840e7b..755c457fc20 100644
--- a/src/vs/editor/contrib/suggest/browser/media/suggest.css
+++ b/src/vs/editor/contrib/suggest/browser/media/suggest.css
@@ -389,7 +389,11 @@
 	opacity: 0.7;
 	white-space: pre;
 	margin: 0 24px 0 0;
-	padding: 4px 0 12px 5px;
+	padding: 4px 0 4px 5px;
+}
+
+.monaco-editor .suggest-details.detail-and-doc > .monaco-scrollable-element > .body > .header > .type {
+	padding-bottom: 12px;
 }
 
 .monaco-editor .suggest-details > .monaco-scrollable-element > .body > .header > .type.auto-wrap {
diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.ts b/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.ts
index ac2af6022b0..66101cdbd68 100644
--- a/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.ts
@@ -184,6 +184,8 @@ export class SuggestDetailsWidget {
 			this._renderDisposeable.add(renderedContents);
 		}
 
+		this.domNode.classList.toggle('detail-and-doc', !!detail && !!documentation);
+
 		this.domNode.style.userSelect = 'text';
 		this.domNode.tabIndex = -1;
 

From 710a78d6d0cfb256f094cad4d29ea32111863615 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Fri, 13 Dec 2024 12:09:56 +0100
Subject: [PATCH 184/479] fix #233758 (#236027)

---
 .../extensions/browser/extensionEditor.ts     | 289 ++++++++++--------
 1 file changed, 158 insertions(+), 131 deletions(-)

diff --git a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
index e73432b6040..d5d8e0b3cd6 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
@@ -275,9 +275,6 @@ export class ExtensionEditor extends EditorPane {
 		@IViewsService private readonly viewsService: IViewsService,
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
 		@IHoverService private readonly hoverService: IHoverService,
-		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
-		@IRemoteAgentService private readonly remoteAgentService: IRemoteAgentService,
-		@IFileService private readonly fileService: IFileService,
 	) {
 		super(ExtensionEditor.ID, group, telemetryService, themeService, storageService);
 		this.extensionReadme = null;
@@ -946,17 +943,162 @@ export class ExtensionEditor extends EditorPane {
 		this.contentDisposables.add(toDisposable(removeLayoutParticipant));
 		this.contentDisposables.add(scrollableContent);
 
-		if (extension.local) {
-			this.renderInstallInfo(content, extension.local);
+		this.contentDisposables.add(this.instantiationService.createInstance(AdditionalDetailsWidget, content, extension));
+
+		append(container, scrollableContent.getDomNode());
+		scrollableContent.scanDomNode();
+	}
+
+	private openChangelog(extension: IExtension, template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement | null> {
+		return this.openMarkdown(extension, this.extensionChangelog!.get(), localize('noChangelog', "No Changelog available."), template.content, WebviewIndex.Changelog, localize('Changelog title', "Changelog"), token);
+	}
+
+	private async openFeatures(template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement | null> {
+		const manifest = await this.loadContents(() => this.extensionManifest!.get(), template.content);
+		if (token.isCancellationRequested) {
+			return null;
 		}
-		if (extension.gallery) {
-			this.renderMarketplaceInfo(content, extension);
+		if (!manifest) {
+			return null;
 		}
-		this.renderCategories(content, extension);
-		this.renderExtensionResources(content, extension);
 
-		append(container, scrollableContent.getDomNode());
+		const extensionFeaturesTab = this.contentDisposables.add(this.instantiationService.createInstance(ExtensionFeaturesTab, manifest, (<IExtensionEditorOptions | undefined>this.options)?.feature));
+		const layout = () => extensionFeaturesTab.layout(template.content.clientHeight, template.content.clientWidth);
+		const removeLayoutParticipant = arrays.insert(this.layoutParticipants, { layout });
+		this.contentDisposables.add(toDisposable(removeLayoutParticipant));
+		append(template.content, extensionFeaturesTab.domNode);
+		layout();
+		return extensionFeaturesTab.domNode;
+	}
+
+	private openExtensionDependencies(extension: IExtension, template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement | null> {
+		if (token.isCancellationRequested) {
+			return Promise.resolve(null);
+		}
+
+		if (arrays.isFalsyOrEmpty(extension.dependencies)) {
+			append(template.content, $('p.nocontent')).textContent = localize('noDependencies', "No Dependencies");
+			return Promise.resolve(template.content);
+		}
+
+		const content = $('div', { class: 'subcontent' });
+		const scrollableContent = new DomScrollableElement(content, {});
+		append(template.content, scrollableContent.getDomNode());
+		this.contentDisposables.add(scrollableContent);
+
+		const dependenciesTree = this.instantiationService.createInstance(ExtensionsTree,
+			new ExtensionData(extension, null, extension => extension.dependencies || [], this.extensionsWorkbenchService), content,
+			{
+				listBackground: editorBackground
+			});
+		const layout = () => {
+			scrollableContent.scanDomNode();
+			const scrollDimensions = scrollableContent.getScrollDimensions();
+			dependenciesTree.layout(scrollDimensions.height);
+		};
+		const removeLayoutParticipant = arrays.insert(this.layoutParticipants, { layout });
+		this.contentDisposables.add(toDisposable(removeLayoutParticipant));
+
+		this.contentDisposables.add(dependenciesTree);
+		scrollableContent.scanDomNode();
+		return Promise.resolve({ focus() { dependenciesTree.domFocus(); } });
+	}
+
+	private async openExtensionPack(extension: IExtension, template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement | null> {
+		if (token.isCancellationRequested) {
+			return Promise.resolve(null);
+		}
+		const manifest = await this.loadContents(() => this.extensionManifest!.get(), template.content);
+		if (token.isCancellationRequested) {
+			return null;
+		}
+		if (!manifest) {
+			return null;
+		}
+		return this.renderExtensionPack(manifest, template.content, token);
+	}
+
+	private async renderExtensionPack(manifest: IExtensionManifest, parent: HTMLElement, token: CancellationToken): Promise<IActiveElement | null> {
+		if (token.isCancellationRequested) {
+			return null;
+		}
+
+		const content = $('div', { class: 'subcontent' });
+		const scrollableContent = new DomScrollableElement(content, { useShadows: false });
+		append(parent, scrollableContent.getDomNode());
+
+		const extensionsGridView = this.instantiationService.createInstance(ExtensionsGridView, content, new Delegate());
+		const extensions: IExtension[] = await getExtensions(manifest.extensionPack!, this.extensionsWorkbenchService);
+		extensionsGridView.setExtensions(extensions);
 		scrollableContent.scanDomNode();
+
+		this.contentDisposables.add(scrollableContent);
+		this.contentDisposables.add(extensionsGridView);
+		this.contentDisposables.add(toDisposable(arrays.insert(this.layoutParticipants, { layout: () => scrollableContent.scanDomNode() })));
+
+		return content;
+	}
+
+	private loadContents<T>(loadingTask: () => CacheResult<T>, container: HTMLElement): Promise<T> {
+		container.classList.add('loading');
+
+		const result = this.contentDisposables.add(loadingTask());
+		const onDone = () => container.classList.remove('loading');
+		result.promise.then(onDone, onDone);
+
+		return result.promise;
+	}
+
+	layout(dimension: Dimension): void {
+		this.dimension = dimension;
+		this.layoutParticipants.forEach(p => p.layout());
+	}
+
+	private onError(err: any): void {
+		if (isCancellationError(err)) {
+			return;
+		}
+
+		this.notificationService.error(err);
+	}
+}
+
+class AdditionalDetailsWidget extends Disposable {
+
+	private readonly disposables = this._register(new DisposableStore());
+
+	constructor(
+		private readonly container: HTMLElement,
+		extension: IExtension,
+		@IHoverService private readonly hoverService: IHoverService,
+		@IOpenerService private readonly openerService: IOpenerService,
+		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
+		@IRemoteAgentService private readonly remoteAgentService: IRemoteAgentService,
+		@IFileService private readonly fileService: IFileService,
+		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService,
+		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
+	) {
+		super();
+		this.render(extension);
+		this._register(this.extensionsWorkbenchService.onChange(e => {
+			if (e && areSameExtensions(e.identifier, extension.identifier) && e.server === extension.server) {
+				this.render(e);
+			}
+		}));
+	}
+
+	private render(extension: IExtension): void {
+		this.container.innerText = '';
+		this.disposables.clear();
+
+		if (extension.local) {
+			this.renderInstallInfo(this.container, extension.local);
+		}
+		if (extension.gallery) {
+			this.renderMarketplaceInfo(this.container, extension);
+		}
+		this.renderCategories(this.container, extension);
+		this.renderExtensionResources(this.container, extension);
 	}
 
 	private renderCategories(container: HTMLElement, extension: IExtension): void {
@@ -965,7 +1107,7 @@ export class ExtensionEditor extends EditorPane {
 			append(categoriesContainer, $('.additional-details-title', undefined, localize('categories', "Categories")));
 			const categoriesElement = append(categoriesContainer, $('.categories'));
 			for (const category of extension.categories) {
-				this.transientDisposables.add(onClick(append(categoriesElement, $('span.category', { tabindex: '0' }, category)),
+				this.disposables.add(onClick(append(categoriesElement, $('span.category', { tabindex: '0' }, category)),
 					() => this.extensionsWorkbenchService.openSearch(`@category:"${category}"`)));
 			}
 		}
@@ -1000,10 +1142,8 @@ export class ExtensionEditor extends EditorPane {
 			const resourcesElement = append(extensionResourcesContainer, $('.resources'));
 			for (const [label, uri] of resources) {
 				const resource = append(resourcesElement, $('a.resource', { tabindex: '0' }, label));
-				this.transientDisposables.add(onClick(resource, () => {
-					this.openerService.open(uri);
-				}));
-				this.transientDisposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), resource, uri.toString()));
+				this.disposables.add(onClick(resource, () => this.openerService.open(uri)));
+				this.disposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), resource, uri.toString()));
 			}
 		}
 	}
@@ -1042,7 +1182,7 @@ export class ExtensionEditor extends EditorPane {
 			if (isNative && extension.source === 'resource' && extension.location.scheme === Schemas.file) {
 				element.classList.add('link');
 				element.title = extension.location.fsPath;
-				this.transientDisposables.add(onClick(element, () => this.openerService.open(extension.location, { openExternal: true })));
+				this.disposables.add(onClick(element, () => this.openerService.open(extension.location, { openExternal: true })));
 			}
 		}
 		if (extension.size) {
@@ -1056,7 +1196,7 @@ export class ExtensionEditor extends EditorPane {
 			if (isNative && extension.location.scheme === Schemas.file) {
 				element.classList.add('link');
 				element.title = extension.location.fsPath;
-				this.transientDisposables.add(onClick(element, () => this.openerService.open(extension.location, { openExternal: true })));
+				this.disposables.add(onClick(element, () => this.openerService.open(extension.location, { openExternal: true })));
 			}
 		}
 		this.getCacheLocation(extension).then(cacheLocation => {
@@ -1076,7 +1216,7 @@ export class ExtensionEditor extends EditorPane {
 				if (isNative && extension.location.scheme === Schemas.file) {
 					element.classList.add('link');
 					element.title = cacheLocation.fsPath;
-					this.transientDisposables.add(onClick(element, () => this.openerService.open(cacheLocation.with({ scheme: Schemas.file }), { openExternal: true })));
+					this.disposables.add(onClick(element, () => this.openerService.open(cacheLocation.with({ scheme: Schemas.file }), { openExternal: true })));
 				}
 			});
 		});
@@ -1125,119 +1265,6 @@ export class ExtensionEditor extends EditorPane {
 			);
 		}
 	}
-
-	private openChangelog(extension: IExtension, template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement | null> {
-		return this.openMarkdown(extension, this.extensionChangelog!.get(), localize('noChangelog', "No Changelog available."), template.content, WebviewIndex.Changelog, localize('Changelog title', "Changelog"), token);
-	}
-
-	private async openFeatures(template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement | null> {
-		const manifest = await this.loadContents(() => this.extensionManifest!.get(), template.content);
-		if (token.isCancellationRequested) {
-			return null;
-		}
-		if (!manifest) {
-			return null;
-		}
-
-		const extensionFeaturesTab = this.contentDisposables.add(this.instantiationService.createInstance(ExtensionFeaturesTab, manifest, (<IExtensionEditorOptions | undefined>this.options)?.feature));
-		const layout = () => extensionFeaturesTab.layout(template.content.clientHeight, template.content.clientWidth);
-		const removeLayoutParticipant = arrays.insert(this.layoutParticipants, { layout });
-		this.contentDisposables.add(toDisposable(removeLayoutParticipant));
-		append(template.content, extensionFeaturesTab.domNode);
-		layout();
-		return extensionFeaturesTab.domNode;
-	}
-
-	private openExtensionDependencies(extension: IExtension, template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement | null> {
-		if (token.isCancellationRequested) {
-			return Promise.resolve(null);
-		}
-
-		if (arrays.isFalsyOrEmpty(extension.dependencies)) {
-			append(template.content, $('p.nocontent')).textContent = localize('noDependencies', "No Dependencies");
-			return Promise.resolve(template.content);
-		}
-
-		const content = $('div', { class: 'subcontent' });
-		const scrollableContent = new DomScrollableElement(content, {});
-		append(template.content, scrollableContent.getDomNode());
-		this.contentDisposables.add(scrollableContent);
-
-		const dependenciesTree = this.instantiationService.createInstance(ExtensionsTree,
-			new ExtensionData(extension, null, extension => extension.dependencies || [], this.extensionsWorkbenchService), content,
-			{
-				listBackground: editorBackground
-			});
-		const layout = () => {
-			scrollableContent.scanDomNode();
-			const scrollDimensions = scrollableContent.getScrollDimensions();
-			dependenciesTree.layout(scrollDimensions.height);
-		};
-		const removeLayoutParticipant = arrays.insert(this.layoutParticipants, { layout });
-		this.contentDisposables.add(toDisposable(removeLayoutParticipant));
-
-		this.contentDisposables.add(dependenciesTree);
-		scrollableContent.scanDomNode();
-		return Promise.resolve({ focus() { dependenciesTree.domFocus(); } });
-	}
-
-	private async openExtensionPack(extension: IExtension, template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement | null> {
-		if (token.isCancellationRequested) {
-			return Promise.resolve(null);
-		}
-		const manifest = await this.loadContents(() => this.extensionManifest!.get(), template.content);
-		if (token.isCancellationRequested) {
-			return null;
-		}
-		if (!manifest) {
-			return null;
-		}
-		return this.renderExtensionPack(manifest, template.content, token);
-	}
-
-	private async renderExtensionPack(manifest: IExtensionManifest, parent: HTMLElement, token: CancellationToken): Promise<IActiveElement | null> {
-		if (token.isCancellationRequested) {
-			return null;
-		}
-
-		const content = $('div', { class: 'subcontent' });
-		const scrollableContent = new DomScrollableElement(content, { useShadows: false });
-		append(parent, scrollableContent.getDomNode());
-
-		const extensionsGridView = this.instantiationService.createInstance(ExtensionsGridView, content, new Delegate());
-		const extensions: IExtension[] = await getExtensions(manifest.extensionPack!, this.extensionsWorkbenchService);
-		extensionsGridView.setExtensions(extensions);
-		scrollableContent.scanDomNode();
-
-		this.contentDisposables.add(scrollableContent);
-		this.contentDisposables.add(extensionsGridView);
-		this.contentDisposables.add(toDisposable(arrays.insert(this.layoutParticipants, { layout: () => scrollableContent.scanDomNode() })));
-
-		return content;
-	}
-
-	private loadContents<T>(loadingTask: () => CacheResult<T>, container: HTMLElement): Promise<T> {
-		container.classList.add('loading');
-
-		const result = this.contentDisposables.add(loadingTask());
-		const onDone = () => container.classList.remove('loading');
-		result.promise.then(onDone, onDone);
-
-		return result.promise;
-	}
-
-	layout(dimension: Dimension): void {
-		this.dimension = dimension;
-		this.layoutParticipants.forEach(p => p.layout());
-	}
-
-	private onError(err: any): void {
-		if (isCancellationError(err)) {
-			return;
-		}
-
-		this.notificationService.error(err);
-	}
 }
 
 const contextKeyExpr = ContextKeyExpr.and(ContextKeyExpr.equals('activeEditor', ExtensionEditor.ID), EditorContextKeys.focus.toNegated());

From 61a7a1a60ddd5345e7a468801296f759bbfe6c32 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Fri, 13 Dec 2024 12:14:23 +0100
Subject: [PATCH 185/479] Add background hover feedback for panel title
 overflow (#236030)

fixes #171077
---
 .../workbench/browser/parts/media/paneCompositePart.css   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/browser/parts/media/paneCompositePart.css b/src/vs/workbench/browser/parts/media/paneCompositePart.css
index a57bdd617ce..2b4518ca204 100644
--- a/src/vs/workbench/browser/parts/media/paneCompositePart.css
+++ b/src/vs/workbench/browser/parts/media/paneCompositePart.css
@@ -164,15 +164,15 @@
 	padding: 2px;
 }
 
-.monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item .action-label,
-.monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item .action-label {
+.monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item .action-label:not(.codicon-more),
+.monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item .action-label:not(.codicon-more) {
 	border-radius: 0;
 }
 
 .monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:not(.icon) .action-label,
-.monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.icon .action-label.codicon,
+.monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.icon .action-label.codicon:not(.codicon-more),
 .monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item:not(.icon) .action-label,
-.monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.icon .action-label.codicon {
+.monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .action-item.icon .action-label.codicon:not(.codicon-more) {
 	background: none !important;
 }
 

From 5325680bc687fcb98d4143c3a08965d8c64a539a Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Fri, 13 Dec 2024 12:48:19 +0100
Subject: [PATCH 186/479] Align view and viewcontainer actions (#236033)

fixes #230701
---
 src/vs/base/browser/ui/splitview/paneview.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/base/browser/ui/splitview/paneview.css b/src/vs/base/browser/ui/splitview/paneview.css
index 62cb3fe642c..64587284592 100644
--- a/src/vs/base/browser/ui/splitview/paneview.css
+++ b/src/vs/base/browser/ui/splitview/paneview.css
@@ -57,6 +57,7 @@
 .monaco-pane-view .pane > .pane-header > .actions {
 	display: none;
 	margin-left: auto;
+	margin-right: 8px;
 }
 
 .monaco-pane-view .pane > .pane-header > .actions .action-item {

From 06c0c95e21fd33b7c929447c44496ad578845e90 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 13 Dec 2024 12:51:01 +0100
Subject: [PATCH 187/479] =?UTF-8?q?Offer=20Copilot=20setup=20from=20?=
 =?UTF-8?q?=F0=9F=A4=96=20even=20when=20extension=20is=20installed=20(fix?=
 =?UTF-8?q?=20microsoft/vscode-copilot#11278)=20(#236035)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contrib/chat/browser/chatQuotasService.ts | 36 +------------------
 .../contrib/chat/browser/chatSetup.ts         | 28 ++++++++-------
 2 files changed, 17 insertions(+), 47 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts b/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
index 51cee3588ca..62bf59aca5e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatQuotasService.ts
@@ -9,14 +9,11 @@ import { language } from '../../../../base/common/platform.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { localize, localize2 } from '../../../../nls.js';
-import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { localize } from '../../../../nls.js';
 import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { createDecorator, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
-import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
-import product from '../../../../platform/product/common/product.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IStatusbarService, StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
 import { ChatContextKeys } from '../common/chatContextKeys.js';
@@ -153,38 +150,7 @@ export class ChatQuotasService extends Disposable implements IChatQuotasService
 			}
 		}
 
-		class SimulateCopilotQuotaExceeded extends Action2 {
-			constructor() {
-				super({
-					id: 'workbench.action.chat.simulateCopilotQuotaExceeded',
-					title: localize2('simulateCopilotQuotaExceeded', "Simulate Copilot Quota Exceeded"),
-					f1: true,
-					category: Categories.Developer
-				});
-			}
-
-			override async run(accessor: ServicesAccessor): Promise<void> {
-				const inputService = accessor.get(IQuickInputService);
-				const result = await inputService.pick([
-					{ label: 'Chat' },
-					{ label: 'Completions' }
-				], { canPickMany: true, placeHolder: 'Pick the quotas to exceed' });
-
-				if (result) {
-					const resultSet = new Set(result.map(r => r.label));
-					that.acceptQuotas({
-						chatQuotaExceeded: resultSet.has('Chat'),
-						completionsQuotaExceeded: resultSet.has('Completions'),
-						quotaResetDate: new Date()
-					});
-				}
-			}
-		}
-
 		registerAction2(ShowLimitReachedDialogAction);
-		if (product.quality !== 'stable') {
-			registerAction2(SimulateCopilotQuotaExceeded);
-		}
 	}
 
 	acceptQuotas(quotas: IChatQuotas): void {
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index a9b5eafe8eb..9f96bde75b4 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -132,6 +132,13 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 	private registerActions(): void {
 		const that = this;
 
+		const chatSetupTriggerContext = ContextKeyExpr.and(
+			ContextKeyExpr.has('config.chat.experimental.offerSetup'),
+			ContextKeyExpr.or(
+				ChatContextKeys.Setup.installed.negate(),
+				ChatContextKeys.Setup.canSignUp
+			)
+		);
 		class ChatSetupTriggerAction extends Action2 {
 
 			constructor() {
@@ -140,15 +147,12 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 					title: TRIGGER_SETUP_COMMAND_LABEL,
 					category: CHAT_CATEGORY,
 					f1: true,
-					precondition: ContextKeyExpr.and(
-						ChatContextKeys.Setup.installed.negate(),
-						ContextKeyExpr.has('config.chat.experimental.offerSetup')
-					),
+					precondition: chatSetupTriggerContext,
 					menu: {
 						id: MenuId.ChatCommandCenter,
 						group: 'a_last',
 						order: 1,
-						when: ChatContextKeys.Setup.installed.negate()
+						when: chatSetupTriggerContext
 					}
 				});
 			}
@@ -227,17 +231,17 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 					title: localize2('managePlan', "Upgrade to Copilot Pro"),
 					category: localize2('chat.category', 'Chat'),
 					f1: true,
-					precondition: ChatContextKeys.enabled,
+					precondition: ContextKeyExpr.or(
+						ChatContextKeys.Setup.canSignUp,
+						ChatContextKeys.Setup.limited,
+					),
 					menu: {
 						id: MenuId.ChatCommandCenter,
 						group: 'a_first',
 						order: 1,
-						when: ContextKeyExpr.and(
-							ChatContextKeys.Setup.installed,
-							ContextKeyExpr.or(
-								ChatContextKeys.chatQuotaExceeded,
-								ChatContextKeys.completionsQuotaExceeded
-							)
+						when: ContextKeyExpr.or(
+							ChatContextKeys.chatQuotaExceeded,
+							ChatContextKeys.completionsQuotaExceeded
 						)
 					}
 				});

From 7112b3b0957dc9129dafcf353324e27167cb3f22 Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Fri, 13 Dec 2024 13:21:08 +0100
Subject: [PATCH 188/479] Make sure the preview editor is visible before trying
 to measure its line widths (#236041)

---
 .../browser/view/inlineEdits/sideBySideDiff.ts   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
index 25b1d750fc4..c5ed83bd5cd 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
@@ -156,6 +156,8 @@ export class InlineEditsSideBySideDiff extends Disposable {
 		this._editorContainerTopLeft.set(this._previewEditorLayoutInfo.map(i => i?.edit1), undefined);
 	}
 
+	private readonly _display = derived(this, reader => !!this._uiState.read(reader) ? 'block' : 'none');
+
 	private readonly previewRef = n.ref<HTMLDivElement>();
 	private readonly toolbarRef = n.ref<HTMLDivElement>();
 
@@ -258,6 +260,18 @@ export class InlineEditsSideBySideDiff extends Disposable {
 	private readonly _updatePreviewEditor = derived(reader => {
 		this._editorContainer.readEffect(reader);
 
+		// Setting this here explicitly to make sure that the preview editor is
+		// visible when needed, we're also checking that these fields are defined
+		// because of the auto run initial
+		// Before removing these, verify with a non-monospace font family
+		this._display.read(reader);
+		if (this._overflowView) {
+			this._overflowView.element.style.display = this._display.read(reader);
+		}
+		if (this._nonOverflowView) {
+			this._nonOverflowView.element.style.display = this._display.read(reader);
+		}
+
 		const uiState = this._uiState.read(reader);
 		if (!uiState) {
 			return;
@@ -513,8 +527,6 @@ export class InlineEditsSideBySideDiff extends Disposable {
 		];
 	})).keepUpdated(this._store);
 
-	private readonly _display = derived(this, reader => !!this._uiState.read(reader) ? 'block' : 'none');
-
 	private readonly _nonOverflowView = n.div({
 		class: 'inline-edits-view',
 		style: {

From fa094097da415cd7d91241d6a53aa622360b206c Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Fri, 13 Dec 2024 13:27:42 +0100
Subject: [PATCH 189/479] Revert "Fix custom task shell doesn't work without
 manually passing in "run command" arg/flag (#181760)" (#236043)

This reverts commit fc3cc5b1c6eb2f56a8ff194cef8844da393652cf.
---
 .../tasks/browser/terminalTaskSystem.ts       | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
index 45a7b5d022c..045a9e63b44 100644
--- a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
+++ b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
@@ -1111,6 +1111,7 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 				color: task.configurationProperties.icon?.color || undefined,
 				waitOnExit
 			};
+			let shellSpecified: boolean = false;
 			const shellOptions: IShellConfiguration | undefined = task.command.options && task.command.options.shell;
 			if (shellOptions) {
 				if (shellOptions.executable) {
@@ -1119,12 +1120,12 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 						shellLaunchConfig.args = undefined;
 					}
 					shellLaunchConfig.executable = await this._resolveVariable(variableResolver, shellOptions.executable);
+					shellSpecified = true;
 				}
 				if (shellOptions.args) {
 					shellLaunchConfig.args = await this._resolveVariables(variableResolver, shellOptions.args.slice());
 				}
 			}
-			const shellArgsSpecified: boolean = shellLaunchConfig.args !== undefined;
 			if (shellLaunchConfig.args === undefined) {
 				shellLaunchConfig.args = [];
 			}
@@ -1137,29 +1138,29 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 				windowsShellArgs = true;
 				// If we don't have a cwd, then the terminal uses the home dir.
 				const userHome = await this._pathService.userHome();
-				if (basename === 'cmd.exe') {
-					if ((options.cwd && isUNC(options.cwd)) || (!options.cwd && isUNC(userHome.fsPath))) {
-						return undefined;
-					}
-					if (!shellArgsSpecified) {
-						toAdd.push('/d', '/c');
-					}
-				} else if ((basename === 'powershell.exe') || (basename === 'pwsh.exe')) {
-					if (!shellArgsSpecified) {
+				if (basename === 'cmd.exe' && ((options.cwd && isUNC(options.cwd)) || (!options.cwd && isUNC(userHome.fsPath)))) {
+					return undefined;
+				}
+				if ((basename === 'powershell.exe') || (basename === 'pwsh.exe')) {
+					if (!shellSpecified) {
 						toAdd.push('-Command');
 					}
 				} else if ((basename === 'bash.exe') || (basename === 'zsh.exe')) {
 					windowsShellArgs = false;
-					if (!shellArgsSpecified) {
+					if (!shellSpecified) {
 						toAdd.push('-c');
 					}
 				} else if (basename === 'wsl.exe') {
-					if (!shellArgsSpecified) {
+					if (!shellSpecified) {
 						toAdd.push('-e');
 					}
+				} else {
+					if (!shellSpecified) {
+						toAdd.push('/d', '/c');
+					}
 				}
 			} else {
-				if (!shellArgsSpecified) {
+				if (!shellSpecified) {
 					// Under Mac remove -l to not start it as a login shell.
 					if (platform === Platform.Platform.Mac) {
 						// Background on -l on osx https://github.com/microsoft/vscode/issues/107563
@@ -1266,12 +1267,11 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 		const combinedShellArgs: string[] = Objects.deepClone(configuredShellArgs);
 		shellCommandArgs.forEach(element => {
 			const shouldAddShellCommandArg = configuredShellArgs.every((arg, index) => {
-				const isDuplicated = arg.toLowerCase() === element.toLowerCase();
-				if (isDuplicated && (configuredShellArgs.length > index + 1)) {
+				if ((arg.toLowerCase() === element) && (configuredShellArgs.length > index + 1)) {
 					// We can still add the argument, but only if not all of the following arguments begin with "-".
 					return !configuredShellArgs.slice(index + 1).every(testArg => testArg.startsWith('-'));
 				} else {
-					return !isDuplicated;
+					return arg.toLowerCase() !== element;
 				}
 			});
 			if (shouldAddShellCommandArg) {

From 15bd01ac9f76cd053a9edd4aeff0be056542a67c Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 13 Dec 2024 13:28:57 +0100
Subject: [PATCH 190/479] fix https://github.com/microsoft/vscode/issues/224944
 (#236034)

---
 .../contrib/callHierarchy/common/callHierarchy.ts    |  4 ++--
 .../contrib/typeHierarchy/common/typeHierarchy.ts    | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/callHierarchy/common/callHierarchy.ts b/src/vs/workbench/contrib/callHierarchy/common/callHierarchy.ts
index c0ea84d13a7..795a96fd018 100644
--- a/src/vs/workbench/contrib/callHierarchy/common/callHierarchy.ts
+++ b/src/vs/workbench/contrib/callHierarchy/common/callHierarchy.ts
@@ -175,7 +175,7 @@ CommandsRegistry.registerCommand('_executeProvideIncomingCalls', async (_accesso
 	// find model
 	const model = _models.get(item._sessionId);
 	if (!model) {
-		return undefined;
+		return [];
 	}
 
 	return model.resolveIncomingCalls(item, CancellationToken.None);
@@ -188,7 +188,7 @@ CommandsRegistry.registerCommand('_executeProvideOutgoingCalls', async (_accesso
 	// find model
 	const model = _models.get(item._sessionId);
 	if (!model) {
-		return undefined;
+		return [];
 	}
 
 	return model.resolveOutgoingCalls(item, CancellationToken.None);
diff --git a/src/vs/workbench/contrib/typeHierarchy/common/typeHierarchy.ts b/src/vs/workbench/contrib/typeHierarchy/common/typeHierarchy.ts
index 71f4f44687e..3144b4c7a99 100644
--- a/src/vs/workbench/contrib/typeHierarchy/common/typeHierarchy.ts
+++ b/src/vs/workbench/contrib/typeHierarchy/common/typeHierarchy.ts
@@ -138,14 +138,18 @@ CommandsRegistry.registerCommand('_executePrepareTypeHierarchy', async (accessor
 			return [];
 		}
 
-		_models.set(model.id, model);
 		_models.forEach((value, key, map) => {
 			if (map.size > 10) {
 				value.dispose();
 				_models.delete(key);
 			}
 		});
-		return [model.root];
+
+		for (const root of model.roots) {
+			_models.set(root._sessionId, model);
+		}
+
+		return model.roots;
 
 	} finally {
 		textModelReference?.dispose();
@@ -169,7 +173,7 @@ CommandsRegistry.registerCommand('_executeProvideSupertypes', async (_accessor,
 	// find model
 	const model = _models.get(item._sessionId);
 	if (!model) {
-		return undefined;
+		return [];
 	}
 
 	return model.provideSupertypes(item, CancellationToken.None);
@@ -182,7 +186,7 @@ CommandsRegistry.registerCommand('_executeProvideSubtypes', async (_accessor, ..
 	// find model
 	const model = _models.get(item._sessionId);
 	if (!model) {
-		return undefined;
+		return [];
 	}
 
 	return model.provideSubtypes(item, CancellationToken.None);

From 21a129e8d0fbdfabcae2444b04a0e4c3912c6fe1 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Fri, 13 Dec 2024 13:33:34 +0100
Subject: [PATCH 191/479] Revert "Render expanded hovers always on the same
 side, so does not jump around" (#236044)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Revert "Render expanded hovers always on the same side, so does not jump arou…"

This reverts commit 82d1ef937686fcb7bca342410f9071f84fbdb3a1.
---
 .../editor/contrib/hover/browser/contentHoverRendered.ts  | 2 +-
 src/vs/editor/contrib/hover/browser/contentHoverWidget.ts | 6 ++----
 .../contrib/hover/browser/contentHoverWidgetWrapper.ts    | 6 +++---
 src/vs/editor/contrib/hover/browser/hoverTypes.ts         | 6 +-----
 .../contrib/hover/browser/markdownHoverParticipant.ts     | 8 ++++----
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/vs/editor/contrib/hover/browser/contentHoverRendered.ts b/src/vs/editor/contrib/hover/browser/contentHoverRendered.ts
index 32d72a6693e..81ccfcbc60b 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverRendered.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverRendered.ts
@@ -408,7 +408,7 @@ class RenderedContentHoverParts extends Disposable {
 				this._context.focus();
 			}
 		}
-		this._context.onContentsChanged({ allowPositionPreferenceRecomputation: false });
+		this._context.onContentsChanged();
 	}
 
 	public doesHoverAtIndexSupportVerbosityAction(index: number, action: HoverVerbosityAction): boolean {
diff --git a/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts b/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts
index 063e4d108fe..ffb8aaa9f11 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts
@@ -17,7 +17,6 @@ import { getHoverAccessibleViewHint, HoverWidget } from '../../../../base/browse
 import { PositionAffinity } from '../../../common/model.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { RenderedContentHover } from './contentHoverRendered.js';
-import { IContentsChangeOptions } from './hoverTypes.js';
 
 const HORIZONTAL_SCROLLING_BY = 30;
 
@@ -393,7 +392,7 @@ export class ContentHoverWidget extends ResizableContentWidget {
 		this._resizableNode.minSize = new dom.Dimension(width, this._minimumSize.height);
 	}
 
-	public onContentsChanged(opts: IContentsChangeOptions = { allowPositionPreferenceRecomputation: true }): void {
+	public onContentsChanged(): void {
 		this._removeConstraintsRenderNormally();
 		const contentsDomNode = this._hover.contentsDomNode;
 
@@ -408,9 +407,8 @@ export class ContentHoverWidget extends ResizableContentWidget {
 		this._contentWidth = width;
 		this._updateMinimumWidth();
 		this._resizableNode.layout(height, width);
-		this._updateResizableNodeMaxDimensions();
 
-		if (opts.allowPositionPreferenceRecomputation && this._renderedHover?.showAtPosition) {
+		if (this._renderedHover?.showAtPosition) {
 			const widgetHeight = dom.getTotalHeight(this._hover.containerDomNode);
 			this._positionPreference = this._findPositionPreference(widgetHeight, this._renderedHover.showAtPosition);
 		}
diff --git a/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts b/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts
index d8439510336..ad9a9920967 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts
@@ -11,7 +11,7 @@ import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
 import { TokenizationRegistry } from '../../../common/languages.js';
 import { HoverOperation, HoverResult, HoverStartMode, HoverStartSource } from './hoverOperation.js';
-import { HoverAnchor, HoverParticipantRegistry, HoverRangeAnchor, IContentsChangeOptions, IEditorHoverContext, IEditorHoverParticipant, IHoverPart, IHoverWidget } from './hoverTypes.js';
+import { HoverAnchor, HoverParticipantRegistry, HoverRangeAnchor, IEditorHoverContext, IEditorHoverParticipant, IHoverPart, IHoverWidget } from './hoverTypes.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { HoverVerbosityAction } from '../../../common/standalone/standaloneEnums.js';
@@ -224,9 +224,9 @@ export class ContentHoverWidgetWrapper extends Disposable implements IHoverWidge
 		const hide = () => {
 			this.hide();
 		};
-		const onContentsChanged = (opts: IContentsChangeOptions) => {
+		const onContentsChanged = () => {
 			this._onContentsChanged.fire();
-			this._contentHoverWidget.onContentsChanged(opts);
+			this._contentHoverWidget.onContentsChanged();
 		};
 		const setMinimumDimensions = (dimensions: dom.Dimension) => {
 			this._contentHoverWidget.setMinimumDimensions(dimensions);
diff --git a/src/vs/editor/contrib/hover/browser/hoverTypes.ts b/src/vs/editor/contrib/hover/browser/hoverTypes.ts
index babdf0f5556..ad5442f1fa2 100644
--- a/src/vs/editor/contrib/hover/browser/hoverTypes.ts
+++ b/src/vs/editor/contrib/hover/browser/hoverTypes.ts
@@ -95,15 +95,11 @@ export interface IEditorHoverColorPickerWidget {
 	layout(): void;
 }
 
-export interface IContentsChangeOptions {
-	allowPositionPreferenceRecomputation: boolean;
-}
-
 export interface IEditorHoverContext {
 	/**
 	 * The contents rendered inside the fragment have been changed, which means that the hover should relayout.
 	 */
-	onContentsChanged(opts?: IContentsChangeOptions): void;
+	onContentsChanged(): void;
 	/**
 	 * Set the minimum dimensions of the resizable hover
 	 */
diff --git a/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts b/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts
index e98b45195e2..3fd5876cfe4 100644
--- a/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts
+++ b/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.ts
@@ -15,7 +15,7 @@ import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { IModelDecoration, ITextModel } from '../../../common/model.js';
 import { ILanguageService } from '../../../common/languages/language.js';
-import { HoverAnchor, HoverAnchorType, HoverRangeAnchor, IContentsChangeOptions, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart, IRenderedHoverPart, IRenderedHoverParts, RenderedHoverParts } from './hoverTypes.js';
+import { HoverAnchor, HoverAnchorType, HoverRangeAnchor, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart, IRenderedHoverPart, IRenderedHoverParts, RenderedHoverParts } from './hoverTypes.js';
 import * as nls from '../../../../nls.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
@@ -245,9 +245,9 @@ class MarkdownRenderedHoverParts implements IRenderedHoverParts<MarkdownHover> {
 		private readonly _keybindingService: IKeybindingService,
 		private readonly _hoverService: IHoverService,
 		private readonly _configurationService: IConfigurationService,
-		private readonly onContentsChanged: (opts?: IContentsChangeOptions | undefined) => void,
+		private readonly _onFinishedRendering: () => void,
 	) {
-		this.renderedHoverParts = this._renderHoverParts(hoverParts, hoverPartsContainer, this.onContentsChanged);
+		this.renderedHoverParts = this._renderHoverParts(hoverParts, hoverPartsContainer, this._onFinishedRendering);
 		this._disposables.add(toDisposable(() => {
 			this.renderedHoverParts.forEach(renderedHoverPart => {
 				renderedHoverPart.dispose();
@@ -416,7 +416,7 @@ class MarkdownRenderedHoverParts implements IRenderedHoverParts<MarkdownHover> {
 		if (index >= this.renderedHoverParts.length || index < 0) {
 			return undefined;
 		}
-		const renderedHoverPart = this._renderHoverPart(hoverPart, () => this.onContentsChanged({ allowPositionPreferenceRecomputation: false }));
+		const renderedHoverPart = this._renderHoverPart(hoverPart, this._onFinishedRendering);
 		const currentRenderedHoverPart = this.renderedHoverParts[index];
 		const currentRenderedMarkdown = currentRenderedHoverPart.hoverElement;
 		const renderedMarkdown = renderedHoverPart.hoverElement;

From c168b55cc85bc38a8db9b434aff8b58026c70fda Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 13 Dec 2024 13:35:48 +0100
Subject: [PATCH 192/479] Install Copilot extension for all profiles (fix
 microsoft/vscode-copilot#11256) (#236042)

---
 src/vs/workbench/contrib/chat/browser/chatSetup.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 9f96bde75b4..2245da971d3 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -834,8 +834,9 @@ class ChatSetupController extends Disposable {
 
 			await this.extensionsWorkbenchService.install(defaultChat.extensionId, {
 				enable: true,
-				isMachineScoped: false,
-				installEverywhere: true,
+				isApplicationScoped: true, 	// install into all profiles
+				isMachineScoped: false,		// do not ask to sync
+				installEverywhere: true,	// install in local and remote
 				installPreReleaseVersion: this.productService.quality !== 'stable'
 			}, isCopilotEditsViewActive(this.viewsService) ? EditsViewId : ChatViewId);
 

From 1590668ba713bdefd82f5f805735be1c96020f4d Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Fri, 13 Dec 2024 14:22:40 +0100
Subject: [PATCH 193/479] Git - add the ability to continue merge/rebase if
 there are no changes (#236045)

---
 extensions/git/src/actionButton.ts | 34 +++++++++++++++++++++++++-----
 extensions/git/src/commands.ts     | 10 ++++++---
 extensions/git/src/git.ts          | 10 +++++++++
 extensions/git/src/operation.ts    | 11 ++++++----
 extensions/git/src/repository.ts   | 17 +++++++++++++--
 5 files changed, 68 insertions(+), 14 deletions(-)

diff --git a/extensions/git/src/actionButton.ts b/extensions/git/src/actionButton.ts
index d801fbba05f..0c94636fff2 100644
--- a/extensions/git/src/actionButton.ts
+++ b/extensions/git/src/actionButton.ts
@@ -25,7 +25,8 @@ function isActionButtonStateEqual(state1: ActionButtonState, state2: ActionButto
 		state1.isMergeInProgress === state2.isMergeInProgress &&
 		state1.isRebaseInProgress === state2.isRebaseInProgress &&
 		state1.isSyncInProgress === state2.isSyncInProgress &&
-		state1.repositoryHasChangesToCommit === state2.repositoryHasChangesToCommit;
+		state1.repositoryHasChangesToCommit === state2.repositoryHasChangesToCommit &&
+		state1.repositoryHasUnresolvedConflicts === state2.repositoryHasUnresolvedConflicts;
 }
 
 interface ActionButtonState {
@@ -36,6 +37,7 @@ interface ActionButtonState {
 	readonly isRebaseInProgress: boolean;
 	readonly isSyncInProgress: boolean;
 	readonly repositoryHasChangesToCommit: boolean;
+	readonly repositoryHasUnresolvedConflicts: boolean;
 }
 
 export class ActionButton {
@@ -68,7 +70,8 @@ export class ActionButton {
 			isMergeInProgress: false,
 			isRebaseInProgress: false,
 			isSyncInProgress: false,
-			repositoryHasChangesToCommit: false
+			repositoryHasChangesToCommit: false,
+			repositoryHasUnresolvedConflicts: false
 		};
 
 		repository.onDidRunGitStatus(this.onDidRunGitStatus, this, this.disposables);
@@ -128,7 +131,11 @@ export class ActionButton {
 		return {
 			command: primaryCommand,
 			secondaryCommands: this.getCommitActionButtonSecondaryCommands(),
-			enabled: (this.state.repositoryHasChangesToCommit || this.state.isRebaseInProgress) && !this.state.isCommitInProgress && !this.state.isMergeInProgress
+			enabled: (
+				this.state.repositoryHasChangesToCommit ||
+				(this.state.isRebaseInProgress && !this.state.repositoryHasUnresolvedConflicts) ||
+				(this.state.isMergeInProgress && !this.state.repositoryHasUnresolvedConflicts)) &&
+				!this.state.isCommitInProgress
 		};
 	}
 
@@ -143,6 +150,16 @@ export class ActionButton {
 			};
 		}
 
+		// Merge Continue
+		if (this.state.isMergeInProgress) {
+			return {
+				command: 'git.commit',
+				title: l10n.t('{0} Continue', '$(check)'),
+				tooltip: this.state.isCommitInProgress ? l10n.t('Continuing Merge...') : l10n.t('Continue Merge'),
+				arguments: [this.repository.sourceControl, null]
+			};
+		}
+
 		// Not a branch (tag, detached)
 		if (this.state.HEAD?.type === RefType.Tag || !this.state.HEAD?.name) {
 			return {
@@ -163,6 +180,11 @@ export class ActionButton {
 			return [];
 		}
 
+		// Merge Continue
+		if (this.state.isMergeInProgress) {
+			return [];
+		}
+
 		// Not a branch (tag, detached)
 		if (this.state.HEAD?.type === RefType.Tag || !this.state.HEAD?.name) {
 			return [];
@@ -240,6 +262,7 @@ export class ActionButton {
 		const isCommitInProgress =
 			this.repository.operations.isRunning(OperationKind.Commit) ||
 			this.repository.operations.isRunning(OperationKind.PostCommitCommand) ||
+			this.repository.operations.isRunning(OperationKind.MergeContinue) ||
 			this.repository.operations.isRunning(OperationKind.RebaseContinue);
 
 		const isSyncInProgress =
@@ -261,9 +284,10 @@ export class ActionButton {
 		this.state = {
 			...this.state,
 			HEAD: this.repository.HEAD,
-			isMergeInProgress: this.repository.mergeGroup.resourceStates.length !== 0,
+			isMergeInProgress: this.repository.mergeInProgress,
 			isRebaseInProgress: !!this.repository.rebaseCommit,
-			repositoryHasChangesToCommit: this.repositoryHasChangesToCommit()
+			repositoryHasChangesToCommit: this.repositoryHasChangesToCommit(),
+			repositoryHasUnresolvedConflicts: this.repository.mergeGroup.resourceStates.length > 0
 		};
 	}
 
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index 5266955198f..f93340d928e 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -2177,6 +2177,8 @@ export class CommandCenter {
 			// amend allows changing only the commit message
 			&& !opts.amend
 			&& !opts.empty
+			// merge not in progress
+			&& !repository.mergeInProgress
 			// rebase not in progress
 			&& repository.rebaseCommit === undefined
 		) {
@@ -4418,15 +4420,17 @@ export class CommandCenter {
 						message = l10n.t('Can\'t force push refs to remote. The tip of the remote-tracking branch has been updated since the last checkout. Try running "Pull" first to pull the latest changes from the remote branch first.');
 						break;
 					case GitErrorCodes.Conflict:
-						message = l10n.t('There are merge conflicts. Resolve them before committing.');
+						message = l10n.t('There are merge conflicts. Please resolve them before committing your changes.');
 						type = 'warning';
+						choices.clear();
 						choices.set(l10n.t('Show Changes'), () => commands.executeCommand('workbench.view.scm'));
 						options.modal = false;
 						break;
 					case GitErrorCodes.StashConflict:
-						message = l10n.t('There were merge conflicts while applying the stash.');
-						choices.set(l10n.t('Show Changes'), () => commands.executeCommand('workbench.view.scm'));
+						message = l10n.t('There are merge conflicts while applying the stash. Please resolve them before committing your changes.');
 						type = 'warning';
+						choices.clear();
+						choices.set(l10n.t('Show Changes'), () => commands.executeCommand('workbench.view.scm'));
 						options.modal = false;
 						break;
 					case GitErrorCodes.AuthenticationFailed: {
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index de8b503ce54..4a968792a77 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -1880,6 +1880,16 @@ export class Repository {
 		await this.exec(['merge', '--abort']);
 	}
 
+	async mergeContinue(): Promise<void> {
+		const args = ['merge', '--continue'];
+
+		try {
+			await this.exec(args, { env: { GIT_EDITOR: 'true' } });
+		} catch (commitErr) {
+			await this.handleCommitError(commitErr);
+		}
+	}
+
 	async tag(options: { name: string; message?: string; ref?: string }): Promise<void> {
 		let args = ['tag'];
 
diff --git a/extensions/git/src/operation.ts b/extensions/git/src/operation.ts
index 6f3f0a1fa68..65a932f7702 100644
--- a/extensions/git/src/operation.ts
+++ b/extensions/git/src/operation.ts
@@ -39,6 +39,7 @@ export const enum OperationKind {
 	Merge = 'Merge',
 	MergeAbort = 'MergeAbort',
 	MergeBase = 'MergeBase',
+	MergeContinue = 'MergeContinue',
 	Move = 'Move',
 	PostCommitCommand = 'PostCommitCommand',
 	Pull = 'Pull',
@@ -69,10 +70,10 @@ export type Operation = AddOperation | ApplyOperation | BlameOperation | BranchO
 	DeleteRefOperation | DeleteRemoteTagOperation | DeleteTagOperation | DiffOperation | FetchOperation | FindTrackingBranchesOperation |
 	GetBranchOperation | GetBranchesOperation | GetCommitTemplateOperation | GetObjectDetailsOperation | GetObjectFilesOperation | GetRefsOperation |
 	GetRemoteRefsOperation | HashObjectOperation | IgnoreOperation | LogOperation | LogFileOperation | MergeOperation | MergeAbortOperation |
-	MergeBaseOperation | MoveOperation | PostCommitCommandOperation | PullOperation | PushOperation | RemoteOperation | RenameBranchOperation |
-	RemoveOperation | ResetOperation | RebaseOperation | RebaseAbortOperation | RebaseContinueOperation | RefreshOperation | RevertFilesOperation |
-	RevListOperation | RevParseOperation | SetBranchUpstreamOperation | ShowOperation | StageOperation | StatusOperation | StashOperation |
-	SubmoduleUpdateOperation | SyncOperation | TagOperation;
+	MergeBaseOperation | MergeContinueOperation | MoveOperation | PostCommitCommandOperation | PullOperation | PushOperation | RemoteOperation |
+	RenameBranchOperation | RemoveOperation | ResetOperation | RebaseOperation | RebaseAbortOperation | RebaseContinueOperation | RefreshOperation |
+	RevertFilesOperation | RevListOperation | RevParseOperation | SetBranchUpstreamOperation | ShowOperation | StageOperation | StatusOperation |
+	StashOperation | SubmoduleUpdateOperation | SyncOperation | TagOperation;
 
 type BaseOperation = { kind: OperationKind; blocking: boolean; readOnly: boolean; remote: boolean; retry: boolean; showProgress: boolean };
 export type AddOperation = BaseOperation & { kind: OperationKind.Add };
@@ -107,6 +108,7 @@ export type LogFileOperation = BaseOperation & { kind: OperationKind.LogFile };
 export type MergeOperation = BaseOperation & { kind: OperationKind.Merge };
 export type MergeAbortOperation = BaseOperation & { kind: OperationKind.MergeAbort };
 export type MergeBaseOperation = BaseOperation & { kind: OperationKind.MergeBase };
+export type MergeContinueOperation = BaseOperation & { kind: OperationKind.MergeContinue };
 export type MoveOperation = BaseOperation & { kind: OperationKind.Move };
 export type PostCommitCommandOperation = BaseOperation & { kind: OperationKind.PostCommitCommand };
 export type PullOperation = BaseOperation & { kind: OperationKind.Pull };
@@ -164,6 +166,7 @@ export const Operation = {
 	Merge: { kind: OperationKind.Merge, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as MergeOperation,
 	MergeAbort: { kind: OperationKind.MergeAbort, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as MergeAbortOperation,
 	MergeBase: { kind: OperationKind.MergeBase, blocking: false, readOnly: true, remote: false, retry: false, showProgress: true } as MergeBaseOperation,
+	MergeContinue: { kind: OperationKind.MergeContinue, blocking: true, readOnly: false, remote: false, retry: false, showProgress: true } as MergeAbortOperation,
 	Move: { kind: OperationKind.Move, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as MoveOperation,
 	PostCommitCommand: { kind: OperationKind.PostCommitCommand, blocking: false, readOnly: false, remote: false, retry: false, showProgress: true } as PostCommitCommandOperation,
 	Pull: { kind: OperationKind.Pull, blocking: true, readOnly: false, remote: true, retry: true, showProgress: true } as PullOperation,
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index ef7997c7542..e3b924d5868 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -1251,7 +1251,20 @@ export class Repository implements Disposable {
 		const workingGroupResources = opts.all && opts.all !== 'tracked' ?
 			[...this.workingTreeGroup.resourceStates.map(r => r.resourceUri.fsPath)] : [];
 
-		if (this.rebaseCommit) {
+		if (this.mergeInProgress) {
+			await this.run(
+				Operation.MergeContinue,
+				async () => {
+					if (opts.all) {
+						const addOpts = opts.all === 'tracked' ? { update: true } : {};
+						await this.repository.add([], addOpts);
+					}
+
+					await this.repository.mergeContinue();
+					await this.commitOperationCleanup(message, indexResources, workingGroupResources);
+				},
+				() => this.commitOperationGetOptimisticResourceGroups(opts));
+		} else if (this.rebaseCommit) {
 			await this.run(
 				Operation.RebaseContinue,
 				async () => {
@@ -2521,7 +2534,7 @@ export class Repository implements Disposable {
 		return head
 			+ (this.workingTreeGroup.resourceStates.length + this.untrackedGroup.resourceStates.length > 0 ? '*' : '')
 			+ (this.indexGroup.resourceStates.length > 0 ? '+' : '')
-			+ (this.mergeGroup.resourceStates.length > 0 ? '!' : '');
+			+ (this.mergeInProgress || !!this.rebaseCommit ? '!' : '');
 	}
 
 	get syncLabel(): string {

From af63c536164e34b42b317f11afae9da6433e2d92 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Fri, 13 Dec 2024 14:25:17 +0100
Subject: [PATCH 194/479] Adds InlineCompletionContext.requestUuid (#236046)

---
 src/vs/editor/common/languages.ts                        | 5 +++++
 .../browser/model/provideInlineCompletions.ts            | 9 ++++++---
 src/vs/workbench/api/common/extHostLanguageFeatures.ts   | 4 +++-
 .../vscode.proposed.inlineCompletionsAdditions.d.ts      | 2 ++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/vs/editor/common/languages.ts b/src/vs/editor/common/languages.ts
index 9d97fb451a8..0c35ac40fcc 100644
--- a/src/vs/editor/common/languages.ts
+++ b/src/vs/editor/common/languages.ts
@@ -703,6 +703,11 @@ export interface InlineCompletionContext {
 	 * @internal
 	*/
 	readonly userPrompt?: string | undefined;
+	/**
+	 * @experimental
+	 * @internal
+	*/
+	readonly requestUuid?: string | undefined;
 
 	readonly includeInlineEdits: boolean;
 	readonly includeInlineCompletions: boolean;
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
index 91c047eff9d..befcccca81a 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
@@ -9,6 +9,7 @@ import { CancellationToken, CancellationTokenSource } from '../../../../../base/
 import { onUnexpectedExternalError } from '../../../../../base/common/errors.js';
 import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
 import { SetMap } from '../../../../../base/common/map.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
 import { ISingleEditOperation } from '../../../../common/core/editOperation.js';
 import { OffsetRange } from '../../../../common/core/offsetRange.js';
 import { Position } from '../../../../common/core/position.js';
@@ -32,8 +33,10 @@ export async function provideInlineCompletions(
 	baseToken: CancellationToken = CancellationToken.None,
 	languageConfigurationService?: ILanguageConfigurationService,
 ): Promise<InlineCompletionProviderResult> {
+	const requestUuid = generateUuid();
 	const tokenSource = new CancellationTokenSource(baseToken);
 	const token = tokenSource.token;
+	const contextWithUuid = { ...context, requestUuid: requestUuid };
 
 	const defaultReplaceRange = positionOrRange instanceof Position ? getDefaultRange(positionOrRange, model) : positionOrRange;
 	const providers = registry.all(model);
@@ -116,9 +119,9 @@ export async function provideInlineCompletions(
 		let result: InlineCompletions | null | undefined;
 		try {
 			if (positionOrRange instanceof Position) {
-				result = await provider.provideInlineCompletions(model, positionOrRange, context, token);
+				result = await provider.provideInlineCompletions(model, positionOrRange, contextWithUuid, token);
 			} else {
-				result = await provider.provideInlineEditsForRange?.(model, positionOrRange, context, token);
+				result = await provider.provideInlineEditsForRange?.(model, positionOrRange, contextWithUuid, token);
 			}
 		} catch (e) {
 			onUnexpectedExternalError(e);
@@ -140,7 +143,7 @@ export async function provideInlineCompletions(
 		return new InlineCompletionProviderResult([], new Set(), []);
 	}
 
-	const result = await addRefAndCreateResult(context, inlineCompletionLists, defaultReplaceRange, model, languageConfigurationService);
+	const result = await addRefAndCreateResult(contextWithUuid, inlineCompletionLists, defaultReplaceRange, model, languageConfigurationService);
 	tokenSource.dispose(true); // This disposes results that are not referenced.
 	return result;
 }
diff --git a/src/vs/workbench/api/common/extHostLanguageFeatures.ts b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
index c39b9347e70..cd42bd3bf77 100644
--- a/src/vs/workbench/api/common/extHostLanguageFeatures.ts
+++ b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
@@ -1345,7 +1345,8 @@ class InlineCompletionAdapter extends InlineCompletionAdapterBase {
 						text: context.selectedSuggestionInfo.text
 					}
 					: undefined,
-			triggerKind: this.languageTriggerKindToVSCodeTriggerKind[context.triggerKind]
+			triggerKind: this.languageTriggerKindToVSCodeTriggerKind[context.triggerKind],
+			requestUuid: context.requestUuid,
 		}, token);
 
 		if (!result) {
@@ -1422,6 +1423,7 @@ class InlineCompletionAdapter extends InlineCompletionAdapterBase {
 					: undefined,
 			triggerKind: this.languageTriggerKindToVSCodeTriggerKind[context.triggerKind],
 			userPrompt: context.userPrompt,
+			requestUuid: context.requestUuid,
 		}, token);
 
 		if (!result) {
diff --git a/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts b/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts
index 8a71a374846..b207361af4a 100644
--- a/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts
+++ b/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts
@@ -66,6 +66,8 @@ declare module 'vscode' {
 
 	export interface InlineCompletionContext {
 		readonly userPrompt?: string;
+
+		readonly requestUuid?: string;
 	}
 
 	export interface PartialAcceptInfo {

From af33df91a45498435bc47f16444d91db4582ce48 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Fri, 13 Dec 2024 14:37:02 +0100
Subject: [PATCH 195/479] fix #141663 (#236050)

---
 src/vs/platform/userDataSync/common/userDataSyncMachines.ts  | 5 ++++-
 .../contrib/userDataSync/browser/userDataSyncViews.ts        | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/vs/platform/userDataSync/common/userDataSyncMachines.ts b/src/vs/platform/userDataSync/common/userDataSyncMachines.ts
index 1c36206421a..c91c8447973 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncMachines.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncMachines.ts
@@ -151,7 +151,10 @@ export class UserDataSyncMachinesService extends Disposable implements IUserData
 	private computeCurrentMachineName(machines: IMachineData[]): string {
 		const previousName = this.storageService.get(currentMachineNameKey, StorageScope.APPLICATION);
 		if (previousName) {
-			return previousName;
+			if (!machines.some(machine => machine.name === previousName)) {
+				return previousName;
+			}
+			this.storageService.remove(currentMachineNameKey, StorageScope.APPLICATION);
 		}
 
 		const namePrefix = `${this.productService.embedderIdentifier ? `${this.productService.embedderIdentifier} - ` : ''}${getPlatformName()} (${this.productService.nameShort})`;
diff --git a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts
index 082c55bda66..8ced2a6fa5d 100644
--- a/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts
+++ b/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts
@@ -697,6 +697,7 @@ class UserDataSyncMachinesViewDataProvider implements ITreeViewDataProvider {
 		inputBox.show();
 		const machines = await this.getMachines();
 		const machine = machines.find(({ id }) => id === machineId);
+		const enabledMachines = machines.filter(({ disabled }) => !disabled);
 		if (!machine) {
 			inputBox.hide();
 			disposableStore.dispose();
@@ -706,7 +707,7 @@ class UserDataSyncMachinesViewDataProvider implements ITreeViewDataProvider {
 		inputBox.value = machine.name;
 		const validateMachineName = (machineName: string): string | null => {
 			machineName = machineName.trim();
-			return machineName && !machines.some(m => m.id !== machineId && m.name === machineName) ? machineName : null;
+			return machineName && !enabledMachines.some(m => m.id !== machineId && m.name === machineName) ? machineName : null;
 		};
 		disposableStore.add(inputBox.onDidChangeValue(() =>
 			inputBox.validationMessage = validateMachineName(inputBox.value) ? '' : localize('valid message', "Machine name should be unique and not empty")));

From 380de2f146b207d3ea9dce33dec1e2fe8aba0b5a Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Fri, 13 Dec 2024 14:48:37 +0100
Subject: [PATCH 196/479] Git - render emojis when showing blame information
 (#236051)

---
 extensions/git/src/blame.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/extensions/git/src/blame.ts b/extensions/git/src/blame.ts
index 04b90e0725e..9bb740fdeb2 100644
--- a/extensions/git/src/blame.ts
+++ b/extensions/git/src/blame.ts
@@ -10,6 +10,7 @@ import { Repository } from './repository';
 import { throttle } from './decorators';
 import { BlameInformation } from './git';
 import { fromGitUri, isGitUri } from './uri';
+import { emojify, ensureEmojis } from './emoji';
 
 function lineRangesContainLine(changes: readonly TextEditorChange[], lineNumber: number): boolean {
 	return changes.some(c => c.modified.startLineNumber <= lineNumber && lineNumber < c.modified.endLineNumberExclusive);
@@ -171,7 +172,7 @@ export class GitBlameController {
 		const templateTokens = {
 			hash: blameInformation.hash,
 			hashShort: blameInformation.hash.substring(0, 8),
-			subject: blameInformation.subject ?? '',
+			subject: emojify(blameInformation.subject ?? ''),
 			authorName: blameInformation.authorName ?? '',
 			authorEmail: blameInformation.authorEmail ?? '',
 			authorDate: new Date(blameInformation.authorDate ?? new Date()).toLocaleString(),
@@ -203,7 +204,7 @@ export class GitBlameController {
 			markdownString.appendMarkdown('\n\n');
 		}
 
-		markdownString.appendMarkdown(`${blameInformation.subject}\n\n`);
+		markdownString.appendMarkdown(`${emojify(blameInformation.subject ?? '')}\n\n`);
 		markdownString.appendMarkdown(`---\n\n`);
 
 		markdownString.appendMarkdown(`[$(eye) View Commit](command:git.blameStatusBarItem.viewCommit?${encodeURIComponent(JSON.stringify([documentUri, blameInformation.hash]))} "${l10n.t('View Commit')}")`);
@@ -259,6 +260,10 @@ export class GitBlameController {
 			return resourceBlameInformation;
 		}
 
+		// Ensure that the emojis are loaded. We will
+		// use them when formatting the blame information.
+		await ensureEmojis();
+
 		// Get blame information for the resource and cache it
 		const blameInformation = await repository.blame2(resource.fsPath, commit) ?? [];
 		this._repositoryBlameCache.setBlameInformation(repository, resource, commit, blameInformation);

From 771c5177d3355542b8db71541996d7748371fe3d Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Fri, 13 Dec 2024 14:54:30 +0100
Subject: [PATCH 197/479] Git - fix `when` clause for keybindings (#236053)

---
 extensions/git/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/git/package.json b/extensions/git/package.json
index 81c825251a4..9aedfbb16e3 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -943,7 +943,7 @@
         "command": "git.stageSelectedRanges",
         "key": "ctrl+k ctrl+alt+s",
         "mac": "cmd+k cmd+alt+s",
-        "when": "resourceScheme =~ /^git$|^file$/"
+        "when": "editorTextFocus && resourceScheme =~ /^git$|^file$/"
       },
       {
         "command": "git.unstageSelectedRanges",
@@ -955,7 +955,7 @@
         "command": "git.revertSelectedRanges",
         "key": "ctrl+k ctrl+r",
         "mac": "cmd+k cmd+r",
-        "when": "resourceScheme =~ /^git$|^file$/"
+        "when": "editorTextFocus && resourceScheme =~ /^git$|^file$/"
       }
     ],
     "menus": {

From 13a37df8910390b7aa5692a01fd0e01079b318b1 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 13 Dec 2024 15:29:22 +0100
Subject: [PATCH 198/479] add error logging for
 https://github.com/microsoft/vscode/issues/227147 (#236054)

---
 .../test/common/ternarySearchtree.test.ts     | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/vs/base/test/common/ternarySearchtree.test.ts b/src/vs/base/test/common/ternarySearchtree.test.ts
index dcb2771d27e..592ef0a597c 100644
--- a/src/vs/base/test/common/ternarySearchtree.test.ts
+++ b/src/vs/base/test/common/ternarySearchtree.test.ts
@@ -536,14 +536,18 @@ suite('Ternary Search Tree', () => {
 			}
 			const tst = TernarySearchTree.forUris<boolean>();
 
-			for (const item of keys) {
-				tst.set(item, true);
-				assert.ok(tst._isBalanced(), `SET${item}|${keys.map(String).join()}`);
-			}
-
-			for (const item of keys) {
-				tst.delete(item);
-				assert.ok(tst._isBalanced(), `DEL${item}|${keys.map(String).join()}`);
+			try {
+				for (const item of keys) {
+					tst.set(item, true);
+					assert.ok(tst._isBalanced(), `SET${item}|${keys.map(String).join()}`);
+				}
+
+				for (const item of keys) {
+					tst.delete(item);
+					assert.ok(tst._isBalanced(), `DEL${item}|${keys.map(String).join()}`);
+				}
+			} catch (err) {
+				assert.ok(false, `FAILED with keys: ${keys.map(String).join()}`);
 			}
 		}
 	});

From 12b060f0a812fcd7e4cabf9c65e8267f48519459 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Fri, 13 Dec 2024 15:33:25 +0100
Subject: [PATCH 199/479] Git - fix bug related to toggling git decorations
 (#172637) (#236055)

---
 extensions/git/src/decorationProvider.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/extensions/git/src/decorationProvider.ts b/extensions/git/src/decorationProvider.ts
index 548f3aa2a1c..ddb3574890b 100644
--- a/extensions/git/src/decorationProvider.ts
+++ b/extensions/git/src/decorationProvider.ts
@@ -273,6 +273,7 @@ class GitIncomingChangesFileDecorationProvider implements FileDecorationProvider
 
 export class GitDecorations {
 
+	private enabled = false;
 	private disposables: Disposable[] = [];
 	private modelDisposables: Disposable[] = [];
 	private providers = new Map<Repository, Disposable>();
@@ -286,13 +287,19 @@ export class GitDecorations {
 	}
 
 	private update(): void {
-		const enabled = workspace.getConfiguration('git').get('decorations.enabled');
+		const config = workspace.getConfiguration('git');
+		const enabled = config.get<boolean>('decorations.enabled') === true;
+		if (this.enabled === enabled) {
+			return;
+		}
 
 		if (enabled) {
 			this.enable();
 		} else {
 			this.disable();
 		}
+
+		this.enabled = enabled;
 	}
 
 	private enable(): void {

From ab7dae30bfe722a3571fb82a55b61359c45a5174 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 13 Dec 2024 15:44:39 +0100
Subject: [PATCH 200/479] cancel session when token is cancelled (#236056)

https://github.com/microsoft/vscode-copilot-release/issues/2433
---
 .../contrib/inlineChat/browser/inlineChatController.ts      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
index e3ac8629904..9b4f17b4173 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as aria from '../../../../base/browser/ui/aria/aria.js';
-import { Barrier, DeferredPromise, Queue } from '../../../../base/common/async.js';
+import { Barrier, DeferredPromise, Queue, raceCancellation } from '../../../../base/common/async.js';
 import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { toErrorMessage } from '../../../../base/common/errorMessage.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
@@ -1187,7 +1187,9 @@ export class InlineChatController implements IEditorContribution {
 			this.cancelSession();
 		}
 
-		await run;
+		const dispo = token.onCancellationRequested(() => this.cancelSession());
+		await raceCancellation(run, token);
+		dispo.dispose();
 		return true;
 	}
 }

From f143959b7d5d9bb4c15c33a10a11601db92d5626 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Fri, 13 Dec 2024 15:56:41 +0100
Subject: [PATCH 201/479] Sticky Scroll: Adding height and emitter for height
 change event (#235953)

* adding height and emitter for hieght change event

* adding the event to the interface

* Set the height always through `_setHeight`

* Switch to non-overflow mode when it would go on top of sticky scroll

---------

Co-authored-by: Alexandru Dima <alexdima@microsoft.com>
---
 .../view/inlineEdits/sideBySideDiff.ts        |  9 +++--
 .../browser/stickyScrollController.ts         | 14 ++++++++
 .../browser/stickyScrollWidget.ts             | 34 ++++++++++++++++---
 3 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
index c5ed83bd5cd..281374e872d 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
@@ -7,7 +7,7 @@ import { IAction } from '../../../../../../base/common/actions.js';
 import { Color } from '../../../../../../base/common/color.js';
 import { structuralEquals } from '../../../../../../base/common/equals.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { IObservable, autorun, constObservable, derived, derivedOpts, observableValue } from '../../../../../../base/common/observable.js';
+import { IObservable, autorun, constObservable, derived, derivedOpts, observableFromEvent, observableValue } from '../../../../../../base/common/observable.js';
 import { MenuId, MenuItemAction } from '../../../../../../platform/actions/common/actions.js';
 import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
@@ -25,6 +25,7 @@ import { Position } from '../../../../../common/core/position.js';
 import { Range } from '../../../../../common/core/range.js';
 import { Command } from '../../../../../common/languages.js';
 import { ITextModel } from '../../../../../common/model.js';
+import { StickyScrollController } from '../../../../stickyScroll/browser/stickyScrollController.js';
 import { CustomizedMenuWorkbenchToolBar } from '../../hintsWidget/inlineCompletionsHintsWidget.js';
 import { PathBuilder, StatusBarViewItem, getOffsetForPos, mapOutFalsy, maxContentWidthInRange, n } from './utils.js';
 import { InlineEditWithChanges } from './viewAndDiffProducer.js';
@@ -396,13 +397,17 @@ export class InlineEditsSideBySideDiff extends Disposable {
 		};
 	});
 
+	private _stickyScrollController = StickyScrollController.get(this._editorObs.editor);
+	private readonly _stickyScrollHeight = this._stickyScrollController ? observableFromEvent(this._stickyScrollController.onDidChangeStickyScrollHeight, () => this._stickyScrollController!.stickyScrollWidgetHeight) : constObservable(0);
+
 	private readonly _shouldOverflow = derived(reader => {
 		const range = this._edit.read(reader)?.originalLineRange;
 		if (!range) {
 			return false;
 		}
+		const stickyScrollHeight = this._stickyScrollHeight.read(reader);
 		const top = this._editor.getTopForLineNumber(range.startLineNumber) - this._editorObs.scrollTop.read(reader);
-		return top > 0;
+		return top > stickyScrollHeight;
 	});
 
 
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
index b5074c87786..01d61e7d614 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
@@ -29,10 +29,12 @@ import { StickyRange } from './stickyScrollElement.js';
 import { IMouseEvent, StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
 import { FoldingController } from '../../folding/browser/folding.js';
 import { FoldingModel, toggleCollapseState } from '../../folding/browser/foldingModel.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
 
 export interface IStickyScrollController {
 	get stickyScrollCandidateProvider(): IStickyLineCandidateProvider;
 	get stickyScrollWidgetState(): StickyScrollWidgetState;
+	readonly stickyScrollWidgetHeight: number;
 	isFocused(): boolean;
 	focus(): void;
 	focusNext(): void;
@@ -41,6 +43,7 @@ export interface IStickyScrollController {
 	findScrollWidgetState(): StickyScrollWidgetState;
 	dispose(): void;
 	selectEditor(): void;
+	onDidChangeStickyScrollHeight: Event<{ height: number }>;
 }
 
 export class StickyScrollController extends Disposable implements IEditorContribution, IStickyScrollController {
@@ -71,6 +74,9 @@ export class StickyScrollController extends Disposable implements IEditorContrib
 	private _showEndForLine: number | undefined;
 	private _minRebuildFromLine: number | undefined;
 
+	private readonly _onDidChangeStickyScrollHeight = this._register(new Emitter<{ height: number }>());
+	public readonly onDidChangeStickyScrollHeight = this._onDidChangeStickyScrollHeight.event;
+
 	constructor(
 		private readonly _editor: ICodeEditor,
 		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
@@ -118,6 +124,9 @@ export class StickyScrollController extends Disposable implements IEditorContrib
 		this._register(dom.addDisposableListener(stickyScrollDomNode, dom.EventType.MOUSE_DOWN, (e) => {
 			this._onMouseDown = true;
 		}));
+		this._register(this._stickyScrollWidget.onDidChangeStickyScrollHeight((e) => {
+			this._onDidChangeStickyScrollHeight.fire(e);
+		}));
 		this._onDidResize();
 		this._readConfiguration();
 	}
@@ -130,6 +139,10 @@ export class StickyScrollController extends Disposable implements IEditorContrib
 		return this._widgetState;
 	}
 
+	get stickyScrollWidgetHeight(): number {
+		return this._stickyScrollWidget.height;
+	}
+
 	public static get(editor: ICodeEditor): IStickyScrollController | null {
 		return editor.getContribution<StickyScrollController>(StickyScrollController.ID);
 	}
@@ -413,6 +426,7 @@ export class StickyScrollController extends Disposable implements IEditorContrib
 		const options = this._editor.getOption(EditorOption.stickyScroll);
 		if (options.enabled === false) {
 			this._editor.removeOverlayWidget(this._stickyScrollWidget);
+			this._resetState();
 			this._sessionStore.clear();
 			this._enabled = false;
 			return;
diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
index 3d1d583cb28..f805b7879b1 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts
@@ -19,6 +19,7 @@ import { LineDecoration } from '../../../common/viewLayout/lineDecorations.js';
 import { CharacterMapping, RenderLineInput, renderViewLine } from '../../../common/viewLayout/viewLineRenderer.js';
 import { foldingCollapsedIcon, foldingExpandedIcon } from '../../folding/browser/foldingDecorations.js';
 import { FoldingModel } from '../../folding/browser/foldingModel.js';
+import { Emitter } from '../../../../base/common/event.js';
 
 export class StickyScrollWidgetState {
 	constructor(
@@ -62,6 +63,12 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 	private _lastLineRelativePosition: number = 0;
 	private _minContentWidthInPx: number = 0;
 	private _isOnGlyphMargin: boolean = false;
+	private _height: number = -1;
+
+	public get height(): number { return this._height; }
+
+	private readonly _onDidChangeStickyScrollHeight = this._register(new Emitter<{ height: number }>());
+	public readonly onDidChangeStickyScrollHeight = this._onDidChangeStickyScrollHeight.event;
 
 	constructor(
 		private readonly _editor: ICodeEditor
@@ -81,6 +88,7 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 		this._rootDomNode.classList.toggle('peek', _editor instanceof EmbeddedCodeEditorWidget);
 		this._rootDomNode.appendChild(this._lineNumbersDomNode);
 		this._rootDomNode.appendChild(this._linesDomNodeScrollable);
+		this._setHeight(0);
 
 		const updateScrollLeftPosition = () => {
 			this._linesDomNode.style.left = this._editor.getOption(EditorOption.stickyScroll).scrollWithEditor ? `-${this._editor.getScrollLeft()}px` : '0px';
@@ -193,7 +201,6 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 		}
 		// Keep the lines that need to be updated
 		this._renderedStickyLines = this._renderedStickyLines.slice(0, clearFromLine);
-		this._rootDomNode.style.display = 'none';
 	}
 
 	private _useFoldingOpacityTransition(requireTransitions: boolean) {
@@ -213,6 +220,8 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 	private async _renderRootNode(state: StickyScrollWidgetState | undefined, foldingModel: FoldingModel | undefined, rebuildFromLine: number): Promise<void> {
 		this._clearStickyLinesFromLine(rebuildFromLine);
 		if (!state) {
+			// make sure the dom is 0 height and display:none
+			this._setHeight(0);
 			return;
 		}
 		// For existing sticky lines update the top and z-index
@@ -237,16 +246,31 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 		}
 
 		const widgetHeight = this._lineNumbers.length * this._lineHeight + this._lastLineRelativePosition;
-		this._rootDomNode.style.display = 'block';
-		this._lineNumbersDomNode.style.height = `${widgetHeight}px`;
-		this._linesDomNodeScrollable.style.height = `${widgetHeight}px`;
-		this._rootDomNode.style.height = `${widgetHeight}px`;
+		this._setHeight(widgetHeight);
 
 		this._rootDomNode.style.marginLeft = '0px';
 		this._minContentWidthInPx = Math.max(...this._renderedStickyLines.map(l => l.scrollWidth)) + layoutInfo.verticalScrollbarWidth;
 		this._editor.layoutOverlayWidget(this);
 	}
 
+	private _setHeight(height: number): void {
+		if (this._height === height) {
+			return;
+		}
+		this._height = height;
+
+		if (this._height === 0) {
+			this._rootDomNode.style.display = 'none';
+		} else {
+			this._rootDomNode.style.display = 'block';
+			this._lineNumbersDomNode.style.height = `${this._height}px`;
+			this._linesDomNodeScrollable.style.height = `${this._height}px`;
+			this._rootDomNode.style.height = `${this._height}px`;
+		}
+
+		this._onDidChangeStickyScrollHeight.fire({ height: this._height });
+	}
+
 	private _setFoldingHoverListeners(): void {
 		const showFoldingControls: 'mouseover' | 'always' | 'never' = this._editor.getOption(EditorOption.showFoldingControls);
 		if (showFoldingControls !== 'mouseover') {

From e4cf87c882c63ed68e007c798af740e4b1617094 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Fri, 13 Dec 2024 16:06:13 +0100
Subject: [PATCH 202/479] Git - stash untracked filed during checkout (#214768)
 (#236057)

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

diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index f93340d928e..64905cd55f3 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -2619,7 +2619,7 @@ export class CommandCenter {
 					await this.cleanAll(repository);
 					await item.run(repository, opts);
 				} else if (choice === stash || choice === migrate) {
-					if (await this._stash(repository)) {
+					if (await this._stash(repository, true)) {
 						await item.run(repository, opts);
 
 						if (choice === migrate) {

From 8c3188b22254e18acebe77acebeb25d538cda7af Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Fri, 13 Dec 2024 16:41:56 +0100
Subject: [PATCH 203/479] Fix comments error telemetry (#236060)

Fixes #230642
---
 .../contrib/comments/browser/commentsController.ts     | 10 ++++++++--
 .../comments/browser/commentsEditorContribution.ts     |  7 +------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/vs/workbench/contrib/comments/browser/commentsController.ts b/src/vs/workbench/contrib/comments/browser/commentsController.ts
index 6fc73d49776..88a789ba264 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsController.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsController.ts
@@ -47,6 +47,7 @@ import { IAccessibilityService } from '../../../../platform/accessibility/common
 import { URI } from '../../../../base/common/uri.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { threadHasMeaningfulComments } from './commentsModel.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
 
 export const ID = 'editor.contrib.review';
 
@@ -485,7 +486,8 @@ export class CommentController implements IEditorContribution {
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IEditorService private readonly editorService: IEditorService,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
-		@IAccessibilityService private readonly accessibilityService: IAccessibilityService
+		@IAccessibilityService private readonly accessibilityService: IAccessibilityService,
+		@INotificationService private readonly notificationService: INotificationService
 	) {
 		this._commentInfos = [];
 		this._commentWidgets = [];
@@ -1168,7 +1170,11 @@ export class CommentController implements IEditorContribution {
 		if (!newCommentInfos.length || !this.editor?.hasModel()) {
 			this._addInProgress = false;
 			if (!newCommentInfos.length) {
-				throw new Error(`There are no commenting ranges at the current position (${range ? 'with range' : 'without range'}).`);
+				if (range) {
+					this.notificationService.error(nls.localize('comments.addCommand.error', "The cursor must be within a commenting range to add a comment."));
+				} else {
+					this.notificationService.error(nls.localize('comments.addFileCommentCommand.error', "File comments are not allowed on this file."));
+				}
 			}
 			return Promise.resolve();
 		}
diff --git a/src/vs/workbench/contrib/comments/browser/commentsEditorContribution.ts b/src/vs/workbench/contrib/comments/browser/commentsEditorContribution.ts
index ce0458cd942..e0441ab93fb 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsEditorContribution.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsEditorContribution.ts
@@ -280,12 +280,7 @@ registerAction2(class extends Action2 {
 
 		const position = args?.range ? new Range(args.range.startLineNumber, args.range.startLineNumber, args.range.endLineNumber, args.range.endColumn)
 			: (args?.fileComment ? undefined : activeEditor.getSelection());
-		const notificationService = accessor.get(INotificationService);
-		try {
-			await controller.addOrToggleCommentAtLine(position, undefined);
-		} catch (e) {
-			notificationService.error(nls.localize('comments.addCommand.error', "The cursor must be within a commenting range to add a comment"));
-		}
+		await controller.addOrToggleCommentAtLine(position, undefined);
 	}
 });
 

From 7ed772b8b0ad0e8e1f7d3294fc9b468d9d1e048c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Fri, 13 Dec 2024 16:50:04 +0100
Subject: [PATCH 204/479] remove retry at publish time (#236070)

fixes #236067
---
 build/azure-pipelines/common/publish.js | 2 +-
 build/azure-pipelines/common/publish.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/azure-pipelines/common/publish.js b/build/azure-pipelines/common/publish.js
index 742db9d9e97..bcebd076c28 100644
--- a/build/azure-pipelines/common/publish.js
+++ b/build/azure-pipelines/common/publish.js
@@ -540,7 +540,7 @@ async function processArtifact(artifact, filePath) {
             const stagingContainerClient = blobServiceClient.getContainerClient('staging');
             await stagingContainerClient.createIfNotExists();
             const releaseService = await ESRPReleaseService.create(log, e('RELEASE_TENANT_ID'), e('RELEASE_CLIENT_ID'), e('RELEASE_AUTH_CERT'), e('RELEASE_REQUEST_SIGNING_CERT'), stagingContainerClient);
-            await (0, retry_1.retry)(() => releaseService.createRelease(version, filePath, friendlyFileName));
+            await releaseService.createRelease(version, filePath, friendlyFileName);
         }
         const { product, os, arch, unprocessedType } = match.groups;
         const isLegacy = artifact.name.includes('_legacy');
diff --git a/build/azure-pipelines/common/publish.ts b/build/azure-pipelines/common/publish.ts
index 0987502432b..b8b99c3855b 100644
--- a/build/azure-pipelines/common/publish.ts
+++ b/build/azure-pipelines/common/publish.ts
@@ -880,7 +880,7 @@ async function processArtifact(
 				stagingContainerClient
 			);
 
-			await retry(() => releaseService.createRelease(version, filePath, friendlyFileName));
+			await releaseService.createRelease(version, filePath, friendlyFileName);
 		}
 
 		const { product, os, arch, unprocessedType } = match.groups!;

From 450b0699586e3efa3d731dffe68747fefe138dc3 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Fri, 13 Dec 2024 16:50:30 +0100
Subject: [PATCH 205/479] Comments pane shows H1 titles as H1 instead of
 regular text (#236069)

Fixes #236068
---
 .../workbench/contrib/comments/browser/commentsTreeViewer.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts b/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
index 69684b02b2d..37c11e7e11e 100644
--- a/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.ts
@@ -250,6 +250,11 @@ export class CommentNodeRenderer implements IListRenderer<ITreeNode<CommentNode>
 			textDescription.textContent = image.alt ? nls.localize('imageWithLabel', "Image: {0}", image.alt) : nls.localize('image', "Image");
 			image.parentNode!.replaceChild(textDescription, image);
 		}
+		const headings = [...renderedComment.element.getElementsByTagName('h1'), ...renderedComment.element.getElementsByTagName('h2'), ...renderedComment.element.getElementsByTagName('h3'), ...renderedComment.element.getElementsByTagName('h4'), ...renderedComment.element.getElementsByTagName('h5'), ...renderedComment.element.getElementsByTagName('h6')];
+		for (const heading of headings) {
+			const textNode = document.createTextNode(heading.textContent || '');
+			heading.parentNode!.replaceChild(textNode, heading);
+		}
 		while ((renderedComment.element.children.length > 1) && (renderedComment.element.firstElementChild?.tagName === 'HR')) {
 			renderedComment.element.removeChild(renderedComment.element.firstElementChild);
 		}

From 974044db9bffb69fb4ac5c301c847a38d2779ab1 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Fri, 13 Dec 2024 16:58:21 +0100
Subject: [PATCH 206/479] Use proper delimiter in tasks paths (#236047)

---
 src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
index 045a9e63b44..e44eaa47cf9 100644
--- a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
+++ b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
@@ -619,7 +619,8 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 	private async _resolveAndFindExecutable(systemInfo: ITaskSystemInfo | undefined, workspaceFolder: IWorkspaceFolder | undefined, task: CustomTask | ContributedTask, cwd: string | undefined, envPath: string | undefined): Promise<string> {
 		const command = await this._configurationResolverService.resolveAsync(workspaceFolder, CommandString.value(task.command.name!));
 		cwd = cwd ? await this._configurationResolverService.resolveAsync(workspaceFolder, cwd) : undefined;
-		const paths = envPath ? await Promise.all(envPath.split(path.delimiter).map(p => this._configurationResolverService.resolveAsync(workspaceFolder, p))) : undefined;
+		const delimiter = (await this._pathService.path).delimiter;
+		const paths = envPath ? await Promise.all(envPath.split(delimiter).map(p => this._configurationResolverService.resolveAsync(workspaceFolder, p))) : undefined;
 		const foundExecutable = await systemInfo?.findExecutable(command, cwd, paths);
 		if (foundExecutable) {
 			return foundExecutable;

From 4b254c2da56e2b3a2faf41d3136c188350e00d44 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Fri, 13 Dec 2024 17:21:25 +0100
Subject: [PATCH 207/479] Git - auto stash should restore the stash when the
 operation fails (#232929) (#236059)

---
 extensions/git/src/repository.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index e3b924d5868..73a54cef4af 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -2465,10 +2465,12 @@ export class Repository implements Disposable {
 		}
 
 		await this.repository.createStash(undefined, true);
-		const result = await runOperation();
-		await this.repository.popStash();
-
-		return result;
+		try {
+			const result = await runOperation();
+			return result;
+		} finally {
+			await this.repository.popStash();
+		}
 	}
 
 	private onFileChange(_uri: Uri): void {

From d70dd875a9c01613a52a5e83dab807186cf67001 Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Fri, 13 Dec 2024 17:25:51 +0100
Subject: [PATCH 208/479] Make sure the background fill for the new code
 renders on top of other editor widgets and remove DOM warning (#236073)

---
 .../view/inlineEdits/sideBySideDiff.ts        | 26 ++++++++++++-------
 .../browser/view/inlineEdits/utils.ts         | 12 +++++++--
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
index 281374e872d..331eb28bc7b 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
@@ -432,14 +432,6 @@ export class InlineEditsSideBySideDiff extends Disposable {
 		transform: 'translate(-0.5 -0.5)',
 		style: { overflow: 'visible', pointerEvents: 'none', position: 'absolute' },
 	}, [
-		n.svgElem('path', {
-			class: 'extendedModifiedBackgroundCoverUp',
-			d: this._extendedModifiedPath,
-			style: {
-				fill: 'var(--vscode-editor-background, transparent)',
-				strokeWidth: '1px',
-			}
-		}),
 		n.svgElem('path', {
 			class: 'rightOfModifiedBackgroundCoverUp',
 			d: this._previewEditorLayoutInfo.map(layoutInfo => layoutInfo && new PathBuilder()
@@ -455,6 +447,20 @@ export class InlineEditsSideBySideDiff extends Disposable {
 		}),
 	]).keepUpdated(this._store);
 
+	private readonly _foregroundBackgroundSvg = n.svg({
+		transform: 'translate(-0.5 -0.5)',
+		style: { overflow: 'visible', pointerEvents: 'none', position: 'absolute' },
+	}, [
+		n.svgElem('path', {
+			class: 'extendedModifiedBackgroundCoverUp',
+			d: this._extendedModifiedPath,
+			style: {
+				fill: 'var(--vscode-editor-background, transparent)',
+				strokeWidth: '1px',
+			}
+		}),
+	]).keepUpdated(this._store);
+
 	private readonly _foregroundSvg = n.svg({
 		transform: 'translate(-0.5 -0.5)',
 		style: { overflow: 'visible', pointerEvents: 'none', position: 'absolute' },
@@ -544,7 +550,7 @@ export class InlineEditsSideBySideDiff extends Disposable {
 		},
 	}, [
 		this._backgroundSvg,
-		derived(this, reader => this._shouldOverflow.read(reader) ? [] : [this._editorContainer, this._foregroundSvg]),
+		derived(this, reader => this._shouldOverflow.read(reader) ? [] : [this._foregroundBackgroundSvg, this._editorContainer, this._foregroundSvg]),
 	]).keepUpdated(this._store);
 
 	private readonly _overflowView = n.div({
@@ -558,6 +564,6 @@ export class InlineEditsSideBySideDiff extends Disposable {
 			display: this._display,
 		},
 	}, [
-		derived(this, reader => this._shouldOverflow.read(reader) ? [this._editorContainer, this._foregroundSvg] : []),
+		derived(this, reader => this._shouldOverflow.read(reader) ? [this._foregroundBackgroundSvg, this._editorContainer, this._foregroundSvg] : []),
 	]).keepUpdated(this._store);
 }
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
index a97c9fe15f5..16971c2ebc6 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
@@ -325,10 +325,10 @@ export abstract class ObserverNode<T extends Element = Element> extends Disposab
 			} else {
 				if (isObservable(value)) {
 					this._deriveds.push(derived(this, reader => {
-						this._element.setAttribute(camelCaseToHyphenCase(key), value.read(reader) as any);
+						setOrRemoveAttribute(this._element, key, value.read(reader));
 					}));
 				} else {
-					this._element.setAttribute(camelCaseToHyphenCase(key), value.toString());
+					setOrRemoveAttribute(this._element, key, value);
 				}
 			}
 		}
@@ -393,6 +393,14 @@ export class ObserverNodeWithElement<T extends Element = Element> extends Observ
 	}
 }
 
+function setOrRemoveAttribute(element: Element, key: string, value: unknown) {
+	if (value === null || value === undefined) {
+		element.removeAttribute(camelCaseToHyphenCase(key));
+	} else {
+		element.setAttribute(camelCaseToHyphenCase(key), String(value));
+	}
+}
+
 function camelCaseToHyphenCase(str: string) {
 	return str.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
 }

From e7b43262d29ff638df67c85eedc472a6c7685999 Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Fri, 13 Dec 2024 17:39:05 +0100
Subject: [PATCH 209/479] Improve layouting of side-by-side (#236075)

---
 .../browser/view/inlineEdits/sideBySideDiff.ts | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
index 331eb28bc7b..cf7c1f94cf4 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
@@ -2,6 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+import { getWindow } from '../../../../../../base/browser/dom.js';
 import { ActionViewItem } from '../../../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { IAction } from '../../../../../../base/common/actions.js';
 import { Color } from '../../../../../../base/common/color.js';
@@ -340,14 +341,23 @@ export class InlineEditsSideBySideDiff extends Disposable {
 		const editorContentMaxWidthInRange = maxContentWidthInRange(this._editorObs, state.originalDisplayRange, reader);
 		const editorLayout = this._editorObs.layoutInfo.read(reader);
 		const previewWidth = this._previewEditorWidth.read(reader);
-		const editorContentAreaWidth = editorLayout.width - editorLayout.contentLeft - editorLayout.minimap.minimapWidth - editorLayout.verticalScrollbarWidth;
+		const editorContentAreaWidth = editorLayout.contentWidth - editorLayout.verticalScrollbarWidth;
+		const clientContentAreaRight = editorLayout.contentLeft + editorLayout.contentWidth + this._editor.getContainerDomNode().getBoundingClientRect().left;
+		const remainingWidthRightOfContent = getWindow(this._editor.getContainerDomNode()).outerWidth - clientContentAreaRight;
+		const desiredMinimumWidth = Math.min(editorLayout.contentWidth * 0.3, previewWidth, 100);
+		const IN_EDITOR_DISPLACEMENT = 0;
+		const maximumAvailableWidth = IN_EDITOR_DISPLACEMENT + remainingWidthRightOfContent;
 
 		const cursorPos = this._cursorPosIfTouchesEdit.read(reader);
 
 		const maxPreviewEditorLeft = Math.max(
-			editorContentAreaWidth * 0.65 + horizontalScrollOffset - 10,
-			editorContentAreaWidth - previewWidth - 70 + horizontalScrollOffset - 10,
-			cursorPos ? getOffsetForPos(this._editorObs, cursorPos, reader) + 50 : 0
+			// We're starting from the content area right and moving it left by IN_EDITOR_DISPLACEMENT and also by an ammount to ensure some mimum desired width
+			editorContentAreaWidth + horizontalScrollOffset - IN_EDITOR_DISPLACEMENT - Math.max(0, desiredMinimumWidth - maximumAvailableWidth),
+			// But we don't want that the moving left ends up covering the cursor, so this will push it to the right again
+			Math.min(
+				cursorPos ? getOffsetForPos(this._editorObs, cursorPos, reader) + 50 : 0,
+				editorContentAreaWidth + horizontalScrollOffset
+			)
 		);
 		const previewEditorLeftInTextArea = Math.min(editorContentMaxWidthInRange + 20, maxPreviewEditorLeft);
 

From e044a71719609b9701aa0d577523d18f92efc32c Mon Sep 17 00:00:00 2001
From: aslezar <97354675+aslezar@users.noreply.github.com>
Date: Fri, 13 Dec 2024 22:22:13 +0530
Subject: [PATCH 210/479] Fix incorrect GLIBC version parsing

Fixes #230370
---
 cli/src/util/prereqs.rs | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs
index e0fba272fcf..dc469fd30cd 100644
--- a/cli/src/util/prereqs.rs
+++ b/cli/src/util/prereqs.rs
@@ -15,7 +15,7 @@ use super::errors::CodeError;
 
 lazy_static! {
 	static ref LDCONFIG_STDC_RE: Regex = Regex::new(r"libstdc\+\+.* => (.+)").unwrap();
-	static ref LDD_VERSION_RE: BinRegex = BinRegex::new(r"^ldd.*(.+)\.(.+)\s").unwrap();
+	static ref LDD_VERSION_RE: BinRegex = BinRegex::new(r"^ldd.*\s(\d+)\.(\d+)(?:\.(\d+))?\s").unwrap();
 	static ref GENERIC_VERSION_RE: Regex = Regex::new(r"^([0-9]+)\.([0-9]+)$").unwrap();
 	static ref LIBSTD_CXX_VERSION_RE: BinRegex =
 		BinRegex::new(r"GLIBCXX_([0-9]+)\.([0-9]+)(?:\.([0-9]+))?").unwrap();
@@ -271,10 +271,10 @@ fn check_for_sufficient_glibcxx_versions(contents: Vec<u8>) -> Result<bool, Stri
 #[allow(dead_code)]
 fn extract_ldd_version(output: &[u8]) -> Option<SimpleSemver> {
 	LDD_VERSION_RE.captures(output).map(|m| SimpleSemver {
-		major: m.get(1).map_or(0, |s| u32_from_bytes(s.as_bytes())),
-		minor: m.get(2).map_or(0, |s| u32_from_bytes(s.as_bytes())),
-		patch: 0,
-	})
+            major: m.get(1).map_or(0, |s| u32_from_bytes(s.as_bytes())),
+            minor: m.get(2).map_or(0, |s| u32_from_bytes(s.as_bytes())),
+            patch: 0,
+    })
 }
 
 #[allow(dead_code)]
@@ -401,5 +401,18 @@ mod tests {
 			extract_ldd_version(&actual),
 			Some(SimpleSemver::new(2, 31, 0)),
 		);
+
+		let actual2 = "ldd (GNU libc) 2.40.9000
+					Copyright (C) 2024 Free Software Foundation, Inc.
+					This is free software; see the source for copying conditions.  There is NO
+					warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+					Written by Roland McGrath and Ulrich Drepper."
+			.to_owned()
+			.into_bytes();
+		assert_eq!(
+			extract_ldd_version(&actual2),
+			Some(SimpleSemver::new(2, 40, 0)),
+		);
 	}
+
 }

From 2468418bd9f6e3a5b7d363c3fee274d5e426f64b Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Fri, 13 Dec 2024 10:57:53 -0600
Subject: [PATCH 211/479] pass in prefix vs value to completion extension
 providers  so command line excludes ghost text (#236000)

fixes #235996
---
 .../terminalContrib/suggest/browser/terminalSuggestAddon.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
index 4594a1b60a8..83c87e8cec2 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -156,7 +156,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 			await this._extensionService.activateByEvent('onTerminalCompletionsRequested');
 		}
 
-		const providedCompletions = await this._terminalCompletionService.provideCompletions(this._promptInputModel.value, this._promptInputModel.cursorIndex, this._shellType, token, triggerCharacter, doNotRequestExtensionCompletions);
+		const providedCompletions = await this._terminalCompletionService.provideCompletions(this._promptInputModel.prefix, this._promptInputModel.cursorIndex, this._shellType, token, triggerCharacter, doNotRequestExtensionCompletions);
 		if (!providedCompletions?.length || token.isCancellationRequested) {
 			return;
 		}

From 1a56b0b5a72c8f8cd5cab62c801b4555b9b4c2b1 Mon Sep 17 00:00:00 2001
From: LemmusLemmus <63229554+LemmusLemmus@users.noreply.github.com>
Date: Fri, 13 Dec 2024 17:58:57 +0100
Subject: [PATCH 212/479] Add $ to surrounding pairs in markdown (#233981)

The dollar sign is used for inline mathematical expressions.
---
 extensions/markdown-basics/language-configuration.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/extensions/markdown-basics/language-configuration.json b/extensions/markdown-basics/language-configuration.json
index 6e1766db02c..935b1c66250 100644
--- a/extensions/markdown-basics/language-configuration.json
+++ b/extensions/markdown-basics/language-configuration.json
@@ -83,6 +83,10 @@
 		[
 			"~",
 			"~"
+		],
+		[
+			"$",
+			"$"
 		]
 	],
 	"folding": {

From 5ae6f1e82930572167dd27a86570e49f9ae658f0 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 13 Dec 2024 18:04:38 +0100
Subject: [PATCH 213/479] chat overlay fixes (#236079)

* fixes disabled button color in chat overlay
* fixes https://github.com/microsoft/vscode-copilot/issues/10930
* fix reveal after streaming issues
---
 .../chat/browser/chatEditorController.ts      | 106 ++++++++++--------
 .../contrib/chat/browser/chatEditorOverlay.ts |  31 +++--
 .../chat/browser/media/chatEditorOverlay.css  |  12 +-
 3 files changed, 78 insertions(+), 71 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditorController.ts b/src/vs/workbench/contrib/chat/browser/chatEditorController.ts
index 0cca055ece2..18a7c1a258e 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditorController.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditorController.ts
@@ -6,7 +6,7 @@
 import './media/chatEditorController.css';
 import { addStandardDisposableListener, getTotalWidth } from '../../../../base/browser/dom.js';
 import { Disposable, DisposableStore, dispose, toDisposable } from '../../../../base/common/lifecycle.js';
-import { autorun, autorunWithStore, derived, IObservable, observableFromEvent, observableValue } from '../../../../base/common/observable.js';
+import { autorun, autorunWithStore, derived, IObservable, observableFromEvent, observableValue, transaction } from '../../../../base/common/observable.js';
 import { themeColorFromId } from '../../../../base/common/themables.js';
 import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, IOverlayWidgetPositionCoordinates, IViewZone, MouseTargetType } from '../../../../editor/browser/editorBrowser.js';
 import { LineSource, renderLines, RenderOptions } from '../../../../editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js';
@@ -55,8 +55,11 @@ export class ChatEditorController extends Disposable implements IEditorContribut
 		return controller;
 	}
 
-	private readonly _currentChange = observableValue<Position | undefined>(this, undefined);
-	readonly currentChange: IObservable<Position | undefined> = this._currentChange;
+	private readonly _currentEntryIndex = observableValue<number | undefined>(this, undefined);
+	readonly currentEntryIndex: IObservable<number | undefined> = this._currentEntryIndex;
+
+	private readonly _currentChangeIndex = observableValue<number | undefined>(this, undefined);
+	readonly currentChangeIndex: IObservable<number | undefined> = this._currentChangeIndex;
 
 	private _scrollLock: boolean = false;
 
@@ -76,20 +79,28 @@ export class ChatEditorController extends Disposable implements IEditorContribut
 		const lineHeightObs = observableCodeEditor(this._editor).getOption(EditorOption.lineHeight);
 		const modelObs = observableCodeEditor(this._editor).model;
 
-		// scroll along unless "another" scroll happens
-		let ignoreScrollEvent = false;
-		this._store.add(this._editor.onDidScrollChange(e => {
-			if (e.scrollTopChanged && !ignoreScrollEvent) {
-				// this._scrollLock = true;
-			}
-		}));
 
 		this._store.add(autorun(r => {
 			const session = this._chatEditingService.currentEditingSessionObs.read(r);
 			this._ctxRequestInProgress.set(session?.state.read(r) === ChatEditingSessionState.StreamingEdits);
 		}));
 
-		let didReveal = false;
+
+		const entryForEditor = derived(r => {
+			const model = modelObs.read(r);
+			const session = this._chatEditingService.currentEditingSessionObs.read(r);
+			if (!session) {
+				return undefined;
+			}
+			const entry = model?.uri ? session.readEntry(model.uri, r) : undefined;
+			if (!entry || entry.state.read(r) !== WorkingSetEntryState.Modified) {
+				return undefined;
+			}
+			return { session, entry };
+		});
+
+
+		let didReval = false;
 
 		this._register(autorunWithStore((r, store) => {
 
@@ -98,55 +109,48 @@ export class ChatEditorController extends Disposable implements IEditorContribut
 				return;
 			}
 
-			fontInfoObs.read(r);
-			lineHeightObs.read(r);
-
-			const model = modelObs.read(r);
+			const currentEditorEntry = entryForEditor.read(r);
 
-			const session = this._chatEditingService.currentEditingSessionObs.read(r);
-			const entry = model?.uri ? session?.readEntry(model.uri, r) : undefined;
-
-			if (!entry || entry.state.read(r) !== WorkingSetEntryState.Modified) {
+			if (!currentEditorEntry) {
 				this._clearRendering();
-				didReveal = false;
+				didReval = false;
 				return;
 			}
 
+			const { session, entry } = currentEditorEntry;
+
+			const entryIndex = session.entries.read(r).indexOf(entry);
+			this._currentEntryIndex.set(entryIndex, undefined);
+
 			if (entry.isCurrentlyBeingModified.read(r)) {
+				// while modified: scroll along unless locked
+				if (!this._scrollLock) {
+					const maxLineNumber = entry.maxLineNumber.read(r);
+					this._editor.revealLineNearTop(maxLineNumber, ScrollType.Smooth);
+				}
 				const domNode = this._editor.getDomNode();
 				if (domNode) {
 					store.add(addStandardDisposableListener(domNode, 'wheel', () => {
 						this._scrollLock = true;
 					}));
 				}
-			}
+			} else {
+				// done: render diff
+				fontInfoObs.read(r);
+				lineHeightObs.read(r);
 
-			try {
-				ignoreScrollEvent = true;
-				if (!this._scrollLock && !didReveal) {
-					const maxLineNumber = entry.maxLineNumber.read(r);
-					this._editor.revealLineNearTop(maxLineNumber, ScrollType.Smooth);
-				}
 				const diff = entry?.diffInfo.read(r);
 				this._updateWithDiff(entry, diff);
-				if (!entry.isCurrentlyBeingModified.read(r)) {
-					this.initNavigation();
-
-					if (!this._scrollLock && !didReveal) {
-						const currentPosition = this._currentChange.read(r);
-						if (currentPosition) {
-							this._editor.revealLine(currentPosition.lineNumber, ScrollType.Smooth);
-							didReveal = true;
-						} else {
-							didReveal = this.revealNext();
-						}
-					}
+
+				if (!didReval && !diff.identical) {
+					didReval = true;
+					this.revealNext();
 				}
-			} finally {
-				ignoreScrollEvent = false;
 			}
 		}));
 
+		// ---- readonly while streaming
+
 		const shouldBeReadOnly = derived(this, r => {
 			const value = this._chatEditingService.currentEditingSessionObs.read(r);
 			if (!value || value.state.read(r) !== ChatEditingSessionState.StreamingEdits) {
@@ -200,7 +204,10 @@ export class ChatEditorController extends Disposable implements IEditorContribut
 		this._diffVisualDecorations.clear();
 		this._diffLineDecorations.clear();
 		this._ctxHasEditorModification.reset();
-		this._currentChange.set(undefined, undefined);
+		transaction(tx => {
+			this._currentEntryIndex.set(undefined, tx);
+			this._currentChangeIndex.set(undefined, tx);
+		});
 		this._scrollLock = false;
 	}
 
@@ -423,10 +430,8 @@ export class ChatEditorController extends Disposable implements IEditorContribut
 
 	initNavigation(): void {
 		const position = this._editor.getPosition();
-		const range = position && this._diffLineDecorations.getRanges().find(r => r.containsPosition(position));
-		if (range) {
-			this._currentChange.set(position, undefined);
-		}
+		const target = position ? this._diffLineDecorations.getRanges().findIndex(r => r.containsPosition(position)) : -1;
+		this._currentChangeIndex.set(target >= 0 ? target : undefined, undefined);
 	}
 
 	revealNext(strict = false): boolean {
@@ -440,6 +445,7 @@ export class ChatEditorController extends Disposable implements IEditorContribut
 	private _reveal(next: boolean, strict: boolean): boolean {
 		const position = this._editor.getPosition();
 		if (!position) {
+			this._currentChangeIndex.set(undefined, undefined);
 			return false;
 		}
 
@@ -448,6 +454,7 @@ export class ChatEditorController extends Disposable implements IEditorContribut
 			.sort((a, b) => Range.compareRangesUsingStarts(a, b));
 
 		if (decorations.length === 0) {
+			this._currentChangeIndex.set(undefined, undefined);
 			return false;
 		}
 
@@ -464,18 +471,19 @@ export class ChatEditorController extends Disposable implements IEditorContribut
 		}
 
 		if (strict && (target < 0 || target >= decorations.length)) {
+			this._currentChangeIndex.set(undefined, undefined);
 			return false;
 		}
 
 		target = (target + decorations.length) % decorations.length;
 
-		const targetPosition = next ? decorations[target].getStartPosition() : decorations[target].getEndPosition();
-
-		this._currentChange.set(targetPosition, undefined);
+		this._currentChangeIndex.set(target, undefined);
 
+		const targetPosition = next ? decorations[target].getStartPosition() : decorations[target].getEndPosition();
 		this._editor.setPosition(targetPosition);
 		this._editor.revealPositionInCenter(targetPosition, ScrollType.Smooth);
 		this._editor.focus();
+
 		return true;
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditorOverlay.ts b/src/vs/workbench/contrib/chat/browser/chatEditorOverlay.ts
index 6a09f5ef275..bb94d4e0fc9 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditorOverlay.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditorOverlay.ts
@@ -203,25 +203,24 @@ class ChatEditorOverlayWidget implements IOverlayWidget {
 
 		this._showStore.add(autorun(r => {
 
-			const position = ChatEditorController.get(this._editor)?.currentChange.read(r);
+			const ctrl = ChatEditorController.get(this._editor);
+
+			const entryIndex = ctrl?.currentEntryIndex.read(r);
+			const changeIndex = ctrl?.currentChangeIndex.read(r);
+
 			const entries = session.entries.read(r);
 
+			let activeIdx = entryIndex !== undefined && changeIndex !== undefined
+				? changeIndex
+				: -1;
+
 			let changes = 0;
-			let activeIdx = -1;
-			for (const entry of entries) {
-				const diffInfo = entry.diffInfo.read(r);
-
-				if (activeIdx !== -1 || entry !== activeEntry) {
-					// just add up
-					changes += diffInfo.changes.length;
-
-				} else {
-					for (const change of diffInfo.changes) {
-						if (position && change.modified.includes(position.lineNumber)) {
-							activeIdx = changes;
-						}
-						changes += 1;
-					}
+			for (let i = 0; i < entries.length; i++) {
+				const diffInfo = entries[i].diffInfo.read(r);
+				changes += diffInfo.changes.length;
+
+				if (entryIndex !== undefined && i < entryIndex) {
+					activeIdx += diffInfo.changes.length;
 				}
 			}
 
diff --git a/src/vs/workbench/contrib/chat/browser/media/chatEditorOverlay.css b/src/vs/workbench/contrib/chat/browser/media/chatEditorOverlay.css
index 67dfaedc4b9..26ece80c64c 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chatEditorOverlay.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chatEditorOverlay.css
@@ -53,10 +53,10 @@
 	color: var(--vscode-button-foreground);
 }
 
-.chat-editor-overlay-widget .action-item.disabled > .action-label.codicon::before,
-.chat-editor-overlay-widget .action-item.disabled > .action-label.codicon,
-.chat-editor-overlay-widget .action-item.disabled > .action-label,
-.chat-editor-overlay-widget .action-item.disabled > .action-label:hover {
+.chat-editor-overlay-widget .monaco-action-bar .action-item.disabled > .action-label.codicon::before,
+.chat-editor-overlay-widget .monaco-action-bar .action-item.disabled > .action-label.codicon,
+.chat-editor-overlay-widget .monaco-action-bar .action-item.disabled > .action-label,
+.chat-editor-overlay-widget .monaco-action-bar .action-item.disabled > .action-label:hover {
 	color: var(--vscode-button-foreground);
 	opacity: 0.7;
 }
@@ -66,8 +66,8 @@
 	font-variant-numeric: tabular-nums;
 }
 
-.chat-editor-overlay-widget .action-item.label-item > .action-label,
-.chat-editor-overlay-widget .action-item.label-item > .action-label:hover {
+.chat-editor-overlay-widget .monaco-action-bar .action-item.label-item > .action-label,
+.chat-editor-overlay-widget .monaco-action-bar .action-item.label-item > .action-label:hover {
 	color: var(--vscode-button-foreground);
 	opacity: 1;
 }

From e7f022a392ed96a234ccca4106796e8a7b2c685a Mon Sep 17 00:00:00 2001
From: oltolm <oleg.tolmatcev@gmail.com>
Date: Fri, 13 Dec 2024 18:10:50 +0100
Subject: [PATCH 214/479] debug: ignore error when stopping a process (#236009)

ERR Invalid debug adapter: Error: Invalid debug adapter
---
 src/vs/workbench/api/browser/mainThreadDebugService.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/api/browser/mainThreadDebugService.ts b/src/vs/workbench/api/browser/mainThreadDebugService.ts
index cccdce7eb4c..69edcaa8ecd 100644
--- a/src/vs/workbench/api/browser/mainThreadDebugService.ts
+++ b/src/vs/workbench/api/browser/mainThreadDebugService.ts
@@ -397,7 +397,8 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
 	}
 
 	public $acceptDAExit(handle: number, code: number, signal: string) {
-		this.getDebugAdapter(handle).fireExit(handle, code, signal);
+		// don't use getDebugAdapter since an error can be expected on a post-close
+		this._debugAdapters.get(handle)?.fireExit(handle, code, signal);
 	}
 
 	private getDebugAdapter(handle: number): ExtensionHostDebugAdapter {

From b911e7c4f0160a46efba471d2f96cbd3ae1698fd Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Fri, 13 Dec 2024 18:14:42 +0100
Subject: [PATCH 215/479] icon themes: unify validation of font properties
 (#236081)

* allow emojiis in icon fonts

* icon themes: unify validation of font properties
---
 src/vs/platform/theme/common/iconRegistry.ts  | 18 +++++++++++---
 .../themes/browser/fileIconThemeData.ts       |  2 +-
 .../themes/browser/productIconThemeData.ts    |  5 ++--
 .../themes/common/fileIconThemeSchema.ts      | 24 ++++++++++---------
 .../themes/common/iconExtensionPoint.ts       | 10 ++++----
 .../themes/common/productIconThemeSchema.ts   | 18 ++++----------
 6 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/src/vs/platform/theme/common/iconRegistry.ts b/src/vs/platform/theme/common/iconRegistry.ts
index 5dee6ce44d6..775c1cf1d4a 100644
--- a/src/vs/platform/theme/common/iconRegistry.ts
+++ b/src/vs/platform/theme/common/iconRegistry.ts
@@ -145,6 +145,19 @@ export interface IIconRegistry {
 	getIconFont(id: string): IconFontDefinition | undefined;
 }
 
+// regexes for validation of font properties
+
+export const fontIdRegex = /^([\w_-]+)$/;
+export const fontStyleRegex = /^(normal|italic|(oblique[ \w\s-]+))$/;
+export const fontWeightRegex = /^(normal|bold|lighter|bolder|(\d{0-1000}))$/;
+export const fontSizeRegex = /^([\w_.%+-]+)$/;
+export const fontFormatRegex = /^woff|woff2|truetype|opentype|embedded-opentype|svg$/;
+export const fontCharacterRegex = /^([^\\]|\\[a-fA-F0-9]+)$/u;
+export const fontColorRegex = /^#[0-9a-fA-F]{0,6}$/;
+
+export const fontCharacterErrorMessage = localize('schema.fontCharacter.formatError', 'The fontCharacter must be a single letter or a backslash followed by unicode code points in hexadecimal.');
+export const fontIdErrorMessage = localize('schema.fontId.formatError', 'The font ID must only contain letters, numbers, underscores and dashes.');
+
 class IconRegistry implements IIconRegistry {
 
 	private readonly _onDidChange = new Emitter<void>();
@@ -156,8 +169,8 @@ class IconRegistry implements IIconRegistry {
 			icons: {
 				type: 'object',
 				properties: {
-					fontId: { type: 'string', description: localize('iconDefinition.fontId', 'The id of the font to use. If not set, the font that is defined first is used.') },
-					fontCharacter: { type: 'string', description: localize('iconDefinition.fontCharacter', 'The font character associated with the icon definition.') }
+					fontId: { type: 'string', description: localize('iconDefinition.fontId', 'The id of the font to use. If not set, the font that is defined first is used.'), pattern: fontIdRegex.source, patternErrorMessage: fontIdErrorMessage },
+					fontCharacter: { type: 'string', description: localize('iconDefinition.fontCharacter', 'The font character associated with the icon definition.'), pattern: fontCharacterRegex.source, patternErrorMessage: fontCharacterErrorMessage }
 				},
 				additionalProperties: false,
 				defaultSnippets: [{ body: { fontCharacter: '\\\\e030' } }]
@@ -318,7 +331,6 @@ iconRegistry.onDidChange(() => {
 	}
 });
 
-
 //setTimeout(_ => console.log(iconRegistry.toString()), 5000);
 
 
diff --git a/src/vs/workbench/services/themes/browser/fileIconThemeData.ts b/src/vs/workbench/services/themes/browser/fileIconThemeData.ts
index c60faca2144..e1d349be481 100644
--- a/src/vs/workbench/services/themes/browser/fileIconThemeData.ts
+++ b/src/vs/workbench/services/themes/browser/fileIconThemeData.ts
@@ -13,7 +13,7 @@ import { getParseErrorMessage } from '../../../../base/common/jsonErrorMessages.
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IExtensionResourceLoaderService } from '../../../../platform/extensionResourceLoader/common/extensionResourceLoader.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
-import { fontCharacterRegex, fontColorRegex, fontSizeRegex } from '../common/productIconThemeSchema.js';
+import { fontCharacterRegex, fontColorRegex, fontSizeRegex } from '../../../../platform/theme/common/iconRegistry.js';
 import * as css from '../../../../base/browser/cssValue.js';
 import { fileIconSelectorEscape } from '../../../../editor/common/services/getIconClasses.js';
 
diff --git a/src/vs/workbench/services/themes/browser/productIconThemeData.ts b/src/vs/workbench/services/themes/browser/productIconThemeData.ts
index 8961bfe3b2b..1e0a9fa295c 100644
--- a/src/vs/workbench/services/themes/browser/productIconThemeData.ts
+++ b/src/vs/workbench/services/themes/browser/productIconThemeData.ts
@@ -11,10 +11,9 @@ import * as Json from '../../../../base/common/json.js';
 import { ExtensionData, IThemeExtensionPoint, IWorkbenchProductIconTheme, ThemeSettingDefaults } from '../common/workbenchThemeService.js';
 import { getParseErrorMessage } from '../../../../base/common/jsonErrorMessages.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-import { fontIdRegex, fontWeightRegex, fontStyleRegex, fontFormatRegex, fontCharacterRegex } from '../common/productIconThemeSchema.js';
 import { isObject, isString } from '../../../../base/common/types.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
-import { IconDefinition, getIconRegistry, IconContribution, IconFontDefinition, IconFontSource } from '../../../../platform/theme/common/iconRegistry.js';
+import { IconDefinition, getIconRegistry, IconContribution, IconFontDefinition, IconFontSource, fontIdRegex, fontWeightRegex, fontStyleRegex, fontFormatRegex, fontCharacterRegex, fontCharacterErrorMessage } from '../../../../platform/theme/common/iconRegistry.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { IExtensionResourceLoaderService } from '../../../../platform/extensionResourceLoader/common/extensionResourceLoader.js';
 
@@ -256,7 +255,7 @@ function _loadProductIconThemeDocument(fileService: IExtensionResourceLoaderServ
 					warnings.push(nls.localize('error.icon.font', 'Skipping icon definition \'{0}\'. Unknown font.', iconId));
 				}
 			} else {
-				warnings.push(nls.localize('error.icon.fontCharacter', 'Skipping icon definition \'{0}\'. Unknown fontCharacter. Must use a sing; character or a \\ followed by a Unicode code points in hexadecimal.', iconId));
+				warnings.push(nls.localize('error.icon.fontCharacter', 'Skipping icon definition \'{0}\': {1}', iconId, fontCharacterErrorMessage));
 			}
 		}
 		return { iconDefinitions };
diff --git a/src/vs/workbench/services/themes/common/fileIconThemeSchema.ts b/src/vs/workbench/services/themes/common/fileIconThemeSchema.ts
index 685c3375f00..f51191117c5 100644
--- a/src/vs/workbench/services/themes/common/fileIconThemeSchema.ts
+++ b/src/vs/workbench/services/themes/common/fileIconThemeSchema.ts
@@ -7,7 +7,7 @@ import * as nls from '../../../../nls.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { Extensions as JSONExtensions, IJSONContributionRegistry } from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
 import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
-import { fontWeightRegex, fontStyleRegex, fontSizeRegex, fontIdRegex, fontCharacterRegex, fontColorRegex } from './productIconThemeSchema.js';
+import { fontWeightRegex, fontStyleRegex, fontSizeRegex, fontIdRegex, fontCharacterRegex, fontColorRegex, fontCharacterErrorMessage, fontIdErrorMessage } from '../../../../platform/theme/common/iconRegistry.js';
 
 const schemaId = 'vscode://schemas/icon-theme';
 const schema: IJSONSchema = {
@@ -148,8 +148,8 @@ const schema: IJSONSchema = {
 					id: {
 						type: 'string',
 						description: nls.localize('schema.id', 'The ID of the font.'),
-						pattern: fontIdRegex,
-						patternErrorMessage: nls.localize('schema.id.formatError', 'The ID must only contain letter, numbers, underscore and minus.')
+						pattern: fontIdRegex.source,
+						patternErrorMessage: fontIdErrorMessage
 					},
 					src: {
 						type: 'array',
@@ -176,17 +176,17 @@ const schema: IJSONSchema = {
 					weight: {
 						type: 'string',
 						description: nls.localize('schema.font-weight', 'The weight of the font. See https://developer.mozilla.org/en-US/docs/Web/CSS/font-weight for valid values.'),
-						pattern: fontWeightRegex
+						pattern: fontWeightRegex.source
 					},
 					style: {
 						type: 'string',
 						description: nls.localize('schema.font-style', 'The style of the font. See https://developer.mozilla.org/en-US/docs/Web/CSS/font-style for valid values.'),
-						pattern: fontStyleRegex
+						pattern: fontStyleRegex.source
 					},
 					size: {
 						type: 'string',
 						description: nls.localize('schema.font-size', 'The default size of the font. We strongly recommend using a percentage value, for example: 125%.'),
-						pattern: fontSizeRegex
+						pattern: fontSizeRegex.source
 					}
 				},
 				required: [
@@ -209,23 +209,25 @@ const schema: IJSONSchema = {
 					fontCharacter: {
 						type: 'string',
 						description: nls.localize('schema.fontCharacter', 'When using a glyph font: The character in the font to use.'),
-						pattern: fontCharacterRegex,
-						patternErrorMessage: nls.localize('schema.fontCharacter.formatError', 'The fontCharacter must be a single letter or a backslash and followed by unicode code points in hexadecimal.')
+						pattern: fontCharacterRegex.source,
+						patternErrorMessage: fontCharacterErrorMessage
 					},
 					fontColor: {
 						type: 'string',
 						format: 'color-hex',
 						description: nls.localize('schema.fontColor', 'When using a glyph font: The color to use.'),
-						pattern: fontColorRegex
+						pattern: fontColorRegex.source
 					},
 					fontSize: {
 						type: 'string',
 						description: nls.localize('schema.fontSize', 'When using a font: The font size in percentage to the text font. If not set, defaults to the size in the font definition.'),
-						pattern: fontSizeRegex
+						pattern: fontSizeRegex.source
 					},
 					fontId: {
 						type: 'string',
-						description: nls.localize('schema.fontId', 'When using a font: The id of the font. If not set, defaults to the first font definition.')
+						description: nls.localize('schema.fontId', 'When using a font: The id of the font. If not set, defaults to the first font definition.'),
+						pattern: fontIdRegex.source,
+						patternErrorMessage: fontIdErrorMessage
 					}
 				}
 			}
diff --git a/src/vs/workbench/services/themes/common/iconExtensionPoint.ts b/src/vs/workbench/services/themes/common/iconExtensionPoint.ts
index 0a58dbcdbbf..9b554226c3f 100644
--- a/src/vs/workbench/services/themes/common/iconExtensionPoint.ts
+++ b/src/vs/workbench/services/themes/common/iconExtensionPoint.ts
@@ -5,13 +5,12 @@
 
 import * as nls from '../../../../nls.js';
 import { ExtensionsRegistry } from '../../extensions/common/extensionsRegistry.js';
-import { IIconRegistry, Extensions as IconRegistryExtensions } from '../../../../platform/theme/common/iconRegistry.js';
+import { IIconRegistry, Extensions as IconRegistryExtensions, fontCharacterErrorMessage, fontCharacterRegex } from '../../../../platform/theme/common/iconRegistry.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import * as resources from '../../../../base/common/resources.js';
 import { IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
 import { extname, posix } from '../../../../base/common/path.js';
-import { fontCharacterRegex } from './productIconThemeSchema.js';
 
 interface IIconExtensionPoint {
 	[id: string]: {
@@ -55,8 +54,8 @@ const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint<IIco
 								fontCharacter: {
 									description: nls.localize('contributes.icon.default.fontCharacter', 'The character for the icon in the icon font.'),
 									type: 'string',
-									pattern: fontCharacterRegex,
-									patternErrorMessage: nls.localize('schema.fontCharacter.formatError', 'The fontCharacter must be a single letter or a backslash followed by unicode code points in hexadecimal.')
+									pattern: fontCharacterRegex.source,
+									patternErrorMessage: fontCharacterErrorMessage
 								}
 							},
 							required: ['fontPath', 'fontCharacter'],
@@ -107,7 +106,8 @@ export class IconExtensionPoint {
 							return;
 						}
 						if (!defaultIcon.fontCharacter.match(fontCharacterRegex)) {
-							collector.warn(nls.localize('invalid.icons.default.fontCharacter', 'Expected `contributes.icons.default.fontCharacter` to consist of a single character or a \\ followed by a Unicode code points in hexadecimal.')); return;
+							collector.warn(nls.localize('invalid.icons.default.fontCharacter', 'Invalid `contributes.icons.default.fontCharacter`: {0}', fontCharacterErrorMessage));
+							return;
 						}
 						const extensionLocation = extension.description.extensionLocation;
 						const iconFontLocation = resources.joinPath(extensionLocation, defaultIcon.fontPath);
diff --git a/src/vs/workbench/services/themes/common/productIconThemeSchema.ts b/src/vs/workbench/services/themes/common/productIconThemeSchema.ts
index 766a8f546e5..997ac2180d3 100644
--- a/src/vs/workbench/services/themes/common/productIconThemeSchema.ts
+++ b/src/vs/workbench/services/themes/common/productIconThemeSchema.ts
@@ -7,15 +7,7 @@ import * as nls from '../../../../nls.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { Extensions as JSONExtensions, IJSONContributionRegistry } from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
 import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
-import { iconsSchemaId } from '../../../../platform/theme/common/iconRegistry.js';
-
-export const fontIdRegex = '^([\\w_-]+)$';
-export const fontStyleRegex = '^(normal|italic|(oblique[ \\w\\s-]+))$';
-export const fontWeightRegex = '^(normal|bold|lighter|bolder|(\\d{0-1000}))$';
-export const fontSizeRegex = '^([\\w_.%+-]+)$';
-export const fontFormatRegex = '^woff|woff2|truetype|opentype|embedded-opentype|svg$';
-export const fontCharacterRegex = '^([^\\\\]|\\\\[a-fA-F0-9]+)$';
-export const fontColorRegex = '^#[0-9a-fA-F]{0,6}$';
+import { fontIdErrorMessage, fontIdRegex, fontStyleRegex, fontWeightRegex, iconsSchemaId } from '../../../../platform/theme/common/iconRegistry.js';
 
 const schemaId = 'vscode://schemas/product-icon-theme';
 const schema: IJSONSchema = {
@@ -31,8 +23,8 @@ const schema: IJSONSchema = {
 					id: {
 						type: 'string',
 						description: nls.localize('schema.id', 'The ID of the font.'),
-						pattern: fontIdRegex,
-						patternErrorMessage: nls.localize('schema.id.formatError', 'The ID must only contain letters, numbers, underscore and minus.')
+						pattern: fontIdRegex.source,
+						patternErrorMessage: fontIdErrorMessage
 					},
 					src: {
 						type: 'array',
@@ -61,7 +53,7 @@ const schema: IJSONSchema = {
 						description: nls.localize('schema.font-weight', 'The weight of the font. See https://developer.mozilla.org/en-US/docs/Web/CSS/font-weight for valid values.'),
 						anyOf: [
 							{ enum: ['normal', 'bold', 'lighter', 'bolder'] },
-							{ type: 'string', pattern: fontWeightRegex }
+							{ type: 'string', pattern: fontWeightRegex.source }
 						]
 					},
 					style: {
@@ -69,7 +61,7 @@ const schema: IJSONSchema = {
 						description: nls.localize('schema.font-style', 'The style of the font. See https://developer.mozilla.org/en-US/docs/Web/CSS/font-style for valid values.'),
 						anyOf: [
 							{ enum: ['normal', 'italic', 'oblique'] },
-							{ type: 'string', pattern: fontStyleRegex }
+							{ type: 'string', pattern: fontStyleRegex.source }
 						]
 					}
 				},

From db6263637a931625e4b1506270181381fd774089 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Fri, 13 Dec 2024 11:17:26 -0600
Subject: [PATCH 216/479] respond to config change for terminal suggestions
 (#235999)

* fix #235071

* tweak

* fixes #235996

* tweak
---
 .../browser/terminal.suggest.contribution.ts   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts
index aac182d3ebb..82b9dc7d514 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts
@@ -61,6 +61,24 @@ class TerminalSuggestContribution extends DisposableStore implements ITerminalCo
 			this._pwshAddon?.dispose();
 		}));
 		this._terminalSuggestWidgetVisibleContextKey = TerminalContextKeys.suggestWidgetVisible.bindTo(this._contextKeyService);
+		this.add(this._configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(TerminalSuggestSettingId.EnableExtensionCompletions) || e.affectsConfiguration(TerminalSuggestSettingId.Enabled)) {
+				const extensionCompletionsEnabled = this._configurationService.getValue<ITerminalSuggestConfiguration>(terminalSuggestConfigSection).enableExtensionCompletions;
+				const completionsEnabled = this._configurationService.getValue<ITerminalSuggestConfiguration>(terminalSuggestConfigSection).enabled;
+				if (!extensionCompletionsEnabled || !completionsEnabled) {
+					this._addon.clear();
+				}
+				if (!completionsEnabled) {
+					this._pwshAddon.clear();
+				}
+				const xtermRaw = this._ctx.instance.xterm?.raw;
+				if (!!xtermRaw && extensionCompletionsEnabled || completionsEnabled) {
+					if (xtermRaw) {
+						this._loadAddons(xtermRaw);
+					}
+				}
+			}
+		}));
 	}
 
 	xtermOpen(xterm: IXtermTerminal & { raw: RawXtermTerminal }): void {

From 9547abafe7c0da3f0b658ada51ea7967f368e221 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Fri, 13 Dec 2024 18:29:22 +0100
Subject: [PATCH 217/479] Rerender sticky scroll on folding settings change
 (#236083)

adding code to rerender sticky scroll on folding settings change
---
 .../contrib/stickyScroll/browser/stickyScrollController.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
index 01d61e7d614..f4ef1a671a9 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
@@ -468,7 +468,7 @@ export class StickyScrollController extends Disposable implements IEditorContrib
 			this._readConfiguration();
 		}
 
-		if (event.hasChanged(EditorOption.lineNumbers)) {
+		if (event.hasChanged(EditorOption.lineNumbers) || event.hasChanged(EditorOption.folding) || event.hasChanged(EditorOption.showFoldingControls)) {
 			this._renderStickyScroll(0);
 		}
 	}

From 8abb9e03d6c150b5490f4a55588be4930fdb5ab6 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Fri, 13 Dec 2024 18:49:57 +0100
Subject: [PATCH 218/479] Adding back border for glyph hover widget (#236088)

adding back border for glyph hover widget
---
 src/vs/editor/contrib/hover/browser/hover.css | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/vs/editor/contrib/hover/browser/hover.css b/src/vs/editor/contrib/hover/browser/hover.css
index b9da587c918..1314484424b 100644
--- a/src/vs/editor/contrib/hover/browser/hover.css
+++ b/src/vs/editor/contrib/hover/browser/hover.css
@@ -13,7 +13,14 @@
 	box-sizing: content-box;
 }
 
+.monaco-editor .monaco-resizable-hover > .monaco-hover {
+	border: none;
+	border-radius: none;
+}
+
 .monaco-editor .monaco-hover {
+	border: 1px solid var(--vscode-editorHoverWidget-border);
+	border-radius: 3px;
 	color: var(--vscode-editorHoverWidget-foreground);
 	background-color: var(--vscode-editorHoverWidget-background);
 }
@@ -31,7 +38,7 @@
 }
 
 .monaco-editor .monaco-hover .hover-row .hover-row-contents {
-	min-width:0;
+	min-width: 0;
 	display: flex;
 	flex-direction: column;
 }
@@ -65,5 +72,3 @@
 .monaco-editor .monaco-hover code {
 	background-color: var(--vscode-textCodeBlock-background);
 }
-
-

From bd786750d9f1750cdeea7902a222d7ec9e347279 Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Fri, 13 Dec 2024 18:53:24 +0100
Subject: [PATCH 219/479] Add `useMixedLinesDiff: forStableInsertions`
 (#236090)

---
 src/vs/editor/common/config/editorOptions.ts  |  8 +-
 .../browser/model/inlineCompletionsModel.ts   | 10 +--
 .../view/inlineEdits/inlineDiffView.ts        |  6 +-
 .../browser/view/inlineEdits/view.ts          | 78 +++++++++++++++----
 .../view/inlineEdits/viewAndDiffProducer.ts   |  6 +-
 src/vs/monaco.d.ts                            |  2 +-
 6 files changed, 79 insertions(+), 31 deletions(-)

diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index 8bd08d2ee1a..0c255963581 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -4195,7 +4195,7 @@ export interface IInlineSuggestOptions {
 	edits?: {
 		experimental?: {
 			enabled?: boolean;
-			useMixedLinesDiff?: 'never' | 'whenPossible' | 'afterJumpWhenPossible';
+			useMixedLinesDiff?: 'never' | 'whenPossible' | 'forStableInsertions' | 'afterJumpWhenPossible';
 			useInterleavedLinesDiff?: 'never' | 'always' | 'afterJump';
 			onlyShowWhenCloseToCursor?: boolean;
 		};
@@ -4227,7 +4227,7 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 			edits: {
 				experimental: {
 					enabled: true,
-					useMixedLinesDiff: 'never',
+					useMixedLinesDiff: 'forStableInsertions',
 					useInterleavedLinesDiff: 'never',
 					onlyShowWhenCloseToCursor: true,
 				},
@@ -4277,7 +4277,7 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 					type: 'string',
 					default: defaults.edits.experimental.useMixedLinesDiff,
 					description: nls.localize('inlineSuggest.edits.experimental.useMixedLinesDiff', "Controls whether to enable experimental edits in inline suggestions."),
-					enum: ['never', 'whenPossible'],
+					enum: ['never', 'whenPossible', 'forStableInsertions', 'afterJumpWhenPossible'],
 				},
 				'editor.inlineSuggest.edits.experimental.useInterleavedLinesDiff': {
 					type: 'string',
@@ -4310,7 +4310,7 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 			edits: {
 				experimental: {
 					enabled: boolean(input.edits?.experimental?.enabled, this.defaultValue.edits.experimental.enabled),
-					useMixedLinesDiff: stringSet(input.edits?.experimental?.useMixedLinesDiff, this.defaultValue.edits.experimental.useMixedLinesDiff, ['never', 'whenPossible', 'afterJumpWhenPossible']),
+					useMixedLinesDiff: stringSet(input.edits?.experimental?.useMixedLinesDiff, this.defaultValue.edits.experimental.useMixedLinesDiff, ['never', 'whenPossible', 'forStableInsertions', 'afterJumpWhenPossible']),
 					useInterleavedLinesDiff: stringSet(input.edits?.experimental?.useInterleavedLinesDiff, this.defaultValue.edits.experimental.useInterleavedLinesDiff, ['never', 'always', 'afterJump']),
 					onlyShowWhenCloseToCursor: boolean(input.edits?.experimental?.onlyShowWhenCloseToCursor, this.defaultValue.edits.experimental.onlyShowWhenCloseToCursor),
 				},
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
index f40e12bdf88..3f9e7c85161 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
@@ -47,7 +47,7 @@ export class InlineCompletionsModel extends Disposable {
 
 	// 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>(this, undefined);
-	private readonly _primaryPosition = derived(this, reader => this._positions.read(reader)[0] ?? new Position(1, 1));
+	public readonly primaryPosition = derived(this, reader => this._positions.read(reader)[0] ?? new Position(1, 1));
 
 	private _isAcceptingPartially = false;
 	public get isAcceptingPartially() { return this._isAcceptingPartially; }
@@ -194,7 +194,7 @@ export class InlineCompletionsModel extends Disposable {
 			});
 		}
 
-		const cursorPosition = this._primaryPosition.get();
+		const cursorPosition = this.primaryPosition.get();
 		if (changeSummary.dontRefetch) {
 			return Promise.resolve(true);
 		}
@@ -257,7 +257,7 @@ export class InlineCompletionsModel extends Disposable {
 	private readonly _inlineCompletionItems = derivedOpts({ owner: this }, reader => {
 		const c = this._source.inlineCompletions.read(reader);
 		if (!c) { return undefined; }
-		const cursorPosition = this._primaryPosition.read(reader);
+		const cursorPosition = this.primaryPosition.read(reader);
 		let inlineEdit: InlineCompletionWithUpdatedRange | undefined = undefined;
 		const visibleCompletions: InlineCompletionWithUpdatedRange[] = [];
 		for (const completion of c.inlineCompletions) {
@@ -355,10 +355,10 @@ export class InlineCompletionsModel extends Disposable {
 			let edit = item.inlineEdit.toSingleTextEdit(reader);
 			edit = singleTextRemoveCommonPrefix(edit, model);
 
-			const cursorPos = this._primaryPosition.read(reader);
+			const cursorPos = this.primaryPosition.read(reader);
 			const cursorAtInlineEdit = LineRange.fromRangeInclusive(edit.range).addMargin(1, 1).contains(cursorPos.lineNumber);
 
-			const cursorDist = LineRange.fromRange(edit.range).distanceToLine(this._primaryPosition.read(reader).lineNumber);
+			const cursorDist = LineRange.fromRange(edit.range).distanceToLine(this.primaryPosition.read(reader).lineNumber);
 
 			if (this._onlyShowWhenCloseToCursor.read(reader) && cursorDist > 3 && !item.inlineEdit.request.isExplicitRequest && !this._inAcceptFlow.read(reader)) {
 				return undefined;
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineDiffView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineDiffView.ts
index faddbf04b09..38343311a3e 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineDiffView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineDiffView.ts
@@ -23,7 +23,7 @@ import { classNames } from './utils.js';
 export interface IOriginalEditorInlineDiffViewState {
 	diff: DetailedLineRangeMapping[];
 	modifiedText: AbstractText;
-	mode: 'mixedLines' | 'interleavedLines' | 'sideBySide';
+	mode: 'mixedLines' | 'ghostText' | 'interleavedLines' | 'sideBySide';
 
 	modifiedCodeEditor: ICodeEditor;
 }
@@ -111,7 +111,7 @@ export class OriginalEditorInlineDiffView extends Disposable {
 		if (!diff) { return undefined; }
 
 		const modified = diff.modifiedText;
-		const showInline = diff.mode === 'mixedLines';
+		const showInline = diff.mode === 'mixedLines' || diff.mode === 'ghostText';
 
 		const showEmptyDecorations = true;
 
@@ -214,7 +214,7 @@ export class OriginalEditorInlineDiffView extends Disposable {
 								description: 'inserted-text',
 								before: {
 									content: insertedText,
-									inlineClassName: 'inlineCompletions-char-insert',
+									inlineClassName: diff.mode === 'ghostText' ? 'ghost-text-decoration' : 'inlineCompletions-char-insert',
 								},
 								zIndex: 2,
 								showIfCollapsed: true,
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.ts
index 391cf7516b7..945c91b9e13 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.ts
@@ -4,22 +4,23 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { derived, IObservable } from '../../../../../../base/common/observable.js';
+import { derived, IObservable, IReader } from '../../../../../../base/common/observable.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { ICodeEditor } from '../../../../../browser/editorBrowser.js';
 import { observableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
 import { EditorOption } from '../../../../../common/config/editorOptions.js';
 import { LineRange } from '../../../../../common/core/lineRange.js';
+import { Position } from '../../../../../common/core/position.js';
 import { StringText } from '../../../../../common/core/textEdit.js';
 import { DetailedLineRangeMapping, lineRangeMappingFromRangeMappings, RangeMapping } from '../../../../../common/diff/rangeMapping.js';
 import { TextModel } from '../../../../../common/model/textModel.js';
-import './view.css';
+import { InlineCompletionsModel } from '../../model/inlineCompletionsModel.js';
+import { IInlineEditsIndicatorState, InlineEditsIndicator } from './indicatorView.js';
 import { IOriginalEditorInlineDiffViewState, OriginalEditorInlineDiffView } from './inlineDiffView.js';
+import { InlineEditsSideBySideDiff } from './sideBySideDiff.js';
 import { applyEditToModifiedRangeMappings, createReindentEdit } from './utils.js';
-import { IInlineEditsIndicatorState, InlineEditsIndicator } from './indicatorView.js';
-import { InlineCompletionsModel } from '../../model/inlineCompletionsModel.js';
+import './view.css';
 import { InlineEditWithChanges } from './viewAndDiffProducer.js';
-import { InlineEditsSideBySideDiff } from './sideBySideDiff.js';
 
 export class InlineEditsView extends Disposable {
 	private readonly _editorObs = observableCodeEditor(this._editor);
@@ -37,7 +38,7 @@ export class InlineEditsView extends Disposable {
 	}
 
 	private readonly _uiState = derived<{
-		state: 'collapsed' | 'mixedLines' | 'interleavedLines' | 'sideBySide';
+		state: 'collapsed' | 'mixedLines' | 'ghostText' | 'interleavedLines' | 'sideBySide';
 		diff: DetailedLineRangeMapping[];
 		edit: InlineEditWithChanges;
 		newText: string;
@@ -55,17 +56,7 @@ export class InlineEditsView extends Disposable {
 		let newText = edit.edit.apply(edit.originalText);
 		let diff = lineRangeMappingFromRangeMappings(mappings, edit.originalText, new StringText(newText));
 
-		let state: 'collapsed' | 'mixedLines' | 'interleavedLines' | 'sideBySide';
-		if (edit.isCollapsed) {
-			state = 'collapsed';
-		} else if (diff.every(m => OriginalEditorInlineDiffView.supportsInlineDiffRendering(m)) &&
-			(this._useMixedLinesDiff.read(reader) === 'whenPossible' || (edit.userJumpedToIt && this._useMixedLinesDiff.read(reader) === 'afterJumpWhenPossible'))) {
-			state = 'mixedLines';
-		} else if ((this._useInterleavedLinesDiff.read(reader) === 'always' || (edit.userJumpedToIt && this._useInterleavedLinesDiff.read(reader) === 'afterJump'))) {
-			state = 'interleavedLines';
-		} else {
-			state = 'sideBySide';
-		}
+		const state = this.determinRenderState(edit, reader, diff);
 
 		if (state === 'sideBySide') {
 			const indentationAdjustmentEdit = createReindentEdit(newText, edit.modifiedLineRange);
@@ -140,4 +131,57 @@ export class InlineEditsView extends Disposable {
 		}),
 		this._model,
 	));
+
+	private determinRenderState(edit: InlineEditWithChanges, reader: IReader, diff: DetailedLineRangeMapping[]) {
+		if (edit.isCollapsed) {
+			return 'collapsed';
+		}
+
+		if (
+			(this._useMixedLinesDiff.read(reader) === 'whenPossible' || (edit.userJumpedToIt && this._useMixedLinesDiff.read(reader) === 'afterJumpWhenPossible'))
+			&& diff.every(m => OriginalEditorInlineDiffView.supportsInlineDiffRendering(m))
+		) {
+			return 'mixedLines';
+		}
+
+		if (
+			this._useMixedLinesDiff.read(reader) === 'forStableInsertions'
+			&& isInsertionAfterPosition(diff, edit.cursorPosition)
+		) {
+			return 'ghostText';
+		}
+
+		if (this._useInterleavedLinesDiff.read(reader) === 'always' || (edit.userJumpedToIt && this._useInterleavedLinesDiff.read(reader) === 'afterJump')) {
+			return 'interleavedLines';
+		}
+
+		return 'sideBySide';
+	}
+}
+
+function isInsertionAfterPosition(diff: DetailedLineRangeMapping[], position: Position | null) {
+	if (!position) {
+		return false;
+	}
+	const pos = position;
+
+	return diff.every(m => m.innerChanges!.every(r => isStableWordInsertion(r)));
+
+	function isStableWordInsertion(r: RangeMapping) {
+		if (!r.originalRange.isEmpty()) {
+			return false;
+		}
+		const isInsertionWithinLine = r.modifiedRange.startLineNumber === r.modifiedRange.endLineNumber;
+		if (!isInsertionWithinLine) {
+			return false;
+		}
+		const insertPosition = r.originalRange.getStartPosition();
+		if (pos.isBeforeOrEqual(insertPosition)) {
+			return true;
+		}
+		if (insertPosition.lineNumber < pos.lineNumber) {
+			return true;
+		}
+		return false;
+	}
 }
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/viewAndDiffProducer.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/viewAndDiffProducer.ts
index 3f31d826857..ed40c6c0edb 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/viewAndDiffProducer.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/viewAndDiffProducer.ts
@@ -53,6 +53,8 @@ export class InlineEditsViewAndDiffProducer extends Disposable {
 	});
 
 	private readonly _inlineEditPromise = derived<IObservable<InlineEditWithChanges | undefined> | undefined>(this, (reader) => {
+		const model = this._model.read(reader);
+		if (!model) { return undefined; }
 		const inlineEdit = this._edit.read(reader);
 		if (!inlineEdit) { return undefined; }
 
@@ -86,7 +88,7 @@ export class InlineEditsViewAndDiffProducer extends Disposable {
 			));
 			const diffEdits = new TextEdit(edits);
 
-			return new InlineEditWithChanges(text, diffEdits, inlineEdit.isCollapsed, inlineEdit.renderExplicitly, inlineEdit.commands, inlineEdit.inlineCompletion); //inlineEdit.showInlineIfPossible);
+			return new InlineEditWithChanges(text, diffEdits, inlineEdit.isCollapsed, model.primaryPosition.get(), inlineEdit.renderExplicitly, inlineEdit.commands, inlineEdit.inlineCompletion); //inlineEdit.showInlineIfPossible);
 		});
 	});
 
@@ -116,6 +118,7 @@ export class InlineEditWithChanges {
 		public readonly originalText: AbstractText,
 		public readonly edit: TextEdit,
 		public readonly isCollapsed: boolean,
+		public readonly cursorPosition: Position,
 		public readonly userJumpedToIt: boolean,
 		public readonly commands: readonly Command[],
 		public readonly inlineCompletion: InlineCompletionItem,
@@ -126,6 +129,7 @@ export class InlineEditWithChanges {
 		return this.originalText.getValue() === other.originalText.getValue() &&
 			this.edit.equals(other.edit) &&
 			this.isCollapsed === other.isCollapsed &&
+			this.cursorPosition.equals(other.cursorPosition) &&
 			this.userJumpedToIt === other.userJumpedToIt &&
 			this.commands === other.commands &&
 			this.inlineCompletion === other.inlineCompletion;
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index eba21bfb561..77cd7ae49a5 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -4602,7 +4602,7 @@ declare namespace monaco.editor {
 		edits?: {
 			experimental?: {
 				enabled?: boolean;
-				useMixedLinesDiff?: 'never' | 'whenPossible' | 'afterJumpWhenPossible';
+				useMixedLinesDiff?: 'never' | 'whenPossible' | 'forStableInsertions' | 'afterJumpWhenPossible';
 				useInterleavedLinesDiff?: 'never' | 'always' | 'afterJump';
 				onlyShowWhenCloseToCursor?: boolean;
 			};

From afd7c3ccb38f580dced00040f65b6eae719c7908 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Fri, 13 Dec 2024 19:45:19 +0100
Subject: [PATCH 220/479] fixing incorrect hover size after resize of other
 hover (#236078)

* fixing incorrect sizing after resize

* replacing line
---
 src/vs/editor/contrib/hover/browser/contentHoverWidget.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts b/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts
index ffb8aaa9f11..fdfc464bc04 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverWidget.ts
@@ -138,6 +138,7 @@ export class ContentHoverWidget extends ResizableContentWidget {
 
 	private _setHoverWidgetMaxDimensions(width: number | string, height: number | string): void {
 		ContentHoverWidget._applyMaxDimensions(this._hover.contentsDomNode, width, height);
+		ContentHoverWidget._applyMaxDimensions(this._hover.scrollbar.getDomNode(), width, height);
 		ContentHoverWidget._applyMaxDimensions(this._hover.containerDomNode, width, height);
 		this._hover.containerDomNode.style.setProperty('--vscode-hover-maxWidth', typeof width === 'number' ? `${width}px` : width);
 		this._layoutContentWidget();
@@ -145,9 +146,7 @@ export class ContentHoverWidget extends ResizableContentWidget {
 
 	private _setAdjustedHoverWidgetDimensions(size: dom.Dimension): void {
 		this._setHoverWidgetMaxDimensions('none', 'none');
-		const width = size.width;
-		const height = size.height;
-		this._setHoverWidgetDimensions(width, height);
+		this._setHoverWidgetDimensions(size.width, size.height);
 	}
 
 	private _updateResizableNodeMaxDimensions(): void {
@@ -297,6 +296,7 @@ export class ContentHoverWidget extends ResizableContentWidget {
 	private _updateMaxDimensions() {
 		const height = Math.max(this._editor.getLayoutInfo().height / 4, 250, ContentHoverWidget._lastDimensions.height);
 		const width = Math.max(this._editor.getLayoutInfo().width * 0.66, 750, ContentHoverWidget._lastDimensions.width);
+		this._resizableNode.maxSize = new dom.Dimension(width, height);
 		this._setHoverWidgetMaxDimensions(width, height);
 	}
 
@@ -304,7 +304,6 @@ export class ContentHoverWidget extends ResizableContentWidget {
 		this._setRenderedHover(renderedHover);
 		this._updateFont();
 		this._updateContent(renderedHover.domNode);
-		this._updateMaxDimensions();
 		this.onContentsChanged();
 		// Simply force a synchronous render on the editor
 		// such that the widget does not really render with left = '0px'
@@ -371,6 +370,7 @@ export class ContentHoverWidget extends ResizableContentWidget {
 		const layoutInfo = this._editor.getLayoutInfo();
 		this._resizableNode.layout(layoutInfo.height, layoutInfo.width);
 		this._setHoverWidgetDimensions('auto', 'auto');
+		this._updateMaxDimensions();
 	}
 
 	public setMinimumDimensions(dimensions: dom.Dimension): void {

From afd3f0abf02675155a01770b7f45fcf3bb9202d6 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Fri, 13 Dec 2024 14:19:39 -0600
Subject: [PATCH 221/479] Check whether commands are executable before
 including them in terminal suggestions (#235997)

---
 .../src/terminalSuggestMain.ts                | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index 04af5ff5da9..c7cdf75406e 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -168,6 +168,24 @@ function createCompletionItem(commandLine: string, cursorPosition: number, prefi
 	};
 }
 
+async function isExecutable(filePath: string): Promise<boolean> {
+	// Windows doesn't have the concept of an executable bit and running any
+	// file is possible. We considered using $PATHEXT here but since it's mostly
+	// there for legacy reasons and it would be easier and more intuitive to add
+	// a setting if needed instead.
+	if (osIsWindows()) {
+		return true;
+	}
+	try {
+		const stats = await fs.stat(filePath);
+		// On macOS/Linux, check if the executable bit is set
+		return (stats.mode & 0o100) !== 0;
+	} catch (error) {
+		// If the file does not exist or cannot be accessed, it's not executable
+		return false;
+	}
+}
+
 async function getCommandsInPath(): Promise<Set<string> | undefined> {
 	if (cachedAvailableCommands) {
 		return cachedAvailableCommands;
@@ -176,7 +194,7 @@ async function getCommandsInPath(): Promise<Set<string> | undefined> {
 	if (!paths) {
 		return;
 	}
-
+	const pathSeparator = osIsWindows() ? '\\' : '/';
 	const executables = new Set<string>();
 	for (const path of paths) {
 		try {
@@ -187,7 +205,7 @@ async function getCommandsInPath(): Promise<Set<string> | undefined> {
 			const files = await vscode.workspace.fs.readDirectory(vscode.Uri.file(path));
 
 			for (const [file, fileType] of files) {
-				if (fileType !== vscode.FileType.Unknown && fileType !== vscode.FileType.Directory) {
+				if (fileType !== vscode.FileType.Unknown && fileType !== vscode.FileType.Directory && await isExecutable(path + pathSeparator + file)) {
 					executables.add(file);
 				}
 			}

From c1189b5a8e38e66a154eb07e28957c8beff587d0 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Fri, 13 Dec 2024 14:45:20 -0600
Subject: [PATCH 222/479] add aria label for disable/enable current file
 context button (#236077)

fix #236076
---
 .../chat/browser/attachments/implicitContextAttachment.ts        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/contrib/chat/browser/attachments/implicitContextAttachment.ts b/src/vs/workbench/contrib/chat/browser/attachments/implicitContextAttachment.ts
index 73ab2960823..dfff8cee32b 100644
--- a/src/vs/workbench/contrib/chat/browser/attachments/implicitContextAttachment.ts
+++ b/src/vs/workbench/contrib/chat/browser/attachments/implicitContextAttachment.ts
@@ -79,6 +79,7 @@ export class ImplicitContextAttachmentWidget extends Disposable {
 		this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), hintElement, title));
 
 		const buttonMsg = this.attachment.enabled ? localize('disable', "Disable current file context") : localize('enable', "Enable current file context");
+		this.domNode.ariaLabel = buttonMsg;
 		const toggleButton = this.renderDisposables.add(new Button(this.domNode, { supportIcons: true, title: buttonMsg }));
 		toggleButton.icon = this.attachment.enabled ? Codicon.eye : Codicon.eyeClosed;
 		this.renderDisposables.add(toggleButton.onDidClick((e) => {

From 899afc031137585826b56aa200aca155a785a319 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Fri, 13 Dec 2024 22:01:05 +0100
Subject: [PATCH 223/479] Git - ignore changes reported to the submodule folder
 (#205125) (#236098)

---
 extensions/git/src/repository.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 73a54cef4af..2465bd80bc4 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -2385,7 +2385,16 @@ export class Repository implements Disposable {
 			}
 
 			switch (raw.y) {
-				case 'M': workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.MODIFIED, useIcons, renameUri)); break;
+				case 'M': {
+					// https://git-scm.com/docs/git-status#_porcelain_format_version_1
+					// When using `-z` with the porcelain v1 format any submodule changes
+					// are reported as modified M instead of m or single ?. Due to that we
+					// will ignore any changes reported for the submodule folder.
+					if (this.submodules.every(s => !pathEquals(s.path, raw.path))) {
+						workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.MODIFIED, useIcons, renameUri));
+					}
+					break;
+				}
 				case 'D': workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.DELETED, useIcons, renameUri)); break;
 				case 'A': workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.INTENT_TO_ADD, useIcons, renameUri)); break;
 				case 'R': workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.INTENT_TO_RENAME, useIcons, renameUri)); break;

From f7cbfef520f09f4c36c9f510a4f9c67e3f2c0cc9 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Fri, 13 Dec 2024 13:26:02 -0800
Subject: [PATCH 224/479] extensions: warn folks not to change the debug worker
 name :P (#236104)

Refs #232544
---
 .../extensions/worker/webWorkerExtensionHostIframe.html       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html b/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
index 88407e89f16..372f26d51e9 100644
--- a/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
+++ b/src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html
@@ -4,7 +4,7 @@
 		<meta http-equiv="Content-Security-Policy" content="
 			default-src 'none';
 			child-src 'self' data: blob:;
-			script-src 'self' 'unsafe-eval' 'sha256-xM2KVDKIoeb8vVxk4ezEUsxdTZh5wFnKO3YmFhy9tkk=' https: http://localhost:* blob:;
+			script-src 'self' 'unsafe-eval' 'sha256-cl8ijlOzEe+0GRCQNJQu2k6nUQ0fAYNYIuuKEm72JDs=' https: http://localhost:* blob:;
 			connect-src 'self' https: wss: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:*;"/>
 	</head>
 	<body>
@@ -12,6 +12,8 @@
 (function () {
 	const searchParams = new URL(document.location.href).searchParams;
 	const vscodeWebWorkerExtHostId = searchParams.get('vscodeWebWorkerExtHostId') || '';
+	// DO NOT CHANGE the name of the worker without also updating js-debug, as that
+	// is used to filter targets to attach to (e.g. #232544)
 	const name = searchParams.get('debugged') ? 'DebugExtensionHostWorker' : 'ExtensionHostWorker';
 	const parentOrigin = searchParams.get('parentOrigin') || window.origin;
 	const salt = searchParams.get('salt');

From af9502d4b1425e076e05b02850363b227bf9316e Mon Sep 17 00:00:00 2001
From: Joyce Er <joyce.er@microsoft.com>
Date: Fri, 13 Dec 2024 13:38:11 -0800
Subject: [PATCH 225/479] fix: don't cut off focus border for chat editing Add
 Files button (#236102)

---
 src/vs/workbench/contrib/chat/browser/chatInputPart.ts | 2 +-
 src/vs/workbench/contrib/chat/browser/media/chat.css   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 78b8a6628af..2c3d2e0a19b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -1282,7 +1282,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		}));
 		dom.append(addFilesElement, button.element);
 
-		// REALTED files (after Add Files...)
+		// RELATED files (after Add Files...)
 		for (const [uri, metadata] of chatEditingSession.workingSet) {
 			if (metadata.state !== WorkingSetEntryState.Suggested) {
 				continue;
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
index b93329f8ddf..f9065621637 100644
--- a/src/vs/workbench/contrib/chat/browser/media/chat.css
+++ b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -661,6 +661,7 @@ have to be updated for changes to the rules above, or to support more deeply nes
 }
 
 .interactive-session .chat-editing-session .chat-editing-session-toolbar-actions .monaco-button.secondary:first-child {
+	margin: 3px 0px 3px 3px;
 	flex-shrink: 0;
 }
 

From c921e57456cb5721151fcef69e21f73a1cb221c5 Mon Sep 17 00:00:00 2001
From: Joyce Er <joyce.er@microsoft.com>
Date: Fri, 13 Dec 2024 13:47:11 -0800
Subject: [PATCH 226/479] fix: add aria label for chat working set (#236106)

fix: add aria label for working set region
---
 src/vs/workbench/contrib/chat/browser/chatInputPart.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 2c3d2e0a19b..5ee4df94945 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -1166,6 +1166,8 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		} else {
 			suggestedFilesInWorkingSetCount = entries.filter(e => e.kind === 'reference' && e.state === WorkingSetEntryState.Suggested).length;
 		}
+		overviewTitle.ariaLabel = overviewTitle.textContent;
+		overviewTitle.tabIndex = 0;
 
 		if (excludedEntries.length > 0) {
 			overviewFileCount.textContent = ' ' + localize('chatEditingSession.excludedFiles', '({0}/{1} files)', this.chatEditingService.editingSessionFileLimit + excludedEntries.length, this.chatEditingService.editingSessionFileLimit);

From 0d676289ff74ffd00571a4dcce4ef80af2dfefda Mon Sep 17 00:00:00 2001
From: Joyce Er <joyce.er@microsoft.com>
Date: Fri, 13 Dec 2024 14:40:29 -0800
Subject: [PATCH 227/479] fix: reduce race timeout for getting chat related
 files (#236108)

---
 .../contrib/chat/browser/contrib/chatInputCompletions.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
index 06a7bd3c912..bf5dfa67cef 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.ts
@@ -564,7 +564,7 @@ class BuiltinDynamicCompletions extends Disposable {
 
 		// RELATED FILES
 		if (widget.location === ChatAgentLocation.EditingSession && widget.viewModel && this._chatEditingService.currentEditingSessionObs.get()?.chatSessionId === widget.viewModel?.sessionId) {
-			const relatedFiles = (await raceTimeout(this._chatEditingService.getRelatedFiles(widget.viewModel.sessionId, widget.getInput(), token), 1000)) ?? [];
+			const relatedFiles = (await raceTimeout(this._chatEditingService.getRelatedFiles(widget.viewModel.sessionId, widget.getInput(), token), 200)) ?? [];
 			for (const relatedFileGroup of relatedFiles) {
 				for (const relatedFile of relatedFileGroup.files) {
 					if (seen.has(relatedFile.uri)) {

From eb70dfe409b18664d5fafe9d4bcf1ff8fbbade68 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Fri, 13 Dec 2024 15:20:34 -0800
Subject: [PATCH 228/479] testing: fix transparent background in test error
 badges artifacting (#236109)

---
 .../contrib/testing/browser/media/testing.css |  2 --
 .../contrib/testing/browser/theme.ts          | 22 ++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/contrib/testing/browser/media/testing.css b/src/vs/workbench/contrib/testing/browser/media/testing.css
index cafaaac4dd7..2ebd1fc35bc 100644
--- a/src/vs/workbench/contrib/testing/browser/media/testing.css
+++ b/src/vs/workbench/contrib/testing/browser/media/testing.css
@@ -414,7 +414,6 @@
 .monaco-workbench .test-error-content-widget .inner {
 	margin-left: 20px;
 	color: var(--vscode-testing-message-error-badgeForeground) !important;
-	background: var(--vscode-testing-message-error-badgeBackground);
 	border-top-right-radius: 2px;
 	border-bottom-right-radius: 2px;
 	padding-right: 3px;
@@ -452,7 +451,6 @@
 		top: -1px;
 		width: 15px;
 		left: -10px;
-		fill: var(--vscode-testing-message-error-badgeBackground);
 		z-index: -1;
 		stroke-width: 0.71px; /* 1 / sqrt(2) */
 		stroke: var(--vscode-testing-message-error-badgeBorder);
diff --git a/src/vs/workbench/contrib/testing/browser/theme.ts b/src/vs/workbench/contrib/testing/browser/theme.ts
index 439e1f765fa..b41f5828a97 100644
--- a/src/vs/workbench/contrib/testing/browser/theme.ts
+++ b/src/vs/workbench/contrib/testing/browser/theme.ts
@@ -183,7 +183,6 @@ export const testStatesToRetiredIconColors: { [K in TestResultState]?: string }
 registerThemingParticipant((theme, collector) => {
 
 	const editorBg = theme.getColor(editorBackground);
-	const missBadgeBackground = editorBg && theme.getColor(testingUncoveredBackground)?.transparent(2).makeOpaque(editorBg);
 
 	collector.addRule(`
 	.coverage-deco-inline.coverage-deco-hit.coverage-deco-hovered {
@@ -194,9 +193,22 @@ registerThemingParticipant((theme, collector) => {
 		background: ${theme.getColor(testingUncoveredBackground)?.transparent(1.3)};
 		outline-color: ${theme.getColor(testingUncoveredBorder)?.transparent(2)};
 	}
-	.coverage-deco-branch-miss-indicator::before {
-		border-color: ${missBadgeBackground?.transparent(1.3)};
-		background-color: ${missBadgeBackground};
+		`);
+
+	if (editorBg) {
+		const missBadgeBackground = theme.getColor(testingUncoveredBackground)?.transparent(2).makeOpaque(editorBg);
+		const errorBadgeBackground = theme.getColor(messageBadgeBackground)?.makeOpaque(editorBg);
+		collector.addRule(`
+			.coverage-deco-branch-miss-indicator::before {
+				border-color: ${missBadgeBackground?.transparent(1.3)};
+				background-color: ${missBadgeBackground};
+			}
+			.monaco-workbench .test-error-content-widget .inner{
+				background: ${errorBadgeBackground};
+			}
+			.monaco-workbench .test-error-content-widget .inner .arrow svg {
+				fill: ${errorBadgeBackground};
+			}
+		`);
 	}
-	`);
 });

From cdec0c6a14aeeae336c3467a7fa156f2cde6945f Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Fri, 13 Dec 2024 15:53:23 -0800
Subject: [PATCH 229/479] testing: improve performance of filtering file tests
 (#236112)

Fixes #235819. Probably.
---
 .../common/mainThreadTestCollection.ts        |  7 ++-
 .../contrib/testing/common/testService.ts     | 45 ++++++++++++++-----
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/src/vs/workbench/contrib/testing/common/mainThreadTestCollection.ts b/src/vs/workbench/contrib/testing/common/mainThreadTestCollection.ts
index 1a691a3c80f..bff443281f6 100644
--- a/src/vs/workbench/contrib/testing/common/mainThreadTestCollection.ts
+++ b/src/vs/workbench/contrib/testing/common/mainThreadTestCollection.ts
@@ -5,6 +5,7 @@
 
 import { Emitter } from '../../../../base/common/event.js';
 import { Iterable } from '../../../../base/common/iterator.js';
+import { LinkedList } from '../../../../base/common/linkedList.js';
 import { ResourceMap } from '../../../../base/common/map.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IMainThreadTestCollection } from './testService.js';
@@ -184,8 +185,10 @@ export class MainThreadTestCollection extends AbstractIncrementalTestCollection<
 	}
 
 	private *getIterator() {
-		const queue = [this.rootIds];
-		while (queue.length) {
+		const queue = new LinkedList<Iterable<string>>();
+		queue.push(this.rootIds);
+
+		while (queue.size > 0) {
 			for (const id of queue.pop()!) {
 				const node = this.getNodeById(id)!;
 				yield node;
diff --git a/src/vs/workbench/contrib/testing/common/testService.ts b/src/vs/workbench/contrib/testing/common/testService.ts
index fe1d04bc441..f75e3145ae8 100644
--- a/src/vs/workbench/contrib/testing/common/testService.ts
+++ b/src/vs/workbench/contrib/testing/common/testService.ts
@@ -8,6 +8,7 @@ import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { Event } from '../../../../base/common/event.js';
 import { Iterable } from '../../../../base/common/iterator.js';
 import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { LinkedList } from '../../../../base/common/linkedList.js';
 import { MarshalledId } from '../../../../base/common/marshallingIds.js';
 import { IObservable } from '../../../../base/common/observable.js';
 import { IPrefixTreeNode, WellDefinedPrefixTree } from '../../../../base/common/prefixTree.js';
@@ -172,24 +173,44 @@ const waitForTestToBeIdle = (testService: ITestService, test: IncrementalTestCol
  * in strictly descending order.
  */
 export const testsInFile = async function* (testService: ITestService, ident: IUriIdentityService, uri: URI, waitForIdle = true): AsyncIterable<IncrementalTestCollectionItem> {
-	for (const test of testService.collection.all) {
-		if (!test.item.uri) {
-			continue;
-		}
+	const queue = new LinkedList<Iterable<string>>();
 
-		if (ident.extUri.isEqual(uri, test.item.uri)) {
-			yield test;
-		}
+	const existing = [...testService.collection.getNodeByUrl(uri)];
+	queue.push(existing.length ? existing.map(e => e.item.extId) : testService.collection.rootIds);
 
-		if (ident.extUri.isEqualOrParent(uri, test.item.uri)) {
-			if (test.expand === TestItemExpandState.Expandable) {
-				await testService.collection.expand(test.item.extId, 1);
+	let n = 0;
+	while (queue.size > 0) {
+		for (const id of queue.pop()!) {
+			n++;
+			const test = testService.collection.getNodeById(id);
+			if (!test) {
+				continue; // possible because we expand async and things could delete
+			}
+
+			if (!test.item.uri) {
+				queue.push(test.children);
+				continue;
+			}
+
+			if (ident.extUri.isEqual(uri, test.item.uri)) {
+				yield test;
 			}
-			if (waitForIdle) {
-				await waitForTestToBeIdle(testService, test);
+
+			if (ident.extUri.isEqualOrParent(uri, test.item.uri)) {
+				if (test.expand === TestItemExpandState.Expandable) {
+					await testService.collection.expand(test.item.extId, 1);
+				}
+				if (waitForIdle) {
+					await waitForTestToBeIdle(testService, test);
+				}
+
+				if (test.children.size) {
+					queue.push(test.children);
+				}
 			}
 		}
 	}
+	console.log('iterated', n, 'times');
 };
 
 /**

From 31092ac1a0f9e68026cd0796f184fd3dfe978069 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Fri, 13 Dec 2024 17:40:57 -0800
Subject: [PATCH 230/479] debug: fix remote attach fails without message
 (#236117)

Fixes #235722
---
 src/vs/workbench/contrib/debug/node/debugAdapter.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/vs/workbench/contrib/debug/node/debugAdapter.ts b/src/vs/workbench/contrib/debug/node/debugAdapter.ts
index 7c2b2e68307..4892338a1c1 100644
--- a/src/vs/workbench/contrib/debug/node/debugAdapter.ts
+++ b/src/vs/workbench/contrib/debug/node/debugAdapter.ts
@@ -114,6 +114,11 @@ export abstract class NetworkDebugAdapter extends StreamDebugAdapter {
 			});
 
 			this.socket.on('error', error => {
+				// On ipv6 posix this can be an AggregateError which lacks a message. Use the first.
+				if (error instanceof AggregateError) {
+					error = error.errors[0];
+				}
+
 				if (connected) {
 					this._onError.fire(error);
 				} else {

From 1dc517c0a43a1df7730023b68533f9e3158b648d Mon Sep 17 00:00:00 2001
From: Jawad Najar <113301432+janajar@users.noreply.github.com>
Date: Sat, 14 Dec 2024 09:39:46 -0500
Subject: [PATCH 231/479] Fix: When no results in search editor it throws an
 error (#235031)

* Fix: issue #233200

Added a null check for matchRange in the iterateThroughMatches
function to ensure setSelection is only called with valid arguments.

* Revert package.json and package-lock.json to original states

---------

Co-authored-by: Aly Ayyob <113083026+aayyob@users.noreply.github.com>
---
 src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
index 12423a7f38f..841b309d364 100644
--- a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
+++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.ts
@@ -454,6 +454,7 @@ export class SearchEditor extends AbstractTextCodeEditor<SearchEditorViewState>
 		if (!matchRanges) { return; }
 
 		const matchRange = (reverse ? findPrevRange : findNextRange)(matchRanges, currentPosition);
+		if (!matchRange) { return; }
 
 		this.searchResultEditor.setSelection(matchRange);
 		this.searchResultEditor.revealLineInCenterIfOutsideViewport(matchRange.startLineNumber);

From f7c3b1b4748ba07ddf14dafd9b1dc611372c1bde Mon Sep 17 00:00:00 2001
From: notoriousmango <psm03120@gmail.com>
Date: Sun, 15 Dec 2024 00:01:28 +0900
Subject: [PATCH 232/479] use openDocumentLink

---
 extensions/markdown-language-features/preview-src/index.ts  | 6 +++---
 .../markdown-language-features/src/commands/openImage.ts    | 3 +--
 .../src/preview/previewManager.ts                           | 5 +++++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/extensions/markdown-language-features/preview-src/index.ts b/extensions/markdown-language-features/preview-src/index.ts
index cd2221b140d..1c2e2f5535a 100644
--- a/extensions/markdown-language-features/preview-src/index.ts
+++ b/extensions/markdown-language-features/preview-src/index.ts
@@ -11,6 +11,7 @@ import { SettingsManager, getData } from './settings';
 import throttle = require('lodash.throttle');
 import morphdom from 'morphdom';
 import type { ToWebviewMessage } from '../types/previewMessaging';
+import { isOfScheme, Schemes } from '../src/util/schemes';
 
 let scrollDisabledCount = 0;
 
@@ -132,9 +133,8 @@ function addImageContexts() {
 	for (const img of images) {
 		img.id = 'image-' + idNumber;
 		idNumber += 1;
-		const imageSource = img.src;
-		const imgSrcAttribute = img.getAttribute('src');
-		const isLocalFile = imageSource !== imgSrcAttribute;
+		const imageSource = img.getAttribute('data-src');
+		const isLocalFile = imageSource && !(isOfScheme(Schemes.http, imageSource) || isOfScheme(Schemes.https, imageSource));
 		const webviewSection = isLocalFile ? 'localImage' : 'image';
 		img.setAttribute('data-vscode-context', JSON.stringify({ webviewSection, id: img.id, 'preventDefaultContextMenuItems': true, resource: documentResource, imageSource }));
 	}
diff --git a/extensions/markdown-language-features/src/commands/openImage.ts b/extensions/markdown-language-features/src/commands/openImage.ts
index 53f615148f3..64b1831df0d 100644
--- a/extensions/markdown-language-features/src/commands/openImage.ts
+++ b/extensions/markdown-language-features/src/commands/openImage.ts
@@ -16,7 +16,6 @@ export class OpenImageCommand implements Command {
 
 	public execute(args: { resource: string; imageSource: string }) {
 		const source = vscode.Uri.parse(args.resource);
-		const imageSourceUri = vscode.Uri.file(vscode.Uri.parse(args.imageSource).path);
-		vscode.commands.executeCommand('vscode.open', imageSourceUri, this._webviewManager.findPreview(source));
+		this._webviewManager.openDocumentLink(args.imageSource, source);
 	}
 }
diff --git a/extensions/markdown-language-features/src/preview/previewManager.ts b/extensions/markdown-language-features/src/preview/previewManager.ts
index 3b46c2a4322..3aa126da063 100644
--- a/extensions/markdown-language-features/src/preview/previewManager.ts
+++ b/extensions/markdown-language-features/src/preview/previewManager.ts
@@ -170,6 +170,11 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 		}
 	}
 
+	public openDocumentLink(linkText: string, fromResource: vscode.Uri) {
+		const viewColumn = this.findPreview(fromResource)?.resourceColumn;
+		return this._opener.openDocumentLink(linkText, fromResource, viewColumn);
+	}
+
 	public async deserializeWebviewPanel(
 		webview: vscode.WebviewPanel,
 		state: any

From 7606e11e89e5cce00cfb0959c4d2d97ffd477472 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Sat, 14 Dec 2024 17:22:14 +0100
Subject: [PATCH 233/479] fix #235878 (#236129)

---
 .../common/extensionManagement.ts                | 12 ++++++++++--
 .../extensions/browser/extensionEditor.ts        | 16 +++++++++-------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index 2d6713d409d..ba8a8e86fee 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -12,7 +12,7 @@ import { Platform } from '../../../base/common/platform.js';
 import { URI } from '../../../base/common/uri.js';
 import { localize2 } from '../../../nls.js';
 import { ExtensionType, IExtension, IExtensionManifest, TargetPlatform } from '../../extensions/common/extensions.js';
-import { IFileService } from '../../files/common/files.js';
+import { FileOperationError, FileOperationResult, IFileService, IFileStat } from '../../files/common/files.js';
 import { createDecorator } from '../../instantiation/common/instantiation.js';
 
 export const EXTENSION_IDENTIFIER_PATTERN = '^([a-z0-9A-Z][a-z0-9-A-Z]*)\\.([a-z0-9A-Z][a-z0-9-A-Z]*)$';
@@ -640,7 +640,15 @@ export interface IAllowedExtensionsService {
 }
 
 export async function computeSize(location: URI, fileService: IFileService): Promise<number> {
-	const stat = await fileService.resolve(location);
+	let stat: IFileStat;
+	try {
+		stat = await fileService.resolve(location);
+	} catch (e) {
+		if ((<FileOperationError>e).fileOperationResult === FileOperationResult.FILE_NOT_FOUND) {
+			return 0;
+		}
+		throw e;
+	}
 	if (stat.children) {
 		const sizes = await Promise.all(stat.children.map(c => computeSize(c.resource, fileService)));
 		return sizes.reduce((r, s) => r + s, 0);
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
index d5d8e0b3cd6..a47806e80f4 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
@@ -1157,12 +1157,14 @@ class AdditionalDetailsWidget extends Disposable {
 				$('div.more-info-entry-name', undefined, localize('id', "Identifier")),
 				$('code', undefined, extension.identifier.id)
 			));
-		append(installInfo,
-			$('.more-info-entry', undefined,
-				$('div.more-info-entry-name', undefined, localize('Version', "Version")),
-				$('code', undefined, extension.manifest.version)
-			)
-		);
+		if (extension.type !== ExtensionType.System) {
+			append(installInfo,
+				$('.more-info-entry', undefined,
+					$('div.more-info-entry-name', undefined, localize('Version', "Version")),
+					$('code', undefined, extension.manifest.version)
+				)
+			);
+		}
 		if (extension.installedTimestamp) {
 			append(installInfo,
 				$('.more-info-entry', undefined,
@@ -1171,7 +1173,7 @@ class AdditionalDetailsWidget extends Disposable {
 				)
 			);
 		}
-		if (extension.source !== 'gallery') {
+		if (!extension.isBuiltin && extension.source !== 'gallery') {
 			const element = $('div', undefined, extension.source === 'vsix' ? localize('vsix', "VSIX") : localize('other', "Local"));
 			append(installInfo,
 				$('.more-info-entry', undefined,

From 6fb1f6fbdd167ca4599f6ad28323257c3704a777 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Sat, 14 Dec 2024 17:22:39 +0100
Subject: [PATCH 234/479] fix #168779 (#236125)

---
 .../browser/userDataSyncWorkbenchService.ts   | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
index ddfd1f0553f..6a1eb065c6c 100644
--- a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
+++ b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
@@ -6,7 +6,7 @@
 import { IUserDataSyncService, IAuthenticationProvider, isAuthenticationProvider, IUserDataAutoSyncService, IUserDataSyncStoreManagementService, SyncStatus, IUserDataSyncEnablementService, IUserDataSyncResource, IResourcePreview, USER_DATA_SYNC_SCHEME, USER_DATA_SYNC_LOG_ID, } from '../../../../platform/userDataSync/common/userDataSync.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
-import { IUserDataSyncWorkbenchService, IUserDataSyncAccount, AccountStatus, CONTEXT_SYNC_ENABLEMENT, CONTEXT_SYNC_STATE, CONTEXT_ACCOUNT_STATE, SHOW_SYNC_LOG_COMMAND_ID, CONTEXT_ENABLE_ACTIVITY_VIEWS, SYNC_VIEW_CONTAINER_ID, SYNC_TITLE, SYNC_CONFLICTS_VIEW_ID, CONTEXT_ENABLE_SYNC_CONFLICTS_VIEW, CONTEXT_HAS_CONFLICTS, IUserDataSyncConflictsView } from '../common/userDataSync.js';
+import { IUserDataSyncWorkbenchService, IUserDataSyncAccount, AccountStatus, CONTEXT_SYNC_ENABLEMENT, CONTEXT_SYNC_STATE, CONTEXT_ACCOUNT_STATE, SHOW_SYNC_LOG_COMMAND_ID, CONTEXT_ENABLE_ACTIVITY_VIEWS, SYNC_VIEW_CONTAINER_ID, SYNC_TITLE, SYNC_CONFLICTS_VIEW_ID, CONTEXT_ENABLE_SYNC_CONFLICTS_VIEW, CONTEXT_HAS_CONFLICTS, IUserDataSyncConflictsView, getSyncAreaLabel } from '../common/userDataSync.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { getCurrentAuthenticationSessionInfo } from '../../authentication/browser/authenticationService.js';
@@ -403,9 +403,21 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
 	}
 
 	private async handleConflictsWhileTurningOn(token: CancellationToken): Promise<void> {
+		const conflicts = this.userDataSyncService.conflicts;
+		const andSeparator = localize('and', ' and ');
+		let conflictsText = '';
+		for (let i = 0; i < conflicts.length; i++) {
+			if (i === conflicts.length - 1 && i !== 0) {
+				conflictsText += andSeparator;
+			} else if (i !== 0) {
+				conflictsText += ', ';
+			}
+			conflictsText += getSyncAreaLabel(conflicts[i].syncResource);
+		}
+		const singleConflictResource = conflicts.length === 1 ? getSyncAreaLabel(conflicts[0].syncResource) : undefined;
 		await this.dialogService.prompt({
 			type: Severity.Warning,
-			message: localize('conflicts detected', "Conflicts Detected"),
+			message: localize('conflicts detected', "Conflicts Detected in {0}", conflictsText),
 			detail: localize('resolve', "Please resolve conflicts to turn on..."),
 			buttons: [
 				{
@@ -417,11 +429,11 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
 					}
 				},
 				{
-					label: localize({ key: 'replace local', comment: ['&& denotes a mnemonic'] }, "Replace &&Local"),
+					label: singleConflictResource ? localize({ key: 'replace local single', comment: ['&& denotes a mnemonic'] }, "Accept &&Remote {0}", singleConflictResource) : localize({ key: 'replace local', comment: ['&& denotes a mnemonic'] }, "Accept &&Remote"),
 					run: async () => this.replace(true)
 				},
 				{
-					label: localize({ key: 'replace remote', comment: ['&& denotes a mnemonic'] }, "Replace &&Remote"),
+					label: singleConflictResource ? localize({ key: 'replace remote single', comment: ['&& denotes a mnemonic'] }, "Accept &&Local {0}", singleConflictResource) : localize({ key: 'replace remote', comment: ['&& denotes a mnemonic'] }, "Accept &&Local"),
 					run: () => this.replace(false)
 				},
 			],

From 402f07b34ce8aaa3997030c07999be8d8832057c Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Sun, 15 Dec 2024 11:43:58 +0100
Subject: [PATCH 235/479] debt - remove `handleTitleDoubleClick` (#236154)

Looks like this is not working anymore since app-region drag takes events away
---
 src/vs/platform/native/common/native.ts       |  2 --
 .../electron-main/nativeHostMainService.ts    |  5 ---
 .../platform/window/electron-main/window.ts   |  2 --
 .../windows/electron-main/windowImpl.ts       | 35 -------------------
 .../test/electron-main/windowsFinder.test.ts  |  1 -
 src/vs/workbench/electron-sandbox/window.ts   | 20 ++---------
 .../electron-sandbox/workbenchTestServices.ts |  1 -
 7 files changed, 2 insertions(+), 64 deletions(-)

diff --git a/src/vs/platform/native/common/native.ts b/src/vs/platform/native/common/native.ts
index 7ec630cb844..2fdfb63e0b5 100644
--- a/src/vs/platform/native/common/native.ts
+++ b/src/vs/platform/native/common/native.ts
@@ -83,8 +83,6 @@ export interface ICommonNativeHostService {
 	isFullScreen(options?: INativeHostOptions): Promise<boolean>;
 	toggleFullScreen(options?: INativeHostOptions): Promise<void>;
 
-	handleTitleDoubleClick(options?: INativeHostOptions): Promise<void>;
-
 	getCursorScreenPoint(): Promise<{ readonly point: IPoint; readonly display: IRectangle }>;
 
 	isMaximized(options?: INativeHostOptions): Promise<boolean>;
diff --git a/src/vs/platform/native/electron-main/nativeHostMainService.ts b/src/vs/platform/native/electron-main/nativeHostMainService.ts
index 703f89ef66b..c3dbf1ee3ea 100644
--- a/src/vs/platform/native/electron-main/nativeHostMainService.ts
+++ b/src/vs/platform/native/electron-main/nativeHostMainService.ts
@@ -247,11 +247,6 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 		window?.toggleFullScreen();
 	}
 
-	async handleTitleDoubleClick(windowId: number | undefined, options?: INativeHostOptions): Promise<void> {
-		const window = this.windowById(options?.targetWindowId, windowId);
-		window?.handleTitleDoubleClick();
-	}
-
 	async getCursorScreenPoint(windowId: number | undefined): Promise<{ readonly point: IPoint; readonly display: IRectangle }> {
 		const point = screen.getCursorScreenPoint();
 		const display = screen.getDisplayNearestPoint(point);
diff --git a/src/vs/platform/window/electron-main/window.ts b/src/vs/platform/window/electron-main/window.ts
index 8a861e7f176..91a2eb1339a 100644
--- a/src/vs/platform/window/electron-main/window.ts
+++ b/src/vs/platform/window/electron-main/window.ts
@@ -34,8 +34,6 @@ export interface IBaseWindow extends IDisposable {
 	setDocumentEdited(edited: boolean): void;
 	isDocumentEdited(): boolean;
 
-	handleTitleDoubleClick(): void;
-
 	readonly isFullScreen: boolean;
 	toggleFullScreen(): void;
 
diff --git a/src/vs/platform/windows/electron-main/windowImpl.ts b/src/vs/platform/windows/electron-main/windowImpl.ts
index 3a9132dd3cd..ab629987eae 100644
--- a/src/vs/platform/windows/electron-main/windowImpl.ts
+++ b/src/vs/platform/windows/electron-main/windowImpl.ts
@@ -314,41 +314,6 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow {
 		win.focus();
 	}
 
-	handleTitleDoubleClick(): void {
-		const win = this.win;
-		if (!win) {
-			return;
-		}
-
-		// Respect system settings on mac with regards to title click on windows title
-		if (isMacintosh) {
-			const action = electron.systemPreferences.getUserDefault('AppleActionOnDoubleClick', 'string');
-			switch (action) {
-				case 'Minimize':
-					win.minimize();
-					break;
-				case 'None':
-					break;
-				case 'Maximize':
-				default:
-					if (win.isMaximized()) {
-						win.unmaximize();
-					} else {
-						win.maximize();
-					}
-			}
-		}
-
-		// Linux/Windows: just toggle maximize/minimized state
-		else {
-			if (win.isMaximized()) {
-				win.unmaximize();
-			} else {
-				win.maximize();
-			}
-		}
-	}
-
 	//#region Window Control Overlays
 
 	private static readonly windowControlHeightStateStorageKey = 'windowControlHeight';
diff --git a/src/vs/platform/windows/test/electron-main/windowsFinder.test.ts b/src/vs/platform/windows/test/electron-main/windowsFinder.test.ts
index 98973497b19..c0889db322b 100644
--- a/src/vs/platform/windows/test/electron-main/windowsFinder.test.ts
+++ b/src/vs/platform/windows/test/electron-main/windowsFinder.test.ts
@@ -70,7 +70,6 @@ suite('WindowsFinder', () => {
 			getRepresentedFilename(): string | undefined { throw new Error('Method not implemented.'); }
 			setDocumentEdited(edited: boolean): void { throw new Error('Method not implemented.'); }
 			isDocumentEdited(): boolean { throw new Error('Method not implemented.'); }
-			handleTitleDoubleClick(): void { throw new Error('Method not implemented.'); }
 			updateTouchBar(items: UriDto<ICommandAction>[][]): void { throw new Error('Method not implemented.'); }
 			serializeWindowState(): IWindowState { throw new Error('Method not implemented'); }
 			updateWindowControls(options: { height?: number | undefined; backgroundColor?: string | undefined; foregroundColor?: string | undefined }): void { throw new Error('Method not implemented.'); }
diff --git a/src/vs/workbench/electron-sandbox/window.ts b/src/vs/workbench/electron-sandbox/window.ts
index ec924899b8b..c186b45d2ba 100644
--- a/src/vs/workbench/electron-sandbox/window.ts
+++ b/src/vs/workbench/electron-sandbox/window.ts
@@ -8,7 +8,7 @@ import { localize } from '../../nls.js';
 import { URI } from '../../base/common/uri.js';
 import { onUnexpectedError } from '../../base/common/errors.js';
 import { equals } from '../../base/common/objects.js';
-import { EventType, EventHelper, addDisposableListener, ModifierKeyEmitter, getActiveElement, hasWindow, getWindow, getWindowById, getWindows } from '../../base/browser/dom.js';
+import { EventType, EventHelper, addDisposableListener, ModifierKeyEmitter, getActiveElement, hasWindow, getWindowById, getWindows } from '../../base/browser/dom.js';
 import { Action, Separator, WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../base/common/actions.js';
 import { IFileService } from '../../platform/files/common/files.js';
 import { EditorResourceAccessor, IUntitledTextResourceEditorInput, SideBySideEditor, pathsToEditors, IResourceDiffEditorInput, IUntypedEditorInput, IEditorPane, isResourceEditorInput, IResourceMergeEditorInput } from '../common/editor.js';
@@ -41,13 +41,12 @@ import { WorkbenchState, IWorkspaceContextService } from '../../platform/workspa
 import { coalesce } from '../../base/common/arrays.js';
 import { ConfigurationTarget, IConfigurationService } from '../../platform/configuration/common/configuration.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../platform/storage/common/storage.js';
-import { assertIsDefined } from '../../base/common/types.js';
 import { IOpenerService, IResolvedExternalUri, OpenOptions } from '../../platform/opener/common/opener.js';
 import { Schemas } from '../../base/common/network.js';
 import { INativeHostService } from '../../platform/native/common/native.js';
 import { posix } from '../../base/common/path.js';
 import { ITunnelService, RemoteTunnel, extractLocalHostUriMetaDataForPortMapping, extractQueryLocalHostUriMetaDataForPortMapping } from '../../platform/tunnel/common/tunnel.js';
-import { IWorkbenchLayoutService, Parts, positionFromString, Position } from '../services/layout/browser/layoutService.js';
+import { IWorkbenchLayoutService, positionFromString, Position } from '../services/layout/browser/layoutService.js';
 import { IWorkingCopyService } from '../services/workingCopy/common/workingCopyService.js';
 import { WorkingCopyCapabilities } from '../services/workingCopy/common/workingCopy.js';
 import { IFilesConfigurationService } from '../services/filesConfiguration/common/filesConfigurationService.js';
@@ -397,21 +396,6 @@ export class NativeWindow extends BaseWindow {
 			this._register(this.editorGroupService.onDidCreateAuxiliaryEditorPart(part => this.handleRepresentedFilename(part)));
 		}
 
-		// Maximize/Restore on doubleclick (for macOS custom title)
-		if (isMacintosh && !hasNativeTitlebar(this.configurationService)) {
-			this._register(Event.runAndSubscribe(this.layoutService.onDidAddContainer, ({ container, disposables }) => {
-				const targetWindow = getWindow(container);
-				const targetWindowId = targetWindow.vscodeWindowId;
-				const titlePart = assertIsDefined(this.layoutService.getContainer(targetWindow, Parts.TITLEBAR_PART));
-
-				disposables.add(addDisposableListener(titlePart, EventType.DBLCLICK, e => {
-					EventHelper.stop(e);
-
-					this.nativeHostService.handleTitleDoubleClick({ targetWindowId });
-				}));
-			}, { container: this.layoutService.mainContainer, disposables: this._store }));
-		}
-
 		// Document edited: indicate for dirty working copies
 		this._register(this.workingCopyService.onDidChangeDirty(workingCopy => {
 			const gotDirty = workingCopy.isDirty();
diff --git a/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts b/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts
index c58ce20646c..9bc958141ff 100644
--- a/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts
+++ b/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts
@@ -94,7 +94,6 @@ export class TestNativeHostService implements INativeHostService {
 	}
 
 	async toggleFullScreen(): Promise<void> { }
-	async handleTitleDoubleClick(): Promise<void> { }
 	async isMaximized(): Promise<boolean> { return true; }
 	async isFullScreen(): Promise<boolean> { return true; }
 	async maximizeWindow(): Promise<void> { }

From 8fca93f9e2f8f887fcafa35eabaff8623f1a084f Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Sun, 15 Dec 2024 11:44:46 +0100
Subject: [PATCH 236/479] Web: `homeIndicator` not respected anymore (fix
 #171724) (#236155)

---
 .../browser/parts/titlebar/titlebarPart.ts    | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
index 717c0a0e955..69342beb96a 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
@@ -434,22 +434,20 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 		this.centerContent = append(this.rootContainer, $('.titlebar-center'));
 		this.rightContent = append(this.rootContainer, $('.titlebar-right'));
 
-		// App Icon (Native Windows/Linux and Web)
-		if (!isMacintosh && !isWeb && !hasNativeTitlebar(this.configurationService, this.titleBarStyle)) {
+		// App Icon (Windows, Linux) / Home Indicator (Web)
+		const homeIndicator = this.environmentService.options?.homeIndicator;
+		const supportsAppIcon = isWindows || isLinux || (isWeb && homeIndicator && !this.isAuxiliary);
+		if (supportsAppIcon && !hasNativeTitlebar(this.configurationService, this.titleBarStyle)) {
 			this.appIcon = prepend(this.leftContent, $('a.window-appicon'));
 
-			// Web-only home indicator and menu (not for auxiliary windows)
-			if (!this.isAuxiliary && isWeb) {
-				const homeIndicator = this.environmentService.options?.homeIndicator;
-				if (homeIndicator) {
-					const icon: ThemeIcon = getIconRegistry().getIcon(homeIndicator.icon) ? { id: homeIndicator.icon } : Codicon.code;
-
-					this.appIcon.setAttribute('href', homeIndicator.href);
-					this.appIcon.classList.add(...ThemeIcon.asClassNameArray(icon));
-					this.appIconBadge = document.createElement('div');
-					this.appIconBadge.classList.add('home-bar-icon-badge');
-					this.appIcon.appendChild(this.appIconBadge);
-				}
+			// Web: home indicator
+			if (isWeb && homeIndicator) {
+				const icon: ThemeIcon = getIconRegistry().getIcon(homeIndicator.icon) ? { id: homeIndicator.icon } : Codicon.code;
+				this.appIcon.setAttribute('href', homeIndicator.href);
+				this.appIcon.classList.add(...ThemeIcon.asClassNameArray(icon));
+				this.appIconBadge = document.createElement('div');
+				this.appIconBadge.classList.add('home-bar-icon-badge');
+				this.appIcon.appendChild(this.appIconBadge);
 			}
 		}
 

From 5c525a4d5664e73eb4e28c4df4b29f3f1196b6f0 Mon Sep 17 00:00:00 2001
From: aslezar <97354675+aslezar@users.noreply.github.com>
Date: Sun, 15 Dec 2024 16:54:08 +0530
Subject: [PATCH 237/479] fixed formatting

---
 cli/src/util/prereqs.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs
index dc469fd30cd..af48bf0a93a 100644
--- a/cli/src/util/prereqs.rs
+++ b/cli/src/util/prereqs.rs
@@ -271,9 +271,9 @@ fn check_for_sufficient_glibcxx_versions(contents: Vec<u8>) -> Result<bool, Stri
 #[allow(dead_code)]
 fn extract_ldd_version(output: &[u8]) -> Option<SimpleSemver> {
 	LDD_VERSION_RE.captures(output).map(|m| SimpleSemver {
-            major: m.get(1).map_or(0, |s| u32_from_bytes(s.as_bytes())),
-            minor: m.get(2).map_or(0, |s| u32_from_bytes(s.as_bytes())),
-            patch: 0,
+		major: m.get(1).map_or(0, |s| u32_from_bytes(s.as_bytes())),
+		minor: m.get(2).map_or(0, |s| u32_from_bytes(s.as_bytes())),
+		patch: 0,
     })
 }
 

From 4325b8ce0dfccf8a146211c83e8f39795096e415 Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Sun, 15 Dec 2024 18:13:05 +0100
Subject: [PATCH 238/479] Use console.error and console.warn for errors and
 warnings (#236048)

---
 src/vs/platform/log/common/log.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/platform/log/common/log.ts b/src/vs/platform/log/common/log.ts
index e503417a554..7ce341461a4 100644
--- a/src/vs/platform/log/common/log.ts
+++ b/src/vs/platform/log/common/log.ts
@@ -432,7 +432,7 @@ export class ConsoleLogger extends AbstractLogger implements ILogger {
 	warn(message: string | Error, ...args: any[]): void {
 		if (this.canLog(LogLevel.Warning)) {
 			if (this.useColors) {
-				console.log('%c WARN', 'color: #993', message, ...args);
+				console.warn('%c WARN', 'color: #993', message, ...args);
 			} else {
 				console.log(message, ...args);
 			}
@@ -442,7 +442,7 @@ export class ConsoleLogger extends AbstractLogger implements ILogger {
 	error(message: string, ...args: any[]): void {
 		if (this.canLog(LogLevel.Error)) {
 			if (this.useColors) {
-				console.log('%c  ERR', 'color: #f33', message, ...args);
+				console.error('%c  ERR', 'color: #f33', message, ...args);
 			} else {
 				console.error(message, ...args);
 			}

From ce50bd4876af457f64d83cfd956bc916535285f4 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Sun, 15 Dec 2024 18:17:17 +0100
Subject: [PATCH 239/479] Remove unused showLocal proposal (#236032)

* Remove unused showLocal proposal

* No local build error??
---
 .../common/extensionsApiProposals.ts          |  3 ---
 .../api/browser/mainThreadDialogs.ts          |  3 +--
 .../workbench/api/common/extHost.api.impl.ts  |  2 +-
 src/vs/workbench/api/common/extHostDialogs.ts |  7 +------
 src/vscode-dts/vscode.proposed.showLocal.d.ts | 19 -------------------
 5 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 src/vscode-dts/vscode.proposed.showLocal.d.ts

diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts
index 9a6636005b3..bd35500287e 100644
--- a/src/vs/platform/extensions/common/extensionsApiProposals.ts
+++ b/src/vs/platform/extensions/common/extensionsApiProposals.ts
@@ -319,9 +319,6 @@ const _allApiProposals = {
 	shareProvider: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.shareProvider.d.ts',
 	},
-	showLocal: {
-		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.showLocal.d.ts',
-	},
 	speech: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.speech.d.ts',
 	},
diff --git a/src/vs/workbench/api/browser/mainThreadDialogs.ts b/src/vs/workbench/api/browser/mainThreadDialogs.ts
index 4ab41cf2663..50f3a61b94d 100644
--- a/src/vs/workbench/api/browser/mainThreadDialogs.ts
+++ b/src/vs/workbench/api/browser/mainThreadDialogs.ts
@@ -7,7 +7,6 @@ import { URI } from '../../../base/common/uri.js';
 import { MainThreadDiaglogsShape, MainContext, MainThreadDialogOpenOptions, MainThreadDialogSaveOptions } from '../common/extHost.protocol.js';
 import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
 import { IFileDialogService, IOpenDialogOptions, ISaveDialogOptions } from '../../../platform/dialogs/common/dialogs.js';
-import { Schemas } from '../../../base/common/network.js';
 
 @extHostNamedCustomer(MainContext.MainThreadDialogs)
 export class MainThreadDialogs implements MainThreadDiaglogsShape {
@@ -47,7 +46,7 @@ export class MainThreadDialogs implements MainThreadDiaglogsShape {
 			canSelectMany: options?.canSelectMany,
 			defaultUri: options?.defaultUri ? URI.revive(options.defaultUri) : undefined,
 			title: options?.title || undefined,
-			availableFileSystems: options?.allowUIResources ? [Schemas.vscodeRemote, Schemas.file] : []
+			availableFileSystems: []
 		};
 		if (options?.filters) {
 			result.filters = [];
diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
index 6e68860da3f..85ff1aa52b2 100644
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -781,7 +781,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				return extHostQuickOpen.showInput(options, token);
 			},
 			showOpenDialog(options) {
-				return extHostDialogs.showOpenDialog(extension, options);
+				return extHostDialogs.showOpenDialog(options);
 			},
 			showSaveDialog(options) {
 				return extHostDialogs.showSaveDialog(options);
diff --git a/src/vs/workbench/api/common/extHostDialogs.ts b/src/vs/workbench/api/common/extHostDialogs.ts
index 8e98769e19c..05b37776943 100644
--- a/src/vs/workbench/api/common/extHostDialogs.ts
+++ b/src/vs/workbench/api/common/extHostDialogs.ts
@@ -6,8 +6,6 @@
 import type * as vscode from 'vscode';
 import { URI } from '../../../base/common/uri.js';
 import { MainContext, MainThreadDiaglogsShape, IMainContext } from './extHost.protocol.js';
-import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
-import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
 
 export class ExtHostDialogs {
 
@@ -17,10 +15,7 @@ export class ExtHostDialogs {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadDialogs);
 	}
 
-	showOpenDialog(extension: IExtensionDescription, options?: vscode.OpenDialogOptions): Promise<URI[] | undefined> {
-		if (options?.allowUIResources) {
-			checkProposedApiEnabled(extension, 'showLocal');
-		}
+	showOpenDialog(options?: vscode.OpenDialogOptions): Promise<URI[] | undefined> {
 		return this._proxy.$showOpenDialog(options).then(filepaths => {
 			return filepaths ? filepaths.map(p => URI.revive(p)) : undefined;
 		});
diff --git a/src/vscode-dts/vscode.proposed.showLocal.d.ts b/src/vscode-dts/vscode.proposed.showLocal.d.ts
deleted file mode 100644
index 9a9294f596b..00000000000
--- a/src/vscode-dts/vscode.proposed.showLocal.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-// https://github.com/microsoft/vscode/issues/131138
-
-declare module 'vscode' {
-
-	export interface OpenDialogOptions {
-		/**
-		 * Controls whether the dialog allows users to select local files via the "Show Local" button.
-		 * Extensions that set this to `true` should check the scheme of the selected file.
-		 * Resources with the `file` scheme come from the same extension host as the extension.
-		 * Resources with the `vscode-local` scheme come from an extension host running in the same place as the UI.
-		 */
-		allowUIResources?: boolean;
-	}
-}

From 7432213b30d0c4a161d4fa8e934f21500bfbb990 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Mon, 16 Dec 2024 10:17:29 +0100
Subject: [PATCH 240/479] debt - remove home indicator (#236189)

It was broken before and not shown, and there were no complains, so lets remove it for good.
---
 .../parts/titlebar/media/titlebarpart.css     | 17 -------------
 .../browser/parts/titlebar/titlebarPart.ts    | 19 ++-------------
 src/vs/workbench/browser/web.api.ts           | 24 -------------------
 3 files changed, 2 insertions(+), 58 deletions(-)

diff --git a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
index 0264e5460d4..d3c6da2f239 100644
--- a/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
+++ b/src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css
@@ -271,23 +271,6 @@
 	display: none;
 }
 
-.monaco-workbench .part.titlebar > .titlebar-container .window-appicon > .home-bar-icon-badge {
-	position: absolute;
-	right: 9px;
-	bottom: 6px;
-	width: 8px;
-	height: 8px;
-	z-index: 1;
-	/* on top of home indicator */
-	background-image: url('../../../media/code-icon.svg');
-	background-repeat: no-repeat;
-	background-position: center center;
-	background-size: 8px;
-	pointer-events: none;
-	border-top: 1px solid transparent;
-	border-left: 1px solid transparent;
-}
-
 /* Window Controls Container */
 .monaco-workbench .part.titlebar .window-controls-container {
 	display: flex;
diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
index 69342beb96a..93a798fa708 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
@@ -15,7 +15,6 @@ import { IConfigurationService, IConfigurationChangeEvent } from '../../../../pl
 import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
 import { IBrowserWorkbenchEnvironmentService } from '../../../services/environment/browser/environmentService.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
 import { TITLE_BAR_ACTIVE_BACKGROUND, TITLE_BAR_ACTIVE_FOREGROUND, TITLE_BAR_INACTIVE_FOREGROUND, TITLE_BAR_INACTIVE_BACKGROUND, TITLE_BAR_BORDER, WORKBENCH_BACKGROUND } from '../../../common/theme.js';
 import { isMacintosh, isWindows, isLinux, isWeb, isNative, platformLocale } from '../../../../base/common/platform.js';
 import { Color } from '../../../../base/common/color.js';
@@ -29,8 +28,6 @@ import { createActionViewItem, fillInActionBarActions as fillInActionBarActions
 import { Action2, IMenu, IMenuService, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IHostService } from '../../../services/host/browser/host.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { getIconRegistry } from '../../../../platform/theme/common/iconRegistry.js';
 import { WindowTitle } from './windowTitle.js';
 import { CommandCenterControl } from './commandCenterControl.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
@@ -434,21 +431,9 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 		this.centerContent = append(this.rootContainer, $('.titlebar-center'));
 		this.rightContent = append(this.rootContainer, $('.titlebar-right'));
 
-		// App Icon (Windows, Linux) / Home Indicator (Web)
-		const homeIndicator = this.environmentService.options?.homeIndicator;
-		const supportsAppIcon = isWindows || isLinux || (isWeb && homeIndicator && !this.isAuxiliary);
-		if (supportsAppIcon && !hasNativeTitlebar(this.configurationService, this.titleBarStyle)) {
+		// App Icon (Windows, Linux)
+		if ((isWindows || isLinux) && !hasNativeTitlebar(this.configurationService, this.titleBarStyle)) {
 			this.appIcon = prepend(this.leftContent, $('a.window-appicon'));
-
-			// Web: home indicator
-			if (isWeb && homeIndicator) {
-				const icon: ThemeIcon = getIconRegistry().getIcon(homeIndicator.icon) ? { id: homeIndicator.icon } : Codicon.code;
-				this.appIcon.setAttribute('href', homeIndicator.href);
-				this.appIcon.classList.add(...ThemeIcon.asClassNameArray(icon));
-				this.appIconBadge = document.createElement('div');
-				this.appIconBadge.classList.add('home-bar-icon-badge');
-				this.appIcon.appendChild(this.appIconBadge);
-			}
 		}
 
 		// Draggable region that we can manipulate for #52522
diff --git a/src/vs/workbench/browser/web.api.ts b/src/vs/workbench/browser/web.api.ts
index c2668a8ca6a..9ae723f51fd 100644
--- a/src/vs/workbench/browser/web.api.ts
+++ b/src/vs/workbench/browser/web.api.ts
@@ -332,11 +332,6 @@ export interface IWorkbenchConstructionOptions {
 
 	//#region Branding
 
-	/**
-	 * Optional home indicator to appear above the hamburger menu in the activity bar.
-	 */
-	readonly homeIndicator?: IHomeIndicator;
-
 	/**
 	 * Optional welcome banner to appear above the workbench. Can be dismissed by the
 	 * user.
@@ -576,25 +571,6 @@ export interface ICommand {
 	handler: (...args: any[]) => unknown;
 }
 
-export interface IHomeIndicator {
-
-	/**
-	 * The link to open when clicking the home indicator.
-	 */
-	href: string;
-
-	/**
-	 * The icon name for the home indicator. This needs to be one of the existing
-	 * icons from our Codicon icon set. For example `code`.
-	 */
-	icon: string;
-
-	/**
-	 * A tooltip that will appear while hovering over the home indicator.
-	 */
-	title: string;
-}
-
 export interface IWelcomeBanner {
 
 	/**

From 737e2ed44a2136e4e7b153ad79ebbb9d8c0558bc Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Mon, 16 Dec 2024 10:18:00 +0100
Subject: [PATCH 241/479] Free SKU flow does not work with multiple accounts
 (fix microsoft/vscode-copilot#11323) (#236190)

---
 src/vs/workbench/contrib/chat/browser/chatSetup.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 2245da971d3..e814b6acb21 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -42,7 +42,7 @@ import { IWorkspaceContextService } from '../../../../platform/workspace/common/
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IViewDescriptorService, ViewContainerLocation } from '../../../common/views.js';
 import { IActivityService, ProgressBadge } from '../../../services/activity/common/activity.js';
-import { AuthenticationSession, IAuthenticationService } from '../../../services/authentication/common/authentication.js';
+import { AuthenticationSession, IAuthenticationExtensionsService, IAuthenticationService } from '../../../services/authentication/common/authentication.js';
 import { IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { IWorkbenchLayoutService, Parts } from '../../../services/layout/browser/layoutService.js';
@@ -706,6 +706,7 @@ class ChatSetupController extends Disposable {
 		private readonly requests: ChatSetupRequests,
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IAuthenticationService private readonly authenticationService: IAuthenticationService,
+		@IAuthenticationExtensionsService private readonly authenticationExtensionsService: IAuthenticationExtensionsService,
 		@IViewsService private readonly viewsService: IViewsService,
 		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IProductService private readonly productService: IProductService,
@@ -804,8 +805,11 @@ class ChatSetupController extends Disposable {
 
 			session = await this.authenticationService.createSession(defaultChat.providerId, defaultChat.providerScopes[0]);
 			entitlement = await this.requests.forceResolveEntitlement(session);
+
+			this.authenticationExtensionsService.updateAccountPreference(defaultChat.extensionId, defaultChat.providerId, session.account);
+			this.authenticationExtensionsService.updateAccountPreference(defaultChat.chatExtensionId, defaultChat.providerId, session.account);
 		} catch (error) {
-			// noop
+			this.logService.error(`[chat setup] signIn: error ${error}`);
 		}
 
 		if (!session) {

From 85709a0cd67d7945213598e7f3d4d017c7fbbe32 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 16 Dec 2024 10:28:00 +0100
Subject: [PATCH 242/479] SCM - only show visible quick diff providers in the
 quick diff widget (#236192)

---
 .../contrib/scm/browser/quickDiffWidget.ts          | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts b/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts
index 35771008fe6..8ac67f6cd53 100644
--- a/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts
+++ b/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts
@@ -305,7 +305,11 @@ class QuickDiffWidget extends PeekViewWidget {
 	}
 
 	private shouldUseDropdown(): boolean {
-		return this.model.getQuickDiffResults()
+		const visibleQuickDiffs = this.model.quickDiffs.filter(quickDiff => quickDiff.visible);
+		const visibleQuickDiffResults = this.model.getQuickDiffResults()
+			.filter(result => visibleQuickDiffs.some(quickDiff => quickDiff.label === result.label));
+
+		return visibleQuickDiffResults
 			.filter(quickDiff => quickDiff.changes.length > 0).length > 1;
 	}
 
@@ -333,9 +337,12 @@ class QuickDiffWidget extends PeekViewWidget {
 	protected override _fillHead(container: HTMLElement): void {
 		super._fillHead(container, true);
 
+		const visibleQuickDiffs = this.model.quickDiffs.filter(quickDiff => quickDiff.visible);
+
 		this.dropdownContainer = dom.prepend(this._titleElement!, dom.$('.dropdown'));
-		this.dropdown = this.instantiationService.createInstance(QuickDiffPickerViewItem, new QuickDiffPickerBaseAction((event?: IQuickDiffSelectItem) => this.switchQuickDiff(event)),
-			this.model.quickDiffs.map(quickDiffer => quickDiffer.label), this.model.changes[this._index].label);
+		this.dropdown = this.instantiationService.createInstance(QuickDiffPickerViewItem,
+			new QuickDiffPickerBaseAction((event?: IQuickDiffSelectItem) => this.switchQuickDiff(event)),
+			visibleQuickDiffs.map(quickDiff => quickDiff.label), this.model.changes[this._index].label);
 		this.dropdown.render(this.dropdownContainer);
 		this.updateActions();
 	}

From 276e24792198ecb7e83533d575568b66da722064 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Mon, 16 Dec 2024 11:03:13 +0100
Subject: [PATCH 243/479] Align view and container actions (#236199)

align view and container actions
---
 src/vs/workbench/browser/media/part.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/browser/media/part.css b/src/vs/workbench/browser/media/part.css
index f17465a5e4a..0cbc7346b60 100644
--- a/src/vs/workbench/browser/media/part.css
+++ b/src/vs/workbench/browser/media/part.css
@@ -78,6 +78,7 @@
 	background-size: 16px;
 	background-position: center center;
 	background-repeat: no-repeat;
+	padding: 2px; /* Make sure view actions and container actions align */
 }
 
 .monaco-workbench .part > .title > .title-actions .action-label .label {

From 8db8225de61cc748e0ae79154ce26610a9b8ec80 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Mon, 16 Dec 2024 11:05:31 +0100
Subject: [PATCH 244/479] Allow file level comments to start collapsed
 (#236201)

Fixes https://github.com/microsoft/vscode-pull-request-github/issues/6465
---
 .../contrib/comments/browser/commentThreadZoneWidget.ts         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts b/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
index eb2a0396eee..87e7767a8bc 100644
--- a/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
@@ -388,7 +388,7 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 		this._disposables.add(this._commentThreadWidget.onDidResize(dimension => {
 			this._refresh(dimension);
 		}));
-		if ((this._commentThread.collapsibleState === languages.CommentThreadCollapsibleState.Expanded) || (range === undefined)) {
+		if (this._commentThread.collapsibleState === languages.CommentThreadCollapsibleState.Expanded) {
 			this.show(this.arrowPosition(range), 2);
 		}
 

From 3a1e3f7f92057ecc563da275e58f18ad8fceb2ca Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Mon, 16 Dec 2024 11:16:31 +0100
Subject: [PATCH 245/479] Adds derived owners (#236204)

---
 .../browser/model/inlineCompletionsModel.ts                 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
index 3f9e7c85161..65201933d14 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
@@ -419,7 +419,7 @@ export class InlineCompletionsModel extends Disposable {
 		return 'noSuggestion';
 	});
 
-	public readonly inlineCompletionState = derived(reader => {
+	public readonly inlineCompletionState = derived(this, reader => {
 		const s = this.state.read(reader);
 		if (!s || s.kind !== 'ghostText') {
 			return undefined;
@@ -430,7 +430,7 @@ export class InlineCompletionsModel extends Disposable {
 		return s;
 	});
 
-	public readonly inlineEditState = derived(reader => {
+	public readonly inlineEditState = derived(this, reader => {
 		const s = this.state.read(reader);
 		if (!s || s.kind !== 'inlineEdit') {
 			return undefined;
@@ -438,7 +438,7 @@ export class InlineCompletionsModel extends Disposable {
 		return s;
 	});
 
-	public readonly inlineEditAvailable = derived(reader => {
+	public readonly inlineEditAvailable = derived(this, reader => {
 		const s = this.inlineEditState.read(reader);
 		return !!s;
 	});

From 92d2d5d984b89fd44f831c04612e89c8e59028e2 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Mon, 16 Dec 2024 11:20:39 +0100
Subject: [PATCH 246/479] Observables: Adds debug logging (#236205)

---
 .../base/common/observableInternal/logging.ts | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/vs/base/common/observableInternal/logging.ts b/src/vs/base/common/observableInternal/logging.ts
index 56f154e001e..0de37a858cb 100644
--- a/src/vs/base/common/observableInternal/logging.ts
+++ b/src/vs/base/common/observableInternal/logging.ts
@@ -105,6 +105,28 @@ export class ConsoleObservableLogger implements IObservableLogger {
 			this.changedObservablesSets.get(derived)!.add(observable);
 			return existingHandleChange.apply(derived, [observable, change]);
 		};
+
+		const debugTrackUpdating = false;
+		if (debugTrackUpdating) {
+			const updating: IObservable<any>[] = [];
+			(derived as any).__debugUpdating = updating;
+
+			const existingBeginUpdate = derived.beginUpdate;
+			derived.beginUpdate = (obs) => {
+				updating.push(obs);
+				return existingBeginUpdate.apply(derived, [obs]);
+			};
+
+			const existingEndUpdate = derived.endUpdate;
+			derived.endUpdate = (obs) => {
+				const idx = updating.indexOf(obs);
+				if (idx === -1) {
+					console.error('endUpdate called without beginUpdate', derived.debugName, obs.debugName);
+				}
+				updating.splice(idx, 1);
+				return existingEndUpdate.apply(derived, [obs]);
+			};
+		}
 	}
 
 	handleDerivedRecomputed(derived: Derived<unknown>, info: IChangeInformation): void {

From 864d5d8aff43a9ff242c25f1603888a5ef036f89 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 16 Dec 2024 11:28:44 +0100
Subject: [PATCH 247/479] Revert "Git - ignore changes reported to the
 submodule folder (#205125) (#236098)" (#236206)

This reverts commit 899afc031137585826b56aa200aca155a785a319.
---
 extensions/git/src/repository.ts | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 2465bd80bc4..73a54cef4af 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -2385,16 +2385,7 @@ export class Repository implements Disposable {
 			}
 
 			switch (raw.y) {
-				case 'M': {
-					// https://git-scm.com/docs/git-status#_porcelain_format_version_1
-					// When using `-z` with the porcelain v1 format any submodule changes
-					// are reported as modified M instead of m or single ?. Due to that we
-					// will ignore any changes reported for the submodule folder.
-					if (this.submodules.every(s => !pathEquals(s.path, raw.path))) {
-						workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.MODIFIED, useIcons, renameUri));
-					}
-					break;
-				}
+				case 'M': workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.MODIFIED, useIcons, renameUri)); break;
 				case 'D': workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.DELETED, useIcons, renameUri)); break;
 				case 'A': workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.INTENT_TO_ADD, useIcons, renameUri)); break;
 				case 'R': workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.INTENT_TO_RENAME, useIcons, renameUri)); break;

From 27a8a26b36230b7956c58b313c9e432e685d3cf9 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Mon, 16 Dec 2024 11:38:23 +0100
Subject: [PATCH 248/479] update area labels (#236207)

---
 .vscode/notebooks/my-work.github-issues | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vscode/notebooks/my-work.github-issues b/.vscode/notebooks/my-work.github-issues
index 7577d9626c8..b47a08b5a18 100644
--- a/.vscode/notebooks/my-work.github-issues
+++ b/.vscode/notebooks/my-work.github-issues
@@ -102,7 +102,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode assignee:@me is:open type:issue -label:\"info-needed\" -label:api -label:api-finalization -label:api-proposal -label:authentication -label:bisect-ext -label:bracket-pair-colorization -label:bracket-pair-guides -label:breadcrumbs -label:callhierarchy -label:chrome-devtools -label:code-lens -label:command-center -label:comments -label:config -label:context-keys -label:custom-editors -label:debug -label:debug-console -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor-api -label:editor-autoclosing -label:editor-autoindent -label:editor-bracket-matching -label:editor-clipboard -label:editor-code-actions -label:editor-color-picker -label:editor-columnselect -label:editor-commands -label:editor-comments -label:editor-contrib -label:editor-core -label:editor-drag-and-drop -label:editor-error-widget -label:editor-find -label:editor-folding -label:editor-highlight -label:editor-hover -label:editor-indent-detection -label:editor-indent-guides -label:editor-input -label:editor-input-IME -label:editor-insets -label:editor-minimap -label:editor-multicursor -label:editor-parameter-hints -label:editor-render-whitespace -label:editor-rendering -label:editor-RTL -label:editor-scrollbar -label:editor-sorting -label:editor-sticky-scroll -label:editor-sticky-scroll-decorations -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet-parse -label:extension-activation -label:extension-host -label:extension-prerelease -label:extension-recommendations -label:extension-signature -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-io -label:file-nesting -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:github-repositories -label:gpu -label:grammar -label:grid-widget -label:icon-brand -label:icons-product -label:icons-widget -label:inlay-hints -label:inline-chat -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-playground -label:interactive-window -label:javascript -label:json -label:json-sorting -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:L10N -label:l10n-platform -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list-widget -label:live-preview -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:merge-editor -label:merge-editor-workbench -label:monaco-editor -label:multi-monitor -label:native-file-dialog -label:network -label:notebook -label:notebook-accessibility -label:notebook-api -label:notebook-builtin-renderers -label:notebook-cell-editor -label:notebook-celltoolbar -label:notebook-clipboard -label:notebook-code-actions -label:notebook-commands -label:notebook-commenting -label:notebook-debugging -label:notebook-diff -label:notebook-dnd -label:notebook-execution -label:notebook-find -label:notebook-folding -label:notebook-format -label:notebook-getting-started -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-kernel-picker -label:notebook-language -label:notebook-layout -label:notebook-markdown -label:notebook-minimap -label:notebook-multiselect -label:notebook-output -label:notebook-perf -label:notebook-remote -label:notebook-rendering -label:notebook-serialization -label:notebook-statusbar -label:notebook-sticky-scroll -label:notebook-toc-outline -label:notebook-undo-redo -label:notebook-variables -label:notebook-workbench-integration -label:notebook-workflow -label:open-editors -label:opener -label:outline -label:output -label:packaging -label:panel-chat -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-open -label:quick-pick -label:quickpick-chat -label:references-viewlet -label:release-notes -label:remote -label:remote-connection -label:remote-desktop -label:remote-explorer -label:remote-tunnel -label:rename -label:runCommands -label:sandbox -label:sash-widget -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:server -label:settings-editor -label:settings-search -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview-widget -label:ssh -label:suggest -label:system-context-menu -label:table-widget -label:tasks -label:telemetry -label:terminal -label:terminal-accessibility -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-find -label:terminal-input -label:terminal-layout -label:terminal-links -label:terminal-local-echo -label:terminal-persistence -label:terminal-process -label:terminal-profiles -label:terminal-quick-fix -label:terminal-rendering -label:terminal-shell-bash -label:terminal-shell-cmd -label:terminal-shell-fish -label:terminal-shell-git-bash -label:terminal-shell-integration -label:terminal-shell-pwsh -label:terminal-shell-zsh -label:terminal-tabs -label:testing -label:themes -label:timeline -label:timeline-git -label:timeline-local-history -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typescript -label:unc -label:undo-redo -label:unicode-highlight -label:uri -label:user-profiles -label:ux -label:variable-resolving -label:VIM -label:virtual-documents -label:virtual-workspaces -label:vscode-website -label:vscode.dev -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-auxwindow -label:workbench-banner -label:workbench-cli -label:workbench-diagnostics -label:workbench-dnd -label:workbench-editor-grid -label:workbench-editor-groups -label:workbench-editor-resolver -label:workbench-editors -label:workbench-electron -label:workbench-fonts -label:workbench-history -label:workbench-hot-exit -label:workbench-hover -label:workbench-launch -label:workbench-link -label:workbench-multiroot -label:workbench-notifications -label:workbench-os-integration -label:workbench-rapid-render -label:workbench-run-as-admin -label:workbench-state -label:workbench-status -label:workbench-tabs -label:workbench-touchbar -label:workbench-untitled-editors -label:workbench-views -label:workbench-voice -label:workbench-welcome -label:workbench-window -label:workbench-workspace -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom -label:error-list -label:winget"
+    "value": "repo:microsoft/vscode assignee:@me is:open type:issue -label:\"info-needed\" -label:api -label:api-finalization -label:api-proposal -label:authentication -label:bisect-ext -label:bracket-pair-colorization -label:bracket-pair-guides -label:breadcrumbs -label:callhierarchy -label:chrome-devtools -label:code-lens -label:command-center -label:comments -label:config -label:context-keys -label:custom-editors -label:debug -label:debug-console -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor-api -label:editor-autoclosing -label:editor-autoindent -label:editor-bracket-matching -label:editor-clipboard -label:editor-code-actions -label:editor-color-picker -label:editor-columnselect -label:editor-commands -label:editor-comments -label:editor-contrib -label:editor-core -label:editor-drag-and-drop -label:editor-error-widget -label:editor-find -label:editor-folding -label:editor-highlight -label:editor-hover -label:editor-indent-detection -label:editor-indent-guides -label:editor-input -label:editor-input-IME -label:editor-insets -label:editor-minimap -label:editor-multicursor -label:editor-parameter-hints -label:editor-render-whitespace -label:editor-rendering -label:editor-RTL -label:editor-scrollbar -label:editor-sorting -label:editor-sticky-scroll -label:editor-sticky-scroll-decorations -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet-parse -label:extension-activation -label:extension-host -label:extension-prerelease -label:extension-recommendations -label:extension-signature -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-io -label:file-nesting -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:github-repositories -label:gpu -label:grammar -label:grid-widget -label:icon-brand -label:icons-product -label:icons-widget -label:inlay-hints -label:inline-chat -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-playground -label:interactive-window -label:javascript -label:json -label:json-sorting -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:L10N -label:l10n-platform -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list-widget -label:live-preview -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:merge-editor -label:merge-editor-workbench -label:monaco-editor -label:multi-monitor -label:native-file-dialog -label:network -label:notebook -label:notebook-accessibility -label:notebook-api -label:notebook-cell-editor -label:notebook-celltoolbar -label:notebook-clipboard -label:notebook-code-actions -label:notebook-commands -label:notebook-debugging -label:notebook-diff -label:notebook-dnd -label:notebook-execution -label:notebook-find -label:notebook-folding -label:notebook-format -label:notebook-getting-started -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-kernel-picker -label:notebook-language -label:notebook-layout -label:notebook-markdown -label:notebook-output -label:notebook-perf -label:notebook-remote -label:notebook-serialization -label:notebook-statusbar -label:notebook-sticky-scroll -label:notebook-toc-outline -label:notebook-undo-redo -label:notebook-variables -label:notebook-workbench-integration -label:notebook-workflow -label:open-editors -label:opener -label:outline -label:output -label:packaging -label:panel-chat -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-open -label:quick-pick -label:quickpick-chat -label:references-viewlet -label:release-notes -label:remote -label:remote-connection -label:remote-desktop -label:remote-explorer -label:remote-tunnel -label:rename -label:runCommands -label:sandbox -label:sash-widget -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:server -label:settings-editor -label:settings-search -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview-widget -label:ssh -label:suggest -label:system-context-menu -label:table-widget -label:tasks -label:telemetry -label:terminal -label:terminal-accessibility -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-find -label:terminal-input -label:terminal-layout -label:terminal-links -label:terminal-local-echo -label:terminal-persistence -label:terminal-process -label:terminal-profiles -label:terminal-quick-fix -label:terminal-rendering -label:terminal-shell-bash -label:terminal-shell-cmd -label:terminal-shell-fish -label:terminal-shell-git-bash -label:terminal-shell-integration -label:terminal-shell-pwsh -label:terminal-shell-zsh -label:terminal-tabs -label:testing -label:themes -label:timeline -label:timeline-git -label:timeline-local-history -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typescript -label:unc -label:undo-redo -label:unicode-highlight -label:uri -label:user-profiles -label:ux -label:variable-resolving -label:VIM -label:virtual-documents -label:virtual-workspaces -label:vscode-website -label:vscode.dev -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-auxwindow -label:workbench-banner -label:workbench-cli -label:workbench-diagnostics -label:workbench-dnd -label:workbench-editor-grid -label:workbench-editor-groups -label:workbench-editor-resolver -label:workbench-editors -label:workbench-electron -label:workbench-fonts -label:workbench-history -label:workbench-hot-exit -label:workbench-hover -label:workbench-launch -label:workbench-link -label:workbench-multiroot -label:workbench-notifications -label:workbench-os-integration -label:workbench-rapid-render -label:workbench-run-as-admin -label:workbench-state -label:workbench-status -label:workbench-tabs -label:workbench-touchbar -label:workbench-untitled-editors -label:workbench-views -label:workbench-voice -label:workbench-welcome -label:workbench-window -label:workbench-workspace -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom -label:error-list -label:winget -label:cross-file-editing -label:editor-refactor-preview"
   },
   {
     "kind": 1,

From 17320a061adef54978fa300f9395e809df9168e0 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Mon, 16 Dec 2024 11:40:19 +0100
Subject: [PATCH 249/479] Fixing escape does not hide hover  (#236200)

* fixing escape does not work

* making same fix
---
 .../hover/browser/contentHoverController.ts   | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/vs/editor/contrib/hover/browser/contentHoverController.ts b/src/vs/editor/contrib/hover/browser/contentHoverController.ts
index 26a7115f3ad..f7831694948 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverController.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverController.ts
@@ -83,18 +83,17 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 			sticky: hoverOpts.sticky,
 			hidingDelay: hoverOpts.hidingDelay
 		};
-		if (hoverOpts.enabled) {
-			this._listenersStore.add(this._editor.onMouseDown((e: IEditorMouseEvent) => this._onEditorMouseDown(e)));
-			this._listenersStore.add(this._editor.onMouseUp(() => this._onEditorMouseUp()));
-			this._listenersStore.add(this._editor.onMouseMove((e: IEditorMouseEvent) => this._onEditorMouseMove(e)));
-			this._listenersStore.add(this._editor.onKeyDown((e: IKeyboardEvent) => this._onKeyDown(e)));
-			this._listenersStore.add(this._editor.onMouseLeave((e) => this._onEditorMouseLeave(e)));
-			this._listenersStore.add(this._editor.onDidChangeModel(() => this._cancelSchedulerAndHide()));
-			this._listenersStore.add(this._editor.onDidChangeModelContent(() => this._cancelScheduler()));
-			this._listenersStore.add(this._editor.onDidScrollChange((e: IScrollEvent) => this._onEditorScrollChanged(e)));
-		} else {
+		if (!hoverOpts.enabled) {
 			this._cancelSchedulerAndHide();
 		}
+		this._listenersStore.add(this._editor.onMouseDown((e: IEditorMouseEvent) => this._onEditorMouseDown(e)));
+		this._listenersStore.add(this._editor.onMouseUp(() => this._onEditorMouseUp()));
+		this._listenersStore.add(this._editor.onMouseMove((e: IEditorMouseEvent) => this._onEditorMouseMove(e)));
+		this._listenersStore.add(this._editor.onKeyDown((e: IKeyboardEvent) => this._onKeyDown(e)));
+		this._listenersStore.add(this._editor.onMouseLeave((e) => this._onEditorMouseLeave(e)));
+		this._listenersStore.add(this._editor.onDidChangeModel(() => this._cancelSchedulerAndHide()));
+		this._listenersStore.add(this._editor.onDidChangeModelContent(() => this._cancelScheduler()));
+		this._listenersStore.add(this._editor.onDidScrollChange((e: IScrollEvent) => this._onEditorScrollChanged(e)));
 	}
 
 	private _unhookListeners(): void {
@@ -229,9 +228,11 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 		if (!mouseEvent) {
 			return;
 		}
-		const contentWidget: ContentHoverWidgetWrapper = this._getOrCreateContentWidget();
-		if (contentWidget.showsOrWillShow(mouseEvent)) {
-			return;
+		if (this._hoverSettings.enabled) {
+			const contentWidget: ContentHoverWidgetWrapper = this._getOrCreateContentWidget();
+			if (contentWidget.showsOrWillShow(mouseEvent)) {
+				return;
+			}
 		}
 		if (_sticky) {
 			return;

From dc3bf2d878a01e7ef6e0031f59d5be363f8c0ab7 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 16 Dec 2024 11:45:03 +0100
Subject: [PATCH 250/479] Git - fix submodule decoration (#236208)

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

diff --git a/extensions/git/src/decorationProvider.ts b/extensions/git/src/decorationProvider.ts
index ddb3574890b..2e72a1e4114 100644
--- a/extensions/git/src/decorationProvider.ts
+++ b/extensions/git/src/decorationProvider.ts
@@ -118,11 +118,11 @@ class GitDecorationProvider implements FileDecorationProvider {
 	private onDidRunGitStatus(): void {
 		const newDecorations = new Map<string, FileDecoration>();
 
-		this.collectSubmoduleDecorationData(newDecorations);
 		this.collectDecorationData(this.repository.indexGroup, newDecorations);
 		this.collectDecorationData(this.repository.untrackedGroup, newDecorations);
 		this.collectDecorationData(this.repository.workingTreeGroup, newDecorations);
 		this.collectDecorationData(this.repository.mergeGroup, newDecorations);
+		this.collectSubmoduleDecorationData(newDecorations);
 
 		const uris = new Set([...this.decorations.keys()].concat([...newDecorations.keys()]));
 		this.decorations = newDecorations;

From 002eaa541a29bba3f6a5194ce49047992c9d6a63 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Mon, 16 Dec 2024 12:11:06 +0100
Subject: [PATCH 251/479] remove console.log fyi @connor4312 (#236209)

---
 src/vs/workbench/contrib/testing/common/testService.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/vs/workbench/contrib/testing/common/testService.ts b/src/vs/workbench/contrib/testing/common/testService.ts
index f75e3145ae8..4f9fbbd8e9a 100644
--- a/src/vs/workbench/contrib/testing/common/testService.ts
+++ b/src/vs/workbench/contrib/testing/common/testService.ts
@@ -210,7 +210,6 @@ export const testsInFile = async function* (testService: ITestService, ident: IU
 			}
 		}
 	}
-	console.log('iterated', n, 'times');
 };
 
 /**

From 1bbe4e9d96e0ee30a1fa5fdeb3aeddb947bae871 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Mon, 16 Dec 2024 12:15:15 +0100
Subject: [PATCH 252/479] Focus panel if maximized otherwise editor (#236211)

fix #205584
---
 src/vs/workbench/browser/layout.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index ca6cb860397..b60d2864283 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -1249,7 +1249,11 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 	}
 
 	focus(): void {
-		this.focusPart(Parts.EDITOR_PART, getWindow(this.activeContainer));
+		if (this.isPanelMaximized() && this.mainContainer === this.activeContainer) {
+			this.focusPart(Parts.PANEL_PART);
+		} else {
+			this.focusPart(Parts.EDITOR_PART, getWindow(this.activeContainer));
+		}
 	}
 
 	private focusPanelOrEditor(): void {

From 188b1f1b31cfd10448c19421bde0a528f41e13d5 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Mon, 16 Dec 2024 03:15:28 -0800
Subject: [PATCH 253/479] Only add additional margin on hover children with bg

Fixes #228136
---
 src/vs/base/browser/ui/hover/hoverWidget.css | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/vs/base/browser/ui/hover/hoverWidget.css b/src/vs/base/browser/ui/hover/hoverWidget.css
index e6b088e3301..c8138b37c16 100644
--- a/src/vs/base/browser/ui/hover/hoverWidget.css
+++ b/src/vs/base/browser/ui/hover/hoverWidget.css
@@ -176,12 +176,23 @@
 	color: var(--vscode-textLink-activeForeground);
 }
 
-/** Spans in markdown hovers need a margin-bottom to avoid looking cramped: https://github.com/microsoft/vscode/issues/101496 **/
-.monaco-hover .markdown-hover .hover-contents:not(.code-hover-contents):not(.html-hover-contents) span {
+/**
+ * Spans in markdown hovers need a margin-bottom to avoid looking cramped:
+ * https://github.com/microsoft/vscode/issues/101496
+
+ * This was later refined to only apply when the last child of a rendered markdown block (before the
+ * border or a `hr`) uses background color:
+ * https://github.com/microsoft/vscode/issues/228136
+ */
+.monaco-hover .markdown-hover .hover-contents:not(.code-hover-contents):not(.html-hover-contents) p:last-child [style*="background-color"] {
 	margin-bottom: 4px;
 	display: inline-block;
 }
 
+/**
+ * Add a slight margin to try vertically align codicons with any text
+ * https://github.com/microsoft/vscode/issues/221359
+ */
 .monaco-hover .markdown-hover .hover-contents:not(.code-hover-contents):not(.html-hover-contents) span.codicon {
 	margin-bottom: 2px;
 }

From 0c995148f461418349157adad18d38eb0987a5c8 Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Mon, 16 Dec 2024 13:27:29 +0100
Subject: [PATCH 254/479] Do not inherit outer editor padding (#236219)

---
 .../inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
index cf7c1f94cf4..096070fb167 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
@@ -235,6 +235,7 @@ export class InlineEditsSideBySideDiff extends Disposable {
 				bracketPairsHorizontal: false,
 				highlightActiveIndentation: false,
 			},
+			padding: { top: 0, bottom: 0 },
 			folding: false,
 			selectOnLineNumbers: false,
 			selectionHighlight: false,

From 7abd349c802187e8fe6231bfc6755c43f34c73ef Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Mon, 16 Dec 2024 15:10:34 +0100
Subject: [PATCH 255/479] Hide Panel (X) tooltip now includes key binding
 (#236062)

* #209193

* fix glitching render
---
 .../parts/auxiliarybar/auxiliaryBarActions.ts | 13 +++-
 .../browser/parts/panel/panelActions.ts       | 61 ++++---------------
 2 files changed, 21 insertions(+), 53 deletions(-)

diff --git a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts
index 575a3aefe8f..3bea858332e 100644
--- a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts
+++ b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts
@@ -11,12 +11,13 @@ import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js'
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 import { AuxiliaryBarVisibleContext } from '../../../common/contextkeys.js';
 import { ViewContainerLocation, ViewContainerLocationToString } from '../../../common/views.js';
-import { IWorkbenchLayoutService, Parts } from '../../../services/layout/browser/layoutService.js';
+import { ActivityBarPosition, IWorkbenchLayoutService, LayoutSettings, Parts } from '../../../services/layout/browser/layoutService.js';
 import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
 import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import { SwitchCompositeViewAction } from '../compositeBarActions.js';
+import { closeIcon } from '../panel/panelActions.js';
 
 const auxiliaryBarRightIcon = registerIcon('auxiliarybar-right-layout-icon', Codicon.layoutSidebarRight, localize('toggleAuxiliaryIconRight', 'Icon to toggle the auxiliary bar off in its right position.'));
 const auxiliaryBarRightOffIcon = registerIcon('auxiliarybar-right-off-layout-icon', Codicon.layoutSidebarRightOff, localize('toggleAuxiliaryIconRightOn', 'Icon to toggle the auxiliary bar on in its right position.'));
@@ -34,10 +35,11 @@ export class ToggleAuxiliaryBarAction extends Action2 {
 			title: ToggleAuxiliaryBarAction.LABEL,
 			toggled: {
 				condition: AuxiliaryBarVisibleContext,
-				title: localize('secondary sidebar', "Secondary Side Bar"),
+				title: localize('closeSecondarySideBar', 'Hide Secondary Side Bar'),
+				icon: closeIcon,
 				mnemonicTitle: localize({ key: 'secondary sidebar mnemonic', comment: ['&& denotes a mnemonic'] }, "Secondary Si&&de Bar"),
 			},
-
+			icon: closeIcon, // Ensures no flickering when using toggled.icon
 			category: Categories.View,
 			f1: true,
 			keybinding: {
@@ -54,6 +56,11 @@ export class ToggleAuxiliaryBarAction extends Action2 {
 					id: MenuId.MenubarAppearanceMenu,
 					group: '2_workbench_layout',
 					order: 2
+				}, {
+					id: MenuId.AuxiliaryBarTitle,
+					group: 'navigation',
+					order: 2,
+					when: ContextKeyExpr.equals(`config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`, ActivityBarPosition.DEFAULT)
 				}
 			]
 		});
diff --git a/src/vs/workbench/browser/parts/panel/panelActions.ts b/src/vs/workbench/browser/parts/panel/panelActions.ts
index c9250e36e84..e8fbbacb68a 100644
--- a/src/vs/workbench/browser/parts/panel/panelActions.ts
+++ b/src/vs/workbench/browser/parts/panel/panelActions.ts
@@ -8,8 +8,8 @@ import { localize, localize2 } from '../../../../nls.js';
 import { KeyMod, KeyCode } from '../../../../base/common/keyCodes.js';
 import { MenuId, MenuRegistry, registerAction2, Action2, IAction2Options } from '../../../../platform/actions/common/actions.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
-import { ActivityBarPosition, isHorizontal, IWorkbenchLayoutService, LayoutSettings, PanelAlignment, Parts, Position, positionToString } from '../../../services/layout/browser/layoutService.js';
-import { AuxiliaryBarVisibleContext, PanelAlignmentContext, PanelMaximizedContext, PanelPositionContext, PanelVisibleContext } from '../../../common/contextkeys.js';
+import { isHorizontal, IWorkbenchLayoutService, PanelAlignment, Parts, Position, positionToString } from '../../../services/layout/browser/layoutService.js';
+import { PanelAlignmentContext, PanelMaximizedContext, PanelPositionContext, PanelVisibleContext } from '../../../common/contextkeys.js';
 import { ContextKeyExpr, ContextKeyExpression } from '../../../../platform/contextkey/common/contextkey.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
@@ -24,7 +24,7 @@ import { SwitchCompositeViewAction } from '../compositeBarActions.js';
 
 const maximizeIcon = registerIcon('panel-maximize', Codicon.chevronUp, localize('maximizeIcon', 'Icon to maximize a panel.'));
 const restoreIcon = registerIcon('panel-restore', Codicon.chevronDown, localize('restoreIcon', 'Icon to restore a panel.'));
-const closeIcon = registerIcon('panel-close', Codicon.close, localize('closeIcon', 'Icon to close a panel.'));
+export const closeIcon = registerIcon('panel-close', Codicon.close, localize('closeIcon', 'Icon to close a panel.'));
 const panelIcon = registerIcon('panel-layout-icon', Codicon.layoutPanel, localize('togglePanelOffIcon', 'Icon to toggle the panel off when it is on.'));
 const panelOffIcon = registerIcon('panel-layout-icon-off', Codicon.layoutPanelOff, localize('togglePanelOnIcon', 'Icon to toggle the panel on when it is off.'));
 
@@ -39,9 +39,11 @@ export class TogglePanelAction extends Action2 {
 			title: TogglePanelAction.LABEL,
 			toggled: {
 				condition: PanelVisibleContext,
-				title: localize('toggle panel', "Panel"),
+				title: localize('closePanel', 'Hide Panel'),
+				icon: closeIcon,
 				mnemonicTitle: localize({ key: 'toggle panel mnemonic', comment: ['&& denotes a mnemonic'] }, "&&Panel"),
 			},
+			icon: closeIcon, // Ensures no flickering when using toggled.icon
 			f1: true,
 			category: Categories.View,
 			keybinding: { primary: KeyMod.CtrlCmd | KeyCode.KeyJ, weight: KeybindingWeight.WorkbenchContrib },
@@ -54,7 +56,11 @@ export class TogglePanelAction extends Action2 {
 					id: MenuId.LayoutControlMenuSubmenu,
 					group: '0_workbench_layout',
 					order: 4
-				},
+				}, {
+					id: MenuId.PanelTitle,
+					group: 'navigation',
+					order: 2
+				}
 			]
 		});
 	}
@@ -288,51 +294,6 @@ registerAction2(class extends Action2 {
 	}
 });
 
-registerAction2(class extends Action2 {
-	constructor() {
-		super({
-			id: 'workbench.action.closePanel',
-			title: localize2('closePanel', 'Hide Panel'),
-			category: Categories.View,
-			icon: closeIcon,
-			menu: [{
-				id: MenuId.CommandPalette,
-				when: PanelVisibleContext,
-			}, {
-				id: MenuId.PanelTitle,
-				group: 'navigation',
-				order: 2
-			}]
-		});
-	}
-	run(accessor: ServicesAccessor) {
-		accessor.get(IWorkbenchLayoutService).setPartHidden(true, Parts.PANEL_PART);
-	}
-});
-
-registerAction2(class extends Action2 {
-	constructor() {
-		super({
-			id: 'workbench.action.closeAuxiliaryBar',
-			title: localize2('closeSecondarySideBar', 'Hide Secondary Side Bar'),
-			category: Categories.View,
-			icon: closeIcon,
-			menu: [{
-				id: MenuId.CommandPalette,
-				when: AuxiliaryBarVisibleContext,
-			}, {
-				id: MenuId.AuxiliaryBarTitle,
-				group: 'navigation',
-				order: 2,
-				when: ContextKeyExpr.equals(`config.${LayoutSettings.ACTIVITY_BAR_LOCATION}`, ActivityBarPosition.DEFAULT)
-			}]
-		});
-	}
-	run(accessor: ServicesAccessor) {
-		accessor.get(IWorkbenchLayoutService).setPartHidden(true, Parts.AUXILIARYBAR_PART);
-	}
-});
-
 MenuRegistry.appendMenuItems([
 	{
 		id: MenuId.LayoutControlMenu,

From 9b05bdafb3d816d25a23b392fbcf24b6a7285087 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Mon, 16 Dec 2024 15:11:31 +0100
Subject: [PATCH 256/479] * make sure to cancel request when disposing session
 (#236225)

* make sure to stop editing when request is cancalled

fixes https://github.com/microsoft/vscode-copilot/issues/11349
fixes https://github.com/microsoft/vscode-copilot-release/issues/2684
---
 .../contrib/chat/browser/actions/chatClearActions.ts       | 4 ++--
 .../contrib/chat/browser/chatEditing/chatEditingService.ts | 2 --
 .../contrib/chat/browser/chatEditing/chatEditingSession.ts | 7 +++----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
index cbb333f9656..07f9ce1cc93 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.ts
@@ -188,7 +188,7 @@ export function registerNewChatActions() {
 				announceChatCleared(accessibilitySignalService);
 				const widget = widgetService.getWidgetBySessionId(context.sessionId);
 				if (widget) {
-					chatEditingService.currentEditingSessionObs.get()?.stop(true);
+					await chatEditingService.currentEditingSessionObs.get()?.stop(true);
 					widget.clear();
 					widget.attachmentModel.clear();
 					widget.focusInput();
@@ -199,7 +199,7 @@ export function registerNewChatActions() {
 				const widget = chatView.widget;
 
 				announceChatCleared(accessibilitySignalService);
-				chatEditingService.currentEditingSessionObs.get()?.stop(true);
+				await chatEditingService.currentEditingSessionObs.get()?.stop(true);
 				widget.clear();
 				widget.attachmentModel.clear();
 				widget.focusInput();
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts
index af6ffc0640e..4d064636e7a 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts
@@ -328,8 +328,6 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 							if (responseModel.isComplete) {
 								onResponseComplete(responseModel);
 								disposable.dispose();
-							} else if (responseModel.isCanceled || responseModel.isStale) {
-								disposable.dispose();
 							}
 						});
 					}
diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index 6f24595cbad..31e9a672a13 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -6,7 +6,7 @@
 import { ITask, Sequencer, timeout } from '../../../../../base/common/async.js';
 import { BugIndicatingError } from '../../../../../base/common/errors.js';
 import { Emitter } from '../../../../../base/common/event.js';
-import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { Disposable, dispose } from '../../../../../base/common/lifecycle.js';
 import { ResourceMap, ResourceSet } from '../../../../../base/common/map.js';
 import { autorun, derived, IObservable, IReader, ITransaction, observableValue, transaction } from '../../../../../base/common/observable.js';
 import { URI } from '../../../../../base/common/uri.js';
@@ -523,10 +523,9 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 	override dispose() {
 		this._assertNotDisposed();
 
-		for (const entry of this._entriesObs.get()) {
-			entry.dispose();
-		}
+		this._chatService.cancelCurrentRequestForSession(this.chatSessionId);
 
+		dispose(this._entriesObs.get());
 		super.dispose();
 		this._state.set(ChatEditingSessionState.Disposed, undefined);
 		this._onDidDispose.fire();

From 845f0ac17b88e75ed4ff2afd6a9975f36b1d7cb5 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Mon, 16 Dec 2024 15:48:58 +0100
Subject: [PATCH 257/479] Refactoring hover controller (#236228)

refactoring hover computation
---
 .../hover/browser/contentHoverController.ts   | 75 +++++++++----------
 1 file changed, 35 insertions(+), 40 deletions(-)

diff --git a/src/vs/editor/contrib/hover/browser/contentHoverController.ts b/src/vs/editor/contrib/hover/browser/contentHoverController.ts
index f7831694948..e44c40a947d 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverController.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverController.ts
@@ -61,7 +61,11 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 	) {
 		super();
 		this._reactToEditorMouseMoveRunner = this._register(new RunOnceScheduler(
-			() => this._reactToEditorMouseMove(this._mouseMoveEvent), 0
+			() => {
+				if (this._mouseMoveEvent) {
+					this._reactToEditorMouseMove(this._mouseMoveEvent);
+				}
+			}, 0
 		));
 		this._hookListeners();
 		this._register(this._editor.onDidChangeConfiguration((e: ConfigurationChangedEvent) => {
@@ -155,33 +159,49 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 		this.hideContentHover();
 	}
 
-	private _shouldNotRecomputeCurrentHoverWidget(mouseEvent: IEditorMouseEvent): boolean {
-
+	private _shouldKeepCurrentHover(mouseEvent: IEditorMouseEvent): boolean {
+		const contentWidget = this._contentWidget;
+		if (!contentWidget) {
+			return false;
+		}
 		const isHoverSticky = this._hoverSettings.sticky;
-
 		const isMouseOnStickyContentHoverWidget = (mouseEvent: IEditorMouseEvent, isHoverSticky: boolean): boolean => {
 			const isMouseOnContentHoverWidget = this._isMouseOnContentHoverWidget(mouseEvent);
 			return isHoverSticky && isMouseOnContentHoverWidget;
 		};
-		const isMouseOnColorPicker = (mouseEvent: IEditorMouseEvent): boolean => {
+		const isMouseOnColorPickerOrChoosingColor = (mouseEvent: IEditorMouseEvent): boolean => {
+			const isColorPickerVisible = contentWidget.isColorPickerVisible;
 			const isMouseOnContentHoverWidget = this._isMouseOnContentHoverWidget(mouseEvent);
-			const isColorPickerVisible = this._contentWidget?.isColorPickerVisible ?? false;
-			return isMouseOnContentHoverWidget && isColorPickerVisible;
+			const isMouseOnHoverWithColorPicker = isColorPickerVisible && isMouseOnContentHoverWidget;
+			const isMaybeChoosingColor = isColorPickerVisible && this._isMouseDown;
+			return isMouseOnHoverWithColorPicker || isMaybeChoosingColor;
 		};
 		// TODO@aiday-mar verify if the following is necessary code
 		const isTextSelectedWithinContentHoverWidget = (mouseEvent: IEditorMouseEvent, sticky: boolean): boolean => {
-			return (sticky
-				&& this._contentWidget?.containsNode(mouseEvent.event.browserEvent.view?.document.activeElement)
-				&& !mouseEvent.event.browserEvent.view?.getSelection()?.isCollapsed) ?? false;
+			const view = mouseEvent.event.browserEvent.view;
+			if (!view) {
+				return false;
+			}
+			return sticky && contentWidget.containsNode(view.document.activeElement) && !view.getSelection()?.isCollapsed;
 		};
-		return isMouseOnStickyContentHoverWidget(mouseEvent, isHoverSticky)
-			|| isMouseOnColorPicker(mouseEvent)
+		const isFocused = contentWidget.isFocused;
+		const isResizing = contentWidget.isResizing;
+		const isStickyAndVisibleFromKeyboard = this._hoverSettings.sticky && contentWidget.isVisibleFromKeyboard;
+
+		return this.shouldKeepOpenOnEditorMouseMoveOrLeave
+			|| isFocused
+			|| isResizing
+			|| isStickyAndVisibleFromKeyboard
+			|| isMouseOnStickyContentHoverWidget(mouseEvent, isHoverSticky)
+			|| isMouseOnColorPickerOrChoosingColor(mouseEvent)
 			|| isTextSelectedWithinContentHoverWidget(mouseEvent, isHoverSticky);
 	}
 
 	private _onEditorMouseMove(mouseEvent: IEditorMouseEvent): void {
-		const shouldReactToEditorMouseMove = this._shouldReactToEditorMouseMove(mouseEvent);
-		if (!shouldReactToEditorMouseMove) {
+		this._mouseMoveEvent = mouseEvent;
+		const shouldKeepCurrentHover = this._shouldKeepCurrentHover(mouseEvent);
+		if (shouldKeepCurrentHover) {
+			this._reactToEditorMouseMoveRunner.cancel();
 			return;
 		}
 		const shouldRescheduleHoverComputation = this._shouldRescheduleHoverComputation();
@@ -194,28 +214,6 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 		this._reactToEditorMouseMove(mouseEvent);
 	}
 
-	private _shouldReactToEditorMouseMove(mouseEvent: IEditorMouseEvent): boolean {
-		if (this.shouldKeepOpenOnEditorMouseMoveOrLeave) {
-			return false;
-		}
-		this._mouseMoveEvent = mouseEvent;
-		if (this._contentWidget && (this._contentWidget.isFocused || this._contentWidget.isResizing || this._isMouseDown && this._contentWidget.isColorPickerVisible)) {
-			return false;
-		}
-		const sticky = this._hoverSettings.sticky;
-		if (sticky && this._contentWidget?.isVisibleFromKeyboard) {
-			// Sticky mode is on and the hover has been shown via keyboard
-			// so moving the mouse has no effect
-			return false;
-		}
-		const shouldNotRecomputeCurrentHoverWidget = this._shouldNotRecomputeCurrentHoverWidget(mouseEvent);
-		if (shouldNotRecomputeCurrentHoverWidget) {
-			this._reactToEditorMouseMoveRunner.cancel();
-			return false;
-		}
-		return true;
-	}
-
 	private _shouldRescheduleHoverComputation(): boolean {
 		const hidingDelay = this._hoverSettings.hidingDelay;
 		const isContentHoverWidgetVisible = this._contentWidget?.isVisible ?? false;
@@ -224,10 +222,7 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 		return isContentHoverWidgetVisible && this._hoverSettings.sticky && hidingDelay > 0;
 	}
 
-	private _reactToEditorMouseMove(mouseEvent: IEditorMouseEvent | undefined): void {
-		if (!mouseEvent) {
-			return;
-		}
+	private _reactToEditorMouseMove(mouseEvent: IEditorMouseEvent): void {
 		if (this._hoverSettings.enabled) {
 			const contentWidget: ContentHoverWidgetWrapper = this._getOrCreateContentWidget();
 			if (contentWidget.showsOrWillShow(mouseEvent)) {

From 386d58d0dec05465e66185197ef6eb626ad3fb78 Mon Sep 17 00:00:00 2001
From: aslezar <97354675+aslezar@users.noreply.github.com>
Date: Mon, 16 Dec 2024 20:49:16 +0530
Subject: [PATCH 258/479] fixed formattting error

---
 cli/src/util/prereqs.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs
index af48bf0a93a..f8eff34ec39 100644
--- a/cli/src/util/prereqs.rs
+++ b/cli/src/util/prereqs.rs
@@ -274,7 +274,7 @@ fn extract_ldd_version(output: &[u8]) -> Option<SimpleSemver> {
 		major: m.get(1).map_or(0, |s| u32_from_bytes(s.as_bytes())),
 		minor: m.get(2).map_or(0, |s| u32_from_bytes(s.as_bytes())),
 		patch: 0,
-    })
+	})
 }
 
 #[allow(dead_code)]

From 6338f2920cea263c97ed153afa68378906e20c81 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 16 Dec 2024 16:21:01 +0100
Subject: [PATCH 259/479] SCM - quick diff decorators use legancy diff
 algorithm to avoid touching diffs (#236231)

---
 .../contrib/scm/browser/quickDiffModel.ts        | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts b/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts
index e7f97e04082..9907a627c27 100644
--- a/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts
+++ b/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts
@@ -22,7 +22,7 @@ import { Iterable } from '../../../../base/common/iterator.js';
 import { ISplice } from '../../../../base/common/sequence.js';
 import { DiffState } from '../../../../editor/browser/widget/diffEditor/diffEditorViewModel.js';
 import { toLineChanges } from '../../../../editor/browser/widget/diffEditor/diffEditorWidget.js';
-import { LineRangeMapping, lineRangeMappingFromChange } from '../../../../editor/common/diff/rangeMapping.js';
+import { LineRangeMapping } from '../../../../editor/common/diff/rangeMapping.js';
 import { IDiffEditorModel } from '../../../../editor/common/editorCommon.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
@@ -273,16 +273,14 @@ export class QuickDiffModel extends Disposable {
 	}
 
 	private async _diff(original: URI, modified: URI, ignoreTrimWhitespace: boolean): Promise<{ changes: readonly IChange[] | null; changes2: readonly LineRangeMapping[] | null }> {
-		if (this.options?.algorithm === undefined) {
-			const changes = await this.editorWorkerService.computeDirtyDiff(original, modified, ignoreTrimWhitespace);
-			return { changes, changes2: changes?.map(change => lineRangeMappingFromChange(change)) ?? null };
-		}
+		// When no algorithm is specified, we use the legacy diff algorithm along with a 1000ms
+		// timeout as the diff information is being used for the quick diff editor decorations
+		const algorithm = this.options?.algorithm ?? 'legacy';
+		const maxComputationTimeMs = this.options?.algorithm ? Number.MAX_SAFE_INTEGER : 1000;
 
 		const result = await this.editorWorkerService.computeDiff(original, modified, {
-			computeMoves: false,
-			ignoreTrimWhitespace,
-			maxComputationTimeMs: Number.MAX_SAFE_INTEGER
-		}, this.options.algorithm);
+			computeMoves: false, ignoreTrimWhitespace, maxComputationTimeMs
+		}, algorithm);
 
 		return { changes: result ? toLineChanges(DiffState.fromDiffResult(result)) : null, changes2: result?.changes ?? null };
 	}

From 3bbe4568920ffada9fba325985feb39e37bb9fb7 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Mon, 16 Dec 2024 16:23:54 +0100
Subject: [PATCH 260/479] Polish tab bar focus styles (#236232)

polish tab bar focus + :lipstick:
---
 .../parts/editor/media/multieditortabscontrol.css      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css b/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
index d0bb1d3d186..f70426f7d9f 100644
--- a/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
+++ b/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css
@@ -50,7 +50,7 @@
 	display: none;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .title .tab:not([tabIndex="0"]) .tabs-and-actions-container.tabs-border-bottom::after {
+.monaco-workbench .part.editor > .content .editor-group-container > .title .tab:not(.active) .tabs-and-actions-container.tabs-border-bottom::after {
 	content: '';
 	position: absolute;
 	bottom: 0;
@@ -285,22 +285,22 @@
 	width: 100%;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active.tab-border-top > .tab-border-top-container,
-.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.selected.tab-border-top > .tab-border-top-container {
+.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active.tab-border-top:not(:focus) > .tab-border-top-container,
+.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.selected.tab-border-top:not(:focus) > .tab-border-top-container {
 	z-index: 6;
 	top: 0;
 	height: 1px;
 	background-color: var(--tab-border-top-color);
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active.tab-border-bottom:not([tabIndex="0"]) > .tab-border-bottom-container {
+.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active.tab-border-bottom:not(:focus) > .tab-border-bottom-container {
 	z-index: 10;
 	bottom: 0;
 	height: 1px;
 	background-color: var(--tab-border-bottom-color);
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty-border-top > .tab-border-top-container {
+.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty-border-top:not(:focus) > .tab-border-top-container {
 	z-index: 6;
 	top: 0;
 	height: 2px;

From a31ec0d89aa656d684547b33d83c326b79342117 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 16 Dec 2024 16:39:11 +0100
Subject: [PATCH 261/479] GitHub - do not show the "Publish to GitHub" command
 in an empty workspace (#236234)

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

diff --git a/extensions/github/package.json b/extensions/github/package.json
index ece19e32f54..e84b35d19b7 100644
--- a/extensions/github/package.json
+++ b/extensions/github/package.json
@@ -69,7 +69,7 @@
       "commandPalette": [
         {
           "command": "github.publish",
-          "when": "git-base.gitEnabled && remoteName != 'codespaces'"
+          "when": "git-base.gitEnabled && workspaceFolderCount != 0 && remoteName != 'codespaces'"
         },
         {
           "command": "github.copyVscodeDevLink",

From a58957af828dc2a936161e87c4c0ac0a29927e79 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Mon, 16 Dec 2024 16:39:38 +0100
Subject: [PATCH 262/479] fix https://github.com/microsoft/vscode/issues/232918
 (#236233)

---
 .../contrib/inlineChat/browser/inlineChatStrategies.ts        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts
index b77311ce72b..4d8b814e0df 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts
@@ -416,6 +416,10 @@ export class LiveStrategy extends EditModeStrategy {
 					continue;
 				}
 				const hunkRanges = candidate.hunk.getRangesN();
+				if (hunkRanges.length === 0) {
+					// bogous hunk
+					continue;
+				}
 				const myDistance = zoneLine <= hunkRanges[0].startLineNumber
 					? hunkRanges[0].startLineNumber - zoneLine
 					: zoneLine - hunkRanges[0].endLineNumber;

From cb279a8eb2aa96c58f0220bc94b0cde3740365ac Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Mon, 16 Dec 2024 16:55:47 +0100
Subject: [PATCH 263/479] Use position:fixed to make sure to be on top of
 everything in the workbench (#236236)

---
 .../view/inlineEdits/sideBySideDiff.ts        | 19 ++++++++----
 .../browser/view/inlineEdits/utils.ts         | 29 +++++++++++++++++--
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
index 096070fb167..12e853ddcdf 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
@@ -114,7 +114,12 @@ export class InlineEditsSideBySideDiff extends Disposable {
 
 		this._register(this._editorObs.createOverlayWidget({
 			domNode: this._overflowView.element,
-			position: constObservable(null),
+			position: constObservable({
+				preference: {
+					top: 0,
+					left: 0
+				}
+			}),
 			allowEditorOverflow: true,
 			minContentWidthInPx: constObservable(0),
 		}));
@@ -418,7 +423,14 @@ export class InlineEditsSideBySideDiff extends Disposable {
 		}
 		const stickyScrollHeight = this._stickyScrollHeight.read(reader);
 		const top = this._editor.getTopForLineNumber(range.startLineNumber) - this._editorObs.scrollTop.read(reader);
-		return top > stickyScrollHeight;
+		if (top <= stickyScrollHeight) {
+			return false;
+		}
+		const bottom = this._editor.getTopForLineNumber(range.endLineNumberExclusive) - this._editorObs.scrollTop.read(reader);
+		if (bottom >= this._editorObs.layoutInfo.read(reader).height) {
+			return false;
+		}
+		return true;
 	});
 
 
@@ -567,10 +579,7 @@ export class InlineEditsSideBySideDiff extends Disposable {
 	private readonly _overflowView = n.div({
 		class: 'inline-edits-view',
 		style: {
-			position: 'absolute',
 			overflow: 'visible',
-			top: '0px',
-			left: '0px',
 			zIndex: '100',
 			display: this._display,
 		},
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
index 16971c2ebc6..af375cca816 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { h, isSVGElement } from '../../../../../../base/browser/dom.js';
+import { getDomNodePagePosition, h, isSVGElement } from '../../../../../../base/browser/dom.js';
 import { KeybindingLabel, unthemedKeybindingLabelOptions } from '../../../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
 import { numberComparator } from '../../../../../../base/common/arrays.js';
 import { findFirstMin } from '../../../../../../base/common/arraysFind.js';
 import { BugIndicatingError } from '../../../../../../base/common/errors.js';
-import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
-import { derived, IObservable, IReader } from '../../../../../../base/common/observable.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { derived, IObservable, IReader, observableValue, transaction } from '../../../../../../base/common/observable.js';
 import { OS } from '../../../../../../base/common/platform.js';
 import { getIndentationLength, splitLines } from '../../../../../../base/common/strings.js';
 import { URI } from '../../../../../../base/common/uri.js';
@@ -426,3 +426,26 @@ export function mapOutFalsy<T>(obs: IObservable<T | undefined | null | false>):
 		return obs as IObservable<T>;
 	});
 }
+
+export function observeElementPosition(element: HTMLElement, store: DisposableStore) {
+	const topLeft = getDomNodePagePosition(element);
+	const top = observableValue<number>('top', topLeft.top);
+	const left = observableValue<number>('left', topLeft.left);
+
+	const resizeObserver = new ResizeObserver(() => {
+		transaction(tx => {
+			const topLeft = getDomNodePagePosition(element);
+			top.set(topLeft.top, tx);
+			left.set(topLeft.left, tx);
+		});
+	});
+
+	resizeObserver.observe(element);
+
+	store.add(toDisposable(() => resizeObserver.disconnect()));
+
+	return {
+		top,
+		left
+	};
+}

From d3bd083824d2181e5b524696c3077afb7d770e1e Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Mon, 16 Dec 2024 17:20:04 +0100
Subject: [PATCH 264/479] Scroll in the preview editor when necessary (#236241)

---
 .../view/inlineEdits/sideBySideDiff.ts        | 44 ++++++++++++++-----
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
index 12e853ddcdf..481af0ed288 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
@@ -145,9 +145,7 @@ export class InlineEditsSideBySideDiff extends Disposable {
 				return;
 			}
 
-			const editHeight = layoutInfo.editHeight;
-			const width = this._previewEditorWidth.read(reader);
-			this.previewEditor.layout({ height: editHeight, width });
+			this.previewEditor.layout({ height: layoutInfo.editHeight, width: layoutInfo.previewEditorWidth });
 
 			const topEdit = layoutInfo.edit1;
 			this._editorContainer.element.style.top = `${topEdit.y}px`;
@@ -160,6 +158,15 @@ export class InlineEditsSideBySideDiff extends Disposable {
 			this._elements.root.classList.toggle('toolbarDropdownVisible', toolbarDropdownVisible.read(reader));
 		}));*/
 
+		this._register(autorun(reader => {
+			const layoutInfo = this._previewEditorLayoutInfo.read(reader);
+			if (!layoutInfo) {
+				return;
+			}
+
+			this._previewEditorObs.editor.setScrollLeft(layoutInfo.desiredPreviewEditorScrollLeft);
+		}));
+
 		this._editorContainerTopLeft.set(this._previewEditorLayoutInfo.map(i => i?.edit1), undefined);
 	}
 
@@ -330,7 +337,7 @@ export class InlineEditsSideBySideDiff extends Disposable {
 	/**
 	 * ![test](./layout.dio.svg)
 	*/
-	private readonly _previewEditorLayoutInfo = derived(this, (reader) => {//
+	private readonly _previewEditorLayoutInfo = derived(this, (reader) => {
 		const inlineEdit = this._edit.read(reader);
 		if (!inlineEdit) {
 			return null;
@@ -346,11 +353,13 @@ export class InlineEditsSideBySideDiff extends Disposable {
 
 		const editorContentMaxWidthInRange = maxContentWidthInRange(this._editorObs, state.originalDisplayRange, reader);
 		const editorLayout = this._editorObs.layoutInfo.read(reader);
-		const previewWidth = this._previewEditorWidth.read(reader);
+		const previewContentWidth = this._previewEditorWidth.read(reader);
 		const editorContentAreaWidth = editorLayout.contentWidth - editorLayout.verticalScrollbarWidth;
-		const clientContentAreaRight = editorLayout.contentLeft + editorLayout.contentWidth + this._editor.getContainerDomNode().getBoundingClientRect().left;
+		const editorBoundingClientRect = this._editor.getContainerDomNode().getBoundingClientRect();
+		const clientContentAreaRight = editorLayout.contentLeft + editorLayout.contentWidth + editorBoundingClientRect.left;
 		const remainingWidthRightOfContent = getWindow(this._editor.getContainerDomNode()).outerWidth - clientContentAreaRight;
-		const desiredMinimumWidth = Math.min(editorLayout.contentWidth * 0.3, previewWidth, 100);
+		const remainingWidthRightOfEditor = getWindow(this._editor.getContainerDomNode()).outerWidth - editorBoundingClientRect.right;
+		const desiredMinimumWidth = Math.min(editorLayout.contentWidth * 0.3, previewContentWidth, 100);
 		const IN_EDITOR_DISPLACEMENT = 0;
 		const maximumAvailableWidth = IN_EDITOR_DISPLACEMENT + remainingWidthRightOfContent;
 
@@ -367,12 +376,20 @@ export class InlineEditsSideBySideDiff extends Disposable {
 		);
 		const previewEditorLeftInTextArea = Math.min(editorContentMaxWidthInRange + 20, maxPreviewEditorLeft);
 
-		const previewEditorLeft = editorLayout.contentLeft + previewEditorLeftInTextArea;
-		const maxContentWidth = editorContentMaxWidthInRange + 20 + previewWidth + 70;
+		const maxContentWidth = editorContentMaxWidthInRange + 20 + previewContentWidth + 70;
 
 		const dist = maxPreviewEditorLeft - previewEditorLeftInTextArea;
 
-		const left = Math.max(editorLayout.contentLeft, previewEditorLeft - horizontalScrollOffset);
+		let desiredPreviewEditorScrollLeft;
+		let left;
+		if (previewEditorLeftInTextArea > horizontalScrollOffset) {
+			desiredPreviewEditorScrollLeft = 0;
+			left = editorLayout.contentLeft + previewEditorLeftInTextArea - horizontalScrollOffset;
+		} else {
+			desiredPreviewEditorScrollLeft = horizontalScrollOffset - previewEditorLeftInTextArea;
+			left = editorLayout.contentLeft;
+
+		}
 
 		const selectionTop = this._originalVerticalStartPosition.read(reader) ?? this._editor.getTopForLineNumber(range.startLineNumber) - this._editorObs.scrollTop.read(reader);
 		const selectionBottom = this._originalVerticalEndPosition.read(reader) ?? this._editor.getTopForLineNumber(range.endLineNumberExclusive) - this._editorObs.scrollTop.read(reader);
@@ -394,6 +411,8 @@ export class InlineEditsSideBySideDiff extends Disposable {
 		const codeEditDist = codeEditDistRange.clip(dist);
 		const editHeight = this._editor.getOption(EditorOption.lineHeight) * inlineEdit.modifiedLineRange.length;
 
+		const previewEditorWidth = remainingWidthRightOfEditor + editorLayout.width - editorLayout.contentLeft - codeEditDist;
+
 		const edit1 = new Point(left + codeEditDist, selectionTop);
 		const edit2 = new Point(left + codeEditDist, selectionTop + editHeight);
 
@@ -407,9 +426,10 @@ export class InlineEditsSideBySideDiff extends Disposable {
 			edit1,
 			edit2,
 			editHeight,
-			previewEditorLeft,
 			maxContentWidth,
 			shouldShowShadow: clipped,
+			desiredPreviewEditorScrollLeft,
+			previewEditorWidth
 		};
 	});
 
@@ -437,7 +457,7 @@ export class InlineEditsSideBySideDiff extends Disposable {
 	private readonly _extendedModifiedPath = derived(reader => {
 		const layoutInfo = this._previewEditorLayoutInfo.read(reader);
 		if (!layoutInfo) { return undefined; }
-		const width = this._previewEditorWidth.read(reader);
+		const width = layoutInfo.previewEditorWidth;
 		const extendedModifiedPathBuilder = new PathBuilder()
 			.moveTo(layoutInfo.code1)
 			.lineTo(layoutInfo.edit1)

From 4fa8dfa8e1299ac7dbf0da21bc04f3f0b055e64f Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Mon, 16 Dec 2024 17:42:26 +0100
Subject: [PATCH 265/479] set `insertMode: replace` mode for snippets (#236245)

---
 extensions/json-language-features/package.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json
index cb6bc601e1d..ff620435b98 100644
--- a/extensions/json-language-features/package.json
+++ b/extensions/json-language-features/package.json
@@ -139,6 +139,12 @@
           "strings": true
         },
         "editor.suggest.insertMode": "replace"
+      },
+      "[snippets]": {
+        "editor.quickSuggestions": {
+          "strings": true
+        },
+        "editor.suggest.insertMode": "replace"
       }
     },
     "jsonValidation": [

From a6a6e8e3807465c735b27ccca3fa7f86bed34cad Mon Sep 17 00:00:00 2001
From: Bhavya U <bhavyau@microsoft.com>
Date: Mon, 16 Dec 2024 08:45:54 -0800
Subject: [PATCH 266/479] remove width and height attributes from
 multi-file-edits.svg (#236010)

---
 .../welcomeGettingStarted/common/media/multi-file-edits.svg     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/media/multi-file-edits.svg b/src/vs/workbench/contrib/welcomeGettingStarted/common/media/multi-file-edits.svg
index e151a4b95f2..9106074c4c0 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/common/media/multi-file-edits.svg
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/media/multi-file-edits.svg
@@ -1,4 +1,4 @@
-<svg width="631" height="531" viewBox="0 0 631 531" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg viewBox="0 0 631 531" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <g>
     <g>
       <g clip-path="url(#clip0_304_6548)">

From 7e8ac0f74fcfe7b56bc8159fde95b9e31af061e5 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Mon, 16 Dec 2024 17:59:03 +0100
Subject: [PATCH 267/479] Fix titlebar update for longer extension names
 (#236235)

fix #171742
---
 src/vs/workbench/browser/parts/titlebar/titlebarPart.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
index 93a798fa708..3facaf51e23 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
@@ -536,6 +536,10 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
 			this.title.innerText = this.windowTitle.value;
 			this.titleDisposables.add(this.windowTitle.onDidChange(() => {
 				this.title.innerText = this.windowTitle.value;
+				// layout menubar and other renderings in the titlebar
+				if (this.lastLayoutDimensions) {
+					this.updateLayout(this.lastLayoutDimensions);
+				}
 			}));
 		}
 

From 2008c6338cad30260023442561965fc5ec8a01c8 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Mon, 16 Dec 2024 18:23:19 +0100
Subject: [PATCH 268/479] Immediately re-render sticky scroll on pressing Shift
 key (#236244)

immediately rerender
---
 .../browser/stickyScrollController.ts         | 49 +++++++++++++------
 1 file changed, 33 insertions(+), 16 deletions(-)

diff --git a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
index f4ef1a671a9..38e4419456b 100644
--- a/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
+++ b/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
@@ -30,6 +30,7 @@ import { IMouseEvent, StandardMouseEvent } from '../../../../base/browser/mouseE
 import { FoldingController } from '../../folding/browser/folding.js';
 import { FoldingModel, toggleCollapseState } from '../../folding/browser/foldingModel.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
+import { mainWindow } from '../../../../base/browser/window.js';
 
 export interface IStickyScrollController {
 	get stickyScrollCandidateProvider(): IStickyLineCandidateProvider;
@@ -73,6 +74,7 @@ export class StickyScrollController extends Disposable implements IEditorContrib
 	private _endLineNumbers: number[] = [];
 	private _showEndForLine: number | undefined;
 	private _minRebuildFromLine: number | undefined;
+	private _mouseTarget: EventTarget | null = null;
 
 	private readonly _onDidChangeStickyScrollHeight = this._register(new Emitter<{ height: number }>());
 	public readonly onDidChangeStickyScrollHeight = this._onDidChangeStickyScrollHeight.event;
@@ -300,26 +302,26 @@ export class StickyScrollController extends Disposable implements IEditorContrib
 			}
 			this._revealPosition(position);
 		}));
-		this._register(dom.addStandardDisposableListener(stickyScrollWidgetDomNode, dom.EventType.MOUSE_MOVE, (mouseEvent: IMouseEvent) => {
-			if (mouseEvent.shiftKey) {
-				const currentEndForLineIndex = this._stickyScrollWidget.getLineIndexFromChildDomNode(mouseEvent.target);
-				if (currentEndForLineIndex === null || this._showEndForLine !== null && this._showEndForLine === currentEndForLineIndex) {
-					return;
-				}
-				this._showEndForLine = currentEndForLineIndex;
-				this._renderStickyScroll();
-				return;
-			}
-			if (this._showEndForLine !== undefined) {
-				this._showEndForLine = undefined;
-				this._renderStickyScroll();
-			}
-		}));
-		this._register(dom.addDisposableListener(stickyScrollWidgetDomNode, dom.EventType.MOUSE_LEAVE, (e) => {
+		const mouseMoveListener = (mouseEvent: MouseEvent) => {
+			this._mouseTarget = mouseEvent.target;
+			this._onMouseMoveOrKeyDown(mouseEvent);
+		};
+		const keyDownListener = (mouseEvent: KeyboardEvent) => {
+			this._onMouseMoveOrKeyDown(mouseEvent);
+		};
+		const keyUpListener = (e: KeyboardEvent) => {
 			if (this._showEndForLine !== undefined) {
 				this._showEndForLine = undefined;
 				this._renderStickyScroll();
 			}
+		};
+		mainWindow.addEventListener(dom.EventType.MOUSE_MOVE, mouseMoveListener);
+		mainWindow.addEventListener(dom.EventType.KEY_DOWN, keyDownListener);
+		mainWindow.addEventListener(dom.EventType.KEY_UP, keyUpListener);
+		this._register(toDisposable(() => {
+			mainWindow.removeEventListener(dom.EventType.MOUSE_MOVE, mouseMoveListener);
+			mainWindow.removeEventListener(dom.EventType.KEY_DOWN, keyDownListener);
+			mainWindow.removeEventListener(dom.EventType.KEY_UP, keyUpListener);
 		}));
 
 		this._register(gesture.onMouseMoveOrRelevantKeyDown(([mouseEvent, _keyboardEvent]) => {
@@ -403,6 +405,21 @@ export class StickyScrollController extends Disposable implements IEditorContrib
 		});
 	}
 
+	private _onMouseMoveOrKeyDown(mouseEvent: KeyboardEvent | MouseEvent): void {
+		if (!mouseEvent.shiftKey) {
+			return;
+		}
+		if (!this._mouseTarget || !dom.isHTMLElement(this._mouseTarget)) {
+			return;
+		}
+		const currentEndForLineIndex = this._stickyScrollWidget.getLineIndexFromChildDomNode(this._mouseTarget);
+		if (currentEndForLineIndex === null || this._showEndForLine === currentEndForLineIndex) {
+			return;
+		}
+		this._showEndForLine = currentEndForLineIndex;
+		this._renderStickyScroll();
+	}
+
 	private _toggleFoldingRegionForLine(line: number | null) {
 		if (!this._foldingModel || line === null) {
 			return;

From b7f7aeaf81b7e5710f015bd368b8311f6cb5f348 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Mon, 16 Dec 2024 18:33:46 +0100
Subject: [PATCH 269/479] std-in files (/tmp/code-stdin-*) are not removed on
 remote and should have user only access rights (#236251)

---
 src/vs/platform/environment/node/stdin.ts |  7 ++++++-
 src/vs/server/node/server.cli.ts          | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/vs/platform/environment/node/stdin.ts b/src/vs/platform/environment/node/stdin.ts
index c3ecd62f953..93e8e9e5c1e 100644
--- a/src/vs/platform/environment/node/stdin.ts
+++ b/src/vs/platform/environment/node/stdin.ts
@@ -38,12 +38,17 @@ export function getStdinFilePath(): string {
 	return randomPath(tmpdir(), 'code-stdin', 3);
 }
 
+async function createStdInFile(targetPath: string) {
+	await fs.promises.appendFile(targetPath, '');
+	await fs.promises.chmod(targetPath, 0o600); // Ensure the file is only read/writable by the user: https://github.com/microsoft/vscode-remote-release/issues/9048
+}
+
 export async function readFromStdin(targetPath: string, verbose: boolean, onEnd?: Function): Promise<void> {
 
 	let [encoding, iconv] = await Promise.all([
 		resolveTerminalEncoding(verbose),		// respect terminal encoding when piping into file
 		import('@vscode/iconv-lite-umd'),		// lazy load encoding module for usage
-		fs.promises.appendFile(targetPath, '') 	// make sure file exists right away (https://github.com/microsoft/vscode/issues/155341)
+		createStdInFile(targetPath) 			// make sure file exists right away (https://github.com/microsoft/vscode/issues/155341)
 	]);
 
 	if (!iconv.default.encodingExists(encoding)) {
diff --git a/src/vs/server/node/server.cli.ts b/src/vs/server/node/server.cli.ts
index 324a92bf937..7f20588c3bd 100644
--- a/src/vs/server/node/server.cli.ts
+++ b/src/vs/server/node/server.cli.ts
@@ -184,10 +184,11 @@ export async function main(desc: ProductDescription, args: string[]): Promise<vo
 	parsedArgs['_'] = [];
 
 	let readFromStdinPromise: Promise<void> | undefined;
+	let stdinFilePath: string | undefined;
 
 	if (hasReadStdinArg && hasStdinWithoutTty()) {
 		try {
-			let stdinFilePath = cliStdInFilePath;
+			stdinFilePath = cliStdInFilePath;
 			if (!stdinFilePath) {
 				stdinFilePath = getStdinFilePath();
 				const readFromStdinDone = new DeferredPromise<void>();
@@ -351,8 +352,18 @@ export async function main(desc: ProductDescription, args: string[]): Promise<vo
 
 		if (readFromStdinPromise) {
 			await readFromStdinPromise;
+
+		}
+
+		if (waitMarkerFilePath && stdinFilePath) {
+			try {
+				fs.unlinkSync(stdinFilePath);
+			} catch (e) {
+				//ignore
+			}
 		}
 	}
+
 }
 
 function runningInWSL2(): boolean {

From fd9ed2494b4bc2fc87a7224f5e0ccd5b95979bdc Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Mon, 16 Dec 2024 12:51:24 -0600
Subject: [PATCH 270/479] `onCommandExecuted`, hide suggest widget (#236261)

fix #224492
---
 .../terminalContrib/suggest/browser/terminalSuggestAddon.ts      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
index 83c87e8cec2..81476106cf2 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -115,6 +115,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 						this._promptInputModel.onDidFinishInput(() => this.hideSuggestWidget()),
 					);
 				}
+				this._register(commandDetection.onCommandExecuted(() => this.hideSuggestWidget()));
 			} else {
 				this._promptInputModel = undefined;
 			}

From 50dca635cb1ae36023399b4565223f234754f643 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Mon, 16 Dec 2024 13:02:45 -0600
Subject: [PATCH 271/479] add rm from context aria label (#236096)

fix #236094
---
 src/vs/base/browser/ui/button/button.ts       | 20 +++++++++++++------
 .../contrib/chat/browser/chatInputPart.ts     |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/vs/base/browser/ui/button/button.ts b/src/vs/base/browser/ui/button/button.ts
index 36e12cf9f7d..78fbad75c1d 100644
--- a/src/vs/base/browser/ui/button/button.ts
+++ b/src/vs/base/browser/ui/button/button.ts
@@ -28,7 +28,10 @@ import { IActionProvider } from '../dropdown/dropdown.js';
 
 export interface IButtonOptions extends Partial<IButtonStyles> {
 	readonly title?: boolean | string;
-	readonly ariaLabel?: boolean | string;
+	/**
+	 * Will fallback to `title` if not set.
+	 */
+	readonly ariaLabel?: string;
 	readonly supportIcons?: boolean;
 	readonly supportShortLabel?: boolean;
 	readonly secondary?: boolean;
@@ -261,11 +264,7 @@ export class Button extends Disposable implements IButton {
 
 		this.setTitle(title);
 
-		if (typeof this.options.ariaLabel === 'string') {
-			this._element.setAttribute('aria-label', this.options.ariaLabel);
-		} else if (this.options.ariaLabel) {
-			this._element.setAttribute('aria-label', title);
-		}
+		this._setAriaLabel();
 
 		this._label = value;
 	}
@@ -286,7 +285,16 @@ export class Button extends Disposable implements IButton {
 		}
 	}
 
+	private _setAriaLabel(): void {
+		if (typeof this.options.ariaLabel === 'string') {
+			this._element.setAttribute('aria-label', this.options.ariaLabel);
+		} else if (typeof this.options.title === 'string') {
+			this._element.setAttribute('aria-label', this.options.title);
+		}
+	}
+
 	set icon(icon: ThemeIcon) {
+		this._setAriaLabel();
 		this._element.classList.add(...ThemeIcon.asClassNameArray(icon));
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 5ee4df94945..998fcc7afb3 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -980,7 +980,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		const clearButton = new Button(widget, {
 			supportIcons: true,
 			hoverDelegate,
-			title: localize('chat.attachment.clearButton', "Remove from context"),
+			title: localize('chat.attachment.clearButton', "Remove from context")
 		});
 
 		// If this item is rendering in place of the last attached context item, focus the clear button so the user can continue deleting attached context items with the keyboard

From 466eb0be759a7e098aa4d04780e71bb13566bbe2 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Mon, 16 Dec 2024 13:24:42 -0600
Subject: [PATCH 272/479] fix replacement index,length for terminal completions
 (#236260)

fix bugs
---
 .../src/terminalSuggestMain.ts                | 16 +++--
 .../browser/terminalCompletionService.ts      |  4 +-
 .../browser/terminalCompletionService.test.ts | 68 ++++++++++++++++++-
 3 files changed, 78 insertions(+), 10 deletions(-)

diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index c7cdf75406e..4eab00a8659 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -158,12 +158,14 @@ function getLabel(spec: Fig.Spec | Fig.Arg | Fig.Suggestion | string): string[]
 	return spec.name;
 }
 
-function createCompletionItem(commandLine: string, cursorPosition: number, prefix: string, label: string, description?: string, kind?: vscode.TerminalCompletionItemKind): vscode.TerminalCompletionItem {
+function createCompletionItem(cursorPosition: number, prefix: string, label: string, description?: string, kind?: vscode.TerminalCompletionItemKind): vscode.TerminalCompletionItem {
+	const endsWithSpace = prefix.endsWith(' ');
+	const lastWord = endsWithSpace ? '' : prefix.split(' ').at(-1) ?? '';
 	return {
 		label,
 		detail: description ?? '',
-		replacementIndex: commandLine.length - prefix.length >= 0 ? commandLine.length - prefix.length : commandLine[cursorPosition - 1] === ' ' ? cursorPosition : cursorPosition - 1,
-		replacementLength: prefix.length,
+		replacementIndex: cursorPosition - lastWord.length,
+		replacementLength: lastWord.length > 0 ? lastWord.length : cursorPosition,
 		kind: kind ?? vscode.TerminalCompletionItemKind.Method
 	};
 }
@@ -268,7 +270,7 @@ export async function getCompletionItemsFromSpecs(specs: Fig.Spec[], terminalCon
 				|| !!firstCommand && specLabel.startsWith(firstCommand)
 			) {
 				// push it to the completion items
-				items.push(createCompletionItem(terminalContext.commandLine, terminalContext.cursorPosition, prefix, specLabel));
+				items.push(createCompletionItem(terminalContext.cursorPosition, prefix, specLabel));
 			}
 			if (!terminalContext.commandLine.startsWith(specLabel)) {
 				// the spec label is not the first word in the command line, so do not provide options or args
@@ -283,7 +285,7 @@ export async function getCompletionItemsFromSpecs(specs: Fig.Spec[], terminalCon
 					}
 					for (const optionLabel of optionLabels) {
 						if (!items.find(i => i.label === optionLabel) && optionLabel.startsWith(prefix) || (prefix.length > specLabel.length && prefix.trim() === specLabel)) {
-							items.push(createCompletionItem(terminalContext.commandLine, terminalContext.cursorPosition, prefix, optionLabel, option.description, vscode.TerminalCompletionItemKind.Flag));
+							items.push(createCompletionItem(terminalContext.cursorPosition, prefix, optionLabel, option.description, vscode.TerminalCompletionItemKind.Flag));
 						}
 						const expectedText = `${specLabel} ${optionLabel} `;
 						if (!precedingText.includes(expectedText)) {
@@ -331,7 +333,7 @@ export async function getCompletionItemsFromSpecs(specs: Fig.Spec[], terminalCon
 		// Include builitin/available commands in the results
 		for (const command of availableCommands) {
 			if ((!terminalContext.commandLine.trim() || firstCommand && command.startsWith(firstCommand)) && !items.find(item => item.label === command)) {
-				items.push(createCompletionItem(terminalContext.commandLine, terminalContext.cursorPosition, prefix, command));
+				items.push(createCompletionItem(terminalContext.cursorPosition, prefix, command));
 			}
 		}
 	}
@@ -397,7 +399,7 @@ function getCompletionItemsFromArgs(args: Fig.SingleOrArray<Fig.Arg> | undefined
 					}
 					if (suggestionLabel && suggestionLabel.startsWith(currentPrefix.trim())) {
 						const description = typeof suggestion !== 'string' ? suggestion.description : '';
-						items.push(createCompletionItem(terminalContext.commandLine, terminalContext.cursorPosition, wordBefore ?? '', suggestionLabel, description, vscode.TerminalCompletionItemKind.Argument));
+						items.push(createCompletionItem(terminalContext.cursorPosition, wordBefore ?? '', suggestionLabel, description, vscode.TerminalCompletionItemKind.Argument));
 					}
 				}
 			}
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
index ea3b6cf16bf..ebbeae34b59 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts
@@ -249,8 +249,8 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 				kind,
 				isDirectory,
 				isFile: kind === TerminalCompletionItemKind.File,
-				replacementIndex: cursorPosition - lastWord.length > 0 ? cursorPosition - lastWord.length : cursorPosition,
-				replacementLength: lastWord.length > 0 ? lastWord.length : label.length
+				replacementIndex: cursorPosition - lastWord.length,
+				replacementLength: lastWord.length > 0 ? lastWord.length : cursorPosition
 			});
 		}
 
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionService.test.ts b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionService.test.ts
index b3611df7444..3ce17efc700 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionService.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionService.test.ts
@@ -69,6 +69,72 @@ suite('TerminalCompletionService', () => {
 	});
 
 	suite('resolveResources should return folder completions', () => {
+		test('', async () => {
+			const resourceRequestConfig: TerminalResourceRequestConfig = {
+				cwd: URI.parse('file:///test'),
+				foldersRequested: true,
+				pathSeparator
+			};
+			validResources = [URI.parse('file:///test')];
+			const childFolder = { resource: URI.parse('file:///test/folder1/'), name: 'folder1', isDirectory: true, isFile: false };
+			const childFile = { resource: URI.parse('file:///test/file1.txt'), name: 'file1.txt', isDirectory: false, isFile: true };
+			childResources = [childFolder, childFile];
+			const result = await terminalCompletionService.resolveResources(resourceRequestConfig, '', 1);
+			assert(!!result);
+			assert(result.length === 1);
+			assert.deepEqual(result![0], {
+				label: `.${pathSeparator}folder1${pathSeparator}`,
+				kind: TerminalCompletionItemKind.Folder,
+				isDirectory: true,
+				isFile: false,
+				replacementIndex: 1,
+				replacementLength: 1
+			});
+		});
+		test('.', async () => {
+			const resourceRequestConfig: TerminalResourceRequestConfig = {
+				cwd: URI.parse('file:///test'),
+				foldersRequested: true,
+				pathSeparator
+			};
+			validResources = [URI.parse('file:///test')];
+			const childFolder = { resource: URI.parse('file:///test/folder1/'), name: 'folder1', isDirectory: true, isFile: false };
+			const childFile = { resource: URI.parse('file:///test/file1.txt'), name: 'file1.txt', isDirectory: false, isFile: true };
+			childResources = [childFolder, childFile];
+			const result = await terminalCompletionService.resolveResources(resourceRequestConfig, '.', 2);
+			assert(!!result);
+			assert(result.length === 1);
+			assert.deepEqual(result![0], {
+				label: `.${pathSeparator}folder1${pathSeparator}`,
+				kind: TerminalCompletionItemKind.Folder,
+				isDirectory: true,
+				isFile: false,
+				replacementIndex: 1,
+				replacementLength: 1
+			});
+		});
+		test('./', async () => {
+			const resourceRequestConfig: TerminalResourceRequestConfig = {
+				cwd: URI.parse('file:///test'),
+				foldersRequested: true,
+				pathSeparator
+			};
+			validResources = [URI.parse('file:///test')];
+			const childFolder = { resource: URI.parse('file:///test/folder1/'), name: 'folder1', isDirectory: true, isFile: false };
+			const childFile = { resource: URI.parse('file:///test/file1.txt'), name: 'file1.txt', isDirectory: false, isFile: true };
+			childResources = [childFolder, childFile];
+			const result = await terminalCompletionService.resolveResources(resourceRequestConfig, './', 3);
+			assert(!!result);
+			assert(result.length === 1);
+			assert.deepEqual(result![0], {
+				label: `.${pathSeparator}folder1${pathSeparator}`,
+				kind: TerminalCompletionItemKind.Folder,
+				isDirectory: true,
+				isFile: false,
+				replacementIndex: 1,
+				replacementLength: 2
+			});
+		});
 		test('cd ', async () => {
 			const resourceRequestConfig: TerminalResourceRequestConfig = {
 				cwd: URI.parse('file:///test'),
@@ -88,7 +154,7 @@ suite('TerminalCompletionService', () => {
 				isDirectory: true,
 				isFile: false,
 				replacementIndex: 3,
-				replacementLength: 10
+				replacementLength: 3
 			});
 		});
 		test('cd .', async () => {

From 70409435e515cd7fc7951246690b31dbcd382326 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Mon, 16 Dec 2024 20:25:11 +0100
Subject: [PATCH 273/479] debt: remove migrations (#236239)

* debt: remove migrations

* remove migration test
---
 .../common/abstractSynchronizer.ts            | 29 +------------
 .../userDataSync/common/ignoredExtensions.ts  |  8 ----
 .../test/common/synchronizer.test.ts          | 42 -------------------
 3 files changed, 1 insertion(+), 78 deletions(-)

diff --git a/src/vs/platform/userDataSync/common/abstractSynchronizer.ts b/src/vs/platform/userDataSync/common/abstractSynchronizer.ts
index 5f40daba148..dc3b9950ad7 100644
--- a/src/vs/platform/userDataSync/common/abstractSynchronizer.ts
+++ b/src/vs/platform/userDataSync/common/abstractSynchronizer.ts
@@ -593,10 +593,7 @@ export abstract class AbstractSynchroniser extends Disposable implements IUserDa
 	}
 
 	async getLastSyncUserData(): Promise<IRemoteUserData | null> {
-		let storedLastSyncUserDataStateContent = this.getStoredLastSyncUserDataStateContent();
-		if (!storedLastSyncUserDataStateContent) {
-			storedLastSyncUserDataStateContent = await this.migrateLastSyncUserData();
-		}
+		const storedLastSyncUserDataStateContent = this.getStoredLastSyncUserDataStateContent();
 
 		// Last Sync Data state does not exist
 		if (!storedLastSyncUserDataStateContent) {
@@ -704,30 +701,6 @@ export abstract class AbstractSynchroniser extends Disposable implements IUserDa
 		await this.fileService.writeFile(this.lastSyncResource, VSBuffer.fromString(JSON.stringify(lastSyncRemoteUserData)));
 	}
 
-	private async migrateLastSyncUserData(): Promise<string | undefined> {
-		try {
-			const content = await this.fileService.readFile(this.lastSyncResource);
-			const userData = JSON.parse(content.value.toString());
-			await this.fileService.del(this.lastSyncResource);
-			if (userData.ref && userData.content !== undefined) {
-				this.storageService.store(this.lastSyncUserDataStateKey, JSON.stringify({
-					...userData,
-					content: undefined,
-				}), StorageScope.APPLICATION, StorageTarget.MACHINE);
-				await this.writeLastSyncStoredRemoteUserData({ ref: userData.ref, syncData: userData.content === null ? null : JSON.parse(userData.content) });
-			} else {
-				this.logService.info(`${this.syncResourceLogLabel}: Migrating last sync user data. Invalid data.`, userData);
-			}
-		} catch (error) {
-			if (error instanceof FileOperationError && error.fileOperationResult === FileOperationResult.FILE_NOT_FOUND) {
-				this.logService.info(`${this.syncResourceLogLabel}: Migrating last sync user data. Resource does not exist.`);
-			} else {
-				this.logService.error(error);
-			}
-		}
-		return this.storageService.get(this.lastSyncUserDataStateKey, StorageScope.APPLICATION);
-	}
-
 	async getRemoteUserData(lastSyncData: IRemoteUserData | null): Promise<IRemoteUserData> {
 		const { ref, content } = await this.getUserData(lastSyncData);
 		let syncData: ISyncData | null = null;
diff --git a/src/vs/platform/userDataSync/common/ignoredExtensions.ts b/src/vs/platform/userDataSync/common/ignoredExtensions.ts
index 309cb745382..58e7f35f6ec 100644
--- a/src/vs/platform/userDataSync/common/ignoredExtensions.ts
+++ b/src/vs/platform/userDataSync/common/ignoredExtensions.ts
@@ -82,14 +82,6 @@ export class IgnoredExtensionsManagementService implements IIgnoredExtensionsMan
 	}
 
 	private getConfiguredIgnoredExtensions(): ReadonlyArray<string> {
-		let userValue = this.configurationService.inspect<string[]>('settingsSync.ignoredExtensions').userValue;
-		if (userValue !== undefined) {
-			return userValue;
-		}
-		userValue = this.configurationService.inspect<string[]>('sync.ignoredExtensions').userValue;
-		if (userValue !== undefined) {
-			return userValue;
-		}
 		return (this.configurationService.getValue<string[]>('settingsSync.ignoredExtensions') || []).map(id => id.toLowerCase());
 	}
 }
diff --git a/src/vs/platform/userDataSync/test/common/synchronizer.test.ts b/src/vs/platform/userDataSync/test/common/synchronizer.test.ts
index cbc65e458b1..4dfec270711 100644
--- a/src/vs/platform/userDataSync/test/common/synchronizer.test.ts
+++ b/src/vs/platform/userDataSync/test/common/synchronizer.test.ts
@@ -1380,48 +1380,6 @@ suite('TestSynchronizer - Last Sync Data', () => {
 		});
 	});
 
-	test('last sync data is migrated', async () => {
-		await runWithFakedTimers<void>({}, async () => {
-			const storageService = client.instantiationService.get(IStorageService);
-			const fileService = client.instantiationService.get(IFileService);
-			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
-			const machineId = await testObject.getMachineId();
-			await fileService.writeFile(testObject.getLastSyncResource(), VSBuffer.fromString(JSON.stringify({
-				ref: '1',
-				version: 1,
-				content: JSON.stringify({
-					content: '0',
-					machineId,
-					version: 1
-				}),
-				additionalData: {
-					foo: 'bar'
-				}
-			})));
-
-			const actual = await testObject.getLastSyncUserData();
-
-			assert.deepStrictEqual(storageService.get('settings.lastSyncUserData', StorageScope.APPLICATION), JSON.stringify({
-				ref: '1',
-				version: 1,
-				additionalData: {
-					foo: 'bar'
-				}
-			}));
-			assert.deepStrictEqual(actual, {
-				ref: '1',
-				version: 1,
-				syncData: {
-					content: '0',
-					machineId,
-					version: 1
-				},
-				additionalData: {
-					foo: 'bar'
-				}
-			});
-		});
-	});
 });
 
 function assertConflicts(actual: IBaseResourcePreview[], expected: URI[]) {

From a690eb691d5d1f015c10ca0f89b777c4d97d0094 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 16 Dec 2024 20:28:00 +0100
Subject: [PATCH 274/479] Git - only show git blame information for the active
 text editor (#236274)

---
 extensions/git/src/blame.ts | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/extensions/git/src/blame.ts b/extensions/git/src/blame.ts
index 9bb740fdeb2..b625439e15f 100644
--- a/extensions/git/src/blame.ts
+++ b/extensions/git/src/blame.ts
@@ -421,6 +421,8 @@ class GitBlameEditorDecoration {
 		this._disposables.push(this._decorationType);
 
 		workspace.onDidChangeConfiguration(this._onDidChangeConfiguration, this, this._disposables);
+		window.onDidChangeActiveTextEditor(this._onDidChangeActiveTextEditor, this, this._disposables);
+
 		this._controller.onDidChangeBlameInformation(e => this._updateDecorations(e), this, this._disposables);
 	}
 
@@ -439,6 +441,18 @@ class GitBlameEditorDecoration {
 		}
 	}
 
+	private _onDidChangeActiveTextEditor(): void {
+		if (!this._getConfiguration().enabled) {
+			return;
+		}
+
+		for (const editor of window.visibleTextEditors) {
+			if (editor !== window.activeTextEditor) {
+				editor.setDecorations(this._decorationType, []);
+			}
+		}
+	}
+
 	private _getConfiguration(): { enabled: boolean; template: string } {
 		const config = workspace.getConfiguration('git');
 		const enabled = config.get<boolean>('blame.editorDecoration.enabled', false);
@@ -453,15 +467,6 @@ class GitBlameEditorDecoration {
 			return;
 		}
 
-		// Clear decorations for the other editors
-		for (const editor of window.visibleTextEditors) {
-			if (editor === textEditor) {
-				continue;
-			}
-
-			editor.setDecorations(this._decorationType, []);
-		}
-
 		// Only support resources with `file` and `git` schemes
 		if (textEditor.document.uri.scheme !== 'file' && !isGitUri(textEditor.document.uri)) {
 			textEditor.setDecorations(this._decorationType, []);
@@ -543,9 +548,7 @@ class GitBlameStatusBarItem {
 			return;
 		}
 
-		if (window.activeTextEditor) {
-			this._updateStatusBarItem(window.activeTextEditor);
-		} else {
+		if (!window.activeTextEditor) {
 			this._statusBarItem?.hide();
 		}
 	}

From 24b8e3ce99ceccde43b8b19e8f15dc9d548d3c2d Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Mon, 16 Dec 2024 11:36:39 -0800
Subject: [PATCH 275/479] Remove workaround for swiftshader upstream issue

Fixes #236148
---
 .../terminal/browser/xterm/xtermTerminal.ts   | 27 ++-----------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts
index fb5f0ddaf94..5ef6d497196 100644
--- a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts
+++ b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts
@@ -94,7 +94,6 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 	private readonly _capabilities: ITerminalCapabilityStore;
 
 	private static _suggestedRendererType: 'dom' | undefined = undefined;
-	private static _checkedWebglCompatible = false;
 	private _attached?: { container: HTMLElement; options: IXtermAttachToElementOptions };
 	private _isPhysicalMouseWheel = MouseWheelClassifier.INSTANCE.isPhysicalMouseWheel();
 
@@ -667,24 +666,6 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 			return;
 		}
 
-		// Check if the the WebGL renderer is compatible with xterm.js:
-		// - https://github.com/microsoft/vscode/issues/190195
-		// - https://github.com/xtermjs/xterm.js/issues/4665
-		// - https://bugs.chromium.org/p/chromium/issues/detail?id=1476475
-		if (!XtermTerminal._checkedWebglCompatible) {
-			XtermTerminal._checkedWebglCompatible = true;
-			const checkCanvas = document.createElement('canvas');
-			const checkGl = checkCanvas.getContext('webgl2');
-			const debugInfo = checkGl?.getExtension('WEBGL_debug_renderer_info');
-			if (checkGl && debugInfo) {
-				const renderer = checkGl.getParameter(debugInfo.UNMASKED_RENDERER_WEBGL);
-				if (renderer.startsWith('ANGLE (Google, Vulkan 1.3.0 (SwiftShader Device (Subzero)')) {
-					this._disableWebglForThisSession();
-					return;
-				}
-			}
-		}
-
 		const Addon = await this._xtermAddonLoader.importAddon('webgl');
 		this._webglAddon = new Addon();
 		try {
@@ -706,15 +687,11 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 			// }, 5000);
 		} catch (e) {
 			this._logService.warn(`Webgl could not be loaded. Falling back to the DOM renderer`, e);
-			this._disableWebglForThisSession();
+			XtermTerminal._suggestedRendererType = 'dom';
+			this._disposeOfWebglRenderer();
 		}
 	}
 
-	private _disableWebglForThisSession() {
-		XtermTerminal._suggestedRendererType = 'dom';
-		this._disposeOfWebglRenderer();
-	}
-
 	@debounce(100)
 	private async _refreshLigaturesAddon(): Promise<void> {
 		if (!this.raw.element) {

From e678c2e0c83c92fd6136234b4eb18453f7dcc89a Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Mon, 16 Dec 2024 13:43:40 -0600
Subject: [PATCH 276/479] don't filter available commands in the extension
 (#236101)

---
 .../src/terminalSuggestMain.ts                | 19 ++++++++-----------
 .../src/test/terminalSuggestMain.test.ts      |  1 -
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index 4eab00a8659..0c29d9688b1 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -251,7 +251,6 @@ export async function getCompletionItemsFromSpecs(specs: Fig.Spec[], terminalCon
 	const items: vscode.TerminalCompletionItem[] = [];
 	let filesRequested = false;
 	let foldersRequested = false;
-	let specificSuggestionsProvided = false;
 	const firstCommand = getFirstCommand(terminalContext.commandLine);
 	for (const spec of specs) {
 		const specLabels = getLabel(spec);
@@ -297,7 +296,6 @@ export async function getCompletionItemsFromSpecs(specs: Fig.Spec[], terminalCon
 						if (!argsCompletions) {
 							continue;
 						}
-						specificSuggestionsProvided = true;
 						const argCompletions = argsCompletions.items;
 						foldersRequested = foldersRequested || argsCompletions.foldersRequested;
 						filesRequested = filesRequested || argsCompletions.filesRequested;
@@ -305,7 +303,6 @@ export async function getCompletionItemsFromSpecs(specs: Fig.Spec[], terminalCon
 						if (shellIntegrationCwd && (filesRequested || foldersRequested)) {
 							cwd = await resolveCwdFromPrefix(prefix, shellIntegrationCwd) ?? shellIntegrationCwd;
 						}
-						specificSuggestionsProvided = argsCompletions.specificSuggestionsProvided;
 						return { items: argCompletions, filesRequested, foldersRequested, cwd };
 					}
 				}
@@ -322,17 +319,17 @@ export async function getCompletionItemsFromSpecs(specs: Fig.Spec[], terminalCon
 					continue;
 				}
 				items.push(...argsCompletions.items);
-				specificSuggestionsProvided = argsCompletions.specificSuggestionsProvided;
 				filesRequested = filesRequested || argsCompletions.filesRequested;
 				foldersRequested = foldersRequested || argsCompletions.foldersRequested;
 			}
 		}
 	}
-
-	if (!specificSuggestionsProvided && (filesRequested === foldersRequested)) {
+	const shouldShowCommands = !terminalContext.commandLine.substring(0, terminalContext.cursorPosition).trimStart().includes(' ');
+	if (shouldShowCommands && (filesRequested === foldersRequested)) {
 		// Include builitin/available commands in the results
+		const labels = new Set(items.map(i => i.label));
 		for (const command of availableCommands) {
-			if ((!terminalContext.commandLine.trim() || firstCommand && command.startsWith(firstCommand)) && !items.find(item => item.label === command)) {
+			if (!labels.has(command)) {
 				items.push(createCompletionItem(terminalContext.cursorPosition, prefix, command));
 			}
 		}
@@ -361,7 +358,7 @@ export async function getCompletionItemsFromSpecs(specs: Fig.Spec[], terminalCon
 	return { items, filesRequested, foldersRequested, cwd };
 }
 
-function getCompletionItemsFromArgs(args: Fig.SingleOrArray<Fig.Arg> | undefined, currentPrefix: string, terminalContext: { commandLine: string; cursorPosition: number }): { items: vscode.TerminalCompletionItem[]; filesRequested: boolean; foldersRequested: boolean; specificSuggestionsProvided: boolean } | undefined {
+function getCompletionItemsFromArgs(args: Fig.SingleOrArray<Fig.Arg> | undefined, currentPrefix: string, terminalContext: { commandLine: string; cursorPosition: number }): { items: vscode.TerminalCompletionItem[]; filesRequested: boolean; foldersRequested: boolean } | undefined {
 	if (!args) {
 		return;
 	}
@@ -395,7 +392,7 @@ function getCompletionItemsFromArgs(args: Fig.SingleOrArray<Fig.Arg> | undefined
 						continue;
 					}
 					if (!arg.isVariadic && twoWordsBefore === suggestionLabel && wordBefore?.trim() === '') {
-						return { items: [], filesRequested, foldersRequested, specificSuggestionsProvided: false };
+						return { items: [], filesRequested, foldersRequested };
 					}
 					if (suggestionLabel && suggestionLabel.startsWith(currentPrefix.trim())) {
 						const description = typeof suggestion !== 'string' ? suggestion.description : '';
@@ -404,11 +401,11 @@ function getCompletionItemsFromArgs(args: Fig.SingleOrArray<Fig.Arg> | undefined
 				}
 			}
 			if (items.length) {
-				return { items, filesRequested, foldersRequested, specificSuggestionsProvided: true };
+				return { items, filesRequested, foldersRequested };
 			}
 		}
 	}
-	return { items, filesRequested, foldersRequested, specificSuggestionsProvided: false };
+	return { items, filesRequested, foldersRequested };
 }
 
 function osIsWindows(): boolean {
diff --git a/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts b/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts
index c1979b251e2..70694606d99 100644
--- a/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts
+++ b/extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts
@@ -56,7 +56,6 @@ function createCodeTestSpecs(executable: string): ITestSpec2[] {
 		{ input: `${executable} |`, expectedCompletions: codeOptions },
 		{ input: `${executable} --locale |`, expectedCompletions: localeOptions },
 		{ input: `${executable} --diff |`, expectedResourceRequests: { type: 'files', cwd: testCwd } },
-		{ input: `${executable} -di|`, expectedCompletions: codeOptions.filter(o => o.startsWith('di')), expectedResourceRequests: { type: 'both', cwd: testCwd } },
 		{ input: `${executable} --diff ./file1 |`, expectedResourceRequests: { type: 'files', cwd: testCwd } },
 		{ input: `${executable} --merge |`, expectedResourceRequests: { type: 'files', cwd: testCwd } },
 		{ input: `${executable} --merge ./file1 ./file2 |`, expectedResourceRequests: { type: 'files', cwd: testCwd } },

From a09be5db237776197f9c0b1ef51a7043f256c7f3 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Mon, 16 Dec 2024 20:46:57 +0100
Subject: [PATCH 277/479] Bug: setup hangs (fix microsoft/vscode-copilot#11361)
 (#236275)

---
 .../contrib/chat/browser/chatSetup.ts         | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index e814b6acb21..54e081fbc0d 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -574,7 +574,7 @@ class ChatSetupRequests extends Disposable {
 		return this.resolveEntitlement(session, CancellationToken.None);
 	}
 
-	async signUpLimited(session: AuthenticationSession): Promise<boolean> {
+	async signUpLimited(session: AuthenticationSession): Promise<true /* signed up */ | false /* already signed up */ | undefined /* error */> {
 		const body = {
 			restricted_telemetry: this.telemetryService.telemetryLevel === TelemetryLevel.NONE ? 'disabled' : 'enabled',
 			public_code_suggestions: 'enabled'
@@ -583,7 +583,7 @@ class ChatSetupRequests extends Disposable {
 		const response = await this.request(defaultChat.entitlementSignupLimitedUrl, 'POST', body, session, CancellationToken.None);
 		if (!response) {
 			this.onUnknownSignUpError('[chat setup] sign-up: no response');
-			return false;
+			return undefined;
 		}
 
 		if (response.res.statusCode && response.res.statusCode !== 200) {
@@ -594,7 +594,7 @@ class ChatSetupRequests extends Disposable {
 						const responseError: { message: string } = JSON.parse(responseText);
 						if (typeof responseError.message === 'string' && responseError.message) {
 							this.onUnprocessableSignUpError(`[chat setup] sign-up: unprocessable entity (${responseError.message})`, responseError.message);
-							return false;
+							return undefined;
 						}
 					}
 				} catch (error) {
@@ -602,7 +602,7 @@ class ChatSetupRequests extends Disposable {
 				}
 			}
 			this.onUnknownSignUpError(`[chat setup] sign-up: unexpected status code ${response.res.statusCode}`);
-			return false;
+			return undefined;
 		}
 
 		let responseText: string | null = null;
@@ -614,7 +614,7 @@ class ChatSetupRequests extends Disposable {
 
 		if (!responseText) {
 			this.onUnknownSignUpError('[chat setup] sign-up: response has no content');
-			return false;
+			return undefined;
 		}
 
 		let parsedResult: { subscribed: boolean } | undefined = undefined;
@@ -623,20 +623,14 @@ class ChatSetupRequests extends Disposable {
 			this.logService.trace(`[chat setup] sign-up: response is ${responseText}`);
 		} catch (err) {
 			this.onUnknownSignUpError(`[chat setup] sign-up: error parsing response (${err})`);
+			return undefined;
 		}
 
-		const subscribed = Boolean(parsedResult?.subscribed);
-		if (subscribed) {
-			this.logService.trace('[chat setup] sign-up: successfully subscribed');
-		} else {
-			this.logService.error('[chat setup] sign-up: not subscribed');
-		}
-
-		if (subscribed) {
-			this.update({ entitlement: ChatEntitlement.Limited });
-		}
+		// We have made it this far, so the user either did sign-up or was signed-up already.
+		// That is, because the endpoint throws in all other case according to Patrick.
+		this.update({ entitlement: ChatEntitlement.Limited });
 
-		return subscribed;
+		return Boolean(parsedResult?.subscribed);
 	}
 
 	private onUnknownSignUpError(logMessage: string): void {
@@ -824,14 +818,14 @@ class ChatSetupController extends Disposable {
 
 		let installResult: 'installed' | 'cancelled' | 'failedInstall' | undefined = undefined;
 		const wasInstalled = this.context.state.installed;
-		let didSignUp = false;
+		let didSignUp: boolean | undefined = undefined;
 		try {
 			showCopilotView(this.viewsService, this.layoutService);
 
 			if (entitlement !== ChatEntitlement.Limited && entitlement !== ChatEntitlement.Pro && entitlement !== ChatEntitlement.Unavailable) {
 				didSignUp = await this.requests.signUpLimited(session);
 
-				if (!didSignUp) {
+				if (typeof didSignUp === 'undefined' /* error */) {
 					this.telemetryService.publicLog2<InstallChatEvent, InstallChatClassification>('commandCenter.chatInstall', { installResult: 'failedSignUp', signedIn });
 				}
 			}

From 58399f1f6840737cece0a8b6ad065d51422b4987 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 16 Dec 2024 21:22:49 +0100
Subject: [PATCH 278/479] Git - truncate the git blame information after 50
 characters (#236279)

---
 extensions/git/src/blame.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/extensions/git/src/blame.ts b/extensions/git/src/blame.ts
index b625439e15f..916d906a0a2 100644
--- a/extensions/git/src/blame.ts
+++ b/extensions/git/src/blame.ts
@@ -144,6 +144,8 @@ class GitBlameInformationCache {
 }
 
 export class GitBlameController {
+	private readonly _subjectMaxLength = 50;
+
 	private readonly _onDidChangeBlameInformation = new EventEmitter<TextEditor>();
 	public readonly onDidChangeBlameInformation = this._onDidChangeBlameInformation.event;
 
@@ -169,10 +171,14 @@ export class GitBlameController {
 	}
 
 	formatBlameInformationMessage(template: string, blameInformation: BlameInformation): string {
+		const subject = blameInformation.subject && blameInformation.subject.length > this._subjectMaxLength
+			? `${blameInformation.subject.substring(0, this._subjectMaxLength)}\u2026`
+			: blameInformation.subject;
+
 		const templateTokens = {
 			hash: blameInformation.hash,
 			hashShort: blameInformation.hash.substring(0, 8),
-			subject: emojify(blameInformation.subject ?? ''),
+			subject: emojify(subject ?? ''),
 			authorName: blameInformation.authorName ?? '',
 			authorEmail: blameInformation.authorEmail ?? '',
 			authorDate: new Date(blameInformation.authorDate ?? new Date()).toLocaleString(),

From f1a2ce694a2899821233834096cf4acaf9ea81e2 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Mon, 16 Dec 2024 21:52:59 +0100
Subject: [PATCH 279/479] remove rarely used reinstall extension command
 (#236278)

---
 .../abstractExtensionManagementService.ts     |  1 -
 .../common/extensionManagement.ts             |  1 -
 .../common/extensionManagementIpc.ts          |  7 --
 .../node/extensionManagementService.ts        | 22 -------
 .../browser/extensions.contribution.ts        | 13 +---
 .../extensions/browser/extensionsActions.ts   | 66 -------------------
 .../browser/extensionsWorkbenchService.ts     | 11 ----
 .../contrib/extensions/common/extensions.ts   |  1 -
 .../common/extensionManagementService.ts      |  9 ---
 .../common/webExtensionManagementService.ts   |  1 -
 .../test/browser/workbenchTestServices.ts     |  3 -
 11 files changed, 1 insertion(+), 134 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
index 59f359d659c..6b854b0bd87 100644
--- a/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts
@@ -111,7 +111,6 @@ export abstract class CommontExtensionManagementService extends Disposable imple
 	abstract getInstalled(type?: ExtensionType, profileLocation?: URI, productVersion?: IProductVersion): Promise<ILocalExtension[]>;
 	abstract copyExtensions(fromProfileLocation: URI, toProfileLocation: URI): Promise<void>;
 	abstract download(extension: IGalleryExtension, operation: InstallOperation, donotVerifySignature: boolean): Promise<URI>;
-	abstract reinstallFromGallery(extension: ILocalExtension): Promise<ILocalExtension>;
 	abstract cleanUp(): Promise<void>;
 	abstract updateMetadata(local: ILocalExtension, metadata: Partial<Metadata>, profileLocation: URI): Promise<ILocalExtension>;
 }
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index ba8a8e86fee..155079831fc 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -572,7 +572,6 @@ export interface IExtensionManagementService {
 	uninstall(extension: ILocalExtension, options?: UninstallOptions): Promise<void>;
 	uninstallExtensions(extensions: UninstallExtensionInfo[]): Promise<void>;
 	toggleAppliationScope(extension: ILocalExtension, fromProfileLocation: URI): Promise<ILocalExtension>;
-	reinstallFromGallery(extension: ILocalExtension): Promise<ILocalExtension>;
 	getInstalled(type?: ExtensionType, profileLocation?: URI, productVersion?: IProductVersion): Promise<ILocalExtension[]>;
 	getExtensionsControlManifest(): Promise<IExtensionsControlManifest>;
 	copyExtensions(fromProfileLocation: URI, toProfileLocation: URI): Promise<void>;
diff --git a/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts b/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts
index d9542cb5e6a..e20ce088e42 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts
@@ -144,9 +144,6 @@ export class ExtensionManagementChannel implements IServerChannel {
 				const arg: UninstallExtensionInfo[] = args[0];
 				return this.service.uninstallExtensions(arg.map(({ extension, options }) => ({ extension: transformIncomingExtension(extension, uriTransformer), options: transformIncomingOptions(options, uriTransformer) })));
 			}
-			case 'reinstallFromGallery': {
-				return this.service.reinstallFromGallery(transformIncomingExtension(args[0], uriTransformer));
-			}
 			case 'getInstalled': {
 				const extensions = await this.service.getInstalled(args[0], transformIncomingURI(args[1], uriTransformer), args[2]);
 				return extensions.map(e => transformOutgoingExtension(e, uriTransformer));
@@ -299,10 +296,6 @@ export class ExtensionManagementChannelClient extends CommontExtensionManagement
 
 	}
 
-	reinstallFromGallery(extension: ILocalExtension): Promise<ILocalExtension> {
-		return Promise.resolve(this.channel.call<ILocalExtension>('reinstallFromGallery', [extension])).then(local => transformIncomingExtension(local, null));
-	}
-
 	getInstalled(type: ExtensionType | null = null, extensionsProfileResource?: URI, productVersion?: IProductVersion): Promise<ILocalExtension[]> {
 		return Promise.resolve(this.channel.call<ILocalExtension[]>('getInstalled', [type, extensionsProfileResource, productVersion]))
 			.then(extensions => extensions.map(extension => transformIncomingExtension(extension, null)));
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index a55978c612f..92405eefb75 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -8,7 +8,6 @@ import { Promises, Queue } from '../../../base/common/async.js';
 import { VSBuffer } from '../../../base/common/buffer.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { IStringDictionary } from '../../../base/common/collections.js';
-import { toErrorMessage } from '../../../base/common/errorMessage.js';
 import { CancellationError, getErrorMessage } from '../../../base/common/errors.js';
 import { Emitter } from '../../../base/common/event.js';
 import { hash } from '../../../base/common/hash.js';
@@ -215,27 +214,6 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 		return local;
 	}
 
-	async reinstallFromGallery(extension: ILocalExtension): Promise<ILocalExtension> {
-		this.logService.trace('ExtensionManagementService#reinstallFromGallery', extension.identifier.id);
-		if (!this.galleryService.isEnabled()) {
-			throw new Error(nls.localize('MarketPlaceDisabled', "Marketplace is not enabled"));
-		}
-
-		const targetPlatform = await this.getTargetPlatform();
-		const [galleryExtension] = await this.galleryService.getExtensions([{ ...extension.identifier, preRelease: extension.preRelease }], { targetPlatform, compatible: true }, CancellationToken.None);
-		if (!galleryExtension) {
-			throw new Error(nls.localize('Not a Marketplace extension', "Only Marketplace Extensions can be reinstalled"));
-		}
-
-		await this.extensionsScanner.setUninstalled(extension);
-		try {
-			await this.extensionsScanner.removeUninstalledExtension(extension);
-		} catch (e) {
-			throw new Error(nls.localize('removeError', "Error while removing the extension: {0}. Please Quit and Start VS Code before trying again.", toErrorMessage(e)));
-		}
-		return this.installFromGallery(galleryExtension);
-	}
-
 	protected copyExtension(extension: ILocalExtension, fromProfileLocation: URI, toProfileLocation: URI, metadata: Partial<Metadata>): Promise<ILocalExtension> {
 		return this.extensionsScanner.copyExtension(extension, fromProfileLocation, toProfileLocation, metadata);
 	}
diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
index 4a2b68d2f91..4a55c93c25c 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
@@ -14,7 +14,7 @@ import { IExtensionIgnoredRecommendationsService, IExtensionRecommendationsServi
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from '../../../common/contributions.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { VIEWLET_ID, IExtensionsWorkbenchService, IExtensionsViewPaneContainer, TOGGLE_IGNORE_EXTENSION_ACTION_ID, INSTALL_EXTENSION_FROM_VSIX_COMMAND_ID, WORKSPACE_RECOMMENDATIONS_VIEW_ID, IWorkspaceRecommendedExtensionsView, AutoUpdateConfigurationKey, HasOutdatedExtensionsContext, SELECT_INSTALL_VSIX_EXTENSION_COMMAND_ID, LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID, ExtensionEditorTab, THEME_ACTIONS_GROUP, INSTALL_ACTIONS_GROUP, OUTDATED_EXTENSIONS_VIEW_ID, CONTEXT_HAS_GALLERY, extensionsSearchActionsMenu, UPDATE_ACTIONS_GROUP, IExtensionArg, ExtensionRuntimeActionType, EXTENSIONS_CATEGORY } from '../common/extensions.js';
-import { ReinstallAction, InstallSpecificVersionOfExtensionAction, ConfigureWorkspaceRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction, SetColorThemeAction, SetFileIconThemeAction, SetProductIconThemeAction, ClearLanguageAction, ToggleAutoUpdateForExtensionAction, ToggleAutoUpdatesForPublisherAction, TogglePreReleaseExtensionAction, InstallAnotherVersionAction, InstallAction } from './extensionsActions.js';
+import { InstallSpecificVersionOfExtensionAction, ConfigureWorkspaceRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction, SetColorThemeAction, SetFileIconThemeAction, SetProductIconThemeAction, ClearLanguageAction, ToggleAutoUpdateForExtensionAction, ToggleAutoUpdatesForPublisherAction, TogglePreReleaseExtensionAction, InstallAnotherVersionAction, InstallAction } from './extensionsActions.js';
 import { ExtensionsInput } from '../common/extensionsInput.js';
 import { ExtensionEditor } from './extensionEditor.js';
 import { StatusUpdater, MaliciousExtensionChecker, ExtensionsViewletViewsContribution, ExtensionsViewPaneContainer, BuiltInExtensionsContext, SearchMarketplaceExtensionsContext, RecommendedExtensionsContext, DefaultViewsContext, ExtensionsSortByContext, SearchHasTextContext, ExtensionsSearchValueContext } from './extensionsViewlet.js';
@@ -1292,17 +1292,6 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
 			},
 			run: () => runAction(this.instantiationService.createInstance(InstallSpecificVersionOfExtensionAction, InstallSpecificVersionOfExtensionAction.ID, InstallSpecificVersionOfExtensionAction.LABEL))
 		});
-
-		this.registerExtensionAction({
-			id: ReinstallAction.ID,
-			title: { value: ReinstallAction.LABEL, original: 'Reinstall Extension...' },
-			category: Categories.Developer,
-			menu: {
-				id: MenuId.CommandPalette,
-				when: ContextKeyExpr.and(CONTEXT_HAS_GALLERY, ContextKeyExpr.or(CONTEXT_HAS_LOCAL_SERVER, CONTEXT_HAS_REMOTE_SERVER))
-			},
-			run: () => runAction(this.instantiationService.createInstance(ReinstallAction, ReinstallAction.ID, ReinstallAction.LABEL))
-		});
 	}
 
 	// Extension Context Menu
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
index a932e4f9ab5..052e14050eb 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
@@ -2843,72 +2843,6 @@ export class ExtensionStatusAction extends ExtensionAction {
 	}
 }
 
-export class ReinstallAction extends Action {
-
-	static readonly ID = 'workbench.extensions.action.reinstall';
-	static readonly LABEL = localize('reinstall', "Reinstall Extension...");
-
-	constructor(
-		id: string = ReinstallAction.ID, label: string = ReinstallAction.LABEL,
-		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
-		@IExtensionManagementServerService private readonly extensionManagementServerService: IExtensionManagementServerService,
-		@IQuickInputService private readonly quickInputService: IQuickInputService,
-		@INotificationService private readonly notificationService: INotificationService,
-		@IHostService private readonly hostService: IHostService,
-		@IExtensionService private readonly extensionService: IExtensionService
-	) {
-		super(id, label);
-	}
-
-	override get enabled(): boolean {
-		return this.extensionsWorkbenchService.local.filter(l => !l.isBuiltin && l.local).length > 0;
-	}
-
-	override run(): Promise<any> {
-		return this.quickInputService.pick(this.getEntries(), { placeHolder: localize('selectExtensionToReinstall', "Select Extension to Reinstall") })
-			.then(pick => pick && this.reinstallExtension(pick.extension));
-	}
-
-	private getEntries(): Promise<(IQuickPickItem & { extension: IExtension })[]> {
-		return this.extensionsWorkbenchService.queryLocal()
-			.then(local => {
-				const entries = local
-					.filter(extension => !extension.isBuiltin && extension.server !== this.extensionManagementServerService.webExtensionManagementServer)
-					.map(extension => {
-						return {
-							id: extension.identifier.id,
-							label: extension.displayName,
-							description: extension.identifier.id,
-							extension,
-						};
-					});
-				return entries;
-			});
-	}
-
-	private reinstallExtension(extension: IExtension): Promise<void> {
-		return this.extensionsWorkbenchService.openSearch('@installed ')
-			.then(() => {
-				return this.extensionsWorkbenchService.reinstall(extension)
-					.then(extension => {
-						const requireReload = !(extension.local && this.extensionService.canAddExtension(toExtensionDescription(extension.local)));
-						const message = requireReload ? localize('ReinstallAction.successReload', "Please reload Visual Studio Code to complete reinstalling the extension {0}.", extension.identifier.id)
-							: localize('ReinstallAction.success', "Reinstalling the extension {0} is completed.", extension.identifier.id);
-						const actions = requireReload ? [{
-							label: localize('InstallVSIXAction.reloadNow', "Reload Now"),
-							run: () => this.hostService.reload()
-						}] : [];
-						this.notificationService.prompt(
-							Severity.Info,
-							message,
-							actions,
-							{ sticky: true }
-						);
-					}, error => this.notificationService.error(error));
-			});
-	}
-}
-
 export class InstallSpecificVersionOfExtensionAction extends Action {
 
 	static readonly ID = 'workbench.extensions.action.install.specificVersion';
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
index 1a862498873..1a28f0027ee 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
@@ -2618,17 +2618,6 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 			extension.displayName, dependents[0].displayName, dependents[1].displayName);
 	}
 
-	reinstall(extension: IExtension): Promise<IExtension> {
-		return this.doInstall(extension, () => {
-			const ext = extension.local ? extension : this.local.filter(e => areSameExtensions(e.identifier, extension.identifier))[0];
-			const toReinstall: ILocalExtension | null = ext && ext.local ? ext.local : null;
-			if (!toReinstall) {
-				throw new Error('Missing local');
-			}
-			return this.extensionManagementService.reinstallFromGallery(toReinstall);
-		});
-	}
-
 	isExtensionIgnoredToSync(extension: IExtension): boolean {
 		return extension.local ? !this.isInstalledExtensionSynced(extension.local)
 			: this.extensionsSyncManagementService.hasToNeverSyncExtension(extension.identifier.id);
diff --git a/src/vs/workbench/contrib/extensions/common/extensions.ts b/src/vs/workbench/contrib/extensions/common/extensions.ts
index 916628ddc60..4cd9d5ea1d4 100644
--- a/src/vs/workbench/contrib/extensions/common/extensions.ts
+++ b/src/vs/workbench/contrib/extensions/common/extensions.ts
@@ -143,7 +143,6 @@ export interface IExtensionsWorkbenchService {
 	installInServer(extension: IExtension, server: IExtensionManagementServer): Promise<void>;
 	downloadVSIX(extension: string, prerelease: boolean): Promise<void>;
 	uninstall(extension: IExtension): Promise<void>;
-	reinstall(extension: IExtension): Promise<IExtension>;
 	togglePreRelease(extension: IExtension): Promise<void>;
 	canSetLanguage(extension: IExtension): boolean;
 	setLanguage(extension: IExtension): Promise<void>;
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
index 6312b05fe32..d8236828324 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
@@ -256,15 +256,6 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 
 	}
 
-	async reinstallFromGallery(extension: ILocalExtension): Promise<ILocalExtension> {
-		const server = this.getServer(extension);
-		if (server) {
-			await this.checkForWorkspaceTrust(extension.manifest, false);
-			return server.extensionManagementService.reinstallFromGallery(extension);
-		}
-		return Promise.reject(`Invalid location ${extension.location.toString()}`);
-	}
-
 	updateMetadata(extension: ILocalExtension, metadata: Partial<Metadata>): Promise<ILocalExtension> {
 		const server = this.getServer(extension);
 		if (server) {
diff --git a/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts
index 30971801a82..65b49fb7bd1 100644
--- a/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/webExtensionManagementService.ts
@@ -201,7 +201,6 @@ export class WebExtensionManagementService extends AbstractExtensionManagementSe
 	zip(extension: ILocalExtension): Promise<URI> { throw new Error('unsupported'); }
 	getManifest(vsix: URI): Promise<IExtensionManifest> { throw new Error('unsupported'); }
 	download(): Promise<URI> { throw new Error('unsupported'); }
-	reinstallFromGallery(): Promise<ILocalExtension> { throw new Error('unsupported'); }
 
 	async cleanUp(): Promise<void> { }
 
diff --git a/src/vs/workbench/test/browser/workbenchTestServices.ts b/src/vs/workbench/test/browser/workbenchTestServices.ts
index 4a850d040d8..a914f4586d4 100644
--- a/src/vs/workbench/test/browser/workbenchTestServices.ts
+++ b/src/vs/workbench/test/browser/workbenchTestServices.ts
@@ -2226,9 +2226,6 @@ export class TestWorkbenchExtensionManagementService implements IWorkbenchExtens
 	uninstallExtensions(extensions: UninstallExtensionInfo[]): Promise<void> {
 		throw new Error('Method not implemented.');
 	}
-	async reinstallFromGallery(extension: ILocalExtension): Promise<ILocalExtension> {
-		throw new Error('Method not implemented.');
-	}
 	async getInstalled(type?: ExtensionType | undefined): Promise<ILocalExtension[]> { return []; }
 	getExtensionsControlManifest(): Promise<IExtensionsControlManifest> {
 		throw new Error('Method not implemented.');

From 40582112ab4e36a7e01493973f6f2d25148b6cf2 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 16 Dec 2024 21:53:25 +0100
Subject: [PATCH 280/479] SCM - more quick diff cleanup (#236280)

---
 .../contrib/scm/browser/quickDiffModel.ts     | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts b/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts
index 9907a627c27..3d1ec39c3f6 100644
--- a/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts
+++ b/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts
@@ -33,8 +33,14 @@ export const IQuickDiffModelService = createDecorator<IQuickDiffModelService>('I
 
 export interface QuickDiffModelOptions {
 	readonly algorithm: DiffAlgorithmName;
+	readonly maxComputationTimeMs?: number;
 }
 
+const decoratorQuickDiffModelOptions: QuickDiffModelOptions = {
+	algorithm: 'legacy',
+	maxComputationTimeMs: 1000
+};
+
 export interface IQuickDiffModelService {
 	_serviceBrand: undefined;
 
@@ -52,7 +58,7 @@ class QuickDiffModelReferenceCollection extends ReferenceCollection<QuickDiffMod
 		super();
 	}
 
-	protected override createReferencedObject(_key: string, textFileModel: IResolvedTextFileEditorModel, options?: QuickDiffModelOptions): QuickDiffModel {
+	protected override createReferencedObject(_key: string, textFileModel: IResolvedTextFileEditorModel, options: QuickDiffModelOptions): QuickDiffModel {
 		return this._instantiationService.createInstance(QuickDiffModel, textFileModel, options);
 	}
 
@@ -74,16 +80,13 @@ export class QuickDiffModelService implements IQuickDiffModelService {
 		this._references = this.instantiationService.createInstance(QuickDiffModelReferenceCollection);
 	}
 
-	createQuickDiffModelReference(resource: URI, options?: QuickDiffModelOptions): IReference<QuickDiffModel> | undefined {
+	createQuickDiffModelReference(resource: URI, options: QuickDiffModelOptions = decoratorQuickDiffModelOptions): IReference<QuickDiffModel> | undefined {
 		const textFileModel = this.textFileService.files.get(resource);
 		if (!textFileModel?.isResolved()) {
 			return undefined;
 		}
 
-		resource = options === undefined
-			? this.uriIdentityService.asCanonicalUri(resource)
-			: this.uriIdentityService.asCanonicalUri(resource).with({ query: JSON.stringify(options) });
-
+		resource = this.uriIdentityService.asCanonicalUri(resource).with({ query: JSON.stringify(options) });
 		return this._references.acquire(resource.toString(), textFileModel, options);
 	}
 }
@@ -119,7 +122,7 @@ export class QuickDiffModel extends Disposable {
 
 	constructor(
 		textFileModel: IResolvedTextFileEditorModel,
-		private readonly options: QuickDiffModelOptions | undefined,
+		private readonly options: QuickDiffModelOptions,
 		@ISCMService private readonly scmService: ISCMService,
 		@IQuickDiffService private readonly quickDiffService: IQuickDiffService,
 		@IEditorWorkerService private readonly editorWorkerService: IEditorWorkerService,
@@ -273,14 +276,11 @@ export class QuickDiffModel extends Disposable {
 	}
 
 	private async _diff(original: URI, modified: URI, ignoreTrimWhitespace: boolean): Promise<{ changes: readonly IChange[] | null; changes2: readonly LineRangeMapping[] | null }> {
-		// When no algorithm is specified, we use the legacy diff algorithm along with a 1000ms
-		// timeout as the diff information is being used for the quick diff editor decorations
-		const algorithm = this.options?.algorithm ?? 'legacy';
-		const maxComputationTimeMs = this.options?.algorithm ? Number.MAX_SAFE_INTEGER : 1000;
+		const maxComputationTimeMs = this.options.maxComputationTimeMs ?? Number.MAX_SAFE_INTEGER;
 
 		const result = await this.editorWorkerService.computeDiff(original, modified, {
 			computeMoves: false, ignoreTrimWhitespace, maxComputationTimeMs
-		}, algorithm);
+		}, this.options.algorithm);
 
 		return { changes: result ? toLineChanges(DiffState.fromDiffResult(result)) : null, changes2: result?.changes ?? null };
 	}
@@ -361,7 +361,7 @@ export class QuickDiffModel extends Disposable {
 		// When the QuickDiffModel is created for a diff editor, there is no
 		// need to compute the diff information for the `isSCM` quick diff
 		// provider as that information will be provided by the diff editor
-		return this.options?.algorithm !== undefined
+		return this.options.maxComputationTimeMs === undefined
 			? quickDiffs.filter(quickDiff => !quickDiff.isSCM)
 			: quickDiffs;
 	}

From 057dd7b933f684d018a614a1ce03e4db5c3614c9 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Mon, 16 Dec 2024 15:31:45 -0600
Subject: [PATCH 281/479] get `No suggestions` to show up when triggered for
 terminal suggest (#236264)

---
 .../suggest/browser/terminalSuggestAddon.ts   |  3 +--
 .../suggest/browser/simpleSuggestWidget.ts    | 24 ++++++++++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
index 81476106cf2..331d36a2e58 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -42,7 +42,6 @@ export interface ISuggestController {
 	acceptSelectedSuggestion(suggestion?: Pick<ISimpleSelectedSuggestion, 'item' | 'model'>): void;
 	hideSuggestWidget(): void;
 }
-
 export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggestController {
 	private _terminal?: Terminal;
 
@@ -366,7 +365,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		}
 		const suggestWidget = this._ensureSuggestWidget(this._terminal);
 		suggestWidget.setCompletionModel(model);
-		if (model.items.length === 0 || !this._promptInputModel) {
+		if (!this._promptInputModel) {
 			return;
 		}
 		this._model = model;
diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
index 6f22b0d0d77..61fb7437cea 100644
--- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
@@ -59,6 +59,9 @@ export interface IWorkbenchSuggestWidgetOptions {
 
 export class SimpleSuggestWidget extends Disposable {
 
+	private static LOADING_MESSAGE: string = localize('suggestWidget.loading', "Loading...");
+	private static NO_SUGGESTIONS_MESSAGE: string = localize('suggestWidget.noSuggestions', "No suggestions.");
+
 	private _state: State = State.Hidden;
 	private _completionModel?: SimpleCompletionModel;
 	private _cappedHeight?: { wanted: number; capped: number };
@@ -67,6 +70,7 @@ export class SimpleSuggestWidget extends Disposable {
 	private readonly _pendingLayout = this._register(new MutableDisposable());
 
 	readonly element: ResizableHTMLElement;
+	private readonly _messageElement: HTMLElement;
 	private readonly _listElement: HTMLElement;
 	private readonly _list: List<SimpleCompletionItem>;
 	private readonly _status?: SuggestWidgetStatus;
@@ -193,6 +197,8 @@ export class SimpleSuggestWidget extends Disposable {
 			}
 		}));
 
+		this._messageElement = dom.append(this.element.domNode, dom.$('.message'));
+
 		if (options.statusBarMenuId) {
 			this._status = this._register(instantiationService.createInstance(SuggestWidgetStatus, this.element.domNode, options.statusBarMenuId));
 			this.element.domNode.classList.toggle('with-status-bar', true);
@@ -287,7 +293,9 @@ export class SimpleSuggestWidget extends Disposable {
 
 		switch (state) {
 			case State.Hidden:
-				// dom.hide(this._messageElement, this._listElement, this._status.element);
+				if (this._status) {
+					dom.hide(this._messageElement, this._listElement, this._status.element);
+				}
 				dom.hide(this._listElement);
 				if (this._status) {
 					dom.hide(this._status?.element);
@@ -307,30 +315,30 @@ export class SimpleSuggestWidget extends Disposable {
 				break;
 			case State.Loading:
 				this.element.domNode.classList.add('message');
-				// this._messageElement.textContent = SuggestWidget.LOADING_MESSAGE;
+				this._messageElement.textContent = SimpleSuggestWidget.LOADING_MESSAGE;
 				dom.hide(this._listElement);
 				if (this._status) {
 					dom.hide(this._status?.element);
 				}
-				// dom.show(this._messageElement);
+				dom.show(this._messageElement);
 				// this._details.hide();
 				this._show();
 				// this._focusedItem = undefined;
 				break;
 			case State.Empty:
 				this.element.domNode.classList.add('message');
-				// this._messageElement.textContent = SuggestWidget.NO_SUGGESTIONS_MESSAGE;
+				this._messageElement.textContent = SimpleSuggestWidget.NO_SUGGESTIONS_MESSAGE;
 				dom.hide(this._listElement);
 				if (this._status) {
 					dom.hide(this._status?.element);
 				}
-				// dom.show(this._messageElement);
+				dom.show(this._messageElement);
 				// this._details.hide();
 				this._show();
 				// this._focusedItem = undefined;
 				break;
 			case State.Open:
-				// dom.hide(this._messageElement);
+				dom.hide(this._messageElement);
 				dom.show(this._listElement);
 				if (this._status) {
 					dom.show(this._status?.element);
@@ -338,7 +346,7 @@ export class SimpleSuggestWidget extends Disposable {
 				this._show();
 				break;
 			case State.Frozen:
-				// dom.hide(this._messageElement);
+				dom.hide(this._messageElement);
 				dom.show(this._listElement);
 				if (this._status) {
 					dom.show(this._status?.element);
@@ -346,7 +354,7 @@ export class SimpleSuggestWidget extends Disposable {
 				this._show();
 				break;
 			case State.Details:
-				// dom.hide(this._messageElement);
+				dom.hide(this._messageElement);
 				dom.show(this._listElement);
 				if (this._status) {
 					dom.show(this._status?.element);

From d0ecdc1f5551d21f3d7822c8adc026ad4a9bf7e3 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Mon, 16 Dec 2024 16:38:14 -0600
Subject: [PATCH 282/479] get terminal editor's name to persist upon rename
 cancellation (#236281)

fix #235931
---
 src/vs/workbench/contrib/terminal/browser/terminalActions.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
index 45d04fac451..9218eff9f83 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
@@ -1724,7 +1724,9 @@ async function renameWithQuickPick(c: ITerminalServicesCollection, accessor: Ser
 			value: instance.title,
 			prompt: localize('workbench.action.terminal.rename.prompt', "Enter terminal name"),
 		});
-		instance.rename(title);
+		if (title) {
+			instance.rename(title);
+		}
 	}
 }
 

From 8264792d81f87d1524f4c26b07e571a28d3fc24a Mon Sep 17 00:00:00 2001
From: Oleg Solomko <legomushroom@gmail.com>
Date: Mon, 16 Dec 2024 15:07:15 -0800
Subject: [PATCH 283/479] add prompt snippets support (#234220)

* [prompt snippets]: working on recursive file references

* [prompt snippets]: working on file contents codec

* [prompt snippets]: implement the `LinesCodecDecoder`

* [prompt snippets]: working on the `SimpleTokensCodecDecoder`

* [prompt snippets]: implement first version of `PromptSyntaxCodec`

* [prompt snippets]: add `Range` attributes to all the tokens

* [prompt snippets]: refactoring components to standalone files

* [prompt snippets]: move out components to separate files, working on the first unit test

* [prompt snippets]: add the first unit test for `LinesDecoder`

* [prompt snippets]: add first unit test for the `SimpleDecoder`

* [prompt snippets]: refactor `SimpleDecoder` logic

* [prompt snippets]: make `SimpleDecoder` handle `\t` characters and improve unit tests

* [prompt snippets]: add unit tests for the `ChatbotPromptCodec` codec

* [prompt snippets]: add unit test for the `ChatbotPromptReference`

* [prompt snippets]: working on enhancing prompt context

* [prompt snippets]: enahnce working set file references on submit

* [prompt snippets]: cleanup

* [prompt snippets]: implement automatic references resolution on file variable addition

* [prompt snippets]: implement prompt snippets for implicit context files

* [prompt snippets]: improve implicit context file rendering

* [prompt snippets]: remove redundant `ChatReference` class

* [prompt snippets]: `PromptReference` can now subscribe to filesystem changes, added unit test for the `assertDefined` util

* [prompt snippets]: make `LinesDecoder` to also emit `NewLine` tokens, add more unit tests for it

* [prompt snippets]: resolve nested references for dynamic variables and update variable label

* [prompt snippets]: add nested file references to implicit context of prompt request

* [prompt snippets]: variable hover label now includes nested file references

* [prompt snippets]: add the `TestDecoder` and `TestLinesDecoder` reusable test utilities

* [prompt snippets]: add unit tests for `ChatbotPromptDecoder` decoder

* [prompt snippets]: refactor decoders to eliminate static type hacks

* [prompt snippets]: improve `BaseDecoder` logic and docs

* [prompt snippets]: add unit tests for the new reduce-less logic of the stream

* [prompt snippets]: improve doc comments, finish the basic unit test for the `PromptFileReference` class

* [prompt snippets]: finish the main unit test for the `PromptFileReference` class

* [prompt snippets]: make the `PromptFileReference` class ininite-reference-recursion-proof and add approptiate tests

* [prompt snippets]: cleanup

* [prompt snippets]: ensure codecs work well with UTF16 codepoints

* [prompt snippets]: add `randomInt()` utility and related tests

* [prompt snippets]: refactor and add more unit tests

* [prompt snippets]: fix unresolved `Buffer` import reference

* [prompt snippets]: refactor `LinesDecoder` to use `VSBuffer` as underlying data source

* [prompt snippets]: make the `ImplicitContext` to create prompt file reference object only if `prompt-snippets` config value is set

* [prompt snippets]: make the `ChatDynamicVariable` to resolve prompt file reference object only if `prompt-snippets` config value is set

* [prompt snippets]: localize (+N more) labels

* [prompt snippets]: pre PR cleanups

* [prompt snippets]: minor cleanups

* [prompt snippets]: address some PR feedback, fix an unit test issue

* [prompt snippets]: move file to common layers

* [prompt snippets]: move base codec types to base/common

* [prompt snippets]: move more codec files around

* [prompt snippets]: update a code comment

* [prompt snippets]: fix `assert.throws()` API incompatibility issue

* [prompt snippets]: minor cleanup

* [prompt snippets]: improve unit tests for the `PromptFileReference`

* [prompt snippets]: skip unit tests of `PromptFileReference` on Windows for now

* [prompt snippets]: address PR feedback

* [prompt snippets]: add `PromptFileReference.isPromptSnippetFile` getter

* [prompt snippets]: move the `assertDefined` utility to `types.ts`

* use service injection in `PromptFileReference` class

* [prompt snippets]: remove formatting changes

* [prompt snippets]: remove more formatting changes

* [prompt snippets]: revert more formatting changes

* [prompt snippets]: add logic to dispose existing variables in `ChatDynamicVariableModel`

* [prompt snippets]: cleanup

* [prompt snippets]: minor cleanup

* [prompt snippets]: remove redundant disposable registrations, cleanup more formatting changes

* [prompt snippets]: improve cross-platform newline handling, add `vertical tab` and `form feed` tokens

* [prompt snippets]: minor types naming cleanup

* [prompt snippets]: make `ChatPromptCodec` to be a global singleton object and improve doc comments

* [prompt snippets]: address PR feedback

* [prompt snippets]: remove (+N more) label, ensure that `ChatFileReferences` are scoped to files only

* [prompt snippets]: revert changes for the `ImplicitContext`

* [prompt snippets]: cleanup changes in `ChatDynamicVariableModel`

* [prompt snippets]: revert changes in the `ChatRequestParser`

* [prompt snippets]: improve history navigation

* [prompt snippets]: address PR feedback

* [prompt snippets]: allow non-prompt-snippet files to be referenced, but don't parse their contents
---
 src/vs/base/common/codecs/asyncDecoder.ts     |  85 ++++
 src/vs/base/common/codecs/baseDecoder.ts      | 322 ++++++++++++
 src/vs/base/common/codecs/types/ICodec.d.ts   |  22 +
 src/vs/base/common/numbers.ts                 |  62 +++
 src/vs/base/common/stream.ts                  |  36 +-
 src/vs/base/common/types.ts                   |  47 +-
 src/vs/base/test/common/numbers.test.ts       | 177 ++++++-
 src/vs/base/test/common/stream.test.ts        | 100 +++-
 src/vs/base/test/common/types.test.ts         | 130 +++++
 src/vs/editor/common/codecs/baseToken.ts      |  57 +++
 .../common/codecs/linesCodec/linesDecoder.ts  | 213 ++++++++
 .../linesCodec/tokens/carriageReturn.ts       |  59 +++
 .../common/codecs/linesCodec/tokens/line.ts   |  63 +++
 .../codecs/linesCodec/tokens/newLine.ts       |  58 +++
 .../codecs/simpleCodec/simpleDecoder.ts       | 100 ++++
 .../codecs/simpleCodec/tokens/formFeed.ts     |  46 ++
 .../common/codecs/simpleCodec/tokens/space.ts |  46 ++
 .../common/codecs/simpleCodec/tokens/tab.ts   |  47 ++
 .../codecs/simpleCodec/tokens/verticalTab.ts  |  46 ++
 .../common/codecs/simpleCodec/tokens/word.ts  |  72 +++
 .../test/common/codecs/linesDecoder.test.ts   | 140 ++++++
 .../test/common/codecs/simpleDecoder.test.ts  | 111 ++++
 .../editor/test/common/utils/testDecoder.ts   | 115 +++++
 .../contrib/chat/browser/chatInputPart.ts     |  25 +-
 .../contrib/chat/browser/chatWidget.ts        |   2 +-
 .../browser/contrib/chatDynamicVariables.ts   |  96 +++-
 .../chatDynamicVariables/chatFileReference.ts |  79 +++
 .../codecs/chatPromptCodec/chatPromptCodec.ts |  52 ++
 .../chatPromptCodec/chatPromptDecoder.ts      |  45 ++
 .../chatPromptCodec/tokens/fileReference.ts   |  98 ++++
 .../chat/common/promptFileReference.ts        | 414 +++++++++++++++
 .../chat/common/promptFileReferenceErrors.ts  | 129 +++++
 .../common/codecs/chatPromptCodec.test.ts     |  77 +++
 .../common/codecs/chatPromptDecoder.test.ts   |  75 +++
 .../test/common/promptFileReference.test.ts   | 474 ++++++++++++++++++
 35 files changed, 3687 insertions(+), 33 deletions(-)
 create mode 100644 src/vs/base/common/codecs/asyncDecoder.ts
 create mode 100644 src/vs/base/common/codecs/baseDecoder.ts
 create mode 100644 src/vs/base/common/codecs/types/ICodec.d.ts
 create mode 100644 src/vs/editor/common/codecs/baseToken.ts
 create mode 100644 src/vs/editor/common/codecs/linesCodec/linesDecoder.ts
 create mode 100644 src/vs/editor/common/codecs/linesCodec/tokens/carriageReturn.ts
 create mode 100644 src/vs/editor/common/codecs/linesCodec/tokens/line.ts
 create mode 100644 src/vs/editor/common/codecs/linesCodec/tokens/newLine.ts
 create mode 100644 src/vs/editor/common/codecs/simpleCodec/simpleDecoder.ts
 create mode 100644 src/vs/editor/common/codecs/simpleCodec/tokens/formFeed.ts
 create mode 100644 src/vs/editor/common/codecs/simpleCodec/tokens/space.ts
 create mode 100644 src/vs/editor/common/codecs/simpleCodec/tokens/tab.ts
 create mode 100644 src/vs/editor/common/codecs/simpleCodec/tokens/verticalTab.ts
 create mode 100644 src/vs/editor/common/codecs/simpleCodec/tokens/word.ts
 create mode 100644 src/vs/editor/test/common/codecs/linesDecoder.test.ts
 create mode 100644 src/vs/editor/test/common/codecs/simpleDecoder.test.ts
 create mode 100644 src/vs/editor/test/common/utils/testDecoder.ts
 create mode 100644 src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables/chatFileReference.ts
 create mode 100644 src/vs/workbench/contrib/chat/common/codecs/chatPromptCodec/chatPromptCodec.ts
 create mode 100644 src/vs/workbench/contrib/chat/common/codecs/chatPromptCodec/chatPromptDecoder.ts
 create mode 100644 src/vs/workbench/contrib/chat/common/codecs/chatPromptCodec/tokens/fileReference.ts
 create mode 100644 src/vs/workbench/contrib/chat/common/promptFileReference.ts
 create mode 100644 src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
 create mode 100644 src/vs/workbench/contrib/chat/test/common/codecs/chatPromptCodec.test.ts
 create mode 100644 src/vs/workbench/contrib/chat/test/common/codecs/chatPromptDecoder.test.ts
 create mode 100644 src/vs/workbench/contrib/chat/test/common/promptFileReference.test.ts

diff --git a/src/vs/base/common/codecs/asyncDecoder.ts b/src/vs/base/common/codecs/asyncDecoder.ts
new file mode 100644
index 00000000000..efbcf9a7fe4
--- /dev/null
+++ b/src/vs/base/common/codecs/asyncDecoder.ts
@@ -0,0 +1,85 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable } from '../lifecycle.js';
+import { BaseDecoder } from './baseDecoder.js';
+
+/**
+ * Asynchronous interator wrapper for a decoder.
+ */
+export class AsyncDecoder<T extends NonNullable<unknown>, K extends NonNullable<unknown> = NonNullable<unknown>> extends Disposable {
+	// Buffer of messages that have been decoded but not yet consumed.
+	private readonly messages: T[] = [];
+
+	/**
+	 * A transient promise that is resolved when a new event
+	 * is received. Used in the situation when there is no new
+	 * data avaialble and decoder stream did not finish yet,
+	 * hence we need to wait until new event is received.
+	 */
+	private resolveOnNewEvent?: (value: void) => void;
+
+	/**
+	 * @param decoder The decoder instance to wrap.
+	 *
+	 * Note! Assumes ownership of the `decoder` object, hence will `dipose`
+	 * 		 it when the decoder stream is ended.
+	 */
+	constructor(
+		private readonly decoder: BaseDecoder<T, K>,
+	) {
+		super();
+
+		this._register(decoder);
+	}
+
+	/**
+	 * Async iterator implementation.
+	 */
+	async *[Symbol.asyncIterator](): AsyncIterator<T | null> {
+		// callback is called when `data` or `end` event is received
+		const callback = (data?: T) => {
+			if (data !== undefined) {
+				this.messages.push(data);
+			} else {
+				this.decoder.removeListener('data', callback);
+				this.decoder.removeListener('end', callback);
+			}
+
+			// is the promise resolve callback is present,
+			// then call it and remove the reference
+			if (this.resolveOnNewEvent) {
+				this.resolveOnNewEvent();
+				delete this.resolveOnNewEvent;
+			}
+		};
+		this.decoder.on('data', callback);
+		this.decoder.on('end', callback);
+
+		// start flowing the decoder stream
+		this.decoder.start();
+
+		while (true) {
+			const maybeMessage = this.messages.shift();
+			if (maybeMessage !== undefined) {
+				yield maybeMessage;
+				continue;
+			}
+
+			// if no data available and stream ended, we're done
+			if (this.decoder.isEnded) {
+				this.dispose();
+
+				return null;
+			}
+
+			// stream isn't ended so wait for the new
+			// `data` or `end` event to be received
+			await new Promise((resolve) => {
+				this.resolveOnNewEvent = resolve;
+			});
+		}
+	}
+}
diff --git a/src/vs/base/common/codecs/baseDecoder.ts b/src/vs/base/common/codecs/baseDecoder.ts
new file mode 100644
index 00000000000..5404e3df0bf
--- /dev/null
+++ b/src/vs/base/common/codecs/baseDecoder.ts
@@ -0,0 +1,322 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assert } from '../assert.js';
+import { Emitter } from '../event.js';
+import { ReadableStream } from '../stream.js';
+import { AsyncDecoder } from './asyncDecoder.js';
+import { Disposable, IDisposable } from '../lifecycle.js';
+
+/**
+ * Event names of {@link ReadableStream} stream.
+ */
+export type TStreamListenerNames = 'data' | 'error' | 'end';
+
+/**
+ * Base decoder class that can be used to convert stream messages data type
+ * from one type to another. For instance, a stream of binary data can be
+ * "decoded" into a stream of well defined objects.
+ * Intended to be a part of "codec" implementation rather than used directly.
+ */
+export abstract class BaseDecoder<
+	T extends NonNullable<unknown>,
+	K extends NonNullable<unknown> = NonNullable<unknown>,
+> extends Disposable implements ReadableStream<T> {
+	/**
+	 * Flag that indicates if the decoder stream has ended.
+	 */
+	protected ended = false;
+
+	protected readonly _onData = this._register(new Emitter<T>());
+	protected readonly _onEnd = this._register(new Emitter<void>());
+	protected readonly _onError = this._register(new Emitter<Error>());
+
+	/**
+	 * A store of currently registered event listeners.
+	 */
+	private readonly _listeners: Map<TStreamListenerNames, Map<Function, IDisposable>> = new Map();
+
+	/**
+	 * @param stream The input stream to decode.
+	 */
+	constructor(
+		protected readonly stream: ReadableStream<K>,
+	) {
+		super();
+
+		this.tryOnStreamData = this.tryOnStreamData.bind(this);
+		this.onStreamError = this.onStreamError.bind(this);
+		this.onStreamEnd = this.onStreamEnd.bind(this);
+	}
+
+	/**
+	 * This method is called when a new incomming data
+	 * is received from the input stream.
+	 */
+	protected abstract onStreamData(data: K): void;
+
+	/**
+	 * Start receiveing data from the stream.
+	 * @throws if the decoder stream has already ended.
+	 */
+	public start(): this {
+		assert(
+			!this.ended,
+			'Cannot start stream that has already ended.',
+		);
+
+		this.stream.on('data', this.tryOnStreamData);
+		this.stream.on('error', this.onStreamError);
+		this.stream.on('end', this.onStreamEnd);
+
+		// this allows to compose decoders together, - if a decoder
+		// instance is passed as a readble stream to this decoder,
+		// then we need to call `start` on it too
+		if (this.stream instanceof BaseDecoder) {
+			this.stream.start();
+		}
+
+		return this;
+	}
+
+	/**
+	 * Check if the decoder has been ended hence has
+	 * no more data to produce.
+	 */
+	public get isEnded(): boolean {
+		return this.ended;
+	}
+
+	/**
+	 * Automatically catch and dispatch errors thrown inside `onStreamData`.
+	 */
+	private tryOnStreamData(data: K): void {
+		try {
+			this.onStreamData(data);
+		} catch (error) {
+			this.onStreamError(error);
+		}
+	}
+
+	public on(event: 'data', callback: (data: T) => void): void;
+	public on(event: 'error', callback: (err: Error) => void): void;
+	public on(event: 'end', callback: () => void): void;
+	public on(event: TStreamListenerNames, callback: unknown): void {
+		if (event === 'data') {
+			return this.onData(callback as (data: T) => void);
+		}
+
+		if (event === 'error') {
+			return this.onError(callback as (error: Error) => void);
+		}
+
+		if (event === 'end') {
+			return this.onEnd(callback as () => void);
+		}
+
+		throw new Error(`Invalid event name: ${event}`);
+	}
+
+	/**
+	 * Add listener for the `data` event.
+	 * @throws if the decoder stream has already ended.
+	 */
+	public onData(callback: (data: T) => void): void {
+		assert(
+			!this.ended,
+			'Cannot subscribe to the `data` event because the decoder stream has already ended.',
+		);
+
+		let currentListeners = this._listeners.get('data');
+
+		if (!currentListeners) {
+			currentListeners = new Map();
+			this._listeners.set('data', currentListeners);
+		}
+
+		currentListeners.set(callback, this._onData.event(callback));
+	}
+
+	/**
+	 * Add listener for the `error` event.
+	 * @throws if the decoder stream has already ended.
+	 */
+	public onError(callback: (error: Error) => void): void {
+		assert(
+			!this.ended,
+			'Cannot subscribe to the `error` event because the decoder stream has already ended.',
+		);
+
+		let currentListeners = this._listeners.get('error');
+
+		if (!currentListeners) {
+			currentListeners = new Map();
+			this._listeners.set('error', currentListeners);
+		}
+
+		currentListeners.set(callback, this._onError.event(callback));
+	}
+
+	/**
+	 * Add listener for the `end` event.
+	 * @throws if the decoder stream has already ended.
+	 */
+	public onEnd(callback: () => void): void {
+		assert(
+			!this.ended,
+			'Cannot subscribe to the `end` event because the decoder stream has already ended.',
+		);
+
+		let currentListeners = this._listeners.get('end');
+
+		if (!currentListeners) {
+			currentListeners = new Map();
+			this._listeners.set('end', currentListeners);
+		}
+
+		currentListeners.set(callback, this._onEnd.event(callback));
+	}
+
+	/**
+	 * Remove all existing event listeners.
+	 */
+	public removeAllListeners(): void {
+		// remove listeners set up by this class
+		this.stream.removeListener('data', this.tryOnStreamData);
+		this.stream.removeListener('error', this.onStreamError);
+		this.stream.removeListener('end', this.onStreamEnd);
+
+		// remove listeners set up by external consumers
+		for (const [name, listeners] of this._listeners.entries()) {
+			this._listeners.delete(name);
+			for (const [listener, disposable] of listeners) {
+				disposable.dispose();
+				listeners.delete(listener);
+			}
+		}
+	}
+
+	/**
+	 * Pauses the stream.
+	 */
+	public pause(): void {
+		this.stream.pause();
+	}
+
+	/**
+	 * Resumes the stream if it has been paused.
+	 * @throws if the decoder stream has already ended.
+	 */
+	public resume(): void {
+		assert(
+			!this.ended,
+			'Cannot resume the stream because it has already ended.',
+		);
+
+		this.stream.resume();
+	}
+
+	/**
+	 * Destroys(disposes) the stream.
+	 */
+	public destroy(): void {
+		this.dispose();
+	}
+
+	/**
+	 * Removes a priorly-registered event listener for a specified event.
+	 *
+	 * Note!
+	 *  - the callback function must be the same as the one that was used when
+	 * 	  registering the event listener as it is used as an identifier to
+	 *    remove the listener
+	 *  - this method is idempotent and results in no-op if the listener is
+	 *    not found, therefore passing incorrect `callback` function may
+	 *    result in silent unexpected behaviour
+	 */
+	public removeListener(event: string, callback: Function): void {
+		for (const [nameName, listeners] of this._listeners.entries()) {
+			if (nameName !== event) {
+				continue;
+			}
+
+			for (const [listener, disposable] of listeners) {
+				if (listener !== callback) {
+					continue;
+				}
+
+				disposable.dispose();
+				listeners.delete(listener);
+			}
+		}
+	}
+
+	/**
+	 * This method is called when the input stream ends.
+	 */
+	protected onStreamEnd(): void {
+		if (this.ended) {
+			return;
+		}
+
+		this.ended = true;
+		this._onEnd.fire();
+	}
+
+	/**
+	 * This method is called when the input stream emits an error.
+	 * We re-emit the error here by default, but subclasses can
+	 * override this method to handle the error differently.
+	 */
+	protected onStreamError(error: Error): void {
+		this._onError.fire(error);
+	}
+
+	/**
+	 * Consume all messages from the stream, blocking until the stream finishes.
+	 * @throws if the decoder stream has already ended.
+	 */
+	public async consumeAll(): Promise<T[]> {
+		assert(
+			!this.ended,
+			'Cannot consume all messages of the stream that has already ended.',
+		);
+
+		const messages = [];
+
+		for await (const maybeMessage of this) {
+			if (maybeMessage === null) {
+				break;
+			}
+
+			messages.push(maybeMessage);
+		}
+
+		return messages;
+	}
+
+	/**
+	 * Async iterator interface for the decoder.
+	 * @throws if the decoder stream has already ended.
+	 */
+	[Symbol.asyncIterator](): AsyncIterator<T | null> {
+		assert(
+			!this.ended,
+			'Cannot iterate on messages of the stream that has already ended.',
+		);
+
+		const asyncDecoder = this._register(new AsyncDecoder(this));
+
+		return asyncDecoder[Symbol.asyncIterator]();
+	}
+
+	public override dispose(): void {
+		this.onStreamEnd();
+
+		this.stream.destroy();
+		this.removeAllListeners();
+		super.dispose();
+	}
+}
diff --git a/src/vs/base/common/codecs/types/ICodec.d.ts b/src/vs/base/common/codecs/types/ICodec.d.ts
new file mode 100644
index 00000000000..cd8abb3ff67
--- /dev/null
+++ b/src/vs/base/common/codecs/types/ICodec.d.ts
@@ -0,0 +1,22 @@
+import { ReadableStream } from '../../stream.js';
+
+/**
+ * A codec is an object capable of encoding/decoding a stream of data transforming its messages.
+ * Useful for abstracting a data transfer or protocol logic on top of a stream of bytes.
+ *
+ * For instance, if protocol messages need to be trasferred over `TCP` connection, a codec that
+ * encodes the messages into a sequence of bytes before sending it to a network socket. Likewise,
+ * on the other end of the connection, the same codec can decode the sequence of bytes back into
+ * a sequence of the protocol messages.
+ */
+export interface ICodec<T, K> {
+	/**
+	 * Encode a stream of `K`s into a stream of `T`s.
+	 */
+	encode: (value: ReadableStream<K>) => ReadableStream<T>;
+
+	/**
+	 * Decode a stream of `T`s into a stream of `K`s.
+	 */
+	decode: (value: ReadableStream<T>) => ReadableStream<K>;
+}
diff --git a/src/vs/base/common/numbers.ts b/src/vs/base/common/numbers.ts
index ab4c9f92e06..594fcf63545 100644
--- a/src/vs/base/common/numbers.ts
+++ b/src/vs/base/common/numbers.ts
@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { assert } from './assert.js';
+
 export function clamp(value: number, min: number, max: number): number {
 	return Math.min(Math.max(value, min), max);
 }
@@ -96,3 +98,63 @@ export function isPointWithinTriangle(
 
 	return u >= 0 && v >= 0 && u + v < 1;
 }
+
+/**
+ * Function to get a (pseudo)random integer from a provided `max`...[`min`] range.
+ * Both `min` and `max` values are inclusive. The `min` value is optional and defaults
+ * to `0` if not explicitely specified.
+ *
+ * @throws in the next cases:
+ * 	- if provided `min` or `max` is not a number
+ *  - if provided `min` or `max` is not finite
+ *  - if provided `min` is larger than `max` value
+ *
+ * ## Examples
+ *
+ * Specifying a `max` value only uses `0` as the `min` value by default:
+ *
+ * ```typescript
+ * // get a random integer between 0 and 10
+ * const randomInt = randomInt(10);
+ *
+ * assert(
+ *   randomInt >= 0,
+ *   'Should be greater than or equal to 0.',
+ * );
+ *
+ * assert(
+ *   randomInt <= 10,
+ *   'Should be less than or equal to 10.',
+ * );
+ * ```
+ * * Specifying both `max` and `min` values:
+ *
+ * ```typescript
+ * // get a random integer between 5 and 8
+ * const randomInt = randomInt(8, 5);
+ *
+ * assert(
+ *   randomInt >= 5,
+ *   'Should be greater than or equal to 5.',
+ * );
+ *
+ * assert(
+ *   randomInt <= 8,
+ *   'Should be less than or equal to 8.',
+ * );
+ * ```
+ */
+export const randomInt = (max: number, min: number = 0): number => {
+	assert(!isNaN(min), '"min" param is not a number.');
+	assert(!isNaN(max), '"max" param is not a number.');
+
+	assert(isFinite(max), '"max" param is not finite.');
+	assert(isFinite(min), '"min" param is not finite.');
+
+	assert(max > min, `"max"(${max}) param should be greater than "min"(${min}).`);
+
+	const delta = max - min;
+	const randomFloat = delta * Math.random();
+
+	return Math.round(min + randomFloat);
+};
diff --git a/src/vs/base/common/stream.ts b/src/vs/base/common/stream.ts
index 7d990dfcab8..990c8f1c6bc 100644
--- a/src/vs/base/common/stream.ts
+++ b/src/vs/base/common/stream.ts
@@ -186,7 +186,7 @@ export interface ITransformer<Original, Transformed> {
 	error?: IErrorTransformer;
 }
 
-export function newWriteableStream<T>(reducer: IReducer<T>, options?: WriteableStreamOptions): WriteableStream<T> {
+export function newWriteableStream<T>(reducer: IReducer<T> | null, options?: WriteableStreamOptions): WriteableStream<T> {
 	return new WriteableStreamImpl<T>(reducer, options);
 }
 
@@ -221,7 +221,13 @@ class WriteableStreamImpl<T> implements WriteableStream<T> {
 
 	private readonly pendingWritePromises: Function[] = [];
 
-	constructor(private reducer: IReducer<T>, private options?: WriteableStreamOptions) { }
+	/**
+	 * @param reducer a function that reduces the buffered data into a single object;
+	 * 				  because some objects can be complex and non-reducible, we also
+	 * 				  allow passing the explicit `null` value to skip the reduce step
+	 * @param options stream options
+	 */
+	constructor(private reducer: IReducer<T> | null, private options?: WriteableStreamOptions) { }
 
 	pause(): void {
 		if (this.state.destroyed) {
@@ -396,18 +402,30 @@ class WriteableStreamImpl<T> implements WriteableStream<T> {
 	}
 
 	private flowData(): void {
-		if (this.buffer.data.length > 0) {
+		// if buffer is empty, nothing to do
+		if (this.buffer.data.length === 0) {
+			return;
+		}
+
+		// if buffer data can be reduced into a single object,
+		// emit the reduced data
+		if (typeof this.reducer === 'function') {
 			const fullDataBuffer = this.reducer(this.buffer.data);
 
 			this.emitData(fullDataBuffer);
+		} else {
+			// otherwise emit each buffered data instance individually
+			for (const data of this.buffer.data) {
+				this.emitData(data);
+			}
+		}
 
-			this.buffer.data.length = 0;
+		this.buffer.data.length = 0;
 
-			// When the buffer is empty, resolve all pending writers
-			const pendingWritePromises = [...this.pendingWritePromises];
-			this.pendingWritePromises.length = 0;
-			pendingWritePromises.forEach(pendingWritePromise => pendingWritePromise());
-		}
+		// when the buffer is empty, resolve all pending writers
+		const pendingWritePromises = [...this.pendingWritePromises];
+		this.pendingWritePromises.length = 0;
+		pendingWritePromises.forEach(pendingWritePromise => pendingWritePromise());
 	}
 
 	private flowErrors(): void {
diff --git a/src/vs/base/common/types.ts b/src/vs/base/common/types.ts
index 6ad28eaece0..54edfafe71f 100644
--- a/src/vs/base/common/types.ts
+++ b/src/vs/base/common/types.ts
@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { assert } from './assert.js';
+
 /**
  * @returns whether the provided parameter is a JavaScript String or not.
  */
@@ -93,15 +95,52 @@ export function assertType(condition: unknown, type?: string): asserts condition
 
 /**
  * Asserts that the argument passed in is neither undefined nor null.
+ *
+ * @see {@link assertDefined} for a similar utility that leverages TS assertion functions to narrow down the type of `arg` to be non-nullable.
  */
-export function assertIsDefined<T>(arg: T | null | undefined): T {
-	if (isUndefinedOrNull(arg)) {
-		throw new Error('Assertion Failed: argument is undefined or null');
-	}
+export function assertIsDefined<T>(arg: T | null | undefined): NonNullable<T> {
+	assert(
+		arg !== null && arg !== undefined,
+		'Argument is `undefined` or `null`.',
+	);
 
 	return arg;
 }
 
+/**
+ * Asserts that a provided `value` is `defined` - not `null` or `undefined`,
+ * throwing an error with the provided error or error message, while also
+ * narrowing down the type of the `value` to be `NonNullable` using TS
+ * assertion functions.
+ *
+ * @throws if the provided `value` is `null` or `undefined`.
+ *
+ * ## Examples
+ *
+ * ```typescript
+ * // an assert with an error message
+ * assertDefined('some value', 'String constant is not defined o_O.');
+ *
+ * // `throws!` the provided error
+ * assertDefined(null, new Error('Should throw this error.'));
+ *
+ * // narrows down the type of `someValue` to be non-nullable
+ * const someValue: string | undefined | null = blackbox();
+ * assertDefined(someValue, 'Some value must be defined.');
+ * console.log(someValue.length); // now type of `someValue` is `string`
+ * ```
+ *
+ * @see {@link assertIsDefined} for a similar utility but without assertion.
+ * @see {@link https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-7.html#assertion-functions typescript-3-7.html#assertion-functions}
+ */
+export function assertDefined<T>(value: T, error: string | NonNullable<Error>): asserts value is NonNullable<T> {
+	if (value === null || value === undefined) {
+		const errorToThrow = typeof error === 'string' ? new Error(error) : error;
+
+		throw errorToThrow;
+	}
+}
+
 /**
  * Asserts that each argument passed in is neither undefined nor null.
  */
diff --git a/src/vs/base/test/common/numbers.test.ts b/src/vs/base/test/common/numbers.test.ts
index ac544e76dfb..7916bf6710d 100644
--- a/src/vs/base/test/common/numbers.test.ts
+++ b/src/vs/base/test/common/numbers.test.ts
@@ -3,9 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as assert from 'assert';
-import { isPointWithinTriangle } from '../../common/numbers.js';
+import assert from 'assert';
 import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
+import { isPointWithinTriangle, randomInt } from '../../common/numbers.js';
 
 suite('isPointWithinTriangle', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
@@ -25,3 +25,176 @@ suite('isPointWithinTriangle', () => {
 		assert.ok(result);
 	});
 });
+
+suite('randomInt', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	/**
+	 * Test helper that allows to run a test on the `randomInt()`
+	 * utility with specified `max` and `min` values.
+	 */
+	const testRandomIntUtil = (max: number, min: number | undefined, testName: string) => {
+		suite(testName, () => {
+			let i = 0;
+			while (++i < 5) {
+				test(`should generate random boolean attempt#${i}`, async () => {
+					let iterations = 100;
+					while (iterations-- > 0) {
+						const int = randomInt(max, min);
+
+						assert(
+							int <= max,
+							`Expected ${int} to be less than or equal to ${max}.`
+						);
+						assert(
+							int >= (min ?? 0),
+							`Expected ${int} to be greater than or equal to ${min ?? 0}.`,
+						);
+					}
+				});
+			}
+
+			test(`should include min and max`, async () => {
+				let iterations = 100;
+				const results = [];
+				while (iterations-- > 0) {
+					results.push(randomInt(max, min));
+				}
+
+				assert(
+					results.includes(max),
+					`Expected ${results} to include ${max}.`,
+				);
+				assert(
+					results.includes(min ?? 0),
+					`Expected ${results} to include ${min ?? 0}.`,
+				);
+			});
+		});
+	};
+
+	suite('positive numbers', () => {
+		testRandomIntUtil(5, 2, 'max: 5, min: 2');
+		testRandomIntUtil(5, 0, 'max: 5, min: 0');
+		testRandomIntUtil(5, undefined, 'max: 5, min: undefined');
+		testRandomIntUtil(1, 0, 'max: 0, min: 0');
+	});
+
+	suite('negative numbers', () => {
+		testRandomIntUtil(-2, -5, 'max: -2, min: -5');
+		testRandomIntUtil(0, -5, 'max: 0, min: -5');
+		testRandomIntUtil(0, -1, 'max: 0, min: -1');
+	});
+
+	suite('split numbers', () => {
+		testRandomIntUtil(3, -1, 'max: 3, min: -1');
+		testRandomIntUtil(2, -2, 'max: 2, min: -2');
+		testRandomIntUtil(1, -3, 'max: 2, min: -2');
+	});
+
+	suite('errors', () => {
+		test('should throw if "min" is == "max" #1', () => {
+			assert.throws(() => {
+				randomInt(200, 200);
+			}, `"max"(200) param should be greater than "min"(200)."`);
+		});
+
+		test('should throw if "min" is == "max" #2', () => {
+			assert.throws(() => {
+				randomInt(2, 2);
+			}, `"max"(2) param should be greater than "min"(2)."`);
+		});
+
+		test('should throw if "min" is == "max" #3', () => {
+			assert.throws(() => {
+				randomInt(0);
+			}, `"max"(0) param should be greater than "min"(0)."`);
+		});
+
+		test('should throw if "min" is > "max" #1', () => {
+			assert.throws(() => {
+				randomInt(2, 3);
+			}, `"max"(2) param should be greater than "min"(3)."`);
+		});
+
+		test('should throw if "min" is > "max" #2', () => {
+			assert.throws(() => {
+				randomInt(999, 2000);
+			}, `"max"(999) param should be greater than "min"(2000)."`);
+		});
+
+		test('should throw if "min" is > "max" #3', () => {
+			assert.throws(() => {
+				randomInt(0, 1);
+			}, `"max"(0) param should be greater than "min"(1)."`);
+		});
+
+		test('should throw if "min" is > "max" #4', () => {
+			assert.throws(() => {
+				randomInt(-5, 2);
+			}, `"max"(-5) param should be greater than "min"(2)."`);
+		});
+
+		test('should throw if "min" is > "max" #5', () => {
+			assert.throws(() => {
+				randomInt(-5, 0);
+			}, `"max"(-5) param should be greater than "min"(0)."`);
+		});
+
+		test('should throw if "min" is > "max" #6', () => {
+			assert.throws(() => {
+				randomInt(-5);
+			}, `"max"(-5) param should be greater than "min"(0)."`);
+		});
+
+		test('should throw if "max" is `NaN`', () => {
+			assert.throws(() => {
+				randomInt(NaN);
+			}, `"max" param is not a number."`);
+		});
+
+		test('should throw if "min" is `NaN`', () => {
+			assert.throws(() => {
+				randomInt(5, NaN);
+			}, `"min" param is not a number."`);
+		});
+
+		suite('infinite arguments', () => {
+			test('should throw if "max" is infinite [Infinity]', () => {
+				assert.throws(() => {
+					randomInt(Infinity);
+				}, `"max" param is not finite."`);
+			});
+
+			test('should throw if "max" is infinite [-Infinity]', () => {
+				assert.throws(() => {
+					randomInt(-Infinity);
+				}, `"max" param is not finite."`);
+			});
+
+			test('should throw if "max" is infinite [+Infinity]', () => {
+				assert.throws(() => {
+					randomInt(+Infinity);
+				}, `"max" param is not finite."`);
+			});
+
+			test('should throw if "min" is infinite [Infinity]', () => {
+				assert.throws(() => {
+					randomInt(Infinity, Infinity);
+				}, `"max" param is not finite."`);
+			});
+
+			test('should throw if "min" is infinite [-Infinity]', () => {
+				assert.throws(() => {
+					randomInt(Infinity, -Infinity);
+				}, `"max" param is not finite."`);
+			});
+
+			test('should throw if "min" is infinite [+Infinity]', () => {
+				assert.throws(() => {
+					randomInt(Infinity, +Infinity);
+				}, `"max" param is not finite."`);
+			});
+		});
+	});
+});
diff --git a/src/vs/base/test/common/stream.test.ts b/src/vs/base/test/common/stream.test.ts
index b25769c2415..83e81e93aae 100644
--- a/src/vs/base/test/common/stream.test.ts
+++ b/src/vs/base/test/common/stream.test.ts
@@ -5,10 +5,10 @@
 
 import assert from 'assert';
 import { timeout } from '../../common/async.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 import { bufferToReadable, VSBuffer } from '../../common/buffer.js';
 import { CancellationTokenSource } from '../../common/cancellation.js';
 import { consumeReadable, consumeStream, isReadable, isReadableBufferedStream, isReadableStream, listenStream, newWriteableStream, peekReadable, peekStream, prefixedReadable, prefixedStream, Readable, ReadableStream, toReadable, toStream, transform } from '../../common/stream.js';
-import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('Stream', () => {
 
@@ -91,6 +91,104 @@ suite('Stream', () => {
 		assert.strictEqual(chunks.length, 4);
 	});
 
+	test('stream with non-reducible messages', () => {
+		/**
+		 * A complex object that cannot be reduced to a single object.
+		 */
+		class TestMessage {
+			constructor(public value: string) { }
+		}
+
+		const stream = newWriteableStream<TestMessage>(null);
+
+		let error = false;
+		stream.on('error', e => {
+			error = true;
+		});
+
+		let end = false;
+		stream.on('end', () => {
+			end = true;
+		});
+
+		stream.write(new TestMessage('Hello'));
+
+		const chunks: TestMessage[] = [];
+		stream.on('data', data => {
+			chunks.push(data);
+		});
+
+		assert(
+			chunks[0] instanceof TestMessage,
+			'Message `0` must be an instance of `TestMessage`.',
+		);
+		assert.strictEqual(chunks[0].value, 'Hello');
+
+		stream.write(new TestMessage('World'));
+
+		assert(
+			chunks[1] instanceof TestMessage,
+			'Message `1` must be an instance of `TestMessage`.',
+		);
+		assert.strictEqual(chunks[1].value, 'World');
+
+		assert.strictEqual(error, false);
+		assert.strictEqual(end, false);
+
+		stream.pause();
+		stream.write(new TestMessage('1'));
+		stream.write(new TestMessage('2'));
+		stream.write(new TestMessage('3'));
+
+		assert.strictEqual(chunks.length, 2);
+
+		stream.resume();
+
+		assert.strictEqual(chunks.length, 5);
+
+		assert(
+			chunks[2] instanceof TestMessage,
+			'Message `2` must be an instance of `TestMessage`.',
+		);
+		assert.strictEqual(chunks[2].value, '1');
+
+		assert(
+			chunks[3] instanceof TestMessage,
+			'Message `3` must be an instance of `TestMessage`.',
+		);
+		assert.strictEqual(chunks[3].value, '2');
+
+		assert(
+			chunks[4] instanceof TestMessage,
+			'Message `4` must be an instance of `TestMessage`.',
+		);
+		assert.strictEqual(chunks[4].value, '3');
+
+		stream.error(new Error());
+		assert.strictEqual(error, true);
+
+		error = false;
+		stream.error(new Error());
+		assert.strictEqual(error, true);
+
+		stream.end(new TestMessage('Final Bit'));
+		assert.strictEqual(chunks.length, 6);
+
+		assert(
+			chunks[5] instanceof TestMessage,
+			'Message `5` must be an instance of `TestMessage`.',
+		);
+		assert.strictEqual(chunks[5].value, 'Final Bit');
+
+
+		assert.strictEqual(end, true);
+
+		stream.destroy();
+
+		stream.write(new TestMessage('Unexpected'));
+		assert.strictEqual(chunks.length, 6);
+	});
+
 	test('WriteableStream - end with empty string works', async () => {
 		const reducer = (strings: string[]) => strings.length > 0 ? strings.join() : 'error';
 		const stream = newWriteableStream<string>(reducer);
diff --git a/src/vs/base/test/common/types.test.ts b/src/vs/base/test/common/types.test.ts
index 8f6eba0d0f3..da005539201 100644
--- a/src/vs/base/test/common/types.test.ts
+++ b/src/vs/base/test/common/types.test.ts
@@ -6,6 +6,7 @@
 import assert from 'assert';
 import * as types from '../../common/types.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
+import { assertDefined } from '../../common/types.js';
 
 suite('Types', () => {
 
@@ -174,6 +175,135 @@ suite('Types', () => {
 		assert.strictEqual(res[2], 'Hello');
 	});
 
+	suite('assertDefined', () => {
+		test('should not throw if `value` is defined (bool)', async () => {
+			assert.doesNotThrow(function () {
+				assertDefined(true, 'Oops something happened.');
+			});
+		});
+
+		test('should not throw if `value` is defined (number)', async () => {
+			assert.doesNotThrow(function () {
+				assertDefined(5, 'Oops something happened.');
+			});
+		});
+
+		test('should not throw if `value` is defined (zero)', async () => {
+			assert.doesNotThrow(function () {
+				assertDefined(0, 'Oops something happened.');
+			});
+		});
+
+		test('should not throw if `value` is defined (string)', async () => {
+			assert.doesNotThrow(function () {
+				assertDefined('some string', 'Oops something happened.');
+			});
+		});
+
+		test('should not throw if `value` is defined (empty string)', async () => {
+			assert.doesNotThrow(function () {
+				assertDefined('', 'Oops something happened.');
+			});
+		});
+
+		/**
+		 * Note! API of `assert.throws()` is different in the browser
+		 * and in Node.js, and it is not possible to use the same code
+		 * here. Therefore we had to resort to the manual try/catch.
+		 */
+		const assertThrows = (
+			testFunction: () => void,
+			errorMessage: string,
+		) => {
+			let thrownError: Error | undefined;
+
+			try {
+				testFunction();
+			} catch (e) {
+				thrownError = e as Error;
+			}
+
+			assertDefined(thrownError, 'Must throw an error.');
+			assert(
+				thrownError instanceof Error,
+				'Error must be an instance of `Error`.',
+			);
+
+			assert.strictEqual(
+				thrownError.message,
+				errorMessage,
+				'Error must have correct message.',
+			);
+		};
+
+		test('should throw if `value` is `null`', async () => {
+			const errorMessage = 'Uggh ohh!';
+			assertThrows(() => {
+				assertDefined(null, errorMessage);
+			}, errorMessage);
+		});
+
+		test('should throw if `value` is `undefined`', async () => {
+			const errorMessage = 'Oh no!';
+			assertThrows(() => {
+				assertDefined(undefined, new Error(errorMessage));
+			}, errorMessage);
+		});
+
+		test('should throw assertion error by default', async () => {
+			const errorMessage = 'Uggh ohh!';
+			let thrownError: Error | undefined;
+			try {
+				assertDefined(null, errorMessage);
+			} catch (e) {
+				thrownError = e as Error;
+			}
+
+			assertDefined(thrownError, 'Must throw an error.');
+
+			assert(
+				thrownError instanceof Error,
+				'Error must be an instance of `Error`.',
+			);
+
+			assert.strictEqual(
+				thrownError.message,
+				errorMessage,
+				'Error must have correct message.',
+			);
+		});
+
+		test('should throw provided error instance', async () => {
+			class TestError extends Error {
+				constructor(...args: ConstructorParameters<typeof Error>) {
+					super(...args);
+
+					this.name = 'TestError';
+				}
+			}
+
+			const errorMessage = 'Oops something hapenned.';
+			const error = new TestError(errorMessage);
+
+			let thrownError;
+			try {
+				assertDefined(null, error);
+			} catch (e) {
+				thrownError = e;
+			}
+
+			assert(
+				thrownError instanceof TestError,
+				'Error must be an instance of `TestError`.',
+			);
+			assert.strictEqual(
+				thrownError.message,
+				errorMessage,
+				'Error must have correct message.',
+			);
+		});
+	});
+
 	test('validateConstraints', () => {
 		types.validateConstraints([1, 'test', true], [Number, String, Boolean]);
 		types.validateConstraints([1, 'test', true], ['number', 'string', 'boolean']);
diff --git a/src/vs/editor/common/codecs/baseToken.ts b/src/vs/editor/common/codecs/baseToken.ts
new file mode 100644
index 00000000000..9ebe3ad8abc
--- /dev/null
+++ b/src/vs/editor/common/codecs/baseToken.ts
@@ -0,0 +1,57 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IRange, Range } from '../../../editor/common/core/range.js';
+
+/**
+ * Base class for all tokens with a `range` that
+ * reflects token position in the original data.
+ */
+export abstract class BaseToken {
+	constructor(
+		private _range: Range,
+	) { }
+
+	public get range(): Range {
+		return this._range;
+	}
+
+	/**
+	 * Check if this token has the same range as another one.
+	 */
+	public sameRange(other: Range): boolean {
+		return this.range.equalsRange(other);
+	}
+
+	/**
+	 * Returns a string representation of the token.
+	 */
+	public abstract toString(): string;
+
+	/**
+	 * Check if this token is equal to another one.
+	 */
+	public equals<T extends BaseToken>(other: T): boolean {
+		if (!(other instanceof this.constructor)) {
+			return false;
+		}
+
+		return this.sameRange(other.range);
+	}
+
+	/**
+	 * Change `range` of the token with provided range components.
+	 */
+	public withRange(components: Partial<IRange>): this {
+		this._range = new Range(
+			components.startLineNumber ?? this.range.startLineNumber,
+			components.startColumn ?? this.range.startColumn,
+			components.endLineNumber ?? this.range.endLineNumber,
+			components.endColumn ?? this.range.endColumn,
+		);
+
+		return this;
+	}
+}
diff --git a/src/vs/editor/common/codecs/linesCodec/linesDecoder.ts b/src/vs/editor/common/codecs/linesCodec/linesDecoder.ts
new file mode 100644
index 00000000000..3bd72e5bd73
--- /dev/null
+++ b/src/vs/editor/common/codecs/linesCodec/linesDecoder.ts
@@ -0,0 +1,213 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Line } from './tokens/line.js';
+import { Range } from '../../core/range.js';
+import { NewLine } from './tokens/newLine.js';
+import { assert } from '../../../../base/common/assert.js';
+import { CarriageReturn } from './tokens/carriageReturn.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { assertDefined } from '../../../../base/common/types.js';
+import { BaseDecoder } from '../../../../base/common/codecs/baseDecoder.js';
+
+/**
+ * Tokens produced by the `LinesDecoder`.
+ */
+export type TLineToken = Line | CarriageReturn | NewLine;
+
+/**
+ * The `decoder` part of the `LinesCodec` and is able to transform
+ * data from a binary stream into a stream of text lines(`Line`).
+ */
+export class LinesDecoder extends BaseDecoder<TLineToken, VSBuffer> {
+	/**
+	 * Buffered received data yet to be processed.
+	 */
+	private buffer: VSBuffer = VSBuffer.alloc(0);
+
+	/**
+	 * The last emitted `Line` token, if any. The value is used
+	 * to correctly emit remaining line range in the `onStreamEnd`
+	 * method when underlying input stream ends and `buffer` still
+	 * contains some data that must be emitted as the last line.
+	 */
+	private lastEmittedLine?: Line;
+
+	/**
+	 * Process data received from the input stream.
+	 */
+	protected override onStreamData(chunk: VSBuffer): void {
+		this.buffer = VSBuffer.concat([this.buffer, chunk]);
+
+		this.processData(false);
+	}
+
+	/**
+	 * Process buffered data.
+	 *
+	 * @param streamEnded Flag that indicates if the input stream has ended,
+	 * 					  which means that is the last call of this method.
+	 * @throws If internal logic implementation error is detected.
+	 */
+	private processData(
+		streamEnded: boolean,
+	) {
+		// iterate over each line of the data buffer, emitting each line
+		// as a `Line` token followed by a `NewLine` token, if applies
+		while (this.buffer.byteLength > 0) {
+			// get line number based on a previously emitted line, if any
+			const lineNumber = this.lastEmittedLine
+				? this.lastEmittedLine.range.startLineNumber + 1
+				: 1;
+
+			// find the `\r`, `\n`, or `\r\n` tokens in the data
+			const endOfLineTokens = this.findEndOfLineTokens(lineNumber);
+			const firstToken = endOfLineTokens[0];
+
+			// if no end-of-the-line tokens found, stop processing because we
+			// either (1)need more data to arraive or (2)the stream has ended
+			// in the case (2) remaining data must be emitted as the last line
+			if (!firstToken) {
+				// (2) if `streamEnded`, we need to emit the whole remaining
+				// data as the last line immediately
+				if (streamEnded) {
+					this.emitLine(lineNumber, this.buffer.slice(0));
+				}
+
+				break;
+			}
+
+			// emit the line found in the data as the `Line` token
+			this.emitLine(lineNumber, this.buffer.slice(0, firstToken.range.startColumn - 1));
+
+			// must always hold true as the `emitLine` above sets this
+			assertDefined(
+				this.lastEmittedLine,
+				'No last emitted line found.',
+			);
+
+			// emit the end-of-the-line tokens
+			let startColumn = this.lastEmittedLine.range.endColumn;
+			for (const token of endOfLineTokens) {
+				const endColumn = startColumn + token.byte.byteLength;
+				// emit the token updating its column start/end numbers based on
+				// the emitted line text length and previous end-of-the-line token
+				this._onData.fire(token.withRange({ startColumn, endColumn }));
+				// shorten the data buffer by the length of the token
+				this.buffer = this.buffer.slice(token.byte.byteLength);
+				// update the start column for the next token
+				startColumn = endColumn;
+			}
+		}
+
+		// if the stream has ended, assert that the input data buffer is now empty
+		// otherwise we have a logic error and leaving some buffered data behind
+		if (streamEnded) {
+			assert(
+				this.buffer.byteLength === 0,
+				'Expected the input data buffer to be empty when the stream ends.',
+			);
+		}
+	}
+
+	/**
+	 * Find the end of line tokens in the data buffer.
+	 * Can return:
+	 *  - [`\r`, `\n`] tokens if the sequence is found
+	 *  - [`\r`] token if only the carriage return is found
+	 *  - [`\n`] token if only the newline is found
+	 *  - an `empty array` if no end of line tokens found
+	 */
+	private findEndOfLineTokens(
+		lineNumber: number,
+	): (CarriageReturn | NewLine)[] {
+		const result = [];
+
+		// find the first occurrence of the carriage return and newline tokens
+		const carriageReturnIndex = this.buffer.indexOf(CarriageReturn.byte);
+		const newLineIndex = this.buffer.indexOf(NewLine.byte);
+
+		// if the `\r` comes before the `\n`(if `\n` present at all)
+		if (carriageReturnIndex >= 0 && (carriageReturnIndex < newLineIndex || newLineIndex === -1)) {
+			// add the carriage return token first
+			result.push(
+				new CarriageReturn(new Range(
+					lineNumber,
+					(carriageReturnIndex + 1),
+					lineNumber,
+					(carriageReturnIndex + 1) + CarriageReturn.byte.byteLength,
+				)),
+			);
+
+			// if the `\r\n` sequence
+			if (newLineIndex === carriageReturnIndex + 1) {
+				// add the newline token to the result
+				result.push(
+					new NewLine(new Range(
+						lineNumber,
+						(newLineIndex + 1),
+						lineNumber,
+						(newLineIndex + 1) + NewLine.byte.byteLength,
+					)),
+				);
+			}
+
+			if (this.buffer.byteLength > carriageReturnIndex + 1) {
+				// either `\r` or `\r\n` cases found
+				return result;
+			}
+
+			return [];
+		}
+
+		// no `\r`, but there is `\n`
+		if (newLineIndex >= 0) {
+			result.push(
+				new NewLine(new Range(
+					lineNumber,
+					(newLineIndex + 1),
+					lineNumber,
+					(newLineIndex + 1) + NewLine.byte.byteLength,
+				)),
+			);
+		}
+
+		// neither `\r` nor `\n` found, no end of line found at all
+		return result;
+	}
+
+	/**
+	 * Emit a provided line as the `Line` token to the output stream.
+	 */
+	private emitLine(
+		lineNumber: number, // Note! 1-based indexing
+		lineBytes: VSBuffer,
+	): void {
+
+		const line = new Line(lineNumber, lineBytes.toString());
+		this._onData.fire(line);
+
+		// store the last emitted line so we can use it when we need
+		// to send the remaining line in the `onStreamEnd` method
+		this.lastEmittedLine = line;
+
+		// shorten the data buffer by the length of the line emitted
+		this.buffer = this.buffer.slice(lineBytes.byteLength);
+	}
+
+	/**
+	 * Handle the end of the input stream - if the buffer still has some data,
+	 * emit it as the last available line token before firing the `onEnd` event.
+	 */
+	protected override onStreamEnd(): void {
+		// if the input data buffer is not empty when the input stream ends, emit
+		// the remaining data as the last line before firing the `onEnd` event
+		if (this.buffer.byteLength > 0) {
+			this.processData(true);
+		}
+
+		super.onStreamEnd();
+	}
+}
diff --git a/src/vs/editor/common/codecs/linesCodec/tokens/carriageReturn.ts b/src/vs/editor/common/codecs/linesCodec/tokens/carriageReturn.ts
new file mode 100644
index 00000000000..5120f4ac322
--- /dev/null
+++ b/src/vs/editor/common/codecs/linesCodec/tokens/carriageReturn.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 { Line } from './line.js';
+import { BaseToken } from '../../baseToken.js';
+import { Range } from '../../../core/range.js';
+import { Position } from '../../../core/position.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+
+/**
+ * Token that represent a `carriage return` with a `range`. The `range`
+ * value reflects the position of the token in the original data.
+ */
+export class CarriageReturn extends BaseToken {
+	/**
+	 * The underlying symbol of the token.
+	 */
+	public static readonly symbol: string = '\r';
+
+	/**
+	 * The byte representation of the {@link symbol}.
+	 */
+	public static readonly byte = VSBuffer.fromString(CarriageReturn.symbol);
+
+	/**
+	 * The byte representation of the token.
+	 */
+	public get byte() {
+		return CarriageReturn.byte;
+	}
+
+	/**
+	 * Create new `CarriageReturn` token with range inside
+	 * the given `Line` at the given `column number`.
+	 */
+	public static newOnLine(
+		line: Line,
+		atColumnNumber: number,
+	): CarriageReturn {
+		const { range } = line;
+
+		const startPosition = new Position(range.startLineNumber, atColumnNumber);
+		const endPosition = new Position(range.startLineNumber, atColumnNumber + this.symbol.length);
+
+		return new CarriageReturn(Range.fromPositions(
+			startPosition,
+			endPosition,
+		));
+	}
+
+	/**
+	 * Returns a string representation of the token.
+	 */
+	public override toString(): string {
+		return `carriage-return${this.range}`;
+	}
+}
diff --git a/src/vs/editor/common/codecs/linesCodec/tokens/line.ts b/src/vs/editor/common/codecs/linesCodec/tokens/line.ts
new file mode 100644
index 00000000000..6669169967f
--- /dev/null
+++ b/src/vs/editor/common/codecs/linesCodec/tokens/line.ts
@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { BaseToken } from '../../baseToken.js';
+import { assert } from '../../../../../base/common/assert.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+
+/**
+ * Token representing a line of text with a `range` which
+ * reflects the line's position in the original data.
+ */
+export class Line extends BaseToken {
+	constructor(
+		// the line index
+		// Note! 1-based indexing
+		lineNumber: number,
+		// the line contents
+		public readonly text: string,
+	) {
+		assert(
+			!isNaN(lineNumber),
+			`The line number must not be a NaN.`,
+		);
+
+		assert(
+			lineNumber > 0,
+			`The line number must be >= 1, got "${lineNumber}".`,
+		);
+
+		super(
+			new Range(
+				lineNumber,
+				1,
+				lineNumber,
+				text.length + 1,
+			),
+		);
+	}
+
+	/**
+	 * Check if this token is equal to another one.
+	 */
+	public override equals<T extends BaseToken>(other: T): boolean {
+		if (!super.equals(other)) {
+			return false;
+		}
+
+		if (!(other instanceof Line)) {
+			return false;
+		}
+
+		return this.text === other.text;
+	}
+
+	/**
+	 * Returns a string representation of the token.
+	 */
+	public override toString(): string {
+		return `line("${this.text}")${this.range}`;
+	}
+}
diff --git a/src/vs/editor/common/codecs/linesCodec/tokens/newLine.ts b/src/vs/editor/common/codecs/linesCodec/tokens/newLine.ts
new file mode 100644
index 00000000000..19b80dd88a3
--- /dev/null
+++ b/src/vs/editor/common/codecs/linesCodec/tokens/newLine.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 { Line } from './line.js';
+import { BaseToken } from '../../baseToken.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+
+/**
+ * A token that represent a `new line` with a `range`. The `range`
+ * value reflects the position of the token in the original data.
+ */
+export class NewLine extends BaseToken {
+	/**
+	 * The underlying symbol of the `NewLine` token.
+	 */
+	public static readonly symbol: string = '\n';
+
+	/**
+	 * The byte representation of the {@link symbol}.
+	 */
+	public static readonly byte = VSBuffer.fromString(NewLine.symbol);
+
+	/**
+	 * The byte representation of the token.
+	 */
+	public get byte() {
+		return NewLine.byte;
+	}
+
+	/**
+	 * Create new `NewLine` token with range inside
+	 * the given `Line` at the given `column number`.
+	 */
+	public static newOnLine(
+		line: Line,
+		atColumnNumber: number,
+	): NewLine {
+		const { range } = line;
+
+		const startPosition = new Position(range.startLineNumber, atColumnNumber);
+		const endPosition = new Position(range.startLineNumber, atColumnNumber + this.symbol.length);
+
+		return new NewLine(
+			Range.fromPositions(startPosition, endPosition),
+		);
+	}
+
+	/**
+	 * Returns a string representation of the token.
+	 */
+	public override toString(): string {
+		return `newline${this.range}`;
+	}
+}
diff --git a/src/vs/editor/common/codecs/simpleCodec/simpleDecoder.ts b/src/vs/editor/common/codecs/simpleCodec/simpleDecoder.ts
new file mode 100644
index 00000000000..64173eceabd
--- /dev/null
+++ b/src/vs/editor/common/codecs/simpleCodec/simpleDecoder.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 { FormFeed } from './tokens/formFeed.js';
+import { Tab } from '../simpleCodec/tokens/tab.js';
+import { Word } from '../simpleCodec/tokens/word.js';
+import { VerticalTab } from './tokens/verticalTab.js';
+import { Space } from '../simpleCodec/tokens/space.js';
+import { NewLine } from '../linesCodec/tokens/newLine.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { ReadableStream } from '../../../../base/common/stream.js';
+import { CarriageReturn } from '../linesCodec/tokens/carriageReturn.js';
+import { LinesDecoder, TLineToken } from '../linesCodec/linesDecoder.js';
+import { BaseDecoder } from '../../../../base/common/codecs/baseDecoder.js';
+
+/**
+ * A token type that this decoder can handle.
+ */
+export type TSimpleToken = Word | Space | Tab | VerticalTab | NewLine | FormFeed | CarriageReturn;
+
+/**
+ * Characters that stop a "word" sequence.
+ * Note! the `\r` and `\n` are excluded from the list because this decoder based on `LinesDecoder` which
+ * 	     already handles the `carriagereturn`/`newline` cases and emits lines that don't contain them.
+ */
+const STOP_CHARACTERS = [Space.symbol, Tab.symbol, VerticalTab.symbol, FormFeed.symbol];
+
+/**
+ * A decoder that can decode a stream of `Line`s into a stream
+ * of simple token, - `Word`, `Space`, `Tab`, `NewLine`, etc.
+ */
+export class SimpleDecoder extends BaseDecoder<TSimpleToken, TLineToken> {
+	constructor(
+		stream: ReadableStream<VSBuffer>,
+	) {
+		super(new LinesDecoder(stream));
+	}
+
+	protected override onStreamData(token: TLineToken): void {
+		// re-emit new line tokens
+		if (token instanceof CarriageReturn || token instanceof NewLine) {
+			this._onData.fire(token);
+
+			return;
+		}
+
+		// loop through the text separating it into `Word` and `Space` tokens
+		let i = 0;
+		while (i < token.text.length) {
+			// index is 0-based, but column numbers are 1-based
+			const columnNumber = i + 1;
+
+			// if a space character, emit a `Space` token and continue
+			if (token.text[i] === Space.symbol) {
+				this._onData.fire(Space.newOnLine(token, columnNumber));
+
+				i++;
+				continue;
+			}
+
+			// if a tab character, emit a `Tab` token and continue
+			if (token.text[i] === Tab.symbol) {
+				this._onData.fire(Tab.newOnLine(token, columnNumber));
+
+				i++;
+				continue;
+			}
+
+			// if a vertical tab character, emit a `VerticalTab` token and continue
+			if (token.text[i] === VerticalTab.symbol) {
+				this._onData.fire(VerticalTab.newOnLine(token, columnNumber));
+
+				i++;
+				continue;
+			}
+
+			// if a form feed character, emit a `FormFeed` token and continue
+			if (token.text[i] === FormFeed.symbol) {
+				this._onData.fire(FormFeed.newOnLine(token, columnNumber));
+
+				i++;
+				continue;
+			}
+
+			// if a non-space character, parse out the whole word and
+			// emit it, then continue from the last word character position
+			let word = '';
+			while (i < token.text.length && !(STOP_CHARACTERS.includes(token.text[i]))) {
+				word += token.text[i];
+				i++;
+			}
+
+			this._onData.fire(
+				Word.newOnLine(word, token, columnNumber),
+			);
+		}
+	}
+}
diff --git a/src/vs/editor/common/codecs/simpleCodec/tokens/formFeed.ts b/src/vs/editor/common/codecs/simpleCodec/tokens/formFeed.ts
new file mode 100644
index 00000000000..ab40192f459
--- /dev/null
+++ b/src/vs/editor/common/codecs/simpleCodec/tokens/formFeed.ts
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { BaseToken } from '../../baseToken.js';
+import { Line } from '../../linesCodec/tokens/line.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+
+/**
+ * Token that represent a `form feed` with a `range`. The `range`
+ * value reflects the position of the token in the original data.
+ */
+export class FormFeed extends BaseToken {
+	/**
+	 * The underlying symbol of the token.
+	 */
+	public static readonly symbol: string = '\f';
+
+	/**
+	 * Create new `FormFeed` token with range inside
+	 * the given `Line` at the given `column number`.
+	 */
+	public static newOnLine(
+		line: Line,
+		atColumnNumber: number,
+	): FormFeed {
+		const { range } = line;
+
+		const startPosition = new Position(range.startLineNumber, atColumnNumber);
+		const endPosition = new Position(range.startLineNumber, atColumnNumber + this.symbol.length);
+
+		return new FormFeed(Range.fromPositions(
+			startPosition,
+			endPosition,
+		));
+	}
+
+	/**
+	 * Returns a string representation of the token.
+	 */
+	public override toString(): string {
+		return `formfeed${this.range}`;
+	}
+}
diff --git a/src/vs/editor/common/codecs/simpleCodec/tokens/space.ts b/src/vs/editor/common/codecs/simpleCodec/tokens/space.ts
new file mode 100644
index 00000000000..9961c38ece9
--- /dev/null
+++ b/src/vs/editor/common/codecs/simpleCodec/tokens/space.ts
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { BaseToken } from '../../baseToken.js';
+import { Line } from '../../linesCodec/tokens/line.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+
+/**
+ * A token that represent a `space` with a `range`. The `range`
+ * value reflects the position of the token in the original data.
+ */
+export class Space extends BaseToken {
+	/**
+	 * The underlying symbol of the `Space` token.
+	 */
+	public static readonly symbol: string = ' ';
+
+	/**
+	 * Create new `Space` token with range inside
+	 * the given `Line` at the given `column number`.
+	 */
+	public static newOnLine(
+		line: Line,
+		atColumnNumber: number,
+	): Space {
+		const { range } = line;
+
+		const startPosition = new Position(range.startLineNumber, atColumnNumber);
+		const endPosition = new Position(range.startLineNumber, atColumnNumber + this.symbol.length);
+
+		return new Space(Range.fromPositions(
+			startPosition,
+			endPosition,
+		));
+	}
+
+	/**
+	 * Returns a string representation of the token.
+	 */
+	public override toString(): string {
+		return `space${this.range}`;
+	}
+}
diff --git a/src/vs/editor/common/codecs/simpleCodec/tokens/tab.ts b/src/vs/editor/common/codecs/simpleCodec/tokens/tab.ts
new file mode 100644
index 00000000000..aab11327bc1
--- /dev/null
+++ b/src/vs/editor/common/codecs/simpleCodec/tokens/tab.ts
@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { BaseToken } from '../../baseToken.js';
+import { Line } from '../../linesCodec/tokens/line.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+
+/**
+ * A token that represent a `tab` with a `range`. The `range`
+ * value reflects the position of the token in the original data.
+ */
+export class Tab extends BaseToken {
+	/**
+	 * The underlying symbol of the `Tab` token.
+	 */
+	public static readonly symbol: string = '\t';
+
+	/**
+	 * Create new `Tab` token with range inside
+	 * the given `Line` at the given `column number`.
+	 */
+	public static newOnLine(
+		line: Line,
+		atColumnNumber: number,
+	): Tab {
+		const { range } = line;
+
+		const startPosition = new Position(range.startLineNumber, atColumnNumber);
+		// the tab token length is 1, hence `+ 1`
+		const endPosition = new Position(range.startLineNumber, atColumnNumber + this.symbol.length);
+
+		return new Tab(Range.fromPositions(
+			startPosition,
+			endPosition,
+		));
+	}
+
+	/**
+	 * Returns a string representation of the token.
+	 */
+	public override toString(): string {
+		return `tab${this.range}`;
+	}
+}
diff --git a/src/vs/editor/common/codecs/simpleCodec/tokens/verticalTab.ts b/src/vs/editor/common/codecs/simpleCodec/tokens/verticalTab.ts
new file mode 100644
index 00000000000..11e5ca6efab
--- /dev/null
+++ b/src/vs/editor/common/codecs/simpleCodec/tokens/verticalTab.ts
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { BaseToken } from '../../baseToken.js';
+import { Line } from '../../linesCodec/tokens/line.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+
+/**
+ * Token that represent a `vertical tab` with a `range`. The `range`
+ * value reflects the position of the token in the original data.
+ */
+export class VerticalTab extends BaseToken {
+	/**
+	 * The underlying symbol of the `VerticalTab` token.
+	 */
+	public static readonly symbol: string = '\v';
+
+	/**
+	 * Create new `VerticalTab` token with range inside
+	 * the given `Line` at the given `column number`.
+	 */
+	public static newOnLine(
+		line: Line,
+		atColumnNumber: number,
+	): VerticalTab {
+		const { range } = line;
+
+		const startPosition = new Position(range.startLineNumber, atColumnNumber);
+		const endPosition = new Position(range.startLineNumber, atColumnNumber + this.symbol.length);
+
+		return new VerticalTab(Range.fromPositions(
+			startPosition,
+			endPosition,
+		));
+	}
+
+	/**
+	 * Returns a string representation of the token.
+	 */
+	public override toString(): string {
+		return `vtab${this.range}`;
+	}
+}
diff --git a/src/vs/editor/common/codecs/simpleCodec/tokens/word.ts b/src/vs/editor/common/codecs/simpleCodec/tokens/word.ts
new file mode 100644
index 00000000000..fc3cefa79be
--- /dev/null
+++ b/src/vs/editor/common/codecs/simpleCodec/tokens/word.ts
@@ -0,0 +1,72 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { BaseToken } from '../../baseToken.js';
+import { Line } from '../../linesCodec/tokens/line.js';
+import { Range } from '../../../../../editor/common/core/range.js';
+import { Position } from '../../../../../editor/common/core/position.js';
+
+/**
+ * A token that represent a word - a set of continuous
+ * characters without stop characters, like a `space`,
+ * a `tab`, or a `new line`.
+ */
+export class Word extends BaseToken {
+	constructor(
+		/**
+		 * The word range.
+		 */
+		range: Range,
+
+		/**
+		 * The string value of the word.
+		 */
+		public readonly text: string,
+	) {
+		super(range);
+	}
+
+	/**
+	 * Create new `Word` token with the given `text` and the range
+	 * inside the given `Line` at the specified `column number`.
+	 */
+	public static newOnLine(
+		text: string,
+		line: Line,
+		atColumnNumber: number,
+	): Word {
+		const { range } = line;
+
+		const startPosition = new Position(range.startLineNumber, atColumnNumber);
+		const endPosition = new Position(range.startLineNumber, atColumnNumber + text.length);
+
+		return new Word(
+			Range.fromPositions(startPosition, endPosition),
+			text,
+		);
+	}
+
+	/**
+	 * Check if this token is equal to another one.
+	 */
+	public override equals<T extends BaseToken>(other: T): boolean {
+		if (!super.equals(other)) {
+			return false;
+		}
+
+		if (!(other instanceof Word)) {
+			return false;
+		}
+
+		return this.text === other.text;
+	}
+
+	/**
+	 * Returns a string representation of the token.
+	 */
+	public override toString(): string {
+		return `word("${this.text.slice(0, 8)}")${this.range}`;
+	}
+}
diff --git a/src/vs/editor/test/common/codecs/linesDecoder.test.ts b/src/vs/editor/test/common/codecs/linesDecoder.test.ts
new file mode 100644
index 00000000000..b3e6c91be13
--- /dev/null
+++ b/src/vs/editor/test/common/codecs/linesDecoder.test.ts
@@ -0,0 +1,140 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { TestDecoder } from '../utils/testDecoder.js';
+import { Range } from '../../../common/core/range.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { newWriteableStream } from '../../../../base/common/stream.js';
+import { Line } from '../../../common/codecs/linesCodec/tokens/line.js';
+import { NewLine } from '../../../common/codecs/linesCodec/tokens/newLine.js';
+import { CarriageReturn } from '../../../common/codecs/linesCodec/tokens/carriageReturn.js';
+import { LinesDecoder, TLineToken } from '../../../common/codecs/linesCodec/linesDecoder.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+
+/**
+ * A reusable test utility that asserts that a `LinesDecoder` instance
+ * correctly decodes `inputData` into a stream of `TLineToken` tokens.
+ *
+ * ## Examples
+ *
+ * ```typescript
+ * // create a new test utility instance
+ * const test = testDisposables.add(new TestLinesDecoder());
+ *
+ * // run the test
+ * await test.run(
+ *   ' hello world\n',
+ *   [
+ *     new Line(1, ' hello world'),
+ *     new NewLine(new Range(1, 13, 1, 14)),
+ *   ],
+ * );
+ */
+export class TestLinesDecoder extends TestDecoder<TLineToken, LinesDecoder> {
+	constructor() {
+		const stream = newWriteableStream<VSBuffer>(null);
+		const decoder = new LinesDecoder(stream);
+
+		super(stream, decoder);
+	}
+}
+
+suite('LinesDecoder', () => {
+	suite('produces expected tokens', () => {
+		const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
+
+		test('input starts with line data', async () => {
+			const test = testDisposables.add(new TestLinesDecoder());
+
+			await test.run(
+				' hello world\nhow are you doing?\n\n 😊 \r ',
+				[
+					new Line(1, ' hello world'),
+					new NewLine(new Range(1, 13, 1, 14)),
+					new Line(2, 'how are you doing?'),
+					new NewLine(new Range(2, 19, 2, 20)),
+					new Line(3, ''),
+					new NewLine(new Range(3, 1, 3, 2)),
+					new Line(4, ' 😊 '),
+					new CarriageReturn(new Range(4, 5, 4, 6)),
+					new Line(5, ' '),
+				],
+			);
+		});
+
+		test('input starts with a new line', async () => {
+			const test = testDisposables.add(new TestLinesDecoder());
+
+			await test.run(
+				'\nsome text on this line\n\n\nanother 💬 on this line\r\n🤫\n',
+				[
+					new Line(1, ''),
+					new NewLine(new Range(1, 1, 1, 2)),
+					new Line(2, 'some text on this line'),
+					new NewLine(new Range(2, 23, 2, 24)),
+					new Line(3, ''),
+					new NewLine(new Range(3, 1, 3, 2)),
+					new Line(4, ''),
+					new NewLine(new Range(4, 1, 4, 2)),
+					new Line(5, 'another 💬 on this line'),
+					new CarriageReturn(new Range(5, 24, 5, 25)),
+					new NewLine(new Range(5, 25, 5, 26)),
+					new Line(6, '🤫'),
+					new NewLine(new Range(6, 3, 6, 4)),
+				],
+			);
+		});
+
+		test('input starts and ends with multiple new lines', async () => {
+			const test = testDisposables.add(new TestLinesDecoder());
+
+			await test.run(
+				'\n\n\r\nciao! 🗯️\t💭 💥 come\tva?\n\n\n\n\n',
+				[
+					new Line(1, ''),
+					new NewLine(new Range(1, 1, 1, 2)),
+					new Line(2, ''),
+					new NewLine(new Range(2, 1, 2, 2)),
+					new Line(3, ''),
+					new CarriageReturn(new Range(3, 1, 3, 2)),
+					new NewLine(new Range(3, 2, 3, 3)),
+					new Line(4, 'ciao! 🗯️\t💭 💥 come\tva?'),
+					new NewLine(new Range(4, 25, 4, 26)),
+					new Line(5, ''),
+					new NewLine(new Range(5, 1, 5, 2)),
+					new Line(6, ''),
+					new NewLine(new Range(6, 1, 6, 2)),
+					new Line(7, ''),
+					new NewLine(new Range(7, 1, 7, 2)),
+					new Line(8, ''),
+					new NewLine(new Range(8, 1, 8, 2)),
+				],
+			);
+		});
+
+		test('single carriage return is treated as new line', async () => {
+			const test = testDisposables.add(new TestLinesDecoder());
+
+			await test.run(
+				'\r\rhaalo! 💥💥 how\'re you?\r ?!\r\n\r\n ',
+				[
+					new Line(1, ''),
+					new CarriageReturn(new Range(1, 1, 1, 2)),
+					new Line(2, ''),
+					new CarriageReturn(new Range(2, 1, 2, 2)),
+					new Line(3, 'haalo! 💥💥 how\'re you?'),
+					new CarriageReturn(new Range(3, 24, 3, 25)),
+					new Line(4, ' ?!'),
+					new CarriageReturn(new Range(4, 4, 4, 5)),
+					new NewLine(new Range(4, 5, 4, 6)),
+					new Line(5, ''),
+					new CarriageReturn(new Range(5, 1, 5, 2)),
+					new NewLine(new Range(5, 2, 5, 3)),
+					new Line(6, ' '),
+				],
+			);
+		});
+	});
+});
diff --git a/src/vs/editor/test/common/codecs/simpleDecoder.test.ts b/src/vs/editor/test/common/codecs/simpleDecoder.test.ts
new file mode 100644
index 00000000000..2e57a1c8219
--- /dev/null
+++ b/src/vs/editor/test/common/codecs/simpleDecoder.test.ts
@@ -0,0 +1,111 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { TestDecoder } from '../utils/testDecoder.js';
+import { Range } from '../../../common/core/range.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { newWriteableStream } from '../../../../base/common/stream.js';
+import { Tab } from '../../../common/codecs/simpleCodec/tokens/tab.js';
+import { Word } from '../../../common/codecs/simpleCodec/tokens/word.js';
+import { Space } from '../../../common/codecs/simpleCodec/tokens/space.js';
+import { NewLine } from '../../../common/codecs/linesCodec/tokens/newLine.js';
+import { FormFeed } from '../../../common/codecs/simpleCodec/tokens/formFeed.js';
+import { VerticalTab } from '../../../common/codecs/simpleCodec/tokens/verticalTab.js';
+import { CarriageReturn } from '../../../common/codecs/linesCodec/tokens/carriageReturn.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/common/utils.js';
+import { SimpleDecoder, TSimpleToken } from '../../../common/codecs/simpleCodec/simpleDecoder.js';
+
+/**
+ * A reusable test utility that asserts that a `SimpleDecoder` instance
+ * correctly decodes `inputData` into a stream of `TSimpleToken` tokens.
+ *
+ * ## Examples
+ *
+ * ```typescript
+ * // create a new test utility instance
+ * const test = testDisposables.add(new TestSimpleDecoder());
+ *
+ * // run the test
+ * await test.run(
+ *   ' hello world\n',
+ *   [
+ *     new Space(new Range(1, 1, 1, 2)),
+ *     new Word(new Range(1, 2, 1, 7), 'hello'),
+ *     new Space(new Range(1, 7, 1, 8)),
+ *     new Word(new Range(1, 8, 1, 13), 'world'),
+ *     new NewLine(new Range(1, 13, 1, 14)),
+ *   ],
+ * );
+ */
+export class TestSimpleDecoder extends TestDecoder<TSimpleToken, SimpleDecoder> {
+	constructor() {
+		const stream = newWriteableStream<VSBuffer>(null);
+		const decoder = new SimpleDecoder(stream);
+
+		super(stream, decoder);
+	}
+}
+
+suite('SimpleDecoder', () => {
+	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('produces expected tokens', async () => {
+		const test = testDisposables.add(
+			new TestSimpleDecoder(),
+		);
+
+		await test.run(
+			' hello world\nhow are\t you?\v\n\n   (test)  [!@#$%^&*_+=]\f  \n\t\t🤗❤ \t\n hey\vthere\r\n\r\n',
+			[
+				// first line
+				new Space(new Range(1, 1, 1, 2)),
+				new Word(new Range(1, 2, 1, 7), 'hello'),
+				new Space(new Range(1, 7, 1, 8)),
+				new Word(new Range(1, 8, 1, 13), 'world'),
+				new NewLine(new Range(1, 13, 1, 14)),
+				// second line
+				new Word(new Range(2, 1, 2, 4), 'how'),
+				new Space(new Range(2, 4, 2, 5)),
+				new Word(new Range(2, 5, 2, 8), 'are'),
+				new Tab(new Range(2, 8, 2, 9)),
+				new Space(new Range(2, 9, 2, 10)),
+				new Word(new Range(2, 10, 2, 14), 'you?'),
+				new VerticalTab(new Range(2, 14, 2, 15)),
+				new NewLine(new Range(2, 15, 2, 16)),
+				// third line
+				new NewLine(new Range(3, 1, 3, 2)),
+				// fourth line
+				new Space(new Range(4, 1, 4, 2)),
+				new Space(new Range(4, 2, 4, 3)),
+				new Space(new Range(4, 3, 4, 4)),
+				new Word(new Range(4, 4, 4, 10), '(test)'),
+				new Space(new Range(4, 10, 4, 11)),
+				new Space(new Range(4, 11, 4, 12)),
+				new Word(new Range(4, 12, 4, 25), '[!@#$%^&*_+=]'),
+				new FormFeed(new Range(4, 25, 4, 26)),
+				new Space(new Range(4, 26, 4, 27)),
+				new Space(new Range(4, 27, 4, 28)),
+				new NewLine(new Range(4, 28, 4, 29)),
+				// fifth line
+				new Tab(new Range(5, 1, 5, 2)),
+				new Tab(new Range(5, 2, 5, 3)),
+				new Word(new Range(5, 3, 5, 6), '🤗❤'),
+				new Space(new Range(5, 6, 5, 7)),
+				new Tab(new Range(5, 7, 5, 8)),
+				new NewLine(new Range(5, 8, 5, 9)),
+				// sixth line
+				new Space(new Range(6, 1, 6, 2)),
+				new Word(new Range(6, 2, 6, 5), 'hey'),
+				new VerticalTab(new Range(6, 5, 6, 6)),
+				new Word(new Range(6, 6, 6, 11), 'there'),
+				new CarriageReturn(new Range(6, 11, 6, 12)),
+				new NewLine(new Range(6, 12, 6, 13)),
+				// seventh line
+				new CarriageReturn(new Range(7, 1, 7, 2)),
+				new NewLine(new Range(7, 2, 7, 3)),
+			],
+		);
+	});
+});
diff --git a/src/vs/editor/test/common/utils/testDecoder.ts b/src/vs/editor/test/common/utils/testDecoder.ts
new file mode 100644
index 00000000000..e9ee9ce1067
--- /dev/null
+++ b/src/vs/editor/test/common/utils/testDecoder.ts
@@ -0,0 +1,115 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { VSBuffer } from '../../../../base/common/buffer.js';
+import { randomInt } from '../../../../base/common/numbers.js';
+import { BaseToken } from '../../../common/codecs/baseToken.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { WriteableStream } from '../../../../base/common/stream.js';
+import { BaseDecoder } from '../../../../base/common/codecs/baseDecoder.js';
+
+/**
+ * (pseudo)Random boolean generator.
+ *
+ * ## Examples
+ *
+ * ```typsecript
+ * randomBoolean(); // generates either `true` or `false`
+ * ```
+ */
+const randomBoolean = (): boolean => {
+	return Math.random() > 0.5;
+};
+
+/**
+ * A reusable test utility that asserts that the given decoder
+ * produces the expected `expectedTokens` sequence of tokens.
+ *
+ * ## Examples
+ *
+ * ```typescript
+ * const stream = newWriteableStream<VSBuffer>(null);
+ * const decoder = testDisposables.add(new LinesDecoder(stream));
+ *
+ * // create a new test utility instance
+ * const test = testDisposables.add(new TestDecoder(stream, decoder));
+ *
+ * // run the test
+ * await test.run(
+ *   ' hello world\n',
+ *   [
+ * 	   new Line(1, ' hello world'),
+ * 	   new NewLine(new Range(1, 13, 1, 14)),
+ *   ],
+ * );
+ */
+export class TestDecoder<T extends BaseToken, D extends BaseDecoder<T>> extends Disposable {
+	constructor(
+		private readonly stream: WriteableStream<VSBuffer>,
+		private readonly decoder: D,
+	) {
+		super();
+
+		this._register(this.decoder);
+	}
+
+	/**
+	 * Run the test sending the `inputData` data to the stream and asserting
+	 * that the decoder produces the `expectedTokens` sequence of tokens.
+	 */
+	public async run(
+		inputData: string,
+		expectedTokens: readonly T[],
+	): Promise<void> {
+		// write the data to the stream after a short delay to ensure
+		// that the the data is sent after the reading loop below
+		setTimeout(() => {
+			let inputDataBytes = VSBuffer.fromString(inputData);
+
+			// write the input data to the stream in multiple random-length chunks
+			while (inputDataBytes.byteLength > 0) {
+				const dataToSend = inputDataBytes.slice(0, randomInt(inputDataBytes.byteLength));
+				this.stream.write(dataToSend);
+				inputDataBytes = inputDataBytes.slice(dataToSend.byteLength);
+			}
+
+			this.stream.end();
+		}, 25);
+
+		// randomly use either the `async iterator` or the `.consume()`
+		// variants of getting tokens, they both must yield equal results
+		const receivedTokens: T[] = [];
+		if (randomBoolean()) {
+			// test the `async iterator` code path
+			for await (const token of this.decoder) {
+				if (token === null) {
+					break;
+				}
+
+				receivedTokens.push(token);
+			}
+		} else {
+			// test the `.consume()` code path
+			receivedTokens.push(...(await this.decoder.consumeAll()));
+		}
+
+		for (let i = 0; i < expectedTokens.length; i++) {
+			const expectedToken = expectedTokens[i];
+			const receivedtoken = receivedTokens[i];
+
+			assert(
+				receivedtoken.equals(expectedToken),
+				`Expected token '${i}' to be '${expectedToken}', got '${receivedtoken}'.`,
+			);
+		}
+
+		assert.strictEqual(
+			receivedTokens.length,
+			expectedTokens.length,
+			'Must produce correct number of tokens.',
+		);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
index 998fcc7afb3..39bb44149b6 100644
--- a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -84,6 +84,7 @@ import { ChatEditingSessionState, IChatEditingService, IChatEditingSession, Work
 import { IChatRequestVariableEntry, isPasteVariableEntry } from '../common/chatModel.js';
 import { ChatRequestDynamicVariablePart } from '../common/chatParserTypes.js';
 import { IChatFollowup } from '../common/chatService.js';
+import { IChatVariablesService } from '../common/chatVariables.js';
 import { IChatResponseViewModel } from '../common/chatViewModel.js';
 import { IChatHistoryEntry, IChatInputState, IChatWidgetHistoryService } from '../common/chatWidgetHistoryService.js';
 import { ILanguageModelChatMetadata, ILanguageModelsService } from '../common/languageModels.js';
@@ -99,6 +100,7 @@ import { ChatEditingRemoveAllFilesAction, ChatEditingShowChangesAction } from '.
 import { ChatEditingSaveAllAction } from './chatEditorSaving.js';
 import { ChatFollowups } from './chatFollowups.js';
 import { IChatViewState } from './chatWidget.js';
+import { ChatFileReference } from './contrib/chatDynamicVariables/chatFileReference.js';
 import { ChatImplicitContext } from './contrib/chatImplicitContext.js';
 
 const $ = dom.$;
@@ -150,12 +152,32 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		return this._attachmentModel;
 	}
 
-	public getAttachedAndImplicitContext(): IChatRequestVariableEntry[] {
+	public getAttachedAndImplicitContext(sessionId: string): IChatRequestVariableEntry[] {
 		const contextArr = [...this.attachmentModel.attachments];
 		if (this.implicitContext?.enabled && this.implicitContext.value) {
 			contextArr.push(this.implicitContext.toBaseEntry());
 		}
 
+		// factor in nested file references into the implicit context
+		const variables = this.variableService.getDynamicVariables(sessionId);
+		for (const variable of variables) {
+			if (!(variable instanceof ChatFileReference)) {
+				continue;
+			}
+
+			for (const childUri of variable.validFileReferenceUris) {
+				contextArr.push({
+					id: variable.id,
+					name: basename(childUri.path),
+					value: childUri,
+					isSelection: false,
+					enabled: true,
+					isFile: true,
+					isDynamic: true,
+				});
+			}
+		}
+
 		return contextArr;
 	}
 
@@ -287,6 +309,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		@ITextModelService private readonly textModelResolverService: ITextModelService,
 		@IStorageService private readonly storageService: IStorageService,
 		@ILabelService private readonly labelService: ILabelService,
+		@IChatVariablesService private readonly variableService: IChatVariablesService,
 	) {
 		super();
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
index 800e82d952e..3bb7d3b2285 100644
--- a/src/vs/workbench/contrib/chat/browser/chatWidget.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -1006,7 +1006,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 				}
 			}
 
-			let attachedContext = this.inputPart.getAttachedAndImplicitContext();
+			let attachedContext = this.inputPart.getAttachedAndImplicitContext(this.viewModel.sessionId);
 			let workingSet: URI[] | undefined;
 			if (this.location === ChatAgentLocation.EditingSession) {
 				const currentEditingSession = this.chatEditingService.currentEditingSessionObs.get();
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
index 9d1a1e19450..f4a6d525ce8 100644
--- a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts
@@ -15,7 +15,7 @@ import { ITextModelService } from '../../../../../editor/common/services/resolve
 import { localize } from '../../../../../nls.js';
 import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
-import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { ILogService } from '../../../../../platform/log/common/log.js';
 import { AnythingQuickAccessProviderRunOptions, IQuickAccessOptions } from '../../../../../platform/quickinput/common/quickAccess.js';
@@ -24,14 +24,23 @@ import { IChatWidget } from '../chat.js';
 import { ChatWidget, IChatWidgetContrib } from '../chatWidget.js';
 import { IChatRequestVariableValue, IChatVariablesService, IDynamicVariable } from '../../common/chatVariables.js';
 import { ISymbolQuickPickItem } from '../../../search/browser/symbolsQuickAccess.js';
+import { ChatFileReference } from './chatDynamicVariables/chatFileReference.js';
+import { PromptFileReference } from '../../common/promptFileReference.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 
 export const dynamicVariableDecorationType = 'chat-dynamic-variable';
 
+/**
+ * Type of dynamic variables. Can be either a file reference or
+ * another dynamic variable (e.g., a `#sym`, `#kb`, etc.).
+ */
+type TDynamicVariable = IDynamicVariable | ChatFileReference;
+
 export class ChatDynamicVariableModel extends Disposable implements IChatWidgetContrib {
 	public static readonly ID = 'chatDynamicVariableModel';
 
-	private _variables: IDynamicVariable[] = [];
-	get variables(): ReadonlyArray<IDynamicVariable> {
+	private _variables: TDynamicVariable[] = [];
+	get variables(): ReadonlyArray<TDynamicVariable> {
 		return [...this._variables];
 	}
 
@@ -42,8 +51,11 @@ export class ChatDynamicVariableModel extends Disposable implements IChatWidgetC
 	constructor(
 		private readonly widget: IChatWidget,
 		@ILabelService private readonly labelService: ILabelService,
+		@IConfigurationService private readonly configService: IConfigurationService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
 		super();
+
 		this._register(widget.inputEditor.onDidChangeModelContent(e => {
 			e.changes.forEach(c => {
 				// Don't mutate entries in _variables, since they will be returned from the getter
@@ -60,18 +72,23 @@ export class ChatDynamicVariableModel extends Disposable implements IChatWidgetC
 							}]);
 							this.widget.refreshParsedInput();
 						}
+
+						// dispose the reference if possible before dropping it off
+						if ('dispose' in ref && typeof ref.dispose === 'function') {
+							ref.dispose();
+						}
+
 						return null;
 					} else if (Range.compareRangesUsingStarts(ref.range, c.range) > 0) {
 						const delta = c.text.length - c.rangeLength;
-						return {
-							...ref,
-							range: {
-								startLineNumber: ref.range.startLineNumber,
-								startColumn: ref.range.startColumn + delta,
-								endLineNumber: ref.range.endLineNumber,
-								endColumn: ref.range.endColumn + delta
-							}
+						ref.range = {
+							startLineNumber: ref.range.startLineNumber,
+							startColumn: ref.range.startColumn + delta,
+							endLineNumber: ref.range.endLineNumber,
+							endColumn: ref.range.endColumn + delta,
 						};
+
+						return ref;
 					}
 
 					return ref;
@@ -83,7 +100,15 @@ export class ChatDynamicVariableModel extends Disposable implements IChatWidgetC
 	}
 
 	getInputState(): any {
-		return this.variables;
+		return this.variables
+			.map((variable: TDynamicVariable) => {
+				// return underlying `IDynamicVariable` object for file references
+				if (variable instanceof ChatFileReference) {
+					return variable.reference;
+				}
+
+				return variable;
+			});
 	}
 
 	setInputState(s: any): void {
@@ -91,14 +116,39 @@ export class ChatDynamicVariableModel extends Disposable implements IChatWidgetC
 			s = [];
 		}
 
-		this._variables = s.filter(isDynamicVariable);
-		this.updateDecorations();
+		this.disposeVariables();
+		this._variables = [];
+
+		for (const variable of s) {
+			if (!isDynamicVariable(variable)) {
+				continue;
+			}
+
+			this.addReference(variable);
+		}
 	}
 
 	addReference(ref: IDynamicVariable): void {
-		this._variables.push(ref);
+		// use `ChatFileReference` for file references and `IDynamicVariable` for other variables
+		const promptSnippetsEnabled = PromptFileReference.promptSnippetsEnabled(this.configService);
+		const variable = (ref.id === 'vscode.file' && promptSnippetsEnabled)
+			? this.instantiationService.createInstance(ChatFileReference, ref)
+			: ref;
+
+		this._variables.push(variable);
 		this.updateDecorations();
 		this.widget.refreshParsedInput();
+
+		// if the `prompt snippets` feature is enabled, and file is a `prompt snippet`,
+		// start resolving nested file references immediatelly and subscribe to updates
+		if (variable instanceof ChatFileReference && variable.isPromptSnippetFile) {
+			// subscribe to variable changes
+			variable.onUpdate(() => {
+				this.updateDecorations();
+			});
+			// start resolving the file references
+			variable.resolve();
+		}
 	}
 
 	private updateDecorations(): void {
@@ -120,6 +170,22 @@ export class ChatDynamicVariableModel extends Disposable implements IChatWidgetC
 			return undefined;
 		}
 	}
+
+	/**
+	 * Dispose all existing variables.
+	 */
+	private disposeVariables(): void {
+		for (const variable of this._variables) {
+			if ('dispose' in variable && typeof variable.dispose === 'function') {
+				variable.dispose();
+			}
+		}
+	}
+
+	public override dispose() {
+		this.disposeVariables();
+		super.dispose();
+	}
 }
 
 /**
diff --git a/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables/chatFileReference.ts b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables/chatFileReference.ts
new file mode 100644
index 00000000000..2a5ecdf5048
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables/chatFileReference.ts
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { URI } from '../../../../../../base/common/uri.js';
+import { assert } from '../../../../../../base/common/assert.js';
+import { IDynamicVariable } from '../../../common/chatVariables.js';
+import { IRange } from '../../../../../../editor/common/core/range.js';
+import { PromptFileReference } from '../../../common/promptFileReference.js';
+import { IFileService } from '../../../../../../platform/files/common/files.js';
+import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.js';
+
+/**
+ * A wrapper class for an `IDynamicVariable` object that that adds functionality
+ * to parse nested file references of this variable.
+ * See {@link PromptFileReference} for details.
+ */
+export class ChatFileReference extends PromptFileReference implements IDynamicVariable {
+	/**
+	 * @throws if the `data` reference is no an instance of `URI`.
+	 */
+	constructor(
+		public readonly reference: IDynamicVariable,
+		@IFileService fileService: IFileService,
+		@IConfigurationService configService: IConfigurationService,
+	) {
+		const { data } = reference;
+
+		assert(
+			data instanceof URI,
+			`Variable data must be an URI, got '${data}'.`,
+		);
+
+		super(data, fileService, configService);
+	}
+
+	/**
+	 * Note! below are the getters that simply forward to the underlying `IDynamicVariable` object;
+	 * 		 while we could implement the logic generically using the `Proxy` class here, it's hard
+	 * 		 to make Typescript to recognize this generic implementation correctly
+	 */
+
+	public get id() {
+		return this.reference.id;
+	}
+
+	public get range() {
+		return this.reference.range;
+	}
+
+	public set range(range: IRange) {
+		this.reference.range = range;
+	}
+
+	public get data(): URI {
+		return this.uri;
+	}
+
+	public get prefix() {
+		return this.reference.prefix;
+	}
+
+	public get isFile() {
+		return this.reference.isFile;
+	}
+
+	public get fullName() {
+		return this.reference.fullName;
+	}
+
+	public get icon() {
+		return this.reference.icon;
+	}
+
+	public get modelDescription() {
+		return this.reference.modelDescription;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/codecs/chatPromptCodec/chatPromptCodec.ts b/src/vs/workbench/contrib/chat/common/codecs/chatPromptCodec/chatPromptCodec.ts
new file mode 100644
index 00000000000..7522f5acd0b
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/codecs/chatPromptCodec/chatPromptCodec.ts
@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { VSBuffer } from '../../../../../../base/common/buffer.js';
+import { ReadableStream } from '../../../../../../base/common/stream.js';
+import { ChatPromptDecoder, TChatPromptToken } from './chatPromptDecoder.js';
+import { ICodec } from '../../../../../../base/common/codecs/types/ICodec.js';
+
+/**
+ * `ChatPromptCodec` type is a `ICodec<T, K>` with specific types for
+ * stream messages and return types of the `encode`/`decode` functions.
+ * @see {@linkcode ICodec}
+ */
+interface IChatPromptCodec extends ICodec<VSBuffer, TChatPromptToken> {
+	/**
+	 * Decode a stream of `VSBuffer`s into a stream of `TChatPromptToken`s.
+	 *
+	 * @see {@linkcode TChatPromptToken}
+	 * @see {@linkcode VSBuffer}
+	 * @see {@linkcode ChatPromptDecoder}
+	 */
+	decode: (value: ReadableStream<VSBuffer>) => ChatPromptDecoder;
+}
+
+/**
+ * Codec that is capable to encode and decode tokens of an AI chatbot prompt message.
+ */
+export const ChatPromptCodec: IChatPromptCodec = Object.freeze({
+	/**
+	 * Encode a stream of `TChatPromptToken`s into a stream of `VSBuffer`s.
+	 *
+	 * @see {@linkcode ReadableStream}
+	 * @see {@linkcode VSBuffer}
+	 */
+	encode: (_stream: ReadableStream<TChatPromptToken>): ReadableStream<VSBuffer> => {
+		throw new Error('The `encode` method is not implemented.');
+	},
+
+	/**
+	 * Decode a of `VSBuffer`s into a readable of `TChatPromptToken`s.
+	 *
+	 * @see {@linkcode TChatPromptToken}
+	 * @see {@linkcode VSBuffer}
+	 * @see {@linkcode ChatPromptDecoder}
+	 * @see {@linkcode ReadableStream}
+	 */
+	decode: (stream: ReadableStream<VSBuffer>): ChatPromptDecoder => {
+		return new ChatPromptDecoder(stream);
+	},
+});
diff --git a/src/vs/workbench/contrib/chat/common/codecs/chatPromptCodec/chatPromptDecoder.ts b/src/vs/workbench/contrib/chat/common/codecs/chatPromptCodec/chatPromptDecoder.ts
new file mode 100644
index 00000000000..57b7f0955b8
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/codecs/chatPromptCodec/chatPromptDecoder.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 { FileReference } from './tokens/fileReference.js';
+import { VSBuffer } from '../../../../../../base/common/buffer.js';
+import { ReadableStream } from '../../../../../../base/common/stream.js';
+import { BaseDecoder } from '../../../../../../base/common/codecs/baseDecoder.js';
+import { Word } from '../../../../../../editor/common/codecs/simpleCodec/tokens/word.js';
+import { SimpleDecoder, TSimpleToken } from '../../../../../../editor/common/codecs/simpleCodec/simpleDecoder.js';
+
+/**
+ * Tokens handled by the `ChatPromptDecoder` decoder.
+ */
+export type TChatPromptToken = FileReference;
+
+/**
+ * Decoder for the common chatbot prompt message syntax.
+ * For instance, the file references `#file:./path/file.md` are handled by this decoder.
+ */
+export class ChatPromptDecoder extends BaseDecoder<TChatPromptToken, TSimpleToken> {
+	constructor(
+		stream: ReadableStream<VSBuffer>,
+	) {
+		super(new SimpleDecoder(stream));
+	}
+
+	protected override onStreamData(simpleToken: TSimpleToken): void {
+		// handle the word tokens only
+		if (!(simpleToken instanceof Word)) {
+			return;
+		}
+
+		// handle file references only for now
+		const { text } = simpleToken;
+		if (!text.startsWith(FileReference.TOKEN_START)) {
+			return;
+		}
+
+		this._onData.fire(
+			FileReference.fromWord(simpleToken),
+		);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/codecs/chatPromptCodec/tokens/fileReference.ts b/src/vs/workbench/contrib/chat/common/codecs/chatPromptCodec/tokens/fileReference.ts
new file mode 100644
index 00000000000..5a68344a757
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/codecs/chatPromptCodec/tokens/fileReference.ts
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { assert } from '../../../../../../../base/common/assert.js';
+import { Range } from '../../../../../../../editor/common/core/range.js';
+import { BaseToken } from '../../../../../../../editor/common/codecs/baseToken.js';
+import { Word } from '../../../../../../../editor/common/codecs/simpleCodec/tokens/word.js';
+
+// Start sequence for a file reference token in a prompt.
+const TOKEN_START: string = '#file:';
+
+/**
+ * Object represents a file reference token inside a chatbot prompt.
+ */
+export class FileReference extends BaseToken {
+	// Start sequence for a file reference token in a prompt.
+	public static readonly TOKEN_START = TOKEN_START;
+
+	constructor(
+		range: Range,
+		public readonly path: string,
+	) {
+		super(range);
+	}
+
+	/**
+	 * Get full text of the file reference token.
+	 */
+	public get text(): string {
+		return `${TOKEN_START}${this.path}`;
+	}
+
+	/**
+	 * Create a file reference token out of a generic `Word`.
+	 * @throws if the word does not conform to the expected format or if
+	 *         the reference is an invalid `URI`.
+	 */
+	public static fromWord(word: Word): FileReference {
+		const { text } = word;
+
+		assert(
+			text.startsWith(TOKEN_START),
+			`The reference must start with "${TOKEN_START}", got ${text}.`,
+		);
+
+		const maybeReference = text.split(TOKEN_START);
+
+		assert(
+			maybeReference.length === 2,
+			`The expected reference format is "${TOKEN_START}:filesystem-path", got ${text}.`,
+		);
+
+		const [first, second] = maybeReference;
+
+		assert(
+			first === '',
+			`The reference must start with "${TOKEN_START}", got ${first}.`,
+		);
+
+		assert(
+			// Note! this accounts for both cases when second is `undefined` or `empty`
+			// 		 and we don't care about rest of the "falsy" cases here
+			!!second,
+			`The reference path must be defined, got ${second}.`,
+		);
+
+		const reference = new FileReference(
+			word.range,
+			second,
+		);
+
+		return reference;
+	}
+
+	/**
+	 * Check if this token is equal to another one.
+	 */
+	public override equals<T extends BaseToken>(other: T): boolean {
+		if (!super.sameRange(other.range)) {
+			return false;
+		}
+
+		if (!(other instanceof FileReference)) {
+			return false;
+		}
+
+		return this.text === other.text;
+	}
+
+	/**
+	 * Return a string representation of the token.
+	 */
+	public override toString(): string {
+		return `file-ref("${this.text}")${this.range}`;
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/promptFileReference.ts b/src/vs/workbench/contrib/chat/common/promptFileReference.ts
new file mode 100644
index 00000000000..878c800d785
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/promptFileReference.ts
@@ -0,0 +1,414 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { URI } from '../../../../base/common/uri.js';
+import { Emitter } from '../../../../base/common/event.js';
+import { extUri } from '../../../../base/common/resources.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Location } from '../../../../editor/common/languages.js';
+import { ChatPromptCodec } from './codecs/chatPromptCodec/chatPromptCodec.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { FileOpenFailed, NonPromptSnippetFile, RecursiveReference } from './promptFileReferenceErrors.js';
+import { FileChangesEvent, FileChangeType, IFileService, IFileStreamContent } from '../../../../platform/files/common/files.js';
+
+/**
+ * Error conditions that may happen during the file reference resolution.
+ */
+export type TErrorCondition = FileOpenFailed | RecursiveReference | NonPromptSnippetFile;
+
+/**
+ * File extension for the prompt snippet files.
+ */
+const PROMP_SNIPPET_FILE_EXTENSION: string = '.prompt.md';
+
+/**
+ * Configuration key for the prompt snippets feature.
+ */
+const PROMPT_SNIPPETS_CONFIG_KEY: string = 'chat.experimental.prompt-snippets';
+
+/**
+ * Represents a file reference in the chatbot prompt, e.g. `#file:./path/to/file.md`.
+ * Contains logic to resolve all nested file references in the target file and all
+ * referenced child files recursively, if any.
+ *
+ * ## Examples
+ *
+ * ```typescript
+ * const fileReference = new PromptFileReference(
+ * 	 URI.file('/path/to/file.md'),
+ * 	 fileService,
+ * );
+ *
+ * // subscribe to updates to the file reference tree
+ * fileReference.onUpdate(() => {
+ * 	 // .. do something with the file reference tree ..
+ * 	 // e.g. get URIs of all resolved file references in the tree
+ * 	 const resolved = fileReference
+ * 		// get all file references as a flat array
+ * 		.flatten()
+ * 		// remove self from the list if only child references are needed
+ * 		.slice(1)
+ * 		// filter out unresolved references
+ * 		.filter(reference => reference.resolveFailed === flase)
+ * 		// convert to URIs only
+ * 		.map(reference => reference.uri);
+ *
+ * 	 console.log(resolved);
+ * });
+ *
+ * // *optional* if need to re-resolve file references when target files change
+ * // note that this does not sets up filesystem listeners for nested file references
+ * fileReference.addFilesystemListeners();
+ *
+ * // start resolving the file reference tree; this can also be `await`ed if needed
+ * // to wait for the resolution on the main file reference to complete (the nested
+ * // references can still be resolving in the background)
+ * fileReference.resolve();
+ *
+ * // don't forget to dispose when no longer needed!
+ * fileReference.dispose();
+ * ```
+ */
+export class PromptFileReference extends Disposable {
+	/**
+	 * Child references of the current one.
+	 */
+	protected readonly children: PromptFileReference[] = [];
+
+	/**
+	 * The event is fired when nested prompt snippet references are updated, if any.
+	 */
+	private readonly _onUpdate = this._register(new Emitter<void>());
+
+	private _errorCondition?: TErrorCondition;
+	/**
+	 * If file reference resolution fails, this attribute will be set
+	 * to an error instance that describes the error condition.
+	 */
+	public get errorCondition(): TErrorCondition | undefined {
+		return this._errorCondition;
+	}
+
+	/**
+	 * Whether file reference resolution was attempted at least once.
+	 */
+	private _resolveAttempted: boolean = false;
+	/**
+	 * Whether file references resolution failed.
+	 * Set to `undefined` if the `resolve` method hasn't been ever called yet.
+	 */
+	public get resolveFailed(): boolean | undefined {
+		if (!this._resolveAttempted) {
+			return undefined;
+		}
+
+		return !!this._errorCondition;
+	}
+
+	constructor(
+		private readonly _uri: URI | Location,
+		@IFileService private readonly fileService: IFileService,
+		@IConfigurationService private readonly configService: IConfigurationService,
+	) {
+		super();
+		this.onFilesChanged = this.onFilesChanged.bind(this);
+
+		// make sure the variable is updated on file changes
+		// but only for the prompt snippet files
+		if (this.isPromptSnippetFile) {
+			this.addFilesystemListeners();
+		}
+	}
+
+	/**
+	 * Subscribe to the `onUpdate` event.
+	 * @param callback
+	 */
+	public onUpdate(callback: () => unknown) {
+		this._register(this._onUpdate.event(callback));
+	}
+
+	/**
+	 * Check if the prompt snippets feature is enabled.
+	 * @see {@link PROMPT_SNIPPETS_CONFIG_KEY}
+	 */
+	public static promptSnippetsEnabled(
+		configService: IConfigurationService,
+	): boolean {
+		const value = configService.getValue(PROMPT_SNIPPETS_CONFIG_KEY);
+
+		if (!value) {
+			return false;
+		}
+
+		if (typeof value === 'string') {
+			return value.trim().toLowerCase() === 'true';
+		}
+
+		return !!value;
+	}
+
+	/**
+	 * Check if the current reference points to a prompt snippet file.
+	 */
+	public get isPromptSnippetFile(): boolean {
+		return this.uri.path.endsWith(PROMP_SNIPPET_FILE_EXTENSION);
+	}
+
+	/**
+	 * Associated URI of the reference.
+	 */
+	public get uri(): URI {
+		return this._uri instanceof URI
+			? this._uri
+			: this._uri.uri;
+	}
+
+	/**
+	 * Get the directory name of the file reference.
+	 */
+	public get dirname() {
+		return URI.joinPath(this.uri, '..');
+	}
+
+	/**
+	 * Check if the current reference points to a given resource.
+	 */
+	public sameUri(other: URI | Location): boolean {
+		const otherUri = other instanceof URI ? other : other.uri;
+
+		return this.uri.toString() === otherUri.toString();
+	}
+
+	/**
+	 * Add file system event listeners for the current file reference.
+	 */
+	private addFilesystemListeners(): this {
+		this._register(
+			this.fileService.onDidFilesChange(this.onFilesChanged),
+		);
+
+		return this;
+	}
+
+	/**
+	 * Event handler for the `onDidFilesChange` event.
+	 */
+	private onFilesChanged(event: FileChangesEvent) {
+		const fileChanged = event.contains(this.uri, FileChangeType.UPDATED);
+		const fileDeleted = event.contains(this.uri, FileChangeType.DELETED);
+		if (!fileChanged && !fileDeleted) {
+			return;
+		}
+
+		// if file is changed or deleted, re-resolve the file reference
+		// in the case when the file is deleted, this should result in
+		// failure to open the file, so the `errorCondition` field will
+		// be updated to an appropriate error instance and the `children`
+		// field will be cleared up
+		this.resolve();
+	}
+
+	/**
+	 * Get file stream, if the file exsists.
+	 */
+	private async getFileStream(): Promise<IFileStreamContent | null> {
+		try {
+			// read the file first
+			const result = await this.fileService.readFileStream(this.uri);
+
+			// if file exists but not a prompt snippet file, set appropriate error
+			// condition and return null so we don't resolve nested references in it
+			if (this.uri.path.endsWith(PROMP_SNIPPET_FILE_EXTENSION) === false) {
+				this._errorCondition = new NonPromptSnippetFile(this.uri);
+
+				return null;
+			}
+
+			return result;
+		} catch (error) {
+			this._errorCondition = new FileOpenFailed(this.uri, error);
+
+			return null;
+		}
+	}
+
+	/**
+	 * Resolve the current file reference on the disk and
+	 * all nested file references that may exist in the file.
+	 *
+	 * @param waitForChildren Whether need to block until all child references are resolved.
+	 */
+	public async resolve(
+		waitForChildren: boolean = false,
+	): Promise<this> {
+		return await this.resolveReference(waitForChildren);
+	}
+
+	/**
+	 * Private implementation of the {@link resolve} method, that allows
+	 * to pass `seenReferences` list to the recursive calls to prevent
+	 * infinite file reference recursion.
+	 */
+	private async resolveReference(
+		waitForChildren: boolean = false,
+		seenReferences: string[] = [],
+	): Promise<this> {
+		// remove current error condition from the previous resolve attempt, if any
+		delete this._errorCondition;
+
+		// dispose current child references, if any exist from a previous resolve
+		this.disposeChildren();
+
+		// to prevent infinite file recursion, we keep track of all references in
+		// the current branch of the file reference tree and check if the current
+		// file reference has been already seen before
+		if (seenReferences.includes(this.uri.path)) {
+			seenReferences.push(this.uri.path);
+
+			this._errorCondition = new RecursiveReference(this.uri, seenReferences);
+			this._resolveAttempted = true;
+			this._onUpdate.fire();
+
+			return this;
+		}
+
+		// we don't care if reading the file fails below, hence can add the path
+		// of the current reference to the `seenReferences` set immediately, -
+		// even if the file doesn't exist, we would never end up in the recursion
+		seenReferences.push(this.uri.path);
+
+		// try to get stream for the contents of the file, it may
+		// fail to multiple reasons, e.g. file doesn't exist, etc.
+		const fileStream = await this.getFileStream();
+		this._resolveAttempted = true;
+
+		// failed to open the file, nothing to resolve
+		if (fileStream === null) {
+			this._onUpdate.fire();
+
+			return this;
+		}
+
+		// get all file references in the file contents
+		const references = await ChatPromptCodec.decode(fileStream.value).consumeAll();
+
+		// recursively resolve all references and add to the `children` array
+		//
+		// Note! we don't register the children references as disposables here, because we dispose them
+		//		 explicitly in the `dispose` override method of this class. This is done to prevent
+		//       the disposables store to be littered with already-disposed child instances due to
+		// 		 the fact that the `resolve` method can be called multiple times on target file changes
+		const childPromises = [];
+		for (const reference of references) {
+			const childUri = extUri.resolvePath(this.dirname, reference.path);
+
+			const child = new PromptFileReference(
+				childUri,
+				this.fileService,
+				this.configService,
+			);
+
+			// subscribe to child updates
+			child.onUpdate(
+				this._onUpdate.fire.bind(this._onUpdate),
+			);
+			this.children.push(child);
+
+			// start resolving the child in the background, including its children
+			// Note! we have to clone the `seenReferences` list here to ensure that
+			// 		 different tree branches don't interfere with each other as we
+			//       care about the parent references when checking for recursion
+			childPromises.push(
+				child.resolveReference(waitForChildren, [...seenReferences]),
+			);
+		}
+
+		// if should wait for all children to resolve, block here
+		if (waitForChildren) {
+			await Promise.all(childPromises);
+		}
+
+		this._onUpdate.fire();
+
+		return this;
+	}
+
+	/**
+	 * Dispose current child file references.
+	 */
+	private disposeChildren(): this {
+		for (const child of this.children) {
+			child.dispose();
+		}
+
+		this.children.length = 0;
+		this._onUpdate.fire();
+
+		return this;
+	}
+
+	/**
+	 * Flatten the current file reference tree into a single array.
+	 */
+	public flatten(): readonly PromptFileReference[] {
+		const result = [];
+
+		// then add self to the result
+		result.push(this);
+
+		// get flattened children references first
+		for (const child of this.children) {
+			result.push(...child.flatten());
+		}
+
+		return result;
+	}
+
+	/**
+	 * Get list of all valid child references.
+	 */
+	public get validChildReferences(): readonly PromptFileReference[] {
+		return this.flatten()
+			// skip the root reference itself (this variable)
+			.slice(1)
+			// filter out unresolved references
+			.filter((reference) => {
+				return (reference.resolveFailed === false) ||
+					(reference.errorCondition instanceof NonPromptSnippetFile);
+			});
+	}
+
+	/**
+	 * Get list of all valid child references as URIs.
+	 */
+	public get validFileReferenceUris(): readonly URI[] {
+		return this.validChildReferences
+			.map(child => child.uri);
+	}
+
+	/**
+	 * Check if the current reference is equal to a given one.
+	 */
+	public equals(other: PromptFileReference): boolean {
+		if (!this.sameUri(other.uri)) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns a string representation of this reference.
+	 */
+	public override toString() {
+		return `#file:${this.uri.path}`;
+	}
+
+	public override dispose() {
+		this.disposeChildren();
+		super.dispose();
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts b/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
new file mode 100644
index 00000000000..60da24e52a7
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/common/promptFileReferenceErrors.ts
@@ -0,0 +1,129 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { URI } from '../../../../base/common/uri.js';
+
+/**
+ * Base resolve error class used when file reference resolution fails.
+ */
+abstract class ResolveError extends Error {
+	constructor(
+		public readonly uri: URI,
+		message?: string,
+		options?: ErrorOptions,
+	) {
+		super(message, options);
+	}
+
+	/**
+	 * Check if provided object is of the same type as this error.
+	 */
+	public sameTypeAs(other: unknown): other is typeof this {
+		if (other === null || other === undefined) {
+			return false;
+		}
+
+		return other instanceof this.constructor;
+	}
+
+	/**
+	 * Check if provided object is equal to this error.
+	 */
+	public equal(other: unknown): boolean {
+		return this.sameTypeAs(other);
+	}
+}
+
+/**
+ * Error that reflects the case when attempt to open target file fails.
+ */
+export class FileOpenFailed extends ResolveError {
+	constructor(
+		uri: URI,
+		public readonly originalError: unknown,
+	) {
+		super(
+			uri,
+			`Failed to open file '${uri.toString()}': ${originalError}.`,
+		);
+	}
+}
+
+/**
+ * Error that reflects the case when attempt resolve nested file
+ * references failes due to a recursive reference, e.g.,
+ *
+ * ```markdown
+ * // a.md
+ * #file:b.md
+ * ```
+ *
+ * ```markdown
+ * // b.md
+ * #file:a.md
+ * ```
+ */
+export class RecursiveReference extends ResolveError {
+	constructor(
+		uri: URI,
+		public readonly recursivePath: string[],
+	) {
+		const references = recursivePath.join(' -> ');
+
+		super(
+			uri,
+			`Recursive references found: ${references}.`,
+		);
+	}
+
+	/**
+	 * Returns a string representation of the recursive path.
+	 */
+	public get recursivePathString(): string {
+		return this.recursivePath.join(' -> ');
+	}
+
+	/**
+	 * Check if provided object is of the same type as this
+	 * error, contains the same recursive path and URI.
+	 */
+	public override equal(other: unknown): other is this {
+		if (!this.sameTypeAs(other)) {
+			return false;
+		}
+
+		if (this.uri.toString() !== other.uri.toString()) {
+			return false;
+		}
+
+		return this.recursivePathString === other.recursivePathString;
+	}
+
+	/**
+	 * Returns a string representation of the error object.
+	 */
+	public override toString(): string {
+		return `"${this.message}"(${this.uri})`;
+	}
+}
+
+/**
+ * Error that reflects the case when resource URI does not point to
+ * a prompt snippet file, hence was not attempted to be resolved.
+ */
+export class NonPromptSnippetFile extends ResolveError {
+	constructor(
+		uri: URI,
+		message: string = '',
+	) {
+
+		const suffix = message ? `: ${message}` : '';
+
+		super(
+			uri,
+			`Resource at ${uri.path} is not a prompt snippet file${suffix}`,
+		);
+	}
+}
diff --git a/src/vs/workbench/contrib/chat/test/common/codecs/chatPromptCodec.test.ts b/src/vs/workbench/contrib/chat/test/common/codecs/chatPromptCodec.test.ts
new file mode 100644
index 00000000000..01fd02cd1c0
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/codecs/chatPromptCodec.test.ts
@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { VSBuffer } from '../../../../../../base/common/buffer.js';
+import { Range } from '../../../../../../editor/common/core/range.js';
+import { newWriteableStream } from '../../../../../../base/common/stream.js';
+import { TestDecoder } from '../../../../../../editor/test/common/utils/testDecoder.js';
+import { FileReference } from '../../../common/codecs/chatPromptCodec/tokens/fileReference.js';
+import { ChatPromptCodec } from '../../../common/codecs/chatPromptCodec/chatPromptCodec.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { ChatPromptDecoder, TChatPromptToken } from '../../../common/codecs/chatPromptCodec/chatPromptDecoder.js';
+
+/**
+ * A reusable test utility that asserts that a `ChatPromptDecoder` instance
+ * correctly decodes `inputData` into a stream of `TChatPromptToken` tokens.
+ *
+ * ## Examples
+ *
+ * ```typescript
+ * // create a new test utility instance
+ * const test = testDisposables.add(new TestChatPromptCodec());
+ *
+ * // run the test
+ * await test.run(
+ *   ' hello #file:./some-file.md world\n',
+ *   [
+ *     new FileReference(
+ *       new Range(1, 8, 1, 28),
+ *       './some-file.md',
+ *     ),
+ *   ]
+ * );
+ */
+export class TestChatPromptCodec extends TestDecoder<TChatPromptToken, ChatPromptDecoder> {
+	constructor() {
+		const stream = newWriteableStream<VSBuffer>(null);
+		const decoder = ChatPromptCodec.decode(stream);
+
+		super(stream, decoder);
+	}
+}
+
+suite('ChatPromptCodec', () => {
+	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('produces expected tokens', async () => {
+		const test = testDisposables.add(new TestChatPromptCodec());
+
+		await test.run(
+			'#file:/etc/hosts some text\t\n  for #file:./README.md\t testing\n ✔ purposes\n#file:LICENSE.md ✌ \t#file:.gitignore\n\n\n\t   #file:/Users/legomushroom/repos/vscode   ',
+			[
+				new FileReference(
+					new Range(1, 1, 1, 1 + 16),
+					'/etc/hosts',
+				),
+				new FileReference(
+					new Range(2, 7, 2, 7 + 17),
+					'./README.md',
+				),
+				new FileReference(
+					new Range(4, 1, 4, 1 + 16),
+					'LICENSE.md',
+				),
+				new FileReference(
+					new Range(4, 21, 4, 21 + 16),
+					'.gitignore',
+				),
+				new FileReference(
+					new Range(7, 5, 7, 5 + 38),
+					'/Users/legomushroom/repos/vscode',
+				),
+			],
+		);
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/codecs/chatPromptDecoder.test.ts b/src/vs/workbench/contrib/chat/test/common/codecs/chatPromptDecoder.test.ts
new file mode 100644
index 00000000000..2ebadb798f1
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/codecs/chatPromptDecoder.test.ts
@@ -0,0 +1,75 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { VSBuffer } from '../../../../../../base/common/buffer.js';
+import { Range } from '../../../../../../editor/common/core/range.js';
+import { newWriteableStream } from '../../../../../../base/common/stream.js';
+import { TestDecoder } from '../../../../../../editor/test/common/utils/testDecoder.js';
+import { FileReference } from '../../../common/codecs/chatPromptCodec/tokens/fileReference.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { ChatPromptDecoder, TChatPromptToken } from '../../../common/codecs/chatPromptCodec/chatPromptDecoder.js';
+
+/**
+ * A reusable test utility that asserts that a `ChatPromptDecoder` instance
+ * correctly decodes `inputData` into a stream of `TChatPromptToken` tokens.
+ *
+ * ## Examples
+ *
+ * ```typescript
+ * // create a new test utility instance
+ * const test = testDisposables.add(new TestChatPromptDecoder());
+ *
+ * // run the test
+ * await test.run(
+ *   ' hello #file:./some-file.md world\n',
+ *   [
+ *     new FileReference(
+ *       new Range(1, 8, 1, 28),
+ *       './some-file.md',
+ *     ),
+ *   ]
+ * );
+ */
+export class TestChatPromptDecoder extends TestDecoder<TChatPromptToken, ChatPromptDecoder> {
+	constructor(
+	) {
+		const stream = newWriteableStream<VSBuffer>(null);
+		const decoder = new ChatPromptDecoder(stream);
+
+		super(stream, decoder);
+	}
+}
+
+suite('ChatPromptDecoder', () => {
+	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('produces expected tokens', async () => {
+		const test = testDisposables.add(
+			new TestChatPromptDecoder(),
+		);
+
+		await test.run(
+			'\nhaalo!\n message 👾 message #file:./path/to/file1.md \n\n \t#file:a/b/c/filename2.md\t🖖\t#file:other-file.md\nsome text #file:/some/file/with/absolute/path.md\t',
+			[
+				new FileReference(
+					new Range(3, 21, 3, 21 + 24),
+					'./path/to/file1.md',
+				),
+				new FileReference(
+					new Range(5, 3, 5, 3 + 24),
+					'a/b/c/filename2.md',
+				),
+				new FileReference(
+					new Range(5, 31, 5, 31 + 19),
+					'other-file.md',
+				),
+				new FileReference(
+					new Range(6, 11, 6, 11 + 38),
+					'/some/file/with/absolute/path.md',
+				),
+			],
+		);
+	});
+});
diff --git a/src/vs/workbench/contrib/chat/test/common/promptFileReference.test.ts b/src/vs/workbench/contrib/chat/test/common/promptFileReference.test.ts
new file mode 100644
index 00000000000..e7256cf7099
--- /dev/null
+++ b/src/vs/workbench/contrib/chat/test/common/promptFileReference.test.ts
@@ -0,0 +1,474 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert from 'assert';
+import { URI } from '../../../../../base/common/uri.js';
+import { VSBuffer } from '../../../../../base/common/buffer.js';
+import { Schemas } from '../../../../../base/common/network.js';
+import { isWindows } from '../../../../../base/common/platform.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { FileService } from '../../../../../platform/files/common/fileService.js';
+import { NullPolicyService } from '../../../../../platform/policy/common/policy.js';
+import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js';
+import { PromptFileReference, TErrorCondition } from '../../common/promptFileReference.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ConfigurationService } from '../../../../../platform/configuration/common/configurationService.js';
+import { InMemoryFileSystemProvider } from '../../../../../platform/files/common/inMemoryFilesystemProvider.js';
+import { FileOpenFailed, RecursiveReference, NonPromptSnippetFile } from '../../common/promptFileReferenceErrors.js';
+import { TestInstantiationService } from '../../../../../platform/instantiation/test/common/instantiationServiceMock.js';
+
+/**
+ * Represents a file system node.
+ */
+interface IFilesystemNode {
+	name: string;
+}
+
+/**
+ * Represents a file node.
+ */
+interface IFile extends IFilesystemNode {
+	contents: string;
+}
+
+/**
+ * Represents a folder node.
+ */
+interface IFolder extends IFilesystemNode {
+	children: (IFolder | IFile)[];
+}
+
+/**
+ * Represents a file reference with an expected
+ * error condition value for testing purposes.
+ */
+class ExpectedReference extends PromptFileReference {
+	constructor(
+		uri: URI,
+		public readonly error: TErrorCondition | undefined,
+	) {
+		const nullLogService = new NullLogService();
+		const nullPolicyService = new NullPolicyService();
+		const nullFileService = new FileService(nullLogService);
+		const nullConfigService = new ConfigurationService(
+			URI.file('/config.json'),
+			nullFileService,
+			nullPolicyService,
+			nullLogService,
+		);
+		super(uri, nullFileService, nullConfigService);
+
+		this._register(nullFileService);
+		this._register(nullConfigService);
+	}
+
+	/**
+	 * Override the error condition getter to
+	 * return the provided expected error value.
+	 */
+	public override get errorCondition() {
+		return this.error;
+	}
+}
+
+/**
+ * A reusable test utility to test the `PromptFileReference` class.
+ */
+class TestPromptFileReference extends Disposable {
+	constructor(
+		private readonly fileStructure: IFolder,
+		private readonly rootFileUri: URI,
+		private readonly expectedReferences: ExpectedReference[],
+		@IFileService private readonly fileService: IFileService,
+		@IConfigurationService private readonly configService: IConfigurationService,
+	) {
+		super();
+
+		// ensure all the expected references are disposed
+		for (const expectedReference of this.expectedReferences) {
+			this._register(expectedReference);
+		}
+
+		// create in-memory file system
+		const fileSystemProvider = this._register(new InMemoryFileSystemProvider());
+		this._register(this.fileService.registerProvider(Schemas.file, fileSystemProvider));
+	}
+
+	/**
+	 * Run the test.
+	 */
+	public async run() {
+		// create the files structure on the disk
+		await this.createFolder(
+			this.fileService,
+			this.fileStructure,
+		);
+
+		// start resolving references for the specified root file
+		const rootReference = this._register(new PromptFileReference(
+			this.rootFileUri,
+			this.fileService,
+			this.configService,
+		));
+
+		// resolve the root file reference including all nested references
+		const resolvedReferences = (await rootReference.resolve(true))
+			.flatten();
+
+		assert.strictEqual(
+			resolvedReferences.length,
+			this.expectedReferences.length,
+			[
+				`\nExpected(${this.expectedReferences.length}): [\n ${this.expectedReferences.join('\n ')}\n]`,
+				`Received(${resolvedReferences.length}): [\n ${resolvedReferences.join('\n ')}\n]`,
+			].join('\n')
+		);
+
+		for (let i = 0; i < this.expectedReferences.length; i++) {
+			const expectedReference = this.expectedReferences[i];
+			const resolvedReference = resolvedReferences[i];
+
+			assert(
+				resolvedReference.equals(expectedReference),
+				[
+					`Expected ${i}th resolved reference to be ${expectedReference}`,
+					`got ${resolvedReference}.`,
+				].join(', '),
+			);
+
+			if (expectedReference.errorCondition === undefined) {
+				assert(
+					resolvedReference.errorCondition === undefined,
+					[
+						`Expected ${i}th error condition to be 'undefined'`,
+						`got '${resolvedReference.errorCondition}'.`,
+					].join(', '),
+				);
+				continue;
+			}
+
+			assert(
+				expectedReference.errorCondition.equal(resolvedReference.errorCondition),
+				[
+					`Expected ${i}th error condition to be '${expectedReference.errorCondition}'`,
+					`got '${resolvedReference.errorCondition}'.`,
+				].join(', '),
+			);
+		}
+	}
+
+	/**
+	 * Create the provided filesystem folder structure.
+	 */
+	async createFolder(
+		fileService: IFileService,
+		folder: IFolder,
+		parentFolder?: URI,
+	): Promise<void> {
+		const folderUri = parentFolder
+			? URI.joinPath(parentFolder, folder.name)
+			: URI.file(folder.name);
+
+		if (await fileService.exists(folderUri)) {
+			await fileService.del(folderUri);
+		}
+		await fileService.createFolder(folderUri);
+
+		for (const child of folder.children) {
+			const childUri = URI.joinPath(folderUri, child.name);
+			// create child file
+			if ('contents' in child) {
+				await fileService.writeFile(childUri, VSBuffer.fromString(child.contents));
+				continue;
+			}
+
+			// recursively create child filesystem structure
+			await this.createFolder(fileService, child, folderUri);
+		}
+	}
+}
+
+suite('PromptFileReference (Unix)', function () {
+	const testDisposables = ensureNoDisposablesAreLeakedInTestSuite();
+
+	let instantiationService: TestInstantiationService;
+	setup(async () => {
+		const nullPolicyService = new NullPolicyService();
+		const nullLogService = testDisposables.add(new NullLogService());
+		const nullFileService = testDisposables.add(new FileService(nullLogService));
+		const nullConfigService = testDisposables.add(new ConfigurationService(
+			URI.file('/config.json'),
+			nullFileService,
+			nullPolicyService,
+			nullLogService,
+		));
+		instantiationService = testDisposables.add(new TestInstantiationService());
+
+		instantiationService.stub(IFileService, nullFileService);
+		instantiationService.stub(ILogService, nullLogService);
+		instantiationService.stub(IConfigurationService, nullConfigService);
+	});
+
+	test('resolves nested file references', async function () {
+		if (isWindows) {
+			this.skip();
+		}
+
+		const rootFolderName = 'resolves-nested-file-references';
+		const rootFolder = `/${rootFolderName}`;
+		const rootUri = URI.file(rootFolder);
+
+		const test = testDisposables.add(instantiationService.createInstance(TestPromptFileReference,
+			/**
+			 * The file structure to be created on the disk for the test.
+			 */
+			{
+				name: rootFolderName,
+				children: [
+					{
+						name: 'file1.prompt.md',
+						contents: '## Some Header\nsome contents\n ',
+					},
+					{
+						name: 'file2.prompt.md',
+						contents: '## Files\n\t- this file #file:folder1/file3.prompt.md \n\t- also this #file:./folder1/some-other-folder/file4.prompt.md please!\n ',
+					},
+					{
+						name: 'folder1',
+						children: [
+							{
+								name: 'file3.prompt.md',
+								contents: `\n\n\t- some seemingly random #file:${rootFolder}/folder1/some-other-folder/yetAnotherFolder🤭/another-file.prompt.md contents\n some more\t content`,
+							},
+							{
+								name: 'some-other-folder',
+								children: [
+									{
+										name: 'file4.prompt.md',
+										contents: 'this file has a non-existing #file:./some-non-existing/file.prompt.md\t\treference\n\nand some non-prompt #file:./some-non-prompt-file.js',
+									},
+									{
+										name: 'file.txt',
+										contents: 'contents of a non-prompt-snippet file',
+									},
+									{
+										name: 'yetAnotherFolder🤭',
+										children: [
+											{
+												name: 'another-file.prompt.md',
+												contents: 'another-file.prompt.md contents\t  #file:../file.txt',
+											},
+											{
+												name: 'one_more_file_just_in_case.prompt.md',
+												contents: 'one_more_file_just_in_case.prompt.md contents',
+											},
+										],
+									},
+									{
+										name: 'some-non-prompt-file.js',
+										contents: 'some-non-prompt-file.js contents',
+									},
+								],
+							},
+						],
+					},
+				],
+			},
+			/**
+			 * The root file path to start the resolve process from.
+			 */
+			URI.file(`/${rootFolderName}/file2.prompt.md`),
+			/**
+			 * The expected references to be resolved.
+			 */
+			[
+				testDisposables.add(new ExpectedReference(
+					URI.joinPath(rootUri, './file2.prompt.md'),
+					undefined,
+				)),
+				testDisposables.add(new ExpectedReference(
+					URI.joinPath(rootUri, './folder1/file3.prompt.md'),
+					undefined,
+				)),
+				testDisposables.add(new ExpectedReference(
+					URI.joinPath(rootUri, './folder1/some-other-folder/yetAnotherFolder🤭/another-file.prompt.md'),
+					undefined,
+				)),
+				testDisposables.add(new ExpectedReference(
+					URI.joinPath(rootUri, './folder1/some-other-folder/file.txt'),
+					new NonPromptSnippetFile(
+						URI.joinPath(rootUri, './folder1/some-other-folder/file.txt'),
+						'Ughh oh!',
+					),
+				)),
+				testDisposables.add(new ExpectedReference(
+					URI.joinPath(rootUri, './folder1/some-other-folder/file4.prompt.md'),
+					undefined,
+				)),
+				testDisposables.add(new ExpectedReference(
+					URI.joinPath(rootUri, './folder1/some-other-folder/some-non-existing/file.prompt.md'),
+					new FileOpenFailed(
+						URI.joinPath(rootUri, './folder1/some-other-folder/some-non-existing/file.prompt.md'),
+						'Some error message.',
+					),
+				)),
+				testDisposables.add(new ExpectedReference(
+					URI.joinPath(rootUri, './folder1/some-other-folder/some-non-prompt-file.js'),
+					new NonPromptSnippetFile(
+						URI.joinPath(rootUri, './folder1/some-other-folder/some-non-prompt-file.js'),
+						'Oh no!',
+					),
+				)),
+			]
+		));
+
+		await test.run();
+	});
+
+	test('does not fall into infinite reference recursion', async function () {
+		if (isWindows) {
+			this.skip();
+		}
+
+		const rootFolderName = 'infinite-recursion';
+		const rootFolder = `/${rootFolderName}`;
+		const rootUri = URI.file(rootFolder);
+
+		const test = testDisposables.add(instantiationService.createInstance(TestPromptFileReference,
+			/**
+			 * The file structure to be created on the disk for the test.
+			 */
+			{
+				name: rootFolderName,
+				children: [
+					{
+						name: 'file1.md',
+						contents: '## Some Header\nsome contents\n ',
+					},
+					{
+						name: 'file2.prompt.md',
+						contents: `## Files\n\t- this file #file:folder1/file3.prompt.md \n\t- also this #file:./folder1/some-other-folder/file4.prompt.md\n\n#file:${rootFolder}/folder1/some-other-folder/file5.prompt.md\t please!\n\t#file:./file1.md `,
+					},
+					{
+						name: 'folder1',
+						children: [
+							{
+								name: 'file3.prompt.md',
+								contents: `\n\n\t- some seemingly random #file:${rootFolder}/folder1/some-other-folder/yetAnotherFolder🤭/another-file.prompt.md contents\n some more\t content`,
+							},
+							{
+								name: 'some-other-folder',
+								children: [
+									{
+										name: 'file4.prompt.md',
+										contents: 'this file has a non-existing #file:../some-non-existing/file.prompt.md\t\treference',
+									},
+									{
+										name: 'file5.prompt.md',
+										contents: 'this file has a relative recursive #file:../../file2.prompt.md\nreference\n ',
+									},
+									{
+										name: 'yetAnotherFolder🤭',
+										children: [
+											{
+												name: 'another-file.prompt.md',
+												// absolute path with recursion
+												contents: `some test goes\t\nhere #file:${rootFolder}/file2.prompt.md`,
+											},
+											{
+												name: 'one_more_file_just_in_case.prompt.md',
+												contents: 'one_more_file_just_in_case.prompt.md contents',
+											},
+										],
+									},
+								],
+							},
+						],
+					},
+				],
+			},
+			/**
+			 * The root file path to start the resolve process from.
+			 */
+			URI.file(`/${rootFolderName}/file2.prompt.md`),
+			/**
+			 * The expected references to be resolved.
+			 */
+			[
+				testDisposables.add(new ExpectedReference(
+					URI.joinPath(rootUri, './file2.prompt.md'),
+					undefined,
+				)),
+				testDisposables.add(new ExpectedReference(
+					URI.joinPath(rootUri, './folder1/file3.prompt.md'),
+					undefined,
+				)),
+				testDisposables.add(new ExpectedReference(
+					URI.joinPath(rootUri, './folder1/some-other-folder/yetAnotherFolder🤭/another-file.prompt.md'),
+					undefined,
+				)),
+				/**
+				 * This reference should be resolved as
+				 * a recursive reference error condition.
+				 * (the absolute reference case)
+				 */
+				testDisposables.add(new ExpectedReference(
+					URI.joinPath(rootUri, './file2.prompt.md'),
+					new RecursiveReference(
+						URI.joinPath(rootUri, './file2.prompt.md'),
+						[
+							'/infinite-recursion/file2.prompt.md',
+							'/infinite-recursion/folder1/file3.prompt.md',
+							'/infinite-recursion/folder1/some-other-folder/yetAnotherFolder🤭/another-file.prompt.md',
+							'/infinite-recursion/file2.prompt.md',
+						],
+					),
+				)),
+				testDisposables.add(new ExpectedReference(
+					URI.joinPath(rootUri, './folder1/some-other-folder/file4.prompt.md'),
+					undefined,
+				)),
+				testDisposables.add(new ExpectedReference(
+					URI.joinPath(rootUri, './folder1/some-non-existing/file.prompt.md'),
+					new FileOpenFailed(
+						URI.joinPath(rootUri, './folder1/some-non-existing/file.prompt.md'),
+						'Some error message.',
+					),
+				)),
+				testDisposables.add(new ExpectedReference(
+					URI.joinPath(rootUri, './folder1/some-other-folder/file5.prompt.md'),
+					undefined,
+				)),
+				/**
+				 * This reference should be resolved as
+				 * a recursive reference error condition.
+				 * (the relative reference case)
+				 */
+				testDisposables.add(new ExpectedReference(
+					URI.joinPath(rootUri, './file2.prompt.md'),
+					new RecursiveReference(
+						URI.joinPath(rootUri, './file2.prompt.md'),
+						[
+							'/infinite-recursion/file2.prompt.md',
+							'/infinite-recursion/folder1/some-other-folder/file5.prompt.md',
+							'/infinite-recursion/file2.prompt.md',
+						],
+					),
+				)),
+				testDisposables.add(new ExpectedReference(
+					URI.joinPath(rootUri, './file1.md'),
+					new NonPromptSnippetFile(
+						URI.joinPath(rootUri, './file1.md'),
+						'Uggh oh!',
+					),
+				)),
+			]
+		));
+
+		await test.run();
+	});
+});

From d6bf64517af4ce9d1eeab149269012926558142c Mon Sep 17 00:00:00 2001
From: DetachHead <57028336+DetachHead@users.noreply.github.com>
Date: Tue, 17 Dec 2024 09:42:08 +1000
Subject: [PATCH 284/479] remove
 `javascript.inlayHints.enumMemberValues.enabled` because javascript does not
 have enums

---
 extensions/typescript-language-features/package.json | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index c6363dfc48e..d93a488f08e 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -384,12 +384,6 @@
           "markdownDescription": "%configuration.inlayHints.functionLikeReturnTypes.enabled%",
           "scope": "resource"
         },
-        "javascript.inlayHints.enumMemberValues.enabled": {
-          "type": "boolean",
-          "default": false,
-          "markdownDescription": "%configuration.inlayHints.enumMemberValues.enabled%",
-          "scope": "resource"
-        },
         "javascript.suggest.includeCompletionsForImportStatements": {
           "type": "boolean",
           "default": true,

From 6be3f02482f73de545aea12e865e766a791eb4fd Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 16 Dec 2024 15:50:05 -0800
Subject: [PATCH 285/479] Inline simple methods

These don't add much
---
 .../src/typescriptServiceClient.ts            | 48 +++++++------------
 1 file changed, 18 insertions(+), 30 deletions(-)

diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
index 7e18022f36d..d9f47c1b85a 100644
--- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
+++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
@@ -12,7 +12,7 @@ import { Schemes } from './configuration/schemes';
 import { IExperimentationTelemetryReporter } from './experimentTelemetryReporter';
 import { DiagnosticKind, DiagnosticsManager } from './languageFeatures/diagnostics';
 import { Logger } from './logging/logger';
-import { TelemetryProperties, TelemetryReporter, VSCodeTelemetryReporter } from './logging/telemetry';
+import { TelemetryReporter, VSCodeTelemetryReporter } from './logging/telemetry';
 import Tracer from './logging/tracer';
 import { ProjectType, inferredProjectCompilerOptions } from './tsconfig';
 import { API } from './tsServer/api';
@@ -319,7 +319,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 
 	public restartTsServer(fromUserAction = false): void {
 		if (this.serverState.type === ServerState.Type.Running) {
-			this.info('Killing TS Server');
+			this.logger.info('Killing TS Server');
 			this.isRestarting = true;
 			this.serverState.server.kill();
 		}
@@ -372,18 +372,6 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 		return this._onReady!.promise.then(f);
 	}
 
-	private info(message: string, ...data: any[]): void {
-		this.logger.info(message, ...data);
-	}
-
-	private error(message: string, ...data: any[]): void {
-		this.logger.error(message, ...data);
-	}
-
-	private logTelemetry(eventName: string, properties?: TelemetryProperties) {
-		this.telemetryReporter.logTelemetry(eventName, properties);
-	}
-
 	public ensureServiceStarted() {
 		if (this.serverState.type !== ServerState.Type.Running) {
 			this.startService();
@@ -392,15 +380,15 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 
 	private token: number = 0;
 	private startService(resendModels: boolean = false): ServerState.State {
-		this.info(`Starting TS Server`);
+		this.logger.info(`Starting TS Server`);
 
 		if (this.isDisposed) {
-			this.info(`Not starting server: disposed`);
+			this.logger.info(`Not starting server: disposed`);
 			return ServerState.None;
 		}
 
 		if (this.hasServerFatallyCrashedTooManyTimes) {
-			this.info(`Not starting server: too many crashes`);
+			this.logger.info(`Not starting server: too many crashes`);
 			return ServerState.None;
 		}
 
@@ -412,10 +400,10 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 			version = this._versionManager.currentVersion;
 		}
 
-		this.info(`Using tsserver from: ${version.path}`);
+		this.logger.info(`Using tsserver from: ${version.path}`);
 		const nodePath = this._nodeVersionManager.currentVersion;
 		if (nodePath) {
-			this.info(`Using Node installation from ${nodePath} to run TS Server`);
+			this.logger.info(`Using Node installation from ${nodePath} to run TS Server`);
 		}
 
 		this.resetWatchers();
@@ -451,7 +439,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 				"typeScriptVersionSource": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 			}
 		*/
-		this.logTelemetry('tsserver.spawned', {
+		this.telemetryReporter.logTelemetry('tsserver.spawned', {
 			...typeScriptServerEnvCommonProperties,
 			localTypeScriptVersion: this.versionProvider.localVersion ? this.versionProvider.localVersion.displayName : '',
 			typeScriptVersionSource: version.source,
@@ -468,9 +456,9 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 			}
 
 			this.serverState = new ServerState.Errored(err, handle.tsServerLog);
-			this.error('TSServer errored with error.', err);
+			this.logger.error('TSServer errored with error.', err);
 			if (handle.tsServerLog?.type === 'file') {
-				this.error(`TSServer log file: ${handle.tsServerLog.uri.fsPath}`);
+				this.logger.error(`TSServer log file: ${handle.tsServerLog.uri.fsPath}`);
 			}
 
 			/* __GDPR__
@@ -482,7 +470,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 					]
 				}
 			*/
-			this.logTelemetry('tsserver.error', {
+			this.telemetryReporter.logTelemetry('tsserver.error', {
 				...typeScriptServerEnvCommonProperties
 			});
 			this.serviceExited(false, apiVersion);
@@ -490,7 +478,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 
 		handle.onExit((data: TypeScriptServerExitEvent) => {
 			const { code, signal } = data;
-			this.error(`TSServer exited. Code: ${code}. Signal: ${signal}`);
+			this.logger.error(`TSServer exited. Code: ${code}. Signal: ${signal}`);
 
 			// In practice, the exit code is an integer with no ties to any identity,
 			// so it can be classified as SystemMetaData, rather than CallstackOrException.
@@ -505,7 +493,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 					"signal" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
 				}
 			*/
-			this.logTelemetry('tsserver.exitWithCode', {
+			this.telemetryReporter.logTelemetry('tsserver.exitWithCode', {
 				...typeScriptServerEnvCommonProperties,
 				code: code ?? undefined,
 				signal: signal ?? undefined,
@@ -517,7 +505,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 			}
 
 			if (handle.tsServerLog?.type === 'file') {
-				this.info(`TSServer log file: ${handle.tsServerLog.uri.fsPath}`);
+				this.logger.info(`TSServer log file: ${handle.tsServerLog.uri.fsPath}`);
 			}
 			this.serviceExited(!this.isRestarting, apiVersion);
 			this.isRestarting = false;
@@ -678,7 +666,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 							]
 						}
 					*/
-					this.logTelemetry('serviceExited');
+					this.telemetryReporter.logTelemetry('serviceExited');
 				} else if (diff < 60 * 1000 * 5 /* 5 Minutes */) {
 					this.lastStart = Date.now();
 					if (!this._isPromptingAfterCrash) {
@@ -956,14 +944,14 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 				"command" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 			}
 		*/
-		this.logTelemetry('fatalError', { ...(error instanceof TypeScriptServerError ? error.telemetry : { command }) });
+		this.telemetryReporter.logTelemetry('fatalError', { ...(error instanceof TypeScriptServerError ? error.telemetry : { command }) });
 		console.error(`A non-recoverable error occurred while executing tsserver command: ${command}`);
 		if (error instanceof TypeScriptServerError && error.serverErrorText) {
 			console.error(error.serverErrorText);
 		}
 
 		if (this.serverState.type === ServerState.Type.Running) {
-			this.info('Killing TS Server');
+			this.logger.info('Killing TS Server');
 			const logfile = this.serverState.server.tsServerLog;
 			this.serverState.server.kill();
 			if (error instanceof TypeScriptServerError) {
@@ -1235,7 +1223,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 			}
 		*/
 		// __GDPR__COMMENT__: Other events are defined by TypeScript.
-		this.logTelemetry(telemetryData.telemetryEventName, properties);
+		this.telemetryReporter.logTelemetry(telemetryData.telemetryEventName, properties);
 	}
 
 	private configurePlugin(pluginName: string, configuration: {}): any {

From 19c7c0190d58569f06e2d97f11573ea31360ba07 Mon Sep 17 00:00:00 2001
From: tcostew <143664112+tcostew@users.noreply.github.com>
Date: Mon, 16 Dec 2024 19:01:11 -0500
Subject: [PATCH 286/479] Allow Github Copilot chat to appear in QuickAccess
 (#210805)

---
 .../workbench/contrib/search/browser/anythingQuickAccess.ts  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts b/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
index 9d50072998d..c08b3518cf7 100644
--- a/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
+++ b/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
@@ -485,8 +485,9 @@ export class AnythingQuickAccessProvider extends PickerQuickAccessProvider<IAnyt
 		for (const editor of this.historyService.getHistory()) {
 			const resource = editor.resource;
 			// allow untitled and terminal editors to go through
-			if (!resource || (!this.fileService.hasProvider(resource) && resource.scheme !== Schemas.untitled && resource.scheme !== Schemas.vscodeTerminal)) {
-				continue; // exclude editors without file resource if we are searching by pattern
+			// allow github copilot chat to go through
+			if (!resource) {
+				continue;
 			}
 
 			const editorHistoryPick = this.createAnythingPick(editor, configuration);

From 70dc7fc97a01f71684b0f540b852c7c26316fedc Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 16 Dec 2024 17:06:07 -0800
Subject: [PATCH 287/479] Use safer escaping for css url strings

Fixes #236122

For css `\0000xx` escaping, if I'm understanding the spec correctly it turns out they eat the space character following them: https://www.w3.org/TR/CSS2/syndata.html#characters

My previous fix didn't account for this. Instead I think a safer fix is to switch to use `Css.escape`. This often over-escapes the string by converting characters that don't need it but should be safe and it fixes the original issue
---
 src/vs/base/browser/cssValue.ts                      |  2 +-
 .../browser/services/decorationRenderOptions.test.ts | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/vs/base/browser/cssValue.ts b/src/vs/base/browser/cssValue.ts
index 6ee7fff792a..84cee8522ae 100644
--- a/src/vs/base/browser/cssValue.ts
+++ b/src/vs/base/browser/cssValue.ts
@@ -62,7 +62,7 @@ export function asCSSUrl(uri: URI | null | undefined): CssFragment {
 	if (!uri) {
 		return asFragment(`url('')`);
 	}
-	return inline`url(${stringValue(FileAccess.uriToBrowserUri(uri).toString(true))})`;
+	return inline`url('${asFragment(CSS.escape(FileAccess.uriToBrowserUri(uri).toString(true)))}')`;
 }
 
 export function className(value: string, escapingExpected = false): CssFragment {
diff --git a/src/vs/editor/test/browser/services/decorationRenderOptions.test.ts b/src/vs/editor/test/browser/services/decorationRenderOptions.test.ts
index 74555b9a823..9608d1d779a 100644
--- a/src/vs/editor/test/browser/services/decorationRenderOptions.test.ts
+++ b/src/vs/editor/test/browser/services/decorationRenderOptions.test.ts
@@ -44,7 +44,7 @@ suite('Decoration Render Options', () => {
 		const styleSheet = s.globalStyleSheet;
 		store.add(s.registerDecorationType('test', 'example', options));
 		const sheet = readStyleSheet(styleSheet);
-		assert(sheet.indexOf(`{background:url('https://github.com/microsoft/vscode/blob/main/resources/linux/code.png') center center no-repeat;background-size:contain;}`) >= 0);
+		assert(sheet.indexOf(`{background:url('${CSS.escape('https://github.com/microsoft/vscode/blob/main/resources/linux/code.png')}') center center no-repeat;background-size:contain;}`) >= 0);
 		assert(sheet.indexOf(`{background-color:red;border-color:yellow;box-sizing: border-box;}`) >= 0);
 	});
 
@@ -111,7 +111,7 @@ suite('Decoration Render Options', () => {
 
 		// URI, only minimal encoding
 		s.registerDecorationType('test', 'example', { gutterIconPath: URI.parse('data:image/svg+xml;base64,PHN2ZyB4b+') });
-		assert(readStyleSheet(styleSheet).indexOf(`{background:url('data:image/svg+xml;base64,PHN2ZyB4b+') center center no-repeat;}`) > 0);
+		assert(readStyleSheet(styleSheet).indexOf(`{background:url('${CSS.escape('data:image/svg+xml;base64,PHN2ZyB4b+')}') center center no-repeat;}`) > 0);
 		s.removeDecorationType('example');
 
 		function assertBackground(url1: string, url2: string) {
@@ -130,22 +130,22 @@ suite('Decoration Render Options', () => {
 
 			// single quote must always be escaped/encoded
 			s.registerDecorationType('test', 'example', { gutterIconPath: URI.file('c:\\files\\foo\\b\'ar.png') });
-			assertBackground('file:///c:/files/foo/b\\000027ar.png', 'vscode-file://vscode-app/c:/files/foo/b\\000027ar.png');
+			assertBackground(CSS.escape('file:///c:/files/foo/b\'ar.png'), CSS.escape('vscode-file://vscode-app/c:/files/foo/b\'ar.png'));
 			s.removeDecorationType('example');
 		} else {
 			// unix file path (used as string)
 			s.registerDecorationType('test', 'example', { gutterIconPath: URI.file('/Users/foo/bar.png') });
-			assertBackground('file:///Users/foo/bar.png', 'vscode-file://vscode-app/Users/foo/bar.png');
+			assertBackground(CSS.escape('file:///Users/foo/bar.png'), CSS.escape('vscode-file://vscode-app/Users/foo/bar.png'));
 			s.removeDecorationType('example');
 
 			// single quote must always be escaped/encoded
 			s.registerDecorationType('test', 'example', { gutterIconPath: URI.file('/Users/foo/b\'ar.png') });
-			assertBackground('file:///Users/foo/b\\000027ar.png', 'vscode-file://vscode-app/Users/foo/b\\000027ar.png');
+			assertBackground(CSS.escape('file:///Users/foo/b\'ar.png'), CSS.escape('vscode-file://vscode-app/Users/foo/b\'ar.png'));
 			s.removeDecorationType('example');
 		}
 
 		s.registerDecorationType('test', 'example', { gutterIconPath: URI.parse('http://test/pa\'th') });
-		assert(readStyleSheet(styleSheet).indexOf(`{background:url('http://test/pa\\000027th') center center no-repeat;}`) > 0);
+		assert(readStyleSheet(styleSheet).indexOf(`{background:url('${CSS.escape('http://test/pa\'th')}') center center no-repeat;}`) > 0);
 		s.removeDecorationType('example');
 	});
 });

From 95386dec787946547812c7ee9d38cba19d6a6398 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Mon, 16 Dec 2024 19:27:10 -0600
Subject: [PATCH 288/479] make screen reader notification more descriptive,
 useful (#236295)

---
 .../accessibility/browser/accessibilityStatus.ts     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibilityStatus.ts b/src/vs/workbench/contrib/accessibility/browser/accessibilityStatus.ts
index 50ae856a62f..aa09758f5b4 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibilityStatus.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibilityStatus.ts
@@ -13,6 +13,7 @@ import { ConfigurationTarget, IConfigurationService } from '../../../../platform
 import { INotificationHandle, INotificationService, NotificationPriority } from '../../../../platform/notification/common/notification.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 
 export class AccessibilityStatus extends Disposable implements IWorkbenchContribution {
 
@@ -26,7 +27,8 @@ export class AccessibilityStatus extends Disposable implements IWorkbenchContrib
 		@IConfigurationService private readonly configurationService: IConfigurationService,
 		@INotificationService private readonly notificationService: INotificationService,
 		@IAccessibilityService private readonly accessibilityService: IAccessibilityService,
-		@IStatusbarService private readonly statusbarService: IStatusbarService
+		@IStatusbarService private readonly statusbarService: IStatusbarService,
+		@IOpenerService private readonly openerService: IOpenerService,
 	) {
 		super();
 
@@ -50,7 +52,7 @@ export class AccessibilityStatus extends Disposable implements IWorkbenchContrib
 	private showScreenReaderNotification(): void {
 		this.screenReaderNotification = this.notificationService.prompt(
 			Severity.Info,
-			localize('screenReaderDetectedExplanation.question', "Are you using a screen reader to operate VS Code?"),
+			localize('screenReaderDetectedExplanation.question', "Screen reader usage detected. Do you want to enable {0} to optimize the editor for screen reader usage?", 'editor.accessibilitySupport'),
 			[{
 				label: localize('screenReaderDetectedExplanation.answerYes', "Yes"),
 				run: () => {
@@ -61,6 +63,12 @@ export class AccessibilityStatus extends Disposable implements IWorkbenchContrib
 				run: () => {
 					this.configurationService.updateValue('editor.accessibilitySupport', 'off', ConfigurationTarget.USER);
 				}
+			},
+			{
+				label: localize('screenReaderDetectedExplanation.answerLearnMore', "Learn More"),
+				run: () => {
+					this.openerService.open('https://code.visualstudio.com/docs/editor/accessibility#_screen-readers');
+				}
 			}],
 			{
 				sticky: true,

From ca3ff9f56444da1bfa4d942e7fea9154deeffbf9 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Tue, 17 Dec 2024 09:26:30 +0100
Subject: [PATCH 289/479] SCM - quick diff should better handle untracked files
 (#236315)

---
 extensions/git/src/repository.ts                       | 8 +++++++-
 src/vs/workbench/contrib/scm/browser/quickDiffModel.ts | 4 ----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 73a54cef4af..21dd3b5819f 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -1035,7 +1035,13 @@ export class Repository implements Disposable {
 		}
 
 		// Ignore path that is inside a merge group
-		if (this.mergeGroup.resourceStates.some(r => r.resourceUri.path === uri.path)) {
+		if (this.mergeGroup.resourceStates.some(r => pathEquals(r.resourceUri.fsPath, uri.fsPath))) {
+			return undefined;
+		}
+
+		// Ignore path that is untracked
+		if (this.untrackedGroup.resourceStates.some(r => pathEquals(r.resourceUri.path, uri.path)) ||
+			this.workingTreeGroup.resourceStates.some(r => pathEquals(r.resourceUri.path, uri.path) && r.type === Status.UNTRACKED)) {
 			return undefined;
 		}
 
diff --git a/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts b/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts
index 3d1ec39c3f6..bf9494da91c 100644
--- a/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts
+++ b/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts
@@ -214,10 +214,6 @@ export class QuickDiffModel extends Disposable {
 					return; // disposed
 				}
 
-				if (editorModels.every(editorModel => editorModel.textEditorModel.getValueLength() === 0)) {
-					result.changes = [];
-				}
-
 				this.setChanges(result.changes, result.mapChanges);
 			})
 			.catch(err => onUnexpectedError(err));

From a5a6d6d21e8b03bf81105101125571db01ff8f23 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 17 Dec 2024 10:02:16 +0100
Subject: [PATCH 290/479] Improve wording and flow of restart EH blocker (fix
 #233912) (#236311)

---
 .../api/browser/mainThreadCustomEditors.ts    |  2 +-
 .../common/customTextEditorModel.ts           |  2 +-
 .../contrib/debug/browser/debugService.ts     |  2 +-
 ...mentWorkspaceTrustTransitionParticipant.ts |  2 +-
 .../browser/extensionsWorkbenchService.ts     |  2 +-
 .../notebook/common/notebookEditorInput.ts    |  4 +--
 .../browser/relauncher.contribution.ts        |  2 +-
 .../common/abstractExtensionService.ts        | 29 +++++++++++++++----
 .../nativeExtensionService.ts                 |  2 +-
 .../browser/userDataProfileManagement.ts      |  2 +-
 .../workspaceEditingService.ts                |  2 +-
 11 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/vs/workbench/api/browser/mainThreadCustomEditors.ts b/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
index 4fb33a99f16..cd15f673c29 100644
--- a/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
+++ b/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
@@ -389,7 +389,7 @@ class MainThreadCustomEditorModel extends ResourceWorkingCopy implements ICustom
 			this._register(workingCopyService.registerWorkingCopy(this));
 
 			this._register(extensionService.onWillStop(e => {
-				e.veto(true, localize('vetoExtHostRestart', "A custom editor for '{0}' is open.", this.name));
+				e.veto(true, localize('vetoExtHostRestart', "An extension provided editor for '{0}' is still open that would close otherwise.", this.name));
 			}));
 		}
 
diff --git a/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.ts b/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.ts
index 0ca157683f9..38648ff3dfd 100644
--- a/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.ts
+++ b/src/vs/workbench/contrib/customEditor/common/customTextEditorModel.ts
@@ -66,7 +66,7 @@ export class CustomTextEditorModel extends Disposable implements ICustomEditorMo
 		}));
 
 		this._register(extensionService.onWillStop(e => {
-			e.veto(true, localize('vetoExtHostRestart', "A custom text editor for '{0}' is open.", this.resource.path));
+			e.veto(true, localize('vetoExtHostRestart', "An extension provided text editor for '{0}' is still open that would close otherwise.", this.name));
 		}));
 	}
 
diff --git a/src/vs/workbench/contrib/debug/browser/debugService.ts b/src/vs/workbench/contrib/debug/browser/debugService.ts
index 7019624359c..1527a4c2101 100644
--- a/src/vs/workbench/contrib/debug/browser/debugService.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugService.ts
@@ -207,7 +207,7 @@ export class DebugService implements IDebugService {
 		this.disposables.add(extensionService.onWillStop(evt => {
 			evt.veto(
 				this.model.getSessions().length > 0,
-				nls.localize('active debug session', 'A debug session is still running.'),
+				nls.localize('active debug session', 'A debug session is still running that would terminate.'),
 			);
 		}));
 
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionEnablementWorkspaceTrustTransitionParticipant.ts b/src/vs/workbench/contrib/extensions/browser/extensionEnablementWorkspaceTrustTransitionParticipant.ts
index 55de158e6b8..47065f253b4 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionEnablementWorkspaceTrustTransitionParticipant.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionEnablementWorkspaceTrustTransitionParticipant.ts
@@ -39,7 +39,7 @@ export class ExtensionEnablementWorkspaceTrustTransitionParticipant extends Disp
 							if (environmentService.remoteAuthority) {
 								hostService.reload();
 							} else {
-								const stopped = await extensionService.stopExtensionHosts(localize('restartExtensionHost.reason', "Restarting extension host due to workspace trust change."));
+								const stopped = await extensionService.stopExtensionHosts(localize('restartExtensionHost.reason', "Changing workspace trust"));
 								await extensionEnablementService.updateExtensionsEnablementsWhenWorkspaceTrustChanges();
 								if (stopped) {
 									extensionService.startExtensionHosts();
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
index 1a28f0027ee..ae7df7d09b3 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
@@ -1585,7 +1585,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		}
 
 		if (toAdd.length || toRemove.length) {
-			if (await this.extensionService.stopExtensionHosts(nls.localize('restart', "Enable or Disable extensions"), auto)) {
+			if (await this.extensionService.stopExtensionHosts(nls.localize('restart', "Changing extension enablement"), auto)) {
 				await this.extensionService.startExtensionHosts({ toAdd, toRemove });
 				if (auto) {
 					this.notificationService.notify({
diff --git a/src/vs/workbench/contrib/notebook/common/notebookEditorInput.ts b/src/vs/workbench/contrib/notebook/common/notebookEditorInput.ts
index 92c066a28e7..f6c4b05d618 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookEditorInput.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookEditorInput.ts
@@ -91,8 +91,8 @@ export class NotebookEditorInput extends AbstractResourceEditorInput {
 			}
 
 			const reason = e.auto
-				? localize('vetoAutoExtHostRestart', "One of the opened editors is a notebook editor.")
-				: localize('vetoExtHostRestart', "Notebook '{0}' could not be saved.", this.resource.path);
+				? localize('vetoAutoExtHostRestart', "An extension provided notebook for '{0}' is still open that would close otherwise.", this.getName())
+				: localize('vetoExtHostRestart', "An extension provided notebook for '{0}' could not be saved.", this.getName());
 
 			e.veto((async () => {
 				const editors = editorService.findEditors(this);
diff --git a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
index 3cb188be749..54b2cff5b80 100644
--- a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
+++ b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
@@ -224,7 +224,7 @@ export class WorkspaceChangeExtHostRelauncher extends Disposable implements IWor
 			if (environmentService.remoteAuthority) {
 				hostService.reload(); // TODO@aeschli, workaround
 			} else if (isNative) {
-				const stopped = await extensionService.stopExtensionHosts(localize('restartExtensionHost.reason', "Restarting extension host due to a workspace folder change."));
+				const stopped = await extensionService.stopExtensionHosts(localize('restartExtensionHost.reason', "Changing workspace folders"));
 				if (stopped) {
 					extensionService.startExtensionHosts();
 				}
diff --git a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
index 68b71d7ce1b..8e63847fb9b 100644
--- a/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
+++ b/src/vs/workbench/services/extensions/common/abstractExtensionService.ts
@@ -761,12 +761,29 @@ export abstract class AbstractExtensionService extends Disposable implements IEx
 				const vetoReasonsArray = Array.from(vetoReasons);
 
 				this._logService.warn(`Extension host was not stopped because of veto (stop reason: ${reason}, veto reason: ${vetoReasonsArray.join(', ')})`);
-				await this._dialogService.warn(
-					nls.localize('extensionStopVetoMessage', "The following operation was blocked: {0}", reason),
-					vetoReasonsArray.length === 1 ?
-						nls.localize('extensionStopVetoDetailsOne', "The reason for blocking the operation: {0}", vetoReasonsArray[0]) :
-						nls.localize('extensionStopVetoDetailsMany', "The reasons for blocking the operation:\n- {0}", vetoReasonsArray.join('\n -')),
-				);
+
+				let overrideVeto = false;
+				await this._dialogService.prompt({
+					type: Severity.Warning,
+					message: nls.localize('extensionStopVetoMessage', "Restart of extensions was prevented but is required for: {0}. Do you want to proceed anyways?", reason),
+					detail: vetoReasonsArray.length === 1 ?
+						nls.localize('extensionStopVetoDetailsOne', "Reason: {0}", vetoReasonsArray[0]) :
+						nls.localize('extensionStopVetoDetailsMany', "Reasons:\n- {0}", vetoReasonsArray.join('\n -')),
+					buttons: [
+						{
+							label: nls.localize('ok', "OK"),
+							run: () => { /* noop */ }
+						},
+						{
+							label: nls.localize('proceedAnyways', "Proceed Anyways"),
+							run: () => overrideVeto = true
+						}
+					]
+				});
+
+				if (overrideVeto) {
+					return true;
+				}
 			}
 
 		}
diff --git a/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts b/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
index 8adc7c19fe7..33eabcc36dd 100644
--- a/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
+++ b/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
@@ -742,7 +742,7 @@ class RestartExtensionHostAction extends Action2 {
 	async run(accessor: ServicesAccessor): Promise<void> {
 		const extensionService = accessor.get(IExtensionService);
 
-		const stopped = await extensionService.stopExtensionHosts(nls.localize('restartExtensionHost.reason', "Restarting extension host on explicit request."));
+		const stopped = await extensionService.stopExtensionHosts(nls.localize('restartExtensionHost.reason', "An explicit request"));
 		if (stopped) {
 			extensionService.startExtensionHosts();
 		}
diff --git a/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts b/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
index 88b46666077..e4b29d57e53 100644
--- a/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
+++ b/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
@@ -198,7 +198,7 @@ export class UserDataProfileManagementService extends Disposable implements IUse
 
 		if (shouldRestartExtensionHosts) {
 			if (!isRemoteWindow) {
-				if (!(await this.extensionService.stopExtensionHosts(localize('switch profile', "Switching to a profile.")))) {
+				if (!(await this.extensionService.stopExtensionHosts(localize('switch profile', "Switching to a profile")))) {
 					// If extension host did not stop, do not switch profile
 					if (this.userDataProfilesService.profiles.some(p => p.id === this.userDataProfileService.currentProfile.id)) {
 						await this.userDataProfilesService.setProfileForWorkspace(toWorkspaceIdentifier(this.workspaceContextService.getWorkspace()), this.userDataProfileService.currentProfile);
diff --git a/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts b/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts
index 625f69f60b9..c285804f40a 100644
--- a/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts
+++ b/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts
@@ -174,7 +174,7 @@ export class NativeWorkspaceEditingService extends AbstractWorkspaceEditingServi
 	}
 
 	async enterWorkspace(workspaceUri: URI): Promise<void> {
-		const stopped = await this.extensionService.stopExtensionHosts(localize('restartExtensionHost.reason', "Opening a multi-root workspace."));
+		const stopped = await this.extensionService.stopExtensionHosts(localize('restartExtensionHost.reason', "Opening a multi-root workspace"));
 		if (!stopped) {
 			return;
 		}

From 9963eb06d9ead53d8f42d73959b47f38554d21bd Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Tue, 17 Dec 2024 10:08:35 +0100
Subject: [PATCH 291/479] Removing showing of hover on modifier key press
 (#236317)

removing showing of hover on modifier key press
---
 .../hover/browser/contentHoverController.ts       | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/vs/editor/contrib/hover/browser/contentHoverController.ts b/src/vs/editor/contrib/hover/browser/contentHoverController.ts
index e44c40a947d..a3f67bb85f6 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverController.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverController.ts
@@ -5,7 +5,6 @@
 
 import { DECREASE_HOVER_VERBOSITY_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID, SHOW_OR_FOCUS_HOVER_ACTION_ID } from './hoverActionIds.js';
 import { IKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
-import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { ICodeEditor, IEditorMouseEvent, IPartialEditorMouseEvent } from '../../../browser/editorBrowser.js';
 import { ConfigurationChangedEvent, EditorOption } from '../../../common/config/editorOptions.js';
@@ -243,13 +242,6 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 		if (isPotentialKeyboardShortcut) {
 			return;
 		}
-		const isModifierKeyPressed = this._isModifierKeyPressed(e);
-		if (isModifierKeyPressed && this._mouseMoveEvent) {
-			const contentWidget: ContentHoverWidgetWrapper = this._getOrCreateContentWidget();
-			if (contentWidget.showsOrWillShow(this._mouseMoveEvent)) {
-				return;
-			}
-		}
 		this.hideContentHover();
 	}
 
@@ -267,13 +259,6 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 		return moreChordsAreNeeded || isHoverAction;
 	}
 
-	private _isModifierKeyPressed(e: IKeyboardEvent): boolean {
-		return e.keyCode === KeyCode.Ctrl
-			|| e.keyCode === KeyCode.Alt
-			|| e.keyCode === KeyCode.Meta
-			|| e.keyCode === KeyCode.Shift;
-	}
-
 	public hideContentHover(): void {
 		if (_sticky) {
 			return;

From f5e5ee4b29158b0294783dba7dd3f3b92d6e9180 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Tue, 17 Dec 2024 10:14:27 +0100
Subject: [PATCH 292/479] SCM - remove more debt from the quick diff (#236318)

---
 extensions/git/src/repository.ts                | 17 +++++++++++++++++
 .../contrib/scm/browser/quickDiffModel.ts       | 10 +---------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 21dd3b5819f..ac2649242f2 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -1031,17 +1031,34 @@ export class Repository implements Disposable {
 
 		// Ignore path that is not inside the current repository
 		if (this.repositoryResolver.getRepository(uri) !== this) {
+			this.logger.trace(`[Repository][provideOriginalResource] Resource is not part of the repository: ${uri.toString()}`);
 			return undefined;
 		}
 
 		// Ignore path that is inside a merge group
 		if (this.mergeGroup.resourceStates.some(r => pathEquals(r.resourceUri.fsPath, uri.fsPath))) {
+			this.logger.trace(`[Repository][provideOriginalResource] Resource is part of a merge group: ${uri.toString()}`);
 			return undefined;
 		}
 
 		// Ignore path that is untracked
 		if (this.untrackedGroup.resourceStates.some(r => pathEquals(r.resourceUri.path, uri.path)) ||
 			this.workingTreeGroup.resourceStates.some(r => pathEquals(r.resourceUri.path, uri.path) && r.type === Status.UNTRACKED)) {
+			this.logger.trace(`[Repository][provideOriginalResource] Resource is untracked: ${uri.toString()}`);
+			return undefined;
+		}
+
+		const activeTabInput = window.tabGroups.activeTabGroup.activeTab?.input;
+
+		// Ignore file that is on the right-hand side of a diff editor
+		if (activeTabInput instanceof TabInputTextDiff && pathEquals(activeTabInput.modified.fsPath, uri.fsPath)) {
+			this.logger.trace(`[Repository][provideOriginalResource] Resource is on the right-hand side of a diff editor: ${uri.toString()}`);
+			return undefined;
+		}
+
+		// Ignore file that is on the right -hand side of a multi-file diff editor
+		if (activeTabInput instanceof TabInputTextMultiDiff && activeTabInput.textDiffs.some(diff => pathEquals(diff.modified.fsPath, uri.fsPath))) {
+			this.logger.trace(`[Repository][provideOriginalResource] Resource is on the right-hand side of a multi-file diff editor: ${uri.toString()}`);
 			return undefined;
 		}
 
diff --git a/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts b/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts
index bf9494da91c..c8a3d8b07dd 100644
--- a/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts
+++ b/src/vs/workbench/contrib/scm/browser/quickDiffModel.ts
@@ -351,15 +351,7 @@ export class QuickDiffModel extends Disposable {
 		}
 
 		const isSynchronized = this._model.textEditorModel ? shouldSynchronizeModel(this._model.textEditorModel) : undefined;
-		const quickDiffs = await this.quickDiffService.getQuickDiffs(uri, this._model.getLanguageId(), isSynchronized);
-
-		// TODO@lszomoru - find a long term solution for this
-		// When the QuickDiffModel is created for a diff editor, there is no
-		// need to compute the diff information for the `isSCM` quick diff
-		// provider as that information will be provided by the diff editor
-		return this.options.maxComputationTimeMs === undefined
-			? quickDiffs.filter(quickDiff => !quickDiff.isSCM)
-			: quickDiffs;
+		return this.quickDiffService.getQuickDiffs(uri, this._model.getLanguageId(), isSynchronized);
 	}
 
 	findNextClosestChange(lineNumber: number, inclusive = true, provider?: string): number {

From f283262be0d06d0c6759e52c1c47fbde06e2b172 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Tue, 17 Dec 2024 10:17:50 +0100
Subject: [PATCH 293/479] [json] `Unable to load schema, EISDIR: illegal
 operation on a directory (#236319)

---
 .../server/src/node/jsonServerMain.ts         | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/extensions/json-language-features/server/src/node/jsonServerMain.ts b/extensions/json-language-features/server/src/node/jsonServerMain.ts
index ad1ae439e59..c22cd14834d 100644
--- a/extensions/json-language-features/server/src/node/jsonServerMain.ts
+++ b/extensions/json-language-features/server/src/node/jsonServerMain.ts
@@ -8,8 +8,8 @@ import { formatError } from '../utils/runner';
 import { RequestService, RuntimeEnvironment, startServer } from '../jsonServer';
 
 import { xhr, XHRResponse, configure as configureHttpRequests, getErrorStatusDescription } from 'request-light';
-import { URI as Uri } from 'vscode-uri';
-import * as fs from 'fs';
+import { promises as fs } from 'fs';
+import * as l10n from '@vscode/l10n';
 
 // Create a connection for the server.
 const connection: Connection = createConnection();
@@ -36,16 +36,17 @@ function getHTTPRequestService(): RequestService {
 
 function getFileRequestService(): RequestService {
 	return {
-		getContent(location: string, encoding?: BufferEncoding) {
-			return new Promise((c, e) => {
-				const uri = Uri.parse(location);
-				fs.readFile(uri.fsPath, encoding, (err, buf) => {
-					if (err) {
-						return e(err);
-					}
-					c(buf.toString());
-				});
-			});
+		async getContent(location: string, encoding?: BufferEncoding) {
+			try {
+				return (await fs.readFile(location, encoding)).toString();
+			} catch (e) {
+				if (e.code === 'ENOENT') {
+					throw new Error(l10n.t('Schema not found: {0}', location));
+				} else if (e.code === 'EISDIR') {
+					throw new Error(l10n.t('{0} is a directory, not a file', location));
+				}
+				throw e;
+			}
 		}
 	};
 }

From 848e5a3495a9af7dc8523a25e12b81b267b2a4de Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Tue, 17 Dec 2024 11:09:44 +0100
Subject: [PATCH 294/479] Do not inherit outer editor's rulers (#236324)

---
 .../inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
index 481af0ed288..b2cd7d9ef56 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
@@ -247,6 +247,7 @@ export class InlineEditsSideBySideDiff extends Disposable {
 				bracketPairsHorizontal: false,
 				highlightActiveIndentation: false,
 			},
+			rulers: [],
 			padding: { top: 0, bottom: 0 },
 			folding: false,
 			selectOnLineNumbers: false,

From b426e026e1640a08b827e3b28274c0bea654ccf8 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 17 Dec 2024 11:26:12 +0100
Subject: [PATCH 295/479] Show remote name for files in recently opened (fix
 #143096) (#236309)

---
 src/vs/platform/label/common/label.ts                  |  3 ++-
 src/vs/workbench/browser/actions/windowActions.ts      |  2 +-
 .../workbench/browser/parts/titlebar/menubarControl.ts |  2 +-
 .../contrib/search/browser/anythingQuickAccess.ts      |  2 --
 .../dialogs/browser/abstractFileDialogService.ts       |  2 +-
 .../services/host/browser/browserHostService.ts        |  2 +-
 .../host/electron-sandbox/nativeHostService.ts         |  2 +-
 src/vs/workbench/services/label/common/labelService.ts | 10 +++++++---
 8 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/vs/platform/label/common/label.ts b/src/vs/platform/label/common/label.ts
index e920d9a1c21..c8d520ae357 100644
--- a/src/vs/platform/label/common/label.ts
+++ b/src/vs/platform/label/common/label.ts
@@ -20,8 +20,9 @@ export interface ILabelService {
 	 * If `relative` is passed returns a label relative to the workspace root that the uri belongs to.
 	 * If `noPrefix` is passed does not tildify the label and also does not prepand the root name for relative labels in a multi root scenario.
 	 * If `separator` is passed, will use that over the defined path separator of the formatter.
+	 * If `appendWorkspaceSuffix` is passed, will append the name of the workspace to the label.
 	 */
-	getUriLabel(resource: URI, options?: { relative?: boolean; noPrefix?: boolean; separator?: '/' | '\\' }): string;
+	getUriLabel(resource: URI, options?: { relative?: boolean; noPrefix?: boolean; separator?: '/' | '\\'; appendWorkspaceSuffix?: boolean }): string;
 	getUriBasenameLabel(resource: URI): string;
 	getWorkspaceLabel(workspace: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI | IWorkspace), options?: { verbose: Verbosity }): string;
 	getHostLabel(scheme: string, authority?: string): string;
diff --git a/src/vs/workbench/browser/actions/windowActions.ts b/src/vs/workbench/browser/actions/windowActions.ts
index e2248c750fb..2fb9c8edbb3 100644
--- a/src/vs/workbench/browser/actions/windowActions.ts
+++ b/src/vs/workbench/browser/actions/windowActions.ts
@@ -211,7 +211,7 @@ abstract class BaseOpenRecentAction extends Action2 {
 			resource = recent.fileUri;
 			iconClasses = getIconClasses(modelService, languageService, resource, FileKind.FILE);
 			openable = { fileUri: resource };
-			fullLabel = recent.label || labelService.getUriLabel(resource);
+			fullLabel = recent.label || labelService.getUriLabel(resource, { appendWorkspaceSuffix: true });
 		}
 
 		const { name, parentPath } = splitRecentLabel(fullLabel);
diff --git a/src/vs/workbench/browser/parts/titlebar/menubarControl.ts b/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
index ac4940f1c28..50e68318650 100644
--- a/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
+++ b/src/vs/workbench/browser/parts/titlebar/menubarControl.ts
@@ -327,7 +327,7 @@ export abstract class MenubarControl extends Disposable {
 			openable = { workspaceUri: uri };
 		} else {
 			uri = recent.fileUri;
-			label = recent.label || this.labelService.getUriLabel(uri);
+			label = recent.label || this.labelService.getUriLabel(uri, { appendWorkspaceSuffix: true });
 			commandId = 'openRecentFile';
 			openable = { fileUri: uri };
 		}
diff --git a/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts b/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
index c08b3518cf7..bcb65cdddfd 100644
--- a/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
+++ b/src/vs/workbench/contrib/search/browser/anythingQuickAccess.ts
@@ -484,8 +484,6 @@ export class AnythingQuickAccessProvider extends PickerQuickAccessProvider<IAnyt
 		const editorHistoryPicks: Array<IAnythingQuickPickItem> = [];
 		for (const editor of this.historyService.getHistory()) {
 			const resource = editor.resource;
-			// allow untitled and terminal editors to go through
-			// allow github copilot chat to go through
 			if (!resource) {
 				continue;
 			}
diff --git a/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts b/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts
index c7e890fce1d..7223babe5ef 100644
--- a/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts
+++ b/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts
@@ -230,7 +230,7 @@ export abstract class AbstractFileDialogService implements IFileDialogService {
 	}
 
 	protected addFileToRecentlyOpened(uri: URI): void {
-		this.workspacesService.addRecentlyOpened([{ fileUri: uri, label: this.labelService.getUriLabel(uri) }]);
+		this.workspacesService.addRecentlyOpened([{ fileUri: uri, label: this.labelService.getUriLabel(uri, { appendWorkspaceSuffix: true }) }]);
 	}
 
 	protected async pickFolderAndOpenSimplified(schema: string, options: IPickAndOpenOptions): Promise<void> {
diff --git a/src/vs/workbench/services/host/browser/browserHostService.ts b/src/vs/workbench/services/host/browser/browserHostService.ts
index c2a2374c6c9..afd2a3d1267 100644
--- a/src/vs/workbench/services/host/browser/browserHostService.ts
+++ b/src/vs/workbench/services/host/browser/browserHostService.ts
@@ -428,7 +428,7 @@ export class BrowserHostService extends Disposable implements IHostService {
 			return this.labelService.getWorkspaceLabel(getWorkspaceIdentifier(openable.workspaceUri), { verbose: Verbosity.LONG });
 		}
 
-		return this.labelService.getUriLabel(openable.fileUri);
+		return this.labelService.getUriLabel(openable.fileUri, { appendWorkspaceSuffix: true });
 	}
 
 	private shouldReuse(options: IOpenWindowOptions = Object.create(null), isFile: boolean): boolean {
diff --git a/src/vs/workbench/services/host/electron-sandbox/nativeHostService.ts b/src/vs/workbench/services/host/electron-sandbox/nativeHostService.ts
index 8bdfe9743fe..be5cdaa8bb6 100644
--- a/src/vs/workbench/services/host/electron-sandbox/nativeHostService.ts
+++ b/src/vs/workbench/services/host/electron-sandbox/nativeHostService.ts
@@ -130,7 +130,7 @@ class WorkbenchHostService extends Disposable implements IHostService {
 			return this.labelService.getWorkspaceLabel({ id: '', configPath: openable.workspaceUri }, { verbose: Verbosity.LONG });
 		}
 
-		return this.labelService.getUriLabel(openable.fileUri);
+		return this.labelService.getUriLabel(openable.fileUri, { appendWorkspaceSuffix: true });
 	}
 
 	private doOpenEmptyWindow(options?: IOpenEmptyWindowOptions): Promise<void> {
diff --git a/src/vs/workbench/services/label/common/labelService.ts b/src/vs/workbench/services/label/common/labelService.ts
index 941b49db19a..d99ee6ad9b4 100644
--- a/src/vs/workbench/services/label/common/labelService.ts
+++ b/src/vs/workbench/services/label/common/labelService.ts
@@ -208,19 +208,23 @@ export class LabelService extends Disposable implements ILabelService {
 		return bestResult ? bestResult.formatting : undefined;
 	}
 
-	getUriLabel(resource: URI, options: { relative?: boolean; noPrefix?: boolean; separator?: '/' | '\\' } = {}): string {
+	getUriLabel(resource: URI, options: { relative?: boolean; noPrefix?: boolean; separator?: '/' | '\\'; appendWorkspaceSuffix?: boolean } = {}): string {
 		let formatting = this.findFormatting(resource);
 		if (formatting && options.separator) {
 			// mixin separator if defined from the outside
 			formatting = { ...formatting, separator: options.separator };
 		}
 
-		const label = this.doGetUriLabel(resource, formatting, options);
+		let label = this.doGetUriLabel(resource, formatting, options);
 
 		// Without formatting we still need to support the separator
 		// as provided in options (https://github.com/microsoft/vscode/issues/130019)
 		if (!formatting && options.separator) {
-			return label.replace(sepRegexp, options.separator);
+			label = label.replace(sepRegexp, options.separator);
+		}
+
+		if (options.appendWorkspaceSuffix && formatting?.workspaceSuffix) {
+			label = this.appendWorkspaceSuffix(label, resource);
 		}
 
 		return label;

From f78af5335027855ca7221e4211978034b858c612 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Tue, 17 Dec 2024 11:38:12 +0100
Subject: [PATCH 296/479] Fix extra primary button in comments (#236325)

Fixes https://github.com/microsoft/vscode-pull-request-github/issues/6553
---
 src/vs/workbench/contrib/comments/browser/commentNode.ts  | 2 +-
 src/vs/workbench/contrib/comments/browser/commentReply.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/comments/browser/commentNode.ts b/src/vs/workbench/contrib/comments/browser/commentNode.ts
index 37958bce7d8..f90a81288a3 100644
--- a/src/vs/workbench/contrib/comments/browser/commentNode.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentNode.ts
@@ -658,7 +658,7 @@ export class CommentNode<T extends IRange | ICellRange> extends Disposable {
 
 		this._register(menu);
 		this._register(menu.onDidChange(() => {
-			this._commentEditorActions?.setActions(menu);
+			this._commentEditorActions?.setActions(menu, true);
 		}));
 
 		this._commentEditorActions = new CommentFormActions(this.keybindingService, this._contextKeyService, this.contextMenuService, container, (action: IAction): void => {
diff --git a/src/vs/workbench/contrib/comments/browser/commentReply.ts b/src/vs/workbench/contrib/comments/browser/commentReply.ts
index 981a3513d59..37bb741dc68 100644
--- a/src/vs/workbench/contrib/comments/browser/commentReply.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentReply.ts
@@ -300,7 +300,7 @@ export class CommentReply<T extends IRange | ICellRange> extends Disposable {
 		const editorMenu = this._commentMenus.getCommentEditorActions(this._contextKeyService);
 		this._register(editorMenu);
 		this._register(editorMenu.onDidChange(() => {
-			this._commentEditorActions.setActions(editorMenu);
+			this._commentEditorActions.setActions(editorMenu, true);
 		}));
 
 		this._commentEditorActions = new CommentFormActions(this.keybindingService, this._contextKeyService, this.contextMenuService, container, async (action: IAction) => {

From 9b0cd6551590014e8b91e78425848ccb6a12c6e6 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Tue, 17 Dec 2024 12:22:51 +0100
Subject: [PATCH 297/479] theme - fix some colors in status bar for #235718
 (#236331)

---
 extensions/theme-defaults/themes/hc_light.json     | 4 +++-
 extensions/theme-defaults/themes/light_modern.json | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/extensions/theme-defaults/themes/hc_light.json b/extensions/theme-defaults/themes/hc_light.json
index 6d192e76757..e59494f9cfb 100644
--- a/extensions/theme-defaults/themes/hc_light.json
+++ b/extensions/theme-defaults/themes/hc_light.json
@@ -569,6 +569,8 @@
 		}
 	],
 	"colors": {
-		"actionBar.toggledBackground": "#dddddd"
+		"actionBar.toggledBackground": "#dddddd",
+		"statusBarItem.remoteBackground": "#FFFFFF",
+		"statusBarItem.remoteForeground": "#000000"
 	}
 }
diff --git a/extensions/theme-defaults/themes/light_modern.json b/extensions/theme-defaults/themes/light_modern.json
index 9b4d627fcd1..7f5e622639c 100644
--- a/extensions/theme-defaults/themes/light_modern.json
+++ b/extensions/theme-defaults/themes/light_modern.json
@@ -104,6 +104,8 @@
 		"statusBar.background": "#F8F8F8",
 		"statusBar.foreground": "#3B3B3B",
 		"statusBar.border": "#E5E5E5",
+		"statusBarItem.hoverBackground": "#B8B8B850",
+		"statusBarItem.compactHoverBackground": "#CCCCCC",
 		"statusBar.debuggingBackground": "#FD716C",
 		"statusBar.debuggingForeground": "#000000",
 		"statusBar.focusBorder": "#005FB8",

From c269884f97e3ec4e62495ce64dec99d2d1f9db0b Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Tue, 17 Dec 2024 12:30:48 +0100
Subject: [PATCH 298/479] disable sticky scroll while steaming edits (#236332)

disable sticky scroll white steaming edits

fixes https://github.com/microsoft/vscode-copilot/issues/11102
---
 .../contrib/chat/browser/chatEditorController.ts    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditorController.ts b/src/vs/workbench/contrib/chat/browser/chatEditorController.ts
index 18a7c1a258e..e2a186b5886 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditorController.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditorController.ts
@@ -11,7 +11,7 @@ import { themeColorFromId } from '../../../../base/common/themables.js';
 import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, IOverlayWidgetPositionCoordinates, IViewZone, MouseTargetType } from '../../../../editor/browser/editorBrowser.js';
 import { LineSource, renderLines, RenderOptions } from '../../../../editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js';
 import { diffAddDecoration, diffDeleteDecoration, diffWholeLineAddDecoration } from '../../../../editor/browser/widget/diffEditor/registrations.contribution.js';
-import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { EditorOption, IEditorStickyScrollOptions } from '../../../../editor/common/config/editorOptions.js';
 import { EditOperation, ISingleEditOperation } from '../../../../editor/common/core/editOperation.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { IDocumentDiff } from '../../../../editor/common/diff/documentDiffProvider.js';
@@ -164,25 +164,30 @@ export class ChatEditorController extends Disposable implements IEditorContribut
 
 		let actualReadonly: boolean | undefined;
 		let actualDeco: 'off' | 'editable' | 'on' | undefined;
+		let actualStickyScroll: IEditorStickyScrollOptions | undefined;
 
 		this._register(autorun(r => {
 			const value = shouldBeReadOnly.read(r);
 			if (value) {
 				actualReadonly ??= this._editor.getOption(EditorOption.readOnly);
 				actualDeco ??= this._editor.getOption(EditorOption.renderValidationDecorations);
+				actualStickyScroll ??= this._editor.getOption(EditorOption.stickyScroll);
 
 				this._editor.updateOptions({
 					readOnly: true,
-					renderValidationDecorations: 'off'
+					renderValidationDecorations: 'off',
+					stickyScroll: { enabled: false }
 				});
 			} else {
-				if (actualReadonly !== undefined && actualDeco !== undefined) {
+				if (actualReadonly !== undefined && actualDeco !== undefined && actualStickyScroll !== undefined) {
 					this._editor.updateOptions({
 						readOnly: actualReadonly,
-						renderValidationDecorations: actualDeco
+						renderValidationDecorations: actualDeco,
+						stickyScroll: actualStickyScroll
 					});
 					actualReadonly = undefined;
 					actualDeco = undefined;
+					actualStickyScroll = undefined;
 				}
 			}
 		}));

From f776d0611ec9fc8c8169dc6883ab1adaa7965f24 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Tue, 17 Dec 2024 04:09:17 -0800
Subject: [PATCH 299/479] Fill pwsh commands via Get-Command

Fixes #235024
---
 .../src/terminalSuggestMain.ts                | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index 0c29d9688b1..5071c4c79ce 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -25,40 +25,44 @@ function getBuiltinCommands(shell: string): string[] | undefined {
 		}
 		const filter = (cmd: string) => cmd;
 		const options: ExecOptionsWithStringEncoding = { encoding: 'utf-8', shell };
+		let commands: string[] | undefined;
 		switch (shellType) {
 			case 'bash': {
 				const bashOutput = execSync('compgen -b', options);
-				const bashResult = bashOutput.split('\n').filter(filter);
-				if (bashResult.length) {
-					cachedBuiltinCommands?.set(shellType, bashResult);
-					return bashResult;
-				}
+				commands = bashOutput.split('\n').filter(filter);
 				break;
 			}
 			case 'zsh': {
 				const zshOutput = execSync('printf "%s\\n" ${(k)builtins}', options);
-				const zshResult = zshOutput.split('\n').filter(filter);
-				if (zshResult.length) {
-					cachedBuiltinCommands?.set(shellType, zshResult);
-					return zshResult;
-				}
+				commands = zshOutput.split('\n').filter(filter);
+				break;
 			}
 			case 'fish': {
 				// TODO: ghost text in the command line prevents
 				// completions from working ATM for fish
 				const fishOutput = execSync('functions -n', options);
-				const fishResult = fishOutput.split(', ').filter(filter);
-				if (fishResult.length) {
-					cachedBuiltinCommands?.set(shellType, fishResult);
-					return fishResult;
-				}
+				commands = fishOutput.split(', ').filter(filter);
 				break;
 			}
 			case 'pwsh': {
-				// native pwsh completions are builtin to vscode
-				return [];
+				const output = execSync('Get-Command | Select-Object Name, CommandType, DisplayName | ConvertTo-Json', options);
+				let json: any;
+				try {
+					json = JSON.parse(output);
+				} catch (e) {
+					console.error('Error parsing pwsh output:', e);
+					return [];
+				}
+				// TODO: Return a rich type with kind and detail
+				commands = (json as any[]).map(e => e.Name);
+				break;
 			}
 		}
+		// TODO: Cache failure results too
+		if (commands?.length) {
+			cachedBuiltinCommands?.set(shellType, commands);
+			return commands;
+		}
 		return;
 
 	} catch (error) {

From cdd41b08dba59afbff4a499f522e35dde0d53caa Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Tue, 17 Dec 2024 04:27:47 -0800
Subject: [PATCH 300/479] Reduce duplication in terminal completion service
 tests

---
 .../browser/terminalCompletionService.test.ts | 94 ++++++-------------
 1 file changed, 28 insertions(+), 66 deletions(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionService.test.ts b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionService.test.ts
index 3ce17efc700..1ce22b4138c 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionService.test.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionService.test.ts
@@ -6,7 +6,6 @@
 import { URI } from '../../../../../../base/common/uri.js';
 import { IFileService, IFileStatWithMetadata, IResolveMetadataFileOptions } from '../../../../../../platform/files/common/files.js';
 import { TerminalCompletionService, TerminalCompletionItemKind, TerminalResourceRequestConfig } from '../../browser/terminalCompletionService.js';
-import sinon from 'sinon';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
 import assert from 'assert';
 import { isWindows } from '../../../../../../base/common/platform.js';
@@ -44,10 +43,6 @@ suite('TerminalCompletionService', () => {
 		childResources = [];
 	});
 
-	teardown(() => {
-		sinon.restore();
-	});
-
 	suite('resolveResources should return undefined', () => {
 		test('if cwd is not provided', async () => {
 			const resourceRequestConfig: TerminalResourceRequestConfig = {
@@ -69,157 +64,124 @@ suite('TerminalCompletionService', () => {
 	});
 
 	suite('resolveResources should return folder completions', () => {
-		test('', async () => {
+		setup(() => {
+			validResources = [URI.parse('file:///test')];
+			const childFolder = { resource: URI.parse('file:///test/folder1/'), name: 'folder1', isDirectory: true, isFile: false };
+			const childFile = { resource: URI.parse('file:///test/file1.txt'), name: 'file1.txt', isDirectory: false, isFile: true };
+			childResources = [childFolder, childFile];
+		});
+
+		test('|', async () => {
 			const resourceRequestConfig: TerminalResourceRequestConfig = {
 				cwd: URI.parse('file:///test'),
 				foldersRequested: true,
 				pathSeparator
 			};
-			validResources = [URI.parse('file:///test')];
-			const childFolder = { resource: URI.parse('file:///test/folder1/'), name: 'folder1', isDirectory: true, isFile: false };
-			const childFile = { resource: URI.parse('file:///test/file1.txt'), name: 'file1.txt', isDirectory: false, isFile: true };
-			childResources = [childFolder, childFile];
 			const result = await terminalCompletionService.resolveResources(resourceRequestConfig, '', 1);
-			assert(!!result);
-			assert(result.length === 1);
-			assert.deepEqual(result![0], {
+			assert.deepEqual(result, [{
 				label: `.${pathSeparator}folder1${pathSeparator}`,
 				kind: TerminalCompletionItemKind.Folder,
 				isDirectory: true,
 				isFile: false,
 				replacementIndex: 1,
 				replacementLength: 1
-			});
+			}]);
 		});
-		test('.', async () => {
+		test('.|', async () => {
 			const resourceRequestConfig: TerminalResourceRequestConfig = {
 				cwd: URI.parse('file:///test'),
 				foldersRequested: true,
 				pathSeparator
 			};
-			validResources = [URI.parse('file:///test')];
-			const childFolder = { resource: URI.parse('file:///test/folder1/'), name: 'folder1', isDirectory: true, isFile: false };
-			const childFile = { resource: URI.parse('file:///test/file1.txt'), name: 'file1.txt', isDirectory: false, isFile: true };
-			childResources = [childFolder, childFile];
 			const result = await terminalCompletionService.resolveResources(resourceRequestConfig, '.', 2);
-			assert(!!result);
-			assert(result.length === 1);
-			assert.deepEqual(result![0], {
+			assert.deepEqual(result, [{
 				label: `.${pathSeparator}folder1${pathSeparator}`,
 				kind: TerminalCompletionItemKind.Folder,
 				isDirectory: true,
 				isFile: false,
 				replacementIndex: 1,
 				replacementLength: 1
-			});
+			}]);
 		});
-		test('./', async () => {
+		test('./|', async () => {
 			const resourceRequestConfig: TerminalResourceRequestConfig = {
 				cwd: URI.parse('file:///test'),
 				foldersRequested: true,
 				pathSeparator
 			};
-			validResources = [URI.parse('file:///test')];
-			const childFolder = { resource: URI.parse('file:///test/folder1/'), name: 'folder1', isDirectory: true, isFile: false };
-			const childFile = { resource: URI.parse('file:///test/file1.txt'), name: 'file1.txt', isDirectory: false, isFile: true };
-			childResources = [childFolder, childFile];
 			const result = await terminalCompletionService.resolveResources(resourceRequestConfig, './', 3);
-			assert(!!result);
-			assert(result.length === 1);
-			assert.deepEqual(result![0], {
+			assert.deepEqual(result, [{
 				label: `.${pathSeparator}folder1${pathSeparator}`,
 				kind: TerminalCompletionItemKind.Folder,
 				isDirectory: true,
 				isFile: false,
 				replacementIndex: 1,
 				replacementLength: 2
-			});
+			}]);
 		});
-		test('cd ', async () => {
+		test('cd |', async () => {
 			const resourceRequestConfig: TerminalResourceRequestConfig = {
 				cwd: URI.parse('file:///test'),
 				foldersRequested: true,
 				pathSeparator
 			};
-			validResources = [URI.parse('file:///test')];
-			const childFolder = { resource: URI.parse('file:///test/folder1/'), name: 'folder1', isDirectory: true, isFile: false };
-			const childFile = { resource: URI.parse('file:///test/file1.txt'), name: 'file1.txt', isDirectory: false, isFile: true };
-			childResources = [childFolder, childFile];
 			const result = await terminalCompletionService.resolveResources(resourceRequestConfig, 'cd ', 3);
-			assert(!!result);
-			assert(result.length === 1);
-			assert.deepEqual(result![0], {
+			assert.deepEqual(result, [{
 				label: `.${pathSeparator}folder1${pathSeparator}`,
 				kind: TerminalCompletionItemKind.Folder,
 				isDirectory: true,
 				isFile: false,
 				replacementIndex: 3,
 				replacementLength: 3
-			});
+			}]);
 		});
-		test('cd .', async () => {
+		test('cd .|', async () => {
 			const resourceRequestConfig: TerminalResourceRequestConfig = {
 				cwd: URI.parse('file:///test'),
 				foldersRequested: true,
 				pathSeparator
 			};
-			validResources = [URI.parse('file:///test/')];
-			const childFolder = { resource: URI.parse('file:///test/folder1/'), name: 'folder1', isDirectory: true, isFile: false };
-			const childFile = { resource: URI.parse('file:///test/file1.txt'), name: 'file1.txt', isDirectory: false, isFile: true };
-			childResources = [childFolder, childFile];
 			const result = await terminalCompletionService.resolveResources(resourceRequestConfig, 'cd .', 4);
-			assert(!!result);
-			assert(result.length === 1);
-			assert.deepEqual(result![0], {
+			assert.deepEqual(result, [{
 				label: `.${pathSeparator}folder1${pathSeparator}`,
 				kind: TerminalCompletionItemKind.Folder,
 				isDirectory: true,
 				isFile: false,
 				replacementIndex: 3,
 				replacementLength: 1 // replacing .
-			});
+			}]);
 		});
-		test('cd ./', async () => {
+		test('cd ./|', async () => {
 			const resourceRequestConfig: TerminalResourceRequestConfig = {
 				cwd: URI.parse('file:///test'),
 				foldersRequested: true,
 				pathSeparator
 			};
-			const childFolder = { resource: URI.parse('file:///test/folder1/'), name: 'folder1', isDirectory: true, isFile: false };
-			const childFile = { resource: URI.parse('file:///test/file1.txt'), name: 'file1.txt', isDirectory: false, isFile: true };
-			childResources = [childFolder, childFile];
 			const result = await terminalCompletionService.resolveResources(resourceRequestConfig, 'cd ./', 5);
-			assert(!!result);
-			assert(result.length === 1);
-			assert.deepEqual(result![0], {
+			assert.deepEqual(result, [{
 				label: `.${pathSeparator}folder1${pathSeparator}`,
 				kind: TerminalCompletionItemKind.Folder,
 				isDirectory: true,
 				isFile: false,
 				replacementIndex: 3,
 				replacementLength: 2 // replacing ./
-			});
+			}]);
 		});
-		test('cd ./f', async () => {
+		test('cd ./f|', async () => {
 			const resourceRequestConfig: TerminalResourceRequestConfig = {
 				cwd: URI.parse('file:///test'),
 				foldersRequested: true,
 				pathSeparator
 			};
-			const childFolder = { resource: URI.parse('file:///test/folder1/'), name: 'folder1', isDirectory: true, isFile: false };
-			const childFile = { resource: URI.parse('file:///test/file1.txt'), name: 'file1.txt', isDirectory: false, isFile: true };
-			childResources = [childFolder, childFile];
 			const result = await terminalCompletionService.resolveResources(resourceRequestConfig, 'cd ./f', 6);
-			assert(!!result);
-			assert(result.length === 1);
-			assert.deepEqual(result![0], {
+			assert.deepEqual(result, [{
 				label: `.${pathSeparator}folder1${pathSeparator}`,
 				kind: TerminalCompletionItemKind.Folder,
 				isDirectory: true,
 				isFile: false,
 				replacementIndex: 3,
 				replacementLength: 3 // replacing ./f
-			});
+			}]);
 		});
 	});
 });

From 6997bee2acbcec80320a948d520e388f913f9d04 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Tue, 17 Dec 2024 14:49:21 +0100
Subject: [PATCH 301/479] Make badge smaller, reduce margin and change color
 when icon (#236346)

make badge smaller and closer to label
---
 .../browser/parts/media/paneCompositePart.css        | 12 ++++++------
 src/vs/workbench/browser/parts/panel/panelPart.ts    | 11 ++++++-----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/vs/workbench/browser/parts/media/paneCompositePart.css b/src/vs/workbench/browser/parts/media/paneCompositePart.css
index 2b4518ca204..de625937628 100644
--- a/src/vs/workbench/browser/parts/media/paneCompositePart.css
+++ b/src/vs/workbench/browser/parts/media/paneCompositePart.css
@@ -183,7 +183,7 @@
 
 .monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .badge,
 .monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .badge {
-	margin-left: 8px;
+	margin-left: 2px;
 	display: flex;
 	align-items: center;
 }
@@ -196,11 +196,11 @@
 .monaco-workbench .pane-composite-part > .title > .composite-bar-container > .composite-bar > .monaco-action-bar .badge .badge-content,
 .monaco-workbench .pane-composite-part > .header-or-footer > .composite-bar-container > .composite-bar > .monaco-action-bar .badge .badge-content {
 	padding: 3px 5px;
-	border-radius: 11px;
-	font-size: 11px;
-	min-width: 18px;
-	height: 18px;
-	line-height: 11px;
+	border-radius: 10px;
+	font-size: 10px;
+	min-width: 16px;
+	height: 16px;
+	line-height: 10px;
 	font-weight: normal;
 	text-align: center;
 	display: inline-block;
diff --git a/src/vs/workbench/browser/parts/panel/panelPart.ts b/src/vs/workbench/browser/parts/panel/panelPart.ts
index 4646b4412f3..6363f266384 100644
--- a/src/vs/workbench/browser/parts/panel/panelPart.ts
+++ b/src/vs/workbench/browser/parts/panel/panelPart.ts
@@ -15,8 +15,8 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { TogglePanelAction } from './panelActions.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { PANEL_BACKGROUND, PANEL_BORDER, PANEL_TITLE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_INACTIVE_TITLE_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_DRAG_AND_DROP_BORDER } from '../../../common/theme.js';
-import { contrastBorder, badgeBackground, badgeForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { PANEL_BACKGROUND, PANEL_BORDER, PANEL_TITLE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_INACTIVE_TITLE_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_DRAG_AND_DROP_BORDER, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND } from '../../../common/theme.js';
+import { badgeBackground, badgeForeground, contrastBorder } from '../../../../platform/theme/common/colorRegistry.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { Dimension } from '../../../../base/browser/dom.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
@@ -130,12 +130,13 @@ export class PanelPart extends AbstractPaneCompositePart {
 	}
 
 	protected getCompositeBarOptions(): IPaneCompositeBarOptions {
+		const showIcons = this.configurationService.getValue('workbench.panel.showLabels') === false;
 		return {
 			partContainerClass: 'panel',
 			pinnedViewContainersKey: 'workbench.panel.pinnedPanels',
 			placeholderViewContainersKey: 'workbench.panel.placeholderPanels',
 			viewContainersWorkspaceStateKey: 'workbench.panel.viewContainersWorkspaceState',
-			icon: this.configurationService.getValue('workbench.panel.showLabels') === false,
+			icon: showIcons,
 			orientation: ActionsOrientation.HORIZONTAL,
 			recomputeSizes: true,
 			activityHoverOptions: {
@@ -152,8 +153,8 @@ export class PanelPart extends AbstractPaneCompositePart {
 				activeBorderBottomColor: theme.getColor(PANEL_ACTIVE_TITLE_BORDER),
 				activeForegroundColor: theme.getColor(PANEL_ACTIVE_TITLE_FOREGROUND),
 				inactiveForegroundColor: theme.getColor(PANEL_INACTIVE_TITLE_FOREGROUND),
-				badgeBackground: theme.getColor(badgeBackground),
-				badgeForeground: theme.getColor(badgeForeground),
+				badgeBackground: theme.getColor(showIcons ? ACTIVITY_BAR_BADGE_BACKGROUND : badgeBackground),
+				badgeForeground: theme.getColor(showIcons ? ACTIVITY_BAR_BADGE_FOREGROUND : badgeForeground),
 				dragAndDropBorder: theme.getColor(PANEL_DRAG_AND_DROP_BORDER)
 			})
 		};

From d162ceb7fecc3476f27d75196e3dd71b06c51bc1 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Tue, 17 Dec 2024 15:15:31 +0100
Subject: [PATCH 302/479] extension events use new `ExtensionError` so that
 these errors don't make it into "normal" error telemetry (#236336)

* extension events use new `ExtensionError` so that these errors don't make it into "normal" error telemetry

fixes https://github.com/microsoft/vscode/issues/232914

* fix tests
---
 .../platform/extensions/common/extensions.ts  | 14 +++++++++++
 .../workbench/api/common/extHost.api.impl.ts  |  5 ++--
 .../workbench/api/common/extensionHostMain.ts | 25 +++++++++++++------
 .../api/test/common/extensionHostMain.test.ts |  7 ++++--
 4 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts
index cee0043bad6..687fd50dc36 100644
--- a/src/vs/platform/extensions/common/extensions.ts
+++ b/src/vs/platform/extensions/common/extensions.ts
@@ -447,6 +447,20 @@ export class ExtensionIdentifierMap<T> {
 	}
 }
 
+/**
+ * An error that is clearly from an extension, identified by the `ExtensionIdentifier`
+ */
+export class ExtensionError extends Error {
+
+	readonly extension: ExtensionIdentifier;
+
+	constructor(extensionIdentifier: ExtensionIdentifier, cause: Error, message?: string) {
+		super(`Error in extension ${ExtensionIdentifier.toKey(extensionIdentifier)}: ${message ?? cause.message}`, { cause });
+		this.name = 'ExtensionError';
+		this.extension = extensionIdentifier;
+	}
+}
+
 export interface IRelaxedExtensionDescription extends IRelaxedExtensionManifest {
 	id?: string;
 	identifier: ExtensionIdentifier;
diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
index 85ff1aa52b2..868906908ea 100644
--- a/src/vs/workbench/api/common/extHost.api.impl.ts
+++ b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -14,7 +14,7 @@ import { TextEditorCursorStyle } from '../../../editor/common/config/editorOptio
 import { score, targetsNotebooks } from '../../../editor/common/languageSelector.js';
 import * as languageConfiguration from '../../../editor/common/languages/languageConfiguration.js';
 import { OverviewRulerLane } from '../../../editor/common/model.js';
-import { ExtensionIdentifierSet, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { ExtensionError, ExtensionIdentifierSet, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
 import * as files from '../../../platform/files/common/files.js';
 import { ServicesAccessor } from '../../../platform/instantiation/common/instantiation.js';
 import { ILogService, ILoggerService, LogLevel } from '../../../platform/log/common/log.js';
@@ -245,8 +245,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 					try {
 						listener.call(thisArgs, e);
 					} catch (err) {
-						errors.onUnexpectedExternalError(new Error(`[ExtensionListenerError] Extension '${extension.identifier.value}' FAILED to handle event: ${err.toString()}`, { cause: err }));
-						extHostTelemetry.onExtensionError(extension.identifier, err);
+						errors.onUnexpectedExternalError(new ExtensionError(extension.identifier, err, 'FAILED to handle event'));
 					}
 				});
 				disposables?.push(handle);
diff --git a/src/vs/workbench/api/common/extensionHostMain.ts b/src/vs/workbench/api/common/extensionHostMain.ts
index 6c93b88e428..d0180c1a081 100644
--- a/src/vs/workbench/api/common/extensionHostMain.ts
+++ b/src/vs/workbench/api/common/extensionHostMain.ts
@@ -11,7 +11,7 @@ import { IMessagePassingProtocol } from '../../../base/parts/ipc/common/ipc.js';
 import { MainContext, MainThreadConsoleShape } from './extHost.protocol.js';
 import { IExtensionHostInitData } from '../../services/extensions/common/extensionHostProtocol.js';
 import { RPCProtocol } from '../../services/extensions/common/rpcProtocol.js';
-import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
+import { ExtensionError, ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
 import { ILogService } from '../../../platform/log/common/log.js';
 import { getSingletonServiceDescriptors } from '../../../platform/instantiation/common/extensions.js';
 import { ServiceCollection } from '../../../platform/instantiation/common/serviceCollection.js';
@@ -119,15 +119,24 @@ export abstract class ErrorHandler {
 			logService.error(err);
 
 			const errorData = errors.transformErrorForSerialization(err);
-			const stackData = extensionErrors.get(err);
-			if (!stackData?.extensionIdentifier) {
-				mainThreadErrors.$onUnexpectedError(errorData);
-				return;
+
+			let extension: ExtensionIdentifier | undefined;
+			if (err instanceof ExtensionError) {
+				extension = err.extension;
+			} else {
+				const stackData = extensionErrors.get(err);
+				extension = stackData?.extensionIdentifier;
+			}
+
+			if (extension) {
+				mainThreadExtensions.$onExtensionRuntimeError(extension, errorData);
+				const reported = extensionTelemetry.onExtensionError(extension, err);
+				logService.trace('forwarded error to extension?', reported, extension);
 			}
+		});
 
-			mainThreadExtensions.$onExtensionRuntimeError(stackData.extensionIdentifier, errorData);
-			const reported = extensionTelemetry.onExtensionError(stackData.extensionIdentifier, err);
-			logService.trace('forwarded error to extension?', reported, stackData);
+		errors.errorHandler.addListener(err => {
+			mainThreadErrors.$onUnexpectedError(err);
 		});
 	}
 }
diff --git a/src/vs/workbench/api/test/common/extensionHostMain.test.ts b/src/vs/workbench/api/test/common/extensionHostMain.test.ts
index cda646f07cf..aa96a67b445 100644
--- a/src/vs/workbench/api/test/common/extensionHostMain.test.ts
+++ b/src/vs/workbench/api/test/common/extensionHostMain.test.ts
@@ -14,7 +14,7 @@ import { ExtensionIdentifier, IExtensionDescription } from '../../../../platform
 import { InstantiationService } from '../../../../platform/instantiation/common/instantiationService.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { ILogService, NullLogService } from '../../../../platform/log/common/log.js';
-import { MainThreadExtensionServiceShape } from '../../common/extHost.protocol.js';
+import { MainThreadErrorsShape, MainThreadExtensionServiceShape } from '../../common/extHost.protocol.js';
 import { ExtensionPaths, IExtHostExtensionService } from '../../common/extHostExtensionService.js';
 import { IExtHostRpcService } from '../../common/extHostRpcService.js';
 import { IExtHostTelemetry } from '../../common/extHostTelemetry.js';
@@ -30,9 +30,12 @@ suite('ExtensionHostMain#ErrorHandler - Wrapping prepareStackTrace can cause slo
 	}
 
 	const extensionsIndex = TernarySearchTree.forUris<IExtensionDescription>();
-	const mainThreadExtensionsService = new class extends mock<MainThreadExtensionServiceShape>() {
+	const mainThreadExtensionsService = new class extends mock<MainThreadExtensionServiceShape>() implements MainThreadErrorsShape {
 		override $onExtensionRuntimeError(extensionId: ExtensionIdentifier, data: SerializedError): void {
 
+		}
+		$onUnexpectedError(err: any | SerializedError): void {
+
 		}
 	};
 

From 206033fd3f1cabff14b46e3ffdb3e5c487dd05a3 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Tue, 17 Dec 2024 15:36:20 +0100
Subject: [PATCH 303/479] drop code lenses with invalid/missing range (#236353)

https://github.com/microsoft/vscode/issues/233159
---
 src/vs/workbench/api/common/extHostLanguageFeatures.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/vs/workbench/api/common/extHostLanguageFeatures.ts b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
index cd42bd3bf77..9783b16e880 100644
--- a/src/vs/workbench/api/common/extHostLanguageFeatures.ts
+++ b/src/vs/workbench/api/common/extHostLanguageFeatures.ts
@@ -130,6 +130,12 @@ class CodeLensAdapter {
 			lenses: [],
 		};
 		for (let i = 0; i < lenses.length; i++) {
+
+			if (!Range.isRange(lenses[i].range)) {
+				console.warn('INVALID code lens, range is not defined', this._extension.identifier.value);
+				continue;
+			}
+
 			result.lenses.push({
 				cacheId: [cacheId, i],
 				range: typeConvert.Range.from(lenses[i].range),

From 317d55da7b91e07131403663d8aa6f9499e3a112 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Tue, 17 Dec 2024 16:08:13 +0100
Subject: [PATCH 304/479] Pressing alt/opt makes the hover temporarily sticky
 (#236356)

* add alt key to make hover temporarily sticky

* adding code
---
 .../hover/browser/contentHoverController.ts   | 39 ++++++++++++++++---
 .../browser/contentHoverWidgetWrapper.ts      | 26 ++++++++++---
 2 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/src/vs/editor/contrib/hover/browser/contentHoverController.ts b/src/vs/editor/contrib/hover/browser/contentHoverController.ts
index a3f67bb85f6..eec21e17259 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverController.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverController.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { DECREASE_HOVER_VERBOSITY_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID, SHOW_OR_FOCUS_HOVER_ACTION_ID } from './hoverActionIds.js';
-import { IKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
-import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { IKeyboardEvent, StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
 import { ICodeEditor, IEditorMouseEvent, IPartialEditorMouseEvent } from '../../../browser/editorBrowser.js';
 import { ConfigurationChangedEvent, EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
@@ -22,6 +22,9 @@ import { ContentHoverWidgetWrapper } from './contentHoverWidgetWrapper.js';
 import './hover.css';
 import { Emitter } from '../../../../base/common/event.js';
 import { isOnColorDecorator } from '../../colorPicker/browser/hoverColorPicker/hoverColorPicker.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { EventType } from '../../../../base/browser/dom.js';
+import { mainWindow } from '../../../../base/browser/window.js';
 
 // sticky hover widget which doesn't disappear on focus out and such
 const _sticky = false
@@ -92,11 +95,18 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 		this._listenersStore.add(this._editor.onMouseDown((e: IEditorMouseEvent) => this._onEditorMouseDown(e)));
 		this._listenersStore.add(this._editor.onMouseUp(() => this._onEditorMouseUp()));
 		this._listenersStore.add(this._editor.onMouseMove((e: IEditorMouseEvent) => this._onEditorMouseMove(e)));
-		this._listenersStore.add(this._editor.onKeyDown((e: IKeyboardEvent) => this._onKeyDown(e)));
 		this._listenersStore.add(this._editor.onMouseLeave((e) => this._onEditorMouseLeave(e)));
 		this._listenersStore.add(this._editor.onDidChangeModel(() => this._cancelSchedulerAndHide()));
 		this._listenersStore.add(this._editor.onDidChangeModelContent(() => this._cancelScheduler()));
 		this._listenersStore.add(this._editor.onDidScrollChange((e: IScrollEvent) => this._onEditorScrollChanged(e)));
+		const keyDownListener = (e: KeyboardEvent) => this._onKeyDown(e);
+		const keyUpListener = (e: KeyboardEvent) => this._onKeyUp(e);
+		mainWindow.addEventListener(EventType.KEY_DOWN, keyDownListener);
+		mainWindow.addEventListener(EventType.KEY_UP, keyUpListener);
+		this._listenersStore.add(toDisposable(() => {
+			mainWindow.removeEventListener(EventType.KEY_DOWN, keyDownListener);
+			mainWindow.removeEventListener(EventType.KEY_UP, keyUpListener);
+		}));
 	}
 
 	private _unhookListeners(): void {
@@ -155,6 +165,9 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 		if (_sticky) {
 			return;
 		}
+		if (this._contentWidget) {
+			this._contentWidget.temporarilySticky = false;
+		}
 		this.hideContentHover();
 	}
 
@@ -234,17 +247,31 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 		this.hideContentHover();
 	}
 
-	private _onKeyDown(e: IKeyboardEvent): void {
-		if (!this._editor.hasModel()) {
+	private _onKeyDown(e: KeyboardEvent): void {
+		if (!this._contentWidget) {
 			return;
 		}
-		const isPotentialKeyboardShortcut = this._isPotentialKeyboardShortcut(e);
+		const event = new StandardKeyboardEvent(e);
+		if (event.keyCode === KeyCode.Alt) {
+			this._contentWidget.temporarilySticky = true;
+		}
+		const isPotentialKeyboardShortcut = this._isPotentialKeyboardShortcut(event);
 		if (isPotentialKeyboardShortcut) {
 			return;
 		}
 		this.hideContentHover();
 	}
 
+	private _onKeyUp(e: KeyboardEvent): void {
+		if (!this._contentWidget) {
+			return;
+		}
+		const event = new StandardKeyboardEvent(e);
+		if (event.keyCode === KeyCode.Alt) {
+			this._contentWidget.temporarilySticky = false;
+		}
+	}
+
 	private _isPotentialKeyboardShortcut(e: IKeyboardEvent): boolean {
 		if (!this._editor.hasModel() || !this._contentWidget) {
 			return false;
diff --git a/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts b/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts
index ad9a9920967..228e9533d29 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts
@@ -27,6 +27,7 @@ export class ContentHoverWidgetWrapper extends Disposable implements IHoverWidge
 
 	private _currentResult: ContentHoverResult | null = null;
 	private _renderedContentHover: RenderedContentHover | undefined;
+	private _temporarilySticky: boolean = false;
 
 	private readonly _contentHoverWidget: ContentHoverWidget;
 	private readonly _participants: IEditorHoverParticipant[];
@@ -162,11 +163,25 @@ export class ContentHoverWidgetWrapper extends Disposable implements IHoverWidge
 		if (currentHoverResultIsEmpty) {
 			currentHoverResult = null;
 		}
+		const hoverVisible = this._contentHoverWidget.isVisible;
+		if (!hoverVisible) {
+			this._renderResult(currentHoverResult);
+		} else {
+			if (this._temporarilySticky) {
+				return;
+			} else {
+				this._renderResult(currentHoverResult);
+			}
+		}
+	}
+
+	private _renderResult(currentHoverResult: ContentHoverResult | null): void {
 		this._currentResult = currentHoverResult;
 		if (this._currentResult) {
 			this._showHover(this._currentResult);
 		} else {
-			this._hideHover();
+			this._contentHoverWidget.hide();
+			this._participants.forEach(participant => participant.handleHide?.());
 		}
 	}
 
@@ -215,11 +230,6 @@ export class ContentHoverWidgetWrapper extends Disposable implements IHoverWidge
 		}
 	}
 
-	private _hideHover(): void {
-		this._contentHoverWidget.hide();
-		this._participants.forEach(participant => participant.handleHide?.());
-	}
-
 	private _getHoverContext(): IEditorHoverContext {
 		const hide = () => {
 			this.hide();
@@ -293,6 +303,10 @@ export class ContentHoverWidgetWrapper extends Disposable implements IHoverWidge
 		}
 	}
 
+	public set temporarilySticky(value: boolean) {
+		this._temporarilySticky = value;
+	}
+
 	public startShowingAtRange(range: Range, mode: HoverStartMode, source: HoverStartSource, focus: boolean): void {
 		this._startShowingOrUpdateHover(new HoverRangeAnchor(0, range, undefined, undefined), mode, source, focus, null);
 	}

From 538412ba9def08421a42e7880bdbd31803dbb88c Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Tue, 17 Dec 2024 16:15:26 +0100
Subject: [PATCH 305/479] Diff - manually revert
 854108f7d2a8b40aa1ac0390f95088e61153ebc5 (#236355)

---
 .../diffEditor/components/diffEditorEditors.ts     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.ts b/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.ts
index 5d8f652a485..638c9fe8bd5 100644
--- a/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.ts
+++ b/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.ts
@@ -19,6 +19,7 @@ import { localize } from '../../../../../nls.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
 import { DiffEditorOptions } from '../diffEditorOptions.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 
 export class DiffEditorEditors extends Disposable {
 	public readonly original = this._register(this._createLeftHandSideEditor(this._options.editorOptions.get(), this._argCodeEditorWidgetOptions.originalEditor || {}));
@@ -51,6 +52,7 @@ export class DiffEditorEditors extends Disposable {
 		private readonly _options: DiffEditorOptions,
 		private _argCodeEditorWidgetOptions: IDiffCodeEditorWidgetOptions,
 		private readonly _createInnerEditor: (instantiationService: IInstantiationService, container: HTMLElement, options: Readonly<IEditorOptions>, editorWidgetOptions: ICodeEditorWidgetOptions) => CodeEditorWidget,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService
 	) {
@@ -80,14 +82,22 @@ export class DiffEditorEditors extends Disposable {
 	private _createLeftHandSideEditor(options: Readonly<IDiffEditorConstructionOptions>, codeEditorWidgetOptions: ICodeEditorWidgetOptions): CodeEditorWidget {
 		const leftHandSideOptions = this._adjustOptionsForLeftHandSide(undefined, options);
 		const editor = this._constructInnerEditor(this._instantiationService, this.originalEditorElement, leftHandSideOptions, codeEditorWidgetOptions);
-		editor.setContextValue('isInDiffLeftEditor', true);
+
+		const isInDiffLeftEditorKey = this._contextKeyService.createKey<boolean>('isInDiffLeftEditor', editor.hasWidgetFocus());
+		this._register(editor.onDidFocusEditorWidget(() => isInDiffLeftEditorKey.set(true)));
+		this._register(editor.onDidBlurEditorWidget(() => isInDiffLeftEditorKey.set(false)));
+
 		return editor;
 	}
 
 	private _createRightHandSideEditor(options: Readonly<IDiffEditorConstructionOptions>, codeEditorWidgetOptions: ICodeEditorWidgetOptions): CodeEditorWidget {
 		const rightHandSideOptions = this._adjustOptionsForRightHandSide(undefined, options);
 		const editor = this._constructInnerEditor(this._instantiationService, this.modifiedEditorElement, rightHandSideOptions, codeEditorWidgetOptions);
-		editor.setContextValue('isInDiffRightEditor', true);
+
+		const isInDiffRightEditorKey = this._contextKeyService.createKey<boolean>('isInDiffRightEditor', editor.hasWidgetFocus());
+		this._register(editor.onDidFocusEditorWidget(() => isInDiffRightEditorKey.set(true)));
+		this._register(editor.onDidBlurEditorWidget(() => isInDiffRightEditorKey.set(false)));
+
 		return editor;
 	}
 

From 0acab1b9b56310c5578ef540a9028a53be98af09 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Tue, 17 Dec 2024 16:20:39 +0100
Subject: [PATCH 306/479] Fixes #11380 (#236352)

Adjusts zIndex. Fixes microsoft/vscode-copilot#11380
---
 .../browser/view/inlineEdits/sideBySideDiff.ts                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
index b2cd7d9ef56..d36ae86f085 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
@@ -601,7 +601,7 @@ export class InlineEditsSideBySideDiff extends Disposable {
 		class: 'inline-edits-view',
 		style: {
 			overflow: 'visible',
-			zIndex: '100',
+			zIndex: '10',
 			display: this._display,
 		},
 	}, [

From f76df5bbe6c21bccd7a666043c05f68ac6d32dbd Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Tue, 17 Dec 2024 16:24:47 +0100
Subject: [PATCH 307/479] Fixes #11376 (#236358)

---
 .../browser/view/inlineEdits/sideBySideDiff.ts                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
index d36ae86f085..0df68982f14 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
@@ -412,7 +412,7 @@ export class InlineEditsSideBySideDiff extends Disposable {
 		const codeEditDist = codeEditDistRange.clip(dist);
 		const editHeight = this._editor.getOption(EditorOption.lineHeight) * inlineEdit.modifiedLineRange.length;
 
-		const previewEditorWidth = remainingWidthRightOfEditor + editorLayout.width - editorLayout.contentLeft - codeEditDist;
+		const previewEditorWidth = Math.min(previewContentWidth, remainingWidthRightOfEditor + editorLayout.width - editorLayout.contentLeft - codeEditDist);
 
 		const edit1 = new Point(left + codeEditDist, selectionTop);
 		const edit2 = new Point(left + codeEditDist, selectionTop + editHeight);

From 92965da2b8f50ef4f3109ca2d1c58f26d7bff79c Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Tue, 17 Dec 2024 16:29:06 +0100
Subject: [PATCH 308/479] When tab is pressed when content widget is focused,
 do not hide the hover (#236360)

when tab is pressed when content widget is focused, do not hide the hover
---
 src/vs/editor/contrib/hover/browser/contentHoverController.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/vs/editor/contrib/hover/browser/contentHoverController.ts b/src/vs/editor/contrib/hover/browser/contentHoverController.ts
index eec21e17259..09cb6efcab4 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverController.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverController.ts
@@ -259,6 +259,9 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 		if (isPotentialKeyboardShortcut) {
 			return;
 		}
+		if (this._contentWidget.isFocused && event.keyCode === KeyCode.Tab) {
+			return;
+		}
 		this.hideContentHover();
 	}
 

From 36d8719a8e34fd831ace3960d63d35e320b9b92b Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Tue, 17 Dec 2024 16:37:16 +0100
Subject: [PATCH 309/479] SCM Input - respect `editor.emptySelectionClipboard`
 setting (#236361)

---
 src/vs/workbench/contrib/scm/browser/scmViewPane.ts | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
index fd25da9f13c..8a05bb6c06f 100644
--- a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+++ b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -1477,6 +1477,7 @@ class SCMInputWidgetEditorOptions {
 			e => {
 				return e.affectsConfiguration('editor.accessibilitySupport') ||
 					e.affectsConfiguration('editor.cursorBlinking') ||
+					e.affectsConfiguration('editor.emptySelectionClipboard') ||
 					e.affectsConfiguration('editor.fontFamily') ||
 					e.affectsConfiguration('editor.rulers') ||
 					e.affectsConfiguration('editor.wordWrap') ||
@@ -1490,21 +1491,14 @@ class SCMInputWidgetEditorOptions {
 	}
 
 	getEditorConstructionOptions(): IEditorConstructionOptions {
-		const fontFamily = this._getEditorFontFamily();
-		const fontSize = this._getEditorFontSize();
-		const lineHeight = this._getEditorLineHeight(fontSize);
-
 		return {
 			...getSimpleEditorOptions(this.configurationService),
-			...this._getEditorLanguageConfiguration(),
+			...this.getEditorOptions(),
 			cursorWidth: 1,
 			dragAndDrop: true,
 			dropIntoEditor: { enabled: true },
-			fontFamily: fontFamily,
-			fontSize: fontSize,
 			formatOnType: true,
 			lineDecorationsWidth: 6,
-			lineHeight: lineHeight,
 			overflowWidgetsDomNode: this.overflowWidgetsDomNode,
 			padding: { top: 2, bottom: 2 },
 			quickSuggestions: false,
@@ -1524,8 +1518,9 @@ class SCMInputWidgetEditorOptions {
 		const lineHeight = this._getEditorLineHeight(fontSize);
 		const accessibilitySupport = this.configurationService.getValue<'auto' | 'off' | 'on'>('editor.accessibilitySupport');
 		const cursorBlinking = this.configurationService.getValue<'blink' | 'smooth' | 'phase' | 'expand' | 'solid'>('editor.cursorBlinking');
+		const emptySelectionClipboard = this.configurationService.getValue<boolean>('editor.emptySelectionClipboard') === true;
 
-		return { ...this._getEditorLanguageConfiguration(), accessibilitySupport, cursorBlinking, fontFamily, fontSize, lineHeight };
+		return { ...this._getEditorLanguageConfiguration(), accessibilitySupport, cursorBlinking, fontFamily, fontSize, lineHeight, emptySelectionClipboard };
 	}
 
 	private _getEditorFontFamily(): string {

From 422927459007119b4c5bde6dea39b34eefb314ae Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Tue, 17 Dec 2024 16:49:21 +0100
Subject: [PATCH 310/479] Fixes
 https://github.com/microsoft/vscode-copilot/issues/11377 (#236362)

---
 .../view/inlineEdits/sideBySideDiff.ts        | 21 ++++++++++++++++---
 .../browser/view/inlineEdits/utils.ts         |  9 +++++++-
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
index 0df68982f14..d58c42f83f9 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
@@ -8,7 +8,7 @@ import { IAction } from '../../../../../../base/common/actions.js';
 import { Color } from '../../../../../../base/common/color.js';
 import { structuralEquals } from '../../../../../../base/common/equals.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { IObservable, autorun, constObservable, derived, derivedOpts, observableFromEvent, observableValue } from '../../../../../../base/common/observable.js';
+import { IObservable, autorun, constObservable, derived, derivedObservableWithCache, derivedOpts, observableFromEvent, observableValue } from '../../../../../../base/common/observable.js';
 import { MenuId, MenuItemAction } from '../../../../../../platform/actions/common/actions.js';
 import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
@@ -335,6 +335,22 @@ export class InlineEditsSideBySideDiff extends Disposable {
 	private readonly _originalVerticalStartPosition = this._editorObs.observePosition(this._originalStartPosition, this._store).map(p => p?.y);
 	private readonly _originalVerticalEndPosition = this._editorObs.observePosition(this._originalEndPosition, this._store).map(p => p?.y);
 
+	private readonly _originalDisplayRange = this._uiState.map(s => s?.originalDisplayRange);
+	private readonly _editorMaxContentWidthInRange = derived(this, reader => {
+		const originalDisplayRange = this._originalDisplayRange.read(reader);
+		if (!originalDisplayRange) {
+			return constObservable(0);
+		}
+		this._editorObs.versionId.read(reader);
+
+		// Take the max value that we observed.
+		// Reset when either the edit changes or the editor text version.
+		return derivedObservableWithCache<number>(this, (reader, lastValue) => {
+			const maxWidth = maxContentWidthInRange(this._editorObs, originalDisplayRange, reader);
+			return Math.max(maxWidth, lastValue ?? 0);
+		});
+	}).map((v, r) => v.read(r));
+
 	/**
 	 * ![test](./layout.dio.svg)
 	*/
@@ -352,7 +368,7 @@ export class InlineEditsSideBySideDiff extends Disposable {
 
 		const horizontalScrollOffset = this._editorObs.scrollLeft.read(reader);
 
-		const editorContentMaxWidthInRange = maxContentWidthInRange(this._editorObs, state.originalDisplayRange, reader);
+		const editorContentMaxWidthInRange = this._editorMaxContentWidthInRange.read(reader);
 		const editorLayout = this._editorObs.layoutInfo.read(reader);
 		const previewContentWidth = this._previewEditorWidth.read(reader);
 		const editorContentAreaWidth = editorLayout.contentWidth - editorLayout.verticalScrollbarWidth;
@@ -389,7 +405,6 @@ export class InlineEditsSideBySideDiff extends Disposable {
 		} else {
 			desiredPreviewEditorScrollLeft = horizontalScrollOffset - previewEditorLeftInTextArea;
 			left = editorLayout.contentLeft;
-
 		}
 
 		const selectionTop = this._originalVerticalStartPosition.read(reader) ?? this._editor.getTopForLineNumber(range.startLineNumber) - this._editorObs.scrollTop.read(reader);
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
index af375cca816..d9928a05b2e 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
@@ -16,6 +16,7 @@ import { URI } from '../../../../../../base/common/uri.js';
 import { MenuEntryActionViewItem } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { ObservableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
 import { Point } from '../../../../../browser/point.js';
+import { EditorOption } from '../../../../../common/config/editorOptions.js';
 import { LineRange } from '../../../../../common/core/lineRange.js';
 import { OffsetRange } from '../../../../../common/core/offsetRange.js';
 import { Position } from '../../../../../common/core/position.js';
@@ -34,7 +35,13 @@ export function maxContentWidthInRange(editor: ObservableCodeEditor, range: Line
 	editor.scrollTop.read(reader);
 	for (let i = range.startLineNumber; i < range.endLineNumberExclusive; i++) {
 		const column = model.getLineMaxColumn(i);
-		const lineContentWidth = editor.editor.getOffsetForColumn(i, column);
+		let lineContentWidth = editor.editor.getOffsetForColumn(i, column);
+		if (lineContentWidth === -1) {
+			// approximation
+			const typicalHalfwidthCharacterWidth = editor.editor.getOption(EditorOption.fontInfo).typicalHalfwidthCharacterWidth;
+			const approximation = column * typicalHalfwidthCharacterWidth;
+			lineContentWidth = approximation;
+		}
 		maxContentWidth = Math.max(maxContentWidth, lineContentWidth);
 	}
 	const lines = range.mapToLineArray(l => model.getLineContent(l));

From 68410e1431f9849547b67d0b38dbc76cdb4aa3c8 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Tue, 17 Dec 2024 17:03:46 +0100
Subject: [PATCH 311/479] Fixes
 https://github.com/microsoft/vscode-copilot/issues/9375 (#236363)

---
 .../browser/model/inlineCompletionsModel.ts                  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
index 65201933d14..b2669bdf25f 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
@@ -227,6 +227,7 @@ export class InlineCompletionsModel extends Disposable {
 				this._onlyRequestInlineEditsSignal.trigger(tx);
 			}
 			this._isActive.set(true, tx);
+			this._inAcceptFlow.set(true, tx);
 			this._forceUpdateExplicitlySignal.trigger(tx);
 		});
 		await this._fetchInlineCompletionsPromise.get();
@@ -480,6 +481,10 @@ export class InlineCompletionsModel extends Disposable {
 	});
 
 	private readonly _tabShouldIndent = derived(this, reader => {
+		if (this._inAcceptFlow.read(reader)) {
+			return false;
+		}
+
 		function isMultiLine(range: Range): boolean {
 			return range.startLineNumber !== range.endLineNumber;
 		}

From 639c4c8d1e63eb05f4061202e65311ec6ea4a940 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Tue, 17 Dec 2024 17:57:23 +0100
Subject: [PATCH 312/479] Make title bar and command center visible when
 actions are enabled (#236369)

Make title bar and or command center visible when actions are enabled in title bar
---
 src/vs/workbench/browser/layout.ts | 37 ++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index b60d2864283..84e2eaadb3c 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -116,12 +116,18 @@ interface IInitialEditorsState {
 	readonly layout?: EditorGroupLayout;
 }
 
+const COMMAND_CENTER_SETTINGS = [
+	'chat.commandCenter.enabled',
+	'workbench.navigationControl.enabled',
+	'workbench.experimental.share.enabled',
+];
+
 export const TITLE_BAR_SETTINGS = [
 	LayoutSettings.ACTIVITY_BAR_LOCATION,
 	LayoutSettings.COMMAND_CENTER,
+	...COMMAND_CENTER_SETTINGS,
 	LayoutSettings.EDITOR_ACTIONS_LOCATION,
 	LayoutSettings.LAYOUT_ACTIONS,
-	'workbench.navigationControl.enabled',
 	'window.menuBarVisibility',
 	TitleBarSetting.TITLE_BAR_STYLE,
 	TitleBarSetting.CUSTOM_TITLE_BAR_VISIBILITY,
@@ -355,18 +361,31 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 				LegacyWorkbenchLayoutSettings.SIDEBAR_POSITION,
 				LegacyWorkbenchLayoutSettings.STATUSBAR_VISIBLE,
 			].some(setting => e.affectsConfiguration(setting))) {
-				// Show Custom TitleBar if actions moved to the titlebar
-				const editorActionsMovedToTitlebar = e.affectsConfiguration(LayoutSettings.EDITOR_ACTIONS_LOCATION) && this.configurationService.getValue<EditorActionsLocation>(LayoutSettings.EDITOR_ACTIONS_LOCATION) === EditorActionsLocation.TITLEBAR;
-
-				let activityBarMovedToTopOrBottom = false;
-				if (e.affectsConfiguration(LayoutSettings.ACTIVITY_BAR_LOCATION)) {
-					const activityBarPosition = this.configurationService.getValue<ActivityBarPosition>(LayoutSettings.ACTIVITY_BAR_LOCATION);
-					activityBarMovedToTopOrBottom = activityBarPosition === ActivityBarPosition.TOP || activityBarPosition === ActivityBarPosition.BOTTOM;
+				// Show Command Center if command center actions enabled
+				const shareEnabled = e.affectsConfiguration('workbench.experimental.share.enabled') && this.configurationService.getValue<boolean>('workbench.experimental.share.enabled');
+				const navigationControlEnabled = e.affectsConfiguration('workbench.navigationControl.enabled') && this.configurationService.getValue<boolean>('workbench.navigationControl.enabled');
+
+				// Currently not supported for "chat.commandCenter.enabled" as we
+				// programatically set this during setup and could lead to unwanted titlebar appearing
+				// const chatControlsEnabled = e.affectsConfiguration('chat.commandCenter.enabled') && this.configurationService.getValue<boolean>('chat.commandCenter.enabled');
+
+				if (shareEnabled || navigationControlEnabled) {
+					if (this.configurationService.getValue<boolean>(LayoutSettings.COMMAND_CENTER) === false) {
+						this.configurationService.updateValue(LayoutSettings.COMMAND_CENTER, true);
+						return; // onDidChangeConfiguration will be triggered again
+					}
 				}
 
-				if (activityBarMovedToTopOrBottom || editorActionsMovedToTitlebar) {
+				// Show Custom TitleBar if actions enabled in (or moved to) the titlebar
+				const editorActionsMovedToTitlebar = e.affectsConfiguration(LayoutSettings.EDITOR_ACTIONS_LOCATION) && this.configurationService.getValue<EditorActionsLocation>(LayoutSettings.EDITOR_ACTIONS_LOCATION) === EditorActionsLocation.TITLEBAR;
+				const commandCenterEnabled = e.affectsConfiguration(LayoutSettings.COMMAND_CENTER) && this.configurationService.getValue<boolean>(LayoutSettings.COMMAND_CENTER);
+				const layoutControlsEnabled = e.affectsConfiguration(LayoutSettings.LAYOUT_ACTIONS) && this.configurationService.getValue<boolean>(LayoutSettings.LAYOUT_ACTIONS);
+				const activityBarMovedToTopOrBottom = e.affectsConfiguration(LayoutSettings.ACTIVITY_BAR_LOCATION) && [ActivityBarPosition.TOP, ActivityBarPosition.BOTTOM].includes(this.configurationService.getValue<ActivityBarPosition>(LayoutSettings.ACTIVITY_BAR_LOCATION));
+
+				if (activityBarMovedToTopOrBottom || editorActionsMovedToTitlebar || commandCenterEnabled || layoutControlsEnabled) {
 					if (this.configurationService.getValue<CustomTitleBarVisibility>(TitleBarSetting.CUSTOM_TITLE_BAR_VISIBILITY) === CustomTitleBarVisibility.NEVER) {
 						this.configurationService.updateValue(TitleBarSetting.CUSTOM_TITLE_BAR_VISIBILITY, CustomTitleBarVisibility.AUTO);
+						return; // onDidChangeConfiguration will be triggered again
 					}
 				}
 

From b4c9953da47ea1a2061397303db782bd67040fb7 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Tue, 17 Dec 2024 11:10:39 -0600
Subject: [PATCH 313/479] request folders/files when appropriate (#236370)

fix #236368
---
 .../src/terminalSuggestMain.ts                | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index 5071c4c79ce..4acd5b59f8a 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -328,16 +328,6 @@ export async function getCompletionItemsFromSpecs(specs: Fig.Spec[], terminalCon
 			}
 		}
 	}
-	const shouldShowCommands = !terminalContext.commandLine.substring(0, terminalContext.cursorPosition).trimStart().includes(' ');
-	if (shouldShowCommands && (filesRequested === foldersRequested)) {
-		// Include builitin/available commands in the results
-		const labels = new Set(items.map(i => i.label));
-		for (const command of availableCommands) {
-			if (!labels.has(command)) {
-				items.push(createCompletionItem(terminalContext.cursorPosition, prefix, command));
-			}
-		}
-	}
 
 	const shouldShowResourceCompletions =
 		(
@@ -351,6 +341,17 @@ export async function getCompletionItemsFromSpecs(specs: Fig.Spec[], terminalCon
 		// and neither files nor folders are going to be requested (for a specific spec's argument)
 		&& (!filesRequested && !foldersRequested);
 
+	const shouldShowCommands = !terminalContext.commandLine.substring(0, terminalContext.cursorPosition).trimStart().includes(' ');
+	if (shouldShowCommands && (filesRequested === foldersRequested)) {
+		// Include builitin/available commands in the results
+		const labels = new Set(items.map(i => i.label));
+		for (const command of availableCommands) {
+			if (!labels.has(command)) {
+				items.push(createCompletionItem(terminalContext.cursorPosition, prefix, command));
+			}
+		}
+	}
+
 	if (shouldShowResourceCompletions) {
 		filesRequested = true;
 		foldersRequested = true;

From d12587c914bebf0e7e878ed9d7eeb5d4fbd9d7cd Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 17 Dec 2024 09:24:26 -0800
Subject: [PATCH 314/479] Fix windows test

---
 .../test/browser/services/decorationRenderOptions.test.ts       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/test/browser/services/decorationRenderOptions.test.ts b/src/vs/editor/test/browser/services/decorationRenderOptions.test.ts
index 9608d1d779a..ef5cd93a887 100644
--- a/src/vs/editor/test/browser/services/decorationRenderOptions.test.ts
+++ b/src/vs/editor/test/browser/services/decorationRenderOptions.test.ts
@@ -125,7 +125,7 @@ suite('Decoration Render Options', () => {
 		if (platform.isWindows) {
 			// windows file path (used as string)
 			s.registerDecorationType('test', 'example', { gutterIconPath: URI.file('c:\\files\\miles\\more.png') });
-			assertBackground('file:///c:/files/miles/more.png', 'vscode-file://vscode-app/c:/files/miles/more.png');
+			assertBackground(CSS.escape('file:///c:/files/miles/more.png'), CSS.escape('vscode-file://vscode-app/c:/files/miles/more.png'));
 			s.removeDecorationType('example');
 
 			// single quote must always be escaped/encoded

From da1d8b9c8e1daaa9c9b7c4bd86590e7d374d3f29 Mon Sep 17 00:00:00 2001
From: Parasaran <v.parasaran@gmail.com>
Date: Tue, 17 Dec 2024 22:57:12 +0530
Subject: [PATCH 315/479] fix 235221: Passing the markdown content to the
 webview via meta tag and purifying it before use

---
 extensions/markdown-language-features/preview-src/index.ts  | 6 ++++++
 .../src/preview/documentRenderer.ts                         | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/extensions/markdown-language-features/preview-src/index.ts b/extensions/markdown-language-features/preview-src/index.ts
index 33c84e0a384..d7fa1f18d76 100644
--- a/extensions/markdown-language-features/preview-src/index.ts
+++ b/extensions/markdown-language-features/preview-src/index.ts
@@ -353,6 +353,12 @@ document.addEventListener('click', event => {
 	}
 }, true);
 
+window.addEventListener('load', () => {
+	const htmlParser = new DOMParser();
+	const markDownHtml = htmlParser.parseFromString(getData('data-md-content'), 'text/html');
+	document.body.appendChild(markDownHtml.body);
+});
+
 window.addEventListener('scroll', throttle(() => {
 	updateScrollProgress();
 
diff --git a/extensions/markdown-language-features/src/preview/documentRenderer.ts b/extensions/markdown-language-features/src/preview/documentRenderer.ts
index 331fb5566a0..f2447532e00 100644
--- a/extensions/markdown-language-features/src/preview/documentRenderer.ts
+++ b/extensions/markdown-language-features/src/preview/documentRenderer.ts
@@ -98,13 +98,13 @@ export class MdDocumentRenderer {
 				<meta id="vscode-markdown-preview-data"
 					data-settings="${escapeAttribute(JSON.stringify(initialData))}"
 					data-strings="${escapeAttribute(JSON.stringify(previewStrings))}"
-					data-state="${escapeAttribute(JSON.stringify(state || {}))}">
+					data-state="${escapeAttribute(JSON.stringify(state || {}))}"
+					data-md-content="${escapeAttribute(JSON.stringify(body.html))}">
 				<script src="${this._extensionResourcePath(resourceProvider, 'pre.js')}" nonce="${nonce}"></script>
 				${this._getStyles(resourceProvider, sourceUri, config, imageInfo)}
 				<base href="${resourceProvider.asWebviewUri(markdownDocument.uri)}">
 			</head>
 			<body class="vscode-body ${config.scrollBeyondLastLine ? 'scrollBeyondLastLine' : ''} ${config.wordWrap ? 'wordWrap' : ''} ${config.markEditorSelection ? 'showEditorSelection' : ''}">
-				${body.html}
 				${this._getScripts(resourceProvider, nonce)}
 			</body>
 			</html>`;

From 330ab6c2928963dd83a7d90a271d9f2eb8db90d2 Mon Sep 17 00:00:00 2001
From: Tony <68118705+Legend-Master@users.noreply.github.com>
Date: Wed, 18 Dec 2024 01:50:35 +0800
Subject: [PATCH 316/479] Reland fix custom task shell doesn't work without
 manually passing in "run command" arg/flag (#236058)

---
 src/vs/platform/terminal/common/terminal.ts   |  1 +
 .../tasks/browser/terminalTaskSystem.ts       | 33 +++++++++++--------
 .../browser/terminalProfileResolverService.ts |  1 +
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/vs/platform/terminal/common/terminal.ts b/src/vs/platform/terminal/common/terminal.ts
index c638fb625a2..8235e8a0ab4 100644
--- a/src/vs/platform/terminal/common/terminal.ts
+++ b/src/vs/platform/terminal/common/terminal.ts
@@ -871,6 +871,7 @@ export interface ITerminalProfile {
 	overrideName?: boolean;
 	color?: string;
 	icon?: ThemeIcon | URI | { light: URI; dark: URI };
+	isAutomationShell?: boolean;
 }
 
 export interface ITerminalDimensionsOverride extends Readonly<ITerminalDimensions> {
diff --git a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
index e44eaa47cf9..3b2c1e51c7f 100644
--- a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
+++ b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
@@ -1112,7 +1112,6 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 				color: task.configurationProperties.icon?.color || undefined,
 				waitOnExit
 			};
-			let shellSpecified: boolean = false;
 			const shellOptions: IShellConfiguration | undefined = task.command.options && task.command.options.shell;
 			if (shellOptions) {
 				if (shellOptions.executable) {
@@ -1121,12 +1120,12 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 						shellLaunchConfig.args = undefined;
 					}
 					shellLaunchConfig.executable = await this._resolveVariable(variableResolver, shellOptions.executable);
-					shellSpecified = true;
 				}
 				if (shellOptions.args) {
 					shellLaunchConfig.args = await this._resolveVariables(variableResolver, shellOptions.args.slice());
 				}
 			}
+			const taskShellArgsSpecified = (defaultProfile.isAutomationShell ? shellLaunchConfig.args : shellOptions?.args) !== undefined;
 			if (shellLaunchConfig.args === undefined) {
 				shellLaunchConfig.args = [];
 			}
@@ -1139,29 +1138,34 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 				windowsShellArgs = true;
 				// If we don't have a cwd, then the terminal uses the home dir.
 				const userHome = await this._pathService.userHome();
-				if (basename === 'cmd.exe' && ((options.cwd && isUNC(options.cwd)) || (!options.cwd && isUNC(userHome.fsPath)))) {
-					return undefined;
-				}
-				if ((basename === 'powershell.exe') || (basename === 'pwsh.exe')) {
-					if (!shellSpecified) {
+				if (basename === 'cmd.exe') {
+					if ((options.cwd && isUNC(options.cwd)) || (!options.cwd && isUNC(userHome.fsPath))) {
+						return undefined;
+					}
+					if (!taskShellArgsSpecified) {
+						toAdd.push('/d', '/c');
+					}
+				} else if ((basename === 'powershell.exe') || (basename === 'pwsh.exe')) {
+					if (!taskShellArgsSpecified) {
 						toAdd.push('-Command');
 					}
 				} else if ((basename === 'bash.exe') || (basename === 'zsh.exe')) {
 					windowsShellArgs = false;
-					if (!shellSpecified) {
+					if (!taskShellArgsSpecified) {
 						toAdd.push('-c');
 					}
 				} else if (basename === 'wsl.exe') {
-					if (!shellSpecified) {
+					if (!taskShellArgsSpecified) {
 						toAdd.push('-e');
 					}
 				} else {
-					if (!shellSpecified) {
-						toAdd.push('/d', '/c');
+					if (!taskShellArgsSpecified) {
+						// Push `-c` for unknown shells if the user didn't specify the args
+						toAdd.push('-c');
 					}
 				}
 			} else {
-				if (!shellSpecified) {
+				if (!taskShellArgsSpecified) {
 					// Under Mac remove -l to not start it as a login shell.
 					if (platform === Platform.Platform.Mac) {
 						// Background on -l on osx https://github.com/microsoft/vscode/issues/107563
@@ -1268,11 +1272,12 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 		const combinedShellArgs: string[] = Objects.deepClone(configuredShellArgs);
 		shellCommandArgs.forEach(element => {
 			const shouldAddShellCommandArg = configuredShellArgs.every((arg, index) => {
-				if ((arg.toLowerCase() === element) && (configuredShellArgs.length > index + 1)) {
+				const isDuplicated = arg.toLowerCase() === element.toLowerCase();
+				if (isDuplicated && (configuredShellArgs.length > index + 1)) {
 					// We can still add the argument, but only if not all of the following arguments begin with "-".
 					return !configuredShellArgs.slice(index + 1).every(testArg => testArg.startsWith('-'));
 				} else {
-					return arg.toLowerCase() !== element;
+					return !isDuplicated;
 				}
 			});
 			if (shouldAddShellCommandArg) {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts b/src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts
index 6208cfc0413..e54a12a1b44 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts
@@ -268,6 +268,7 @@ export abstract class BaseTerminalProfileResolverService extends Disposable impl
 		const automationProfile = this._configurationService.getValue(`terminal.integrated.automationProfile.${this._getOsKey(options.os)}`);
 		if (this._isValidAutomationProfile(automationProfile, options.os)) {
 			automationProfile.icon = this._getCustomIcon(automationProfile.icon) || Codicon.tools;
+			automationProfile.isAutomationShell = true;
 			return automationProfile;
 		}
 

From ca721227517f2ad0f737f0fde18df588beb96c67 Mon Sep 17 00:00:00 2001
From: Parasaran <v.parasaran@gmail.com>
Date: Tue, 17 Dec 2024 23:32:42 +0530
Subject: [PATCH 317/479] fix 235221: Encode and decode markdown content to
 escape illegal chars

---
 extensions/markdown-language-features/preview-src/index.ts   | 5 ++++-
 .../src/preview/documentRenderer.ts                          | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/extensions/markdown-language-features/preview-src/index.ts b/extensions/markdown-language-features/preview-src/index.ts
index d7fa1f18d76..336245a1fdf 100644
--- a/extensions/markdown-language-features/preview-src/index.ts
+++ b/extensions/markdown-language-features/preview-src/index.ts
@@ -355,7 +355,10 @@ document.addEventListener('click', event => {
 
 window.addEventListener('load', () => {
 	const htmlParser = new DOMParser();
-	const markDownHtml = htmlParser.parseFromString(getData('data-md-content'), 'text/html');
+	const markDownHtml = htmlParser.parseFromString(
+		decodeURIComponent(getData('data-md-content')),
+		'text/html'
+	);
 	document.body.appendChild(markDownHtml.body);
 });
 
diff --git a/extensions/markdown-language-features/src/preview/documentRenderer.ts b/extensions/markdown-language-features/src/preview/documentRenderer.ts
index f2447532e00..13e709c765f 100644
--- a/extensions/markdown-language-features/src/preview/documentRenderer.ts
+++ b/extensions/markdown-language-features/src/preview/documentRenderer.ts
@@ -99,7 +99,7 @@ export class MdDocumentRenderer {
 					data-settings="${escapeAttribute(JSON.stringify(initialData))}"
 					data-strings="${escapeAttribute(JSON.stringify(previewStrings))}"
 					data-state="${escapeAttribute(JSON.stringify(state || {}))}"
-					data-md-content="${escapeAttribute(JSON.stringify(body.html))}">
+					data-md-content="${escapeAttribute(JSON.stringify(encodeURIComponent(body.html)))}">
 				<script src="${this._extensionResourcePath(resourceProvider, 'pre.js')}" nonce="${nonce}"></script>
 				${this._getStyles(resourceProvider, sourceUri, config, imageInfo)}
 				<base href="${resourceProvider.asWebviewUri(markdownDocument.uri)}">

From dfa26a2c5698f8bb8b0bb504d8cbc0207762dc4b Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Tue, 17 Dec 2024 19:39:48 +0100
Subject: [PATCH 318/479] Adjusts zIndex for notebooks. (#236380)

---
 .../browser/view/inlineEdits/sideBySideDiff.ts                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
index d58c42f83f9..a64c52dcd90 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
@@ -616,7 +616,7 @@ export class InlineEditsSideBySideDiff extends Disposable {
 		class: 'inline-edits-view',
 		style: {
 			overflow: 'visible',
-			zIndex: '10',
+			zIndex: '20',
 			display: this._display,
 		},
 	}, [

From 625bae23758002b62954fd10b53d25409421d718 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Tue, 17 Dec 2024 19:44:54 +0100
Subject: [PATCH 319/479] debt: clean up obsolete file usage (#236379)

- remove it from scanner, with profiles reading this file is not needed
- rename it usage for removal in management service
---
 .../common/extensionManagement.ts             |   4 +-
 .../common/extensionsScannerService.ts        |  51 ++----
 .../node/extensionManagementService.ts        | 163 +++++++++---------
 .../node/extensionsWatcher.ts                 |  20 +--
 .../node/extensionsScannerService.test.ts     |  33 +---
 5 files changed, 115 insertions(+), 156 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index 155079831fc..f08b46ae65b 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -456,8 +456,8 @@ export const enum ExtensionManagementErrorCode {
 	Extract = 'Extract',
 	Scanning = 'Scanning',
 	ScanningExtension = 'ScanningExtension',
-	ReadUninstalled = 'ReadUninstalled',
-	UnsetUninstalled = 'UnsetUninstalled',
+	ReadRemoved = 'ReadRemoved',
+	UnsetRemoved = 'UnsetRemoved',
 	Delete = 'Delete',
 	Rename = 'Rename',
 	IntializeDefaultProfile = 'IntializeDefaultProfile',
diff --git a/src/vs/platform/extensionManagement/common/extensionsScannerService.ts b/src/vs/platform/extensionManagement/common/extensionsScannerService.ts
index 99868cddb5d..a186b6fa045 100644
--- a/src/vs/platform/extensionManagement/common/extensionsScannerService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionsScannerService.ts
@@ -7,7 +7,6 @@ import { coalesce } from '../../../base/common/arrays.js';
 import { ThrottledDelayer } from '../../../base/common/async.js';
 import * as objects from '../../../base/common/objects.js';
 import { VSBuffer } from '../../../base/common/buffer.js';
-import { IStringDictionary } from '../../../base/common/collections.js';
 import { getErrorMessage } from '../../../base/common/errors.js';
 import { getNodeType, parse, ParseError } from '../../../base/common/json.js';
 import { getParseErrorMessage } from '../../../base/common/jsonErrorMessages.js';
@@ -18,12 +17,11 @@ import * as platform from '../../../base/common/platform.js';
 import { basename, isEqual, joinPath } from '../../../base/common/resources.js';
 import * as semver from '../../../base/common/semver/semver.js';
 import Severity from '../../../base/common/severity.js';
-import { isEmptyObject } from '../../../base/common/types.js';
 import { URI } from '../../../base/common/uri.js';
 import { localize } from '../../../nls.js';
 import { IEnvironmentService } from '../../environment/common/environment.js';
 import { IProductVersion, Metadata } from './extensionManagement.js';
-import { areSameExtensions, computeTargetPlatform, ExtensionKey, getExtensionId, getGalleryExtensionId } from './extensionManagementUtil.js';
+import { areSameExtensions, computeTargetPlatform, getExtensionId, getGalleryExtensionId } from './extensionManagementUtil.js';
 import { ExtensionType, ExtensionIdentifier, IExtensionManifest, TargetPlatform, IExtensionIdentifier, IRelaxedExtensionManifest, UNDEFINED_PUBLISHER, IExtensionDescription, BUILTIN_MANIFEST_CACHE_FILE, USER_MANIFEST_CACHE_FILE, ExtensionIdentifierMap, parseEnabledApiProposalNames } from '../../extensions/common/extensions.js';
 import { validateExtensionManifest } from '../../extensions/common/extensionValidator.js';
 import { FileOperationResult, IFileService, toFileOperationResult } from '../../files/common/files.js';
@@ -106,7 +104,6 @@ export type ScanOptions = {
 	readonly profileLocation?: URI;
 	readonly includeInvalid?: boolean;
 	readonly includeAllVersions?: boolean;
-	readonly includeUninstalled?: boolean;
 	readonly checkControlFile?: boolean;
 	readonly language?: string;
 	readonly useCache?: boolean;
@@ -145,10 +142,9 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 	private readonly _onDidChangeCache = this._register(new Emitter<ExtensionType>());
 	readonly onDidChangeCache = this._onDidChangeCache.event;
 
-	private readonly obsoleteFile = joinPath(this.userExtensionsLocation, '.obsolete');
-	private readonly systemExtensionsCachedScanner = this._register(this.instantiationService.createInstance(CachedExtensionsScanner, this.currentProfile, this.obsoleteFile));
-	private readonly userExtensionsCachedScanner = this._register(this.instantiationService.createInstance(CachedExtensionsScanner, this.currentProfile, this.obsoleteFile));
-	private readonly extensionsScanner = this._register(this.instantiationService.createInstance(ExtensionsScanner, this.obsoleteFile));
+	private readonly systemExtensionsCachedScanner = this._register(this.instantiationService.createInstance(CachedExtensionsScanner, this.currentProfile));
+	private readonly userExtensionsCachedScanner = this._register(this.instantiationService.createInstance(CachedExtensionsScanner, this.currentProfile));
+	private readonly extensionsScanner = this._register(this.instantiationService.createInstance(ExtensionsScanner));
 
 	constructor(
 		readonly systemExtensionsLocation: URI,
@@ -199,8 +195,8 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 		const location = scanOptions.profileLocation ?? this.userExtensionsLocation;
 		this.logService.trace('Started scanning user extensions', location);
 		const profileScanOptions: IProfileExtensionsScanOptions | undefined = this.uriIdentityService.extUri.isEqual(scanOptions.profileLocation, this.userDataProfilesService.defaultProfile.extensionsResource) ? { bailOutWhenFileNotFound: true } : undefined;
-		const extensionsScannerInput = await this.createExtensionScannerInput(location, !!scanOptions.profileLocation, ExtensionType.User, !scanOptions.includeUninstalled, scanOptions.language, true, profileScanOptions, scanOptions.productVersion ?? this.getProductVersion());
-		const extensionsScanner = scanOptions.useCache && !extensionsScannerInput.devMode && extensionsScannerInput.excludeObsolete ? this.userExtensionsCachedScanner : this.extensionsScanner;
+		const extensionsScannerInput = await this.createExtensionScannerInput(location, !!scanOptions.profileLocation, ExtensionType.User, scanOptions.language, true, profileScanOptions, scanOptions.productVersion ?? this.getProductVersion());
+		const extensionsScanner = scanOptions.useCache && !extensionsScannerInput.devMode ? this.userExtensionsCachedScanner : this.extensionsScanner;
 		let extensions: IRelaxedScannedExtension[];
 		try {
 			extensions = await extensionsScanner.scanExtensions(extensionsScannerInput);
@@ -221,7 +217,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 		if (this.environmentService.isExtensionDevelopment && this.environmentService.extensionDevelopmentLocationURI) {
 			const extensions = (await Promise.all(this.environmentService.extensionDevelopmentLocationURI.filter(extLoc => extLoc.scheme === Schemas.file)
 				.map(async extensionDevelopmentLocationURI => {
-					const input = await this.createExtensionScannerInput(extensionDevelopmentLocationURI, false, ExtensionType.User, true, scanOptions.language, false /* do not validate */, undefined, scanOptions.productVersion ?? this.getProductVersion());
+					const input = await this.createExtensionScannerInput(extensionDevelopmentLocationURI, false, ExtensionType.User, scanOptions.language, false /* do not validate */, undefined, scanOptions.productVersion ?? this.getProductVersion());
 					const extensions = await this.extensionsScanner.scanOneOrMultipleExtensions(input);
 					return extensions.map(extension => {
 						// Override the extension type from the existing extensions
@@ -237,7 +233,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 	}
 
 	async scanExistingExtension(extensionLocation: URI, extensionType: ExtensionType, scanOptions: ScanOptions): Promise<IScannedExtension | null> {
-		const extensionsScannerInput = await this.createExtensionScannerInput(extensionLocation, false, extensionType, true, scanOptions.language, true, undefined, scanOptions.productVersion ?? this.getProductVersion());
+		const extensionsScannerInput = await this.createExtensionScannerInput(extensionLocation, false, extensionType, scanOptions.language, true, undefined, scanOptions.productVersion ?? this.getProductVersion());
 		const extension = await this.extensionsScanner.scanExtension(extensionsScannerInput);
 		if (!extension) {
 			return null;
@@ -249,7 +245,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 	}
 
 	async scanOneOrMultipleExtensions(extensionLocation: URI, extensionType: ExtensionType, scanOptions: ScanOptions): Promise<IScannedExtension[]> {
-		const extensionsScannerInput = await this.createExtensionScannerInput(extensionLocation, false, extensionType, true, scanOptions.language, true, undefined, scanOptions.productVersion ?? this.getProductVersion());
+		const extensionsScannerInput = await this.createExtensionScannerInput(extensionLocation, false, extensionType, scanOptions.language, true, undefined, scanOptions.productVersion ?? this.getProductVersion());
 		const extensions = await this.extensionsScanner.scanOneOrMultipleExtensions(extensionsScannerInput);
 		return this.applyScanOptions(extensions, extensionType, scanOptions, true);
 	}
@@ -405,7 +401,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 
 	private async scanDefaultSystemExtensions(useCache: boolean, language: string | undefined): Promise<IRelaxedScannedExtension[]> {
 		this.logService.trace('Started scanning system extensions');
-		const extensionsScannerInput = await this.createExtensionScannerInput(this.systemExtensionsLocation, false, ExtensionType.System, true, language, true, undefined, this.getProductVersion());
+		const extensionsScannerInput = await this.createExtensionScannerInput(this.systemExtensionsLocation, false, ExtensionType.System, language, true, undefined, this.getProductVersion());
 		const extensionsScanner = useCache && !extensionsScannerInput.devMode ? this.systemExtensionsCachedScanner : this.extensionsScanner;
 		const result = await extensionsScanner.scanExtensions(extensionsScannerInput);
 		this.logService.trace('Scanned system extensions:', result.length);
@@ -435,7 +431,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 					break;
 			}
 		}
-		const result = await Promise.all(devSystemExtensionsLocations.map(async location => this.extensionsScanner.scanExtension((await this.createExtensionScannerInput(location, false, ExtensionType.System, true, language, true, undefined, this.getProductVersion())))));
+		const result = await Promise.all(devSystemExtensionsLocations.map(async location => this.extensionsScanner.scanExtension((await this.createExtensionScannerInput(location, false, ExtensionType.System, language, true, undefined, this.getProductVersion())))));
 		this.logService.trace('Scanned dev system extensions:', result.length);
 		return coalesce(result);
 	}
@@ -449,7 +445,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 		}
 	}
 
-	private async createExtensionScannerInput(location: URI, profile: boolean, type: ExtensionType, excludeObsolete: boolean, language: string | undefined, validate: boolean, profileScanOptions: IProfileExtensionsScanOptions | undefined, productVersion: IProductVersion): Promise<ExtensionScannerInput> {
+	private async createExtensionScannerInput(location: URI, profile: boolean, type: ExtensionType, language: string | undefined, validate: boolean, profileScanOptions: IProfileExtensionsScanOptions | undefined, productVersion: IProductVersion): Promise<ExtensionScannerInput> {
 		const translations = await this.getTranslations(language ?? platform.language);
 		const mtime = await this.getMtime(location);
 		const applicationExtensionsLocation = profile && !this.uriIdentityService.extUri.isEqual(location, this.userDataProfilesService.defaultProfile.extensionsResource) ? this.userDataProfilesService.defaultProfile.extensionsResource : undefined;
@@ -462,7 +458,6 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 			profile,
 			profileScanOptions,
 			type,
-			excludeObsolete,
 			validate,
 			productVersion.version,
 			productVersion.date,
@@ -504,7 +499,6 @@ export class ExtensionScannerInput {
 		public readonly profile: boolean,
 		public readonly profileScanOptions: IProfileExtensionsScanOptions | undefined,
 		public readonly type: ExtensionType,
-		public readonly excludeObsolete: boolean,
 		public readonly validate: boolean,
 		public readonly productVersion: string,
 		public readonly productDate: string | undefined,
@@ -534,7 +528,6 @@ export class ExtensionScannerInput {
 			&& a.profile === b.profile
 			&& objects.equals(a.profileScanOptions, b.profileScanOptions)
 			&& a.type === b.type
-			&& a.excludeObsolete === b.excludeObsolete
 			&& a.validate === b.validate
 			&& a.productVersion === b.productVersion
 			&& a.productDate === b.productDate
@@ -558,7 +551,6 @@ class ExtensionsScanner extends Disposable {
 	private readonly extensionsEnabledWithApiProposalVersion: string[];
 
 	constructor(
-		private readonly obsoleteFile: URI,
 		@IExtensionsProfileScannerService protected readonly extensionsProfileScannerService: IExtensionsProfileScannerService,
 		@IUriIdentityService protected readonly uriIdentityService: IUriIdentityService,
 		@IFileService protected readonly fileService: IFileService,
@@ -571,15 +563,9 @@ class ExtensionsScanner extends Disposable {
 	}
 
 	async scanExtensions(input: ExtensionScannerInput): Promise<IRelaxedScannedExtension[]> {
-		const extensions = input.profile ? await this.scanExtensionsFromProfile(input) : await this.scanExtensionsFromLocation(input);
-		let obsolete: IStringDictionary<boolean> = {};
-		if (input.excludeObsolete && input.type === ExtensionType.User) {
-			try {
-				const raw = (await this.fileService.readFile(this.obsoleteFile)).value.toString();
-				obsolete = JSON.parse(raw);
-			} catch (error) { /* ignore */ }
-		}
-		return isEmptyObject(obsolete) ? extensions : extensions.filter(e => !obsolete[ExtensionKey.create(e).toString()]);
+		return input.profile
+			? this.scanExtensionsFromProfile(input)
+			: this.scanExtensionsFromLocation(input);
 	}
 
 	private async scanExtensionsFromLocation(input: ExtensionScannerInput): Promise<IRelaxedScannedExtension[]> {
@@ -596,7 +582,7 @@ class ExtensionsScanner extends Disposable {
 				if (input.type === ExtensionType.User && basename(c.resource).indexOf('.') === 0) {
 					return null;
 				}
-				const extensionScannerInput = new ExtensionScannerInput(c.resource, input.mtime, input.applicationExtensionslocation, input.applicationExtensionslocationMtime, input.profile, input.profileScanOptions, input.type, input.excludeObsolete, input.validate, input.productVersion, input.productDate, input.productCommit, input.devMode, input.language, input.translations);
+				const extensionScannerInput = new ExtensionScannerInput(c.resource, input.mtime, input.applicationExtensionslocation, input.applicationExtensionslocationMtime, input.profile, input.profileScanOptions, input.type, input.validate, input.productVersion, input.productDate, input.productCommit, input.devMode, input.language, input.translations);
 				return this.scanExtension(extensionScannerInput);
 			}));
 		return coalesce(extensions)
@@ -622,7 +608,7 @@ class ExtensionsScanner extends Disposable {
 		const extensions = await Promise.all<IRelaxedScannedExtension | null>(
 			scannedProfileExtensions.map(async extensionInfo => {
 				if (filter(extensionInfo)) {
-					const extensionScannerInput = new ExtensionScannerInput(extensionInfo.location, input.mtime, input.applicationExtensionslocation, input.applicationExtensionslocationMtime, input.profile, input.profileScanOptions, input.type, input.excludeObsolete, input.validate, input.productVersion, input.productDate, input.productCommit, input.devMode, input.language, input.translations);
+					const extensionScannerInput = new ExtensionScannerInput(extensionInfo.location, input.mtime, input.applicationExtensionslocation, input.applicationExtensionslocationMtime, input.profile, input.profileScanOptions, input.type, input.validate, input.productVersion, input.productDate, input.productCommit, input.devMode, input.language, input.translations);
 					return this.scanExtension(extensionScannerInput, extensionInfo.metadata);
 				}
 				return null;
@@ -891,7 +877,6 @@ class CachedExtensionsScanner extends ExtensionsScanner {
 
 	constructor(
 		private readonly currentProfile: IUserDataProfile,
-		obsoleteFile: URI,
 		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
 		@IExtensionsProfileScannerService extensionsProfileScannerService: IExtensionsProfileScannerService,
 		@IUriIdentityService uriIdentityService: IUriIdentityService,
@@ -900,7 +885,7 @@ class CachedExtensionsScanner extends ExtensionsScanner {
 		@IEnvironmentService environmentService: IEnvironmentService,
 		@ILogService logService: ILogService
 	) {
-		super(obsoleteFile, extensionsProfileScannerService, uriIdentityService, fileService, productService, environmentService, logService);
+		super(extensionsProfileScannerService, uriIdentityService, fileService, productService, environmentService, logService);
 	}
 
 	override async scanExtensions(input: ExtensionScannerInput): Promise<IRelaxedScannedExtension[]> {
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 92405eefb75..015c3dff393 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -60,7 +60,7 @@ export interface INativeServerExtensionManagementService extends IExtensionManag
 	readonly _serviceBrand: undefined;
 	scanAllUserInstalledExtensions(): Promise<ILocalExtension[]>;
 	scanInstalledExtensionAtLocation(location: URI): Promise<ILocalExtension | null>;
-	markAsUninstalled(...extensions: IExtension[]): Promise<void>;
+	deleteExtensions(...extensions: IExtension[]): Promise<void>;
 }
 
 type ExtractExtensionResult = { readonly local: ILocalExtension; readonly verificationStatus?: ExtensionSignatureVerificationCode };
@@ -222,8 +222,8 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 		return this.extensionsScanner.copyExtensions(fromProfileLocation, toProfileLocation, { version: this.productService.version, date: this.productService.date });
 	}
 
-	markAsUninstalled(...extensions: IExtension[]): Promise<void> {
-		return this.extensionsScanner.setUninstalled(...extensions);
+	deleteExtensions(...extensions: IExtension[]): Promise<void> {
+		return this.extensionsScanner.setExtensionsForRemoval(...extensions);
 	}
 
 	async cleanUp(): Promise<void> {
@@ -480,8 +480,20 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 				continue;
 			}
 
-			// Check if this is a directory
-			if (!(await this.fileService.stat(resource)).isDirectory) {
+			// Ignore changes to the deleted folder
+			if (this.uriIdentityService.extUri.basename(resource).endsWith(DELETED_FOLDER_POSTFIX)) {
+				continue;
+			}
+
+			try {
+				// Check if this is a directory
+				if (!(await this.fileService.stat(resource)).isDirectory) {
+					continue;
+				}
+			} catch (error) {
+				if (toFileOperationResult(error) !== FileOperationResult.FILE_NOT_FOUND) {
+					this.logService.error(error);
+				}
 				continue;
 			}
 
@@ -502,23 +514,10 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 
 	private async addExtensionsToProfile(extensions: [ILocalExtension, Metadata | undefined][], profileLocation: URI): Promise<void> {
 		const localExtensions = extensions.map(e => e[0]);
-		await this.setInstalled(localExtensions);
+		await this.extensionsScanner.unsetExtensionsForRemoval(...localExtensions.map(extension => ExtensionKey.create(extension)));
 		await this.extensionsProfileScannerService.addExtensionsToProfile(extensions, profileLocation);
 		this._onDidInstallExtensions.fire(localExtensions.map(local => ({ local, identifier: local.identifier, operation: InstallOperation.None, profileLocation })));
 	}
-
-	private async setInstalled(extensions: ILocalExtension[]): Promise<void> {
-		const uninstalled = await this.extensionsScanner.getUninstalledExtensions();
-		for (const extension of extensions) {
-			const extensionKey = ExtensionKey.create(extension);
-			if (!uninstalled[extensionKey.toString()]) {
-				continue;
-			}
-			this.logService.trace('Removing the extension from uninstalled list:', extensionKey.id);
-			await this.extensionsScanner.setInstalled(extensionKey);
-			this.logService.info('Removed the extension from uninstalled list:', extensionKey.id);
-		}
-	}
 }
 
 type UpdateMetadataErrorClassification = {
@@ -536,8 +535,8 @@ type UpdateMetadataErrorEvent = {
 
 export class ExtensionsScanner extends Disposable {
 
-	private readonly uninstalledResource: URI;
-	private readonly uninstalledFileLimiter: Queue<any>;
+	private readonly obsoletedResource: URI;
+	private readonly obsoleteFileLimiter: Queue<any>;
 
 	private readonly _onExtract = this._register(new Emitter<URI>());
 	readonly onExtract = this._onExtract.event;
@@ -555,13 +554,13 @@ export class ExtensionsScanner extends Disposable {
 		@ILogService private readonly logService: ILogService,
 	) {
 		super();
-		this.uninstalledResource = joinPath(this.extensionsScannerService.userExtensionsLocation, '.obsolete');
-		this.uninstalledFileLimiter = new Queue();
+		this.obsoletedResource = joinPath(this.extensionsScannerService.userExtensionsLocation, '.obsolete');
+		this.obsoleteFileLimiter = new Queue();
 	}
 
 	async cleanUp(): Promise<void> {
 		await this.removeTemporarilyDeletedFolders();
-		await this.removeUninstalledExtensions();
+		await this.deleteExtensionsMarkedForRemoval();
 		await this.initializeMetadata();
 	}
 
@@ -720,40 +719,38 @@ export class ExtensionsScanner extends Disposable {
 		return this.scanLocalExtension(local.location, local.type, profileLocation);
 	}
 
-	async getUninstalledExtensions(): Promise<IStringDictionary<boolean>> {
-		try {
-			return await this.withUninstalledExtensions();
-		} catch (error) {
-			throw toExtensionManagementError(error, ExtensionManagementErrorCode.ReadUninstalled);
-		}
-	}
-
-	async setUninstalled(...extensions: IExtension[]): Promise<void> {
+	async setExtensionsForRemoval(...extensions: IExtension[]): Promise<void> {
 		const extensionKeys: ExtensionKey[] = extensions.map(e => ExtensionKey.create(e));
-		await this.withUninstalledExtensions(uninstalled =>
+		await this.withRemovedExtensions(removedExtensions =>
 			extensionKeys.forEach(extensionKey => {
-				uninstalled[extensionKey.toString()] = true;
-				this.logService.info('Marked extension as uninstalled', extensionKey.toString());
+				removedExtensions[extensionKey.toString()] = true;
+				this.logService.info('Marked extension as removed', extensionKey.toString());
 			}));
 	}
 
-	async setInstalled(extensionKey: ExtensionKey): Promise<void> {
+	async unsetExtensionsForRemoval(...extensionKeys: ExtensionKey[]): Promise<boolean[]> {
 		try {
-			await this.withUninstalledExtensions(uninstalled => delete uninstalled[extensionKey.toString()]);
+			const results: boolean[] = [];
+			await this.withRemovedExtensions(removedExtensions =>
+				extensionKeys.forEach(extensionKey => {
+					if (removedExtensions[extensionKey.toString()]) {
+						results.push(true);
+						delete removedExtensions[extensionKey.toString()];
+					} else {
+						results.push(false);
+					}
+				}));
+			return results;
 		} catch (error) {
-			throw toExtensionManagementError(error, ExtensionManagementErrorCode.UnsetUninstalled);
+			throw toExtensionManagementError(error, ExtensionManagementErrorCode.UnsetRemoved);
 		}
 	}
 
-	async removeExtension(extension: ILocalExtension | IScannedExtension, type: string): Promise<void> {
+	async deleteExtension(extension: ILocalExtension | IScannedExtension, type: string): Promise<void> {
 		if (this.uriIdentityService.extUri.isEqualOrParent(extension.location, this.extensionsScannerService.userExtensionsLocation)) {
 			return this.deleteExtensionFromLocation(extension.identifier.id, extension.location, type);
 		}
-	}
-
-	async removeUninstalledExtension(extension: ILocalExtension | IScannedExtension): Promise<void> {
-		await this.removeExtension(extension, 'uninstalled');
-		await this.withUninstalledExtensions(uninstalled => delete uninstalled[ExtensionKey.create(extension).toString()]);
+		await this.unsetExtensionsForRemoval(ExtensionKey.create(extension));
 	}
 
 	async copyExtension(extension: ILocalExtension, fromProfileLocation: URI, toProfileLocation: URI, metadata: Partial<Metadata>): Promise<ILocalExtension> {
@@ -792,11 +789,11 @@ export class ExtensionsScanner extends Disposable {
 		this.logService.info(`Deleted ${type} extension from disk`, id, location.fsPath);
 	}
 
-	private withUninstalledExtensions(updateFn?: (uninstalled: IStringDictionary<boolean>) => void): Promise<IStringDictionary<boolean>> {
-		return this.uninstalledFileLimiter.queue(async () => {
+	private withRemovedExtensions(updateFn?: (removed: IStringDictionary<boolean>) => void): Promise<IStringDictionary<boolean>> {
+		return this.obsoleteFileLimiter.queue(async () => {
 			let raw: string | undefined;
 			try {
-				const content = await this.fileService.readFile(this.uninstalledResource, 'utf8');
+				const content = await this.fileService.readFile(this.obsoletedResource, 'utf8');
 				raw = content.value.toString();
 			} catch (error) {
 				if (toFileOperationResult(error) !== FileOperationResult.FILE_NOT_FOUND) {
@@ -804,23 +801,23 @@ export class ExtensionsScanner extends Disposable {
 				}
 			}
 
-			let uninstalled = {};
+			let removed = {};
 			if (raw) {
 				try {
-					uninstalled = JSON.parse(raw);
+					removed = JSON.parse(raw);
 				} catch (e) { /* ignore */ }
 			}
 
 			if (updateFn) {
-				updateFn(uninstalled);
-				if (Object.keys(uninstalled).length) {
-					await this.fileService.writeFile(this.uninstalledResource, VSBuffer.fromString(JSON.stringify(uninstalled)));
+				updateFn(removed);
+				if (Object.keys(removed).length) {
+					await this.fileService.writeFile(this.obsoletedResource, VSBuffer.fromString(JSON.stringify(removed)));
 				} else {
-					await this.fileService.del(this.uninstalledResource);
+					await this.fileService.del(this.obsoletedResource);
 				}
 			}
 
-			return uninstalled;
+			return removed;
 		});
 	}
 
@@ -898,19 +895,25 @@ export class ExtensionsScanner extends Disposable {
 		}));
 	}
 
-	private async removeUninstalledExtensions(): Promise<void> {
-		const uninstalled = await this.getUninstalledExtensions();
-		if (Object.keys(uninstalled).length === 0) {
-			this.logService.debug(`No uninstalled extensions found.`);
+	private async deleteExtensionsMarkedForRemoval(): Promise<void> {
+		let removed: IStringDictionary<boolean>;
+		try {
+			removed = await this.withRemovedExtensions();
+		} catch (error) {
+			throw toExtensionManagementError(error, ExtensionManagementErrorCode.ReadRemoved);
+		}
+
+		if (Object.keys(removed).length === 0) {
+			this.logService.debug(`No extensions are marked as removed.`);
 			return;
 		}
 
-		this.logService.debug(`Removing uninstalled extensions:`, Object.keys(uninstalled));
+		this.logService.debug(`Deleting extensions marked as removed:`, Object.keys(removed));
 
-		const extensions = await this.extensionsScannerService.scanUserExtensions({ includeAllVersions: true, includeUninstalled: true, includeInvalid: true }); // All user extensions
+		const extensions = await this.extensionsScannerService.scanUserExtensions({ includeAllVersions: true, includeInvalid: true }); // All user extensions
 		const installed: Set<string> = new Set<string>();
 		for (const e of extensions) {
-			if (!uninstalled[ExtensionKey.create(e).toString()]) {
+			if (!removed[ExtensionKey.create(e).toString()]) {
 				installed.add(e.identifier.id.toLowerCase());
 			}
 		}
@@ -928,8 +931,8 @@ export class ExtensionsScanner extends Disposable {
 			this.logService.error(error);
 		}
 
-		const toRemove = extensions.filter(e => e.metadata /* Installed by System */ && uninstalled[ExtensionKey.create(e).toString()]);
-		await Promise.allSettled(toRemove.map(e => this.removeUninstalledExtension(e)));
+		const toRemove = extensions.filter(e => e.metadata /* Installed by System */ && removed[ExtensionKey.create(e).toString()]);
+		await Promise.allSettled(toRemove.map(e => this.deleteExtension(e, 'marked for removal')));
 	}
 
 	private async removeTemporarilyDeletedFolders(): Promise<void> {
@@ -1021,7 +1024,7 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
 			if (existingExtension) {
 				if (this.extensionKey.equals(new ExtensionKey(existingExtension.identifier, existingExtension.manifest.version))) {
 					try {
-						await this.extensionsScanner.removeExtension(existingExtension, 'existing');
+						await this.extensionsScanner.deleteExtension(existingExtension, 'existing');
 					} catch (e) {
 						throw new Error(nls.localize('restartCode', "Please restart VS Code before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
 					}
@@ -1029,10 +1032,10 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
 			}
 			// Remove the extension with same version if it is already uninstalled.
 			// Installing a VSIX extension shall replace the existing extension always.
-			const existingWithSameVersion = await this.unsetIfUninstalled(this.extensionKey);
+			const existingWithSameVersion = await this.unsetIfRemoved(this.extensionKey);
 			if (existingWithSameVersion) {
 				try {
-					await this.extensionsScanner.removeExtension(existingWithSameVersion, 'existing');
+					await this.extensionsScanner.deleteExtension(existingWithSameVersion, 'existing');
 				} catch (e) {
 					throw new Error(nls.localize('restartCode', "Please restart VS Code before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
 				}
@@ -1058,7 +1061,7 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
 			}
 
 			// Unset if the extension is uninstalled and return the unset extension.
-			local = await this.unsetIfUninstalled(this.extensionKey);
+			local = await this.unsetIfRemoved(this.extensionKey);
 		}
 
 		if (token.isCancellationRequested) {
@@ -1101,19 +1104,15 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
 		return result;
 	}
 
-	private async unsetIfUninstalled(extensionKey: ExtensionKey): Promise<ILocalExtension | undefined> {
-		const uninstalled = await this.extensionsScanner.getUninstalledExtensions();
-		if (!uninstalled[extensionKey.toString()]) {
-			return undefined;
+	private async unsetIfRemoved(extensionKey: ExtensionKey): Promise<ILocalExtension | undefined> {
+		// If the same version of extension is marked as removed, remove it from there and return the local.
+		const [removed] = await this.extensionsScanner.unsetExtensionsForRemoval(extensionKey);
+		if (removed) {
+			this.logService.info('Removed the extension from removed list:', extensionKey.id);
+			const userExtensions = await this.extensionsScanner.scanAllUserExtensions(true);
+			return userExtensions.find(i => ExtensionKey.create(i).equals(extensionKey));
 		}
-
-		this.logService.trace('Removing the extension from uninstalled list:', extensionKey.id);
-		// If the same version of extension is marked as uninstalled, remove it from there and return the local.
-		await this.extensionsScanner.setInstalled(extensionKey);
-		this.logService.info('Removed the extension from uninstalled list:', extensionKey.id);
-
-		const userExtensions = await this.extensionsScanner.scanAllUserExtensions(true);
-		return userExtensions.find(i => ExtensionKey.create(i).equals(extensionKey));
+		return undefined;
 	}
 
 	private async updateMetadata(extension: ILocalExtension, token: CancellationToken): Promise<void> {
@@ -1149,8 +1148,8 @@ class UninstallExtensionInProfileTask extends AbstractExtensionTask<void> implem
 		super();
 	}
 
-	protected async doRun(token: CancellationToken): Promise<void> {
-		await this.extensionsProfileScannerService.removeExtensionFromProfile(this.extension, this.options.profileLocation);
+	protected doRun(token: CancellationToken): Promise<void> {
+		return this.extensionsProfileScannerService.removeExtensionFromProfile(this.extension, this.options.profileLocation);
 	}
 
 }
diff --git a/src/vs/platform/extensionManagement/node/extensionsWatcher.ts b/src/vs/platform/extensionManagement/node/extensionsWatcher.ts
index d2b65eaea55..2c4e976a5a6 100644
--- a/src/vs/platform/extensionManagement/node/extensionsWatcher.ts
+++ b/src/vs/platform/extensionManagement/node/extensionsWatcher.ts
@@ -48,7 +48,7 @@ export class ExtensionsWatcher extends Disposable {
 		await this.extensionsScannerService.initializeDefaultProfileExtensions();
 		await this.onDidChangeProfiles(this.userDataProfilesService.profiles);
 		this.registerListeners();
-		await this.uninstallExtensionsNotInProfiles();
+		await this.deleteExtensionsNotInProfiles();
 	}
 
 	private registerListeners(): void {
@@ -102,7 +102,7 @@ export class ExtensionsWatcher extends Disposable {
 	}
 
 	private async onDidRemoveExtensions(e: DidRemoveProfileExtensionsEvent): Promise<void> {
-		const extensionsToUninstall: IExtension[] = [];
+		const extensionsToDelete: IExtension[] = [];
 		const promises: Promise<void>[] = [];
 		for (const extension of e.extensions) {
 			const key = this.getKey(extension.identifier, extension.version);
@@ -115,7 +115,7 @@ export class ExtensionsWatcher extends Disposable {
 					promises.push(this.extensionManagementService.scanInstalledExtensionAtLocation(extension.location)
 						.then(result => {
 							if (result) {
-								extensionsToUninstall.push(result);
+								extensionsToDelete.push(result);
 							} else {
 								this.logService.info('Extension not found at the location', extension.location.toString());
 							}
@@ -125,8 +125,8 @@ export class ExtensionsWatcher extends Disposable {
 		}
 		try {
 			await Promise.all(promises);
-			if (extensionsToUninstall.length) {
-				await this.uninstallExtensionsNotInProfiles(extensionsToUninstall);
+			if (extensionsToDelete.length) {
+				await this.deleteExtensionsNotInProfiles(extensionsToDelete);
 			}
 		} catch (error) {
 			this.logService.error(error);
@@ -180,13 +180,13 @@ export class ExtensionsWatcher extends Disposable {
 		}
 	}
 
-	private async uninstallExtensionsNotInProfiles(toUninstall?: IExtension[]): Promise<void> {
-		if (!toUninstall) {
+	private async deleteExtensionsNotInProfiles(toDelete?: IExtension[]): Promise<void> {
+		if (!toDelete) {
 			const installed = await this.extensionManagementService.scanAllUserInstalledExtensions();
-			toUninstall = installed.filter(installedExtension => !this.allExtensions.has(this.getKey(installedExtension.identifier, installedExtension.manifest.version)));
+			toDelete = installed.filter(installedExtension => !this.allExtensions.has(this.getKey(installedExtension.identifier, installedExtension.manifest.version)));
 		}
-		if (toUninstall.length) {
-			await this.extensionManagementService.markAsUninstalled(...toUninstall);
+		if (toDelete.length) {
+			await this.extensionManagementService.deleteExtensions(...toDelete);
 		}
 	}
 
diff --git a/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts b/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts
index 74d3ffcd738..551ba576d44 100644
--- a/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts
+++ b/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts
@@ -224,31 +224,6 @@ suite('NativeExtensionsScanerService Test', () => {
 		assert.deepStrictEqual(actual[0].identifier, { id: 'pub.name' });
 	});
 
-	test('scan exclude uninstalled extensions', async () => {
-		await aUserExtension(anExtensionManifest({ 'name': 'name', 'publisher': 'pub' }));
-		await aUserExtension(anExtensionManifest({ 'name': 'name2', 'publisher': 'pub' }));
-		await instantiationService.get(IFileService).writeFile(joinPath(URI.file(instantiationService.get(INativeEnvironmentService).extensionsPath), '.obsolete'), VSBuffer.fromString(JSON.stringify({ 'pub.name2-1.0.0': true })));
-		const testObject: IExtensionsScannerService = disposables.add(instantiationService.createInstance(ExtensionsScannerService));
-
-		const actual = await testObject.scanUserExtensions({});
-
-		assert.deepStrictEqual(actual.length, 1);
-		assert.deepStrictEqual(actual[0].identifier, { id: 'pub.name' });
-	});
-
-	test('scan include uninstalled extensions', async () => {
-		await aUserExtension(anExtensionManifest({ 'name': 'name', 'publisher': 'pub' }));
-		await aUserExtension(anExtensionManifest({ 'name': 'name2', 'publisher': 'pub' }));
-		await instantiationService.get(IFileService).writeFile(joinPath(URI.file(instantiationService.get(INativeEnvironmentService).extensionsPath), '.obsolete'), VSBuffer.fromString(JSON.stringify({ 'pub.name2-1.0.0': true })));
-		const testObject: IExtensionsScannerService = disposables.add(instantiationService.createInstance(ExtensionsScannerService));
-
-		const actual = await testObject.scanUserExtensions({ includeUninstalled: true });
-
-		assert.deepStrictEqual(actual.length, 2);
-		assert.deepStrictEqual(actual[0].identifier, { id: 'pub.name' });
-		assert.deepStrictEqual(actual[1].identifier, { id: 'pub.name2' });
-	});
-
 	test('scan include invalid extensions', async () => {
 		await aUserExtension(anExtensionManifest({ 'name': 'name', 'publisher': 'pub' }));
 		await aUserExtension(anExtensionManifest({ 'name': 'name2', 'publisher': 'pub', engines: { vscode: '^1.67.0' } }));
@@ -351,7 +326,7 @@ suite('ExtensionScannerInput', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
 
 	test('compare inputs - location', () => {
-		const anInput = (location: URI, mtime: number | undefined) => new ExtensionScannerInput(location, mtime, undefined, undefined, false, undefined, ExtensionType.User, true, true, '1.1.1', undefined, undefined, true, undefined, {});
+		const anInput = (location: URI, mtime: number | undefined) => new ExtensionScannerInput(location, mtime, undefined, undefined, false, undefined, ExtensionType.User, true, '1.1.1', undefined, undefined, true, undefined, {});
 
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(ROOT, undefined), anInput(ROOT, undefined)), true);
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(ROOT, 100), anInput(ROOT, 100)), true);
@@ -361,7 +336,7 @@ suite('ExtensionScannerInput', () => {
 	});
 
 	test('compare inputs - application location', () => {
-		const anInput = (location: URI, mtime: number | undefined) => new ExtensionScannerInput(ROOT, undefined, location, mtime, false, undefined, ExtensionType.User, true, true, '1.1.1', undefined, undefined, true, undefined, {});
+		const anInput = (location: URI, mtime: number | undefined) => new ExtensionScannerInput(ROOT, undefined, location, mtime, false, undefined, ExtensionType.User, true, '1.1.1', undefined, undefined, true, undefined, {});
 
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(ROOT, undefined), anInput(ROOT, undefined)), true);
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(ROOT, 100), anInput(ROOT, 100)), true);
@@ -371,7 +346,7 @@ suite('ExtensionScannerInput', () => {
 	});
 
 	test('compare inputs - profile', () => {
-		const anInput = (profile: boolean, profileScanOptions: IProfileExtensionsScanOptions | undefined) => new ExtensionScannerInput(ROOT, undefined, undefined, undefined, profile, profileScanOptions, ExtensionType.User, true, true, '1.1.1', undefined, undefined, true, undefined, {});
+		const anInput = (profile: boolean, profileScanOptions: IProfileExtensionsScanOptions | undefined) => new ExtensionScannerInput(ROOT, undefined, undefined, undefined, profile, profileScanOptions, ExtensionType.User, true, '1.1.1', undefined, undefined, true, undefined, {});
 
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(true, { bailOutWhenFileNotFound: true }), anInput(true, { bailOutWhenFileNotFound: true })), true);
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(false, { bailOutWhenFileNotFound: true }), anInput(false, { bailOutWhenFileNotFound: true })), true);
@@ -384,7 +359,7 @@ suite('ExtensionScannerInput', () => {
 	});
 
 	test('compare inputs - extension type', () => {
-		const anInput = (type: ExtensionType) => new ExtensionScannerInput(ROOT, undefined, undefined, undefined, false, undefined, type, true, true, '1.1.1', undefined, undefined, true, undefined, {});
+		const anInput = (type: ExtensionType) => new ExtensionScannerInput(ROOT, undefined, undefined, undefined, false, undefined, type, true, '1.1.1', undefined, undefined, true, undefined, {});
 
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(ExtensionType.System), anInput(ExtensionType.System)), true);
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(ExtensionType.User), anInput(ExtensionType.User)), true);

From d3b582676fa88ec3c4bdfd350aafebf851fcda28 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Tue, 17 Dec 2024 12:57:14 -0600
Subject: [PATCH 320/479] add rerun action to terminal chat to align w editor
 (#236381)

---
 .../chat/browser/terminalChat.ts              |  1 +
 .../chat/browser/terminalChatActions.ts       | 45 +++++++++++++++++++
 .../chat/browser/terminalChatWidget.ts        |  2 +
 3 files changed, 48 insertions(+)

diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat.ts
index b182074753e..5f16923d086 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat.ts
@@ -17,6 +17,7 @@ export const enum TerminalChatCommandId {
 	InsertCommand = 'workbench.action.terminal.chat.insertCommand',
 	InsertFirstCommand = 'workbench.action.terminal.chat.insertFirstCommand',
 	ViewInChat = 'workbench.action.terminal.chat.viewInChat',
+	RerunRequest = 'workbench.action.terminal.chat.rerunRequest',
 }
 
 export const MENU_TERMINAL_CHAT_WIDGET_INPUT_SIDE_TOOLBAR = MenuId.for('terminalChatWidget');
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts
index 38bb507fe3b..deeb48f48c7 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts
@@ -8,6 +8,9 @@ import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
 import { localize2 } from '../../../../../nls.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IChatWidgetService } from '../../../chat/browser/chat.js';
+import { ChatAgentLocation } from '../../../chat/common/chatAgents.js';
+import { IChatService } from '../../../chat/common/chatService.js';
 import { AbstractInlineChatAction } from '../../../inlineChat/browser/inlineChatActions.js';
 import { isDetachedTerminalInstance } from '../../../terminal/browser/terminal.js';
 import { registerActiveXtermAction } from '../../../terminal/browser/terminalActions.js';
@@ -209,6 +212,48 @@ registerActiveXtermAction({
 	}
 });
 
+registerActiveXtermAction({
+	id: TerminalChatCommandId.RerunRequest,
+	title: localize2('chat.rerun.label', "Rerun Request"),
+	f1: false,
+	icon: Codicon.refresh,
+	category: AbstractInlineChatAction.category,
+	precondition: ContextKeyExpr.and(
+		ContextKeyExpr.or(TerminalContextKeys.processSupported, TerminalContextKeys.terminalHasBeenCreated),
+		TerminalChatContextKeys.requestActive.negate(),
+	),
+	keybinding: {
+		weight: KeybindingWeight.WorkbenchContrib,
+		primary: KeyMod.CtrlCmd | KeyCode.KeyR
+	},
+	menu: {
+		id: MENU_TERMINAL_CHAT_WIDGET_STATUS,
+		group: '0_main',
+		order: 5,
+		when: ContextKeyExpr.and(TerminalChatContextKeys.inputHasText.toNegated(), TerminalChatContextKeys.requestActive.negate())
+	},
+	run: async (_xterm, _accessor, activeInstance) => {
+		const chatService = _accessor.get(IChatService);
+		const chatWidgetService = _accessor.get(IChatWidgetService);
+		const contr = TerminalChatController.activeChatController;
+		const model = contr?.terminalChatWidget?.inlineChatWidget.chatWidget.viewModel?.model;
+		if (!model) {
+			return;
+		}
+
+		const lastRequest = model.getRequests().at(-1);
+		if (lastRequest) {
+			const widget = chatWidgetService.getWidgetBySessionId(model.sessionId);
+			await chatService.resendRequest(lastRequest, {
+				noCommandDetection: false,
+				attempt: lastRequest.attempt + 1,
+				location: ChatAgentLocation.Terminal,
+				userSelectedModelId: widget?.input.currentLanguageModel
+			});
+		}
+	}
+});
+
 registerActiveXtermAction({
 	id: TerminalChatCommandId.ViewInChat,
 	title: localize2('viewInChat', 'View in Chat'),
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts
index b668b55abc5..d1a310aae29 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.ts
@@ -127,6 +127,8 @@ export class TerminalChatWidget extends Disposable {
 					menu: MENU_TERMINAL_CHAT_WIDGET_STATUS,
 					options: {
 						buttonConfigProvider: action => ({
+							showLabel: action.id !== TerminalChatCommandId.RerunRequest,
+							showIcon: action.id === TerminalChatCommandId.RerunRequest,
 							isSecondary: action.id !== TerminalChatCommandId.RunCommand && action.id !== TerminalChatCommandId.RunFirstCommand
 						})
 					}

From d08f30ded43d3fef500c50a22d2476e896e6d447 Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Tue, 17 Dec 2024 10:57:39 -0800
Subject: [PATCH 321/479] Update area labels (#236116)

---
 .vscode/notebooks/grooming.github-issues | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vscode/notebooks/grooming.github-issues b/.vscode/notebooks/grooming.github-issues
index 4a4955dd767..e408bbd7421 100644
--- a/.vscode/notebooks/grooming.github-issues
+++ b/.vscode/notebooks/grooming.github-issues
@@ -27,7 +27,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode assignee:$assignee is:open type:issue -label:\"info-needed\" -label:api -label:api-finalization -label:api-proposal -label:authentication -label:bisect-ext -label:bracket-pair-colorization -label:bracket-pair-guides -label:breadcrumbs -label:callhierarchy -label:chrome-devtools -label:cloud-changes -label:code-lens -label:command-center -label:comments -label:config -label:containers -label:context-keys -label:continue-working-on -label:css-less-scss -label:custom-editors -label:debug -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor-api -label:editor-autoclosing -label:editor-autoindent -label:editor-bracket-matching -label:editor-clipboard -label:editor-code-actions -label:editor-color-picker -label:editor-columnselect -label:editor-commands -label:editor-comments -label:editor-contrib -label:editor-core -label:editor-drag-and-drop -label:editor-error-widget -label:editor-find -label:editor-folding -label:editor-highlight -label:editor-hover -label:editor-indent-detection -label:editor-indent-guides -label:editor-input -label:editor-input-IME -label:editor-insets -label:editor-minimap -label:editor-multicursor -label:editor-parameter-hints -label:editor-render-whitespace -label:editor-rendering -label:editor-widgets -label:editor-RTL -label:editor-scrollbar -label:editor-sorting -label:editor-sticky-scroll -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet -label:emmet-parse -label:error-list -label:extension-activation -label:extension-host -label:extension-prerelease -label:extension-recommendations -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-io -label:file-nesting -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:github-repositories -label:gpu -label:grammar -label:grid-widget -label:html -label:icon-brand -label:icons-product -label:image-preview -label:inlay-hints -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-playground -label:interactive-window -label:issue-bot -label:issue-reporter -label:javascript -label:json -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:chat -label:l10n-platform -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list-widget -label:live-preview -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:merge-editor -label:merge-editor-workbench -label:monaco-editor -label:native-file-dialog -label:network -label:notebook -label:notebook-accessibility -label:notebook-api -label:notebook-builtin-renderers -label:notebook-cell-editor -label:notebook-celltoolbar -label:notebook-clipboard -label:notebook-commands -label:notebook-commenting -label:notebook-debugging -label:notebook-diff -label:notebook-dnd -label:notebook-execution -label:notebook-find -label:notebook-folding -label:notebook-getting-started -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-kernel-picker -label:notebook-language -label:notebook-layout -label:notebook-markdown -label:notebook-minimap -label:notebook-multiselect -label:notebook-output -label:notebook-perf -label:notebook-remote -label:notebook-rendering -label:notebook-serialization -label:notebook-statusbar -label:notebook-toc-outline -label:notebook-undo-redo -label:notebook-variables -label:notebook-workbench-integration -label:notebook-workflow -label:notebook-sticky-scroll -label:notebook-format -label:notebook-code-actions -label:open-editors -label:opener -label:outline -label:output -label:packaging -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-open -label:quick-pick -label:references-viewlet -label:release-notes -label:remote -label:remote-connection -label:remote-explorer -label:remote-tunnel -label:rename -label:runCommands -label:sandbox -label:sash-widget -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:server -label:settings-editor -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview-widget -label:ssh -label:suggest -label:table-widget -label:tasks -label:telemetry -label:terminal -label:terminal-accessibility -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-find -label:terminal-input -label:terminal-layout -label:terminal-links -label:terminal-local-echo -label:terminal-persistence -label:terminal-process -label:terminal-profiles -label:terminal-quick-fix -label:terminal-rendering -label:terminal-shell-bash -label:terminal-shell-cmd -label:terminal-shell-fish -label:terminal-shell-git-bash -label:terminal-shell-integration -label:terminal-shell-pwsh -label:terminal-shell-zsh -label:terminal-sticky-scroll -label:terminal-tabs -label:testing -label:themes -label:timeline -label:timeline-git -label:timeline-local-history -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typescript -label:undo-redo -label:unicode-highlight -label:uri -label:user-profiles -label:ux -label:variable-resolving -label:VIM -label:virtual-workspaces -label:vscode-website -label:vscode.dev -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-banner -label:workbench-cli -label:workbench-diagnostics -label:workbench-dnd -label:workbench-editor-grid -label:workbench-editor-groups -label:workbench-editor-resolver -label:workbench-editors -label:workbench-electron -label:workbench-fonts -label:workbench-history -label:workbench-hot-exit -label:workbench-hover -label:workbench-launch -label:workbench-link -label:workbench-multiroot -label:workbench-notifications -label:workbench-os-integration -label:workbench-rapid-render -label:workbench-run-as-admin -label:workbench-state -label:workbench-status -label:workbench-tabs -label:workbench-touchbar -label:workbench-untitled-editors -label:workbench-views -label:workbench-welcome -label:workbench-window -label:workbench-workspace -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom -label:inline-chat -label:panel-chat -label:quick-chat -label:tasks -label:error-list -label:winget -label:tree-views -label:freeze-slow-crash-leak -label:engineering -label:cross-file-editing"
+    "value": "repo:microsoft/vscode assignee:$assignee is:open type:issue -label:\"info-needed\" -label:api -label:api-finalization -label:api-proposal -label:authentication -label:bisect-ext -label:bracket-pair-colorization -label:bracket-pair-guides -label:breadcrumbs -label:callhierarchy -label:chrome-devtools -label:cloud-changes -label:code-lens -label:command-center -label:comments -label:config -label:containers -label:context-keys -label:continue-working-on -label:css-less-scss -label:custom-editors -label:debug -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor-api -label:editor-autoclosing -label:editor-autoindent -label:editor-bracket-matching -label:editor-clipboard -label:editor-code-actions -label:editor-color-picker -label:editor-columnselect -label:editor-commands -label:editor-comments -label:editor-contrib -label:editor-core -label:editor-drag-and-drop -label:editor-error-widget -label:editor-find -label:editor-folding -label:editor-highlight -label:editor-hover -label:editor-indent-detection -label:editor-indent-guides -label:editor-input -label:editor-input-IME -label:editor-insets -label:editor-minimap -label:editor-multicursor -label:editor-parameter-hints -label:editor-render-whitespace -label:editor-rendering -label:editor-widgets -label:editor-RTL -label:editor-scrollbar -label:editor-sorting -label:editor-sticky-scroll -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet -label:emmet-parse -label:error-list -label:extension-activation -label:extension-host -label:extension-prerelease -label:extension-recommendations -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-io -label:file-nesting -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:github-repositories -label:gpu -label:grammar -label:grid-widget -label:html -label:icon-brand -label:icons-product -label:image-preview -label:inlay-hints -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-playground -label:interactive-window -label:issue-bot -label:issue-reporter -label:javascript -label:json -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:chat -label:l10n-platform -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list-widget -label:live-preview -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:merge-editor -label:merge-editor-workbench -label:monaco-editor -label:native-file-dialog -label:network -label:notebook -label:notebook-accessibility -label:notebook-api -label:notebook-cell-editor -label:notebook-celltoolbar -label:notebook-clipboard -label:notebook-commands -label:notebook-debugging -label:notebook-diff -label:notebook-dnd -label:notebook-execution -label:notebook-find -label:notebook-folding -label:notebook-getting-started -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-kernel-picker -label:notebook-language -label:notebook-layout -label:notebook-markdown -label:notebook-output -label:notebook-perf -label:notebook-remote -label:notebook-serialization -label:notebook-statusbar -label:notebook-toc-outline -label:notebook-undo-redo -label:notebook-variables -label:notebook-workbench-integration -label:notebook-workflow -label:notebook-sticky-scroll -label:notebook-format -label:notebook-code-actions -label:open-editors -label:opener -label:outline -label:output -label:packaging -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-open -label:quick-pick -label:references-viewlet -label:release-notes -label:remote -label:remote-connection -label:remote-explorer -label:remote-tunnel -label:rename -label:runCommands -label:sandbox -label:sash-widget -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:server -label:settings-editor -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview-widget -label:ssh -label:suggest -label:table-widget -label:tasks -label:telemetry -label:terminal -label:terminal-accessibility -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-find -label:terminal-input -label:terminal-layout -label:terminal-links -label:terminal-local-echo -label:terminal-persistence -label:terminal-process -label:terminal-profiles -label:terminal-quick-fix -label:terminal-rendering -label:terminal-shell-bash -label:terminal-shell-cmd -label:terminal-shell-fish -label:terminal-shell-git-bash -label:terminal-shell-integration -label:terminal-shell-pwsh -label:terminal-shell-zsh -label:terminal-sticky-scroll -label:terminal-tabs -label:testing -label:themes -label:timeline -label:timeline-git -label:timeline-local-history -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typescript -label:undo-redo -label:unicode-highlight -label:uri -label:user-profiles -label:ux -label:variable-resolving -label:VIM -label:virtual-workspaces -label:vscode-website -label:vscode.dev -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-banner -label:workbench-cli -label:workbench-diagnostics -label:workbench-dnd -label:workbench-editor-grid -label:workbench-editor-groups -label:workbench-editor-resolver -label:workbench-editors -label:workbench-electron -label:workbench-fonts -label:workbench-history -label:workbench-hot-exit -label:workbench-hover -label:workbench-launch -label:workbench-link -label:workbench-multiroot -label:workbench-notifications -label:workbench-os-integration -label:workbench-rapid-render -label:workbench-run-as-admin -label:workbench-state -label:workbench-status -label:workbench-tabs -label:workbench-touchbar -label:workbench-untitled-editors -label:workbench-views -label:workbench-welcome -label:workbench-window -label:workbench-workspace -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom -label:inline-chat -label:panel-chat -label:quick-chat -label:tasks -label:error-list -label:winget -label:tree-views -label:freeze-slow-crash-leak -label:engineering -label:cross-file-editing"
   },
   {
     "kind": 1,

From 2bb6383e85fdfc2c28bd479675b9b296ebc7f268 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 17 Dec 2024 10:59:05 -0800
Subject: [PATCH 322/479] Pick up latest TS nightly

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

diff --git a/package-lock.json b/package-lock.json
index fd395ebd432..60dc545ca37 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -153,7 +153,7 @@
         "ts-node": "^10.9.1",
         "tsec": "0.2.7",
         "tslib": "^2.6.3",
-        "typescript": "^5.8.0-dev.20241212",
+        "typescript": "^5.8.0-dev.20241217",
         "typescript-eslint": "^8.8.0",
         "util": "^0.12.4",
         "webpack": "^5.94.0",
@@ -17599,9 +17599,9 @@
       "dev": true
     },
     "node_modules/typescript": {
-      "version": "5.8.0-dev.20241212",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.0-dev.20241212.tgz",
-      "integrity": "sha512-DL+rd76Ze4iHIFTT6+f8SNdxkTYnR0cy6e0QRljOfyr2s0TrO2L9pAOB1dJnSizTAjxou7lIRpUWwxVOIyiMWg==",
+      "version": "5.8.0-dev.20241217",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.0-dev.20241217.tgz",
+      "integrity": "sha512-Q/I+eHfiwN0aWhitenThTT2FcA1lTlUZR1z+6d2WaD/8/wHfdjQjdHynCpYXjAwDkfG8Apf9LdzZ3rLRD3O9iQ==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
diff --git a/package.json b/package.json
index eb0abcc3221..8dd5e0a86a3 100644
--- a/package.json
+++ b/package.json
@@ -211,7 +211,7 @@
     "ts-node": "^10.9.1",
     "tsec": "0.2.7",
     "tslib": "^2.6.3",
-    "typescript": "^5.8.0-dev.20241212",
+    "typescript": "^5.8.0-dev.20241217",
     "typescript-eslint": "^8.8.0",
     "util": "^0.12.4",
     "webpack": "^5.94.0",

From 068676662c8067ea8f6a96ebcc9d9e9332e2b2ba Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Tue, 17 Dec 2024 20:05:05 +0100
Subject: [PATCH 323/479] Fixes
 https://github.com/microsoft/vscode-copilot/issues/10296 (#236383)

---
 .../controller/inlineCompletionsController.ts  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
index 6be0ecd1c90..f3720436c2f 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
@@ -38,6 +38,8 @@ import { InlineCompletionContextKeys } from './inlineCompletionContextKeys.js';
 import { InlineCompletionsView } from '../view/inlineCompletionsView.js';
 
 export class InlineCompletionsController extends Disposable {
+	private static readonly _instances = new Set<InlineCompletionsController>();
+
 	public static hot = createHotClass(InlineCompletionsController);
 	public static ID = 'editor.contrib.inlineCompletionsController';
 
@@ -116,6 +118,22 @@ export class InlineCompletionsController extends Disposable {
 	) {
 		super();
 
+		InlineCompletionsController._instances.add(this);
+		this._register(toDisposable(() => InlineCompletionsController._instances.delete(this)));
+
+		this._register(autorun(reader => {
+			// Cancel all other inline completions when a new one starts
+			const model = this.model.read(reader);
+			if (!model) { return; }
+			if (model.state.read(reader) !== undefined) {
+				for (const ctrl of InlineCompletionsController._instances) {
+					if (ctrl !== this) {
+						ctrl.reject();
+					}
+				}
+			}
+		}));
+
 		this._register(runOnChange(this._editorObs.onDidType, (_value, _changes) => {
 			if (this._enabled.get()) {
 				this.model.get()?.trigger();

From e689b912ba8d46d224fc80ca56c641772476a7da Mon Sep 17 00:00:00 2001
From: Logan Ramos <lramos15@gmail.com>
Date: Tue, 17 Dec 2024 12:12:49 -0700
Subject: [PATCH 324/479] Update telemetry package (#236378)

---
 extensions/git/package-lock.json              | 141 ++++++++++--------
 extensions/git/package.json                   |   2 +-
 .../github-authentication/package-lock.json   | 141 ++++++++++--------
 extensions/github-authentication/package.json |   2 +-
 extensions/github/package-lock.json           | 141 ++++++++++--------
 extensions/github/package.json                |   2 +-
 .../html-language-features/package-lock.json  | 141 ++++++++++--------
 .../html-language-features/package.json       |   2 +-
 .../json-language-features/package-lock.json  | 141 ++++++++++--------
 .../json-language-features/package.json       |   2 +-
 .../package-lock.json                         | 141 ++++++++++--------
 .../markdown-language-features/package.json   |   2 +-
 extensions/media-preview/package-lock.json    | 141 ++++++++++--------
 extensions/media-preview/package.json         |   2 +-
 extensions/merge-conflict/package-lock.json   | 141 ++++++++++--------
 extensions/merge-conflict/package.json        |   2 +-
 .../package-lock.json                         | 141 ++++++++++--------
 .../microsoft-authentication/package.json     |   2 +-
 extensions/simple-browser/package-lock.json   | 141 ++++++++++--------
 extensions/simple-browser/package.json        |   2 +-
 .../package-lock.json                         | 141 ++++++++++--------
 .../typescript-language-features/package.json |   2 +-
 22 files changed, 847 insertions(+), 726 deletions(-)

diff --git a/extensions/git/package-lock.json b/extensions/git/package-lock.json
index cf05db079db..bc150555c70 100644
--- a/extensions/git/package-lock.json
+++ b/extensions/git/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@joaomoreno/unique-names-generator": "^5.2.0",
-        "@vscode/extension-telemetry": "^0.9.0",
+        "@vscode/extension-telemetry": "^0.9.8",
         "@vscode/iconv-lite-umd": "0.7.0",
         "byline": "^5.0.0",
         "file-type": "16.5.4",
@@ -40,118 +40,128 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz",
-      "integrity": "sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
+      "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz",
-      "integrity": "sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz",
+      "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.0.3",
+        "@microsoft/1ds-core-js": "4.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-channel-js": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz",
-      "integrity": "sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz",
+      "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-common": "3.0.4",
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-common": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-common": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz",
-      "integrity": "sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz",
+      "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz",
-      "integrity": "sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz",
+      "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==",
+      "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-shims": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
       "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "license": "MIT",
       "dependencies": {
         "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-web-basic": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz",
-      "integrity": "sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz",
+      "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-channel-js": "3.0.4",
-        "@microsoft/applicationinsights-common": "3.0.4",
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-channel-js": "3.3.4",
+        "@microsoft/applicationinsights-common": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/dynamicproto-js": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz",
-      "integrity": "sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
+      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+      "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
       }
     },
     "node_modules/@nevware21/ts-async": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.3.0.tgz",
-      "integrity": "sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.4.tgz",
+      "integrity": "sha512-IBTyj29GwGlxfzXw2NPnzty+w0Adx61Eze1/lknH/XIVdxtF9UnOpk76tnrHXWa6j84a1RR9hsOcHQPFv9qJjA==",
+      "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.10.0 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.6 < 2.x"
       }
     },
     "node_modules/@nevware21/ts-utils": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz",
-      "integrity": "sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg=="
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.6.tgz",
+      "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
+      "license": "MIT"
     },
     "node_modules/@tokenizer/token": {
       "version": "0.3.0",
@@ -195,13 +205,14 @@
       "dev": true
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz",
-      "integrity": "sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.8.tgz",
+      "integrity": "sha512-7YcKoUvmHlIB8QYCE4FNzt3ErHi9gQPhdCM3ZWtpw1bxPT0I+lMdx52KHlzTNoJzQ2NvMX7HyzyDwBEiMgTrWQ==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^4.0.3",
-        "@microsoft/1ds-post-js": "^4.0.3",
-        "@microsoft/applicationinsights-web-basic": "^3.0.4"
+        "@microsoft/1ds-core-js": "^4.3.4",
+        "@microsoft/1ds-post-js": "^4.3.4",
+        "@microsoft/applicationinsights-web-basic": "^3.3.4"
       },
       "engines": {
         "vscode": "^1.75.0"
diff --git a/extensions/git/package.json b/extensions/git/package.json
index 9aedfbb16e3..8b8f52643a8 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -3471,7 +3471,7 @@
   },
   "dependencies": {
     "@joaomoreno/unique-names-generator": "^5.2.0",
-    "@vscode/extension-telemetry": "^0.9.0",
+    "@vscode/extension-telemetry": "^0.9.8",
     "@vscode/iconv-lite-umd": "0.7.0",
     "byline": "^5.0.0",
     "file-type": "16.5.4",
diff --git a/extensions/github-authentication/package-lock.json b/extensions/github-authentication/package-lock.json
index c150fa7acc3..cbc9e16b75f 100644
--- a/extensions/github-authentication/package-lock.json
+++ b/extensions/github-authentication/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.0.2",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^0.9.0",
+        "@vscode/extension-telemetry": "^0.9.8",
         "node-fetch": "2.6.7",
         "vscode-tas-client": "^0.1.84"
       },
@@ -23,118 +23,128 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz",
-      "integrity": "sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
+      "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz",
-      "integrity": "sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz",
+      "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.0.3",
+        "@microsoft/1ds-core-js": "4.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-channel-js": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz",
-      "integrity": "sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz",
+      "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-common": "3.0.4",
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-common": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-common": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz",
-      "integrity": "sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz",
+      "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz",
-      "integrity": "sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz",
+      "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==",
+      "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-shims": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
       "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "license": "MIT",
       "dependencies": {
         "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-web-basic": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz",
-      "integrity": "sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz",
+      "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-channel-js": "3.0.4",
-        "@microsoft/applicationinsights-common": "3.0.4",
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-channel-js": "3.3.4",
+        "@microsoft/applicationinsights-common": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/dynamicproto-js": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz",
-      "integrity": "sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
+      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+      "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
       }
     },
     "node_modules/@nevware21/ts-async": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.3.0.tgz",
-      "integrity": "sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.4.tgz",
+      "integrity": "sha512-IBTyj29GwGlxfzXw2NPnzty+w0Adx61Eze1/lknH/XIVdxtF9UnOpk76tnrHXWa6j84a1RR9hsOcHQPFv9qJjA==",
+      "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.10.0 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.6 < 2.x"
       }
     },
     "node_modules/@nevware21/ts-utils": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz",
-      "integrity": "sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg=="
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.6.tgz",
+      "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
+      "license": "MIT"
     },
     "node_modules/@types/mocha": {
       "version": "9.1.1",
@@ -162,13 +172,14 @@
       }
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz",
-      "integrity": "sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.8.tgz",
+      "integrity": "sha512-7YcKoUvmHlIB8QYCE4FNzt3ErHi9gQPhdCM3ZWtpw1bxPT0I+lMdx52KHlzTNoJzQ2NvMX7HyzyDwBEiMgTrWQ==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^4.0.3",
-        "@microsoft/1ds-post-js": "^4.0.3",
-        "@microsoft/applicationinsights-web-basic": "^3.0.4"
+        "@microsoft/1ds-core-js": "^4.3.4",
+        "@microsoft/1ds-post-js": "^4.3.4",
+        "@microsoft/applicationinsights-web-basic": "^3.3.4"
       },
       "engines": {
         "vscode": "^1.75.0"
diff --git a/extensions/github-authentication/package.json b/extensions/github-authentication/package.json
index cbc1ddc11dd..80b5d2c920e 100644
--- a/extensions/github-authentication/package.json
+++ b/extensions/github-authentication/package.json
@@ -61,7 +61,7 @@
   },
   "dependencies": {
     "node-fetch": "2.6.7",
-    "@vscode/extension-telemetry": "^0.9.0",
+    "@vscode/extension-telemetry": "^0.9.8",
     "vscode-tas-client": "^0.1.84"
   },
   "devDependencies": {
diff --git a/extensions/github/package-lock.json b/extensions/github/package-lock.json
index 41de66d1a9b..1b7dc727a92 100644
--- a/extensions/github/package-lock.json
+++ b/extensions/github/package-lock.json
@@ -12,7 +12,7 @@
         "@octokit/graphql": "5.0.5",
         "@octokit/graphql-schema": "14.4.0",
         "@octokit/rest": "19.0.4",
-        "@vscode/extension-telemetry": "^0.9.0",
+        "@vscode/extension-telemetry": "^0.9.8",
         "tunnel": "^0.0.6"
       },
       "devDependencies": {
@@ -23,118 +23,128 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz",
-      "integrity": "sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
+      "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz",
-      "integrity": "sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz",
+      "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.0.3",
+        "@microsoft/1ds-core-js": "4.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-channel-js": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz",
-      "integrity": "sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz",
+      "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-common": "3.0.4",
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-common": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-common": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz",
-      "integrity": "sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz",
+      "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz",
-      "integrity": "sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz",
+      "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==",
+      "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-shims": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
       "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "license": "MIT",
       "dependencies": {
         "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-web-basic": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz",
-      "integrity": "sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz",
+      "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-channel-js": "3.0.4",
-        "@microsoft/applicationinsights-common": "3.0.4",
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-channel-js": "3.3.4",
+        "@microsoft/applicationinsights-common": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/dynamicproto-js": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz",
-      "integrity": "sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
+      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+      "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
       }
     },
     "node_modules/@nevware21/ts-async": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.3.0.tgz",
-      "integrity": "sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.4.tgz",
+      "integrity": "sha512-IBTyj29GwGlxfzXw2NPnzty+w0Adx61Eze1/lknH/XIVdxtF9UnOpk76tnrHXWa6j84a1RR9hsOcHQPFv9qJjA==",
+      "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.10.0 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.6 < 2.x"
       }
     },
     "node_modules/@nevware21/ts-utils": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz",
-      "integrity": "sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg=="
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.6.tgz",
+      "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
+      "license": "MIT"
     },
     "node_modules/@octokit/auth-token": {
       "version": "3.0.1",
@@ -393,13 +403,14 @@
       }
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz",
-      "integrity": "sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.8.tgz",
+      "integrity": "sha512-7YcKoUvmHlIB8QYCE4FNzt3ErHi9gQPhdCM3ZWtpw1bxPT0I+lMdx52KHlzTNoJzQ2NvMX7HyzyDwBEiMgTrWQ==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^4.0.3",
-        "@microsoft/1ds-post-js": "^4.0.3",
-        "@microsoft/applicationinsights-web-basic": "^3.0.4"
+        "@microsoft/1ds-core-js": "^4.3.4",
+        "@microsoft/1ds-post-js": "^4.3.4",
+        "@microsoft/applicationinsights-web-basic": "^3.3.4"
       },
       "engines": {
         "vscode": "^1.75.0"
diff --git a/extensions/github/package.json b/extensions/github/package.json
index e84b35d19b7..f99a41d5979 100644
--- a/extensions/github/package.json
+++ b/extensions/github/package.json
@@ -183,7 +183,7 @@
     "@octokit/graphql-schema": "14.4.0",
     "@octokit/rest": "19.0.4",
     "tunnel": "^0.0.6",
-    "@vscode/extension-telemetry": "^0.9.0"
+    "@vscode/extension-telemetry": "^0.9.8"
   },
   "devDependencies": {
     "@types/node": "20.x"
diff --git a/extensions/html-language-features/package-lock.json b/extensions/html-language-features/package-lock.json
index fbb95e522dd..20b14561533 100644
--- a/extensions/html-language-features/package-lock.json
+++ b/extensions/html-language-features/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^0.9.0",
+        "@vscode/extension-telemetry": "^0.9.8",
         "vscode-languageclient": "^10.0.0-next.13",
         "vscode-uri": "^3.0.8"
       },
@@ -21,118 +21,128 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz",
-      "integrity": "sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
+      "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz",
-      "integrity": "sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz",
+      "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.0.3",
+        "@microsoft/1ds-core-js": "4.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-channel-js": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz",
-      "integrity": "sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz",
+      "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-common": "3.0.4",
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-common": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-common": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz",
-      "integrity": "sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz",
+      "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz",
-      "integrity": "sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz",
+      "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==",
+      "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-shims": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
       "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "license": "MIT",
       "dependencies": {
         "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-web-basic": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz",
-      "integrity": "sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz",
+      "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-channel-js": "3.0.4",
-        "@microsoft/applicationinsights-common": "3.0.4",
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-channel-js": "3.3.4",
+        "@microsoft/applicationinsights-common": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/dynamicproto-js": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz",
-      "integrity": "sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
+      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+      "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
       }
     },
     "node_modules/@nevware21/ts-async": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.3.0.tgz",
-      "integrity": "sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.4.tgz",
+      "integrity": "sha512-IBTyj29GwGlxfzXw2NPnzty+w0Adx61Eze1/lknH/XIVdxtF9UnOpk76tnrHXWa6j84a1RR9hsOcHQPFv9qJjA==",
+      "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.10.0 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.6 < 2.x"
       }
     },
     "node_modules/@nevware21/ts-utils": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz",
-      "integrity": "sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg=="
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.6.tgz",
+      "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
+      "license": "MIT"
     },
     "node_modules/@types/node": {
       "version": "20.11.24",
@@ -144,13 +154,14 @@
       }
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz",
-      "integrity": "sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.8.tgz",
+      "integrity": "sha512-7YcKoUvmHlIB8QYCE4FNzt3ErHi9gQPhdCM3ZWtpw1bxPT0I+lMdx52KHlzTNoJzQ2NvMX7HyzyDwBEiMgTrWQ==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^4.0.3",
-        "@microsoft/1ds-post-js": "^4.0.3",
-        "@microsoft/applicationinsights-web-basic": "^3.0.4"
+        "@microsoft/1ds-core-js": "^4.3.4",
+        "@microsoft/1ds-post-js": "^4.3.4",
+        "@microsoft/applicationinsights-web-basic": "^3.3.4"
       },
       "engines": {
         "vscode": "^1.75.0"
diff --git a/extensions/html-language-features/package.json b/extensions/html-language-features/package.json
index 60b9718e6c3..be411fe63a2 100644
--- a/extensions/html-language-features/package.json
+++ b/extensions/html-language-features/package.json
@@ -258,7 +258,7 @@
     ]
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "^0.9.0",
+    "@vscode/extension-telemetry": "^0.9.8",
     "vscode-languageclient": "^10.0.0-next.13",
     "vscode-uri": "^3.0.8"
   },
diff --git a/extensions/json-language-features/package-lock.json b/extensions/json-language-features/package-lock.json
index f28a8c68df0..bde80cbfbe4 100644
--- a/extensions/json-language-features/package-lock.json
+++ b/extensions/json-language-features/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^0.9.0",
+        "@vscode/extension-telemetry": "^0.9.8",
         "request-light": "^0.8.0",
         "vscode-languageclient": "^10.0.0-next.13"
       },
@@ -21,118 +21,128 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz",
-      "integrity": "sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
+      "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz",
-      "integrity": "sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz",
+      "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.0.3",
+        "@microsoft/1ds-core-js": "4.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-channel-js": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz",
-      "integrity": "sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz",
+      "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-common": "3.0.4",
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-common": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-common": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz",
-      "integrity": "sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz",
+      "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz",
-      "integrity": "sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz",
+      "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==",
+      "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-shims": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
       "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "license": "MIT",
       "dependencies": {
         "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-web-basic": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz",
-      "integrity": "sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz",
+      "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-channel-js": "3.0.4",
-        "@microsoft/applicationinsights-common": "3.0.4",
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-channel-js": "3.3.4",
+        "@microsoft/applicationinsights-common": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/dynamicproto-js": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz",
-      "integrity": "sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
+      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+      "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
       }
     },
     "node_modules/@nevware21/ts-async": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.3.0.tgz",
-      "integrity": "sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.4.tgz",
+      "integrity": "sha512-IBTyj29GwGlxfzXw2NPnzty+w0Adx61Eze1/lknH/XIVdxtF9UnOpk76tnrHXWa6j84a1RR9hsOcHQPFv9qJjA==",
+      "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.10.0 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.6 < 2.x"
       }
     },
     "node_modules/@nevware21/ts-utils": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz",
-      "integrity": "sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg=="
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.6.tgz",
+      "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
+      "license": "MIT"
     },
     "node_modules/@types/node": {
       "version": "20.11.24",
@@ -144,13 +154,14 @@
       }
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz",
-      "integrity": "sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.8.tgz",
+      "integrity": "sha512-7YcKoUvmHlIB8QYCE4FNzt3ErHi9gQPhdCM3ZWtpw1bxPT0I+lMdx52KHlzTNoJzQ2NvMX7HyzyDwBEiMgTrWQ==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^4.0.3",
-        "@microsoft/1ds-post-js": "^4.0.3",
-        "@microsoft/applicationinsights-web-basic": "^3.0.4"
+        "@microsoft/1ds-core-js": "^4.3.4",
+        "@microsoft/1ds-post-js": "^4.3.4",
+        "@microsoft/applicationinsights-web-basic": "^3.3.4"
       },
       "engines": {
         "vscode": "^1.75.0"
diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json
index ff620435b98..cf4a7f162da 100644
--- a/extensions/json-language-features/package.json
+++ b/extensions/json-language-features/package.json
@@ -167,7 +167,7 @@
     ]
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "^0.9.0",
+    "@vscode/extension-telemetry": "^0.9.8",
     "request-light": "^0.8.0",
     "vscode-languageclient": "^10.0.0-next.13"
   },
diff --git a/extensions/markdown-language-features/package-lock.json b/extensions/markdown-language-features/package-lock.json
index 91a1a6c5cb9..c13d2a007ad 100644
--- a/extensions/markdown-language-features/package-lock.json
+++ b/extensions/markdown-language-features/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^0.9.0",
+        "@vscode/extension-telemetry": "^0.9.8",
         "dompurify": "^3.1.7",
         "highlight.js": "^11.8.0",
         "markdown-it": "^12.3.2",
@@ -39,118 +39,128 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz",
-      "integrity": "sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
+      "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz",
-      "integrity": "sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz",
+      "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.0.3",
+        "@microsoft/1ds-core-js": "4.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-channel-js": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz",
-      "integrity": "sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz",
+      "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-common": "3.0.4",
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-common": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-common": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz",
-      "integrity": "sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz",
+      "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz",
-      "integrity": "sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz",
+      "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==",
+      "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-shims": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
       "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "license": "MIT",
       "dependencies": {
         "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-web-basic": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz",
-      "integrity": "sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz",
+      "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-channel-js": "3.0.4",
-        "@microsoft/applicationinsights-common": "3.0.4",
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-channel-js": "3.3.4",
+        "@microsoft/applicationinsights-common": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/dynamicproto-js": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz",
-      "integrity": "sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
+      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+      "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
       }
     },
     "node_modules/@nevware21/ts-async": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.3.0.tgz",
-      "integrity": "sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.4.tgz",
+      "integrity": "sha512-IBTyj29GwGlxfzXw2NPnzty+w0Adx61Eze1/lknH/XIVdxtF9UnOpk76tnrHXWa6j84a1RR9hsOcHQPFv9qJjA==",
+      "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.10.0 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.6 < 2.x"
       }
     },
     "node_modules/@nevware21/ts-utils": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz",
-      "integrity": "sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg=="
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.6.tgz",
+      "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
+      "license": "MIT"
     },
     "node_modules/@types/dompurify": {
       "version": "3.0.5",
@@ -223,13 +233,14 @@
       "dev": true
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz",
-      "integrity": "sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.8.tgz",
+      "integrity": "sha512-7YcKoUvmHlIB8QYCE4FNzt3ErHi9gQPhdCM3ZWtpw1bxPT0I+lMdx52KHlzTNoJzQ2NvMX7HyzyDwBEiMgTrWQ==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^4.0.3",
-        "@microsoft/1ds-post-js": "^4.0.3",
-        "@microsoft/applicationinsights-web-basic": "^3.0.4"
+        "@microsoft/1ds-core-js": "^4.3.4",
+        "@microsoft/1ds-post-js": "^4.3.4",
+        "@microsoft/applicationinsights-web-basic": "^3.3.4"
       },
       "engines": {
         "vscode": "^1.75.0"
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
index 3f1c3a5fd58..6ed7ff1e62e 100644
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -763,7 +763,7 @@
     "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "^0.9.0",
+    "@vscode/extension-telemetry": "^0.9.8",
     "dompurify": "^3.1.7",
     "highlight.js": "^11.8.0",
     "markdown-it": "^12.3.2",
diff --git a/extensions/media-preview/package-lock.json b/extensions/media-preview/package-lock.json
index 68391b8c4be..d26855f3ad2 100644
--- a/extensions/media-preview/package-lock.json
+++ b/extensions/media-preview/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^0.9.0",
+        "@vscode/extension-telemetry": "^0.9.8",
         "vscode-uri": "^3.0.6"
       },
       "engines": {
@@ -17,127 +17,138 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz",
-      "integrity": "sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
+      "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz",
-      "integrity": "sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz",
+      "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.0.3",
+        "@microsoft/1ds-core-js": "4.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-channel-js": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz",
-      "integrity": "sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz",
+      "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-common": "3.0.4",
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-common": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-common": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz",
-      "integrity": "sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz",
+      "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz",
-      "integrity": "sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz",
+      "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==",
+      "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-shims": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
       "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "license": "MIT",
       "dependencies": {
         "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-web-basic": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz",
-      "integrity": "sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz",
+      "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-channel-js": "3.0.4",
-        "@microsoft/applicationinsights-common": "3.0.4",
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-channel-js": "3.3.4",
+        "@microsoft/applicationinsights-common": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/dynamicproto-js": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz",
-      "integrity": "sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
+      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+      "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
       }
     },
     "node_modules/@nevware21/ts-async": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.3.0.tgz",
-      "integrity": "sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.4.tgz",
+      "integrity": "sha512-IBTyj29GwGlxfzXw2NPnzty+w0Adx61Eze1/lknH/XIVdxtF9UnOpk76tnrHXWa6j84a1RR9hsOcHQPFv9qJjA==",
+      "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.10.0 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.6 < 2.x"
       }
     },
     "node_modules/@nevware21/ts-utils": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz",
-      "integrity": "sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg=="
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.6.tgz",
+      "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
+      "license": "MIT"
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz",
-      "integrity": "sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.8.tgz",
+      "integrity": "sha512-7YcKoUvmHlIB8QYCE4FNzt3ErHi9gQPhdCM3ZWtpw1bxPT0I+lMdx52KHlzTNoJzQ2NvMX7HyzyDwBEiMgTrWQ==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^4.0.3",
-        "@microsoft/1ds-post-js": "^4.0.3",
-        "@microsoft/applicationinsights-web-basic": "^3.0.4"
+        "@microsoft/1ds-core-js": "^4.3.4",
+        "@microsoft/1ds-post-js": "^4.3.4",
+        "@microsoft/applicationinsights-web-basic": "^3.3.4"
       },
       "engines": {
         "vscode": "^1.75.0"
diff --git a/extensions/media-preview/package.json b/extensions/media-preview/package.json
index b42256a2260..e7ddad4354e 100644
--- a/extensions/media-preview/package.json
+++ b/extensions/media-preview/package.json
@@ -126,7 +126,7 @@
     "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "^0.9.0",
+    "@vscode/extension-telemetry": "^0.9.8",
     "vscode-uri": "^3.0.6"
   },
   "repository": {
diff --git a/extensions/merge-conflict/package-lock.json b/extensions/merge-conflict/package-lock.json
index a57272606cd..5ee68d290f0 100644
--- a/extensions/merge-conflict/package-lock.json
+++ b/extensions/merge-conflict/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^0.9.0"
+        "@vscode/extension-telemetry": "^0.9.8"
       },
       "devDependencies": {
         "@types/node": "20.x"
@@ -19,118 +19,128 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz",
-      "integrity": "sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
+      "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz",
-      "integrity": "sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz",
+      "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.0.3",
+        "@microsoft/1ds-core-js": "4.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-channel-js": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz",
-      "integrity": "sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz",
+      "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-common": "3.0.4",
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-common": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-common": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz",
-      "integrity": "sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz",
+      "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz",
-      "integrity": "sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz",
+      "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==",
+      "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-shims": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
       "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "license": "MIT",
       "dependencies": {
         "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-web-basic": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz",
-      "integrity": "sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz",
+      "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-channel-js": "3.0.4",
-        "@microsoft/applicationinsights-common": "3.0.4",
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-channel-js": "3.3.4",
+        "@microsoft/applicationinsights-common": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/dynamicproto-js": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz",
-      "integrity": "sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
+      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+      "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
       }
     },
     "node_modules/@nevware21/ts-async": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.3.0.tgz",
-      "integrity": "sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.4.tgz",
+      "integrity": "sha512-IBTyj29GwGlxfzXw2NPnzty+w0Adx61Eze1/lknH/XIVdxtF9UnOpk76tnrHXWa6j84a1RR9hsOcHQPFv9qJjA==",
+      "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.10.0 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.6 < 2.x"
       }
     },
     "node_modules/@nevware21/ts-utils": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz",
-      "integrity": "sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg=="
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.6.tgz",
+      "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
+      "license": "MIT"
     },
     "node_modules/@types/node": {
       "version": "20.11.24",
@@ -142,13 +152,14 @@
       }
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz",
-      "integrity": "sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.8.tgz",
+      "integrity": "sha512-7YcKoUvmHlIB8QYCE4FNzt3ErHi9gQPhdCM3ZWtpw1bxPT0I+lMdx52KHlzTNoJzQ2NvMX7HyzyDwBEiMgTrWQ==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^4.0.3",
-        "@microsoft/1ds-post-js": "^4.0.3",
-        "@microsoft/applicationinsights-web-basic": "^3.0.4"
+        "@microsoft/1ds-core-js": "^4.3.4",
+        "@microsoft/1ds-post-js": "^4.3.4",
+        "@microsoft/applicationinsights-web-basic": "^3.3.4"
       },
       "engines": {
         "vscode": "^1.75.0"
diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json
index cdda46fab32..de56c9c22cf 100644
--- a/extensions/merge-conflict/package.json
+++ b/extensions/merge-conflict/package.json
@@ -166,7 +166,7 @@
     }
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "^0.9.0"
+    "@vscode/extension-telemetry": "^0.9.8"
   },
   "devDependencies": {
     "@types/node": "20.x"
diff --git a/extensions/microsoft-authentication/package-lock.json b/extensions/microsoft-authentication/package-lock.json
index 9f69f13972c..4aae40c5f17 100644
--- a/extensions/microsoft-authentication/package-lock.json
+++ b/extensions/microsoft-authentication/package-lock.json
@@ -12,7 +12,7 @@
         "@azure/ms-rest-azure-env": "^2.0.0",
         "@azure/msal-node": "^2.16.2",
         "@azure/msal-node-extensions": "^1.5.0",
-        "@vscode/extension-telemetry": "^0.9.0",
+        "@vscode/extension-telemetry": "^0.9.8",
         "keytar": "file:./packageMocks/keytar",
         "vscode-tas-client": "^0.1.84"
       },
@@ -78,118 +78,128 @@
       "license": "MIT"
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz",
-      "integrity": "sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
+      "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz",
-      "integrity": "sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz",
+      "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.0.3",
+        "@microsoft/1ds-core-js": "4.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-channel-js": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz",
-      "integrity": "sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz",
+      "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-common": "3.0.4",
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-common": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-common": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz",
-      "integrity": "sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz",
+      "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz",
-      "integrity": "sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz",
+      "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==",
+      "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-shims": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
       "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "license": "MIT",
       "dependencies": {
         "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-web-basic": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz",
-      "integrity": "sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz",
+      "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-channel-js": "3.0.4",
-        "@microsoft/applicationinsights-common": "3.0.4",
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-channel-js": "3.3.4",
+        "@microsoft/applicationinsights-common": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/dynamicproto-js": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz",
-      "integrity": "sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
+      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+      "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
       }
     },
     "node_modules/@nevware21/ts-async": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.3.0.tgz",
-      "integrity": "sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.4.tgz",
+      "integrity": "sha512-IBTyj29GwGlxfzXw2NPnzty+w0Adx61Eze1/lknH/XIVdxtF9UnOpk76tnrHXWa6j84a1RR9hsOcHQPFv9qJjA==",
+      "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.10.0 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.6 < 2.x"
       }
     },
     "node_modules/@nevware21/ts-utils": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz",
-      "integrity": "sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg=="
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.6.tgz",
+      "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
+      "license": "MIT"
     },
     "node_modules/@types/node": {
       "version": "20.11.24",
@@ -235,13 +245,14 @@
       "dev": true
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz",
-      "integrity": "sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.8.tgz",
+      "integrity": "sha512-7YcKoUvmHlIB8QYCE4FNzt3ErHi9gQPhdCM3ZWtpw1bxPT0I+lMdx52KHlzTNoJzQ2NvMX7HyzyDwBEiMgTrWQ==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^4.0.3",
-        "@microsoft/1ds-post-js": "^4.0.3",
-        "@microsoft/applicationinsights-web-basic": "^3.0.4"
+        "@microsoft/1ds-core-js": "^4.3.4",
+        "@microsoft/1ds-post-js": "^4.3.4",
+        "@microsoft/applicationinsights-web-basic": "^3.3.4"
       },
       "engines": {
         "vscode": "^1.75.0"
diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json
index c8ad1c070e2..ba7d83aa359 100644
--- a/extensions/microsoft-authentication/package.json
+++ b/extensions/microsoft-authentication/package.json
@@ -142,7 +142,7 @@
     "@azure/ms-rest-azure-env": "^2.0.0",
     "@azure/msal-node": "^2.16.2",
     "@azure/msal-node-extensions": "^1.5.0",
-    "@vscode/extension-telemetry": "^0.9.0",
+    "@vscode/extension-telemetry": "^0.9.8",
     "keytar": "file:./packageMocks/keytar",
     "vscode-tas-client": "^0.1.84"
   },
diff --git a/extensions/simple-browser/package-lock.json b/extensions/simple-browser/package-lock.json
index d3542946e63..c6d9b23636a 100644
--- a/extensions/simple-browser/package-lock.json
+++ b/extensions/simple-browser/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^0.9.0"
+        "@vscode/extension-telemetry": "^0.9.8"
       },
       "devDependencies": {
         "@types/vscode-webview": "^1.57.0",
@@ -20,118 +20,128 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz",
-      "integrity": "sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
+      "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz",
-      "integrity": "sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz",
+      "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.0.3",
+        "@microsoft/1ds-core-js": "4.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-channel-js": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz",
-      "integrity": "sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz",
+      "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-common": "3.0.4",
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-common": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-common": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz",
-      "integrity": "sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz",
+      "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz",
-      "integrity": "sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz",
+      "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==",
+      "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-shims": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
       "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "license": "MIT",
       "dependencies": {
         "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-web-basic": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz",
-      "integrity": "sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz",
+      "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-channel-js": "3.0.4",
-        "@microsoft/applicationinsights-common": "3.0.4",
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-channel-js": "3.3.4",
+        "@microsoft/applicationinsights-common": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/dynamicproto-js": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz",
-      "integrity": "sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
+      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+      "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
       }
     },
     "node_modules/@nevware21/ts-async": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.3.0.tgz",
-      "integrity": "sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.4.tgz",
+      "integrity": "sha512-IBTyj29GwGlxfzXw2NPnzty+w0Adx61Eze1/lknH/XIVdxtF9UnOpk76tnrHXWa6j84a1RR9hsOcHQPFv9qJjA==",
+      "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.10.0 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.6 < 2.x"
       }
     },
     "node_modules/@nevware21/ts-utils": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz",
-      "integrity": "sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg=="
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.6.tgz",
+      "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
+      "license": "MIT"
     },
     "node_modules/@types/vscode-webview": {
       "version": "1.57.0",
@@ -147,13 +157,14 @@
       "license": "CC-BY-4.0"
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz",
-      "integrity": "sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.8.tgz",
+      "integrity": "sha512-7YcKoUvmHlIB8QYCE4FNzt3ErHi9gQPhdCM3ZWtpw1bxPT0I+lMdx52KHlzTNoJzQ2NvMX7HyzyDwBEiMgTrWQ==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^4.0.3",
-        "@microsoft/1ds-post-js": "^4.0.3",
-        "@microsoft/applicationinsights-web-basic": "^3.0.4"
+        "@microsoft/1ds-core-js": "^4.3.4",
+        "@microsoft/1ds-post-js": "^4.3.4",
+        "@microsoft/applicationinsights-web-basic": "^3.3.4"
       },
       "engines": {
         "vscode": "^1.75.0"
diff --git a/extensions/simple-browser/package.json b/extensions/simple-browser/package.json
index 0d812db6078..9aba9ad2503 100644
--- a/extensions/simple-browser/package.json
+++ b/extensions/simple-browser/package.json
@@ -66,7 +66,7 @@
     "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
   },
   "dependencies": {
-    "@vscode/extension-telemetry": "^0.9.0"
+    "@vscode/extension-telemetry": "^0.9.8"
   },
   "devDependencies": {
     "@types/vscode-webview": "^1.57.0",
diff --git a/extensions/typescript-language-features/package-lock.json b/extensions/typescript-language-features/package-lock.json
index 6a19dce700f..4f97eb1048c 100644
--- a/extensions/typescript-language-features/package-lock.json
+++ b/extensions/typescript-language-features/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "@vscode/extension-telemetry": "^0.9.0",
+        "@vscode/extension-telemetry": "^0.9.8",
         "@vscode/sync-api-client": "^0.7.2",
         "@vscode/sync-api-common": "^0.7.2",
         "@vscode/sync-api-service": "^0.7.3",
@@ -28,118 +28,128 @@
       }
     },
     "node_modules/@microsoft/1ds-core-js": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.0.3.tgz",
-      "integrity": "sha512-FrxNLVAPsAvD7+l63TlNS/Kodvpct2WulpDSn1dI4Xuy0kF4E2H867kHdwL/iY1Bj3zA3FSy/jvE4+OcDws7ug==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-core-js/-/1ds-core-js-4.3.4.tgz",
+      "integrity": "sha512-3gbDUQgAO8EoyQTNcAEkxpuPnioC0May13P1l1l0NKZ128L9Ts/sj8QsfwCRTjHz0HThlA+4FptcAJXNYUy3rg==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       }
     },
     "node_modules/@microsoft/1ds-post-js": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.0.3.tgz",
-      "integrity": "sha512-uewvmUtXKd7ttypiKQGdYI6i7UUpPkOznLayzIFrJ4r2xnG6jhPjpKRncHFXPQcM4XSWO3yf5PQ3xAbPq9t7ZQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/1ds-post-js/-/1ds-post-js-4.3.4.tgz",
+      "integrity": "sha512-nlKjWricDj0Tn68Dt0P8lX9a+X7LYrqJ6/iSfQwMfDhRIGLqW+wxx8gxS+iGWC/oc8zMQAeiZaemUpCwQcwpRQ==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "4.0.3",
+        "@microsoft/1ds-core-js": "4.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-channel-js": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.0.4.tgz",
-      "integrity": "sha512-6TlfExmErQ8Y+/ChbkyWl+jyt4wg3T6p7lwXDsUCB0LgZmlEWMaCUS0YlT73JCWmE8j7vxW8yUm0lgsgmHns3A==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-3.3.4.tgz",
+      "integrity": "sha512-Z4nrxYwGKP9iyrYtm7iPQXVOFy4FsEsX0nDKkAi96Qpgw+vEh6NH4ORxMMuES0EollBQ3faJyvYCwckuCVIj0g==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-common": "3.0.4",
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-common": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-common": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.0.4.tgz",
-      "integrity": "sha512-r5gWaw/K9+tKfuo2GtDiDiKASgOkPOCrKW+wZzFvuR06uuwvWjbVQ6yW/YbnfuhRF5M65ksUiMi0eCMwEOGq7Q==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-3.3.4.tgz",
+      "integrity": "sha512-4ms16MlIvcP4WiUPqopifNxcWCcrXQJ2ADAK/75uok2mNQe6ZNRsqb/P+pvhUxc8A5HRlvoXPP1ptDSN5Girgw==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-core-js": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.0.4.tgz",
-      "integrity": "sha512-anxy5kEkqBmVoEqJiJzaaXXA0wzqZi9U4zGd05xFJ04lWckP8dG3zyT3+GGdg7rDelqLTNGxndeYoFmDv63u1g==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-3.3.4.tgz",
+      "integrity": "sha512-MummANF0mgKIkdvVvfmHQTBliK114IZLRhTL0X0Ep+zjDwWMHqYZgew0nlFKAl6ggu42abPZFK5afpE7qjtYJA==",
+      "license": "MIT",
       "dependencies": {
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/applicationinsights-shims": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-shims/-/applicationinsights-shims-3.0.1.tgz",
       "integrity": "sha512-DKwboF47H1nb33rSUfjqI6ryX29v+2QWcTrRvcQDA32AZr5Ilkr7whOOSsD1aBzwqX0RJEIP1Z81jfE3NBm/Lg==",
+      "license": "MIT",
       "dependencies": {
         "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
       }
     },
     "node_modules/@microsoft/applicationinsights-web-basic": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.0.4.tgz",
-      "integrity": "sha512-KfoxPlLlf0JT12ADb23C5iGye/yFouoMgHEKULxkSQcYY9SsW/8rVrqqvoYKAL+u215CZU2A8Kc8sR3ehEaPCQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web-basic/-/applicationinsights-web-basic-3.3.4.tgz",
+      "integrity": "sha512-OpEPXr8vU/t/M8T9jvWJzJx/pCyygIiR1nGM/2PTde0wn7anl71Gxl5fWol7K/WwFEORNjkL3CEyWOyDc+28AA==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/applicationinsights-channel-js": "3.0.4",
-        "@microsoft/applicationinsights-common": "3.0.4",
-        "@microsoft/applicationinsights-core-js": "3.0.4",
+        "@microsoft/applicationinsights-channel-js": "3.3.4",
+        "@microsoft/applicationinsights-common": "3.3.4",
+        "@microsoft/applicationinsights-core-js": "3.3.4",
         "@microsoft/applicationinsights-shims": "3.0.1",
-        "@microsoft/dynamicproto-js": "^2.0.2",
-        "@nevware21/ts-async": ">= 0.3.0 < 2.x",
-        "@nevware21/ts-utils": ">= 0.10.1 < 2.x"
+        "@microsoft/dynamicproto-js": "^2.0.3",
+        "@nevware21/ts-async": ">= 0.5.2 < 2.x",
+        "@nevware21/ts-utils": ">= 0.11.3 < 2.x"
       },
       "peerDependencies": {
-        "tslib": "*"
+        "tslib": ">= 1.0.0"
       }
     },
     "node_modules/@microsoft/dynamicproto-js": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.2.tgz",
-      "integrity": "sha512-MB8trWaFREpmb037k/d0bB7T2BP7Ai24w1e1tbz3ASLB0/lwphsq3Nq8S9I5AsI5vs4zAQT+SB5nC5/dLYTiOg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-2.0.3.tgz",
+      "integrity": "sha512-JTWTU80rMy3mdxOjjpaiDQsTLZ6YSGGqsjURsY6AUQtIj0udlF/jYmhdLZu8693ZIC0T1IwYnFa0+QeiMnziBA==",
+      "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.9.4 < 2.x"
+        "@nevware21/ts-utils": ">= 0.10.4 < 2.x"
       }
     },
     "node_modules/@nevware21/ts-async": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.3.0.tgz",
-      "integrity": "sha512-ZUcgUH12LN/F6nzN0cYd0F/rJaMLmXr0EHVTyYfaYmK55bdwE4338uue4UiVoRqHVqNW4KDUrJc49iGogHKeWA==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-async/-/ts-async-0.5.4.tgz",
+      "integrity": "sha512-IBTyj29GwGlxfzXw2NPnzty+w0Adx61Eze1/lknH/XIVdxtF9UnOpk76tnrHXWa6j84a1RR9hsOcHQPFv9qJjA==",
+      "license": "MIT",
       "dependencies": {
-        "@nevware21/ts-utils": ">= 0.10.0 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.6 < 2.x"
       }
     },
     "node_modules/@nevware21/ts-utils": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.10.1.tgz",
-      "integrity": "sha512-pMny25NnF2/MJwdqC3Iyjm2pGIXNxni4AROpcqDeWa+td9JMUY4bUS9uU9XW+BoBRqTLUL+WURF9SOd/6OQzRg=="
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/@nevware21/ts-utils/-/ts-utils-0.11.6.tgz",
+      "integrity": "sha512-OUUJTh3fnaUSzg9DEHgv3d7jC+DnPL65mIO7RaR+jWve7+MmcgIvF79gY97DPQ4frH+IpNR78YAYd/dW4gK3kg==",
+      "license": "MIT"
     },
     "node_modules/@types/node": {
       "version": "20.11.24",
@@ -157,13 +167,14 @@
       "dev": true
     },
     "node_modules/@vscode/extension-telemetry": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.0.tgz",
-      "integrity": "sha512-37RxGHXrs3GoXPgCUKQhghEu0gxs8j27RLjQwwtSf4WhPdJKz8UrqMYzpsXlliQ05zURYmtdGZst9C6+hfWXaQ==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@vscode/extension-telemetry/-/extension-telemetry-0.9.8.tgz",
+      "integrity": "sha512-7YcKoUvmHlIB8QYCE4FNzt3ErHi9gQPhdCM3ZWtpw1bxPT0I+lMdx52KHlzTNoJzQ2NvMX7HyzyDwBEiMgTrWQ==",
+      "license": "MIT",
       "dependencies": {
-        "@microsoft/1ds-core-js": "^4.0.3",
-        "@microsoft/1ds-post-js": "^4.0.3",
-        "@microsoft/applicationinsights-web-basic": "^3.0.4"
+        "@microsoft/1ds-core-js": "^4.3.4",
+        "@microsoft/1ds-post-js": "^4.3.4",
+        "@microsoft/applicationinsights-web-basic": "^3.3.4"
       },
       "engines": {
         "vscode": "^1.75.0"
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
index c6363dfc48e..65038311f76 100644
--- a/extensions/typescript-language-features/package.json
+++ b/extensions/typescript-language-features/package.json
@@ -40,7 +40,7 @@
     "Programming Languages"
   ],
   "dependencies": {
-    "@vscode/extension-telemetry": "^0.9.0",
+    "@vscode/extension-telemetry": "^0.9.8",
     "@vscode/sync-api-client": "^0.7.2",
     "@vscode/sync-api-common": "^0.7.2",
     "@vscode/sync-api-service": "^0.7.3",

From 1649b305c65c99dcc7b48ee1bf92453555f73203 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 17 Dec 2024 11:13:06 -0800
Subject: [PATCH 325/479] testing: fix can toggle inline test coverage for
 non-text files outside the workspace (#236386)

Fixes #235346
---
 .../contrib/testing/browser/codeCoverageDecorations.ts   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/testing/browser/codeCoverageDecorations.ts b/src/vs/workbench/contrib/testing/browser/codeCoverageDecorations.ts
index 0d85cf22e3a..f82948d3106 100644
--- a/src/vs/workbench/contrib/testing/browser/codeCoverageDecorations.ts
+++ b/src/vs/workbench/contrib/testing/browser/codeCoverageDecorations.ts
@@ -39,9 +39,8 @@ import { KeybindingWeight } from '../../../../platform/keybinding/common/keybind
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { bindContextKey, observableConfigValue } from '../../../../platform/observable/common/platformObservableUtils.js';
 import { IQuickInputService, QuickPickInput } from '../../../../platform/quickinput/common/quickInput.js';
-import * as coverUtils from './codeCoverageDisplayUtils.js';
-import { testingCoverageMissingBranch, testingCoverageReport, testingFilterIcon, testingRerunIcon } from './icons.js';
-import { ManagedTestCoverageBars } from './testCoverageBars.js';
+import { ActiveEditorContext } from '../../../common/contextkeys.js';
+import { TEXT_FILE_EDITOR_ID } from '../../files/common/files.js';
 import { getTestingConfiguration, TestingConfigKeys } from '../common/configuration.js';
 import { TestCommandId } from '../common/constants.js';
 import { FileCoverage } from '../common/testCoverage.js';
@@ -50,6 +49,9 @@ import { TestId } from '../common/testId.js';
 import { ITestService } from '../common/testService.js';
 import { CoverageDetails, DetailType, IDeclarationCoverage, IStatementCoverage } from '../common/testTypes.js';
 import { TestingContextKeys } from '../common/testingContextKeys.js';
+import * as coverUtils from './codeCoverageDisplayUtils.js';
+import { testingCoverageMissingBranch, testingCoverageReport, testingFilterIcon, testingRerunIcon } from './icons.js';
+import { ManagedTestCoverageBars } from './testCoverageBars.js';
 
 const CLASS_HIT = 'coverage-deco-hit';
 const CLASS_MISS = 'coverage-deco-miss';
@@ -772,6 +774,7 @@ registerAction2(class FilterCoverageToTestInEditor extends Action2 {
 						TestingContextKeys.isTestCoverageOpen,
 						TestingContextKeys.coverageToolbarEnabled.notEqualsTo(true),
 						TestingContextKeys.hasPerTestCoverage,
+						ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID),
 					),
 					group: 'navigation',
 				},

From 9bb364f3328e5fda91c2e3b77a557e2927653030 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 17 Dec 2024 11:17:01 -0800
Subject: [PATCH 326/479] testing: fix scrollbar overlaps coverage indicators
 (#236387)

Fixes #235343
---
 src/vs/workbench/contrib/testing/browser/media/testing.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/testing/browser/media/testing.css b/src/vs/workbench/contrib/testing/browser/media/testing.css
index 2ebd1fc35bc..d56ac88a185 100644
--- a/src/vs/workbench/contrib/testing/browser/media/testing.css
+++ b/src/vs/workbench/contrib/testing/browser/media/testing.css
@@ -481,7 +481,7 @@
 	align-items: center;
 	gap: 4px;
 	font-size: 11px;
-	margin-right: 0.8em;
+	margin-right: 12px;
 }
 
 .test-coverage-bars .bar {

From 6baeecd419a5197b1077d3a8e5e16e922c558258 Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <me@tylerleonhardt.com>
Date: Tue, 17 Dec 2024 11:23:55 -0800
Subject: [PATCH 327/479] Add my labels (#236391)

---
 .vscode/notebooks/grooming.github-issues | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vscode/notebooks/grooming.github-issues b/.vscode/notebooks/grooming.github-issues
index e408bbd7421..6d9deb71792 100644
--- a/.vscode/notebooks/grooming.github-issues
+++ b/.vscode/notebooks/grooming.github-issues
@@ -27,7 +27,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "repo:microsoft/vscode assignee:$assignee is:open type:issue -label:\"info-needed\" -label:api -label:api-finalization -label:api-proposal -label:authentication -label:bisect-ext -label:bracket-pair-colorization -label:bracket-pair-guides -label:breadcrumbs -label:callhierarchy -label:chrome-devtools -label:cloud-changes -label:code-lens -label:command-center -label:comments -label:config -label:containers -label:context-keys -label:continue-working-on -label:css-less-scss -label:custom-editors -label:debug -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor-api -label:editor-autoclosing -label:editor-autoindent -label:editor-bracket-matching -label:editor-clipboard -label:editor-code-actions -label:editor-color-picker -label:editor-columnselect -label:editor-commands -label:editor-comments -label:editor-contrib -label:editor-core -label:editor-drag-and-drop -label:editor-error-widget -label:editor-find -label:editor-folding -label:editor-highlight -label:editor-hover -label:editor-indent-detection -label:editor-indent-guides -label:editor-input -label:editor-input-IME -label:editor-insets -label:editor-minimap -label:editor-multicursor -label:editor-parameter-hints -label:editor-render-whitespace -label:editor-rendering -label:editor-widgets -label:editor-RTL -label:editor-scrollbar -label:editor-sorting -label:editor-sticky-scroll -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet -label:emmet-parse -label:error-list -label:extension-activation -label:extension-host -label:extension-prerelease -label:extension-recommendations -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-io -label:file-nesting -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:github-repositories -label:gpu -label:grammar -label:grid-widget -label:html -label:icon-brand -label:icons-product -label:image-preview -label:inlay-hints -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-playground -label:interactive-window -label:issue-bot -label:issue-reporter -label:javascript -label:json -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:chat -label:l10n-platform -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list-widget -label:live-preview -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:merge-editor -label:merge-editor-workbench -label:monaco-editor -label:native-file-dialog -label:network -label:notebook -label:notebook-accessibility -label:notebook-api -label:notebook-cell-editor -label:notebook-celltoolbar -label:notebook-clipboard -label:notebook-commands -label:notebook-debugging -label:notebook-diff -label:notebook-dnd -label:notebook-execution -label:notebook-find -label:notebook-folding -label:notebook-getting-started -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-kernel-picker -label:notebook-language -label:notebook-layout -label:notebook-markdown -label:notebook-output -label:notebook-perf -label:notebook-remote -label:notebook-serialization -label:notebook-statusbar -label:notebook-toc-outline -label:notebook-undo-redo -label:notebook-variables -label:notebook-workbench-integration -label:notebook-workflow -label:notebook-sticky-scroll -label:notebook-format -label:notebook-code-actions -label:open-editors -label:opener -label:outline -label:output -label:packaging -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-open -label:quick-pick -label:references-viewlet -label:release-notes -label:remote -label:remote-connection -label:remote-explorer -label:remote-tunnel -label:rename -label:runCommands -label:sandbox -label:sash-widget -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:server -label:settings-editor -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview-widget -label:ssh -label:suggest -label:table-widget -label:tasks -label:telemetry -label:terminal -label:terminal-accessibility -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-find -label:terminal-input -label:terminal-layout -label:terminal-links -label:terminal-local-echo -label:terminal-persistence -label:terminal-process -label:terminal-profiles -label:terminal-quick-fix -label:terminal-rendering -label:terminal-shell-bash -label:terminal-shell-cmd -label:terminal-shell-fish -label:terminal-shell-git-bash -label:terminal-shell-integration -label:terminal-shell-pwsh -label:terminal-shell-zsh -label:terminal-sticky-scroll -label:terminal-tabs -label:testing -label:themes -label:timeline -label:timeline-git -label:timeline-local-history -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typescript -label:undo-redo -label:unicode-highlight -label:uri -label:user-profiles -label:ux -label:variable-resolving -label:VIM -label:virtual-workspaces -label:vscode-website -label:vscode.dev -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-banner -label:workbench-cli -label:workbench-diagnostics -label:workbench-dnd -label:workbench-editor-grid -label:workbench-editor-groups -label:workbench-editor-resolver -label:workbench-editors -label:workbench-electron -label:workbench-fonts -label:workbench-history -label:workbench-hot-exit -label:workbench-hover -label:workbench-launch -label:workbench-link -label:workbench-multiroot -label:workbench-notifications -label:workbench-os-integration -label:workbench-rapid-render -label:workbench-run-as-admin -label:workbench-state -label:workbench-status -label:workbench-tabs -label:workbench-touchbar -label:workbench-untitled-editors -label:workbench-views -label:workbench-welcome -label:workbench-window -label:workbench-workspace -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom -label:inline-chat -label:panel-chat -label:quick-chat -label:tasks -label:error-list -label:winget -label:tree-views -label:freeze-slow-crash-leak -label:engineering -label:cross-file-editing"
+    "value": "repo:microsoft/vscode assignee:$assignee is:open type:issue -label:\"info-needed\" -label:api -label:api-finalization -label:api-proposal -label:authentication -label:bisect-ext -label:bracket-pair-colorization -label:bracket-pair-guides -label:breadcrumbs -label:callhierarchy -label:chrome-devtools -label:cloud-changes -label:code-lens -label:command-center -label:comments -label:config -label:containers -label:context-keys -label:continue-working-on -label:css-less-scss -label:custom-editors -label:debug -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor-api -label:editor-autoclosing -label:editor-autoindent -label:editor-bracket-matching -label:editor-clipboard -label:editor-code-actions -label:editor-color-picker -label:editor-columnselect -label:editor-commands -label:editor-comments -label:editor-contrib -label:editor-core -label:editor-drag-and-drop -label:editor-error-widget -label:editor-find -label:editor-folding -label:editor-highlight -label:editor-hover -label:editor-indent-detection -label:editor-indent-guides -label:editor-input -label:editor-input-IME -label:editor-insets -label:editor-minimap -label:editor-multicursor -label:editor-parameter-hints -label:editor-render-whitespace -label:editor-rendering -label:editor-widgets -label:editor-RTL -label:editor-scrollbar -label:editor-sorting -label:editor-sticky-scroll -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet -label:emmet-parse -label:error-list -label:extension-activation -label:extension-host -label:extension-prerelease -label:extension-recommendations -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-io -label:file-nesting -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:github-repositories -label:gpu -label:grammar -label:grid-widget -label:html -label:icon-brand -label:icons-product -label:image-preview -label:inlay-hints -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-playground -label:interactive-window -label:issue-bot -label:issue-reporter -label:javascript -label:json -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:chat -label:l10n-platform -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list-widget -label:live-preview -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:merge-editor -label:merge-editor-workbench -label:monaco-editor -label:native-file-dialog -label:network -label:notebook -label:notebook-accessibility -label:notebook-api -label:notebook-cell-editor -label:notebook-celltoolbar -label:notebook-clipboard -label:notebook-commands -label:notebook-debugging -label:notebook-diff -label:notebook-dnd -label:notebook-execution -label:notebook-find -label:notebook-folding -label:notebook-getting-started -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-kernel-picker -label:notebook-language -label:notebook-layout -label:notebook-markdown -label:notebook-output -label:notebook-perf -label:notebook-remote -label:notebook-serialization -label:notebook-statusbar -label:notebook-toc-outline -label:notebook-undo-redo -label:notebook-variables -label:notebook-workbench-integration -label:notebook-workflow -label:notebook-sticky-scroll -label:notebook-format -label:notebook-code-actions -label:open-editors -label:opener -label:outline -label:output -label:packaging -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-open -label:quick-pick -label:references-viewlet -label:release-notes -label:remote -label:remote-connection -label:remote-explorer -label:remote-tunnel -label:rename -label:runCommands -label:sandbox -label:sash-widget -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:server -label:settings-editor -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview-widget -label:ssh -label:suggest -label:table-widget -label:tasks -label:telemetry -label:terminal -label:terminal-accessibility -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-find -label:terminal-input -label:terminal-layout -label:terminal-links -label:terminal-local-echo -label:terminal-persistence -label:terminal-process -label:terminal-profiles -label:terminal-quick-fix -label:terminal-rendering -label:terminal-shell-bash -label:terminal-shell-cmd -label:terminal-shell-fish -label:terminal-shell-git-bash -label:terminal-shell-integration -label:terminal-shell-pwsh -label:terminal-shell-zsh -label:terminal-sticky-scroll -label:terminal-tabs -label:testing -label:themes -label:timeline -label:timeline-git -label:timeline-local-history -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typescript -label:undo-redo -label:unicode-highlight -label:uri -label:user-profiles -label:ux -label:variable-resolving -label:VIM -label:virtual-workspaces -label:vscode-website -label:vscode.dev -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-banner -label:workbench-cli -label:workbench-diagnostics -label:workbench-dnd -label:workbench-editor-grid -label:workbench-editor-groups -label:workbench-editor-resolver -label:workbench-editors -label:workbench-electron -label:workbench-fonts -label:workbench-history -label:workbench-hot-exit -label:workbench-hover -label:workbench-launch -label:workbench-link -label:workbench-multiroot -label:workbench-notifications -label:workbench-os-integration -label:workbench-rapid-render -label:workbench-run-as-admin -label:workbench-state -label:workbench-status -label:workbench-tabs -label:workbench-touchbar -label:workbench-untitled-editors -label:workbench-views -label:workbench-welcome -label:workbench-window -label:workbench-workspace -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom -label:inline-chat -label:panel-chat -label:quick-chat -label:tasks -label:error-list -label:winget -label:tree-views -label:freeze-slow-crash-leak -label:engineering -label:cross-file-editing -label:microsoft-authentication -label:github-authentication -label:lm-access -label:secret-storage"
   },
   {
     "kind": 1,

From 7722c2bb0f4b17e1fa4cee6a24d3f0f438348ba9 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Tue, 17 Dec 2024 20:27:55 +0100
Subject: [PATCH 328/479] Git - adjust command `when` clauses (#236392)

* Add telemetry for troubleshooting

* Adjust command when clause
---
 extensions/git/package.json    | 24 ++++++++++++------------
 extensions/git/src/commands.ts | 15 ++++++++++++++-
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/extensions/git/package.json b/extensions/git/package.json
index 8b8f52643a8..08349fd4783 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -943,19 +943,19 @@
         "command": "git.stageSelectedRanges",
         "key": "ctrl+k ctrl+alt+s",
         "mac": "cmd+k cmd+alt+s",
-        "when": "editorTextFocus && resourceScheme =~ /^git$|^file$/"
+        "when": "editorTextFocus && resourceScheme == file"
       },
       {
         "command": "git.unstageSelectedRanges",
         "key": "ctrl+k ctrl+n",
         "mac": "cmd+k cmd+n",
-        "when": "isInDiffEditor && resourceScheme =~ /^git$|^file$/"
+        "when": "editorTextFocus && isInDiffEditor && isInDiffRightEditor && resourceScheme == git"
       },
       {
         "command": "git.revertSelectedRanges",
         "key": "ctrl+k ctrl+r",
         "mac": "cmd+k cmd+r",
-        "when": "editorTextFocus && resourceScheme =~ /^git$|^file$/"
+        "when": "editorTextFocus && resourceScheme == file"
       }
     ],
     "menus": {
@@ -1026,7 +1026,7 @@
         },
         {
           "command": "git.stageSelectedRanges",
-          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && resourceScheme =~ /^git$|^file$/"
+          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && resourceScheme == file"
         },
         {
           "command": "git.stageChange",
@@ -1034,7 +1034,7 @@
         },
         {
           "command": "git.revertSelectedRanges",
-          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && resourceScheme =~ /^git$|^file$/"
+          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && resourceScheme == file"
         },
         {
           "command": "git.revertChange",
@@ -1054,7 +1054,7 @@
         },
         {
           "command": "git.unstageSelectedRanges",
-          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
+          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && isInDiffRightEditor && resourceScheme == git"
         },
         {
           "command": "git.clean",
@@ -2068,17 +2068,17 @@
         {
           "command": "git.stageSelectedRanges",
           "group": "2_git@1",
-          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
+          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && isInDiffRightEditor && !isEmbeddedDiffEditor && resourceScheme == file"
         },
         {
           "command": "git.unstageSelectedRanges",
           "group": "2_git@2",
-          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
+          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && isInDiffRightEditor && !isEmbeddedDiffEditor && resourceScheme == git"
         },
         {
           "command": "git.revertSelectedRanges",
           "group": "2_git@3",
-          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
+          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && isInDiffRightEditor && !isEmbeddedDiffEditor && resourceScheme == file"
         },
         {
           "command": "git.stashApplyEditor",
@@ -2096,17 +2096,17 @@
         {
           "command": "git.stageSelectedRanges",
           "group": "2_git@1",
-          "when": "isInDiffRightEditor && !isEmbeddedDiffEditor && config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
+          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && isInDiffRightEditor && !isEmbeddedDiffEditor && resourceScheme == file"
         },
         {
           "command": "git.unstageSelectedRanges",
           "group": "2_git@2",
-          "when": "isInDiffRightEditor && !isEmbeddedDiffEditor && config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
+          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && isInDiffRightEditor && !isEmbeddedDiffEditor && resourceScheme == git"
         },
         {
           "command": "git.revertSelectedRanges",
           "group": "2_git@3",
-          "when": "isInDiffRightEditor && !isEmbeddedDiffEditor && config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && resourceScheme =~ /^git$|^file$/"
+          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && isInDiffRightEditor && !isEmbeddedDiffEditor && resourceScheme == file"
         }
       ],
       "editor/content": [
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index 64905cd55f3..8a313931201 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -1563,12 +1563,16 @@ export class CommandCenter {
 			return;
 		}
 
+		this.logger.trace(`[CommandCenter][stageSelectedChanges] changes: ${JSON.stringify(changes)}`);
+
 		const modifiedDocument = textEditor.document;
 		const selectedLines = toLineRanges(textEditor.selections, modifiedDocument);
 		const selectedChanges = changes
 			.map(change => selectedLines.reduce<LineChange | null>((result, range) => result || intersectDiffWithRange(modifiedDocument, change, range), null))
 			.filter(d => !!d) as LineChange[];
 
+		this.logger.trace(`[CommandCenter][stageSelectedChanges] selectedChanges: ${JSON.stringify(selectedChanges)}`);
+
 		if (!selectedChanges.length) {
 			window.showInformationMessage(l10n.t('The selection range does not contain any changes.'));
 			return;
@@ -1745,6 +1749,8 @@ export class CommandCenter {
 			return;
 		}
 
+		this.logger.trace(`[CommandCenter][revertSelectedRanges] changes: ${JSON.stringify(changes)}`);
+
 		const modifiedDocument = textEditor.document;
 		const selections = textEditor.selections;
 		const selectedChanges = changes.filter(change => {
@@ -1757,6 +1763,8 @@ export class CommandCenter {
 			return;
 		}
 
+		this.logger.trace(`[CommandCenter][revertSelectedRanges] selectedChanges: ${JSON.stringify(selectedChanges)}`);
+
 		const selectionsBeforeRevert = textEditor.selections;
 		await this._revertChanges(textEditor, selectedChanges);
 		textEditor.selections = selectionsBeforeRevert;
@@ -1835,6 +1843,8 @@ export class CommandCenter {
 			return;
 		}
 
+		this.logger.trace(`[CommandCenter][unstageSelectedRanges] changes: ${JSON.stringify(changes)}`);
+
 		const originalUri = toGitUri(modifiedUri, 'HEAD');
 		const originalDocument = await workspace.openTextDocument(originalUri);
 		const selectedLines = toLineRanges(textEditor.selections, modifiedDocument);
@@ -1848,8 +1858,11 @@ export class CommandCenter {
 		}
 
 		const invertedDiffs = selectedDiffs.map(invertLineChange);
-		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
 
+		this.logger.trace(`[CommandCenter][unstageSelectedRanges] selectedDiffs: ${JSON.stringify(selectedDiffs)}`);
+		this.logger.trace(`[CommandCenter][unstageSelectedRanges] invertedDiffs: ${JSON.stringify(invertedDiffs)}`);
+
+		const result = applyLineChanges(modifiedDocument, originalDocument, invertedDiffs);
 		await this.runByRepository(modifiedUri, async (repository, resource) => await repository.stage(resource, result));
 	}
 

From 7cc28c3e81227c60347c0ce507f6ee2283732c38 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 17 Dec 2024 11:30:32 -0800
Subject: [PATCH 329/479] Add markdown validation status item

Fixes #236399
---
 .../src/languageFeatures/diagnostics.ts       | 53 ++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/extensions/markdown-language-features/src/languageFeatures/diagnostics.ts b/extensions/markdown-language-features/src/languageFeatures/diagnostics.ts
index f54c136ad1a..8ea0cac41c1 100644
--- a/extensions/markdown-language-features/src/languageFeatures/diagnostics.ts
+++ b/extensions/markdown-language-features/src/languageFeatures/diagnostics.ts
@@ -72,10 +72,61 @@ class AddToIgnoreLinksQuickFixProvider implements vscode.CodeActionProvider {
 	}
 }
 
+function registerMarkdownStatusItem(selector: vscode.DocumentSelector, commandManager: CommandManager): vscode.Disposable {
+	const statusItem = vscode.languages.createLanguageStatusItem('markdownStatus', selector);
+
+	const enabledSettingId = 'validate.enabled';
+	const commandId = '_markdown.toggleValidation';
+
+	const commandSub = commandManager.register({
+		id: commandId,
+		execute: (enabled: boolean) => {
+			vscode.workspace.getConfiguration('markdown').update(enabledSettingId, enabled);
+		}
+	});
+
+	const update = () => {
+		const activeDoc = vscode.window.activeTextEditor?.document;
+		const markdownDoc = activeDoc?.languageId === 'markdown' ? activeDoc : undefined;
+
+		const enabled = vscode.workspace.getConfiguration('markdown', markdownDoc).get(enabledSettingId);
+		if (enabled) {
+			statusItem.text = vscode.l10n.t('Link validation enabled');
+			statusItem.command = {
+				command: commandId,
+				arguments: [false],
+				title: vscode.l10n.t('Disable'),
+				tooltip: vscode.l10n.t('Disable validation of Markdown links'),
+			};
+		} else {
+			statusItem.text = vscode.l10n.t('Link validation disabled');
+			statusItem.command = {
+				command: commandId,
+				arguments: [true],
+				title: vscode.l10n.t('Enable'),
+				tooltip: vscode.l10n.t('Enable validation of Markdown links'),
+			};
+		}
+	};
+	update();
+
+	return vscode.Disposable.from(
+		statusItem,
+		commandSub,
+		vscode.workspace.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('markdown.' + enabledSettingId)) {
+				update();
+			}
+		}),
+	);
+}
 
 export function registerDiagnosticSupport(
 	selector: vscode.DocumentSelector,
 	commandManager: CommandManager,
 ): vscode.Disposable {
-	return AddToIgnoreLinksQuickFixProvider.register(selector, commandManager);
+	return vscode.Disposable.from(
+		AddToIgnoreLinksQuickFixProvider.register(selector, commandManager),
+		registerMarkdownStatusItem(selector, commandManager),
+	);
 }

From a47b13ebc2d1b5db4d815ed9cde86278248cfaa7 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 17 Dec 2024 11:59:05 -0800
Subject: [PATCH 330/479] Small cleanup follow up on #236145

- Don't send content as json
- Reuse existing load helper
---
 .../preview-src/index.ts                      | 21 +++++++++----------
 .../preview-src/settings.ts                   |  8 +++++--
 .../src/preview/documentRenderer.ts           |  2 +-
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/extensions/markdown-language-features/preview-src/index.ts b/extensions/markdown-language-features/preview-src/index.ts
index 336245a1fdf..f9a0abc4f53 100644
--- a/extensions/markdown-language-features/preview-src/index.ts
+++ b/extensions/markdown-language-features/preview-src/index.ts
@@ -7,7 +7,7 @@ import { ActiveLineMarker } from './activeLineMarker';
 import { onceDocumentLoaded } from './events';
 import { createPosterForVsCode } from './messaging';
 import { getEditorLineNumberForPageOffset, scrollToRevealSourceLine, getLineElementForFragment } from './scroll-sync';
-import { SettingsManager, getData } from './settings';
+import { SettingsManager, getData, getRawData } from './settings';
 import throttle = require('lodash.throttle');
 import morphdom from 'morphdom';
 import type { ToWebviewMessage } from '../types/previewMessaging';
@@ -61,8 +61,16 @@ function doAfterImagesLoaded(cb: () => void) {
 }
 
 onceDocumentLoaded(() => {
-	const scrollProgress = state.scrollProgress;
+	// Load initial html
+	const htmlParser = new DOMParser();
+	const markDownHtml = htmlParser.parseFromString(
+		getRawData('data-initial-md-content'),
+		'text/html'
+	);
+	document.body.appendChild(markDownHtml.body);
 
+	// Restore
+	const scrollProgress = state.scrollProgress;
 	addImageContexts();
 	if (typeof scrollProgress === 'number' && !settings.settings.fragment) {
 		doAfterImagesLoaded(() => {
@@ -353,15 +361,6 @@ document.addEventListener('click', event => {
 	}
 }, true);
 
-window.addEventListener('load', () => {
-	const htmlParser = new DOMParser();
-	const markDownHtml = htmlParser.parseFromString(
-		decodeURIComponent(getData('data-md-content')),
-		'text/html'
-	);
-	document.body.appendChild(markDownHtml.body);
-});
-
 window.addEventListener('scroll', throttle(() => {
 	updateScrollProgress();
 
diff --git a/extensions/markdown-language-features/preview-src/settings.ts b/extensions/markdown-language-features/preview-src/settings.ts
index 1bbe3477f25..0fb5d0c2686 100644
--- a/extensions/markdown-language-features/preview-src/settings.ts
+++ b/extensions/markdown-language-features/preview-src/settings.ts
@@ -16,18 +16,22 @@ export interface PreviewSettings {
 	readonly webviewResourceRoot: string;
 }
 
-export function getData<T = {}>(key: string): T {
+export function getRawData(key: string): string {
 	const element = document.getElementById('vscode-markdown-preview-data');
 	if (element) {
 		const data = element.getAttribute(key);
 		if (data) {
-			return JSON.parse(data);
+			return data;
 		}
 	}
 
 	throw new Error(`Could not load data for ${key}`);
 }
 
+export function getData<T = {}>(key: string): T {
+	return JSON.parse(getRawData(key));
+}
+
 export class SettingsManager {
 	private _settings: PreviewSettings = getData('data-settings');
 
diff --git a/extensions/markdown-language-features/src/preview/documentRenderer.ts b/extensions/markdown-language-features/src/preview/documentRenderer.ts
index 13e709c765f..eeab8e19d9d 100644
--- a/extensions/markdown-language-features/src/preview/documentRenderer.ts
+++ b/extensions/markdown-language-features/src/preview/documentRenderer.ts
@@ -99,7 +99,7 @@ export class MdDocumentRenderer {
 					data-settings="${escapeAttribute(JSON.stringify(initialData))}"
 					data-strings="${escapeAttribute(JSON.stringify(previewStrings))}"
 					data-state="${escapeAttribute(JSON.stringify(state || {}))}"
-					data-md-content="${escapeAttribute(JSON.stringify(encodeURIComponent(body.html)))}">
+					data-initial-md-content="${escapeAttribute(body.html)}">
 				<script src="${this._extensionResourcePath(resourceProvider, 'pre.js')}" nonce="${nonce}"></script>
 				${this._getStyles(resourceProvider, sourceUri, config, imageInfo)}
 				<base href="${resourceProvider.asWebviewUri(markdownDocument.uri)}">

From 20dc4d7d2647c3f69a55fd971f66c273666959a3 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Tue, 17 Dec 2024 21:37:33 +0100
Subject: [PATCH 331/479] Git - add more tracing to stage/unstage/revert
 commands (#236409)

---
 extensions/git/src/blame.ts    | 13 ++++-----
 extensions/git/src/commands.ts | 26 +++++++++++++++++-
 extensions/git/src/staging.ts  | 50 +++++++++++++++++++++++++++++++++-
 3 files changed, 79 insertions(+), 10 deletions(-)

diff --git a/extensions/git/src/blame.ts b/extensions/git/src/blame.ts
index 916d906a0a2..5c65fbcf1fc 100644
--- a/extensions/git/src/blame.ts
+++ b/extensions/git/src/blame.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DecorationOptions, l10n, Position, Range, TextEditor, TextEditorChange, TextEditorDecorationType, TextEditorChangeKind, ThemeColor, Uri, window, workspace, EventEmitter, ConfigurationChangeEvent, StatusBarItem, StatusBarAlignment, Command, MarkdownString, TextEditorDiffInformation } from 'vscode';
+import { DecorationOptions, l10n, Position, Range, TextEditor, TextEditorChange, TextEditorDecorationType, TextEditorChangeKind, ThemeColor, Uri, window, workspace, EventEmitter, ConfigurationChangeEvent, StatusBarItem, StatusBarAlignment, Command, MarkdownString } from 'vscode';
 import { Model } from './model';
 import { dispose, fromNow, IDisposable } from './util';
 import { Repository } from './repository';
@@ -11,6 +11,7 @@ import { throttle } from './decorators';
 import { BlameInformation } from './git';
 import { fromGitUri, isGitUri } from './uri';
 import { emojify, ensureEmojis } from './emoji';
+import { getWorkingTreeAndIndexDiffInformation, getWorkingTreeDiffInformation } from './staging';
 
 function lineRangesContainLine(changes: readonly TextEditorChange[], lineNumber: number): boolean {
 	return changes.some(c => c.modified.startLineNumber <= lineNumber && lineNumber < c.modified.endLineNumberExclusive);
@@ -277,10 +278,6 @@ export class GitBlameController {
 		return blameInformation;
 	}
 
-	private _findDiffInformation(textEditor: TextEditor, ref: string): TextEditorDiffInformation | undefined {
-		return textEditor.diffInformation?.find(diff => diff.original && isGitUri(diff.original) && fromGitUri(diff.original).ref === ref);
-	}
-
 	@throttle
 	private async _updateTextEditorBlameInformation(textEditor: TextEditor | undefined, showBlameInformationForPositionZero = false): Promise<void> {
 		if (!textEditor?.diffInformation || textEditor !== window.activeTextEditor) {
@@ -319,7 +316,7 @@ export class GitBlameController {
 				workingTreeAndIndexChanges = undefined;
 			} else if (ref === '') {
 				// Resource on the right-hand side of the diff editor when viewing a resource from the index.
-				const diffInformationWorkingTreeAndIndex = this._findDiffInformation(textEditor, 'HEAD');
+				const diffInformationWorkingTreeAndIndex = getWorkingTreeAndIndexDiffInformation(textEditor);
 
 				// Working tree + index diff information is present and it is stale
 				if (diffInformationWorkingTreeAndIndex && diffInformationWorkingTreeAndIndex.isStale) {
@@ -333,7 +330,7 @@ export class GitBlameController {
 			}
 		} else {
 			// Working tree diff information. Diff Editor (Working Tree) -> Text Editor
-			const diffInformationWorkingTree = this._findDiffInformation(textEditor, '~') ?? this._findDiffInformation(textEditor, '');
+			const diffInformationWorkingTree = getWorkingTreeDiffInformation(textEditor);
 
 			// Working tree diff information is not present or it is stale
 			if (!diffInformationWorkingTree || diffInformationWorkingTree.isStale) {
@@ -341,7 +338,7 @@ export class GitBlameController {
 			}
 
 			// Working tree + index diff information
-			const diffInformationWorkingTreeAndIndex = this._findDiffInformation(textEditor, 'HEAD');
+			const diffInformationWorkingTreeAndIndex = getWorkingTreeAndIndexDiffInformation(textEditor);
 
 			// Working tree + index diff information is present and it is stale
 			if (diffInformationWorkingTreeAndIndex && diffInformationWorkingTreeAndIndex.isStale) {
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index 8a313931201..dde1c99049a 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -12,7 +12,7 @@ import { ForcePushMode, GitErrorCodes, Ref, RefType, Status, CommitOptions, Remo
 import { Git, Stash } from './git';
 import { Model } from './model';
 import { GitResourceGroup, Repository, Resource, ResourceGroupType } from './repository';
-import { DiffEditorSelectionHunkToolbarContext, applyLineChanges, getModifiedRange, intersectDiffWithRange, invertLineChange, toLineRanges } from './staging';
+import { DiffEditorSelectionHunkToolbarContext, applyLineChanges, getModifiedRange, getWorkingTreeAndIndexDiffInformation, getWorkingTreeDiffInformation, intersectDiffWithRange, invertLineChange, toLineChanges, toLineRanges } from './staging';
 import { fromGitUri, toGitUri, isGitUri, toMergeUris, toMultiFileDiffEditorUris } from './uri';
 import { dispose, grep, isDefined, isDescendant, pathEquals, relativePath, truncate } from './util';
 import { GitTimelineItem } from './timelineProvider';
@@ -1565,6 +1565,12 @@ export class CommandCenter {
 
 		this.logger.trace(`[CommandCenter][stageSelectedChanges] changes: ${JSON.stringify(changes)}`);
 
+		const workingTreeDiffInformation = getWorkingTreeDiffInformation(textEditor);
+		if (workingTreeDiffInformation) {
+			this.logger.trace(`[CommandCenter][stageSelectedChanges] diffInformation: ${JSON.stringify(workingTreeDiffInformation)}`);
+			this.logger.trace(`[CommandCenter][stageSelectedChanges] diffInformation changes: ${JSON.stringify(toLineChanges(workingTreeDiffInformation))}`);
+		}
+
 		const modifiedDocument = textEditor.document;
 		const selectedLines = toLineRanges(textEditor.selections, modifiedDocument);
 		const selectedChanges = changes
@@ -1751,6 +1757,12 @@ export class CommandCenter {
 
 		this.logger.trace(`[CommandCenter][revertSelectedRanges] changes: ${JSON.stringify(changes)}`);
 
+		const workingTreeDiffInformation = getWorkingTreeDiffInformation(textEditor);
+		if (workingTreeDiffInformation) {
+			this.logger.trace(`[CommandCenter][revertSelectedRanges] diffInformation: ${JSON.stringify(workingTreeDiffInformation)}`);
+			this.logger.trace(`[CommandCenter][revertSelectedRanges] diffInformation changes: ${JSON.stringify(toLineChanges(workingTreeDiffInformation))}`);
+		}
+
 		const modifiedDocument = textEditor.document;
 		const selections = textEditor.selections;
 		const selectedChanges = changes.filter(change => {
@@ -1845,6 +1857,18 @@ export class CommandCenter {
 
 		this.logger.trace(`[CommandCenter][unstageSelectedRanges] changes: ${JSON.stringify(changes)}`);
 
+		const workingTreeDiffInformation = getWorkingTreeDiffInformation(textEditor);
+		if (workingTreeDiffInformation) {
+			this.logger.trace(`[CommandCenter][unstageSelectedRanges] diffInformation (working tree): ${JSON.stringify(workingTreeDiffInformation)}`);
+			this.logger.trace(`[CommandCenter][unstageSelectedRanges] diffInformation changes (working tree): ${JSON.stringify(toLineChanges(workingTreeDiffInformation))}`);
+		}
+
+		const workingTreeAndIndexDiffInformation = getWorkingTreeAndIndexDiffInformation(textEditor);
+		if (workingTreeAndIndexDiffInformation) {
+			this.logger.trace(`[CommandCenter][unstageSelectedRanges] diffInformation (working tree + index): ${JSON.stringify(workingTreeAndIndexDiffInformation)}`);
+			this.logger.trace(`[CommandCenter][unstageSelectedRanges] diffInformation changes (working tree + index): ${JSON.stringify(toLineChanges(workingTreeAndIndexDiffInformation))}`);
+		}
+
 		const originalUri = toGitUri(modifiedUri, 'HEAD');
 		const originalDocument = await workspace.openTextDocument(originalUri);
 		const selectedLines = toLineRanges(textEditor.selections, modifiedDocument);
diff --git a/extensions/git/src/staging.ts b/extensions/git/src/staging.ts
index 2dcc6d54487..38a462aedf6 100644
--- a/extensions/git/src/staging.ts
+++ b/extensions/git/src/staging.ts
@@ -3,7 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { TextDocument, Range, LineChange, Selection, Uri } from 'vscode';
+import { TextDocument, Range, LineChange, Selection, Uri, TextEditor, TextEditorDiffInformation } from 'vscode';
+import { fromGitUri, isGitUri } from './uri';
 
 export function applyLineChanges(original: TextDocument, modified: TextDocument, diffs: LineChange[]): string {
 	const result: string[] = [];
@@ -143,6 +144,53 @@ export function invertLineChange(diff: LineChange): LineChange {
 	};
 }
 
+export function toLineChanges(diffInformation: TextEditorDiffInformation): LineChange[] {
+	return diffInformation.changes.map(x => {
+		let originalStartLineNumber: number;
+		let originalEndLineNumber: number;
+		let modifiedStartLineNumber: number;
+		let modifiedEndLineNumber: number;
+
+		if (x.original.startLineNumber === x.original.endLineNumberExclusive) {
+			// Insertion
+			originalStartLineNumber = x.original.startLineNumber - 1;
+			originalEndLineNumber = 0;
+		} else {
+			originalStartLineNumber = x.original.startLineNumber;
+			originalEndLineNumber = x.original.endLineNumberExclusive - 1;
+		}
+
+		if (x.modified.startLineNumber === x.modified.endLineNumberExclusive) {
+			// Deletion
+			modifiedStartLineNumber = x.modified.startLineNumber - 1;
+			modifiedEndLineNumber = 0;
+		} else {
+			modifiedStartLineNumber = x.modified.startLineNumber;
+			modifiedEndLineNumber = x.modified.endLineNumberExclusive - 1;
+		}
+
+		return {
+			originalStartLineNumber,
+			originalEndLineNumber,
+			modifiedStartLineNumber,
+			modifiedEndLineNumber
+		};
+	});
+}
+
+export function getWorkingTreeDiffInformation(textEditor: TextEditor): TextEditorDiffInformation | undefined {
+	// Working tree diff information. Diff Editor (Working Tree) -> Text Editor
+	return getDiffInformation(textEditor, '~') ?? getDiffInformation(textEditor, '');
+}
+
+export function getWorkingTreeAndIndexDiffInformation(textEditor: TextEditor): TextEditorDiffInformation | undefined {
+	return getDiffInformation(textEditor, 'HEAD');
+}
+
+function getDiffInformation(textEditor: TextEditor, ref: string): TextEditorDiffInformation | undefined {
+	return textEditor.diffInformation?.find(diff => diff.original && isGitUri(diff.original) && fromGitUri(diff.original).ref === ref);
+}
+
 export interface DiffEditorSelectionHunkToolbarContext {
 	mapping: unknown;
 	/**

From 999f28e49fee2e38050fd1a9c6ab37aa76841d6a Mon Sep 17 00:00:00 2001
From: Michael Lively <milively@microsoft.com>
Date: Tue, 17 Dec 2024 12:39:39 -0800
Subject: [PATCH 332/479] Extend hover styling for entire sticky line (#236410)

extend hover styling for entire sticky line
---
 .../browser/media/notebookEditorStickyScroll.css       | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/media/notebookEditorStickyScroll.css b/src/vs/workbench/contrib/notebook/browser/media/notebookEditorStickyScroll.css
index 25fa90546d6..a723d49cfe0 100644
--- a/src/vs/workbench/contrib/notebook/browser/media/notebookEditorStickyScroll.css
+++ b/src/vs/workbench/contrib/notebook/browser/media/notebookEditorStickyScroll.css
@@ -38,10 +38,8 @@
 .monaco-workbench
 	.notebookOverlay
 	.notebook-sticky-scroll-container
-	.notebook-sticky-scroll-element
-	.notebook-sticky-scroll-header:hover {
+	.notebook-sticky-scroll-element:hover {
 	background-color: var(--vscode-editorStickyScrollHover-background);
-	width: 100%;
 	cursor: pointer;
 }
 
@@ -55,13 +53,11 @@
 .monaco-workbench.hc-light
 	.notebookOverlay
 	.notebook-sticky-scroll-container
-	.notebook-sticky-scroll-element
-	.notebook-sticky-scroll-header:hover,
+	.notebook-sticky-scroll-element:hover,
 .monaco-workbench.hc-black
 	.notebookOverlay
 	.notebook-sticky-scroll-container
-	.notebook-sticky-scroll-element
-	.notebook-sticky-scroll-header:hover {
+	.notebook-sticky-scroll-element:hover {
 	outline: 1px dashed var(--vscode-contrastActiveBorder);
 	outline-offset: -2px;
 }

From b0e6e13be600c35f7444f16b4c5f59eb503ec2f1 Mon Sep 17 00:00:00 2001
From: Michael Lively <milively@microsoft.com>
Date: Tue, 17 Dec 2024 13:34:38 -0800
Subject: [PATCH 333/479] notebook find replace position vs global toolbar
 (#236407)

* notebook find replace position vs global toolbar

* use runAndSubscribe
---
 .../contrib/find/notebookFindReplaceWidget.ts        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts
index 6e8651a4a32..8509900d4b0 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.ts
@@ -20,6 +20,7 @@ import { Widget } from '../../../../../../base/browser/ui/widget.js';
 import { Action, ActionRunner, IAction, IActionRunner, Separator } from '../../../../../../base/common/actions.js';
 import { Delayer } from '../../../../../../base/common/async.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Event } from '../../../../../../base/common/event.js';
 import { KeyCode } from '../../../../../../base/common/keyCodes.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { isSafari } from '../../../../../../base/common/platform.js';
@@ -345,6 +346,17 @@ export abstract class SimpleFindReplaceWidget extends Widget {
 
 		this._domNode = document.createElement('div');
 		this._domNode.classList.add('simple-fr-find-part-wrapper');
+
+		this._register(Event.runAndSubscribe(this._configurationService.onDidChangeConfiguration, e => {
+			if (!e || e.affectsConfiguration(NotebookSetting.globalToolbar)) {
+				if (this._notebookEditor.notebookOptions.getLayoutConfiguration().globalToolbar) {
+					this._domNode.style.top = '26px';
+				} else {
+					this._domNode.style.top = '0px';
+				}
+			}
+		}));
+
 		this._register(this._state.onFindReplaceStateChange((e) => this._onStateChanged(e)));
 		this._scopedContextKeyService = contextKeyService.createScoped(this._domNode);
 

From cece885ae0d18ae017007ccdd7fb808fa23d6b1e Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 17 Dec 2024 14:59:26 -0800
Subject: [PATCH 334/479] testing: show item when coverage is filtered,
 standardize some tree classes (#236418)

Fixes #235147
---
 src/vs/platform/actions/common/actions.ts     |   1 +
 .../contrib/testing/browser/media/testing.css |  78 ++++++------
 .../testing/browser/testCoverageView.ts       | 113 +++++++++++++++---
 .../testResultsView/testResultsTree.ts        |   8 +-
 .../testResultsView/testResultsViewContent.ts |   2 +-
 .../testing/browser/testingExplorerView.ts    |   4 +-
 6 files changed, 137 insertions(+), 69 deletions(-)

diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
index 7f00003c0f3..2b784b5bf5e 100644
--- a/src/vs/platform/actions/common/actions.ts
+++ b/src/vs/platform/actions/common/actions.ts
@@ -139,6 +139,7 @@ export class MenuId {
 	static readonly TestPeekElement = new MenuId('TestPeekElement');
 	static readonly TestPeekTitle = new MenuId('TestPeekTitle');
 	static readonly TestCallStack = new MenuId('TestCallStack');
+	static readonly TestCoverageFilterItem = new MenuId('TestCoverageFilterItem');
 	static readonly TouchBarContext = new MenuId('TouchBarContext');
 	static readonly TitleBarContext = new MenuId('TitleBarContext');
 	static readonly TitleBarTitleContext = new MenuId('TitleBarTitleContext');
diff --git a/src/vs/workbench/contrib/testing/browser/media/testing.css b/src/vs/workbench/contrib/testing/browser/media/testing.css
index d56ac88a185..ef2437bd588 100644
--- a/src/vs/workbench/contrib/testing/browser/media/testing.css
+++ b/src/vs/workbench/contrib/testing/browser/media/testing.css
@@ -43,34 +43,41 @@
 	position: relative;
 }
 
-.test-explorer .test-item .label,
-.test-output-peek-tree .test-peek-item .name,
-.test-coverage-list-item .name,
-.test-coverage-list-item-label {
-	flex-grow: 1;
-	width: 0;
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
+.testing-stdtree-container {
+	display: flex;
+	align-items: center;
+
+	.label {
+		flex-grow: 1;
+		width: 0;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
 
-	.monaco-list.horizontal-scrolling & {
-		width: auto;
-		overflow: visible;
+		.codicon {
+			vertical-align: middle;
+			font-size: 1em;
+			transform: scale(1.25);
+			margin: 0 0.125em;
+		}
+
+		.monaco-list.horizontal-scrolling & {
+			width: auto;
+			overflow: visible;
+		}
 	}
-}
 
-.test-output-peek-tree .test-peek-item .name .codicon,
-.test-explorer .test-item .label .codicon {
-	vertical-align: middle;
-	font-size: 1em;
-	transform: scale(1.25);
-	margin: 0 0.125em;
-}
+	.monaco-action-bar {
+		display: none;
+		flex-shrink: 0;
+		margin-right: 0.8em;
+	}
 
-.test-explorer .test-item,
-.test-output-peek-tree .test-peek-item {
-	display: flex;
-	align-items: center;
+	&:hover, &.focused {
+		.monaco-action-bar {
+			display: initial;
+		}
+	}
 }
 
 .test-output-peek-tree {
@@ -78,14 +85,16 @@
 	border-left: 1px solid var(--vscode-panelSection-border);
 }
 
-.test-output-peek-tree .monaco-list-row .monaco-action-bar,
-.test-explorer .monaco-list-row .monaco-action-bar,
 .test-explorer .monaco-list-row .codicon-testing-hidden {
 	display: none;
 	flex-shrink: 0;
 	margin-right: 0.8em;
 }
 
+.test-explorer .monaco-list-row .monaco-action-bar.testing-is-continuous-run {
+	display: initial;
+}
+
 .test-explorer .monaco-list-row .monaco-action-bar .codicon-testing-continuous-is-on {
 	color: var(--vscode-inputOption-activeForeground);
 	border-color: var(--vscode-inputOption-activeBorder);
@@ -102,14 +111,6 @@
 	display: block !important;
 }
 
-.test-explorer .monaco-list-row:hover .monaco-action-bar,
-.test-explorer .monaco-list-row.focused .monaco-action-bar,
-.test-explorer .monaco-list-row .monaco-action-bar.testing-is-continuous-run,
-.test-output-peek-tree .monaco-list-row:hover .monaco-action-bar,
-.test-output-peek-tree .monaco-list-row.focused .monaco-action-bar {
-	display: initial;
-}
-
 .test-explorer .monaco-list-row .test-is-hidden .codicon-testing-hidden {
 	display: block;
 	margin-right: 9px;
@@ -467,15 +468,6 @@
 
 /** -- coverage  */
 
-.coverage-view-is-filtered > .pane-header > .actions {
-	display: block !important;
-}
-
-.test-coverage-list-item {
-	display: flex;
-	align-items: center;
-}
-
 .test-coverage-bars {
 	display: flex;
 	align-items: center;
diff --git a/src/vs/workbench/contrib/testing/browser/testCoverageView.ts b/src/vs/workbench/contrib/testing/browser/testCoverageView.ts
index 5ee19fb10f6..b660cc798b1 100644
--- a/src/vs/workbench/contrib/testing/browser/testCoverageView.ts
+++ b/src/vs/workbench/contrib/testing/browser/testCoverageView.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as dom from '../../../../base/browser/dom.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { IIdentityProvider, IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
 import { ICompressedTreeElement, ICompressedTreeNode } from '../../../../base/browser/ui/tree/compressedObjectTreeModel.js';
 import { ICompressibleTreeRenderer } from '../../../../base/browser/ui/tree/objectTree.js';
@@ -24,7 +25,9 @@ import { Position } from '../../../../editor/common/core/position.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { localize, localize2 } from '../../../../nls.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
-import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { getActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
+import { Action2, IMenuService, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
@@ -42,17 +45,17 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.js
 import { IResourceLabel, ResourceLabels } from '../../../browser/labels.js';
 import { IViewPaneOptions, ViewAction, ViewPane } from '../../../browser/parts/views/viewPane.js';
 import { IViewDescriptorService } from '../../../common/views.js';
-import * as coverUtils from './codeCoverageDisplayUtils.js';
-import { testingStatesToIcons, testingWasCovered } from './icons.js';
-import { CoverageBarSource, ManagedTestCoverageBars } from './testCoverageBars.js';
+import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
 import { TestCommandId, Testing } from '../common/constants.js';
 import { onObservableChange } from '../common/observableUtils.js';
 import { BypassedFileCoverage, ComputedFileCoverage, FileCoverage, TestCoverage, getTotalCoveragePercent } from '../common/testCoverage.js';
 import { ITestCoverageService } from '../common/testCoverageService.js';
 import { TestId } from '../common/testId.js';
 import { TestingContextKeys } from '../common/testingContextKeys.js';
-import { CoverageDetails, DetailType, ICoverageCount, IDeclarationCoverage, TestResultState } from '../common/testTypes.js';
-import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
+import { CoverageDetails, DetailType, ICoverageCount, IDeclarationCoverage, ITestItem, TestResultState } from '../common/testTypes.js';
+import * as coverUtils from './codeCoverageDisplayUtils.js';
+import { testingStatesToIcons, testingWasCovered } from './icons.js';
+import { CoverageBarSource, ManagedTestCoverageBars } from './testCoverageBars.js';
 
 const enum CoverageSortOrder {
 	Coverage,
@@ -95,13 +98,6 @@ export class TestCoverageView extends ViewPane {
 				this.tree.clear();
 			}
 		}));
-
-		this._register(autorun(reader => {
-			this.element.classList.toggle(
-				'coverage-view-is-filtered',
-				!!this.coverageService.filterToTest.read(reader),
-			);
-		}));
 	}
 
 	protected override layoutBody(height: number, width: number): void {
@@ -197,6 +193,16 @@ class RevealUncoveredDeclarations {
 	constructor(public readonly n: number) { }
 }
 
+class CurrentlyFilteredTo {
+	public readonly id = String(fnNodeId++);
+
+	public get label() {
+		return localize('filteredToTest', "Showing coverage for \"{0}\"", this.testItem.label);
+	}
+
+	constructor(public readonly testItem: ITestItem) { }
+}
+
 class LoadingDetails {
 	public readonly id = String(fnNodeId++);
 	public readonly label = localize('loadingCoverageDetails', "Loading Coverage Details...");
@@ -204,7 +210,7 @@ class LoadingDetails {
 
 /** Type of nodes returned from {@link TestCoverage}. Note: value is *always* defined. */
 type TestCoverageFileNode = IPrefixTreeNode<ComputedFileCoverage | FileCoverage>;
-type CoverageTreeElement = TestCoverageFileNode | DeclarationCoverageNode | LoadingDetails | RevealUncoveredDeclarations;
+type CoverageTreeElement = TestCoverageFileNode | DeclarationCoverageNode | LoadingDetails | RevealUncoveredDeclarations | CurrentlyFilteredTo;
 
 const isFileCoverage = (c: CoverageTreeElement): c is TestCoverageFileNode => typeof c === 'object' && 'value' in c;
 const isDeclarationCoverage = (c: CoverageTreeElement): c is DeclarationCoverageNode => c instanceof DeclarationCoverageNode;
@@ -221,9 +227,12 @@ class TestCoverageTree extends Disposable {
 		sortOrder: IObservable<CoverageSortOrder>,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IEditorService editorService: IEditorService,
+		@ICommandService commandService: ICommandService,
 	) {
 		super();
 
+		container.classList.add('testing-stdtree');
+
 		this.tree = instantiationService.createInstance(
 			WorkbenchCompressibleObjectTree<CoverageTreeElement, void>,
 			'TestCoverageView',
@@ -233,6 +242,7 @@ class TestCoverageTree extends Disposable {
 				instantiationService.createInstance(FileCoverageRenderer, labels),
 				instantiationService.createInstance(DeclarationCoverageRenderer),
 				instantiationService.createInstance(BasicRenderer),
+				instantiationService.createInstance(CurrentlyFilteredToRenderer),
 			],
 			{
 				expandOnlyOnTwistieClick: true,
@@ -289,6 +299,9 @@ class TestCoverageTree extends Disposable {
 				} else if (isDeclarationCoverage(e.element)) {
 					resource = e.element.uri;
 					selection = e.element.location;
+				} else if (e.element instanceof CurrentlyFilteredTo) {
+					commandService.executeCommand(TestCommandId.CoverageFilterToTest);
+					return;
 				}
 			}
 			if (!resource) {
@@ -351,7 +364,19 @@ class TestCoverageTree extends Disposable {
 			}
 		}));
 
-		this.tree.setChildren(null, Iterable.map(files, toChild));
+		let children = Iterable.map(files, toChild);
+		const filteredTo = showOnlyTest && coverage.result.getTestById(showOnlyTest.toString());
+		if (filteredTo) {
+			children = Iterable.concat(
+				Iterable.single<ICompressedTreeElement<CoverageTreeElement>>({
+					element: new CurrentlyFilteredTo(filteredTo),
+					incompressible: true,
+				}),
+				children,
+			);
+		}
+
+		this.tree.setChildren(null, children);
 	}
 
 	public layout(height: number, width: number) {
@@ -409,6 +434,9 @@ class TestCoverageTreeListDelegate implements IListVirtualDelegate<CoverageTreeE
 		if (element instanceof LoadingDetails || element instanceof RevealUncoveredDeclarations) {
 			return BasicRenderer.ID;
 		}
+		if (element instanceof CurrentlyFilteredTo) {
+			return CurrentlyFilteredToRenderer.ID;
+		}
 		assertNever(element);
 	}
 }
@@ -448,6 +476,51 @@ class Sorter implements ITreeSorter<CoverageTreeElement> {
 	}
 }
 
+interface IFilteredToTemplate {
+	label: HTMLElement;
+	actions: ActionBar;
+}
+
+class CurrentlyFilteredToRenderer implements ICompressibleTreeRenderer<CoverageTreeElement, FuzzyScore, IFilteredToTemplate> {
+	public static readonly ID = 'C';
+	public readonly templateId = CurrentlyFilteredToRenderer.ID;
+
+	constructor(
+		@IMenuService private readonly menuService: IMenuService,
+		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+	) { }
+
+	renderCompressedElements(node: ITreeNode<ICompressedTreeNode<CoverageTreeElement>, FuzzyScore>, index: number, templateData: IFilteredToTemplate, height: number | undefined): void {
+		this.renderInner(node.element.elements[node.element.elements.length - 1] as CurrentlyFilteredTo, templateData);
+	}
+
+	renderTemplate(container: HTMLElement): IFilteredToTemplate {
+		container.classList.add('testing-stdtree-container');
+		const label = dom.append(container, dom.$('.label'));
+		const menu = this.menuService.getMenuActions(MenuId.TestCoverageFilterItem, this.contextKeyService, {
+			shouldForwardArgs: true,
+		});
+
+		const actions = new ActionBar(container);
+		actions.push(getActionBarActions(menu, 'inline').primary, { icon: true, label: false });
+		actions.domNode.style.display = 'block';
+
+		return { label, actions };
+	}
+
+	renderElement(element: ITreeNode<CoverageTreeElement, FuzzyScore>, index: number, templateData: IFilteredToTemplate, height: number | undefined): void {
+		this.renderInner(element.element as CurrentlyFilteredTo, templateData);
+	}
+
+	disposeTemplate(templateData: IFilteredToTemplate): void {
+		templateData.actions.dispose();
+	}
+
+	private renderInner(element: CurrentlyFilteredTo, container: IFilteredToTemplate) {
+		container.label.innerText = element.label;
+	}
+}
+
 interface FileTemplateData {
 	container: HTMLElement;
 	bars: ManagedTestCoverageBars;
@@ -469,7 +542,7 @@ class FileCoverageRenderer implements ICompressibleTreeRenderer<CoverageTreeElem
 	/** @inheritdoc */
 	public renderTemplate(container: HTMLElement): FileTemplateData {
 		const templateDisposables = new DisposableStore();
-		container.classList.add('test-coverage-list-item');
+		container.classList.add('testing-stdtree-container', 'test-coverage-list-item');
 
 		return {
 			container,
@@ -518,7 +591,7 @@ class FileCoverageRenderer implements ICompressibleTreeRenderer<CoverageTreeElem
 			fileKind: stat.children?.size ? FileKind.FOLDER : FileKind.FILE,
 			matches: createMatches(filterData),
 			separator: this.labelService.getSeparator(file.uri.scheme, file.uri.authority),
-			extraClasses: ['test-coverage-list-item-label'],
+			extraClasses: ['label'],
 		});
 	}
 }
@@ -542,9 +615,10 @@ class DeclarationCoverageRenderer implements ICompressibleTreeRenderer<CoverageT
 	/** @inheritdoc */
 	public renderTemplate(container: HTMLElement): DeclarationTemplateData {
 		const templateDisposables = new DisposableStore();
-		container.classList.add('test-coverage-list-item');
+		container.classList.add('test-coverage-list-item', 'testing-stdtree-container');
+
 		const icon = dom.append(container, dom.$('.state'));
-		const label = dom.append(container, dom.$('.name'));
+		const label = dom.append(container, dom.$('.label'));
 
 		return {
 			container,
@@ -626,6 +700,7 @@ registerAction2(class TestCoverageChangePerTestFilterAction extends Action2 {
 			},
 			menu: [
 				{ id: MenuId.CommandPalette, when: TestingContextKeys.hasPerTestCoverage },
+				{ id: MenuId.TestCoverageFilterItem, group: 'inline' },
 				{
 					id: MenuId.ViewTitle,
 					when: ContextKeyExpr.and(TestingContextKeys.hasPerTestCoverage, ContextKeyExpr.equals('view', Testing.CoverageViewId)),
diff --git a/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsTree.ts b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsTree.ts
index ac6d958a16d..4915553ce61 100644
--- a/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsTree.ts
+++ b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsTree.ts
@@ -669,11 +669,11 @@ class TestRunElementRenderer implements ICompressibleTreeRenderer<ITreeElement,
 	/** @inheritdoc */
 	public renderTemplate(container: HTMLElement): TemplateData {
 		const templateDisposable = new DisposableStore();
-		const wrapper = dom.append(container, dom.$('.test-peek-item'));
-		const icon = dom.append(wrapper, dom.$('.state'));
-		const label = dom.append(wrapper, dom.$('.name'));
+		container.classList.add('testing-stdtree-container');
+		const icon = dom.append(container, dom.$('.state'));
+		const label = dom.append(container, dom.$('.label'));
 
-		const actionBar = new ActionBar(wrapper, {
+		const actionBar = new ActionBar(container, {
 			actionViewItemProvider: (action, options) =>
 				action instanceof MenuItemAction
 					? this.instantiationService.createInstance(MenuEntryActionViewItem, action, { hoverDelegate: options.hoverDelegate })
diff --git a/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsViewContent.ts b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsViewContent.ts
index f93d2065f0c..421afad78f2 100644
--- a/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsViewContent.ts
+++ b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsViewContent.ts
@@ -248,7 +248,7 @@ export class TestResultsViewContent extends Disposable {
 		this.contextKeyTestMessage = TestingContextKeys.testMessageContext.bindTo(this.messageContextKeyService);
 		this.contextKeyResultOutdated = TestingContextKeys.testResultOutdated.bindTo(this.messageContextKeyService);
 
-		const treeContainer = dom.append(containerElement, dom.$('.test-output-peek-tree'));
+		const treeContainer = dom.append(containerElement, dom.$('.test-output-peek-tree.testing-stdtree'));
 		const tree = this._register(this.instantiationService.createInstance(
 			OutputPeekTree,
 			treeContainer,
diff --git a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
index 2febdc0a89c..5e84db11b6a 100644
--- a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
@@ -1526,8 +1526,8 @@ class TestItemRenderer extends Disposable
 	/**
 	 * @inheritdoc
 	 */
-	public renderTemplate(container: HTMLElement): ITestElementTemplateData {
-		const wrapper = dom.append(container, dom.$('.test-item'));
+	public renderTemplate(wrapper: HTMLElement): ITestElementTemplateData {
+		wrapper.classList.add('testing-stdtree-container');
 
 		const icon = dom.append(wrapper, dom.$('.computed-state'));
 		const label = dom.append(wrapper, dom.$('.label'));

From 2a4ed8474889817be7266f7e675892fbb055195d Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Wed, 18 Dec 2024 00:39:13 +0100
Subject: [PATCH 335/479] Ensure settings and keybindings views open at correct
 location (#236412)

* make sure settings and keybindings views open at correct location

* fix tests
---
 .../browser/preferences.contribution.ts       | 54 ++++++++++++-------
 .../preferences/browser/settingsEditor2.ts    |  2 +-
 .../preferences/browser/preferencesService.ts | 41 ++++++++------
 .../preferences/common/preferences.ts         |  7 ++-
 .../test/browser/preferencesService.test.ts   | 38 ++++++-------
 5 files changed, 87 insertions(+), 55 deletions(-)

diff --git a/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts b/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts
index 175e8bd518b..2a6357e15d4 100644
--- a/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts
+++ b/src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts
@@ -47,6 +47,9 @@ import { IUserDataProfileService, CURRENT_PROFILE_CONTEXT } from '../../../servi
 import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
 import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { resolveCommandsContext } from '../../../browser/parts/editor/editorCommandsContext.js';
+import { IEditorGroup, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
+import { IListService } from '../../../../platform/list/browser/listService.js';
 
 const SETTINGS_EDITOR_COMMAND_SEARCH = 'settings.action.search';
 
@@ -791,9 +794,10 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 					]
 				});
 			}
-			run(accessor: ServicesAccessor, args: string | undefined) {
-				const query = typeof args === 'string' ? args : undefined;
-				return accessor.get(IPreferencesService).openGlobalKeybindingSettings(false, { query });
+			run(accessor: ServicesAccessor, ...args: unknown[]) {
+				const query = typeof args[0] === 'string' ? args[0] : undefined;
+				const groupId = getEditorGroupFromArguments(accessor, args)?.id;
+				return accessor.get(IPreferencesService).openGlobalKeybindingSettings(false, { query, groupId });
 			}
 		}));
 		this._register(MenuRegistry.appendMenuItem(MenuId.MenubarPreferencesMenu, {
@@ -834,8 +838,9 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 					]
 				});
 			}
-			run(accessor: ServicesAccessor) {
-				return accessor.get(IPreferencesService).openGlobalKeybindingSettings(true);
+			run(accessor: ServicesAccessor, ...args: unknown[]) {
+				const groupId = getEditorGroupFromArguments(accessor, args)?.id;
+				return accessor.get(IPreferencesService).openGlobalKeybindingSettings(true, { groupId });
 			}
 		}));
 		this._register(registerAction2(class extends Action2 {
@@ -852,8 +857,9 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 					]
 				});
 			}
-			run(accessor: ServicesAccessor) {
-				const editorPane = accessor.get(IEditorService).activeEditorPane;
+			run(accessor: ServicesAccessor, ...args: unknown[]) {
+				const group = getEditorGroupFromArguments(accessor, args);
+				const editorPane = group?.activeEditorPane;
 				if (editorPane instanceof KeybindingsEditor) {
 					editorPane.search('@source:system');
 				}
@@ -873,8 +879,9 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 					]
 				});
 			}
-			run(accessor: ServicesAccessor) {
-				const editorPane = accessor.get(IEditorService).activeEditorPane;
+			run(accessor: ServicesAccessor, ...args: unknown[]) {
+				const group = getEditorGroupFromArguments(accessor, args);
+				const editorPane = group?.activeEditorPane;
 				if (editorPane instanceof KeybindingsEditor) {
 					editorPane.search('@source:extension');
 				}
@@ -894,8 +901,9 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 					]
 				});
 			}
-			run(accessor: ServicesAccessor) {
-				const editorPane = accessor.get(IEditorService).activeEditorPane;
+			run(accessor: ServicesAccessor, args: unknown[]) {
+				const group = getEditorGroupFromArguments(accessor, args);
+				const editorPane = group?.activeEditorPane;
 				if (editorPane instanceof KeybindingsEditor) {
 					editorPane.search('@source:user');
 				}
@@ -1207,11 +1215,12 @@ class PreferencesActionsContribution extends Disposable implements IWorkbenchCon
 		for (const folder of this.workspaceContextService.getWorkspace().folders) {
 			const commandId = `_workbench.openFolderSettings.${folder.uri.toString()}`;
 			if (!CommandsRegistry.getCommand(commandId)) {
-				CommandsRegistry.registerCommand(commandId, () => {
+				CommandsRegistry.registerCommand(commandId, (accessor: ServicesAccessor, ...args: any[]) => {
+					const groupId = getEditorGroupFromArguments(accessor, args)?.id;
 					if (this.workspaceContextService.getWorkbenchState() === WorkbenchState.FOLDER) {
-						return this.preferencesService.openWorkspaceSettings({ jsonEditor: false });
+						return this.preferencesService.openWorkspaceSettings({ jsonEditor: false, groupId });
 					} else {
-						return this.preferencesService.openFolderSettings({ folderUri: folder.uri, jsonEditor: false });
+						return this.preferencesService.openFolderSettings({ folderUri: folder.uri, jsonEditor: false, groupId });
 					}
 				});
 				MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
@@ -1261,9 +1270,10 @@ class SettingsEditorTitleContribution extends Disposable implements IWorkbenchCo
 						}]
 					});
 				}
-				run(accessor: ServicesAccessor, args: IOpenSettingsActionOptions) {
-					args = sanitizeOpenSettingsArgs(args);
-					return accessor.get(IPreferencesService).openUserSettings({ jsonEditor: false, ...args });
+				run(accessor: ServicesAccessor, ...args: unknown[]) {
+					const sanatizedArgs = sanitizeOpenSettingsArgs(args[0]);
+					const groupId = getEditorGroupFromArguments(accessor, args)?.id;
+					return accessor.get(IPreferencesService).openUserSettings({ jsonEditor: false, ...sanatizedArgs, groupId });
 				}
 			});
 		};
@@ -1289,8 +1299,9 @@ class SettingsEditorTitleContribution extends Disposable implements IWorkbenchCo
 					}]
 				});
 			}
-			run(accessor: ServicesAccessor) {
-				const editorPane = accessor.get(IEditorService).activeEditorPane;
+			run(accessor: ServicesAccessor, ...args: unknown[]) {
+				const group = getEditorGroupFromArguments(accessor, args);
+				const editorPane = group?.activeEditorPane;
 				if (editorPane instanceof SettingsEditor2) {
 					return editorPane.switchToSettingsFile();
 				}
@@ -1300,6 +1311,11 @@ class SettingsEditorTitleContribution extends Disposable implements IWorkbenchCo
 	}
 }
 
+function getEditorGroupFromArguments(accessor: ServicesAccessor, args: unknown[]): IEditorGroup | undefined {
+	const context = resolveCommandsContext(args, accessor.get(IEditorService), accessor.get(IEditorGroupsService), accessor.get(IListService));
+	return context.groupedEditors[0]?.group;
+}
+
 const workbenchContributionsRegistry = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
 registerWorkbenchContribution2(PreferencesActionsContribution.ID, PreferencesActionsContribution, WorkbenchPhase.BlockStartup);
 registerWorkbenchContribution2(PreferencesContribution.ID, PreferencesContribution, WorkbenchPhase.BlockStartup);
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
index c1d1c302db1..8e3388a7008 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
@@ -789,7 +789,7 @@ export class SettingsEditor2 extends EditorPane {
 	private async openSettingsFile(options?: ISettingsEditorOptions): Promise<IEditorPane | undefined> {
 		const currentSettingsTarget = this.settingsTargetsWidget.settingsTarget;
 
-		const openOptions: IOpenSettingsOptions = { jsonEditor: true, ...options };
+		const openOptions: IOpenSettingsOptions = { jsonEditor: true, groupId: this.group.id, ...options };
 		if (currentSettingsTarget === ConfigurationTarget.USER_LOCAL) {
 			if (options?.revealSetting) {
 				const configurationProperties = Registry.as<IConfigurationRegistry>(Extensions.Configuration).getConfigurationProperties();
diff --git a/src/vs/workbench/services/preferences/browser/preferencesService.ts b/src/vs/workbench/services/preferences/browser/preferencesService.ts
index 025cc02e964..f0bb2cb9f25 100644
--- a/src/vs/workbench/services/preferences/browser/preferencesService.ts
+++ b/src/vs/workbench/services/preferences/browser/preferencesService.ts
@@ -29,10 +29,10 @@ import { DEFAULT_EDITOR_ASSOCIATION, IEditorPane } from '../../../common/editor.
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
 import { IJSONEditingService } from '../../configuration/common/jsonEditing.js';
-import { GroupDirection, IEditorGroupsService } from '../../editor/common/editorGroupsService.js';
-import { IEditorService, SIDE_GROUP, SIDE_GROUP_TYPE } from '../../editor/common/editorService.js';
+import { GroupDirection, IEditorGroup, IEditorGroupsService } from '../../editor/common/editorGroupsService.js';
+import { IEditorService, SIDE_GROUP } from '../../editor/common/editorService.js';
 import { KeybindingsEditorInput } from './keybindingsEditorInput.js';
-import { DEFAULT_SETTINGS_EDITOR_SETTING, FOLDER_SETTINGS_PATH, IKeybindingsEditorOptions, IKeybindingsEditorPane, IOpenSettingsOptions, IPreferencesEditorModel, IPreferencesService, ISetting, ISettingsEditorOptions, ISettingsGroup, SETTINGS_AUTHORITY, USE_SPLIT_JSON_SETTING, validateSettingsEditorOptions } from '../common/preferences.js';
+import { DEFAULT_SETTINGS_EDITOR_SETTING, FOLDER_SETTINGS_PATH, IKeybindingsEditorPane, IOpenKeybindingsEditorOptions, IOpenSettingsOptions, IPreferencesEditorModel, IPreferencesService, ISetting, ISettingsEditorOptions, ISettingsGroup, SETTINGS_AUTHORITY, USE_SPLIT_JSON_SETTING, validateSettingsEditorOptions } from '../common/preferences.js';
 import { SettingsEditor2Input } from '../common/preferencesEditorInput.js';
 import { defaultKeybindingsContents, DefaultKeybindingsEditorModel, DefaultRawSettingsEditorModel, DefaultSettings, DefaultSettingsEditorModel, Settings2EditorModel, SettingsEditorModel, WorkspaceConfigurationEditorModel } from '../common/preferencesModels.js';
 import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js';
@@ -48,6 +48,7 @@ import { IURLService } from '../../../../platform/url/common/url.js';
 import { compareIgnoreCase } from '../../../../base/common/strings.js';
 import { IExtensionService } from '../../extensions/common/extensions.js';
 import { IProgressService, ProgressLocation } from '../../../../platform/progress/common/progress.js';
+import { findGroup } from '../../editor/common/editorGroupFinder.js';
 
 const emptyEditableSettingsContent = '{\n}';
 
@@ -248,8 +249,8 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 			...options,
 			focusSearch: true
 		};
-		await this.editorService.openEditor(input, validateSettingsEditorOptions(options), options.openToSide ? SIDE_GROUP : undefined);
-		return this.editorGroupService.activeGroup.activeEditorPane!;
+		const group = await this.getEditorGroupFromOptions(options);
+		return (await group.openEditor(input, validateSettingsEditorOptions(options)))!;
 	}
 
 	openApplicationSettings(options: IOpenSettingsOptions = {}): Promise<IEditorPane | undefined> {
@@ -312,7 +313,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return this.open(folderSettingsUri, options);
 	}
 
-	async openGlobalKeybindingSettings(textual: boolean, options?: IKeybindingsEditorOptions): Promise<void> {
+	async openGlobalKeybindingSettings(textual: boolean, options?: IOpenKeybindingsEditorOptions): Promise<void> {
 		options = { pinned: true, revealIfOpened: true, ...options };
 		if (textual) {
 			const emptyContents = '// ' + nls.localize('emptyKeybindingsHeader', "Place your key bindings in this file to override the defaults") + '\n[\n]';
@@ -322,18 +323,18 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 			// Create as needed and open in editor
 			await this.createIfNotExists(editableKeybindings, emptyContents);
 			if (openDefaultKeybindings) {
-				const activeEditorGroup = this.editorGroupService.activeGroup;
-				const sideEditorGroup = this.editorGroupService.addGroup(activeEditorGroup.id, GroupDirection.RIGHT);
+				const sourceGroupId = options.groupId ?? this.editorGroupService.activeGroup.id;
+				const sideEditorGroup = this.editorGroupService.addGroup(sourceGroupId, GroupDirection.RIGHT);
 				await Promise.all([
-					this.editorService.openEditor({ resource: this.defaultKeybindingsResource, options: { pinned: true, preserveFocus: true, revealIfOpened: true, override: DEFAULT_EDITOR_ASSOCIATION.id }, label: nls.localize('defaultKeybindings', "Default Keybindings"), description: '' }),
+					this.editorService.openEditor({ resource: this.defaultKeybindingsResource, options: { pinned: true, preserveFocus: true, revealIfOpened: true, override: DEFAULT_EDITOR_ASSOCIATION.id }, label: nls.localize('defaultKeybindings', "Default Keybindings"), description: '' }, sourceGroupId),
 					this.editorService.openEditor({ resource: editableKeybindings, options }, sideEditorGroup.id)
 				]);
 			} else {
-				await this.editorService.openEditor({ resource: editableKeybindings, options });
+				await this.editorService.openEditor({ resource: editableKeybindings, options }, options.groupId);
 			}
 
 		} else {
-			const editor = (await this.editorService.openEditor(this.instantiationService.createInstance(KeybindingsEditorInput), { ...options })) as IKeybindingsEditorPane;
+			const editor = (await this.editorService.openEditor(this.instantiationService.createInstance(KeybindingsEditorInput), { ...options }, options.groupId)) as IKeybindingsEditorPane;
 			if (options.query) {
 				editor.search(options.query);
 			}
@@ -345,8 +346,16 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return this.editorService.openEditor({ resource: this.defaultKeybindingsResource, label: nls.localize('defaultKeybindings', "Default Keybindings") });
 	}
 
+	private async getEditorGroupFromOptions(options: IOpenSettingsOptions): Promise<IEditorGroup> {
+		let group = options?.groupId !== undefined ? this.editorGroupService.getGroup(options.groupId) ?? this.editorGroupService.activeGroup : this.editorGroupService.activeGroup;
+		if (options.openToSide) {
+			group = (await this.instantiationService.invokeFunction(findGroup, {}, SIDE_GROUP))[0];
+		}
+		return group;
+	}
+
 	private async openSettingsJson(resource: URI, options: IOpenSettingsOptions): Promise<IEditorPane | undefined> {
-		const group = options?.openToSide ? SIDE_GROUP : undefined;
+		const group = await this.getEditorGroupFromOptions(options);
 		const editor = await this.doOpenSettingsJson(resource, options, group);
 		if (editor && options?.revealSetting) {
 			await this.revealSetting(options.revealSetting.key, !!options.revealSetting.edit, editor, resource);
@@ -354,7 +363,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		return editor;
 	}
 
-	private async doOpenSettingsJson(resource: URI, options: ISettingsEditorOptions, group?: SIDE_GROUP_TYPE): Promise<IEditorPane | undefined> {
+	private async doOpenSettingsJson(resource: URI, options: ISettingsEditorOptions, group: IEditorGroup): Promise<IEditorPane | undefined> {
 		const openSplitJSON = !!this.configurationService.getValue(USE_SPLIT_JSON_SETTING);
 		const openDefaultSettings = !!this.configurationService.getValue(DEFAULT_SETTINGS_EDITOR_SETTING);
 		if (openSplitJSON || openDefaultSettings) {
@@ -364,15 +373,15 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		const configurationTarget = options?.target ?? ConfigurationTarget.USER;
 		const editableSettingsEditorInput = await this.getOrCreateEditableSettingsEditorInput(configurationTarget, resource);
 		options = { ...options, pinned: true };
-		return await this.editorService.openEditor(editableSettingsEditorInput, validateSettingsEditorOptions(options), group);
+		return await group.openEditor(editableSettingsEditorInput, { ...validateSettingsEditorOptions(options) });
 	}
 
-	private async doOpenSplitJSON(resource: URI, options: ISettingsEditorOptions = {}, group?: SIDE_GROUP_TYPE): Promise<IEditorPane | undefined> {
+	private async doOpenSplitJSON(resource: URI, options: ISettingsEditorOptions = {}, group: IEditorGroup,): Promise<IEditorPane | undefined> {
 		const configurationTarget = options.target ?? ConfigurationTarget.USER;
 		await this.createSettingsIfNotExists(configurationTarget, resource);
 		const preferencesEditorInput = this.createSplitJsonEditorInput(configurationTarget, resource);
 		options = { ...options, pinned: true };
-		return this.editorService.openEditor(preferencesEditorInput, validateSettingsEditorOptions(options), group);
+		return group.openEditor(preferencesEditorInput, validateSettingsEditorOptions(options));
 	}
 
 	public createSplitJsonEditorInput(configurationTarget: ConfigurationTarget, resource: URI): EditorInput {
diff --git a/src/vs/workbench/services/preferences/common/preferences.ts b/src/vs/workbench/services/preferences/common/preferences.ts
index e4ae6416bbb..ea385543252 100644
--- a/src/vs/workbench/services/preferences/common/preferences.ts
+++ b/src/vs/workbench/services/preferences/common/preferences.ts
@@ -211,6 +211,7 @@ export interface ISettingsEditorOptions extends IEditorOptions {
 export interface IOpenSettingsOptions extends ISettingsEditorOptions {
 	jsonEditor?: boolean;
 	openToSide?: boolean;
+	groupId?: number;
 }
 
 export function validateSettingsEditorOptions(options: ISettingsEditorOptions): ISettingsEditorOptions {
@@ -231,6 +232,10 @@ export interface IKeybindingsEditorOptions extends IEditorOptions {
 	query?: string;
 }
 
+export interface IOpenKeybindingsEditorOptions extends IKeybindingsEditorOptions {
+	groupId?: number;
+}
+
 export const IPreferencesService = createDecorator<IPreferencesService>('preferencesService');
 
 export interface IPreferencesService {
@@ -254,7 +259,7 @@ export interface IPreferencesService {
 	openRemoteSettings(options?: IOpenSettingsOptions): Promise<IEditorPane | undefined>;
 	openWorkspaceSettings(options?: IOpenSettingsOptions): Promise<IEditorPane | undefined>;
 	openFolderSettings(options: IOpenSettingsOptions & { folderUri: IOpenSettingsOptions['folderUri'] }): Promise<IEditorPane | undefined>;
-	openGlobalKeybindingSettings(textual: boolean, options?: IKeybindingsEditorOptions): Promise<void>;
+	openGlobalKeybindingSettings(textual: boolean, options?: IOpenKeybindingsEditorOptions): Promise<void>;
 	openDefaultKeybindingsFile(): Promise<IEditorPane | undefined>;
 	openLanguageSpecificSettings(languageId: string, options?: IOpenSettingsOptions): Promise<IEditorPane | undefined>;
 	getEditableSettingsURI(configurationTarget: ConfigurationTarget, resource?: URI): Promise<URI | null>;
diff --git a/src/vs/workbench/services/preferences/test/browser/preferencesService.test.ts b/src/vs/workbench/services/preferences/test/browser/preferencesService.test.ts
index 4f1f2493cb4..77c36590b8a 100644
--- a/src/vs/workbench/services/preferences/test/browser/preferencesService.test.ts
+++ b/src/vs/workbench/services/preferences/test/browser/preferencesService.test.ts
@@ -10,26 +10,37 @@ import { ICommandService } from '../../../../../platform/commands/common/command
 import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
 import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
 import { IURLService } from '../../../../../platform/url/common/url.js';
-import { DEFAULT_EDITOR_ASSOCIATION } from '../../../../common/editor.js';
+import { DEFAULT_EDITOR_ASSOCIATION, IEditorPane } from '../../../../common/editor.js';
 import { IJSONEditingService } from '../../../configuration/common/jsonEditing.js';
 import { TestJSONEditingService } from '../../../configuration/test/common/testServices.js';
 import { PreferencesService } from '../../browser/preferencesService.js';
 import { IPreferencesService, ISettingsEditorOptions } from '../../common/preferences.js';
 import { IRemoteAgentService } from '../../../remote/common/remoteAgentService.js';
-import { TestRemoteAgentService, ITestInstantiationService, TestEditorService, workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
+import { TestRemoteAgentService, ITestInstantiationService, workbenchInstantiationService, TestEditorGroupView, TestEditorGroupsService } from '../../../../test/browser/workbenchTestServices.js';
+import { IEditorGroupsService } from '../../../editor/common/editorGroupsService.js';
+import { IEditorOptions } from '../../../../../platform/editor/common/editor.js';
+import { SettingsEditor2Input } from '../../common/preferencesEditorInput.js';
 
 suite('PreferencesService', () => {
 	let testInstantiationService: ITestInstantiationService;
 	let testObject: PreferencesService;
-	let editorService: TestEditorService2;
+	let lastOpenEditorOptions: IEditorOptions | undefined;
 	const disposables = ensureNoDisposablesAreLeakedInTestSuite();
 
 	setup(() => {
-		editorService = disposables.add(new TestEditorService2());
-		testInstantiationService = workbenchInstantiationService({
-			editorService: () => editorService
-		}, disposables);
+		testInstantiationService = workbenchInstantiationService({}, disposables);
 
+		class TestOpenEditorGroupView extends TestEditorGroupView {
+			lastOpenEditorOptions: any;
+			override openEditor(_editor: SettingsEditor2Input, options?: IEditorOptions): Promise<IEditorPane> {
+				lastOpenEditorOptions = options;
+				_editor.dispose();
+				return Promise.resolve(undefined!);
+			}
+		}
+
+		const testEditorGroupService = new TestEditorGroupsService([new TestOpenEditorGroupView(0)]);
+		testInstantiationService.stub(IEditorGroupsService, testEditorGroupService);
 		testInstantiationService.stub(IJSONEditingService, TestJSONEditingService);
 		testInstantiationService.stub(IRemoteAgentService, TestRemoteAgentService);
 		testInstantiationService.stub(ICommandService, TestCommandService);
@@ -42,19 +53,10 @@ suite('PreferencesService', () => {
 		testObject = disposables.add(instantiationService.createInstance(PreferencesService));
 	});
 	test('options are preserved when calling openEditor', async () => {
-		testObject.openSettings({ jsonEditor: false, query: 'test query' });
-		const options = editorService.lastOpenEditorOptions as ISettingsEditorOptions;
+		await testObject.openSettings({ jsonEditor: false, query: 'test query' });
+		const options = lastOpenEditorOptions as ISettingsEditorOptions;
 		assert.strictEqual(options.focusSearch, true);
 		assert.strictEqual(options.override, DEFAULT_EDITOR_ASSOCIATION.id);
 		assert.strictEqual(options.query, 'test query');
 	});
 });
-
-class TestEditorService2 extends TestEditorService {
-	lastOpenEditorOptions: any;
-
-	override async openEditor(editorInput: any, options?: any): Promise<any | undefined> {
-		this.lastOpenEditorOptions = options;
-		return super.openEditor(editorInput, options);
-	}
-}

From 3e86f1e6cd9bf88b1ce23192fd0b68380bfc69be Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 17 Dec 2024 16:38:47 -0800
Subject: [PATCH 336/479] cli: fix serve-web needs to wait a certain amount of
 time after machine startup (#236427)

Fixes #233155
---
 cli/src/commands/serve_web.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cli/src/commands/serve_web.rs b/cli/src/commands/serve_web.rs
index 3dedf4b3f05..ddef3eef342 100644
--- a/cli/src/commands/serve_web.rs
+++ b/cli/src/commands/serve_web.rs
@@ -548,9 +548,11 @@ impl ConnectionManager {
 			Err(_) => Quality::Stable,
 		});
 
+		let now = Instant::now();
 		let latest_version = tokio::sync::Mutex::new(cache.get().first().map(|latest_commit| {
 			(
-				Instant::now() - Duration::from_secs(RELEASE_CHECK_INTERVAL),
+				now.checked_sub(Duration::from_secs(RELEASE_CHECK_INTERVAL))
+					.unwrap_or(now), // handle 0-ish instants, #233155
 				Release {
 					name: String::from("0.0.0"), // Version information not stored on cache
 					commit: latest_commit.clone(),

From 20899216df0283a9e29f1e45badeb3a8714e6b99 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 18 Dec 2024 07:26:26 +0100
Subject: [PATCH 337/479] dialogs - add `Cmd+D` handling (fix #71430) (#236434)

---
 src/vs/base/browser/ui/dialog/dialog.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/vs/base/browser/ui/dialog/dialog.ts b/src/vs/base/browser/ui/dialog/dialog.ts
index 5fcebbd34c6..2ed8d24fadf 100644
--- a/src/vs/base/browser/ui/dialog/dialog.ts
+++ b/src/vs/base/browser/ui/dialog/dialog.ts
@@ -275,6 +275,22 @@ export class Dialog extends Disposable {
 					return; // leave default handling
 				}
 
+				// Cmd+D (trigger the "no"/"do not save"-button) (macOS only)
+				if (isMacintosh && evt.equals(KeyMod.CtrlCmd | KeyCode.KeyD)) {
+					EventHelper.stop(e);
+
+					const noButton = buttonMap.find(button => button.index === 1 && button.index !== this.options.cancelId);
+					if (noButton) {
+						resolve({
+							button: noButton.index,
+							checkboxChecked: this.checkbox ? this.checkbox.checked : undefined,
+							values: this.inputs.length > 0 ? this.inputs.map(input => input.value) : undefined
+						});
+					}
+
+					return; // leave default handling
+				}
+
 				if (evt.equals(KeyCode.Space)) {
 					return; // leave default handling
 				}

From 95d0e288d11737685fc91eb083bdc2abb8cd6d78 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 18 Dec 2024 07:43:11 +0100
Subject: [PATCH 338/479] fuzzy - add test coverage for path matching (#236435)

---
 src/vs/base/test/common/fuzzyScorer.test.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/vs/base/test/common/fuzzyScorer.test.ts b/src/vs/base/test/common/fuzzyScorer.test.ts
index b180df4422b..dc30534270f 100644
--- a/src/vs/base/test/common/fuzzyScorer.test.ts
+++ b/src/vs/base/test/common/fuzzyScorer.test.ts
@@ -1081,6 +1081,21 @@ suite('Fuzzy Scorer', () => {
 		}
 	});
 
+	test('compareFilesByScore - skip preference on label match when using path sep', function () {
+		const resourceA = URI.file('djangosite/ufrela/def.py');
+		const resourceB = URI.file('djangosite/urls/default.py');
+
+		for (const query of ['url/def']) {
+			let res = [resourceA, resourceB].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
+			assert.strictEqual(res[0], resourceB);
+			assert.strictEqual(res[1], resourceA);
+
+			res = [resourceB, resourceA].sort((r1, r2) => compareItemsByScore(r1, r2, query, true, ResourceAccessor));
+			assert.strictEqual(res[0], resourceB);
+			assert.strictEqual(res[1], resourceA);
+		}
+	});
+
 	test('compareFilesByScore - boost shorter prefix match if multiple queries are used (#99171)', function () {
 		const resourceA = URI.file('mesh_editor_lifetime_job.h');
 		const resourceB = URI.file('lifetime_job.h');

From cf2ebd91b8e42e3bc5ab0e85e3323c886a977ffe Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 18 Dec 2024 07:45:55 +0100
Subject: [PATCH 339/479] Revert "debt: clean up obsolete file usage" (#236433)

Revert "debt: clean up obsolete file usage (#236379)"

This reverts commit 625bae23758002b62954fd10b53d25409421d718.
---
 .../common/extensionManagement.ts             |   4 +-
 .../common/extensionsScannerService.ts        |  51 ++++--
 .../node/extensionManagementService.ts        | 163 +++++++++---------
 .../node/extensionsWatcher.ts                 |  20 +--
 .../node/extensionsScannerService.test.ts     |  33 +++-
 5 files changed, 156 insertions(+), 115 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index f08b46ae65b..155079831fc 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -456,8 +456,8 @@ export const enum ExtensionManagementErrorCode {
 	Extract = 'Extract',
 	Scanning = 'Scanning',
 	ScanningExtension = 'ScanningExtension',
-	ReadRemoved = 'ReadRemoved',
-	UnsetRemoved = 'UnsetRemoved',
+	ReadUninstalled = 'ReadUninstalled',
+	UnsetUninstalled = 'UnsetUninstalled',
 	Delete = 'Delete',
 	Rename = 'Rename',
 	IntializeDefaultProfile = 'IntializeDefaultProfile',
diff --git a/src/vs/platform/extensionManagement/common/extensionsScannerService.ts b/src/vs/platform/extensionManagement/common/extensionsScannerService.ts
index a186b6fa045..99868cddb5d 100644
--- a/src/vs/platform/extensionManagement/common/extensionsScannerService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionsScannerService.ts
@@ -7,6 +7,7 @@ import { coalesce } from '../../../base/common/arrays.js';
 import { ThrottledDelayer } from '../../../base/common/async.js';
 import * as objects from '../../../base/common/objects.js';
 import { VSBuffer } from '../../../base/common/buffer.js';
+import { IStringDictionary } from '../../../base/common/collections.js';
 import { getErrorMessage } from '../../../base/common/errors.js';
 import { getNodeType, parse, ParseError } from '../../../base/common/json.js';
 import { getParseErrorMessage } from '../../../base/common/jsonErrorMessages.js';
@@ -17,11 +18,12 @@ import * as platform from '../../../base/common/platform.js';
 import { basename, isEqual, joinPath } from '../../../base/common/resources.js';
 import * as semver from '../../../base/common/semver/semver.js';
 import Severity from '../../../base/common/severity.js';
+import { isEmptyObject } from '../../../base/common/types.js';
 import { URI } from '../../../base/common/uri.js';
 import { localize } from '../../../nls.js';
 import { IEnvironmentService } from '../../environment/common/environment.js';
 import { IProductVersion, Metadata } from './extensionManagement.js';
-import { areSameExtensions, computeTargetPlatform, getExtensionId, getGalleryExtensionId } from './extensionManagementUtil.js';
+import { areSameExtensions, computeTargetPlatform, ExtensionKey, getExtensionId, getGalleryExtensionId } from './extensionManagementUtil.js';
 import { ExtensionType, ExtensionIdentifier, IExtensionManifest, TargetPlatform, IExtensionIdentifier, IRelaxedExtensionManifest, UNDEFINED_PUBLISHER, IExtensionDescription, BUILTIN_MANIFEST_CACHE_FILE, USER_MANIFEST_CACHE_FILE, ExtensionIdentifierMap, parseEnabledApiProposalNames } from '../../extensions/common/extensions.js';
 import { validateExtensionManifest } from '../../extensions/common/extensionValidator.js';
 import { FileOperationResult, IFileService, toFileOperationResult } from '../../files/common/files.js';
@@ -104,6 +106,7 @@ export type ScanOptions = {
 	readonly profileLocation?: URI;
 	readonly includeInvalid?: boolean;
 	readonly includeAllVersions?: boolean;
+	readonly includeUninstalled?: boolean;
 	readonly checkControlFile?: boolean;
 	readonly language?: string;
 	readonly useCache?: boolean;
@@ -142,9 +145,10 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 	private readonly _onDidChangeCache = this._register(new Emitter<ExtensionType>());
 	readonly onDidChangeCache = this._onDidChangeCache.event;
 
-	private readonly systemExtensionsCachedScanner = this._register(this.instantiationService.createInstance(CachedExtensionsScanner, this.currentProfile));
-	private readonly userExtensionsCachedScanner = this._register(this.instantiationService.createInstance(CachedExtensionsScanner, this.currentProfile));
-	private readonly extensionsScanner = this._register(this.instantiationService.createInstance(ExtensionsScanner));
+	private readonly obsoleteFile = joinPath(this.userExtensionsLocation, '.obsolete');
+	private readonly systemExtensionsCachedScanner = this._register(this.instantiationService.createInstance(CachedExtensionsScanner, this.currentProfile, this.obsoleteFile));
+	private readonly userExtensionsCachedScanner = this._register(this.instantiationService.createInstance(CachedExtensionsScanner, this.currentProfile, this.obsoleteFile));
+	private readonly extensionsScanner = this._register(this.instantiationService.createInstance(ExtensionsScanner, this.obsoleteFile));
 
 	constructor(
 		readonly systemExtensionsLocation: URI,
@@ -195,8 +199,8 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 		const location = scanOptions.profileLocation ?? this.userExtensionsLocation;
 		this.logService.trace('Started scanning user extensions', location);
 		const profileScanOptions: IProfileExtensionsScanOptions | undefined = this.uriIdentityService.extUri.isEqual(scanOptions.profileLocation, this.userDataProfilesService.defaultProfile.extensionsResource) ? { bailOutWhenFileNotFound: true } : undefined;
-		const extensionsScannerInput = await this.createExtensionScannerInput(location, !!scanOptions.profileLocation, ExtensionType.User, scanOptions.language, true, profileScanOptions, scanOptions.productVersion ?? this.getProductVersion());
-		const extensionsScanner = scanOptions.useCache && !extensionsScannerInput.devMode ? this.userExtensionsCachedScanner : this.extensionsScanner;
+		const extensionsScannerInput = await this.createExtensionScannerInput(location, !!scanOptions.profileLocation, ExtensionType.User, !scanOptions.includeUninstalled, scanOptions.language, true, profileScanOptions, scanOptions.productVersion ?? this.getProductVersion());
+		const extensionsScanner = scanOptions.useCache && !extensionsScannerInput.devMode && extensionsScannerInput.excludeObsolete ? this.userExtensionsCachedScanner : this.extensionsScanner;
 		let extensions: IRelaxedScannedExtension[];
 		try {
 			extensions = await extensionsScanner.scanExtensions(extensionsScannerInput);
@@ -217,7 +221,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 		if (this.environmentService.isExtensionDevelopment && this.environmentService.extensionDevelopmentLocationURI) {
 			const extensions = (await Promise.all(this.environmentService.extensionDevelopmentLocationURI.filter(extLoc => extLoc.scheme === Schemas.file)
 				.map(async extensionDevelopmentLocationURI => {
-					const input = await this.createExtensionScannerInput(extensionDevelopmentLocationURI, false, ExtensionType.User, scanOptions.language, false /* do not validate */, undefined, scanOptions.productVersion ?? this.getProductVersion());
+					const input = await this.createExtensionScannerInput(extensionDevelopmentLocationURI, false, ExtensionType.User, true, scanOptions.language, false /* do not validate */, undefined, scanOptions.productVersion ?? this.getProductVersion());
 					const extensions = await this.extensionsScanner.scanOneOrMultipleExtensions(input);
 					return extensions.map(extension => {
 						// Override the extension type from the existing extensions
@@ -233,7 +237,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 	}
 
 	async scanExistingExtension(extensionLocation: URI, extensionType: ExtensionType, scanOptions: ScanOptions): Promise<IScannedExtension | null> {
-		const extensionsScannerInput = await this.createExtensionScannerInput(extensionLocation, false, extensionType, scanOptions.language, true, undefined, scanOptions.productVersion ?? this.getProductVersion());
+		const extensionsScannerInput = await this.createExtensionScannerInput(extensionLocation, false, extensionType, true, scanOptions.language, true, undefined, scanOptions.productVersion ?? this.getProductVersion());
 		const extension = await this.extensionsScanner.scanExtension(extensionsScannerInput);
 		if (!extension) {
 			return null;
@@ -245,7 +249,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 	}
 
 	async scanOneOrMultipleExtensions(extensionLocation: URI, extensionType: ExtensionType, scanOptions: ScanOptions): Promise<IScannedExtension[]> {
-		const extensionsScannerInput = await this.createExtensionScannerInput(extensionLocation, false, extensionType, scanOptions.language, true, undefined, scanOptions.productVersion ?? this.getProductVersion());
+		const extensionsScannerInput = await this.createExtensionScannerInput(extensionLocation, false, extensionType, true, scanOptions.language, true, undefined, scanOptions.productVersion ?? this.getProductVersion());
 		const extensions = await this.extensionsScanner.scanOneOrMultipleExtensions(extensionsScannerInput);
 		return this.applyScanOptions(extensions, extensionType, scanOptions, true);
 	}
@@ -401,7 +405,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 
 	private async scanDefaultSystemExtensions(useCache: boolean, language: string | undefined): Promise<IRelaxedScannedExtension[]> {
 		this.logService.trace('Started scanning system extensions');
-		const extensionsScannerInput = await this.createExtensionScannerInput(this.systemExtensionsLocation, false, ExtensionType.System, language, true, undefined, this.getProductVersion());
+		const extensionsScannerInput = await this.createExtensionScannerInput(this.systemExtensionsLocation, false, ExtensionType.System, true, language, true, undefined, this.getProductVersion());
 		const extensionsScanner = useCache && !extensionsScannerInput.devMode ? this.systemExtensionsCachedScanner : this.extensionsScanner;
 		const result = await extensionsScanner.scanExtensions(extensionsScannerInput);
 		this.logService.trace('Scanned system extensions:', result.length);
@@ -431,7 +435,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 					break;
 			}
 		}
-		const result = await Promise.all(devSystemExtensionsLocations.map(async location => this.extensionsScanner.scanExtension((await this.createExtensionScannerInput(location, false, ExtensionType.System, language, true, undefined, this.getProductVersion())))));
+		const result = await Promise.all(devSystemExtensionsLocations.map(async location => this.extensionsScanner.scanExtension((await this.createExtensionScannerInput(location, false, ExtensionType.System, true, language, true, undefined, this.getProductVersion())))));
 		this.logService.trace('Scanned dev system extensions:', result.length);
 		return coalesce(result);
 	}
@@ -445,7 +449,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 		}
 	}
 
-	private async createExtensionScannerInput(location: URI, profile: boolean, type: ExtensionType, language: string | undefined, validate: boolean, profileScanOptions: IProfileExtensionsScanOptions | undefined, productVersion: IProductVersion): Promise<ExtensionScannerInput> {
+	private async createExtensionScannerInput(location: URI, profile: boolean, type: ExtensionType, excludeObsolete: boolean, language: string | undefined, validate: boolean, profileScanOptions: IProfileExtensionsScanOptions | undefined, productVersion: IProductVersion): Promise<ExtensionScannerInput> {
 		const translations = await this.getTranslations(language ?? platform.language);
 		const mtime = await this.getMtime(location);
 		const applicationExtensionsLocation = profile && !this.uriIdentityService.extUri.isEqual(location, this.userDataProfilesService.defaultProfile.extensionsResource) ? this.userDataProfilesService.defaultProfile.extensionsResource : undefined;
@@ -458,6 +462,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 			profile,
 			profileScanOptions,
 			type,
+			excludeObsolete,
 			validate,
 			productVersion.version,
 			productVersion.date,
@@ -499,6 +504,7 @@ export class ExtensionScannerInput {
 		public readonly profile: boolean,
 		public readonly profileScanOptions: IProfileExtensionsScanOptions | undefined,
 		public readonly type: ExtensionType,
+		public readonly excludeObsolete: boolean,
 		public readonly validate: boolean,
 		public readonly productVersion: string,
 		public readonly productDate: string | undefined,
@@ -528,6 +534,7 @@ export class ExtensionScannerInput {
 			&& a.profile === b.profile
 			&& objects.equals(a.profileScanOptions, b.profileScanOptions)
 			&& a.type === b.type
+			&& a.excludeObsolete === b.excludeObsolete
 			&& a.validate === b.validate
 			&& a.productVersion === b.productVersion
 			&& a.productDate === b.productDate
@@ -551,6 +558,7 @@ class ExtensionsScanner extends Disposable {
 	private readonly extensionsEnabledWithApiProposalVersion: string[];
 
 	constructor(
+		private readonly obsoleteFile: URI,
 		@IExtensionsProfileScannerService protected readonly extensionsProfileScannerService: IExtensionsProfileScannerService,
 		@IUriIdentityService protected readonly uriIdentityService: IUriIdentityService,
 		@IFileService protected readonly fileService: IFileService,
@@ -563,9 +571,15 @@ class ExtensionsScanner extends Disposable {
 	}
 
 	async scanExtensions(input: ExtensionScannerInput): Promise<IRelaxedScannedExtension[]> {
-		return input.profile
-			? this.scanExtensionsFromProfile(input)
-			: this.scanExtensionsFromLocation(input);
+		const extensions = input.profile ? await this.scanExtensionsFromProfile(input) : await this.scanExtensionsFromLocation(input);
+		let obsolete: IStringDictionary<boolean> = {};
+		if (input.excludeObsolete && input.type === ExtensionType.User) {
+			try {
+				const raw = (await this.fileService.readFile(this.obsoleteFile)).value.toString();
+				obsolete = JSON.parse(raw);
+			} catch (error) { /* ignore */ }
+		}
+		return isEmptyObject(obsolete) ? extensions : extensions.filter(e => !obsolete[ExtensionKey.create(e).toString()]);
 	}
 
 	private async scanExtensionsFromLocation(input: ExtensionScannerInput): Promise<IRelaxedScannedExtension[]> {
@@ -582,7 +596,7 @@ class ExtensionsScanner extends Disposable {
 				if (input.type === ExtensionType.User && basename(c.resource).indexOf('.') === 0) {
 					return null;
 				}
-				const extensionScannerInput = new ExtensionScannerInput(c.resource, input.mtime, input.applicationExtensionslocation, input.applicationExtensionslocationMtime, input.profile, input.profileScanOptions, input.type, input.validate, input.productVersion, input.productDate, input.productCommit, input.devMode, input.language, input.translations);
+				const extensionScannerInput = new ExtensionScannerInput(c.resource, input.mtime, input.applicationExtensionslocation, input.applicationExtensionslocationMtime, input.profile, input.profileScanOptions, input.type, input.excludeObsolete, input.validate, input.productVersion, input.productDate, input.productCommit, input.devMode, input.language, input.translations);
 				return this.scanExtension(extensionScannerInput);
 			}));
 		return coalesce(extensions)
@@ -608,7 +622,7 @@ class ExtensionsScanner extends Disposable {
 		const extensions = await Promise.all<IRelaxedScannedExtension | null>(
 			scannedProfileExtensions.map(async extensionInfo => {
 				if (filter(extensionInfo)) {
-					const extensionScannerInput = new ExtensionScannerInput(extensionInfo.location, input.mtime, input.applicationExtensionslocation, input.applicationExtensionslocationMtime, input.profile, input.profileScanOptions, input.type, input.validate, input.productVersion, input.productDate, input.productCommit, input.devMode, input.language, input.translations);
+					const extensionScannerInput = new ExtensionScannerInput(extensionInfo.location, input.mtime, input.applicationExtensionslocation, input.applicationExtensionslocationMtime, input.profile, input.profileScanOptions, input.type, input.excludeObsolete, input.validate, input.productVersion, input.productDate, input.productCommit, input.devMode, input.language, input.translations);
 					return this.scanExtension(extensionScannerInput, extensionInfo.metadata);
 				}
 				return null;
@@ -877,6 +891,7 @@ class CachedExtensionsScanner extends ExtensionsScanner {
 
 	constructor(
 		private readonly currentProfile: IUserDataProfile,
+		obsoleteFile: URI,
 		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
 		@IExtensionsProfileScannerService extensionsProfileScannerService: IExtensionsProfileScannerService,
 		@IUriIdentityService uriIdentityService: IUriIdentityService,
@@ -885,7 +900,7 @@ class CachedExtensionsScanner extends ExtensionsScanner {
 		@IEnvironmentService environmentService: IEnvironmentService,
 		@ILogService logService: ILogService
 	) {
-		super(extensionsProfileScannerService, uriIdentityService, fileService, productService, environmentService, logService);
+		super(obsoleteFile, extensionsProfileScannerService, uriIdentityService, fileService, productService, environmentService, logService);
 	}
 
 	override async scanExtensions(input: ExtensionScannerInput): Promise<IRelaxedScannedExtension[]> {
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 015c3dff393..92405eefb75 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -60,7 +60,7 @@ export interface INativeServerExtensionManagementService extends IExtensionManag
 	readonly _serviceBrand: undefined;
 	scanAllUserInstalledExtensions(): Promise<ILocalExtension[]>;
 	scanInstalledExtensionAtLocation(location: URI): Promise<ILocalExtension | null>;
-	deleteExtensions(...extensions: IExtension[]): Promise<void>;
+	markAsUninstalled(...extensions: IExtension[]): Promise<void>;
 }
 
 type ExtractExtensionResult = { readonly local: ILocalExtension; readonly verificationStatus?: ExtensionSignatureVerificationCode };
@@ -222,8 +222,8 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 		return this.extensionsScanner.copyExtensions(fromProfileLocation, toProfileLocation, { version: this.productService.version, date: this.productService.date });
 	}
 
-	deleteExtensions(...extensions: IExtension[]): Promise<void> {
-		return this.extensionsScanner.setExtensionsForRemoval(...extensions);
+	markAsUninstalled(...extensions: IExtension[]): Promise<void> {
+		return this.extensionsScanner.setUninstalled(...extensions);
 	}
 
 	async cleanUp(): Promise<void> {
@@ -480,20 +480,8 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 				continue;
 			}
 
-			// Ignore changes to the deleted folder
-			if (this.uriIdentityService.extUri.basename(resource).endsWith(DELETED_FOLDER_POSTFIX)) {
-				continue;
-			}
-
-			try {
-				// Check if this is a directory
-				if (!(await this.fileService.stat(resource)).isDirectory) {
-					continue;
-				}
-			} catch (error) {
-				if (toFileOperationResult(error) !== FileOperationResult.FILE_NOT_FOUND) {
-					this.logService.error(error);
-				}
+			// Check if this is a directory
+			if (!(await this.fileService.stat(resource)).isDirectory) {
 				continue;
 			}
 
@@ -514,10 +502,23 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 
 	private async addExtensionsToProfile(extensions: [ILocalExtension, Metadata | undefined][], profileLocation: URI): Promise<void> {
 		const localExtensions = extensions.map(e => e[0]);
-		await this.extensionsScanner.unsetExtensionsForRemoval(...localExtensions.map(extension => ExtensionKey.create(extension)));
+		await this.setInstalled(localExtensions);
 		await this.extensionsProfileScannerService.addExtensionsToProfile(extensions, profileLocation);
 		this._onDidInstallExtensions.fire(localExtensions.map(local => ({ local, identifier: local.identifier, operation: InstallOperation.None, profileLocation })));
 	}
+
+	private async setInstalled(extensions: ILocalExtension[]): Promise<void> {
+		const uninstalled = await this.extensionsScanner.getUninstalledExtensions();
+		for (const extension of extensions) {
+			const extensionKey = ExtensionKey.create(extension);
+			if (!uninstalled[extensionKey.toString()]) {
+				continue;
+			}
+			this.logService.trace('Removing the extension from uninstalled list:', extensionKey.id);
+			await this.extensionsScanner.setInstalled(extensionKey);
+			this.logService.info('Removed the extension from uninstalled list:', extensionKey.id);
+		}
+	}
 }
 
 type UpdateMetadataErrorClassification = {
@@ -535,8 +536,8 @@ type UpdateMetadataErrorEvent = {
 
 export class ExtensionsScanner extends Disposable {
 
-	private readonly obsoletedResource: URI;
-	private readonly obsoleteFileLimiter: Queue<any>;
+	private readonly uninstalledResource: URI;
+	private readonly uninstalledFileLimiter: Queue<any>;
 
 	private readonly _onExtract = this._register(new Emitter<URI>());
 	readonly onExtract = this._onExtract.event;
@@ -554,13 +555,13 @@ export class ExtensionsScanner extends Disposable {
 		@ILogService private readonly logService: ILogService,
 	) {
 		super();
-		this.obsoletedResource = joinPath(this.extensionsScannerService.userExtensionsLocation, '.obsolete');
-		this.obsoleteFileLimiter = new Queue();
+		this.uninstalledResource = joinPath(this.extensionsScannerService.userExtensionsLocation, '.obsolete');
+		this.uninstalledFileLimiter = new Queue();
 	}
 
 	async cleanUp(): Promise<void> {
 		await this.removeTemporarilyDeletedFolders();
-		await this.deleteExtensionsMarkedForRemoval();
+		await this.removeUninstalledExtensions();
 		await this.initializeMetadata();
 	}
 
@@ -719,38 +720,40 @@ export class ExtensionsScanner extends Disposable {
 		return this.scanLocalExtension(local.location, local.type, profileLocation);
 	}
 
-	async setExtensionsForRemoval(...extensions: IExtension[]): Promise<void> {
+	async getUninstalledExtensions(): Promise<IStringDictionary<boolean>> {
+		try {
+			return await this.withUninstalledExtensions();
+		} catch (error) {
+			throw toExtensionManagementError(error, ExtensionManagementErrorCode.ReadUninstalled);
+		}
+	}
+
+	async setUninstalled(...extensions: IExtension[]): Promise<void> {
 		const extensionKeys: ExtensionKey[] = extensions.map(e => ExtensionKey.create(e));
-		await this.withRemovedExtensions(removedExtensions =>
+		await this.withUninstalledExtensions(uninstalled =>
 			extensionKeys.forEach(extensionKey => {
-				removedExtensions[extensionKey.toString()] = true;
-				this.logService.info('Marked extension as removed', extensionKey.toString());
+				uninstalled[extensionKey.toString()] = true;
+				this.logService.info('Marked extension as uninstalled', extensionKey.toString());
 			}));
 	}
 
-	async unsetExtensionsForRemoval(...extensionKeys: ExtensionKey[]): Promise<boolean[]> {
+	async setInstalled(extensionKey: ExtensionKey): Promise<void> {
 		try {
-			const results: boolean[] = [];
-			await this.withRemovedExtensions(removedExtensions =>
-				extensionKeys.forEach(extensionKey => {
-					if (removedExtensions[extensionKey.toString()]) {
-						results.push(true);
-						delete removedExtensions[extensionKey.toString()];
-					} else {
-						results.push(false);
-					}
-				}));
-			return results;
+			await this.withUninstalledExtensions(uninstalled => delete uninstalled[extensionKey.toString()]);
 		} catch (error) {
-			throw toExtensionManagementError(error, ExtensionManagementErrorCode.UnsetRemoved);
+			throw toExtensionManagementError(error, ExtensionManagementErrorCode.UnsetUninstalled);
 		}
 	}
 
-	async deleteExtension(extension: ILocalExtension | IScannedExtension, type: string): Promise<void> {
+	async removeExtension(extension: ILocalExtension | IScannedExtension, type: string): Promise<void> {
 		if (this.uriIdentityService.extUri.isEqualOrParent(extension.location, this.extensionsScannerService.userExtensionsLocation)) {
 			return this.deleteExtensionFromLocation(extension.identifier.id, extension.location, type);
 		}
-		await this.unsetExtensionsForRemoval(ExtensionKey.create(extension));
+	}
+
+	async removeUninstalledExtension(extension: ILocalExtension | IScannedExtension): Promise<void> {
+		await this.removeExtension(extension, 'uninstalled');
+		await this.withUninstalledExtensions(uninstalled => delete uninstalled[ExtensionKey.create(extension).toString()]);
 	}
 
 	async copyExtension(extension: ILocalExtension, fromProfileLocation: URI, toProfileLocation: URI, metadata: Partial<Metadata>): Promise<ILocalExtension> {
@@ -789,11 +792,11 @@ export class ExtensionsScanner extends Disposable {
 		this.logService.info(`Deleted ${type} extension from disk`, id, location.fsPath);
 	}
 
-	private withRemovedExtensions(updateFn?: (removed: IStringDictionary<boolean>) => void): Promise<IStringDictionary<boolean>> {
-		return this.obsoleteFileLimiter.queue(async () => {
+	private withUninstalledExtensions(updateFn?: (uninstalled: IStringDictionary<boolean>) => void): Promise<IStringDictionary<boolean>> {
+		return this.uninstalledFileLimiter.queue(async () => {
 			let raw: string | undefined;
 			try {
-				const content = await this.fileService.readFile(this.obsoletedResource, 'utf8');
+				const content = await this.fileService.readFile(this.uninstalledResource, 'utf8');
 				raw = content.value.toString();
 			} catch (error) {
 				if (toFileOperationResult(error) !== FileOperationResult.FILE_NOT_FOUND) {
@@ -801,23 +804,23 @@ export class ExtensionsScanner extends Disposable {
 				}
 			}
 
-			let removed = {};
+			let uninstalled = {};
 			if (raw) {
 				try {
-					removed = JSON.parse(raw);
+					uninstalled = JSON.parse(raw);
 				} catch (e) { /* ignore */ }
 			}
 
 			if (updateFn) {
-				updateFn(removed);
-				if (Object.keys(removed).length) {
-					await this.fileService.writeFile(this.obsoletedResource, VSBuffer.fromString(JSON.stringify(removed)));
+				updateFn(uninstalled);
+				if (Object.keys(uninstalled).length) {
+					await this.fileService.writeFile(this.uninstalledResource, VSBuffer.fromString(JSON.stringify(uninstalled)));
 				} else {
-					await this.fileService.del(this.obsoletedResource);
+					await this.fileService.del(this.uninstalledResource);
 				}
 			}
 
-			return removed;
+			return uninstalled;
 		});
 	}
 
@@ -895,25 +898,19 @@ export class ExtensionsScanner extends Disposable {
 		}));
 	}
 
-	private async deleteExtensionsMarkedForRemoval(): Promise<void> {
-		let removed: IStringDictionary<boolean>;
-		try {
-			removed = await this.withRemovedExtensions();
-		} catch (error) {
-			throw toExtensionManagementError(error, ExtensionManagementErrorCode.ReadRemoved);
-		}
-
-		if (Object.keys(removed).length === 0) {
-			this.logService.debug(`No extensions are marked as removed.`);
+	private async removeUninstalledExtensions(): Promise<void> {
+		const uninstalled = await this.getUninstalledExtensions();
+		if (Object.keys(uninstalled).length === 0) {
+			this.logService.debug(`No uninstalled extensions found.`);
 			return;
 		}
 
-		this.logService.debug(`Deleting extensions marked as removed:`, Object.keys(removed));
+		this.logService.debug(`Removing uninstalled extensions:`, Object.keys(uninstalled));
 
-		const extensions = await this.extensionsScannerService.scanUserExtensions({ includeAllVersions: true, includeInvalid: true }); // All user extensions
+		const extensions = await this.extensionsScannerService.scanUserExtensions({ includeAllVersions: true, includeUninstalled: true, includeInvalid: true }); // All user extensions
 		const installed: Set<string> = new Set<string>();
 		for (const e of extensions) {
-			if (!removed[ExtensionKey.create(e).toString()]) {
+			if (!uninstalled[ExtensionKey.create(e).toString()]) {
 				installed.add(e.identifier.id.toLowerCase());
 			}
 		}
@@ -931,8 +928,8 @@ export class ExtensionsScanner extends Disposable {
 			this.logService.error(error);
 		}
 
-		const toRemove = extensions.filter(e => e.metadata /* Installed by System */ && removed[ExtensionKey.create(e).toString()]);
-		await Promise.allSettled(toRemove.map(e => this.deleteExtension(e, 'marked for removal')));
+		const toRemove = extensions.filter(e => e.metadata /* Installed by System */ && uninstalled[ExtensionKey.create(e).toString()]);
+		await Promise.allSettled(toRemove.map(e => this.removeUninstalledExtension(e)));
 	}
 
 	private async removeTemporarilyDeletedFolders(): Promise<void> {
@@ -1024,7 +1021,7 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
 			if (existingExtension) {
 				if (this.extensionKey.equals(new ExtensionKey(existingExtension.identifier, existingExtension.manifest.version))) {
 					try {
-						await this.extensionsScanner.deleteExtension(existingExtension, 'existing');
+						await this.extensionsScanner.removeExtension(existingExtension, 'existing');
 					} catch (e) {
 						throw new Error(nls.localize('restartCode', "Please restart VS Code before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
 					}
@@ -1032,10 +1029,10 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
 			}
 			// Remove the extension with same version if it is already uninstalled.
 			// Installing a VSIX extension shall replace the existing extension always.
-			const existingWithSameVersion = await this.unsetIfRemoved(this.extensionKey);
+			const existingWithSameVersion = await this.unsetIfUninstalled(this.extensionKey);
 			if (existingWithSameVersion) {
 				try {
-					await this.extensionsScanner.deleteExtension(existingWithSameVersion, 'existing');
+					await this.extensionsScanner.removeExtension(existingWithSameVersion, 'existing');
 				} catch (e) {
 					throw new Error(nls.localize('restartCode', "Please restart VS Code before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
 				}
@@ -1061,7 +1058,7 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
 			}
 
 			// Unset if the extension is uninstalled and return the unset extension.
-			local = await this.unsetIfRemoved(this.extensionKey);
+			local = await this.unsetIfUninstalled(this.extensionKey);
 		}
 
 		if (token.isCancellationRequested) {
@@ -1104,15 +1101,19 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
 		return result;
 	}
 
-	private async unsetIfRemoved(extensionKey: ExtensionKey): Promise<ILocalExtension | undefined> {
-		// If the same version of extension is marked as removed, remove it from there and return the local.
-		const [removed] = await this.extensionsScanner.unsetExtensionsForRemoval(extensionKey);
-		if (removed) {
-			this.logService.info('Removed the extension from removed list:', extensionKey.id);
-			const userExtensions = await this.extensionsScanner.scanAllUserExtensions(true);
-			return userExtensions.find(i => ExtensionKey.create(i).equals(extensionKey));
+	private async unsetIfUninstalled(extensionKey: ExtensionKey): Promise<ILocalExtension | undefined> {
+		const uninstalled = await this.extensionsScanner.getUninstalledExtensions();
+		if (!uninstalled[extensionKey.toString()]) {
+			return undefined;
 		}
-		return undefined;
+
+		this.logService.trace('Removing the extension from uninstalled list:', extensionKey.id);
+		// If the same version of extension is marked as uninstalled, remove it from there and return the local.
+		await this.extensionsScanner.setInstalled(extensionKey);
+		this.logService.info('Removed the extension from uninstalled list:', extensionKey.id);
+
+		const userExtensions = await this.extensionsScanner.scanAllUserExtensions(true);
+		return userExtensions.find(i => ExtensionKey.create(i).equals(extensionKey));
 	}
 
 	private async updateMetadata(extension: ILocalExtension, token: CancellationToken): Promise<void> {
@@ -1148,8 +1149,8 @@ class UninstallExtensionInProfileTask extends AbstractExtensionTask<void> implem
 		super();
 	}
 
-	protected doRun(token: CancellationToken): Promise<void> {
-		return this.extensionsProfileScannerService.removeExtensionFromProfile(this.extension, this.options.profileLocation);
+	protected async doRun(token: CancellationToken): Promise<void> {
+		await this.extensionsProfileScannerService.removeExtensionFromProfile(this.extension, this.options.profileLocation);
 	}
 
 }
diff --git a/src/vs/platform/extensionManagement/node/extensionsWatcher.ts b/src/vs/platform/extensionManagement/node/extensionsWatcher.ts
index 2c4e976a5a6..d2b65eaea55 100644
--- a/src/vs/platform/extensionManagement/node/extensionsWatcher.ts
+++ b/src/vs/platform/extensionManagement/node/extensionsWatcher.ts
@@ -48,7 +48,7 @@ export class ExtensionsWatcher extends Disposable {
 		await this.extensionsScannerService.initializeDefaultProfileExtensions();
 		await this.onDidChangeProfiles(this.userDataProfilesService.profiles);
 		this.registerListeners();
-		await this.deleteExtensionsNotInProfiles();
+		await this.uninstallExtensionsNotInProfiles();
 	}
 
 	private registerListeners(): void {
@@ -102,7 +102,7 @@ export class ExtensionsWatcher extends Disposable {
 	}
 
 	private async onDidRemoveExtensions(e: DidRemoveProfileExtensionsEvent): Promise<void> {
-		const extensionsToDelete: IExtension[] = [];
+		const extensionsToUninstall: IExtension[] = [];
 		const promises: Promise<void>[] = [];
 		for (const extension of e.extensions) {
 			const key = this.getKey(extension.identifier, extension.version);
@@ -115,7 +115,7 @@ export class ExtensionsWatcher extends Disposable {
 					promises.push(this.extensionManagementService.scanInstalledExtensionAtLocation(extension.location)
 						.then(result => {
 							if (result) {
-								extensionsToDelete.push(result);
+								extensionsToUninstall.push(result);
 							} else {
 								this.logService.info('Extension not found at the location', extension.location.toString());
 							}
@@ -125,8 +125,8 @@ export class ExtensionsWatcher extends Disposable {
 		}
 		try {
 			await Promise.all(promises);
-			if (extensionsToDelete.length) {
-				await this.deleteExtensionsNotInProfiles(extensionsToDelete);
+			if (extensionsToUninstall.length) {
+				await this.uninstallExtensionsNotInProfiles(extensionsToUninstall);
 			}
 		} catch (error) {
 			this.logService.error(error);
@@ -180,13 +180,13 @@ export class ExtensionsWatcher extends Disposable {
 		}
 	}
 
-	private async deleteExtensionsNotInProfiles(toDelete?: IExtension[]): Promise<void> {
-		if (!toDelete) {
+	private async uninstallExtensionsNotInProfiles(toUninstall?: IExtension[]): Promise<void> {
+		if (!toUninstall) {
 			const installed = await this.extensionManagementService.scanAllUserInstalledExtensions();
-			toDelete = installed.filter(installedExtension => !this.allExtensions.has(this.getKey(installedExtension.identifier, installedExtension.manifest.version)));
+			toUninstall = installed.filter(installedExtension => !this.allExtensions.has(this.getKey(installedExtension.identifier, installedExtension.manifest.version)));
 		}
-		if (toDelete.length) {
-			await this.extensionManagementService.deleteExtensions(...toDelete);
+		if (toUninstall.length) {
+			await this.extensionManagementService.markAsUninstalled(...toUninstall);
 		}
 	}
 
diff --git a/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts b/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts
index 551ba576d44..74d3ffcd738 100644
--- a/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts
+++ b/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts
@@ -224,6 +224,31 @@ suite('NativeExtensionsScanerService Test', () => {
 		assert.deepStrictEqual(actual[0].identifier, { id: 'pub.name' });
 	});
 
+	test('scan exclude uninstalled extensions', async () => {
+		await aUserExtension(anExtensionManifest({ 'name': 'name', 'publisher': 'pub' }));
+		await aUserExtension(anExtensionManifest({ 'name': 'name2', 'publisher': 'pub' }));
+		await instantiationService.get(IFileService).writeFile(joinPath(URI.file(instantiationService.get(INativeEnvironmentService).extensionsPath), '.obsolete'), VSBuffer.fromString(JSON.stringify({ 'pub.name2-1.0.0': true })));
+		const testObject: IExtensionsScannerService = disposables.add(instantiationService.createInstance(ExtensionsScannerService));
+
+		const actual = await testObject.scanUserExtensions({});
+
+		assert.deepStrictEqual(actual.length, 1);
+		assert.deepStrictEqual(actual[0].identifier, { id: 'pub.name' });
+	});
+
+	test('scan include uninstalled extensions', async () => {
+		await aUserExtension(anExtensionManifest({ 'name': 'name', 'publisher': 'pub' }));
+		await aUserExtension(anExtensionManifest({ 'name': 'name2', 'publisher': 'pub' }));
+		await instantiationService.get(IFileService).writeFile(joinPath(URI.file(instantiationService.get(INativeEnvironmentService).extensionsPath), '.obsolete'), VSBuffer.fromString(JSON.stringify({ 'pub.name2-1.0.0': true })));
+		const testObject: IExtensionsScannerService = disposables.add(instantiationService.createInstance(ExtensionsScannerService));
+
+		const actual = await testObject.scanUserExtensions({ includeUninstalled: true });
+
+		assert.deepStrictEqual(actual.length, 2);
+		assert.deepStrictEqual(actual[0].identifier, { id: 'pub.name' });
+		assert.deepStrictEqual(actual[1].identifier, { id: 'pub.name2' });
+	});
+
 	test('scan include invalid extensions', async () => {
 		await aUserExtension(anExtensionManifest({ 'name': 'name', 'publisher': 'pub' }));
 		await aUserExtension(anExtensionManifest({ 'name': 'name2', 'publisher': 'pub', engines: { vscode: '^1.67.0' } }));
@@ -326,7 +351,7 @@ suite('ExtensionScannerInput', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
 
 	test('compare inputs - location', () => {
-		const anInput = (location: URI, mtime: number | undefined) => new ExtensionScannerInput(location, mtime, undefined, undefined, false, undefined, ExtensionType.User, true, '1.1.1', undefined, undefined, true, undefined, {});
+		const anInput = (location: URI, mtime: number | undefined) => new ExtensionScannerInput(location, mtime, undefined, undefined, false, undefined, ExtensionType.User, true, true, '1.1.1', undefined, undefined, true, undefined, {});
 
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(ROOT, undefined), anInput(ROOT, undefined)), true);
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(ROOT, 100), anInput(ROOT, 100)), true);
@@ -336,7 +361,7 @@ suite('ExtensionScannerInput', () => {
 	});
 
 	test('compare inputs - application location', () => {
-		const anInput = (location: URI, mtime: number | undefined) => new ExtensionScannerInput(ROOT, undefined, location, mtime, false, undefined, ExtensionType.User, true, '1.1.1', undefined, undefined, true, undefined, {});
+		const anInput = (location: URI, mtime: number | undefined) => new ExtensionScannerInput(ROOT, undefined, location, mtime, false, undefined, ExtensionType.User, true, true, '1.1.1', undefined, undefined, true, undefined, {});
 
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(ROOT, undefined), anInput(ROOT, undefined)), true);
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(ROOT, 100), anInput(ROOT, 100)), true);
@@ -346,7 +371,7 @@ suite('ExtensionScannerInput', () => {
 	});
 
 	test('compare inputs - profile', () => {
-		const anInput = (profile: boolean, profileScanOptions: IProfileExtensionsScanOptions | undefined) => new ExtensionScannerInput(ROOT, undefined, undefined, undefined, profile, profileScanOptions, ExtensionType.User, true, '1.1.1', undefined, undefined, true, undefined, {});
+		const anInput = (profile: boolean, profileScanOptions: IProfileExtensionsScanOptions | undefined) => new ExtensionScannerInput(ROOT, undefined, undefined, undefined, profile, profileScanOptions, ExtensionType.User, true, true, '1.1.1', undefined, undefined, true, undefined, {});
 
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(true, { bailOutWhenFileNotFound: true }), anInput(true, { bailOutWhenFileNotFound: true })), true);
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(false, { bailOutWhenFileNotFound: true }), anInput(false, { bailOutWhenFileNotFound: true })), true);
@@ -359,7 +384,7 @@ suite('ExtensionScannerInput', () => {
 	});
 
 	test('compare inputs - extension type', () => {
-		const anInput = (type: ExtensionType) => new ExtensionScannerInput(ROOT, undefined, undefined, undefined, false, undefined, type, true, '1.1.1', undefined, undefined, true, undefined, {});
+		const anInput = (type: ExtensionType) => new ExtensionScannerInput(ROOT, undefined, undefined, undefined, false, undefined, type, true, true, '1.1.1', undefined, undefined, true, undefined, {});
 
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(ExtensionType.System), anInput(ExtensionType.System)), true);
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(ExtensionType.User), anInput(ExtensionType.User)), true);

From 83f695ad2ae4befe613dfd1bb1b1d8547d647d53 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Wed, 18 Dec 2024 09:29:54 +0100
Subject: [PATCH 340/479] Move selected editors instead of only activ ones
 (#236327)

* move selected editors

* :lipstick:

* :lipstick:
---
 .../browser/parts/editor/editorActions.ts     | 38 +++++++-------
 .../browser/parts/editor/editorCommands.ts    | 52 ++++++++++++-------
 2 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts
index be79b3f0af2..9d9766f4eb5 100644
--- a/src/vs/workbench/browser/parts/editor/editorActions.ts
+++ b/src/vs/workbench/browser/parts/editor/editorActions.ts
@@ -12,7 +12,7 @@ import { IWorkbenchLayoutService, Parts } from '../../../services/layout/browser
 import { GoFilter, IHistoryService } from '../../../services/history/common/history.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
-import { CLOSE_EDITOR_COMMAND_ID, MOVE_ACTIVE_EDITOR_COMMAND_ID, ActiveEditorMoveCopyArguments, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, SPLIT_EDITOR_UP, SPLIT_EDITOR_DOWN, splitEditor, LAYOUT_EDITOR_GROUPS_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, COPY_ACTIVE_EDITOR_COMMAND_ID, SPLIT_EDITOR, TOGGLE_MAXIMIZE_EDITOR_GROUP, MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID as NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID } from './editorCommands.js';
+import { CLOSE_EDITOR_COMMAND_ID, MOVE_ACTIVE_EDITOR_COMMAND_ID, SelectedEditorsMoveCopyArguments, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, SPLIT_EDITOR_UP, SPLIT_EDITOR_DOWN, splitEditor, LAYOUT_EDITOR_GROUPS_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, COPY_ACTIVE_EDITOR_COMMAND_ID, SPLIT_EDITOR, TOGGLE_MAXIMIZE_EDITOR_GROUP, MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID as NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID } from './editorCommands.js';
 import { IEditorGroupsService, IEditorGroup, GroupsArrangement, GroupLocation, GroupDirection, preferredSideBySideGroupDirection, IFindGroupScope, GroupOrientation, EditorGroupLayout, GroupsOrder, MergeGroupMode } from '../../../services/editor/common/editorGroupsService.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
@@ -1996,7 +1996,7 @@ export class MoveEditorLeftInGroupAction extends ExecuteCommandAction {
 			},
 			f1: true,
 			category: Categories.View
-		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'left' } satisfies ActiveEditorMoveCopyArguments);
+		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'left' } satisfies SelectedEditorsMoveCopyArguments);
 	}
 }
 
@@ -2015,7 +2015,7 @@ export class MoveEditorRightInGroupAction extends ExecuteCommandAction {
 			},
 			f1: true,
 			category: Categories.View
-		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'right' } satisfies ActiveEditorMoveCopyArguments);
+		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'right' } satisfies SelectedEditorsMoveCopyArguments);
 	}
 }
 
@@ -2034,7 +2034,7 @@ export class MoveEditorToPreviousGroupAction extends ExecuteCommandAction {
 			},
 			f1: true,
 			category: Categories.View,
-		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'previous', by: 'group' } satisfies ActiveEditorMoveCopyArguments);
+		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'previous', by: 'group' } satisfies SelectedEditorsMoveCopyArguments);
 	}
 }
 
@@ -2053,7 +2053,7 @@ export class MoveEditorToNextGroupAction extends ExecuteCommandAction {
 				}
 			},
 			category: Categories.View
-		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'next', by: 'group' } satisfies ActiveEditorMoveCopyArguments);
+		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'next', by: 'group' } satisfies SelectedEditorsMoveCopyArguments);
 	}
 }
 
@@ -2065,7 +2065,7 @@ export class MoveEditorToAboveGroupAction extends ExecuteCommandAction {
 			title: localize2('moveEditorToAboveGroup', 'Move Editor into Group Above'),
 			f1: true,
 			category: Categories.View
-		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'up', by: 'group' } satisfies ActiveEditorMoveCopyArguments);
+		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'up', by: 'group' } satisfies SelectedEditorsMoveCopyArguments);
 	}
 }
 
@@ -2077,7 +2077,7 @@ export class MoveEditorToBelowGroupAction extends ExecuteCommandAction {
 			title: localize2('moveEditorToBelowGroup', 'Move Editor into Group Below'),
 			f1: true,
 			category: Categories.View
-		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'down', by: 'group' } satisfies ActiveEditorMoveCopyArguments);
+		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'down', by: 'group' } satisfies SelectedEditorsMoveCopyArguments);
 	}
 }
 
@@ -2089,7 +2089,7 @@ export class MoveEditorToLeftGroupAction extends ExecuteCommandAction {
 			title: localize2('moveEditorToLeftGroup', 'Move Editor into Left Group'),
 			f1: true,
 			category: Categories.View
-		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'left', by: 'group' } satisfies ActiveEditorMoveCopyArguments);
+		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'left', by: 'group' } satisfies SelectedEditorsMoveCopyArguments);
 	}
 }
 
@@ -2101,7 +2101,7 @@ export class MoveEditorToRightGroupAction extends ExecuteCommandAction {
 			title: localize2('moveEditorToRightGroup', 'Move Editor into Right Group'),
 			f1: true,
 			category: Categories.View
-		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'right', by: 'group' } satisfies ActiveEditorMoveCopyArguments);
+		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'right', by: 'group' } satisfies SelectedEditorsMoveCopyArguments);
 	}
 }
 
@@ -2120,7 +2120,7 @@ export class MoveEditorToFirstGroupAction extends ExecuteCommandAction {
 				}
 			},
 			category: Categories.View
-		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'first', by: 'group' } satisfies ActiveEditorMoveCopyArguments);
+		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'first', by: 'group' } satisfies SelectedEditorsMoveCopyArguments);
 	}
 }
 
@@ -2139,7 +2139,7 @@ export class MoveEditorToLastGroupAction extends ExecuteCommandAction {
 				}
 			},
 			category: Categories.View
-		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'last', by: 'group' } satisfies ActiveEditorMoveCopyArguments);
+		}, MOVE_ACTIVE_EDITOR_COMMAND_ID, { to: 'last', by: 'group' } satisfies SelectedEditorsMoveCopyArguments);
 	}
 }
 
@@ -2151,7 +2151,7 @@ export class SplitEditorToPreviousGroupAction extends ExecuteCommandAction {
 			title: localize2('splitEditorToPreviousGroup', 'Split Editor into Previous Group'),
 			f1: true,
 			category: Categories.View
-		}, COPY_ACTIVE_EDITOR_COMMAND_ID, { to: 'previous', by: 'group' } satisfies ActiveEditorMoveCopyArguments);
+		}, COPY_ACTIVE_EDITOR_COMMAND_ID, { to: 'previous', by: 'group' } satisfies SelectedEditorsMoveCopyArguments);
 	}
 }
 
@@ -2163,7 +2163,7 @@ export class SplitEditorToNextGroupAction extends ExecuteCommandAction {
 			title: localize2('splitEditorToNextGroup', 'Split Editor into Next Group'),
 			f1: true,
 			category: Categories.View
-		}, COPY_ACTIVE_EDITOR_COMMAND_ID, { to: 'next', by: 'group' } satisfies ActiveEditorMoveCopyArguments);
+		}, COPY_ACTIVE_EDITOR_COMMAND_ID, { to: 'next', by: 'group' } satisfies SelectedEditorsMoveCopyArguments);
 	}
 }
 
@@ -2175,7 +2175,7 @@ export class SplitEditorToAboveGroupAction extends ExecuteCommandAction {
 			title: localize2('splitEditorToAboveGroup', 'Split Editor into Group Above'),
 			f1: true,
 			category: Categories.View
-		}, COPY_ACTIVE_EDITOR_COMMAND_ID, { to: 'up', by: 'group' } satisfies ActiveEditorMoveCopyArguments);
+		}, COPY_ACTIVE_EDITOR_COMMAND_ID, { to: 'up', by: 'group' } satisfies SelectedEditorsMoveCopyArguments);
 	}
 }
 
@@ -2187,7 +2187,7 @@ export class SplitEditorToBelowGroupAction extends ExecuteCommandAction {
 			title: localize2('splitEditorToBelowGroup', 'Split Editor into Group Below'),
 			f1: true,
 			category: Categories.View
-		}, COPY_ACTIVE_EDITOR_COMMAND_ID, { to: 'down', by: 'group' } satisfies ActiveEditorMoveCopyArguments);
+		}, COPY_ACTIVE_EDITOR_COMMAND_ID, { to: 'down', by: 'group' } satisfies SelectedEditorsMoveCopyArguments);
 	}
 }
 
@@ -2202,7 +2202,7 @@ export class SplitEditorToLeftGroupAction extends ExecuteCommandAction {
 			title: localize2('splitEditorToLeftGroup', "Split Editor into Left Group"),
 			f1: true,
 			category: Categories.View
-		}, COPY_ACTIVE_EDITOR_COMMAND_ID, { to: 'left', by: 'group' } satisfies ActiveEditorMoveCopyArguments);
+		}, COPY_ACTIVE_EDITOR_COMMAND_ID, { to: 'left', by: 'group' } satisfies SelectedEditorsMoveCopyArguments);
 	}
 }
 
@@ -2214,7 +2214,7 @@ export class SplitEditorToRightGroupAction extends ExecuteCommandAction {
 			title: localize2('splitEditorToRightGroup', 'Split Editor into Right Group'),
 			f1: true,
 			category: Categories.View
-		}, COPY_ACTIVE_EDITOR_COMMAND_ID, { to: 'right', by: 'group' } satisfies ActiveEditorMoveCopyArguments);
+		}, COPY_ACTIVE_EDITOR_COMMAND_ID, { to: 'right', by: 'group' } satisfies SelectedEditorsMoveCopyArguments);
 	}
 }
 
@@ -2226,7 +2226,7 @@ export class SplitEditorToFirstGroupAction extends ExecuteCommandAction {
 			title: localize2('splitEditorToFirstGroup', 'Split Editor into First Group'),
 			f1: true,
 			category: Categories.View
-		}, COPY_ACTIVE_EDITOR_COMMAND_ID, { to: 'first', by: 'group' } satisfies ActiveEditorMoveCopyArguments);
+		}, COPY_ACTIVE_EDITOR_COMMAND_ID, { to: 'first', by: 'group' } satisfies SelectedEditorsMoveCopyArguments);
 	}
 }
 
@@ -2238,7 +2238,7 @@ export class SplitEditorToLastGroupAction extends ExecuteCommandAction {
 			title: localize2('splitEditorToLastGroup', 'Split Editor into Last Group'),
 			f1: true,
 			category: Categories.View
-		}, COPY_ACTIVE_EDITOR_COMMAND_ID, { to: 'last', by: 'group' } satisfies ActiveEditorMoveCopyArguments);
+		}, COPY_ACTIVE_EDITOR_COMMAND_ID, { to: 'last', by: 'group' } satisfies SelectedEditorsMoveCopyArguments);
 	}
 }
 
diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts
index 83f88bd7b74..1bbe6258eb0 100644
--- a/src/vs/workbench/browser/parts/editor/editorCommands.ts
+++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts
@@ -28,7 +28,7 @@ import { ActiveGroupEditorsByMostRecentlyUsedQuickAccess } from './editorQuickAc
 import { SideBySideEditor } from './sideBySideEditor.js';
 import { TextDiffEditor } from './textDiffEditor.js';
 import { ActiveEditorCanSplitInGroupContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupLockedContext, ActiveEditorStickyContext, MultipleEditorGroupsContext, SideBySideEditorActiveContext, TextCompareEditorActiveContext } from '../../../common/contextkeys.js';
-import { CloseDirection, EditorInputCapabilities, EditorsOrder, IResourceDiffEditorInput, IUntitledTextResourceEditorInput, IVisibleEditorPane, isEditorInputWithOptionsAndGroup } from '../../../common/editor.js';
+import { CloseDirection, EditorInputCapabilities, EditorsOrder, IResourceDiffEditorInput, IUntitledTextResourceEditorInput, isEditorInputWithOptionsAndGroup } from '../../../common/editor.js';
 import { DiffEditorInput } from '../../../common/editor/diffEditorInput.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
@@ -108,13 +108,13 @@ export const EDITOR_CORE_NAVIGATION_COMMANDS = [
 	TOGGLE_MAXIMIZE_EDITOR_GROUP
 ];
 
-export interface ActiveEditorMoveCopyArguments {
+export interface SelectedEditorsMoveCopyArguments {
 	to?: 'first' | 'last' | 'left' | 'right' | 'up' | 'down' | 'center' | 'position' | 'previous' | 'next';
 	by?: 'tab' | 'group';
 	value?: number;
 }
 
-const isActiveEditorMoveCopyArg = function (arg: ActiveEditorMoveCopyArguments): boolean {
+const isSelectedEditorsMoveCopyArg = function (arg: SelectedEditorsMoveCopyArguments): boolean {
 	if (!isObject(arg)) {
 		return false;
 	}
@@ -159,14 +159,14 @@ function registerActiveEditorMoveCopyCommand(): void {
 		weight: KeybindingWeight.WorkbenchContrib,
 		when: EditorContextKeys.editorTextFocus,
 		primary: 0,
-		handler: (accessor, args) => moveCopyActiveEditor(true, args, accessor),
+		handler: (accessor, args) => moveCopySelectedEditors(true, args, accessor),
 		metadata: {
 			description: localize('editorCommand.activeEditorMove.description', "Move the active editor by tabs or groups"),
 			args: [
 				{
 					name: localize('editorCommand.activeEditorMove.arg.name', "Active editor move argument"),
 					description: localize('editorCommand.activeEditorMove.arg.description', "Argument Properties:\n\t* 'to': String value providing where to move.\n\t* 'by': String value providing the unit for move (by tab or by group).\n\t* 'value': Number value providing how many positions or an absolute position to move."),
-					constraint: isActiveEditorMoveCopyArg,
+					constraint: isSelectedEditorsMoveCopyArg,
 					schema: moveCopyJSONSchema
 				}
 			]
@@ -178,42 +178,55 @@ function registerActiveEditorMoveCopyCommand(): void {
 		weight: KeybindingWeight.WorkbenchContrib,
 		when: EditorContextKeys.editorTextFocus,
 		primary: 0,
-		handler: (accessor, args) => moveCopyActiveEditor(false, args, accessor),
+		handler: (accessor, args) => moveCopySelectedEditors(false, args, accessor),
 		metadata: {
 			description: localize('editorCommand.activeEditorCopy.description', "Copy the active editor by groups"),
 			args: [
 				{
 					name: localize('editorCommand.activeEditorCopy.arg.name', "Active editor copy argument"),
 					description: localize('editorCommand.activeEditorCopy.arg.description', "Argument Properties:\n\t* 'to': String value providing where to copy.\n\t* 'value': Number value providing how many positions or an absolute position to copy."),
-					constraint: isActiveEditorMoveCopyArg,
+					constraint: isSelectedEditorsMoveCopyArg,
 					schema: moveCopyJSONSchema
 				}
 			]
 		}
 	});
 
-	function moveCopyActiveEditor(isMove: boolean, args: ActiveEditorMoveCopyArguments = Object.create(null), accessor: ServicesAccessor): void {
+	function moveCopySelectedEditors(isMove: boolean, args: SelectedEditorsMoveCopyArguments = Object.create(null), accessor: ServicesAccessor): void {
 		args.to = args.to || 'right';
 		args.by = args.by || 'tab';
 		args.value = typeof args.value === 'number' ? args.value : 1;
 
-		const activeEditorPane = accessor.get(IEditorService).activeEditorPane;
-		if (activeEditorPane) {
+		const activeGroup = accessor.get(IEditorGroupsService).activeGroup;
+		const selectedEditors = activeGroup.selectedEditors;
+		if (selectedEditors.length > 0) {
 			switch (args.by) {
 				case 'tab':
 					if (isMove) {
-						return moveActiveTab(args, activeEditorPane);
+						return moveTabs(args, activeGroup, selectedEditors);
 					}
 					break;
 				case 'group':
-					return moveCopyActiveEditorToGroup(isMove, args, activeEditorPane, accessor);
+					return moveCopyActiveEditorToGroup(isMove, args, activeGroup, selectedEditors, accessor);
 			}
 		}
 	}
 
-	function moveActiveTab(args: ActiveEditorMoveCopyArguments, control: IVisibleEditorPane): void {
-		const group = control.group;
-		let index = group.getIndexOfEditor(control.input);
+	function moveTabs(args: SelectedEditorsMoveCopyArguments, group: IEditorGroup, editors: EditorInput[]): void {
+		const to = args.to;
+		if (to === 'first' || to === 'right') {
+			editors = [...editors].reverse();
+		} else if (to === 'position' && (args.value ?? 1) < group.getIndexOfEditor(editors[0])) {
+			editors = [...editors].reverse();
+		}
+
+		for (const editor of editors) {
+			moveTab(args, group, editor);
+		}
+	}
+
+	function moveTab(args: SelectedEditorsMoveCopyArguments, group: IEditorGroup, editor: EditorInput): void {
+		let index = group.getIndexOfEditor(editor);
 		switch (args.to) {
 			case 'first':
 				index = 0;
@@ -236,14 +249,13 @@ function registerActiveEditorMoveCopyCommand(): void {
 		}
 
 		index = index < 0 ? 0 : index >= group.count ? group.count - 1 : index;
-		group.moveEditor(control.input, group, { index });
+		group.moveEditor(editor, group, { index });
 	}
 
-	function moveCopyActiveEditorToGroup(isMove: boolean, args: ActiveEditorMoveCopyArguments, control: IVisibleEditorPane, accessor: ServicesAccessor): void {
+	function moveCopyActiveEditorToGroup(isMove: boolean, args: SelectedEditorsMoveCopyArguments, sourceGroup: IEditorGroup, editors: EditorInput[], accessor: ServicesAccessor): void {
 		const editorGroupsService = accessor.get(IEditorGroupsService);
 		const configurationService = accessor.get(IConfigurationService);
 
-		const sourceGroup = control.group;
 		let targetGroup: IEditorGroup | undefined;
 
 		switch (args.to) {
@@ -296,9 +308,9 @@ function registerActiveEditorMoveCopyCommand(): void {
 
 		if (targetGroup) {
 			if (isMove) {
-				sourceGroup.moveEditor(control.input, targetGroup);
+				sourceGroup.moveEditors(editors.map(editor => ({ editor })), targetGroup);
 			} else if (sourceGroup.id !== targetGroup.id) {
-				sourceGroup.copyEditor(control.input, targetGroup);
+				sourceGroup.copyEditors(editors.map(editor => ({ editor })), targetGroup);
 			}
 			targetGroup.focus();
 		}

From 2fb0656601fdd8ee16e4bda6f4e788594a22e8f2 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 18 Dec 2024 10:27:36 +0100
Subject: [PATCH 341/479] Removal of `chat.experimental.offerSetup` (fix
 microsoft/vscode-copilot#11286) (#236320)

---
 .../chat/browser/actions/chatActions.ts       |  2 -
 .../contrib/chat/browser/chat.contribution.ts |  7 --
 .../browser/chatParticipant.contribution.ts   |  5 +-
 .../contrib/chat/browser/chatSetup.ts         | 16 ++--
 .../contrib/chat/common/chatContextKeys.ts    | 36 ++++----
 .../common/gettingStartedContent.ts           | 84 ++++++++++---------
 6 files changed, 68 insertions(+), 82 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index de160c8c263..92f6c42dd3d 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -534,7 +534,6 @@ MenuRegistry.appendMenuItem(MenuId.CommandCenter, {
 	when: ContextKeyExpr.and(
 		ContextKeyExpr.has('config.chat.commandCenter.enabled'),
 		ContextKeyExpr.or(
-			ContextKeyExpr.has('config.chat.experimental.offerSetup'),
 			ChatContextKeys.Setup.installed,
 			ChatContextKeys.panelParticipantRegistered
 		)
@@ -552,7 +551,6 @@ registerAction2(class ToggleCopilotControl extends ToggleTitleBarConfigAction {
 				ContextKeyExpr.has('config.window.commandCenter'),
 				ContextKeyExpr.or(
 					ChatContextKeys.Setup.installed,
-					ContextKeyExpr.has('config.chat.experimental.offerSetup'),
 					ChatContextKeys.panelParticipantRegistered
 				)
 			)
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index 2aa243649de..b03d4605d16 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -121,13 +121,6 @@ configurationRegistry.registerConfiguration({
 			markdownDescription: nls.localize('chat.commandCenter.enabled', "Controls whether the command center shows a menu for actions to control Copilot (requires {0}).", '`#window.commandCenter#`'),
 			default: true
 		},
-		'chat.experimental.offerSetup': {
-			type: 'boolean',
-			default: false,
-			scope: ConfigurationScope.APPLICATION,
-			markdownDescription: nls.localize('chat.experimental.offerSetup', "Controls whether setup is offered for Chat if not done already."),
-			tags: ['experimental', 'onExP']
-		},
 		'chat.editing.alwaysSaveWithGeneratedChanges': {
 			type: 'boolean',
 			scope: ConfigurationScope.APPLICATION,
diff --git a/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts b/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
index 355a3d55ff8..6326c643d9c 100644
--- a/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
@@ -309,10 +309,7 @@ export class ChatExtensionPointHandler implements IWorkbenchContribution {
 			},
 			ctorDescriptor: new SyncDescriptor(ChatViewPane, [{ location: ChatAgentLocation.Panel }]),
 			when: ContextKeyExpr.or(
-				ContextKeyExpr.and(
-					ContextKeyExpr.has('config.chat.experimental.offerSetup'),
-					ChatContextKeys.Setup.triggered
-				),
+				ChatContextKeys.Setup.triggered,
 				ChatContextKeys.Setup.installed,
 				ChatContextKeys.panelParticipantRegistered,
 				ChatContextKeys.extensionInvalid
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 54e081fbc0d..aab4103ddac 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -132,12 +132,9 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 	private registerActions(): void {
 		const that = this;
 
-		const chatSetupTriggerContext = ContextKeyExpr.and(
-			ContextKeyExpr.has('config.chat.experimental.offerSetup'),
-			ContextKeyExpr.or(
-				ChatContextKeys.Setup.installed.negate(),
-				ChatContextKeys.Setup.canSignUp
-			)
+		const chatSetupTriggerContext = ContextKeyExpr.or(
+			ChatContextKeys.Setup.installed.negate(),
+			ChatContextKeys.Setup.canSignUp
 		);
 		class ChatSetupTriggerAction extends Action2 {
 
@@ -188,10 +185,7 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 					title: ChatSetupHideAction.TITLE,
 					f1: true,
 					category: CHAT_CATEGORY,
-					precondition: ContextKeyExpr.and(
-						ChatContextKeys.Setup.installed.negate(),
-						ContextKeyExpr.has('config.chat.experimental.offerSetup')
-					),
+					precondition: ChatContextKeys.Setup.installed.negate(),
 					menu: {
 						id: MenuId.ChatCommandCenter,
 						group: 'z_hide',
@@ -1006,6 +1000,7 @@ class ChatSetupContext extends Disposable {
 	private readonly canSignUpContextKey = ChatContextKeys.Setup.canSignUp.bindTo(this.contextKeyService);
 	private readonly signedOutContextKey = ChatContextKeys.Setup.signedOut.bindTo(this.contextKeyService);
 	private readonly limitedContextKey = ChatContextKeys.Setup.limited.bindTo(this.contextKeyService);
+	private readonly proContextKey = ChatContextKeys.Setup.pro.bindTo(this.contextKeyService);
 	private readonly triggeredContext = ChatContextKeys.Setup.triggered.bindTo(this.contextKeyService);
 	private readonly installedContext = ChatContextKeys.Setup.installed.bindTo(this.contextKeyService);
 
@@ -1108,6 +1103,7 @@ class ChatSetupContext extends Disposable {
 		this.signedOutContextKey.set(this._state.entitlement === ChatEntitlement.Unknown);
 		this.canSignUpContextKey.set(this._state.entitlement === ChatEntitlement.Available);
 		this.limitedContextKey.set(this._state.entitlement === ChatEntitlement.Limited);
+		this.proContextKey.set(this._state.entitlement === ChatEntitlement.Pro);
 		this.triggeredContext.set(!!this._state.triggered);
 		this.installedContext.set(!!this._state.installed);
 
diff --git a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
index 047a5824af2..f615233de50 100644
--- a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
+++ b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
@@ -42,31 +42,31 @@ export namespace ChatContextKeys {
 	export const languageModelsAreUserSelectable = new RawContextKey<boolean>('chatModelsAreUserSelectable', false, { type: 'boolean', description: localize('chatModelsAreUserSelectable', "True when the chat model can be selected manually by the user.") });
 
 	export const Setup = {
-		canSignUp: new RawContextKey<boolean>('chatSetupCanSignUp', false, true), 	// True when user can sign up to be a chat limited user.
 
+		// State
 		signedOut: new RawContextKey<boolean>('chatSetupSignedOut', false, true), 	// True when user is signed out.
-		limited: new RawContextKey<boolean>('chatSetupLimited', false, true), 		// True when user is a chat limited user.
-
 		triggered: new RawContextKey<boolean>('chatSetupTriggered', false, true), 	// True when chat setup is triggered.
 		installed: new RawContextKey<boolean>('chatSetupInstalled', false, true),  	// True when the chat extension is installed.
+
+		// Plans
+		canSignUp: new RawContextKey<boolean>('chatPlanCanSignUp', false, true), 	// True when user can sign up to be a chat limited user.
+		limited: new RawContextKey<boolean>('chatPlanLimited', false, true),		// True when user is a chat limited user.
+		pro: new RawContextKey<boolean>('chatPlanPro', false, true) 				// True when user is a chat pro user.
 	};
 
 	export const SetupViewKeys = new Set([ChatContextKeys.Setup.triggered.key, ChatContextKeys.Setup.installed.key, ChatContextKeys.Setup.signedOut.key, ChatContextKeys.Setup.canSignUp.key]);
-	export const SetupViewCondition = ContextKeyExpr.and(
-		ContextKeyExpr.has('config.chat.experimental.offerSetup'),
-		ContextKeyExpr.or(
-			ContextKeyExpr.and(
-				ChatContextKeys.Setup.triggered,
-				ChatContextKeys.Setup.installed.negate()
-			),
-			ContextKeyExpr.and(
-				ChatContextKeys.Setup.canSignUp,
-				ChatContextKeys.Setup.installed
-			),
-			ContextKeyExpr.and(
-				ChatContextKeys.Setup.signedOut,
-				ChatContextKeys.Setup.installed
-			)
+	export const SetupViewCondition = ContextKeyExpr.or(
+		ContextKeyExpr.and(
+			ChatContextKeys.Setup.triggered,
+			ChatContextKeys.Setup.installed.negate()
+		),
+		ContextKeyExpr.and(
+			ChatContextKeys.Setup.canSignUp,
+			ChatContextKeys.Setup.installed
+		),
+		ContextKeyExpr.and(
+			ChatContextKeys.Setup.signedOut,
+			ChatContextKeys.Setup.installed
 		)
 	)!;
 
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
index 303905c9136..7fd3e30163f 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
@@ -246,9 +246,9 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 		content: {
 			type: 'steps',
 			steps: [
-				createCopilotSetupStep('CopilotSetupSignedOut', CopilotSignedOutButton, 'config.chat.experimental.offerSetup && chatSetupSignedOut', true),
-				createCopilotSetupStep('CopilotSetupComplete', CopilotCompleteButton, 'config.chat.experimental.offerSetup && chatSetupInstalled && (chatSetupEntitled || chatSetupLimited)', false),
-				createCopilotSetupStep('CopilotSetupSignedIn', CopilotSignedInButton, 'config.chat.experimental.offerSetup && !chatSetupSignedOut && (!chatSetupInstalled || chatSetupCanSignUp)', true),
+				createCopilotSetupStep('CopilotSetupSignedOut', CopilotSignedOutButton, 'chatSetupSignedOut', true),
+				createCopilotSetupStep('CopilotSetupComplete', CopilotCompleteButton, 'chatSetupInstalled && (chatPlanPro || chatPlanLimited)', false),
+				createCopilotSetupStep('CopilotSetupSignedIn', CopilotSignedInButton, '!chatSetupSignedOut && (!chatSetupInstalled || chatPlanCanSignUp)', true),
 				{
 					id: 'pickColorTheme',
 					title: localize('gettingStarted.pickColor.title', "Choose your theme"),
@@ -277,30 +277,31 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 						type: 'svg', altText: 'Language extensions', path: 'languages.svg'
 					},
 				},
-				{
-					id: 'settings',
-					title: localize('gettingStarted.settings.title', "Tune your settings"),
-					description: localize('gettingStarted.settings.description.interpolated', "Customize every aspect of VS Code and your extensions to your liking. Commonly used settings are listed first to get you started.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')),
-					when: '!config.chat.experimental.offerSetup',
-					media: {
-						type: 'svg', altText: 'VS Code Settings', path: 'settings.svg'
-					},
-				},
-				{
-					id: 'settingsSync',
-					title: localize('gettingStarted.settingsSync.title', "Sync settings across devices"),
-					description: localize('gettingStarted.settingsSync.description.interpolated', "Keep your essential customizations backed up and updated across all your devices.\n{0}", Button(localize('enableSync', "Backup and Sync Settings"), 'command:workbench.userDataSync.actions.turnOn')),
-					when: '!config.chat.experimental.offerSetup && syncStatus != uninitialized',
-					completionEvents: ['onEvent:sync-enabled'],
-					media: {
-						type: 'svg', altText: 'The "Turn on Sync" entry in the settings gear menu.', path: 'settingsSync.svg'
-					},
-				},
+				// Hidden in favor of copilot entry (to be revisited when copilot entry moves, if at all)
+				// {
+				// 	id: 'settings',
+				// 	title: localize('gettingStarted.settings.title', "Tune your settings"),
+				// 	description: localize('gettingStarted.settings.description.interpolated', "Customize every aspect of VS Code and your extensions to your liking. Commonly used settings are listed first to get you started.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')),
+				// 	when: '!config.chat.experimental.offerSetup',
+				// 	media: {
+				// 		type: 'svg', altText: 'VS Code Settings', path: 'settings.svg'
+				// 	},
+				// },
+				// {
+				// 	id: 'settingsSync',
+				// 	title: localize('gettingStarted.settingsSync.title', "Sync settings across devices"),
+				// 	description: localize('gettingStarted.settingsSync.description.interpolated', "Keep your essential customizations backed up and updated across all your devices.\n{0}", Button(localize('enableSync', "Backup and Sync Settings"), 'command:workbench.userDataSync.actions.turnOn')),
+				// 	when: '!config.chat.experimental.offerSetup && syncStatus != uninitialized',
+				// 	completionEvents: ['onEvent:sync-enabled'],
+				// 	media: {
+				// 		type: 'svg', altText: 'The "Turn on Sync" entry in the settings gear menu.', path: 'settingsSync.svg'
+				// 	},
+				// },
 				{
 					id: 'settingsAndSync',
 					title: localize('gettingStarted.settings.title', "Tune your settings"),
 					description: localize('gettingStarted.settingsAndSync.description.interpolated', "Customize every aspect of VS Code and your extensions to your liking. [Back up and sync](command:workbench.userDataSync.actions.turnOn) your essential customizations across all your devices.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')),
-					when: 'config.chat.experimental.offerSetup && syncStatus != uninitialized',
+					when: 'syncStatus != uninitialized',
 					completionEvents: ['onEvent:sync-enabled'],
 					media: {
 						type: 'svg', altText: 'VS Code Settings', path: 'settings.svg'
@@ -312,24 +313,25 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 					description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VS Code.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')),
 					media: { type: 'svg', altText: 'Command Palette overlay for searching and executing commands.', path: 'commandPalette.svg' },
 				},
-				{
-					id: 'pickAFolderTask-Mac',
-					title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"),
-					description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VS Code.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFileFolder')),
-					when: '!config.chat.experimental.offerSetup && isMac && workspaceFolderCount == 0',
-					media: {
-						type: 'svg', altText: 'Explorer view showing buttons for opening folder and cloning repository.', path: 'openFolder.svg'
-					}
-				},
-				{
-					id: 'pickAFolderTask-Other',
-					title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"),
-					description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VS Code.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFolder')),
-					when: '!config.chat.experimental.offerSetup && !isMac && workspaceFolderCount == 0',
-					media: {
-						type: 'svg', altText: 'Explorer view showing buttons for opening folder and cloning repository.', path: 'openFolder.svg'
-					}
-				},
+				// Hidden in favor of copilot entry (to be revisited when copilot entry moves, if at all)
+				// {
+				// 	id: 'pickAFolderTask-Mac',
+				// 	title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"),
+				// 	description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VS Code.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFileFolder')),
+				// 	when: '!config.chat.experimental.offerSetup && isMac && workspaceFolderCount == 0',
+				// 	media: {
+				// 		type: 'svg', altText: 'Explorer view showing buttons for opening folder and cloning repository.', path: 'openFolder.svg'
+				// 	}
+				// },
+				// {
+				// 	id: 'pickAFolderTask-Other',
+				// 	title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"),
+				// 	description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VS Code.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFolder')),
+				// 	when: '!config.chat.experimental.offerSetup && !isMac && workspaceFolderCount == 0',
+				// 	media: {
+				// 		type: 'svg', altText: 'Explorer view showing buttons for opening folder and cloning repository.', path: 'openFolder.svg'
+				// 	}
+				// },
 				{
 					id: 'quickOpen',
 					title: localize('gettingStarted.quickOpen.title', "Quickly navigate between your files"),

From 3daa33e93a945f4f6cab577f424e1862c00846c1 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Wed, 18 Dec 2024 10:31:29 +0100
Subject: [PATCH 342/479] Restore close commands for keybinding support
 (#236446)

* bring back the close commands

* improve discoverability
---
 .../browser/actions/layoutActions.ts          | 22 +++----------------
 .../parts/auxiliarybar/auxiliaryBarActions.ts | 18 +++++++++++++++
 .../browser/parts/panel/panelActions.ts       | 18 +++++++++++++++
 .../browser/parts/sidebar/sidebarActions.ts   | 18 +++++++++++++++
 4 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/src/vs/workbench/browser/actions/layoutActions.ts b/src/vs/workbench/browser/actions/layoutActions.ts
index c3ba2ab9907..75253e235de 100644
--- a/src/vs/workbench/browser/actions/layoutActions.ts
+++ b/src/vs/workbench/browser/actions/layoutActions.ts
@@ -53,25 +53,6 @@ const fullscreenIcon = registerIcon('fullscreen', Codicon.screenFull, localize('
 const centerLayoutIcon = registerIcon('centerLayoutIcon', Codicon.layoutCentered, localize('centerLayoutIcon', "Represents centered layout mode"));
 const zenModeIcon = registerIcon('zenMode', Codicon.target, localize('zenModeIcon', "Represents zen mode"));
 
-
-// --- Close Side Bar
-
-registerAction2(class extends Action2 {
-
-	constructor() {
-		super({
-			id: 'workbench.action.closeSidebar',
-			title: localize2('closeSidebar', 'Close Primary Side Bar'),
-			category: Categories.View,
-			f1: true
-		});
-	}
-
-	run(accessor: ServicesAccessor): void {
-		accessor.get(IWorkbenchLayoutService).setPartHidden(true, Parts.SIDEBAR_PART);
-	}
-});
-
 export const ToggleActivityBarVisibilityActionId = 'workbench.action.toggleActivityBarVisibility';
 
 // --- Toggle Centered Layout
@@ -323,6 +304,9 @@ class ToggleSidebarVisibilityAction extends Action2 {
 				title: localize('primary sidebar', "Primary Side Bar"),
 				mnemonicTitle: localize({ key: 'primary sidebar mnemonic', comment: ['&& denotes a mnemonic'] }, "&&Primary Side Bar"),
 			},
+			metadata: {
+				description: localize('openAndCloseSidebar', 'Open/Show and Close/Hide Sidebar'),
+			},
 			category: Categories.View,
 			f1: true,
 			keybinding: {
diff --git a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts
index 3bea858332e..e564a8d49d7 100644
--- a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts
+++ b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts
@@ -41,6 +41,9 @@ export class ToggleAuxiliaryBarAction extends Action2 {
 			},
 			icon: closeIcon, // Ensures no flickering when using toggled.icon
 			category: Categories.View,
+			metadata: {
+				description: localize('openAndCloseAuxiliaryBar', 'Open/Show and Close/Hide Secondary Side Bar'),
+			},
 			f1: true,
 			keybinding: {
 				weight: KeybindingWeight.WorkbenchContrib,
@@ -74,6 +77,21 @@ export class ToggleAuxiliaryBarAction extends Action2 {
 
 registerAction2(ToggleAuxiliaryBarAction);
 
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.action.closeAuxiliaryBar',
+			title: localize2('closeSecondarySideBar', 'Hide Secondary Side Bar'),
+			category: Categories.View,
+			precondition: AuxiliaryBarVisibleContext,
+			f1: true,
+		});
+	}
+	run(accessor: ServicesAccessor) {
+		accessor.get(IWorkbenchLayoutService).setPartHidden(true, Parts.AUXILIARYBAR_PART);
+	}
+});
+
 registerAction2(class FocusAuxiliaryBarAction extends Action2 {
 
 	static readonly ID = 'workbench.action.focusAuxiliaryBar';
diff --git a/src/vs/workbench/browser/parts/panel/panelActions.ts b/src/vs/workbench/browser/parts/panel/panelActions.ts
index e8fbbacb68a..b3be54f49d7 100644
--- a/src/vs/workbench/browser/parts/panel/panelActions.ts
+++ b/src/vs/workbench/browser/parts/panel/panelActions.ts
@@ -46,6 +46,9 @@ export class TogglePanelAction extends Action2 {
 			icon: closeIcon, // Ensures no flickering when using toggled.icon
 			f1: true,
 			category: Categories.View,
+			metadata: {
+				description: localize('openAndClosePanel', 'Open/Show and Close/Hide Panel'),
+			},
 			keybinding: { primary: KeyMod.CtrlCmd | KeyCode.KeyJ, weight: KeybindingWeight.WorkbenchContrib },
 			menu: [
 				{
@@ -73,6 +76,21 @@ export class TogglePanelAction extends Action2 {
 
 registerAction2(TogglePanelAction);
 
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'workbench.action.closePanel',
+			title: localize2('closePanel', 'Hide Panel'),
+			category: Categories.View,
+			precondition: PanelVisibleContext,
+			f1: true,
+		});
+	}
+	run(accessor: ServicesAccessor) {
+		accessor.get(IWorkbenchLayoutService).setPartHidden(true, Parts.PANEL_PART);
+	}
+});
+
 registerAction2(class extends Action2 {
 
 	static readonly ID = 'workbench.action.focusPanel';
diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarActions.ts b/src/vs/workbench/browser/parts/sidebar/sidebarActions.ts
index 408bb3e4eea..4256ecb5352 100644
--- a/src/vs/workbench/browser/parts/sidebar/sidebarActions.ts
+++ b/src/vs/workbench/browser/parts/sidebar/sidebarActions.ts
@@ -13,6 +13,24 @@ import { KeybindingWeight } from '../../../../platform/keybinding/common/keybind
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
 import { ViewContainerLocation } from '../../../common/views.js';
+import { SideBarVisibleContext } from '../../../common/contextkeys.js';
+
+registerAction2(class extends Action2 {
+
+	constructor() {
+		super({
+			id: 'workbench.action.closeSidebar',
+			title: localize2('closeSidebar', 'Close Primary Side Bar'),
+			category: Categories.View,
+			f1: true,
+			precondition: SideBarVisibleContext
+		});
+	}
+
+	run(accessor: ServicesAccessor): void {
+		accessor.get(IWorkbenchLayoutService).setPartHidden(true, Parts.SIDEBAR_PART);
+	}
+});
 
 export class FocusSideBarAction extends Action2 {
 

From 224ade93d0510c71cbd362e7a8974b2e3df471d6 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Wed, 18 Dec 2024 10:35:16 +0100
Subject: [PATCH 343/479] Git - don't use look-behind regex (#236447)

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

diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index 4a968792a77..f2b9100d79a 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -502,7 +502,7 @@ export class Git {
 			const repoUri = Uri.file(repositoryRootPath);
 			const pathUri = Uri.file(pathInsidePossibleRepository);
 			if (repoUri.authority.length !== 0 && pathUri.authority.length === 0) {
-				const match = /(?<=^\/?)([a-zA-Z])(?=:\/)/.exec(pathUri.path);
+				const match = /^[\/]?([a-zA-Z])[:\/]/.exec(pathUri.path);
 				if (match !== null) {
 					const [, letter] = match;
 

From 29a39607d85dba549907a12b4ceece574d6dce51 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Wed, 18 Dec 2024 10:40:30 +0100
Subject: [PATCH 344/479] Align panel badge style with activity bar (#236448)

closes #195998
---
 src/vs/workbench/browser/parts/panel/panelPart.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/browser/parts/panel/panelPart.ts b/src/vs/workbench/browser/parts/panel/panelPart.ts
index 6363f266384..d93cfd11b3d 100644
--- a/src/vs/workbench/browser/parts/panel/panelPart.ts
+++ b/src/vs/workbench/browser/parts/panel/panelPart.ts
@@ -16,7 +16,7 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { TogglePanelAction } from './panelActions.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { PANEL_BACKGROUND, PANEL_BORDER, PANEL_TITLE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_INACTIVE_TITLE_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_DRAG_AND_DROP_BORDER, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND } from '../../../common/theme.js';
-import { badgeBackground, badgeForeground, contrastBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import { contrastBorder } from '../../../../platform/theme/common/colorRegistry.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { Dimension } from '../../../../base/browser/dom.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
@@ -130,13 +130,12 @@ export class PanelPart extends AbstractPaneCompositePart {
 	}
 
 	protected getCompositeBarOptions(): IPaneCompositeBarOptions {
-		const showIcons = this.configurationService.getValue('workbench.panel.showLabels') === false;
 		return {
 			partContainerClass: 'panel',
 			pinnedViewContainersKey: 'workbench.panel.pinnedPanels',
 			placeholderViewContainersKey: 'workbench.panel.placeholderPanels',
 			viewContainersWorkspaceStateKey: 'workbench.panel.viewContainersWorkspaceState',
-			icon: showIcons,
+			icon: this.configurationService.getValue('workbench.panel.showLabels') === false,
 			orientation: ActionsOrientation.HORIZONTAL,
 			recomputeSizes: true,
 			activityHoverOptions: {
@@ -153,8 +152,8 @@ export class PanelPart extends AbstractPaneCompositePart {
 				activeBorderBottomColor: theme.getColor(PANEL_ACTIVE_TITLE_BORDER),
 				activeForegroundColor: theme.getColor(PANEL_ACTIVE_TITLE_FOREGROUND),
 				inactiveForegroundColor: theme.getColor(PANEL_INACTIVE_TITLE_FOREGROUND),
-				badgeBackground: theme.getColor(showIcons ? ACTIVITY_BAR_BADGE_BACKGROUND : badgeBackground),
-				badgeForeground: theme.getColor(showIcons ? ACTIVITY_BAR_BADGE_FOREGROUND : badgeForeground),
+				badgeBackground: theme.getColor(ACTIVITY_BAR_BADGE_BACKGROUND),
+				badgeForeground: theme.getColor(ACTIVITY_BAR_BADGE_FOREGROUND),
 				dragAndDropBorder: theme.getColor(PANEL_DRAG_AND_DROP_BORDER)
 			})
 		};

From 777fd07cccc3de449e529c9f701c2cfdd36ecb3e Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Wed, 18 Dec 2024 11:20:00 +0100
Subject: [PATCH 345/479] Git - adopt #private in Git extension API (#236444)

* Git - adopt #private in Git extension API

* Fix post commit command provider
---
 extensions/git/src/api/api1.ts           | 236 +++++++++++++----------
 extensions/git/src/main.ts               |   2 +-
 extensions/git/src/postCommitCommands.ts |  14 +-
 3 files changed, 142 insertions(+), 110 deletions(-)

diff --git a/extensions/git/src/api/api1.ts b/extensions/git/src/api/api1.ts
index a8a8fb694b1..8cc0b99f113 100644
--- a/extensions/git/src/api/api1.ts
+++ b/extensions/git/src/api/api1.ts
@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+/* eslint-disable local/code-no-native-private */
+
 import { Model } from '../model';
 import { Repository as BaseRepository, Resource } from '../repository';
 import { InputBox, Git, API, Repository, Remote, RepositoryState, Branch, ForcePushMode, Ref, Submodule, Commit, Change, RepositoryUIState, Status, LogOptions, APIState, CommitOptions, RefType, CredentialsProvider, BranchQuery, PushErrorHandler, PublishEvent, FetchOptions, RemoteSourceProvider, RemoteSourcePublisher, PostCommitCommandsProvider, RefQuery, BranchProtectionProvider, InitOptions } from './git';
@@ -15,222 +17,242 @@ import { PickRemoteSourceOptions } from './git-base';
 import { OperationKind, OperationResult } from '../operation';
 
 class ApiInputBox implements InputBox {
-	set value(value: string) { this._inputBox.value = value; }
-	get value(): string { return this._inputBox.value; }
-	constructor(private _inputBox: SourceControlInputBox) { }
+	#inputBox: SourceControlInputBox;
+
+	constructor(inputBox: SourceControlInputBox) { this.#inputBox = inputBox; }
+
+	set value(value: string) { this.#inputBox.value = value; }
+	get value(): string { return this.#inputBox.value; }
 }
 
 export class ApiChange implements Change {
+	#resource: Resource;
+	constructor(resource: Resource) { this.#resource = resource; }
 
-	get uri(): Uri { return this.resource.resourceUri; }
-	get originalUri(): Uri { return this.resource.original; }
-	get renameUri(): Uri | undefined { return this.resource.renameResourceUri; }
-	get status(): Status { return this.resource.type; }
-
-	constructor(private readonly resource: Resource) { }
+	get uri(): Uri { return this.#resource.resourceUri; }
+	get originalUri(): Uri { return this.#resource.original; }
+	get renameUri(): Uri | undefined { return this.#resource.renameResourceUri; }
+	get status(): Status { return this.#resource.type; }
 }
 
 export class ApiRepositoryState implements RepositoryState {
+	#repository: BaseRepository;
+	readonly onDidChange: Event<void>;
 
-	get HEAD(): Branch | undefined { return this._repository.HEAD; }
+	constructor(repository: BaseRepository) {
+		this.#repository = repository;
+		this.onDidChange = this.#repository.onDidRunGitStatus;
+	}
+
+	get HEAD(): Branch | undefined { return this.#repository.HEAD; }
 	/**
 	 * @deprecated Use ApiRepository.getRefs() instead.
 	 */
 	get refs(): Ref[] { console.warn('Deprecated. Use ApiRepository.getRefs() instead.'); return []; }
-	get remotes(): Remote[] { return [...this._repository.remotes]; }
-	get submodules(): Submodule[] { return [...this._repository.submodules]; }
-	get rebaseCommit(): Commit | undefined { return this._repository.rebaseCommit; }
-
-	get mergeChanges(): Change[] { return this._repository.mergeGroup.resourceStates.map(r => new ApiChange(r)); }
-	get indexChanges(): Change[] { return this._repository.indexGroup.resourceStates.map(r => new ApiChange(r)); }
-	get workingTreeChanges(): Change[] { return this._repository.workingTreeGroup.resourceStates.map(r => new ApiChange(r)); }
-	get untrackedChanges(): Change[] { return this._repository.untrackedGroup.resourceStates.map(r => new ApiChange(r)); }
-
-	readonly onDidChange: Event<void> = this._repository.onDidRunGitStatus;
-
-	constructor(private _repository: BaseRepository) { }
+	get remotes(): Remote[] { return [...this.#repository.remotes]; }
+	get submodules(): Submodule[] { return [...this.#repository.submodules]; }
+	get rebaseCommit(): Commit | undefined { return this.#repository.rebaseCommit; }
+
+	get mergeChanges(): Change[] { return this.#repository.mergeGroup.resourceStates.map(r => new ApiChange(r)); }
+	get indexChanges(): Change[] { return this.#repository.indexGroup.resourceStates.map(r => new ApiChange(r)); }
+	get workingTreeChanges(): Change[] { return this.#repository.workingTreeGroup.resourceStates.map(r => new ApiChange(r)); }
+	get untrackedChanges(): Change[] { return this.#repository.untrackedGroup.resourceStates.map(r => new ApiChange(r)); }
 }
 
 export class ApiRepositoryUIState implements RepositoryUIState {
+	#sourceControl: SourceControl;
+	readonly onDidChange: Event<void>;
 
-	get selected(): boolean { return this._sourceControl.selected; }
-
-	readonly onDidChange: Event<void> = mapEvent<boolean, void>(this._sourceControl.onDidChangeSelection, () => null);
+	constructor(sourceControl: SourceControl) {
+		this.#sourceControl = sourceControl;
+		this.onDidChange = mapEvent<boolean, void>(this.#sourceControl.onDidChangeSelection, () => null);
+	}
 
-	constructor(private _sourceControl: SourceControl) { }
+	get selected(): boolean { return this.#sourceControl.selected; }
 }
 
 export class ApiRepository implements Repository {
 
-	readonly rootUri: Uri = Uri.file(this.repository.root);
-	readonly inputBox: InputBox = new ApiInputBox(this.repository.inputBox);
-	readonly state: RepositoryState = new ApiRepositoryState(this.repository);
-	readonly ui: RepositoryUIState = new ApiRepositoryUIState(this.repository.sourceControl);
+	#repository: BaseRepository;
+
+	readonly rootUri: Uri;
+	readonly inputBox: InputBox;
+	readonly state: RepositoryState;
+	readonly ui: RepositoryUIState;
 
-	readonly onDidCommit: Event<void> = mapEvent<OperationResult, void>(
-		filterEvent(this.repository.onDidRunOperation, e => e.operation.kind === OperationKind.Commit), () => null);
+	readonly onDidCommit: Event<void>;
+	readonly onDidCheckout: Event<void>;
 
-	readonly onDidCheckout: Event<void> = mapEvent<OperationResult, void>(
-		filterEvent(this.repository.onDidRunOperation, e => e.operation.kind === OperationKind.Checkout || e.operation.kind === OperationKind.CheckoutTracking), () => null);
+	constructor(repository: BaseRepository) {
+		this.#repository = repository;
 
-	constructor(readonly repository: BaseRepository) { }
+		this.rootUri = Uri.file(this.#repository.root);
+		this.inputBox = new ApiInputBox(this.#repository.inputBox);
+		this.state = new ApiRepositoryState(this.#repository);
+		this.ui = new ApiRepositoryUIState(this.#repository.sourceControl);
+
+		this.onDidCommit = mapEvent<OperationResult, void>(
+			filterEvent(this.#repository.onDidRunOperation, e => e.operation.kind === OperationKind.Commit), () => null);
+		this.onDidCheckout = mapEvent<OperationResult, void>(
+			filterEvent(this.#repository.onDidRunOperation, e => e.operation.kind === OperationKind.Checkout || e.operation.kind === OperationKind.CheckoutTracking), () => null);
+	}
 
 	apply(patch: string, reverse?: boolean): Promise<void> {
-		return this.repository.apply(patch, reverse);
+		return this.#repository.apply(patch, reverse);
 	}
 
 	getConfigs(): Promise<{ key: string; value: string }[]> {
-		return this.repository.getConfigs();
+		return this.#repository.getConfigs();
 	}
 
 	getConfig(key: string): Promise<string> {
-		return this.repository.getConfig(key);
+		return this.#repository.getConfig(key);
 	}
 
 	setConfig(key: string, value: string): Promise<string> {
-		return this.repository.setConfig(key, value);
+		return this.#repository.setConfig(key, value);
 	}
 
 	getGlobalConfig(key: string): Promise<string> {
-		return this.repository.getGlobalConfig(key);
+		return this.#repository.getGlobalConfig(key);
 	}
 
 	getObjectDetails(treeish: string, path: string): Promise<{ mode: string; object: string; size: number }> {
-		return this.repository.getObjectDetails(treeish, path);
+		return this.#repository.getObjectDetails(treeish, path);
 	}
 
 	detectObjectType(object: string): Promise<{ mimetype: string; encoding?: string }> {
-		return this.repository.detectObjectType(object);
+		return this.#repository.detectObjectType(object);
 	}
 
 	buffer(ref: string, filePath: string): Promise<Buffer> {
-		return this.repository.buffer(ref, filePath);
+		return this.#repository.buffer(ref, filePath);
 	}
 
 	show(ref: string, path: string): Promise<string> {
-		return this.repository.show(ref, path);
+		return this.#repository.show(ref, path);
 	}
 
 	getCommit(ref: string): Promise<Commit> {
-		return this.repository.getCommit(ref);
+		return this.#repository.getCommit(ref);
 	}
 
 	add(paths: string[]) {
-		return this.repository.add(paths.map(p => Uri.file(p)));
+		return this.#repository.add(paths.map(p => Uri.file(p)));
 	}
 
 	revert(paths: string[]) {
-		return this.repository.revert(paths.map(p => Uri.file(p)));
+		return this.#repository.revert(paths.map(p => Uri.file(p)));
 	}
 
 	clean(paths: string[]) {
-		return this.repository.clean(paths.map(p => Uri.file(p)));
+		return this.#repository.clean(paths.map(p => Uri.file(p)));
 	}
 
 	diff(cached?: boolean) {
-		return this.repository.diff(cached);
+		return this.#repository.diff(cached);
 	}
 
 	diffWithHEAD(): Promise<Change[]>;
 	diffWithHEAD(path: string): Promise<string>;
 	diffWithHEAD(path?: string): Promise<string | Change[]> {
-		return this.repository.diffWithHEAD(path);
+		return this.#repository.diffWithHEAD(path);
 	}
 
 	diffWith(ref: string): Promise<Change[]>;
 	diffWith(ref: string, path: string): Promise<string>;
 	diffWith(ref: string, path?: string): Promise<string | Change[]> {
-		return this.repository.diffWith(ref, path);
+		return this.#repository.diffWith(ref, path);
 	}
 
 	diffIndexWithHEAD(): Promise<Change[]>;
 	diffIndexWithHEAD(path: string): Promise<string>;
 	diffIndexWithHEAD(path?: string): Promise<string | Change[]> {
-		return this.repository.diffIndexWithHEAD(path);
+		return this.#repository.diffIndexWithHEAD(path);
 	}
 
 	diffIndexWith(ref: string): Promise<Change[]>;
 	diffIndexWith(ref: string, path: string): Promise<string>;
 	diffIndexWith(ref: string, path?: string): Promise<string | Change[]> {
-		return this.repository.diffIndexWith(ref, path);
+		return this.#repository.diffIndexWith(ref, path);
 	}
 
 	diffBlobs(object1: string, object2: string): Promise<string> {
-		return this.repository.diffBlobs(object1, object2);
+		return this.#repository.diffBlobs(object1, object2);
 	}
 
 	diffBetween(ref1: string, ref2: string): Promise<Change[]>;
 	diffBetween(ref1: string, ref2: string, path: string): Promise<string>;
 	diffBetween(ref1: string, ref2: string, path?: string): Promise<string | Change[]> {
-		return this.repository.diffBetween(ref1, ref2, path);
+		return this.#repository.diffBetween(ref1, ref2, path);
 	}
 
 	hashObject(data: string): Promise<string> {
-		return this.repository.hashObject(data);
+		return this.#repository.hashObject(data);
 	}
 
 	createBranch(name: string, checkout: boolean, ref?: string | undefined): Promise<void> {
-		return this.repository.branch(name, checkout, ref);
+		return this.#repository.branch(name, checkout, ref);
 	}
 
 	deleteBranch(name: string, force?: boolean): Promise<void> {
-		return this.repository.deleteBranch(name, force);
+		return this.#repository.deleteBranch(name, force);
 	}
 
 	getBranch(name: string): Promise<Branch> {
-		return this.repository.getBranch(name);
+		return this.#repository.getBranch(name);
 	}
 
 	getBranches(query: BranchQuery, cancellationToken?: CancellationToken): Promise<Ref[]> {
-		return this.repository.getBranches(query, cancellationToken);
+		return this.#repository.getBranches(query, cancellationToken);
 	}
 
 	getBranchBase(name: string): Promise<Branch | undefined> {
-		return this.repository.getBranchBase(name);
+		return this.#repository.getBranchBase(name);
 	}
 
 	setBranchUpstream(name: string, upstream: string): Promise<void> {
-		return this.repository.setBranchUpstream(name, upstream);
+		return this.#repository.setBranchUpstream(name, upstream);
 	}
 
 	getRefs(query: RefQuery, cancellationToken?: CancellationToken): Promise<Ref[]> {
-		return this.repository.getRefs(query, cancellationToken);
+		return this.#repository.getRefs(query, cancellationToken);
 	}
 
 	checkIgnore(paths: string[]): Promise<Set<string>> {
-		return this.repository.checkIgnore(paths);
+		return this.#repository.checkIgnore(paths);
 	}
 
 	getMergeBase(ref1: string, ref2: string): Promise<string | undefined> {
-		return this.repository.getMergeBase(ref1, ref2);
+		return this.#repository.getMergeBase(ref1, ref2);
 	}
 
 	tag(name: string, message: string, ref?: string | undefined): Promise<void> {
-		return this.repository.tag({ name, message, ref });
+		return this.#repository.tag({ name, message, ref });
 	}
 
 	deleteTag(name: string): Promise<void> {
-		return this.repository.deleteTag(name);
+		return this.#repository.deleteTag(name);
 	}
 
 	status(): Promise<void> {
-		return this.repository.status();
+		return this.#repository.status();
 	}
 
 	checkout(treeish: string): Promise<void> {
-		return this.repository.checkout(treeish);
+		return this.#repository.checkout(treeish);
 	}
 
 	addRemote(name: string, url: string): Promise<void> {
-		return this.repository.addRemote(name, url);
+		return this.#repository.addRemote(name, url);
 	}
 
 	removeRemote(name: string): Promise<void> {
-		return this.repository.removeRemote(name);
+		return this.#repository.removeRemote(name);
 	}
 
 	renameRemote(name: string, newName: string): Promise<void> {
-		return this.repository.renameRemote(name, newName);
+		return this.#repository.renameRemote(name, newName);
 	}
 
 	fetch(arg0?: FetchOptions | string | undefined,
@@ -239,86 +261,92 @@ export class ApiRepository implements Repository {
 		prune?: boolean | undefined
 	): Promise<void> {
 		if (arg0 !== undefined && typeof arg0 !== 'string') {
-			return this.repository.fetch(arg0);
+			return this.#repository.fetch(arg0);
 		}
 
-		return this.repository.fetch({ remote: arg0, ref, depth, prune });
+		return this.#repository.fetch({ remote: arg0, ref, depth, prune });
 	}
 
 	pull(unshallow?: boolean): Promise<void> {
-		return this.repository.pull(undefined, unshallow);
+		return this.#repository.pull(undefined, unshallow);
 	}
 
 	push(remoteName?: string, branchName?: string, setUpstream: boolean = false, force?: ForcePushMode): Promise<void> {
-		return this.repository.pushTo(remoteName, branchName, setUpstream, force);
+		return this.#repository.pushTo(remoteName, branchName, setUpstream, force);
 	}
 
 	blame(path: string): Promise<string> {
-		return this.repository.blame(path);
+		return this.#repository.blame(path);
 	}
 
 	log(options?: LogOptions): Promise<Commit[]> {
-		return this.repository.log(options);
+		return this.#repository.log(options);
 	}
 
 	commit(message: string, opts?: CommitOptions): Promise<void> {
-		return this.repository.commit(message, { ...opts, postCommitCommand: null });
+		return this.#repository.commit(message, { ...opts, postCommitCommand: null });
 	}
 
 	merge(ref: string): Promise<void> {
-		return this.repository.merge(ref);
+		return this.#repository.merge(ref);
 	}
 
 	mergeAbort(): Promise<void> {
-		return this.repository.mergeAbort();
+		return this.#repository.mergeAbort();
 	}
 
 	applyStash(index?: number): Promise<void> {
-		return this.repository.applyStash(index);
+		return this.#repository.applyStash(index);
 	}
 
 	popStash(index?: number): Promise<void> {
-		return this.repository.popStash(index);
+		return this.#repository.popStash(index);
 	}
 
 	dropStash(index?: number): Promise<void> {
-		return this.repository.dropStash(index);
+		return this.#repository.dropStash(index);
 	}
 }
 
 export class ApiGit implements Git {
+	#model: Model;
 
-	get path(): string { return this._model.git.path; }
+	constructor(model: Model) { this.#model = model; }
 
-	constructor(private _model: Model) { }
+	get path(): string { return this.#model.git.path; }
 }
 
 export class ApiImpl implements API {
+	#model: Model;
+	readonly git: ApiGit;
 
-	readonly git = new ApiGit(this._model);
+	constructor(model: Model) {
+		this.#model = model;
+		this.git = new ApiGit(this.#model);
+	}
 
 	get state(): APIState {
-		return this._model.state;
+		return this.#model.state;
 	}
 
 	get onDidChangeState(): Event<APIState> {
-		return this._model.onDidChangeState;
+		return this.#model.onDidChangeState;
 	}
 
 	get onDidPublish(): Event<PublishEvent> {
-		return this._model.onDidPublish;
+		return this.#model.onDidPublish;
 	}
 
 	get onDidOpenRepository(): Event<Repository> {
-		return mapEvent(this._model.onDidOpenRepository, r => new ApiRepository(r));
+		return mapEvent(this.#model.onDidOpenRepository, r => new ApiRepository(r));
 	}
 
 	get onDidCloseRepository(): Event<Repository> {
-		return mapEvent(this._model.onDidCloseRepository, r => new ApiRepository(r));
+		return mapEvent(this.#model.onDidCloseRepository, r => new ApiRepository(r));
 	}
 
 	get repositories(): Repository[] {
-		return this._model.repositories.map(r => new ApiRepository(r));
+		return this.#model.repositories.map(r => new ApiRepository(r));
 	}
 
 	toGitUri(uri: Uri, ref: string): Uri {
@@ -326,14 +354,14 @@ export class ApiImpl implements API {
 	}
 
 	getRepository(uri: Uri): Repository | null {
-		const result = this._model.getRepository(uri);
+		const result = this.#model.getRepository(uri);
 		return result ? new ApiRepository(result) : null;
 	}
 
 	async init(root: Uri, options?: InitOptions): Promise<Repository | null> {
 		const path = root.fsPath;
-		await this._model.git.init(path, options);
-		await this._model.openRepository(path);
+		await this.#model.git.init(path, options);
+		await this.#model.openRepository(path);
 		return this.getRepository(root) || null;
 	}
 
@@ -342,7 +370,7 @@ export class ApiImpl implements API {
 			return null;
 		}
 
-		await this._model.openRepository(root.fsPath);
+		await this.#model.openRepository(root.fsPath);
 		return this.getRepository(root) || null;
 	}
 
@@ -350,7 +378,7 @@ export class ApiImpl implements API {
 		const disposables: Disposable[] = [];
 
 		if (provider.publishRepository) {
-			disposables.push(this._model.registerRemoteSourcePublisher(provider as RemoteSourcePublisher));
+			disposables.push(this.#model.registerRemoteSourcePublisher(provider as RemoteSourcePublisher));
 		}
 		disposables.push(GitBaseApi.getAPI().registerRemoteSourceProvider(provider));
 
@@ -358,26 +386,24 @@ export class ApiImpl implements API {
 	}
 
 	registerRemoteSourcePublisher(publisher: RemoteSourcePublisher): Disposable {
-		return this._model.registerRemoteSourcePublisher(publisher);
+		return this.#model.registerRemoteSourcePublisher(publisher);
 	}
 
 	registerCredentialsProvider(provider: CredentialsProvider): Disposable {
-		return this._model.registerCredentialsProvider(provider);
+		return this.#model.registerCredentialsProvider(provider);
 	}
 
 	registerPostCommitCommandsProvider(provider: PostCommitCommandsProvider): Disposable {
-		return this._model.registerPostCommitCommandsProvider(provider);
+		return this.#model.registerPostCommitCommandsProvider(provider);
 	}
 
 	registerPushErrorHandler(handler: PushErrorHandler): Disposable {
-		return this._model.registerPushErrorHandler(handler);
+		return this.#model.registerPushErrorHandler(handler);
 	}
 
 	registerBranchProtectionProvider(root: Uri, provider: BranchProtectionProvider): Disposable {
-		return this._model.registerBranchProtectionProvider(root, provider);
+		return this.#model.registerBranchProtectionProvider(root, provider);
 	}
-
-	constructor(private _model: Model) { }
 }
 
 function getRefType(type: RefType): string {
diff --git a/extensions/git/src/main.ts b/extensions/git/src/main.ts
index 7180890ad84..515f57c12cf 100644
--- a/extensions/git/src/main.ts
+++ b/extensions/git/src/main.ts
@@ -121,7 +121,7 @@ async function createModel(context: ExtensionContext, logger: LogOutputChannel,
 		new TerminalShellExecutionManager(model, logger)
 	);
 
-	const postCommitCommandsProvider = new GitPostCommitCommandsProvider();
+	const postCommitCommandsProvider = new GitPostCommitCommandsProvider(model);
 	model.registerPostCommitCommandsProvider(postCommitCommandsProvider);
 
 	const diagnosticsManager = new GitCommitInputBoxDiagnosticsManager(model);
diff --git a/extensions/git/src/postCommitCommands.ts b/extensions/git/src/postCommitCommands.ts
index d4e227b6db7..69a18114a41 100644
--- a/extensions/git/src/postCommitCommands.ts
+++ b/extensions/git/src/postCommitCommands.ts
@@ -5,7 +5,7 @@
 
 import { Command, commands, Disposable, Event, EventEmitter, Memento, Uri, workspace, l10n } from 'vscode';
 import { PostCommitCommandsProvider } from './api/git';
-import { Repository } from './repository';
+import { IRepositoryResolver, Repository } from './repository';
 import { ApiRepository } from './api/api1';
 import { dispose } from './util';
 import { OperationKind } from './operation';
@@ -18,17 +18,23 @@ export interface IPostCommitCommandsProviderRegistry {
 }
 
 export class GitPostCommitCommandsProvider implements PostCommitCommandsProvider {
+	constructor(private readonly _repositoryResolver: IRepositoryResolver) { }
+
 	getCommands(apiRepository: ApiRepository): Command[] {
-		const config = workspace.getConfiguration('git', Uri.file(apiRepository.repository.root));
+		const repository = this._repositoryResolver.getRepository(apiRepository.rootUri);
+		if (!repository) {
+			return [];
+		}
+
+		const config = workspace.getConfiguration('git', Uri.file(repository.root));
 
 		// Branch protection
-		const isBranchProtected = apiRepository.repository.isBranchProtected();
+		const isBranchProtected = repository.isBranchProtected();
 		const branchProtectionPrompt = config.get<'alwaysCommit' | 'alwaysCommitToNewBranch' | 'alwaysPrompt'>('branchProtectionPrompt')!;
 		const alwaysPrompt = isBranchProtected && branchProtectionPrompt === 'alwaysPrompt';
 		const alwaysCommitToNewBranch = isBranchProtected && branchProtectionPrompt === 'alwaysCommitToNewBranch';
 
 		// Icon
-		const repository = apiRepository.repository;
 		const isCommitInProgress = repository.operations.isRunning(OperationKind.Commit) || repository.operations.isRunning(OperationKind.PostCommitCommand);
 		const icon = isCommitInProgress ? '$(sync~spin)' : alwaysPrompt ? '$(lock)' : alwaysCommitToNewBranch ? '$(git-branch)' : undefined;
 

From 9fb1d574701dd41b6e5014e1c20f3cc7c4e4f353 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Wed, 18 Dec 2024 11:34:24 +0100
Subject: [PATCH 346/479]  Reapply "debt: clean up obsolete file usage"
 (#236453)

* Reapply "debt: clean up obsolete file usage" (#236433)

This reverts commit cf2ebd91b8e42e3bc5ab0e85e3323c886a977ffe.

* Fix extension deletion logic to ensure proper removal and handle file not found errors
---
 .../common/extensionManagement.ts             |   4 +-
 .../common/extensionsScannerService.ts        |  51 ++----
 .../node/extensionManagementService.ts        | 171 +++++++++---------
 .../node/extensionsWatcher.ts                 |  20 +-
 .../node/extensionsScannerService.test.ts     |  33 +---
 5 files changed, 122 insertions(+), 157 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index 155079831fc..f08b46ae65b 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -456,8 +456,8 @@ export const enum ExtensionManagementErrorCode {
 	Extract = 'Extract',
 	Scanning = 'Scanning',
 	ScanningExtension = 'ScanningExtension',
-	ReadUninstalled = 'ReadUninstalled',
-	UnsetUninstalled = 'UnsetUninstalled',
+	ReadRemoved = 'ReadRemoved',
+	UnsetRemoved = 'UnsetRemoved',
 	Delete = 'Delete',
 	Rename = 'Rename',
 	IntializeDefaultProfile = 'IntializeDefaultProfile',
diff --git a/src/vs/platform/extensionManagement/common/extensionsScannerService.ts b/src/vs/platform/extensionManagement/common/extensionsScannerService.ts
index 99868cddb5d..a186b6fa045 100644
--- a/src/vs/platform/extensionManagement/common/extensionsScannerService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionsScannerService.ts
@@ -7,7 +7,6 @@ import { coalesce } from '../../../base/common/arrays.js';
 import { ThrottledDelayer } from '../../../base/common/async.js';
 import * as objects from '../../../base/common/objects.js';
 import { VSBuffer } from '../../../base/common/buffer.js';
-import { IStringDictionary } from '../../../base/common/collections.js';
 import { getErrorMessage } from '../../../base/common/errors.js';
 import { getNodeType, parse, ParseError } from '../../../base/common/json.js';
 import { getParseErrorMessage } from '../../../base/common/jsonErrorMessages.js';
@@ -18,12 +17,11 @@ import * as platform from '../../../base/common/platform.js';
 import { basename, isEqual, joinPath } from '../../../base/common/resources.js';
 import * as semver from '../../../base/common/semver/semver.js';
 import Severity from '../../../base/common/severity.js';
-import { isEmptyObject } from '../../../base/common/types.js';
 import { URI } from '../../../base/common/uri.js';
 import { localize } from '../../../nls.js';
 import { IEnvironmentService } from '../../environment/common/environment.js';
 import { IProductVersion, Metadata } from './extensionManagement.js';
-import { areSameExtensions, computeTargetPlatform, ExtensionKey, getExtensionId, getGalleryExtensionId } from './extensionManagementUtil.js';
+import { areSameExtensions, computeTargetPlatform, getExtensionId, getGalleryExtensionId } from './extensionManagementUtil.js';
 import { ExtensionType, ExtensionIdentifier, IExtensionManifest, TargetPlatform, IExtensionIdentifier, IRelaxedExtensionManifest, UNDEFINED_PUBLISHER, IExtensionDescription, BUILTIN_MANIFEST_CACHE_FILE, USER_MANIFEST_CACHE_FILE, ExtensionIdentifierMap, parseEnabledApiProposalNames } from '../../extensions/common/extensions.js';
 import { validateExtensionManifest } from '../../extensions/common/extensionValidator.js';
 import { FileOperationResult, IFileService, toFileOperationResult } from '../../files/common/files.js';
@@ -106,7 +104,6 @@ export type ScanOptions = {
 	readonly profileLocation?: URI;
 	readonly includeInvalid?: boolean;
 	readonly includeAllVersions?: boolean;
-	readonly includeUninstalled?: boolean;
 	readonly checkControlFile?: boolean;
 	readonly language?: string;
 	readonly useCache?: boolean;
@@ -145,10 +142,9 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 	private readonly _onDidChangeCache = this._register(new Emitter<ExtensionType>());
 	readonly onDidChangeCache = this._onDidChangeCache.event;
 
-	private readonly obsoleteFile = joinPath(this.userExtensionsLocation, '.obsolete');
-	private readonly systemExtensionsCachedScanner = this._register(this.instantiationService.createInstance(CachedExtensionsScanner, this.currentProfile, this.obsoleteFile));
-	private readonly userExtensionsCachedScanner = this._register(this.instantiationService.createInstance(CachedExtensionsScanner, this.currentProfile, this.obsoleteFile));
-	private readonly extensionsScanner = this._register(this.instantiationService.createInstance(ExtensionsScanner, this.obsoleteFile));
+	private readonly systemExtensionsCachedScanner = this._register(this.instantiationService.createInstance(CachedExtensionsScanner, this.currentProfile));
+	private readonly userExtensionsCachedScanner = this._register(this.instantiationService.createInstance(CachedExtensionsScanner, this.currentProfile));
+	private readonly extensionsScanner = this._register(this.instantiationService.createInstance(ExtensionsScanner));
 
 	constructor(
 		readonly systemExtensionsLocation: URI,
@@ -199,8 +195,8 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 		const location = scanOptions.profileLocation ?? this.userExtensionsLocation;
 		this.logService.trace('Started scanning user extensions', location);
 		const profileScanOptions: IProfileExtensionsScanOptions | undefined = this.uriIdentityService.extUri.isEqual(scanOptions.profileLocation, this.userDataProfilesService.defaultProfile.extensionsResource) ? { bailOutWhenFileNotFound: true } : undefined;
-		const extensionsScannerInput = await this.createExtensionScannerInput(location, !!scanOptions.profileLocation, ExtensionType.User, !scanOptions.includeUninstalled, scanOptions.language, true, profileScanOptions, scanOptions.productVersion ?? this.getProductVersion());
-		const extensionsScanner = scanOptions.useCache && !extensionsScannerInput.devMode && extensionsScannerInput.excludeObsolete ? this.userExtensionsCachedScanner : this.extensionsScanner;
+		const extensionsScannerInput = await this.createExtensionScannerInput(location, !!scanOptions.profileLocation, ExtensionType.User, scanOptions.language, true, profileScanOptions, scanOptions.productVersion ?? this.getProductVersion());
+		const extensionsScanner = scanOptions.useCache && !extensionsScannerInput.devMode ? this.userExtensionsCachedScanner : this.extensionsScanner;
 		let extensions: IRelaxedScannedExtension[];
 		try {
 			extensions = await extensionsScanner.scanExtensions(extensionsScannerInput);
@@ -221,7 +217,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 		if (this.environmentService.isExtensionDevelopment && this.environmentService.extensionDevelopmentLocationURI) {
 			const extensions = (await Promise.all(this.environmentService.extensionDevelopmentLocationURI.filter(extLoc => extLoc.scheme === Schemas.file)
 				.map(async extensionDevelopmentLocationURI => {
-					const input = await this.createExtensionScannerInput(extensionDevelopmentLocationURI, false, ExtensionType.User, true, scanOptions.language, false /* do not validate */, undefined, scanOptions.productVersion ?? this.getProductVersion());
+					const input = await this.createExtensionScannerInput(extensionDevelopmentLocationURI, false, ExtensionType.User, scanOptions.language, false /* do not validate */, undefined, scanOptions.productVersion ?? this.getProductVersion());
 					const extensions = await this.extensionsScanner.scanOneOrMultipleExtensions(input);
 					return extensions.map(extension => {
 						// Override the extension type from the existing extensions
@@ -237,7 +233,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 	}
 
 	async scanExistingExtension(extensionLocation: URI, extensionType: ExtensionType, scanOptions: ScanOptions): Promise<IScannedExtension | null> {
-		const extensionsScannerInput = await this.createExtensionScannerInput(extensionLocation, false, extensionType, true, scanOptions.language, true, undefined, scanOptions.productVersion ?? this.getProductVersion());
+		const extensionsScannerInput = await this.createExtensionScannerInput(extensionLocation, false, extensionType, scanOptions.language, true, undefined, scanOptions.productVersion ?? this.getProductVersion());
 		const extension = await this.extensionsScanner.scanExtension(extensionsScannerInput);
 		if (!extension) {
 			return null;
@@ -249,7 +245,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 	}
 
 	async scanOneOrMultipleExtensions(extensionLocation: URI, extensionType: ExtensionType, scanOptions: ScanOptions): Promise<IScannedExtension[]> {
-		const extensionsScannerInput = await this.createExtensionScannerInput(extensionLocation, false, extensionType, true, scanOptions.language, true, undefined, scanOptions.productVersion ?? this.getProductVersion());
+		const extensionsScannerInput = await this.createExtensionScannerInput(extensionLocation, false, extensionType, scanOptions.language, true, undefined, scanOptions.productVersion ?? this.getProductVersion());
 		const extensions = await this.extensionsScanner.scanOneOrMultipleExtensions(extensionsScannerInput);
 		return this.applyScanOptions(extensions, extensionType, scanOptions, true);
 	}
@@ -405,7 +401,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 
 	private async scanDefaultSystemExtensions(useCache: boolean, language: string | undefined): Promise<IRelaxedScannedExtension[]> {
 		this.logService.trace('Started scanning system extensions');
-		const extensionsScannerInput = await this.createExtensionScannerInput(this.systemExtensionsLocation, false, ExtensionType.System, true, language, true, undefined, this.getProductVersion());
+		const extensionsScannerInput = await this.createExtensionScannerInput(this.systemExtensionsLocation, false, ExtensionType.System, language, true, undefined, this.getProductVersion());
 		const extensionsScanner = useCache && !extensionsScannerInput.devMode ? this.systemExtensionsCachedScanner : this.extensionsScanner;
 		const result = await extensionsScanner.scanExtensions(extensionsScannerInput);
 		this.logService.trace('Scanned system extensions:', result.length);
@@ -435,7 +431,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 					break;
 			}
 		}
-		const result = await Promise.all(devSystemExtensionsLocations.map(async location => this.extensionsScanner.scanExtension((await this.createExtensionScannerInput(location, false, ExtensionType.System, true, language, true, undefined, this.getProductVersion())))));
+		const result = await Promise.all(devSystemExtensionsLocations.map(async location => this.extensionsScanner.scanExtension((await this.createExtensionScannerInput(location, false, ExtensionType.System, language, true, undefined, this.getProductVersion())))));
 		this.logService.trace('Scanned dev system extensions:', result.length);
 		return coalesce(result);
 	}
@@ -449,7 +445,7 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 		}
 	}
 
-	private async createExtensionScannerInput(location: URI, profile: boolean, type: ExtensionType, excludeObsolete: boolean, language: string | undefined, validate: boolean, profileScanOptions: IProfileExtensionsScanOptions | undefined, productVersion: IProductVersion): Promise<ExtensionScannerInput> {
+	private async createExtensionScannerInput(location: URI, profile: boolean, type: ExtensionType, language: string | undefined, validate: boolean, profileScanOptions: IProfileExtensionsScanOptions | undefined, productVersion: IProductVersion): Promise<ExtensionScannerInput> {
 		const translations = await this.getTranslations(language ?? platform.language);
 		const mtime = await this.getMtime(location);
 		const applicationExtensionsLocation = profile && !this.uriIdentityService.extUri.isEqual(location, this.userDataProfilesService.defaultProfile.extensionsResource) ? this.userDataProfilesService.defaultProfile.extensionsResource : undefined;
@@ -462,7 +458,6 @@ export abstract class AbstractExtensionsScannerService extends Disposable implem
 			profile,
 			profileScanOptions,
 			type,
-			excludeObsolete,
 			validate,
 			productVersion.version,
 			productVersion.date,
@@ -504,7 +499,6 @@ export class ExtensionScannerInput {
 		public readonly profile: boolean,
 		public readonly profileScanOptions: IProfileExtensionsScanOptions | undefined,
 		public readonly type: ExtensionType,
-		public readonly excludeObsolete: boolean,
 		public readonly validate: boolean,
 		public readonly productVersion: string,
 		public readonly productDate: string | undefined,
@@ -534,7 +528,6 @@ export class ExtensionScannerInput {
 			&& a.profile === b.profile
 			&& objects.equals(a.profileScanOptions, b.profileScanOptions)
 			&& a.type === b.type
-			&& a.excludeObsolete === b.excludeObsolete
 			&& a.validate === b.validate
 			&& a.productVersion === b.productVersion
 			&& a.productDate === b.productDate
@@ -558,7 +551,6 @@ class ExtensionsScanner extends Disposable {
 	private readonly extensionsEnabledWithApiProposalVersion: string[];
 
 	constructor(
-		private readonly obsoleteFile: URI,
 		@IExtensionsProfileScannerService protected readonly extensionsProfileScannerService: IExtensionsProfileScannerService,
 		@IUriIdentityService protected readonly uriIdentityService: IUriIdentityService,
 		@IFileService protected readonly fileService: IFileService,
@@ -571,15 +563,9 @@ class ExtensionsScanner extends Disposable {
 	}
 
 	async scanExtensions(input: ExtensionScannerInput): Promise<IRelaxedScannedExtension[]> {
-		const extensions = input.profile ? await this.scanExtensionsFromProfile(input) : await this.scanExtensionsFromLocation(input);
-		let obsolete: IStringDictionary<boolean> = {};
-		if (input.excludeObsolete && input.type === ExtensionType.User) {
-			try {
-				const raw = (await this.fileService.readFile(this.obsoleteFile)).value.toString();
-				obsolete = JSON.parse(raw);
-			} catch (error) { /* ignore */ }
-		}
-		return isEmptyObject(obsolete) ? extensions : extensions.filter(e => !obsolete[ExtensionKey.create(e).toString()]);
+		return input.profile
+			? this.scanExtensionsFromProfile(input)
+			: this.scanExtensionsFromLocation(input);
 	}
 
 	private async scanExtensionsFromLocation(input: ExtensionScannerInput): Promise<IRelaxedScannedExtension[]> {
@@ -596,7 +582,7 @@ class ExtensionsScanner extends Disposable {
 				if (input.type === ExtensionType.User && basename(c.resource).indexOf('.') === 0) {
 					return null;
 				}
-				const extensionScannerInput = new ExtensionScannerInput(c.resource, input.mtime, input.applicationExtensionslocation, input.applicationExtensionslocationMtime, input.profile, input.profileScanOptions, input.type, input.excludeObsolete, input.validate, input.productVersion, input.productDate, input.productCommit, input.devMode, input.language, input.translations);
+				const extensionScannerInput = new ExtensionScannerInput(c.resource, input.mtime, input.applicationExtensionslocation, input.applicationExtensionslocationMtime, input.profile, input.profileScanOptions, input.type, input.validate, input.productVersion, input.productDate, input.productCommit, input.devMode, input.language, input.translations);
 				return this.scanExtension(extensionScannerInput);
 			}));
 		return coalesce(extensions)
@@ -622,7 +608,7 @@ class ExtensionsScanner extends Disposable {
 		const extensions = await Promise.all<IRelaxedScannedExtension | null>(
 			scannedProfileExtensions.map(async extensionInfo => {
 				if (filter(extensionInfo)) {
-					const extensionScannerInput = new ExtensionScannerInput(extensionInfo.location, input.mtime, input.applicationExtensionslocation, input.applicationExtensionslocationMtime, input.profile, input.profileScanOptions, input.type, input.excludeObsolete, input.validate, input.productVersion, input.productDate, input.productCommit, input.devMode, input.language, input.translations);
+					const extensionScannerInput = new ExtensionScannerInput(extensionInfo.location, input.mtime, input.applicationExtensionslocation, input.applicationExtensionslocationMtime, input.profile, input.profileScanOptions, input.type, input.validate, input.productVersion, input.productDate, input.productCommit, input.devMode, input.language, input.translations);
 					return this.scanExtension(extensionScannerInput, extensionInfo.metadata);
 				}
 				return null;
@@ -891,7 +877,6 @@ class CachedExtensionsScanner extends ExtensionsScanner {
 
 	constructor(
 		private readonly currentProfile: IUserDataProfile,
-		obsoleteFile: URI,
 		@IUserDataProfilesService private readonly userDataProfilesService: IUserDataProfilesService,
 		@IExtensionsProfileScannerService extensionsProfileScannerService: IExtensionsProfileScannerService,
 		@IUriIdentityService uriIdentityService: IUriIdentityService,
@@ -900,7 +885,7 @@ class CachedExtensionsScanner extends ExtensionsScanner {
 		@IEnvironmentService environmentService: IEnvironmentService,
 		@ILogService logService: ILogService
 	) {
-		super(obsoleteFile, extensionsProfileScannerService, uriIdentityService, fileService, productService, environmentService, logService);
+		super(extensionsProfileScannerService, uriIdentityService, fileService, productService, environmentService, logService);
 	}
 
 	override async scanExtensions(input: ExtensionScannerInput): Promise<IRelaxedScannedExtension[]> {
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 92405eefb75..762da10967f 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -60,7 +60,7 @@ export interface INativeServerExtensionManagementService extends IExtensionManag
 	readonly _serviceBrand: undefined;
 	scanAllUserInstalledExtensions(): Promise<ILocalExtension[]>;
 	scanInstalledExtensionAtLocation(location: URI): Promise<ILocalExtension | null>;
-	markAsUninstalled(...extensions: IExtension[]): Promise<void>;
+	deleteExtensions(...extensions: IExtension[]): Promise<void>;
 }
 
 type ExtractExtensionResult = { readonly local: ILocalExtension; readonly verificationStatus?: ExtensionSignatureVerificationCode };
@@ -222,8 +222,8 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 		return this.extensionsScanner.copyExtensions(fromProfileLocation, toProfileLocation, { version: this.productService.version, date: this.productService.date });
 	}
 
-	markAsUninstalled(...extensions: IExtension[]): Promise<void> {
-		return this.extensionsScanner.setUninstalled(...extensions);
+	deleteExtensions(...extensions: IExtension[]): Promise<void> {
+		return this.extensionsScanner.setExtensionsForRemoval(...extensions);
 	}
 
 	async cleanUp(): Promise<void> {
@@ -480,8 +480,20 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 				continue;
 			}
 
-			// Check if this is a directory
-			if (!(await this.fileService.stat(resource)).isDirectory) {
+			// Ignore changes to the deleted folder
+			if (this.uriIdentityService.extUri.basename(resource).endsWith(DELETED_FOLDER_POSTFIX)) {
+				continue;
+			}
+
+			try {
+				// Check if this is a directory
+				if (!(await this.fileService.stat(resource)).isDirectory) {
+					continue;
+				}
+			} catch (error) {
+				if (toFileOperationResult(error) !== FileOperationResult.FILE_NOT_FOUND) {
+					this.logService.error(error);
+				}
 				continue;
 			}
 
@@ -502,23 +514,10 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 
 	private async addExtensionsToProfile(extensions: [ILocalExtension, Metadata | undefined][], profileLocation: URI): Promise<void> {
 		const localExtensions = extensions.map(e => e[0]);
-		await this.setInstalled(localExtensions);
+		await this.extensionsScanner.unsetExtensionsForRemoval(...localExtensions.map(extension => ExtensionKey.create(extension)));
 		await this.extensionsProfileScannerService.addExtensionsToProfile(extensions, profileLocation);
 		this._onDidInstallExtensions.fire(localExtensions.map(local => ({ local, identifier: local.identifier, operation: InstallOperation.None, profileLocation })));
 	}
-
-	private async setInstalled(extensions: ILocalExtension[]): Promise<void> {
-		const uninstalled = await this.extensionsScanner.getUninstalledExtensions();
-		for (const extension of extensions) {
-			const extensionKey = ExtensionKey.create(extension);
-			if (!uninstalled[extensionKey.toString()]) {
-				continue;
-			}
-			this.logService.trace('Removing the extension from uninstalled list:', extensionKey.id);
-			await this.extensionsScanner.setInstalled(extensionKey);
-			this.logService.info('Removed the extension from uninstalled list:', extensionKey.id);
-		}
-	}
 }
 
 type UpdateMetadataErrorClassification = {
@@ -536,8 +535,8 @@ type UpdateMetadataErrorEvent = {
 
 export class ExtensionsScanner extends Disposable {
 
-	private readonly uninstalledResource: URI;
-	private readonly uninstalledFileLimiter: Queue<any>;
+	private readonly obsoletedResource: URI;
+	private readonly obsoleteFileLimiter: Queue<any>;
 
 	private readonly _onExtract = this._register(new Emitter<URI>());
 	readonly onExtract = this._onExtract.event;
@@ -555,13 +554,13 @@ export class ExtensionsScanner extends Disposable {
 		@ILogService private readonly logService: ILogService,
 	) {
 		super();
-		this.uninstalledResource = joinPath(this.extensionsScannerService.userExtensionsLocation, '.obsolete');
-		this.uninstalledFileLimiter = new Queue();
+		this.obsoletedResource = joinPath(this.extensionsScannerService.userExtensionsLocation, '.obsolete');
+		this.obsoleteFileLimiter = new Queue();
 	}
 
 	async cleanUp(): Promise<void> {
 		await this.removeTemporarilyDeletedFolders();
-		await this.removeUninstalledExtensions();
+		await this.deleteExtensionsMarkedForRemoval();
 		await this.initializeMetadata();
 	}
 
@@ -720,42 +719,40 @@ export class ExtensionsScanner extends Disposable {
 		return this.scanLocalExtension(local.location, local.type, profileLocation);
 	}
 
-	async getUninstalledExtensions(): Promise<IStringDictionary<boolean>> {
-		try {
-			return await this.withUninstalledExtensions();
-		} catch (error) {
-			throw toExtensionManagementError(error, ExtensionManagementErrorCode.ReadUninstalled);
-		}
-	}
-
-	async setUninstalled(...extensions: IExtension[]): Promise<void> {
+	async setExtensionsForRemoval(...extensions: IExtension[]): Promise<void> {
 		const extensionKeys: ExtensionKey[] = extensions.map(e => ExtensionKey.create(e));
-		await this.withUninstalledExtensions(uninstalled =>
+		await this.withRemovedExtensions(removedExtensions =>
 			extensionKeys.forEach(extensionKey => {
-				uninstalled[extensionKey.toString()] = true;
-				this.logService.info('Marked extension as uninstalled', extensionKey.toString());
+				removedExtensions[extensionKey.toString()] = true;
+				this.logService.info('Marked extension as removed', extensionKey.toString());
 			}));
 	}
 
-	async setInstalled(extensionKey: ExtensionKey): Promise<void> {
+	async unsetExtensionsForRemoval(...extensionKeys: ExtensionKey[]): Promise<boolean[]> {
 		try {
-			await this.withUninstalledExtensions(uninstalled => delete uninstalled[extensionKey.toString()]);
+			const results: boolean[] = [];
+			await this.withRemovedExtensions(removedExtensions =>
+				extensionKeys.forEach(extensionKey => {
+					if (removedExtensions[extensionKey.toString()]) {
+						results.push(true);
+						delete removedExtensions[extensionKey.toString()];
+					} else {
+						results.push(false);
+					}
+				}));
+			return results;
 		} catch (error) {
-			throw toExtensionManagementError(error, ExtensionManagementErrorCode.UnsetUninstalled);
+			throw toExtensionManagementError(error, ExtensionManagementErrorCode.UnsetRemoved);
 		}
 	}
 
-	async removeExtension(extension: ILocalExtension | IScannedExtension, type: string): Promise<void> {
+	async deleteExtension(extension: ILocalExtension | IScannedExtension, type: string): Promise<void> {
 		if (this.uriIdentityService.extUri.isEqualOrParent(extension.location, this.extensionsScannerService.userExtensionsLocation)) {
-			return this.deleteExtensionFromLocation(extension.identifier.id, extension.location, type);
+			await this.deleteExtensionFromLocation(extension.identifier.id, extension.location, type);
+			await this.unsetExtensionsForRemoval(ExtensionKey.create(extension));
 		}
 	}
 
-	async removeUninstalledExtension(extension: ILocalExtension | IScannedExtension): Promise<void> {
-		await this.removeExtension(extension, 'uninstalled');
-		await this.withUninstalledExtensions(uninstalled => delete uninstalled[ExtensionKey.create(extension).toString()]);
-	}
-
 	async copyExtension(extension: ILocalExtension, fromProfileLocation: URI, toProfileLocation: URI, metadata: Partial<Metadata>): Promise<ILocalExtension> {
 		const source = await this.getScannedExtension(extension, fromProfileLocation);
 		const target = await this.getScannedExtension(extension, toProfileLocation);
@@ -792,11 +789,11 @@ export class ExtensionsScanner extends Disposable {
 		this.logService.info(`Deleted ${type} extension from disk`, id, location.fsPath);
 	}
 
-	private withUninstalledExtensions(updateFn?: (uninstalled: IStringDictionary<boolean>) => void): Promise<IStringDictionary<boolean>> {
-		return this.uninstalledFileLimiter.queue(async () => {
+	private withRemovedExtensions(updateFn?: (removed: IStringDictionary<boolean>) => void): Promise<IStringDictionary<boolean>> {
+		return this.obsoleteFileLimiter.queue(async () => {
 			let raw: string | undefined;
 			try {
-				const content = await this.fileService.readFile(this.uninstalledResource, 'utf8');
+				const content = await this.fileService.readFile(this.obsoletedResource, 'utf8');
 				raw = content.value.toString();
 			} catch (error) {
 				if (toFileOperationResult(error) !== FileOperationResult.FILE_NOT_FOUND) {
@@ -804,23 +801,29 @@ export class ExtensionsScanner extends Disposable {
 				}
 			}
 
-			let uninstalled = {};
+			let removed = {};
 			if (raw) {
 				try {
-					uninstalled = JSON.parse(raw);
+					removed = JSON.parse(raw);
 				} catch (e) { /* ignore */ }
 			}
 
 			if (updateFn) {
-				updateFn(uninstalled);
-				if (Object.keys(uninstalled).length) {
-					await this.fileService.writeFile(this.uninstalledResource, VSBuffer.fromString(JSON.stringify(uninstalled)));
+				updateFn(removed);
+				if (Object.keys(removed).length) {
+					await this.fileService.writeFile(this.obsoletedResource, VSBuffer.fromString(JSON.stringify(removed)));
 				} else {
-					await this.fileService.del(this.uninstalledResource);
+					try {
+						await this.fileService.del(this.obsoletedResource);
+					} catch (error) {
+						if (toFileOperationResult(error) !== FileOperationResult.FILE_NOT_FOUND) {
+							throw error;
+						}
+					}
 				}
 			}
 
-			return uninstalled;
+			return removed;
 		});
 	}
 
@@ -898,19 +901,25 @@ export class ExtensionsScanner extends Disposable {
 		}));
 	}
 
-	private async removeUninstalledExtensions(): Promise<void> {
-		const uninstalled = await this.getUninstalledExtensions();
-		if (Object.keys(uninstalled).length === 0) {
-			this.logService.debug(`No uninstalled extensions found.`);
+	private async deleteExtensionsMarkedForRemoval(): Promise<void> {
+		let removed: IStringDictionary<boolean>;
+		try {
+			removed = await this.withRemovedExtensions();
+		} catch (error) {
+			throw toExtensionManagementError(error, ExtensionManagementErrorCode.ReadRemoved);
+		}
+
+		if (Object.keys(removed).length === 0) {
+			this.logService.debug(`No extensions are marked as removed.`);
 			return;
 		}
 
-		this.logService.debug(`Removing uninstalled extensions:`, Object.keys(uninstalled));
+		this.logService.debug(`Deleting extensions marked as removed:`, Object.keys(removed));
 
-		const extensions = await this.extensionsScannerService.scanUserExtensions({ includeAllVersions: true, includeUninstalled: true, includeInvalid: true }); // All user extensions
+		const extensions = await this.extensionsScannerService.scanUserExtensions({ includeAllVersions: true, includeInvalid: true }); // All user extensions
 		const installed: Set<string> = new Set<string>();
 		for (const e of extensions) {
-			if (!uninstalled[ExtensionKey.create(e).toString()]) {
+			if (!removed[ExtensionKey.create(e).toString()]) {
 				installed.add(e.identifier.id.toLowerCase());
 			}
 		}
@@ -928,8 +937,8 @@ export class ExtensionsScanner extends Disposable {
 			this.logService.error(error);
 		}
 
-		const toRemove = extensions.filter(e => e.metadata /* Installed by System */ && uninstalled[ExtensionKey.create(e).toString()]);
-		await Promise.allSettled(toRemove.map(e => this.removeUninstalledExtension(e)));
+		const toRemove = extensions.filter(e => e.metadata /* Installed by System */ && removed[ExtensionKey.create(e).toString()]);
+		await Promise.allSettled(toRemove.map(e => this.deleteExtension(e, 'marked for removal')));
 	}
 
 	private async removeTemporarilyDeletedFolders(): Promise<void> {
@@ -1021,7 +1030,7 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
 			if (existingExtension) {
 				if (this.extensionKey.equals(new ExtensionKey(existingExtension.identifier, existingExtension.manifest.version))) {
 					try {
-						await this.extensionsScanner.removeExtension(existingExtension, 'existing');
+						await this.extensionsScanner.deleteExtension(existingExtension, 'existing');
 					} catch (e) {
 						throw new Error(nls.localize('restartCode', "Please restart VS Code before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
 					}
@@ -1029,10 +1038,10 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
 			}
 			// Remove the extension with same version if it is already uninstalled.
 			// Installing a VSIX extension shall replace the existing extension always.
-			const existingWithSameVersion = await this.unsetIfUninstalled(this.extensionKey);
+			const existingWithSameVersion = await this.unsetIfRemoved(this.extensionKey);
 			if (existingWithSameVersion) {
 				try {
-					await this.extensionsScanner.removeExtension(existingWithSameVersion, 'existing');
+					await this.extensionsScanner.deleteExtension(existingWithSameVersion, 'existing');
 				} catch (e) {
 					throw new Error(nls.localize('restartCode', "Please restart VS Code before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
 				}
@@ -1058,7 +1067,7 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
 			}
 
 			// Unset if the extension is uninstalled and return the unset extension.
-			local = await this.unsetIfUninstalled(this.extensionKey);
+			local = await this.unsetIfRemoved(this.extensionKey);
 		}
 
 		if (token.isCancellationRequested) {
@@ -1101,19 +1110,15 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
 		return result;
 	}
 
-	private async unsetIfUninstalled(extensionKey: ExtensionKey): Promise<ILocalExtension | undefined> {
-		const uninstalled = await this.extensionsScanner.getUninstalledExtensions();
-		if (!uninstalled[extensionKey.toString()]) {
-			return undefined;
+	private async unsetIfRemoved(extensionKey: ExtensionKey): Promise<ILocalExtension | undefined> {
+		// If the same version of extension is marked as removed, remove it from there and return the local.
+		const [removed] = await this.extensionsScanner.unsetExtensionsForRemoval(extensionKey);
+		if (removed) {
+			this.logService.info('Removed the extension from removed list:', extensionKey.id);
+			const userExtensions = await this.extensionsScanner.scanAllUserExtensions(true);
+			return userExtensions.find(i => ExtensionKey.create(i).equals(extensionKey));
 		}
-
-		this.logService.trace('Removing the extension from uninstalled list:', extensionKey.id);
-		// If the same version of extension is marked as uninstalled, remove it from there and return the local.
-		await this.extensionsScanner.setInstalled(extensionKey);
-		this.logService.info('Removed the extension from uninstalled list:', extensionKey.id);
-
-		const userExtensions = await this.extensionsScanner.scanAllUserExtensions(true);
-		return userExtensions.find(i => ExtensionKey.create(i).equals(extensionKey));
+		return undefined;
 	}
 
 	private async updateMetadata(extension: ILocalExtension, token: CancellationToken): Promise<void> {
@@ -1149,8 +1154,8 @@ class UninstallExtensionInProfileTask extends AbstractExtensionTask<void> implem
 		super();
 	}
 
-	protected async doRun(token: CancellationToken): Promise<void> {
-		await this.extensionsProfileScannerService.removeExtensionFromProfile(this.extension, this.options.profileLocation);
+	protected doRun(token: CancellationToken): Promise<void> {
+		return this.extensionsProfileScannerService.removeExtensionFromProfile(this.extension, this.options.profileLocation);
 	}
 
 }
diff --git a/src/vs/platform/extensionManagement/node/extensionsWatcher.ts b/src/vs/platform/extensionManagement/node/extensionsWatcher.ts
index d2b65eaea55..2c4e976a5a6 100644
--- a/src/vs/platform/extensionManagement/node/extensionsWatcher.ts
+++ b/src/vs/platform/extensionManagement/node/extensionsWatcher.ts
@@ -48,7 +48,7 @@ export class ExtensionsWatcher extends Disposable {
 		await this.extensionsScannerService.initializeDefaultProfileExtensions();
 		await this.onDidChangeProfiles(this.userDataProfilesService.profiles);
 		this.registerListeners();
-		await this.uninstallExtensionsNotInProfiles();
+		await this.deleteExtensionsNotInProfiles();
 	}
 
 	private registerListeners(): void {
@@ -102,7 +102,7 @@ export class ExtensionsWatcher extends Disposable {
 	}
 
 	private async onDidRemoveExtensions(e: DidRemoveProfileExtensionsEvent): Promise<void> {
-		const extensionsToUninstall: IExtension[] = [];
+		const extensionsToDelete: IExtension[] = [];
 		const promises: Promise<void>[] = [];
 		for (const extension of e.extensions) {
 			const key = this.getKey(extension.identifier, extension.version);
@@ -115,7 +115,7 @@ export class ExtensionsWatcher extends Disposable {
 					promises.push(this.extensionManagementService.scanInstalledExtensionAtLocation(extension.location)
 						.then(result => {
 							if (result) {
-								extensionsToUninstall.push(result);
+								extensionsToDelete.push(result);
 							} else {
 								this.logService.info('Extension not found at the location', extension.location.toString());
 							}
@@ -125,8 +125,8 @@ export class ExtensionsWatcher extends Disposable {
 		}
 		try {
 			await Promise.all(promises);
-			if (extensionsToUninstall.length) {
-				await this.uninstallExtensionsNotInProfiles(extensionsToUninstall);
+			if (extensionsToDelete.length) {
+				await this.deleteExtensionsNotInProfiles(extensionsToDelete);
 			}
 		} catch (error) {
 			this.logService.error(error);
@@ -180,13 +180,13 @@ export class ExtensionsWatcher extends Disposable {
 		}
 	}
 
-	private async uninstallExtensionsNotInProfiles(toUninstall?: IExtension[]): Promise<void> {
-		if (!toUninstall) {
+	private async deleteExtensionsNotInProfiles(toDelete?: IExtension[]): Promise<void> {
+		if (!toDelete) {
 			const installed = await this.extensionManagementService.scanAllUserInstalledExtensions();
-			toUninstall = installed.filter(installedExtension => !this.allExtensions.has(this.getKey(installedExtension.identifier, installedExtension.manifest.version)));
+			toDelete = installed.filter(installedExtension => !this.allExtensions.has(this.getKey(installedExtension.identifier, installedExtension.manifest.version)));
 		}
-		if (toUninstall.length) {
-			await this.extensionManagementService.markAsUninstalled(...toUninstall);
+		if (toDelete.length) {
+			await this.extensionManagementService.deleteExtensions(...toDelete);
 		}
 	}
 
diff --git a/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts b/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts
index 74d3ffcd738..551ba576d44 100644
--- a/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts
+++ b/src/vs/platform/extensionManagement/test/node/extensionsScannerService.test.ts
@@ -224,31 +224,6 @@ suite('NativeExtensionsScanerService Test', () => {
 		assert.deepStrictEqual(actual[0].identifier, { id: 'pub.name' });
 	});
 
-	test('scan exclude uninstalled extensions', async () => {
-		await aUserExtension(anExtensionManifest({ 'name': 'name', 'publisher': 'pub' }));
-		await aUserExtension(anExtensionManifest({ 'name': 'name2', 'publisher': 'pub' }));
-		await instantiationService.get(IFileService).writeFile(joinPath(URI.file(instantiationService.get(INativeEnvironmentService).extensionsPath), '.obsolete'), VSBuffer.fromString(JSON.stringify({ 'pub.name2-1.0.0': true })));
-		const testObject: IExtensionsScannerService = disposables.add(instantiationService.createInstance(ExtensionsScannerService));
-
-		const actual = await testObject.scanUserExtensions({});
-
-		assert.deepStrictEqual(actual.length, 1);
-		assert.deepStrictEqual(actual[0].identifier, { id: 'pub.name' });
-	});
-
-	test('scan include uninstalled extensions', async () => {
-		await aUserExtension(anExtensionManifest({ 'name': 'name', 'publisher': 'pub' }));
-		await aUserExtension(anExtensionManifest({ 'name': 'name2', 'publisher': 'pub' }));
-		await instantiationService.get(IFileService).writeFile(joinPath(URI.file(instantiationService.get(INativeEnvironmentService).extensionsPath), '.obsolete'), VSBuffer.fromString(JSON.stringify({ 'pub.name2-1.0.0': true })));
-		const testObject: IExtensionsScannerService = disposables.add(instantiationService.createInstance(ExtensionsScannerService));
-
-		const actual = await testObject.scanUserExtensions({ includeUninstalled: true });
-
-		assert.deepStrictEqual(actual.length, 2);
-		assert.deepStrictEqual(actual[0].identifier, { id: 'pub.name' });
-		assert.deepStrictEqual(actual[1].identifier, { id: 'pub.name2' });
-	});
-
 	test('scan include invalid extensions', async () => {
 		await aUserExtension(anExtensionManifest({ 'name': 'name', 'publisher': 'pub' }));
 		await aUserExtension(anExtensionManifest({ 'name': 'name2', 'publisher': 'pub', engines: { vscode: '^1.67.0' } }));
@@ -351,7 +326,7 @@ suite('ExtensionScannerInput', () => {
 	ensureNoDisposablesAreLeakedInTestSuite();
 
 	test('compare inputs - location', () => {
-		const anInput = (location: URI, mtime: number | undefined) => new ExtensionScannerInput(location, mtime, undefined, undefined, false, undefined, ExtensionType.User, true, true, '1.1.1', undefined, undefined, true, undefined, {});
+		const anInput = (location: URI, mtime: number | undefined) => new ExtensionScannerInput(location, mtime, undefined, undefined, false, undefined, ExtensionType.User, true, '1.1.1', undefined, undefined, true, undefined, {});
 
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(ROOT, undefined), anInput(ROOT, undefined)), true);
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(ROOT, 100), anInput(ROOT, 100)), true);
@@ -361,7 +336,7 @@ suite('ExtensionScannerInput', () => {
 	});
 
 	test('compare inputs - application location', () => {
-		const anInput = (location: URI, mtime: number | undefined) => new ExtensionScannerInput(ROOT, undefined, location, mtime, false, undefined, ExtensionType.User, true, true, '1.1.1', undefined, undefined, true, undefined, {});
+		const anInput = (location: URI, mtime: number | undefined) => new ExtensionScannerInput(ROOT, undefined, location, mtime, false, undefined, ExtensionType.User, true, '1.1.1', undefined, undefined, true, undefined, {});
 
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(ROOT, undefined), anInput(ROOT, undefined)), true);
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(ROOT, 100), anInput(ROOT, 100)), true);
@@ -371,7 +346,7 @@ suite('ExtensionScannerInput', () => {
 	});
 
 	test('compare inputs - profile', () => {
-		const anInput = (profile: boolean, profileScanOptions: IProfileExtensionsScanOptions | undefined) => new ExtensionScannerInput(ROOT, undefined, undefined, undefined, profile, profileScanOptions, ExtensionType.User, true, true, '1.1.1', undefined, undefined, true, undefined, {});
+		const anInput = (profile: boolean, profileScanOptions: IProfileExtensionsScanOptions | undefined) => new ExtensionScannerInput(ROOT, undefined, undefined, undefined, profile, profileScanOptions, ExtensionType.User, true, '1.1.1', undefined, undefined, true, undefined, {});
 
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(true, { bailOutWhenFileNotFound: true }), anInput(true, { bailOutWhenFileNotFound: true })), true);
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(false, { bailOutWhenFileNotFound: true }), anInput(false, { bailOutWhenFileNotFound: true })), true);
@@ -384,7 +359,7 @@ suite('ExtensionScannerInput', () => {
 	});
 
 	test('compare inputs - extension type', () => {
-		const anInput = (type: ExtensionType) => new ExtensionScannerInput(ROOT, undefined, undefined, undefined, false, undefined, type, true, true, '1.1.1', undefined, undefined, true, undefined, {});
+		const anInput = (type: ExtensionType) => new ExtensionScannerInput(ROOT, undefined, undefined, undefined, false, undefined, type, true, '1.1.1', undefined, undefined, true, undefined, {});
 
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(ExtensionType.System), anInput(ExtensionType.System)), true);
 		assert.strictEqual(ExtensionScannerInput.equals(anInput(ExtensionType.User), anInput(ExtensionType.User)), true);

From 41be1c6b69760824c9fa42d4bcec5a406c41e9bb Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 18 Dec 2024 11:49:08 +0100
Subject: [PATCH 347/479] handle invalid withProgress invocation as external
 error (#236454)

fixes https://github.com/Microsoft/vscode/issues/134892
---
 src/vs/workbench/api/browser/mainThreadProgress.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/api/browser/mainThreadProgress.ts b/src/vs/workbench/api/browser/mainThreadProgress.ts
index 6606b0d64bd..e6f4632b61b 100644
--- a/src/vs/workbench/api/browser/mainThreadProgress.ts
+++ b/src/vs/workbench/api/browser/mainThreadProgress.ts
@@ -9,6 +9,7 @@ import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions
 import { Action } from '../../../base/common/actions.js';
 import { ICommandService } from '../../../platform/commands/common/commands.js';
 import { localize } from '../../../nls.js';
+import { onUnexpectedExternalError } from '../../../base/common/errors.js';
 
 class ManageExtensionAction extends Action {
 	constructor(extensionId: string, label: string, commandService: ICommandService) {
@@ -52,7 +53,13 @@ export class MainThreadProgress implements MainThreadProgressShape {
 			options = notificationOptions;
 		}
 
-		this._progressService.withProgress(options, task, () => this._proxy.$acceptProgressCanceled(handle));
+		try {
+			this._progressService.withProgress(options, task, () => this._proxy.$acceptProgressCanceled(handle));
+		} catch (err) {
+			// the withProgress-method will throw synchronously when invoked with bad options
+			// which is then an enternal/extension error
+			onUnexpectedExternalError(err);
+		}
 	}
 
 	$progressReport(handle: number, message: IProgressStep): void {

From fca8bb2388430e67b42253199e87ed7fa325442a Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 18 Dec 2024 12:18:50 +0100
Subject: [PATCH 348/479] Deduplicate untitled workspaces with workspaces that
 restore (fix #234232) (#236457)

---
 .../electron-main/windowsMainService.ts       | 58 ++++++++++++++-----
 1 file changed, 45 insertions(+), 13 deletions(-)

diff --git a/src/vs/platform/windows/electron-main/windowsMainService.ts b/src/vs/platform/windows/electron-main/windowsMainService.ts
index f441f7d5fb7..d403852efcc 100644
--- a/src/vs/platform/windows/electron-main/windowsMainService.ts
+++ b/src/vs/platform/windows/electron-main/windowsMainService.ts
@@ -57,6 +57,7 @@ import { ILoggerMainService } from '../../log/electron-main/loggerService.js';
 import { IAuxiliaryWindowsMainService } from '../../auxiliaryWindow/electron-main/auxiliaryWindows.js';
 import { IAuxiliaryWindow } from '../../auxiliaryWindow/electron-main/auxiliaryWindow.js';
 import { ICSSDevelopmentService } from '../../cssDev/node/cssDevService.js';
+import { ResourceSet } from '../../../base/common/map.js';
 
 //#region Helper Interfaces
 
@@ -729,7 +730,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 	private async getPathsToOpen(openConfig: IOpenConfiguration): Promise<IPathToOpen[]> {
 		let pathsToOpen: IPathToOpen[];
 		let isCommandLineOrAPICall = false;
-		let restoredWindows = false;
+		let isRestoringPaths = false;
 
 		// Extract paths: from API
 		if (openConfig.urisToOpen && openConfig.urisToOpen.length > 0) {
@@ -759,19 +760,26 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 				pathsToOpen.push(Object.create(null)); // add an empty window if we did not have windows to restore
 			}
 
-			restoredWindows = true;
+			isRestoringPaths = true;
 		}
 
-		// Convert multiple folders into workspace (if opened via API or CLI)
-		// This will ensure to open these folders in one window instead of multiple
-		// If we are in `addMode`, we should not do this because in that case all
-		// folders should be added to the existing window.
+		// Handle the case of multiple folders being opened from CLI while we are
+		// not in `--add` mode by creating an untitled workspace, only if:
+		// - they all share the same remote authority
+		// - there is no existing workspace to open that matches these folders
 		if (!openConfig.addMode && isCommandLineOrAPICall) {
-			const foldersToOpen = pathsToOpen.filter(path => isSingleFolderWorkspacePathToOpen(path)) as ISingleFolderWorkspacePathToOpen[];
+			const foldersToOpen = pathsToOpen.filter(path => isSingleFolderWorkspacePathToOpen(path));
 			if (foldersToOpen.length > 1) {
 				const remoteAuthority = foldersToOpen[0].remoteAuthority;
-				if (foldersToOpen.every(folderToOpen => isEqualAuthority(folderToOpen.remoteAuthority, remoteAuthority))) { // only if all folder have the same authority
-					const workspace = await this.workspacesManagementMainService.createUntitledWorkspace(foldersToOpen.map(folder => ({ uri: folder.workspace.uri })));
+				if (foldersToOpen.every(folderToOpen => isEqualAuthority(folderToOpen.remoteAuthority, remoteAuthority))) {
+					let workspace: IWorkspaceIdentifier | undefined;
+
+					const lastSessionWorkspaceMatchingFolders = await this.doGetWorkspaceMatchingFoldersFromLastSession(remoteAuthority, foldersToOpen);
+					if (lastSessionWorkspaceMatchingFolders) {
+						workspace = lastSessionWorkspaceMatchingFolders;
+					} else {
+						workspace = await this.workspacesManagementMainService.createUntitledWorkspace(foldersToOpen.map(folder => ({ uri: folder.workspace.uri })));
+					}
 
 					// Add workspace and remove folders thereby
 					pathsToOpen.push({ workspace, remoteAuthority });
@@ -780,12 +788,12 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 			}
 		}
 
-		// Check for `window.startup` setting to include all windows
+		// Check for `window.restoreWindows` setting to include all windows
 		// from the previous session if this is the initial startup and we have
 		// not restored windows already otherwise.
-		// Use `unshift` to ensure any new window to open comes last
-		// for proper focus treatment.
-		if (openConfig.initialStartup && !restoredWindows && this.configurationService.getValue<IWindowSettings | undefined>('window')?.restoreWindows === 'preserve') {
+		// Use `unshift` to ensure any new window to open comes last for proper
+		// focus treatment.
+		if (openConfig.initialStartup && !isRestoringPaths && this.configurationService.getValue<IWindowSettings | undefined>('window')?.restoreWindows === 'preserve') {
 			const lastSessionPaths = await this.doGetPathsFromLastSession();
 			pathsToOpen.unshift(...lastSessionPaths.filter(path => isWorkspacePathToOpen(path) || isSingleFolderWorkspacePathToOpen(path) || path.backupPath));
 		}
@@ -974,6 +982,30 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		return restoreWindows;
 	}
 
+	private async doGetWorkspaceMatchingFoldersFromLastSession(remoteAuthority: string | undefined, folders: ISingleFolderWorkspacePathToOpen[]): Promise<IWorkspaceIdentifier | undefined> {
+		const workspaces = (await this.doGetPathsFromLastSession()).filter(path => isWorkspacePathToOpen(path));
+		const folderUris = folders.map(folder => folder.workspace.uri);
+
+		for (const { workspace } of workspaces) {
+			const resolvedWorkspace = await this.workspacesManagementMainService.resolveLocalWorkspace(workspace.configPath);
+			if (
+				!resolvedWorkspace ||
+				resolvedWorkspace.remoteAuthority !== remoteAuthority ||
+				resolvedWorkspace.transient ||
+				resolvedWorkspace.folders.length !== folders.length
+			) {
+				continue;
+			}
+
+			const folderSet = new ResourceSet(folderUris, uri => extUriBiasedIgnorePathCase.getComparisonKey(uri));
+			if (resolvedWorkspace.folders.every(folder => folderSet.has(folder.uri))) {
+				return resolvedWorkspace;
+			}
+		}
+
+		return undefined;
+	}
+
 	private async resolveOpenable(openable: IWindowOpenable, options: IPathResolveOptions = Object.create(null)): Promise<IPathToOpen | undefined> {
 
 		// handle file:// openables with some extra validation

From 2f7beb56ff7319edc20b8f81c965da85738475e4 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 18 Dec 2024 12:46:34 +0100
Subject: [PATCH 349/479] Support for code page `1125` aka `cp866u` (fix
 #230438 (#236461)

)
---
 .../services/textfile/common/encoding.ts      | 60 ++++++++++---------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/vs/workbench/services/textfile/common/encoding.ts b/src/vs/workbench/services/textfile/common/encoding.ts
index b653dd7a847..599f2309e6a 100644
--- a/src/vs/workbench/services/textfile/common/encoding.ts
+++ b/src/vs/workbench/services/textfile/common/encoding.ts
@@ -615,151 +615,157 @@ export const SUPPORTED_ENCODINGS: EncodingsMap = {
 		order: 20,
 		guessableName: 'IBM866'
 	},
+	cp1125: {
+		labelLong: 'Cyrillic (CP 1125)',
+		labelShort: 'CP 1125',
+		order: 21,
+		guessableName: 'IBM1125'
+	},
 	iso88595: {
 		labelLong: 'Cyrillic (ISO 8859-5)',
 		labelShort: 'ISO 8859-5',
-		order: 21,
+		order: 22,
 		guessableName: 'ISO-8859-5'
 	},
 	koi8r: {
 		labelLong: 'Cyrillic (KOI8-R)',
 		labelShort: 'KOI8-R',
-		order: 22,
+		order: 23,
 		guessableName: 'KOI8-R'
 	},
 	koi8u: {
 		labelLong: 'Cyrillic (KOI8-U)',
 		labelShort: 'KOI8-U',
-		order: 23
+		order: 24
 	},
 	iso885913: {
 		labelLong: 'Estonian (ISO 8859-13)',
 		labelShort: 'ISO 8859-13',
-		order: 24
+		order: 25
 	},
 	windows1253: {
 		labelLong: 'Greek (Windows 1253)',
 		labelShort: 'Windows 1253',
-		order: 25,
+		order: 26,
 		guessableName: 'windows-1253'
 	},
 	iso88597: {
 		labelLong: 'Greek (ISO 8859-7)',
 		labelShort: 'ISO 8859-7',
-		order: 26,
+		order: 27,
 		guessableName: 'ISO-8859-7'
 	},
 	windows1255: {
 		labelLong: 'Hebrew (Windows 1255)',
 		labelShort: 'Windows 1255',
-		order: 27,
+		order: 28,
 		guessableName: 'windows-1255'
 	},
 	iso88598: {
 		labelLong: 'Hebrew (ISO 8859-8)',
 		labelShort: 'ISO 8859-8',
-		order: 28,
+		order: 29,
 		guessableName: 'ISO-8859-8'
 	},
 	iso885910: {
 		labelLong: 'Nordic (ISO 8859-10)',
 		labelShort: 'ISO 8859-10',
-		order: 29
+		order: 30
 	},
 	iso885916: {
 		labelLong: 'Romanian (ISO 8859-16)',
 		labelShort: 'ISO 8859-16',
-		order: 30
+		order: 31
 	},
 	windows1254: {
 		labelLong: 'Turkish (Windows 1254)',
 		labelShort: 'Windows 1254',
-		order: 31
+		order: 32
 	},
 	iso88599: {
 		labelLong: 'Turkish (ISO 8859-9)',
 		labelShort: 'ISO 8859-9',
-		order: 32
+		order: 33
 	},
 	windows1258: {
 		labelLong: 'Vietnamese (Windows 1258)',
 		labelShort: 'Windows 1258',
-		order: 33
+		order: 34
 	},
 	gbk: {
 		labelLong: 'Simplified Chinese (GBK)',
 		labelShort: 'GBK',
-		order: 34
+		order: 35
 	},
 	gb18030: {
 		labelLong: 'Simplified Chinese (GB18030)',
 		labelShort: 'GB18030',
-		order: 35
+		order: 36
 	},
 	cp950: {
 		labelLong: 'Traditional Chinese (Big5)',
 		labelShort: 'Big5',
-		order: 36,
+		order: 37,
 		guessableName: 'Big5'
 	},
 	big5hkscs: {
 		labelLong: 'Traditional Chinese (Big5-HKSCS)',
 		labelShort: 'Big5-HKSCS',
-		order: 37
+		order: 38
 	},
 	shiftjis: {
 		labelLong: 'Japanese (Shift JIS)',
 		labelShort: 'Shift JIS',
-		order: 38,
+		order: 39,
 		guessableName: 'SHIFT_JIS'
 	},
 	eucjp: {
 		labelLong: 'Japanese (EUC-JP)',
 		labelShort: 'EUC-JP',
-		order: 39,
+		order: 40,
 		guessableName: 'EUC-JP'
 	},
 	euckr: {
 		labelLong: 'Korean (EUC-KR)',
 		labelShort: 'EUC-KR',
-		order: 40,
+		order: 41,
 		guessableName: 'EUC-KR'
 	},
 	windows874: {
 		labelLong: 'Thai (Windows 874)',
 		labelShort: 'Windows 874',
-		order: 41
+		order: 42
 	},
 	iso885911: {
 		labelLong: 'Latin/Thai (ISO 8859-11)',
 		labelShort: 'ISO 8859-11',
-		order: 42
+		order: 43
 	},
 	koi8ru: {
 		labelLong: 'Cyrillic (KOI8-RU)',
 		labelShort: 'KOI8-RU',
-		order: 43
+		order: 44
 	},
 	koi8t: {
 		labelLong: 'Tajik (KOI8-T)',
 		labelShort: 'KOI8-T',
-		order: 44
+		order: 45
 	},
 	gb2312: {
 		labelLong: 'Simplified Chinese (GB 2312)',
 		labelShort: 'GB 2312',
-		order: 45,
+		order: 46,
 		guessableName: 'GB2312'
 	},
 	cp865: {
 		labelLong: 'Nordic DOS (CP 865)',
 		labelShort: 'CP 865',
-		order: 46
+		order: 47
 	},
 	cp850: {
 		labelLong: 'Western European DOS (CP 850)',
 		labelShort: 'CP 850',
-		order: 47
+		order: 48
 	}
 };
 

From 6c2faf1c5db3a438360b44a9f7b83bafac8efa0b Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 18 Dec 2024 13:06:31 +0100
Subject: [PATCH 350/479] chat - fix setup removal key (#236463)

---
 .../contrib/chat/browser/actions/chatActions.ts  | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index 92f6c42dd3d..4cb15f40d68 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -531,13 +531,7 @@ MenuRegistry.appendMenuItem(MenuId.CommandCenter, {
 	submenu: MenuId.ChatCommandCenter,
 	title: localize('title4', "Chat"),
 	icon: Codicon.copilot,
-	when: ContextKeyExpr.and(
-		ContextKeyExpr.has('config.chat.commandCenter.enabled'),
-		ContextKeyExpr.or(
-			ChatContextKeys.Setup.installed,
-			ChatContextKeys.panelParticipantRegistered
-		)
-	),
+	when: ContextKeyExpr.has('config.chat.commandCenter.enabled'),
 	order: 10001,
 });
 
@@ -547,13 +541,7 @@ registerAction2(class ToggleCopilotControl extends ToggleTitleBarConfigAction {
 			'chat.commandCenter.enabled',
 			localize('toggle.chatControl', 'Copilot Controls'),
 			localize('toggle.chatControlsDescription', "Toggle visibility of the Copilot Controls in title bar"), 4, false,
-			ContextKeyExpr.and(
-				ContextKeyExpr.has('config.window.commandCenter'),
-				ContextKeyExpr.or(
-					ChatContextKeys.Setup.installed,
-					ChatContextKeys.panelParticipantRegistered
-				)
-			)
+			ContextKeyExpr.has('config.window.commandCenter')
 		);
 	}
 });

From 7579838b39047efb0f22236fea8e6d94ca6ea5e1 Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Wed, 18 Dec 2024 14:12:34 +0100
Subject: [PATCH 351/479] Render the a background cover up only if really
 necessary (#236460)

---
 .../view/inlineEdits/sideBySideDiff.ts        | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
index a64c52dcd90..5f36bec5b33 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
@@ -14,6 +14,7 @@ import { ICommandService } from '../../../../../../platform/commands/common/comm
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { diffInserted, diffRemoved } from '../../../../../../platform/theme/common/colorRegistry.js';
 import { darken, lighten, registerColor } from '../../../../../../platform/theme/common/colorUtils.js';
+import { IThemeService } from '../../../../../../platform/theme/common/themeService.js';
 import { ICodeEditor } from '../../../../../browser/editorBrowser.js';
 import { observableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
 import { Point } from '../../../../../browser/point.js';
@@ -108,7 +109,8 @@ export class InlineEditsSideBySideDiff extends Disposable {
 			originalDisplayRange: LineRange;
 		} | undefined>,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@ICommandService private readonly _commandService: ICommandService
+		@ICommandService private readonly _commandService: ICommandService,
+		@IThemeService private readonly _themeService: IThemeService,
 	) {
 		super();
 
@@ -487,19 +489,33 @@ export class InlineEditsSideBySideDiff extends Disposable {
 		return extendedModifiedPathBuilder.build();
 	});
 
+	private readonly _originalBackgroundColor = observableFromEvent(this, this._themeService.onDidColorThemeChange, () => {
+		return this._themeService.getColorTheme().getColor(originalBackgroundColor) ?? Color.transparent;
+	});
+
 	private readonly _backgroundSvg = n.svg({
 		transform: 'translate(-0.5 -0.5)',
 		style: { overflow: 'visible', pointerEvents: 'none', position: 'absolute' },
 	}, [
 		n.svgElem('path', {
 			class: 'rightOfModifiedBackgroundCoverUp',
-			d: this._previewEditorLayoutInfo.map(layoutInfo => layoutInfo && new PathBuilder()
-				.moveTo(layoutInfo.code1)
-				.lineTo(layoutInfo.code1.deltaX(1000))
-				.lineTo(layoutInfo.code2.deltaX(1000))
-				.lineTo(layoutInfo.code2)
-				.build()
-			),
+			d: derived(reader => {
+				const layoutInfo = this._previewEditorLayoutInfo.read(reader);
+				if (!layoutInfo) {
+					return undefined;
+				}
+				const originalBackgroundColor = this._originalBackgroundColor.read(reader);
+				if (originalBackgroundColor.isTransparent()) {
+					return undefined;
+				}
+
+				return new PathBuilder()
+					.moveTo(layoutInfo.code1)
+					.lineTo(layoutInfo.code1.deltaX(1000))
+					.lineTo(layoutInfo.code2.deltaX(1000))
+					.lineTo(layoutInfo.code2)
+					.build();
+			}),
 			style: {
 				fill: 'var(--vscode-editor-background, transparent)',
 			}

From 473620cdd2f4f38e3e4f409d96aeeb02d81db5dc Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Wed, 18 Dec 2024 14:14:46 +0100
Subject: [PATCH 352/479] Wrong use of disable store in searchResultsView.ts
 (fix #236456) (#236469)

---
 .../workbench/contrib/search/browser/searchResultsView.ts   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/search/browser/searchResultsView.ts b/src/vs/workbench/contrib/search/browser/searchResultsView.ts
index 40df97b78cb..a4705ea7f15 100644
--- a/src/vs/workbench/contrib/search/browser/searchResultsView.ts
+++ b/src/vs/workbench/contrib/search/browser/searchResultsView.ts
@@ -192,7 +192,7 @@ export class FolderMatchRenderer extends Disposable implements ICompressibleTree
 		SearchContext.FileFocusKey.bindTo(contextKeyServiceMain).set(false);
 		SearchContext.FolderFocusKey.bindTo(contextKeyServiceMain).set(true);
 
-		const instantiationService = this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyServiceMain])));
+		const instantiationService = disposables.add(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyServiceMain])));
 		const actions = disposables.add(instantiationService.createInstance(MenuWorkbenchToolBar, actionBarContainer, MenuId.SearchActionMenu, {
 			menuOptions: {
 				shouldForwardArgs: true
@@ -292,7 +292,7 @@ export class FileMatchRenderer extends Disposable implements ICompressibleTreeRe
 		SearchContext.FileFocusKey.bindTo(contextKeyServiceMain).set(true);
 		SearchContext.FolderFocusKey.bindTo(contextKeyServiceMain).set(false);
 
-		const instantiationService = this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyServiceMain])));
+		const instantiationService = disposables.add(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyServiceMain])));
 		const actions = disposables.add(instantiationService.createInstance(MenuWorkbenchToolBar, actionBarContainer, MenuId.SearchActionMenu, {
 			menuOptions: {
 				shouldForwardArgs: true
@@ -384,7 +384,7 @@ export class MatchRenderer extends Disposable implements ICompressibleTreeRender
 		SearchContext.FileFocusKey.bindTo(contextKeyServiceMain).set(false);
 		SearchContext.FolderFocusKey.bindTo(contextKeyServiceMain).set(false);
 
-		const instantiationService = this._register(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyServiceMain])));
+		const instantiationService = disposables.add(this.instantiationService.createChild(new ServiceCollection([IContextKeyService, contextKeyServiceMain])));
 		const actions = disposables.add(instantiationService.createInstance(MenuWorkbenchToolBar, actionBarContainer, MenuId.SearchActionMenu, {
 			menuOptions: {
 				shouldForwardArgs: true

From b274aac2ca213a2ca9b9626b7060328f31cfffaf Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Wed, 18 Dec 2024 14:46:43 +0100
Subject: [PATCH 353/479] Allow center layout with vertical groups (#236471)

allow center layout with vertical groups
---
 src/vs/workbench/browser/layout.ts | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index 84e2eaadb3c..592bb4146af 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -23,14 +23,14 @@ import { getMenuBarVisibility, IPath, hasNativeTitlebar, hasCustomTitlebar, Titl
 import { IHostService } from '../services/host/browser/host.js';
 import { IBrowserWorkbenchEnvironmentService } from '../services/environment/browser/environmentService.js';
 import { IEditorService } from '../services/editor/common/editorService.js';
-import { EditorGroupLayout, GroupsOrder, IEditorGroupsService } from '../services/editor/common/editorGroupsService.js';
+import { EditorGroupLayout, GroupOrientation, GroupsOrder, IEditorGroupsService } from '../services/editor/common/editorGroupsService.js';
 import { SerializableGrid, ISerializableView, ISerializedGrid, Orientation, ISerializedNode, ISerializedLeafNode, Direction, IViewSize, Sizing } from '../../base/browser/ui/grid/grid.js';
 import { Part } from './part.js';
 import { IStatusbarService } from '../services/statusbar/browser/statusbar.js';
 import { IFileService } from '../../platform/files/common/files.js';
 import { isCodeEditor } from '../../editor/browser/editorBrowser.js';
 import { coalesce } from '../../base/common/arrays.js';
-import { assertIsDefined } from '../../base/common/types.js';
+import { assertIsDefined, isDefined } from '../../base/common/types.js';
 import { INotificationService, NotificationsFilter } from '../../platform/notification/common/notification.js';
 import { IThemeService } from '../../platform/theme/common/themeService.js';
 import { WINDOW_ACTIVE_BORDER, WINDOW_INACTIVE_BORDER } from '../common/theme.js';
@@ -1610,19 +1610,28 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 	centerMainEditorLayout(active: boolean, skipLayout?: boolean): void {
 		this.stateModel.setRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED, active);
 
-		const activeMainEditor = this.mainPartEditorService.activeEditor;
+		const mainVisibleEditors = this.editorGroupService.mainPart.groups.map(g => g.activeEditor).filter(isDefined);
+		const isEditorComplex = mainVisibleEditors.some(editor => {
+			if (editor instanceof DiffEditorInput) {
+				return this.configurationService.getValue('diffEditor.renderSideBySide');
+			} else if (editor?.hasCapability(EditorInputCapabilities.MultipleEditors)) {
+				return true;
+			}
+			return false;
+		});
 
-		let isEditorComplex = false;
-		if (activeMainEditor instanceof DiffEditorInput) {
-			isEditorComplex = this.configurationService.getValue('diffEditor.renderSideBySide');
-		} else if (activeMainEditor?.hasCapability(EditorInputCapabilities.MultipleEditors)) {
-			isEditorComplex = true;
+		const layout = this.editorGroupService.getLayout();
+		let hasMoreThanOneColumn = false;
+		if (layout.orientation === GroupOrientation.HORIZONTAL) {
+			hasMoreThanOneColumn = layout.groups.length > 1;
+		} else {
+			hasMoreThanOneColumn = layout.groups.some(g => g.groups && g.groups.length > 1);
 		}
 
 		const isCenteredLayoutAutoResizing = this.configurationService.getValue('workbench.editor.centeredLayoutAutoResize');
 		if (
 			isCenteredLayoutAutoResizing &&
-			((this.editorGroupService.mainPart.groups.length > 1 && !this.editorGroupService.mainPart.hasMaximizedGroup()) || isEditorComplex)
+			((hasMoreThanOneColumn && !this.editorGroupService.mainPart.hasMaximizedGroup()) || isEditorComplex)
 		) {
 			active = false; // disable centered layout for complex editors or when there is more than one group
 		}

From 1efa0d219662095a77139bb0d18d664ee6230f3b Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Wed, 18 Dec 2024 14:59:40 +0100
Subject: [PATCH 354/479] refactor: enhance sync method and reuse for preview
 and some clean up (#236470)

* refactor: enhance sync method and reuse for preview and some clean up

* fix tests
---
 .../common/abstractSynchronizer.ts            |  99 +++---
 .../userDataSync/common/extensionsSync.ts     |   3 +-
 .../userDataSync/common/globalStateSync.ts    |  30 +-
 .../userDataSync/common/userDataSync.ts       |   8 +-
 .../common/userDataSyncService.ts             |  41 +--
 .../test/common/keybindingsSync.test.ts       |   6 +-
 .../test/common/settingsSync.test.ts          |   2 +-
 .../test/common/snippetsSync.test.ts          | 155 ++-------
 .../test/common/synchronizer.test.ts          | 305 ++----------------
 .../test/common/tasksSync.test.ts             |   2 +-
 .../browser/editSessions.contribution.ts      |   8 +-
 .../editSessions/common/workspaceStateSync.ts |   9 +-
 12 files changed, 166 insertions(+), 502 deletions(-)

diff --git a/src/vs/platform/userDataSync/common/abstractSynchronizer.ts b/src/vs/platform/userDataSync/common/abstractSynchronizer.ts
index dc3b9950ad7..11c0315468a 100644
--- a/src/vs/platform/userDataSync/common/abstractSynchronizer.ts
+++ b/src/vs/platform/userDataSync/common/abstractSynchronizer.ts
@@ -26,7 +26,14 @@ import { getServiceMachineId } from '../../externalServices/common/serviceMachin
 import { IStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
 import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
-import { Change, getLastSyncResourceUri, IRemoteUserData, IResourcePreview as IBaseResourcePreview, ISyncData, IUserDataSyncResourcePreview as IBaseSyncResourcePreview, IUserData, IUserDataSyncResourceInitializer, IUserDataSyncLocalStoreService, IUserDataSyncConfiguration, IUserDataSynchroniser, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncStoreService, IUserDataSyncUtilService, MergeState, PREVIEW_DIR_NAME, SyncResource, SyncStatus, UserDataSyncError, UserDataSyncErrorCode, USER_DATA_SYNC_CONFIGURATION_SCOPE, USER_DATA_SYNC_SCHEME, IUserDataResourceManifest, getPathSegments, IUserDataSyncResourceConflicts, IUserDataSyncResource } from './userDataSync.js';
+import {
+	Change, getLastSyncResourceUri, IRemoteUserData, IResourcePreview as IBaseResourcePreview, ISyncData,
+	IUserDataSyncResourcePreview as IBaseSyncResourcePreview, IUserData, IUserDataSyncResourceInitializer, IUserDataSyncLocalStoreService,
+	IUserDataSyncConfiguration, IUserDataSynchroniser, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncStoreService,
+	IUserDataSyncUtilService, MergeState, PREVIEW_DIR_NAME, SyncResource, SyncStatus, UserDataSyncError, UserDataSyncErrorCode,
+	USER_DATA_SYNC_CONFIGURATION_SCOPE, USER_DATA_SYNC_SCHEME, IUserDataResourceManifest, getPathSegments, IUserDataSyncResourceConflicts,
+	IUserDataSyncResource, IUserDataSyncResourcePreview
+} from './userDataSync.js';
 import { IUserDataProfile, IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.js';
 
 type IncompatibleSyncSourceClassification = {
@@ -114,6 +121,12 @@ interface ILastSyncUserDataState {
 	[key: string]: any;
 }
 
+export const enum SyncStrategy {
+	Preview = 'preview', // Merge the local and remote data without applying.
+	Merge = 'merge', // Merge the local and remote data and apply.
+	PullOrPush = 'pull-push', // Pull the remote data or push the local data.
+}
+
 export abstract class AbstractSynchroniser extends Disposable implements IUserDataSynchroniser {
 
 	private syncPreviewPromise: CancelablePromise<ISyncResourcePreview> | null = null;
@@ -180,7 +193,7 @@ export abstract class AbstractSynchroniser extends Disposable implements IUserDa
 			this.logService.info(`${this.syncResourceLogLabel}: In conflicts state and local change detected. Syncing again...`);
 			const preview = await this.syncPreviewPromise!;
 			this.syncPreviewPromise = null;
-			const status = await this.performSync(preview.remoteUserData, preview.lastSyncUserData, true, this.getUserDataSyncConfiguration());
+			const status = await this.performSync(preview.remoteUserData, preview.lastSyncUserData, SyncStrategy.Merge, this.getUserDataSyncConfiguration());
 			this.setStatus(status);
 		}
 
@@ -202,28 +215,7 @@ export abstract class AbstractSynchroniser extends Disposable implements IUserDa
 		}
 	}
 
-	async sync(manifest: IUserDataResourceManifest | null, headers: IHeaders = {}): Promise<void> {
-		await this._sync(manifest, true, this.getUserDataSyncConfiguration(), headers);
-	}
-
-	async preview(manifest: IUserDataResourceManifest | null, userDataSyncConfiguration: IUserDataSyncConfiguration, headers: IHeaders = {}): Promise<ISyncResourcePreview | null> {
-		return this._sync(manifest, false, userDataSyncConfiguration, headers);
-	}
-
-	async apply(force: boolean, headers: IHeaders = {}): Promise<ISyncResourcePreview | null> {
-		try {
-			this.syncHeaders = { ...headers };
-
-			const status = await this.doApply(force);
-			this.setStatus(status);
-
-			return this.syncPreviewPromise;
-		} finally {
-			this.syncHeaders = {};
-		}
-	}
-
-	private async _sync(manifest: IUserDataResourceManifest | null, apply: boolean, userDataSyncConfiguration: IUserDataSyncConfiguration, headers: IHeaders): Promise<ISyncResourcePreview | null> {
+	async sync(manifest: IUserDataResourceManifest | null, preview: boolean = false, userDataSyncConfiguration: IUserDataSyncConfiguration = this.getUserDataSyncConfiguration(), headers: IHeaders = {}): Promise<IUserDataSyncResourcePreview | null> {
 		try {
 			this.syncHeaders = { ...headers };
 
@@ -244,7 +236,7 @@ export abstract class AbstractSynchroniser extends Disposable implements IUserDa
 			try {
 				const lastSyncUserData = await this.getLastSyncUserData();
 				const remoteUserData = await this.getLatestRemoteUserData(manifest, lastSyncUserData);
-				status = await this.performSync(remoteUserData, lastSyncUserData, apply, userDataSyncConfiguration);
+				status = await this.performSync(remoteUserData, lastSyncUserData, preview ? SyncStrategy.Preview : SyncStrategy.Merge, userDataSyncConfiguration);
 				if (status === SyncStatus.HasConflicts) {
 					this.logService.info(`${this.syncResourceLogLabel}: Detected conflicts while synchronizing ${this.resource.toLowerCase()}.`);
 				} else if (status === SyncStatus.Idle) {
@@ -259,6 +251,19 @@ export abstract class AbstractSynchroniser extends Disposable implements IUserDa
 		}
 	}
 
+	async apply(force: boolean, headers: IHeaders = {}): Promise<ISyncResourcePreview | null> {
+		try {
+			this.syncHeaders = { ...headers };
+
+			const status = await this.doApply(force);
+			this.setStatus(status);
+
+			return this.syncPreviewPromise;
+		} finally {
+			this.syncHeaders = {};
+		}
+	}
+
 	async replace(content: string): Promise<boolean> {
 		const syncData = this.parseSyncData(content);
 		if (!syncData) {
@@ -318,7 +323,7 @@ export abstract class AbstractSynchroniser extends Disposable implements IUserDa
 		return this.getRemoteUserData(lastSyncUserData);
 	}
 
-	private async performSync(remoteUserData: IRemoteUserData, lastSyncUserData: IRemoteUserData | null, apply: boolean, userDataSyncConfiguration: IUserDataSyncConfiguration): Promise<SyncStatus> {
+	private async performSync(remoteUserData: IRemoteUserData, lastSyncUserData: IRemoteUserData | null, strategy: SyncStrategy, userDataSyncConfiguration: IUserDataSyncConfiguration): Promise<SyncStatus> {
 		if (remoteUserData.syncData && remoteUserData.syncData.version > this.version) {
 			// current version is not compatible with cloud version
 			this.telemetryService.publicLog2<{ source: string }, IncompatibleSyncSourceClassification>('sync/incompatible', { source: this.resource });
@@ -326,7 +331,7 @@ export abstract class AbstractSynchroniser extends Disposable implements IUserDa
 		}
 
 		try {
-			return await this.doSync(remoteUserData, lastSyncUserData, apply, userDataSyncConfiguration);
+			return await this.doSync(remoteUserData, lastSyncUserData, strategy, userDataSyncConfiguration);
 		} catch (e) {
 			if (e instanceof UserDataSyncError) {
 				switch (e.code) {
@@ -334,7 +339,7 @@ export abstract class AbstractSynchroniser extends Disposable implements IUserDa
 					case UserDataSyncErrorCode.LocalPreconditionFailed:
 						// Rejected as there is a new local version. Syncing again...
 						this.logService.info(`${this.syncResourceLogLabel}: Failed to synchronize ${this.syncResourceLogLabel} as there is a new local version available. Synchronizing again...`);
-						return this.performSync(remoteUserData, lastSyncUserData, apply, userDataSyncConfiguration);
+						return this.performSync(remoteUserData, lastSyncUserData, strategy, userDataSyncConfiguration);
 
 					case UserDataSyncErrorCode.Conflict:
 					case UserDataSyncErrorCode.PreconditionFailed:
@@ -348,19 +353,20 @@ export abstract class AbstractSynchroniser extends Disposable implements IUserDa
 						// and one of them successfully updated remote and last sync state.
 						lastSyncUserData = await this.getLastSyncUserData();
 
-						return this.performSync(remoteUserData, lastSyncUserData, apply, userDataSyncConfiguration);
+						return this.performSync(remoteUserData, lastSyncUserData, SyncStrategy.Merge, userDataSyncConfiguration);
 				}
 			}
 			throw e;
 		}
 	}
 
-	protected async doSync(remoteUserData: IRemoteUserData, lastSyncUserData: IRemoteUserData | null, apply: boolean, userDataSyncConfiguration: IUserDataSyncConfiguration): Promise<SyncStatus> {
+	protected async doSync(remoteUserData: IRemoteUserData, lastSyncUserData: IRemoteUserData | null, strategy: SyncStrategy, userDataSyncConfiguration: IUserDataSyncConfiguration): Promise<SyncStatus> {
 		try {
 
 			const isRemoteDataFromCurrentMachine = await this.isRemoteDataFromCurrentMachine(remoteUserData);
 			const acceptRemote = !isRemoteDataFromCurrentMachine && lastSyncUserData === null && this.getStoredLastSyncUserDataStateContent() !== undefined;
-			const merge = apply && !acceptRemote;
+			const merge = strategy === SyncStrategy.Preview || (strategy === SyncStrategy.Merge && !acceptRemote);
+			const apply = strategy === SyncStrategy.Merge || strategy === SyncStrategy.PullOrPush;
 
 			// generate or use existing preview
 			if (!this.syncPreviewPromise) {
@@ -369,13 +375,26 @@ export abstract class AbstractSynchroniser extends Disposable implements IUserDa
 
 			let preview = await this.syncPreviewPromise;
 
-			if (apply && acceptRemote) {
+			if (strategy === SyncStrategy.Merge && acceptRemote) {
 				this.logService.info(`${this.syncResourceLogLabel}: Accepting remote because it was synced before and the last sync data is not available.`);
 				for (const resourcePreview of preview.resourcePreviews) {
 					preview = (await this.accept(resourcePreview.remoteResource)) || preview;
 				}
 			}
 
+			else if (strategy === SyncStrategy.PullOrPush) {
+				for (const resourcePreview of preview.resourcePreviews) {
+					if (resourcePreview.mergeState === MergeState.Accepted) {
+						continue;
+					}
+					if (remoteUserData.ref === lastSyncUserData?.ref || isRemoteDataFromCurrentMachine) {
+						preview = (await this.accept(resourcePreview.localResource)) ?? preview;
+					} else {
+						preview = (await this.accept(resourcePreview.remoteResource)) ?? preview;
+					}
+				}
+			}
+
 			this.updateConflicts(preview.resourcePreviews);
 			if (preview.resourcePreviews.some(({ mergeState }) => mergeState === MergeState.Conflict)) {
 				return SyncStatus.HasConflicts;
@@ -396,22 +415,6 @@ export abstract class AbstractSynchroniser extends Disposable implements IUserDa
 		}
 	}
 
-	async merge(resource: URI): Promise<ISyncResourcePreview | null> {
-		await this.updateSyncResourcePreview(resource, async (resourcePreview) => {
-			const mergeResult = await this.getMergeResult(resourcePreview, CancellationToken.None);
-			await this.fileService.writeFile(resourcePreview.previewResource, VSBuffer.fromString(mergeResult?.content || ''));
-			const acceptResult: IAcceptResult | undefined = mergeResult && !mergeResult.hasConflicts
-				? await this.getAcceptResult(resourcePreview, resourcePreview.previewResource, undefined, CancellationToken.None)
-				: undefined;
-			resourcePreview.acceptResult = acceptResult;
-			resourcePreview.mergeState = mergeResult.hasConflicts ? MergeState.Conflict : acceptResult ? MergeState.Accepted : MergeState.Preview;
-			resourcePreview.localChange = acceptResult ? acceptResult.localChange : mergeResult.localChange;
-			resourcePreview.remoteChange = acceptResult ? acceptResult.remoteChange : mergeResult.remoteChange;
-			return resourcePreview;
-		});
-		return this.syncPreviewPromise;
-	}
-
 	async accept(resource: URI, content?: string | null): Promise<ISyncResourcePreview | null> {
 		await this.updateSyncResourcePreview(resource, async (resourcePreview) => {
 			const acceptResult = await this.getAcceptResult(resourcePreview, resource, content, CancellationToken.None);
diff --git a/src/vs/platform/userDataSync/common/extensionsSync.ts b/src/vs/platform/userDataSync/common/extensionsSync.ts
index 4054babf6f0..2269f4e3c58 100644
--- a/src/vs/platform/userDataSync/common/extensionsSync.ts
+++ b/src/vs/platform/userDataSync/common/extensionsSync.ts
@@ -242,7 +242,8 @@ export class ExtensionsSynchroniser extends AbstractSynchroniser implements IUse
 	private async acceptLocal(resourcePreview: IExtensionResourcePreview): Promise<IExtensionResourceMergeResult> {
 		const installedExtensions = await this.extensionManagementService.getInstalled(undefined, this.syncResource.profile.extensionsResource);
 		const ignoredExtensions = this.ignoredExtensionsManagementService.getIgnoredExtensions(installedExtensions);
-		const mergeResult = merge(resourcePreview.localExtensions, null, null, resourcePreview.skippedExtensions, ignoredExtensions, resourcePreview.builtinExtensions);
+		const remoteExtensions = resourcePreview.remoteContent ? JSON.parse(resourcePreview.remoteContent) : null;
+		const mergeResult = merge(resourcePreview.localExtensions, remoteExtensions, remoteExtensions, resourcePreview.skippedExtensions, ignoredExtensions, resourcePreview.builtinExtensions);
 		const { local, remote } = mergeResult;
 		return {
 			content: resourcePreview.localContent,
diff --git a/src/vs/platform/userDataSync/common/globalStateSync.ts b/src/vs/platform/userDataSync/common/globalStateSync.ts
index 75ea2446438..e37893825af 100644
--- a/src/vs/platform/userDataSync/common/globalStateSync.ts
+++ b/src/vs/platform/userDataSync/common/globalStateSync.ts
@@ -194,25 +194,37 @@ export class GlobalStateSynchroniser extends AbstractSynchroniser implements IUs
 	}
 
 	private async acceptLocal(resourcePreview: IGlobalStateResourcePreview): Promise<IGlobalStateResourceMergeResult> {
-		return {
-			content: resourcePreview.localContent,
-			local: { added: {}, removed: [], updated: {} },
-			remote: { added: Object.keys(resourcePreview.localUserData.storage), removed: [], updated: [], all: resourcePreview.localUserData.storage },
-			localChange: Change.None,
-			remoteChange: Change.Modified,
-		};
+		if (resourcePreview.remoteContent !== null) {
+			const remoteGlobalState: IGlobalState = JSON.parse(resourcePreview.remoteContent);
+			const { local, remote } = merge(resourcePreview.localUserData.storage, remoteGlobalState.storage, remoteGlobalState.storage, resourcePreview.storageKeys, this.logService);
+			return {
+				content: resourcePreview.remoteContent,
+				local,
+				remote,
+				localChange: Change.None,
+				remoteChange: remote.all !== null ? Change.Modified : Change.None,
+			};
+		} else {
+			return {
+				content: resourcePreview.localContent,
+				local: { added: {}, removed: [], updated: {} },
+				remote: { added: Object.keys(resourcePreview.localUserData.storage), removed: [], updated: [], all: resourcePreview.localUserData.storage },
+				localChange: Change.None,
+				remoteChange: Change.Modified,
+			};
+		}
 	}
 
 	private async acceptRemote(resourcePreview: IGlobalStateResourcePreview): Promise<IGlobalStateResourceMergeResult> {
 		if (resourcePreview.remoteContent !== null) {
 			const remoteGlobalState: IGlobalState = JSON.parse(resourcePreview.remoteContent);
-			const { local, remote } = merge(resourcePreview.localUserData.storage, remoteGlobalState.storage, null, resourcePreview.storageKeys, this.logService);
+			const { local, remote } = merge(resourcePreview.localUserData.storage, remoteGlobalState.storage, resourcePreview.localUserData.storage, resourcePreview.storageKeys, this.logService);
 			return {
 				content: resourcePreview.remoteContent,
 				local,
 				remote,
 				localChange: Object.keys(local.added).length > 0 || Object.keys(local.updated).length > 0 || local.removed.length > 0 ? Change.Modified : Change.None,
-				remoteChange: remote !== null ? Change.Modified : Change.None,
+				remoteChange: Change.None,
 			};
 		} else {
 			return {
diff --git a/src/vs/platform/userDataSync/common/userDataSync.ts b/src/vs/platform/userDataSync/common/userDataSync.ts
index c3224e18bdd..02824fa3467 100644
--- a/src/vs/platform/userDataSync/common/userDataSync.ts
+++ b/src/vs/platform/userDataSync/common/userDataSync.ts
@@ -498,14 +498,10 @@ export interface IUserDataSynchroniser {
 
 	readonly onDidChangeLocal: Event<void>;
 
-	sync(manifest: IUserDataResourceManifest | null, headers: IHeaders): Promise<void>;
-	stop(): Promise<void>;
-
-	preview(manifest: IUserDataResourceManifest | null, userDataSyncConfiguration: IUserDataSyncConfiguration, headers: IHeaders): Promise<IUserDataSyncResourcePreview | null>;
+	sync(manifest: IUserDataResourceManifest | null, preview: boolean, userDataSyncConfiguration: IUserDataSyncConfiguration, headers: IHeaders): Promise<IUserDataSyncResourcePreview | null>;
 	accept(resource: URI, content?: string | null): Promise<IUserDataSyncResourcePreview | null>;
-	merge(resource: URI): Promise<IUserDataSyncResourcePreview | null>;
-	discard(resource: URI): Promise<IUserDataSyncResourcePreview | null>;
 	apply(force: boolean, headers: IHeaders): Promise<IUserDataSyncResourcePreview | null>;
+	stop(): Promise<void>;
 
 	hasPreviouslySynced(): Promise<boolean>;
 	hasLocalData(): Promise<boolean>;
diff --git a/src/vs/platform/userDataSync/common/userDataSyncService.ts b/src/vs/platform/userDataSync/common/userDataSyncService.ts
index a18be8e3996..46a443581b9 100644
--- a/src/vs/platform/userDataSync/common/userDataSyncService.ts
+++ b/src/vs/platform/userDataSync/common/userDataSyncService.ts
@@ -28,10 +28,10 @@ import { SnippetsSynchroniser } from './snippetsSync.js';
 import { TasksSynchroniser } from './tasksSync.js';
 import { UserDataProfilesManifestSynchroniser } from './userDataProfilesManifestSync.js';
 import {
-	ALL_SYNC_RESOURCES, Change, createSyncHeaders, IUserDataManualSyncTask, IUserDataSyncResourceConflicts, IUserDataSyncResourceError,
+	ALL_SYNC_RESOURCES, createSyncHeaders, IUserDataManualSyncTask, IUserDataSyncResourceConflicts, IUserDataSyncResourceError,
 	IUserDataSyncResource, ISyncResourceHandle, IUserDataSyncTask, ISyncUserDataProfile, IUserDataManifest, IUserDataResourceManifest, IUserDataSyncConfiguration,
 	IUserDataSyncEnablementService, IUserDataSynchroniser, IUserDataSyncLogService, IUserDataSyncService, IUserDataSyncStoreManagementService, IUserDataSyncStoreService,
-	MergeState, SyncResource, SyncStatus, UserDataSyncError, UserDataSyncErrorCode, UserDataSyncStoreError, USER_DATA_SYNC_CONFIGURATION_SCOPE, IUserDataSyncResourceProviderService, IUserDataActivityData, IUserDataSyncLocalStoreService
+	SyncResource, SyncStatus, UserDataSyncError, UserDataSyncErrorCode, UserDataSyncStoreError, USER_DATA_SYNC_CONFIGURATION_SCOPE, IUserDataSyncResourceProviderService, IUserDataActivityData, IUserDataSyncLocalStoreService,
 } from './userDataSync.js';
 
 type SyncErrorClassification = {
@@ -200,7 +200,7 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
 		};
 	}
 
-	private async sync(manifest: IUserDataManifest | null, merge: boolean, executionId: string, token: CancellationToken): Promise<void> {
+	private async sync(manifest: IUserDataManifest | null, preview: boolean, executionId: string, token: CancellationToken): Promise<void> {
 		this._syncErrors = [];
 		try {
 			if (this.status !== SyncStatus.HasConflicts) {
@@ -209,7 +209,7 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
 
 			// Sync Default Profile First
 			const defaultProfileSynchronizer = this.getOrCreateActiveProfileSynchronizer(this.userDataProfilesService.defaultProfile, undefined);
-			this._syncErrors.push(...await this.syncProfile(defaultProfileSynchronizer, manifest, merge, executionId, token));
+			this._syncErrors.push(...await this.syncProfile(defaultProfileSynchronizer, manifest, preview, executionId, token));
 
 			// Sync other profiles
 			const userDataProfileManifestSynchronizer = defaultProfileSynchronizer.enabled.find(s => s.resource === SyncResource.Profiles);
@@ -218,7 +218,7 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
 				if (token.isCancellationRequested) {
 					return;
 				}
-				await this.syncRemoteProfiles(syncProfiles, manifest, merge, executionId, token);
+				await this.syncRemoteProfiles(syncProfiles, manifest, preview, executionId, token);
 			}
 		} finally {
 			if (this.status !== SyncStatus.HasConflicts) {
@@ -228,7 +228,7 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
 		}
 	}
 
-	private async syncRemoteProfiles(remoteProfiles: ISyncUserDataProfile[], manifest: IUserDataManifest | null, merge: boolean, executionId: string, token: CancellationToken): Promise<void> {
+	private async syncRemoteProfiles(remoteProfiles: ISyncUserDataProfile[], manifest: IUserDataManifest | null, preview: boolean, executionId: string, token: CancellationToken): Promise<void> {
 		for (const syncProfile of remoteProfiles) {
 			if (token.isCancellationRequested) {
 				return;
@@ -240,7 +240,7 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
 			}
 			this.logService.info('Syncing profile.', syncProfile.name);
 			const profileSynchronizer = this.getOrCreateActiveProfileSynchronizer(profile, syncProfile);
-			this._syncErrors.push(...await this.syncProfile(profileSynchronizer, manifest, merge, executionId, token));
+			this._syncErrors.push(...await this.syncProfile(profileSynchronizer, manifest, preview, executionId, token));
 		}
 		// Dispose & Delete profile synchronizers which do not exist anymore
 		for (const [key, profileSynchronizerItem] of this.activeProfileSynchronizers.entries()) {
@@ -285,8 +285,8 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
 		}
 	}
 
-	private async syncProfile(profileSynchronizer: ProfileSynchronizer, manifest: IUserDataManifest | null, merge: boolean, executionId: string, token: CancellationToken): Promise<IUserDataSyncResourceError[]> {
-		const errors = await profileSynchronizer.sync(manifest, merge, executionId, token);
+	private async syncProfile(profileSynchronizer: ProfileSynchronizer, manifest: IUserDataManifest | null, preview: boolean, executionId: string, token: CancellationToken): Promise<IUserDataSyncResourceError[]> {
+		const errors = await profileSynchronizer.sync(manifest, preview, executionId, token);
 		return errors.map(([syncResource, error]) => ({ profile: profileSynchronizer.profile, syncResource, error }));
 	}
 
@@ -715,7 +715,7 @@ class ProfileSynchronizer extends Disposable {
 		}
 	}
 
-	async sync(manifest: IUserDataManifest | null, merge: boolean, executionId: string, token: CancellationToken): Promise<[SyncResource, UserDataSyncError][]> {
+	async sync(manifest: IUserDataManifest | null, preview: boolean, executionId: string, token: CancellationToken): Promise<[SyncResource, UserDataSyncError][]> {
 
 		// Return if cancellation is requested
 		if (token.isCancellationRequested) {
@@ -731,7 +731,7 @@ class ProfileSynchronizer extends Disposable {
 			const syncErrors: [SyncResource, UserDataSyncError][] = [];
 			const syncHeaders = createSyncHeaders(executionId);
 			const resourceManifest: IUserDataResourceManifest | null = (this.collection ? manifest?.collections?.[this.collection]?.latest : manifest?.latest) ?? null;
-			const userDataSyncConfiguration = merge ? await this.getUserDataSyncConfiguration(resourceManifest) : {};
+			const userDataSyncConfiguration = preview ? await this.getUserDataSyncConfiguration(resourceManifest) : this.getLocalUserDataSyncConfiguration();
 			for (const synchroniser of synchronizers) {
 				// Return if cancellation is requested
 				if (token.isCancellationRequested) {
@@ -744,18 +744,7 @@ class ProfileSynchronizer extends Disposable {
 				}
 
 				try {
-					if (merge) {
-						const preview = await synchroniser.preview(resourceManifest, userDataSyncConfiguration, syncHeaders);
-						if (preview) {
-							for (const resourcePreview of preview.resourcePreviews) {
-								if ((resourcePreview.localChange !== Change.None || resourcePreview.remoteChange !== Change.None) && resourcePreview.mergeState === MergeState.Preview) {
-									await synchroniser.merge(resourcePreview.previewResource);
-								}
-							}
-						}
-					} else {
-						await synchroniser.sync(resourceManifest, syncHeaders);
-					}
+					await synchroniser.sync(resourceManifest, preview, userDataSyncConfiguration, syncHeaders);
 				} catch (e) {
 					const userDataSyncError = UserDataSyncError.toUserDataSyncError(e);
 					reportUserDataSyncError(userDataSyncError, executionId, this.userDataSyncStoreManagementService, this.telemetryService);
@@ -825,7 +814,7 @@ class ProfileSynchronizer extends Disposable {
 		if (!this.profile.isDefault) {
 			return {};
 		}
-		const local = this.configurationService.getValue<IUserDataSyncConfiguration>(USER_DATA_SYNC_CONFIGURATION_SCOPE);
+		const local = this.getLocalUserDataSyncConfiguration();
 		const settingsSynchronizer = this.enabled.find(synchronizer => synchronizer instanceof SettingsSynchroniser);
 		if (settingsSynchronizer) {
 			const remote = await (<SettingsSynchroniser>settingsSynchronizer).getRemoteUserDataSyncConfiguration(manifest);
@@ -834,6 +823,10 @@ class ProfileSynchronizer extends Disposable {
 		return local;
 	}
 
+	private getLocalUserDataSyncConfiguration(): IUserDataSyncConfiguration {
+		return this.configurationService.getValue(USER_DATA_SYNC_CONFIGURATION_SCOPE);
+	}
+
 	private setStatus(status: SyncStatus): void {
 		if (this._status !== status) {
 			this._status = status;
diff --git a/src/vs/platform/userDataSync/test/common/keybindingsSync.test.ts b/src/vs/platform/userDataSync/test/common/keybindingsSync.test.ts
index 00841916bbe..c0103898ddc 100644
--- a/src/vs/platform/userDataSync/test/common/keybindingsSync.test.ts
+++ b/src/vs/platform/userDataSync/test/common/keybindingsSync.test.ts
@@ -196,11 +196,11 @@ suite('KeybindingsSync', () => {
 			await fileService.del(keybindingsResource);
 		}
 
-		const preview = (await testObject.preview(await client.getResourceManifest(), {}))!;
+		const preview = await testObject.sync(await client.getResourceManifest(), true);
 
 		server.reset();
-		const content = await testObject.resolveContent(preview.resourcePreviews[0].remoteResource);
-		await testObject.accept(preview.resourcePreviews[0].remoteResource, content);
+		const content = await testObject.resolveContent(preview!.resourcePreviews[0].remoteResource);
+		await testObject.accept(preview!.resourcePreviews[0].remoteResource, content);
 		await testObject.apply(false);
 		assert.deepStrictEqual(server.requests, []);
 	});
diff --git a/src/vs/platform/userDataSync/test/common/settingsSync.test.ts b/src/vs/platform/userDataSync/test/common/settingsSync.test.ts
index 914ae83a5d4..b3c6eee9926 100644
--- a/src/vs/platform/userDataSync/test/common/settingsSync.test.ts
+++ b/src/vs/platform/userDataSync/test/common/settingsSync.test.ts
@@ -569,7 +569,7 @@ suite('SettingsSync - Manual', () => {
 }`;
 		await updateSettings(settingsContent, client);
 
-		let preview = await testObject.preview(await client.getResourceManifest(), {});
+		let preview = await testObject.sync(await client.getResourceManifest(), true);
 		assert.strictEqual(testObject.status, SyncStatus.Syncing);
 		preview = await testObject.accept(preview!.resourcePreviews[0].previewResource);
 		preview = await testObject.apply(false);
diff --git a/src/vs/platform/userDataSync/test/common/snippetsSync.test.ts b/src/vs/platform/userDataSync/test/common/snippetsSync.test.ts
index 89e9c59c48b..0e37d04d493 100644
--- a/src/vs/platform/userDataSync/test/common/snippetsSync.test.ts
+++ b/src/vs/platform/userDataSync/test/common/snippetsSync.test.ts
@@ -674,49 +674,12 @@ suite('SnippetsSync', () => {
 		assert.ok(!await fileService.exists(dirname(conflicts[0].previewResource)));
 	});
 
-	test('merge when there are multiple snippets and only one snippet is merged', async () => {
-		const environmentService = testClient.instantiationService.get(IEnvironmentService);
-
-		await updateSnippet('html.json', htmlSnippet2, testClient);
-		await updateSnippet('typescript.json', tsSnippet2, testClient);
-		let preview = await testObject.preview(await testClient.getResourceManifest(), {});
-
-		assert.strictEqual(testObject.status, SyncStatus.Syncing);
-		assertPreviews(preview!.resourcePreviews,
-			[
-				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'html.json'),
-				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'typescript.json'),
-			]);
-		assert.deepStrictEqual(testObject.conflicts.conflicts, []);
-
-		preview = await testObject.merge(preview!.resourcePreviews[0].localResource);
-
-		assert.strictEqual(testObject.status, SyncStatus.Syncing);
-		assertPreviews(preview!.resourcePreviews,
-			[
-				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'html.json'),
-				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'typescript.json'),
-			]);
-		assert.deepStrictEqual(testObject.conflicts.conflicts, []);
-	});
-
 	test('merge when there are multiple snippets and all snippets are merged', async () => {
 		const environmentService = testClient.instantiationService.get(IEnvironmentService);
 
 		await updateSnippet('html.json', htmlSnippet2, testClient);
 		await updateSnippet('typescript.json', tsSnippet2, testClient);
-		let preview = await testObject.preview(await testClient.getResourceManifest(), {});
-
-		assert.strictEqual(testObject.status, SyncStatus.Syncing);
-		assertPreviews(preview!.resourcePreviews,
-			[
-				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'html.json'),
-				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'typescript.json'),
-			]);
-		assert.deepStrictEqual(testObject.conflicts.conflicts, []);
-
-		preview = await testObject.merge(preview!.resourcePreviews[0].localResource);
-		preview = await testObject.merge(preview!.resourcePreviews[1].localResource);
+		const preview = await testObject.sync(await testClient.getResourceManifest(), true);
 
 		assert.strictEqual(testObject.status, SyncStatus.Syncing);
 		assertPreviews(preview!.resourcePreviews,
@@ -728,22 +691,9 @@ suite('SnippetsSync', () => {
 	});
 
 	test('merge when there are multiple snippets and all snippets are merged and applied', async () => {
-		const environmentService = testClient.instantiationService.get(IEnvironmentService);
-
 		await updateSnippet('html.json', htmlSnippet2, testClient);
 		await updateSnippet('typescript.json', tsSnippet2, testClient);
-		let preview = await testObject.preview(await testClient.getResourceManifest(), {});
-
-		assert.strictEqual(testObject.status, SyncStatus.Syncing);
-		assertPreviews(preview!.resourcePreviews,
-			[
-				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'html.json'),
-				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'typescript.json'),
-			]);
-		assert.deepStrictEqual(testObject.conflicts.conflicts, []);
-
-		preview = await testObject.merge(preview!.resourcePreviews[0].localResource);
-		preview = await testObject.merge(preview!.resourcePreviews[1].localResource);
+		let preview = await testObject.sync(await testClient.getResourceManifest(), true);
 		preview = await testObject.apply(false);
 
 		assert.strictEqual(testObject.status, SyncStatus.Idle);
@@ -759,17 +709,7 @@ suite('SnippetsSync', () => {
 
 		await updateSnippet('html.json', htmlSnippet1, testClient);
 		await updateSnippet('typescript.json', tsSnippet2, testClient);
-		let preview = await testObject.preview(await testClient.getResourceManifest(), {});
-
-		assert.strictEqual(testObject.status, SyncStatus.Syncing);
-		assertPreviews(preview!.resourcePreviews,
-			[
-				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'typescript.json'),
-				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'html.json'),
-			]);
-		assert.deepStrictEqual(testObject.conflicts.conflicts, []);
-
-		preview = await testObject.merge(preview!.resourcePreviews[0].localResource);
+		const preview = await testObject.sync(await testClient.getResourceManifest(), true);
 
 		assert.strictEqual(testObject.status, SyncStatus.Syncing);
 		assertPreviews(preview!.resourcePreviews,
@@ -780,25 +720,14 @@ suite('SnippetsSync', () => {
 		assert.deepStrictEqual(testObject.conflicts.conflicts, []);
 	});
 
-	test('merge when there are multiple snippets and one snippet has no changes and one snippet is merged and applied', async () => {
-		const environmentService = testClient.instantiationService.get(IEnvironmentService);
-
+	test('merge when there are multiple snippets and one snippet has no changes and snippets is merged and applied', async () => {
 		await updateSnippet('html.json', htmlSnippet1, client2);
 		await client2.sync();
 
 		await updateSnippet('html.json', htmlSnippet1, testClient);
 		await updateSnippet('typescript.json', tsSnippet2, testClient);
-		let preview = await testObject.preview(await testClient.getResourceManifest(), {});
-
-		assert.strictEqual(testObject.status, SyncStatus.Syncing);
-		assertPreviews(preview!.resourcePreviews,
-			[
-				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'typescript.json'),
-				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'html.json'),
-			]);
-		assert.deepStrictEqual(testObject.conflicts.conflicts, []);
+		let preview = await testObject.sync(await testClient.getResourceManifest(), true);
 
-		preview = await testObject.merge(preview!.resourcePreviews[0].localResource);
 		preview = await testObject.apply(false);
 
 		assert.strictEqual(testObject.status, SyncStatus.Idle);
@@ -806,7 +735,7 @@ suite('SnippetsSync', () => {
 		assert.deepStrictEqual(testObject.conflicts.conflicts, []);
 	});
 
-	test('merge when there are multiple snippets with conflicts and only one snippet is merged', async () => {
+	test('merge when there are multiple snippets with conflicts and all snippets are merged', async () => {
 		const environmentService = testClient.instantiationService.get(IEnvironmentService);
 
 		await updateSnippet('html.json', htmlSnippet1, client2);
@@ -815,17 +744,7 @@ suite('SnippetsSync', () => {
 
 		await updateSnippet('html.json', htmlSnippet2, testClient);
 		await updateSnippet('typescript.json', tsSnippet2, testClient);
-		let preview = await testObject.preview(await testClient.getResourceManifest(), {});
-
-		assert.strictEqual(testObject.status, SyncStatus.Syncing);
-		assertPreviews(preview!.resourcePreviews,
-			[
-				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'html.json'),
-				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'typescript.json'),
-			]);
-		assert.deepStrictEqual(testObject.conflicts.conflicts, []);
-
-		preview = await testObject.merge(preview!.resourcePreviews[0].previewResource);
+		const preview = await testObject.sync(await testClient.getResourceManifest(), true);
 
 		assert.strictEqual(testObject.status, SyncStatus.HasConflicts);
 		assertPreviews(preview!.resourcePreviews,
@@ -836,10 +755,11 @@ suite('SnippetsSync', () => {
 		assertPreviews(testObject.conflicts.conflicts,
 			[
 				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'html.json'),
+				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'typescript.json'),
 			]);
 	});
 
-	test('merge when there are multiple snippets with conflicts and all snippets are merged', async () => {
+	test('accept when there are multiple snippets with conflicts and only one snippet is accepted', async () => {
 		const environmentService = testClient.instantiationService.get(IEnvironmentService);
 
 		await updateSnippet('html.json', htmlSnippet1, client2);
@@ -848,18 +768,7 @@ suite('SnippetsSync', () => {
 
 		await updateSnippet('html.json', htmlSnippet2, testClient);
 		await updateSnippet('typescript.json', tsSnippet2, testClient);
-		let preview = await testObject.preview(await testClient.getResourceManifest(), {});
-
-		assert.strictEqual(testObject.status, SyncStatus.Syncing);
-		assertPreviews(preview!.resourcePreviews,
-			[
-				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'html.json'),
-				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'typescript.json'),
-			]);
-		assert.deepStrictEqual(testObject.conflicts.conflicts, []);
-
-		preview = await testObject.merge(preview!.resourcePreviews[0].previewResource);
-		preview = await testObject.merge(preview!.resourcePreviews[1].previewResource);
+		let preview = await testObject.sync(await testClient.getResourceManifest(), true);
 
 		assert.strictEqual(testObject.status, SyncStatus.HasConflicts);
 		assertPreviews(preview!.resourcePreviews,
@@ -872,36 +781,19 @@ suite('SnippetsSync', () => {
 				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'html.json'),
 				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'typescript.json'),
 			]);
-	});
 
-	test('accept when there are multiple snippets with conflicts and only one snippet is accepted', async () => {
-		const environmentService = testClient.instantiationService.get(IEnvironmentService);
-
-		await updateSnippet('html.json', htmlSnippet1, client2);
-		await updateSnippet('typescript.json', tsSnippet1, client2);
-		await client2.sync();
-
-		await updateSnippet('html.json', htmlSnippet2, testClient);
-		await updateSnippet('typescript.json', tsSnippet2, testClient);
-		let preview = await testObject.preview(await testClient.getResourceManifest(), {});
+		preview = await testObject.accept(preview!.resourcePreviews[0].previewResource, htmlSnippet2);
 
-		assert.strictEqual(testObject.status, SyncStatus.Syncing);
+		assert.strictEqual(testObject.status, SyncStatus.HasConflicts);
 		assertPreviews(preview!.resourcePreviews,
 			[
 				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'html.json'),
 				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'typescript.json'),
 			]);
-		assert.deepStrictEqual(testObject.conflicts.conflicts, []);
-
-		preview = await testObject.accept(preview!.resourcePreviews[0].previewResource, htmlSnippet2);
-
-		assert.strictEqual(testObject.status, SyncStatus.Syncing);
-		assertPreviews(preview!.resourcePreviews,
+		assertPreviews(testObject.conflicts.conflicts,
 			[
-				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'html.json'),
 				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'typescript.json'),
 			]);
-		assert.deepStrictEqual(testObject.conflicts.conflicts, []);
 	});
 
 	test('accept when there are multiple snippets with conflicts and all snippets are accepted', async () => {
@@ -913,15 +805,19 @@ suite('SnippetsSync', () => {
 
 		await updateSnippet('html.json', htmlSnippet2, testClient);
 		await updateSnippet('typescript.json', tsSnippet2, testClient);
-		let preview = await testObject.preview(await testClient.getResourceManifest(), {});
+		let preview = await testObject.sync(await testClient.getResourceManifest(), true);
 
-		assert.strictEqual(testObject.status, SyncStatus.Syncing);
+		assert.strictEqual(testObject.status, SyncStatus.HasConflicts);
 		assertPreviews(preview!.resourcePreviews,
 			[
 				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'html.json'),
 				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'typescript.json'),
 			]);
-		assert.deepStrictEqual(testObject.conflicts.conflicts, []);
+		assertPreviews(testObject.conflicts.conflicts,
+			[
+				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'html.json'),
+				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'typescript.json'),
+			]);
 
 		preview = await testObject.accept(preview!.resourcePreviews[0].previewResource, htmlSnippet2);
 		preview = await testObject.accept(preview!.resourcePreviews[1].previewResource, tsSnippet2);
@@ -937,22 +833,25 @@ suite('SnippetsSync', () => {
 
 	test('accept when there are multiple snippets with conflicts and all snippets are accepted and applied', async () => {
 		const environmentService = testClient.instantiationService.get(IEnvironmentService);
-
 		await updateSnippet('html.json', htmlSnippet1, client2);
 		await updateSnippet('typescript.json', tsSnippet1, client2);
 		await client2.sync();
 
 		await updateSnippet('html.json', htmlSnippet2, testClient);
 		await updateSnippet('typescript.json', tsSnippet2, testClient);
-		let preview = await testObject.preview(await testClient.getResourceManifest(), {});
+		let preview = await testObject.sync(await testClient.getResourceManifest(), true);
 
-		assert.strictEqual(testObject.status, SyncStatus.Syncing);
+		assert.strictEqual(testObject.status, SyncStatus.HasConflicts);
 		assertPreviews(preview!.resourcePreviews,
 			[
 				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'html.json'),
 				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'typescript.json'),
 			]);
-		assert.deepStrictEqual(testObject.conflicts.conflicts, []);
+		assertPreviews(testObject.conflicts.conflicts,
+			[
+				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'html.json'),
+				joinPath(environmentService.userDataSyncHome, testObject.resource, PREVIEW_DIR_NAME, 'typescript.json'),
+			]);
 
 		preview = await testObject.accept(preview!.resourcePreviews[0].previewResource, htmlSnippet2);
 		preview = await testObject.accept(preview!.resourcePreviews[1].previewResource, tsSnippet2);
diff --git a/src/vs/platform/userDataSync/test/common/synchronizer.test.ts b/src/vs/platform/userDataSync/test/common/synchronizer.test.ts
index 4dfec270711..31a55803660 100644
--- a/src/vs/platform/userDataSync/test/common/synchronizer.test.ts
+++ b/src/vs/platform/userDataSync/test/common/synchronizer.test.ts
@@ -15,7 +15,7 @@ import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/c
 import { IFileService } from '../../../files/common/files.js';
 import { IStorageService, StorageScope } from '../../../storage/common/storage.js';
 import { IUserDataProfilesService } from '../../../userDataProfile/common/userDataProfile.js';
-import { AbstractSynchroniser, IAcceptResult, IMergeResult, IResourcePreview } from '../../common/abstractSynchronizer.js';
+import { AbstractSynchroniser, IAcceptResult, IMergeResult, IResourcePreview, SyncStrategy } from '../../common/abstractSynchronizer.js';
 import { Change, IRemoteUserData, IResourcePreview as IBaseResourcePreview, IUserDataResourceManifest, IUserDataSyncConfiguration, IUserDataSyncStoreService, MergeState, SyncResource, SyncStatus, USER_DATA_SYNC_SCHEME } from '../../common/userDataSync.js';
 import { UserDataSyncClient, UserDataSyncTestServer } from './userDataSyncClient.js';
 
@@ -45,7 +45,7 @@ class TestSynchroniser extends AbstractSynchroniser {
 		return super.getLatestRemoteUserData(manifest, lastSyncUserData);
 	}
 
-	protected override async doSync(remoteUserData: IRemoteUserData, lastSyncUserData: IRemoteUserData | null, apply: boolean, userDataSyncConfiguration: IUserDataSyncConfiguration): Promise<SyncStatus> {
+	protected override async doSync(remoteUserData: IRemoteUserData, lastSyncUserData: IRemoteUserData | null, strategy: SyncStrategy, userDataSyncConfiguration: IUserDataSyncConfiguration): Promise<SyncStatus> {
 		this.cancelled = false;
 		this.onDoSyncCall.fire();
 		await this.syncBarrier.wait();
@@ -54,7 +54,7 @@ class TestSynchroniser extends AbstractSynchroniser {
 			return SyncStatus.Idle;
 		}
 
-		return super.doSync(remoteUserData, lastSyncUserData, apply, userDataSyncConfiguration);
+		return super.doSync(remoteUserData, lastSyncUserData, strategy, userDataSyncConfiguration);
 	}
 
 	protected override async generateSyncPreview(remoteUserData: IRemoteUserData): Promise<ITestResourcePreview[]> {
@@ -536,22 +536,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 			testObject.syncResult = { hasConflicts: false, hasError: false };
 			testObject.syncBarrier.open();
 
-			const preview = await testObject.preview(await client.getResourceManifest(), {});
-
-			assert.deepStrictEqual(testObject.status, SyncStatus.Syncing);
-			assertPreviews(preview!.resourcePreviews, [testObject.localResource]);
-			assertConflicts(testObject.conflicts.conflicts, []);
-		});
-	});
-
-	test('preview -> merge', async () => {
-		await runWithFakedTimers<void>({}, async () => {
-			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
-			testObject.syncResult = { hasConflicts: false, hasError: false };
-			testObject.syncBarrier.open();
-
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
-			preview = await testObject.merge(preview!.resourcePreviews[0].previewResource);
+			const preview = await testObject.sync(await client.getResourceManifest(), true);
 
 			assert.deepStrictEqual(testObject.status, SyncStatus.Syncing);
 			assertPreviews(preview!.resourcePreviews, [testObject.localResource]);
@@ -566,24 +551,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 			testObject.syncResult = { hasConflicts: false, hasError: false };
 			testObject.syncBarrier.open();
 
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
-			preview = await testObject.accept(preview!.resourcePreviews[0].previewResource);
-
-			assert.deepStrictEqual(testObject.status, SyncStatus.Syncing);
-			assertPreviews(preview!.resourcePreviews, [testObject.localResource]);
-			assert.strictEqual(preview!.resourcePreviews[0].mergeState, MergeState.Accepted);
-			assertConflicts(testObject.conflicts.conflicts, []);
-		});
-	});
-
-	test('preview -> merge -> accept', async () => {
-		await runWithFakedTimers<void>({}, async () => {
-			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
-			testObject.syncResult = { hasConflicts: false, hasError: false };
-			testObject.syncBarrier.open();
-
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
-			preview = await testObject.merge(preview!.resourcePreviews[0].previewResource);
+			let preview = await testObject.sync(await client.getResourceManifest(), true);
 			preview = await testObject.accept(preview!.resourcePreviews[0].localResource);
 
 			assert.deepStrictEqual(testObject.status, SyncStatus.Syncing);
@@ -601,8 +569,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 			await testObject.sync(await client.getResourceManifest());
 
 			const manifest = await client.getResourceManifest();
-			let preview = await testObject.preview(manifest, {});
-			preview = await testObject.merge(preview!.resourcePreviews[0].previewResource);
+			let preview = await testObject.sync(manifest, true);
 			preview = await testObject.apply(false);
 
 			assert.deepStrictEqual(testObject.status, SyncStatus.Idle);
@@ -624,7 +591,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 
 			const manifest = await client.getResourceManifest();
 			const expectedContent = manifest![testObject.resource];
-			let preview = await testObject.preview(manifest, {});
+			let preview = await testObject.sync(manifest, true);
 			preview = await testObject.accept(preview!.resourcePreviews[0].previewResource);
 			preview = await testObject.apply(false);
 
@@ -637,36 +604,13 @@ suite('TestSynchronizer - Manual Sync', () => {
 		});
 	});
 
-	test('preview -> merge -> accept -> apply', async () => {
+	test('preivew -> discard', async () => {
 		await runWithFakedTimers<void>({}, async () => {
 			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
 			testObject.syncResult = { hasConflicts: false, hasError: false };
 			testObject.syncBarrier.open();
-			await testObject.sync(await client.getResourceManifest());
 
-			const expectedContent = (await client.instantiationService.get(IFileService).readFile(testObject.localResource)).value.toString();
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
-			preview = await testObject.merge(preview!.resourcePreviews[0].previewResource);
-			preview = await testObject.accept(preview!.resourcePreviews[0].localResource);
-			preview = await testObject.apply(false);
-
-			assert.deepStrictEqual(testObject.status, SyncStatus.Idle);
-			assert.strictEqual(preview, null);
-			assertConflicts(testObject.conflicts.conflicts, []);
-
-			assert.strictEqual((await testObject.getRemoteUserData(null)).syncData?.content, expectedContent);
-			assert.strictEqual((await client.instantiationService.get(IFileService).readFile(testObject.localResource)).value.toString(), expectedContent);
-		});
-	});
-
-	test('preivew -> merge -> discard', async () => {
-		await runWithFakedTimers<void>({}, async () => {
-			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
-			testObject.syncResult = { hasConflicts: false, hasError: false };
-			testObject.syncBarrier.open();
-
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
-			preview = await testObject.merge(preview!.resourcePreviews[0].previewResource);
+			let preview = await testObject.sync(await client.getResourceManifest(), true);
 			preview = await testObject.discard(preview!.resourcePreviews[0].previewResource);
 
 			assert.deepStrictEqual(testObject.status, SyncStatus.Syncing);
@@ -676,14 +620,13 @@ suite('TestSynchronizer - Manual Sync', () => {
 		});
 	});
 
-	test('preivew -> merge -> discard -> accept', async () => {
+	test('preivew -> discard -> accept', async () => {
 		await runWithFakedTimers<void>({}, async () => {
 			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
 			testObject.syncResult = { hasConflicts: false, hasError: false };
 			testObject.syncBarrier.open();
 
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
-			preview = await testObject.merge(preview!.resourcePreviews[0].previewResource);
+			let preview = await testObject.sync(await client.getResourceManifest(), true);
 			preview = await testObject.discard(preview!.resourcePreviews[0].previewResource);
 			preview = await testObject.accept(preview!.resourcePreviews[0].remoteResource);
 
@@ -694,30 +637,13 @@ suite('TestSynchronizer - Manual Sync', () => {
 		});
 	});
 
-	test('preivew -> accept -> discard', async () => {
-		await runWithFakedTimers<void>({}, async () => {
-			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
-			testObject.syncResult = { hasConflicts: false, hasError: false };
-			testObject.syncBarrier.open();
-
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
-			preview = await testObject.accept(preview!.resourcePreviews[0].previewResource);
-			preview = await testObject.discard(preview!.resourcePreviews[0].previewResource);
-
-			assert.deepStrictEqual(testObject.status, SyncStatus.Syncing);
-			assertPreviews(preview!.resourcePreviews, [testObject.localResource]);
-			assert.strictEqual(preview!.resourcePreviews[0].mergeState, MergeState.Preview);
-			assertConflicts(testObject.conflicts.conflicts, []);
-		});
-	});
-
 	test('preivew -> accept -> discard -> accept', async () => {
 		await runWithFakedTimers<void>({}, async () => {
 			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
 			testObject.syncResult = { hasConflicts: false, hasError: false };
 			testObject.syncBarrier.open();
 
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
+			let preview = await testObject.sync(await client.getResourceManifest(), true);
 			preview = await testObject.accept(preview!.resourcePreviews[0].previewResource);
 			preview = await testObject.discard(preview!.resourcePreviews[0].previewResource);
 			preview = await testObject.accept(preview!.resourcePreviews[0].remoteResource);
@@ -729,32 +655,13 @@ suite('TestSynchronizer - Manual Sync', () => {
 		});
 	});
 
-	test('preivew -> accept -> discard -> merge', async () => {
-		await runWithFakedTimers<void>({}, async () => {
-			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
-			testObject.syncResult = { hasConflicts: false, hasError: false };
-			testObject.syncBarrier.open();
-
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
-			preview = await testObject.accept(preview!.resourcePreviews[0].previewResource);
-			preview = await testObject.discard(preview!.resourcePreviews[0].previewResource);
-			preview = await testObject.merge(preview!.resourcePreviews[0].remoteResource);
-
-			assert.deepStrictEqual(testObject.status, SyncStatus.Syncing);
-			assertPreviews(preview!.resourcePreviews, [testObject.localResource]);
-			assert.strictEqual(preview!.resourcePreviews[0].mergeState, MergeState.Accepted);
-			assertConflicts(testObject.conflicts.conflicts, []);
-		});
-	});
-
-	test('preivew -> merge -> accept -> discard', async () => {
+	test('preivew -> accept -> discard', async () => {
 		await runWithFakedTimers<void>({}, async () => {
 			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
 			testObject.syncResult = { hasConflicts: false, hasError: false };
 			testObject.syncBarrier.open();
 
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
-			preview = await testObject.merge(preview!.resourcePreviews[0].previewResource);
+			let preview = await testObject.sync(await client.getResourceManifest(), true);
 			preview = await testObject.accept(preview!.resourcePreviews[0].remoteResource);
 			preview = await testObject.discard(preview!.resourcePreviews[0].previewResource);
 
@@ -765,29 +672,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 		});
 	});
 
-	test('preivew -> merge -> discard -> accept -> apply', async () => {
-		await runWithFakedTimers<void>({}, async () => {
-			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
-			testObject.syncResult = { hasConflicts: false, hasError: false };
-			testObject.syncBarrier.open();
-			await testObject.sync(await client.getResourceManifest());
-
-			const expectedContent = (await client.instantiationService.get(IFileService).readFile(testObject.localResource)).value.toString();
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
-			preview = await testObject.merge(preview!.resourcePreviews[0].previewResource);
-			preview = await testObject.discard(preview!.resourcePreviews[0].previewResource);
-			preview = await testObject.accept(preview!.resourcePreviews[0].localResource);
-			preview = await testObject.apply(false);
-
-			assert.deepStrictEqual(testObject.status, SyncStatus.Idle);
-			assert.strictEqual(preview, null);
-			assertConflicts(testObject.conflicts.conflicts, []);
-			assert.strictEqual((await testObject.getRemoteUserData(null)).syncData?.content, expectedContent);
-			assert.strictEqual((await client.instantiationService.get(IFileService).readFile(testObject.localResource)).value.toString(), expectedContent);
-		});
-	});
-
-	test('preivew -> accept -> discard -> accept -> apply', async () => {
+	test('preivew -> discard -> accept -> apply', async () => {
 		await runWithFakedTimers<void>({}, async () => {
 			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
 			testObject.syncResult = { hasConflicts: false, hasError: false };
@@ -795,8 +680,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 			await testObject.sync(await client.getResourceManifest());
 
 			const expectedContent = (await client.instantiationService.get(IFileService).readFile(testObject.localResource)).value.toString();
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
-			preview = await testObject.merge(preview!.resourcePreviews[0].previewResource);
+			let preview = await testObject.sync(await client.getResourceManifest(), true);
 			preview = await testObject.accept(preview!.resourcePreviews[0].remoteResource);
 			preview = await testObject.discard(preview!.resourcePreviews[0].previewResource);
 			preview = await testObject.accept(preview!.resourcePreviews[0].localResource);
@@ -810,53 +694,13 @@ suite('TestSynchronizer - Manual Sync', () => {
 		});
 	});
 
-	test('preivew -> accept -> discard -> merge -> apply', async () => {
-		await runWithFakedTimers<void>({}, async () => {
-			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
-			testObject.syncResult = { hasConflicts: false, hasError: false };
-			testObject.syncBarrier.open();
-			await testObject.sync(await client.getResourceManifest());
-
-			const manifest = await client.getResourceManifest();
-			const expectedContent = manifest![testObject.resource];
-			let preview = await testObject.preview(manifest, {});
-			preview = await testObject.merge(preview!.resourcePreviews[0].previewResource);
-			preview = await testObject.accept(preview!.resourcePreviews[0].remoteResource);
-			preview = await testObject.discard(preview!.resourcePreviews[0].previewResource);
-			preview = await testObject.merge(preview!.resourcePreviews[0].localResource);
-			preview = await testObject.apply(false);
-
-			assert.deepStrictEqual(testObject.status, SyncStatus.Idle);
-			assert.strictEqual(preview, null);
-			assertConflicts(testObject.conflicts.conflicts, []);
-
-			assert.strictEqual((await testObject.getRemoteUserData(null)).syncData?.content, expectedContent);
-			assert.strictEqual((await client.instantiationService.get(IFileService).readFile(testObject.localResource)).value.toString(), expectedContent);
-		});
-	});
-
 	test('conflicts: preview', async () => {
 		await runWithFakedTimers<void>({}, async () => {
 			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
 			testObject.syncResult = { hasConflicts: true, hasError: false };
 			testObject.syncBarrier.open();
 
-			const preview = await testObject.preview(await client.getResourceManifest(), {});
-
-			assert.deepStrictEqual(testObject.status, SyncStatus.Syncing);
-			assertPreviews(preview!.resourcePreviews, [testObject.localResource]);
-			assertConflicts(testObject.conflicts.conflicts, []);
-		});
-	});
-
-	test('conflicts: preview -> merge', async () => {
-		await runWithFakedTimers<void>({}, async () => {
-			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
-			testObject.syncResult = { hasConflicts: true, hasError: false };
-			testObject.syncBarrier.open();
-
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
-			preview = await testObject.merge(preview!.resourcePreviews[0].previewResource);
+			const preview = await testObject.sync(await client.getResourceManifest(), true);
 
 			assert.deepStrictEqual(testObject.status, SyncStatus.HasConflicts);
 			assertPreviews(preview!.resourcePreviews, [testObject.localResource]);
@@ -865,14 +709,13 @@ suite('TestSynchronizer - Manual Sync', () => {
 		});
 	});
 
-	test('conflicts: preview -> merge -> discard', async () => {
+	test('conflicts: preview -> discard', async () => {
 		await runWithFakedTimers<void>({}, async () => {
 			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
 			testObject.syncResult = { hasConflicts: true, hasError: false };
 			testObject.syncBarrier.open();
 
-			const preview = await testObject.preview(await client.getResourceManifest(), {});
-			await testObject.merge(preview!.resourcePreviews[0].previewResource);
+			const preview = await testObject.sync(await client.getResourceManifest(), true);
 			await testObject.discard(preview!.resourcePreviews[0].previewResource);
 
 			assert.deepStrictEqual(testObject.status, SyncStatus.Syncing);
@@ -888,8 +731,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 			testObject.syncResult = { hasConflicts: true, hasError: false };
 			testObject.syncBarrier.open();
 
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
-			await testObject.merge(preview!.resourcePreviews[0].previewResource);
+			let preview = await testObject.sync(await client.getResourceManifest(), true);
 			const content = await testObject.resolveContent(preview!.resourcePreviews[0].previewResource);
 			preview = await testObject.accept(preview!.resourcePreviews[0].previewResource, content);
 
@@ -899,38 +741,13 @@ suite('TestSynchronizer - Manual Sync', () => {
 		});
 	});
 
-	test('conflicts: preview -> merge -> accept -> apply', async () => {
-		await runWithFakedTimers<void>({}, async () => {
-			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
-			testObject.syncResult = { hasConflicts: false, hasError: false };
-			testObject.syncBarrier.open();
-			await testObject.sync(await client.getResourceManifest());
-
-			testObject.syncResult = { hasConflicts: true, hasError: false };
-			const manifest = await client.getResourceManifest();
-			const expectedContent = manifest![testObject.resource];
-			let preview = await testObject.preview(manifest, {});
-
-			await testObject.merge(preview!.resourcePreviews[0].previewResource);
-			preview = await testObject.accept(preview!.resourcePreviews[0].previewResource);
-			preview = await testObject.apply(false);
-
-			assert.deepStrictEqual(testObject.status, SyncStatus.Idle);
-			assert.strictEqual(preview, null);
-			assertConflicts(testObject.conflicts.conflicts, []);
-
-			assert.strictEqual((await testObject.getRemoteUserData(null)).syncData?.content, expectedContent);
-			assert.strictEqual((await client.instantiationService.get(IFileService).readFile(testObject.localResource)).value.toString(), expectedContent);
-		});
-	});
-
 	test('conflicts: preview -> accept 2', async () => {
 		await runWithFakedTimers<void>({}, async () => {
 			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
 			testObject.syncResult = { hasConflicts: true, hasError: false };
 			testObject.syncBarrier.open();
 
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
+			let preview = await testObject.sync(await client.getResourceManifest(), true);
 			const content = await testObject.resolveContent(preview!.resourcePreviews[0].previewResource);
 			preview = await testObject.accept(preview!.resourcePreviews[0].previewResource, content);
 
@@ -950,7 +767,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 			testObject.syncResult = { hasConflicts: true, hasError: false };
 			const manifest = await client.getResourceManifest();
 			const expectedContent = manifest![testObject.resource];
-			let preview = await testObject.preview(manifest, {});
+			let preview = await testObject.sync(manifest, true);
 
 			preview = await testObject.accept(preview!.resourcePreviews[0].previewResource);
 			preview = await testObject.apply(false);
@@ -964,14 +781,13 @@ suite('TestSynchronizer - Manual Sync', () => {
 		});
 	});
 
-	test('conflicts: preivew -> merge -> discard', async () => {
+	test('conflicts: preivew -> discard', async () => {
 		await runWithFakedTimers<void>({}, async () => {
 			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
 			testObject.syncResult = { hasConflicts: true, hasError: false };
 			testObject.syncBarrier.open();
 
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
-			preview = await testObject.merge(preview!.resourcePreviews[0].previewResource);
+			let preview = await testObject.sync(await client.getResourceManifest(), true);
 			preview = await testObject.discard(preview!.resourcePreviews[0].previewResource);
 
 			assert.deepStrictEqual(testObject.status, SyncStatus.Syncing);
@@ -981,14 +797,13 @@ suite('TestSynchronizer - Manual Sync', () => {
 		});
 	});
 
-	test('conflicts: preivew -> merge -> discard -> accept', async () => {
+	test('conflicts: preivew -> discard -> accept', async () => {
 		await runWithFakedTimers<void>({}, async () => {
 			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
 			testObject.syncResult = { hasConflicts: true, hasError: false };
 			testObject.syncBarrier.open();
 
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
-			preview = await testObject.merge(preview!.resourcePreviews[0].previewResource);
+			let preview = await testObject.sync(await client.getResourceManifest(), true);
 			preview = await testObject.discard(preview!.resourcePreviews[0].previewResource);
 			preview = await testObject.accept(preview!.resourcePreviews[0].remoteResource);
 
@@ -999,30 +814,13 @@ suite('TestSynchronizer - Manual Sync', () => {
 		});
 	});
 
-	test('conflicts: preivew -> accept -> discard', async () => {
-		await runWithFakedTimers<void>({}, async () => {
-			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
-			testObject.syncResult = { hasConflicts: true, hasError: false };
-			testObject.syncBarrier.open();
-
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
-			preview = await testObject.accept(preview!.resourcePreviews[0].previewResource);
-			preview = await testObject.discard(preview!.resourcePreviews[0].previewResource);
-
-			assert.deepStrictEqual(testObject.status, SyncStatus.Syncing);
-			assertPreviews(preview!.resourcePreviews, [testObject.localResource]);
-			assert.strictEqual(preview!.resourcePreviews[0].mergeState, MergeState.Preview);
-			assertConflicts(testObject.conflicts.conflicts, []);
-		});
-	});
-
 	test('conflicts: preivew -> accept -> discard -> accept', async () => {
 		await runWithFakedTimers<void>({}, async () => {
 			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
 			testObject.syncResult = { hasConflicts: true, hasError: false };
 			testObject.syncBarrier.open();
 
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
+			let preview = await testObject.sync(await client.getResourceManifest(), true);
 			preview = await testObject.accept(preview!.resourcePreviews[0].previewResource);
 			preview = await testObject.discard(preview!.resourcePreviews[0].previewResource);
 			preview = await testObject.accept(preview!.resourcePreviews[0].remoteResource);
@@ -1034,50 +832,13 @@ suite('TestSynchronizer - Manual Sync', () => {
 		});
 	});
 
-	test('conflicts: preivew -> accept -> discard -> merge', async () => {
-		await runWithFakedTimers<void>({}, async () => {
-			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
-			testObject.syncResult = { hasConflicts: true, hasError: false };
-			testObject.syncBarrier.open();
-
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
-			preview = await testObject.accept(preview!.resourcePreviews[0].previewResource);
-			preview = await testObject.discard(preview!.resourcePreviews[0].previewResource);
-			preview = await testObject.merge(preview!.resourcePreviews[0].remoteResource);
-
-			assert.deepStrictEqual(testObject.status, SyncStatus.HasConflicts);
-			assertPreviews(preview!.resourcePreviews, [testObject.localResource]);
-			assert.strictEqual(preview!.resourcePreviews[0].mergeState, MergeState.Conflict);
-			assertConflicts(testObject.conflicts.conflicts, [preview!.resourcePreviews[0].localResource]);
-		});
-	});
-
-	test('conflicts: preivew -> merge -> discard -> merge', async () => {
-		await runWithFakedTimers<void>({}, async () => {
-			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
-			testObject.syncResult = { hasConflicts: true, hasError: false };
-			testObject.syncBarrier.open();
-
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
-			preview = await testObject.merge(preview!.resourcePreviews[0].previewResource);
-			preview = await testObject.discard(preview!.resourcePreviews[0].previewResource);
-			preview = await testObject.merge(preview!.resourcePreviews[0].remoteResource);
-
-			assert.deepStrictEqual(testObject.status, SyncStatus.HasConflicts);
-			assertPreviews(preview!.resourcePreviews, [testObject.localResource]);
-			assert.strictEqual(preview!.resourcePreviews[0].mergeState, MergeState.Conflict);
-			assertConflicts(testObject.conflicts.conflicts, [preview!.resourcePreviews[0].localResource]);
-		});
-	});
-
-	test('conflicts: preivew -> merge -> accept -> discard', async () => {
+	test('conflicts: preivew -> accept -> discard', async () => {
 		await runWithFakedTimers<void>({}, async () => {
 			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
 			testObject.syncResult = { hasConflicts: false, hasError: false };
 			testObject.syncBarrier.open();
 
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
-			preview = await testObject.merge(preview!.resourcePreviews[0].previewResource);
+			let preview = await testObject.sync(await client.getResourceManifest(), true);
 			preview = await testObject.accept(preview!.resourcePreviews[0].remoteResource);
 			preview = await testObject.discard(preview!.resourcePreviews[0].previewResource);
 
@@ -1088,7 +849,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 		});
 	});
 
-	test('conflicts: preivew -> merge -> discard -> accept -> apply', async () => {
+	test('conflicts: preivew -> discard -> accept -> apply', async () => {
 		await runWithFakedTimers<void>({}, async () => {
 			const testObject: TestSynchroniser = disposableStore.add(client.instantiationService.createInstance(TestSynchroniser, { syncResource: SyncResource.Settings, profile: client.instantiationService.get(IUserDataProfilesService).defaultProfile }, undefined));
 			testObject.syncResult = { hasConflicts: false, hasError: false };
@@ -1096,8 +857,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 			await testObject.sync(await client.getResourceManifest());
 
 			const expectedContent = (await client.instantiationService.get(IFileService).readFile(testObject.localResource)).value.toString();
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
-			preview = await testObject.merge(preview!.resourcePreviews[0].previewResource);
+			let preview = await testObject.sync(await client.getResourceManifest(), true);
 			preview = await testObject.discard(preview!.resourcePreviews[0].previewResource);
 			preview = await testObject.accept(preview!.resourcePreviews[0].localResource);
 			preview = await testObject.apply(false);
@@ -1118,8 +878,7 @@ suite('TestSynchronizer - Manual Sync', () => {
 			await testObject.sync(await client.getResourceManifest());
 
 			const expectedContent = (await client.instantiationService.get(IFileService).readFile(testObject.localResource)).value.toString();
-			let preview = await testObject.preview(await client.getResourceManifest(), {});
-			preview = await testObject.merge(preview!.resourcePreviews[0].previewResource);
+			let preview = await testObject.sync(await client.getResourceManifest(), true);
 			preview = await testObject.accept(preview!.resourcePreviews[0].remoteResource);
 			preview = await testObject.discard(preview!.resourcePreviews[0].previewResource);
 			preview = await testObject.accept(preview!.resourcePreviews[0].localResource);
diff --git a/src/vs/platform/userDataSync/test/common/tasksSync.test.ts b/src/vs/platform/userDataSync/test/common/tasksSync.test.ts
index 26fa39aeeb2..e875a66455d 100644
--- a/src/vs/platform/userDataSync/test/common/tasksSync.test.ts
+++ b/src/vs/platform/userDataSync/test/common/tasksSync.test.ts
@@ -540,7 +540,7 @@ suite('TasksSync', () => {
 				await fileService.del(tasksResource);
 			}
 
-			const preview = (await testObject.preview(await client.getResourceManifest(), {}))!;
+			const preview = (await testObject.sync(await client.getResourceManifest(), true))!;
 
 			server.reset();
 			const content = await testObject.resolveContent(preview.resourcePreviews[0].remoteResource);
diff --git a/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts b/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts
index d8ed8a95c5f..cb2e6e81555 100644
--- a/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts
+++ b/src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts
@@ -21,7 +21,7 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { IProgress, IProgressService, IProgressStep, ProgressLocation } from '../../../../platform/progress/common/progress.js';
 import { EditSessionsWorkbenchService } from './editSessionsStorageService.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
-import { UserDataSyncErrorCode, UserDataSyncStoreError, IUserDataSynchroniser } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { UserDataSyncErrorCode, UserDataSyncStoreError } from '../../../../platform/userDataSync/common/userDataSync.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
 import { getFileNamesMessage, IDialogService, IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
@@ -124,7 +124,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 
 	private registeredCommands = new Set<string>();
 
-	private workspaceStateSynchronizer: IUserDataSynchroniser | undefined;
+	private workspaceStateSynchronizer: WorkspaceStateSynchroniser | undefined;
 	private editSessionsStorageClient: EditSessionsStoreClient | undefined;
 
 	constructor(
@@ -565,7 +565,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 				}
 			}
 
-			await this.workspaceStateSynchronizer?.apply(false, {});
+			await this.workspaceStateSynchronizer?.apply();
 
 			this.logService.info(`Deleting edit session with ref ${ref} after successfully applying it to current workspace...`);
 			await this.editSessionsStorageService.delete('editSessions', ref);
@@ -743,7 +743,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
 		}
 
 		// Store contributed workspace state
-		await this.workspaceStateSynchronizer?.sync(null, {});
+		await this.workspaceStateSynchronizer?.sync();
 
 		if (!hasEdits) {
 			this.logService.info('Skipped storing working changes in the cloud as there are no edits to store.');
diff --git a/src/vs/workbench/contrib/editSessions/common/workspaceStateSync.ts b/src/vs/workbench/contrib/editSessions/common/workspaceStateSync.ts
index dd6f6145901..0068c223d2b 100644
--- a/src/vs/workbench/contrib/editSessions/common/workspaceStateSync.ts
+++ b/src/vs/workbench/contrib/editSessions/common/workspaceStateSync.ts
@@ -16,7 +16,7 @@ import { ITelemetryService } from '../../../../platform/telemetry/common/telemet
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { IUserDataProfile } from '../../../../platform/userDataProfile/common/userDataProfile.js';
 import { AbstractSynchroniser, IAcceptResult, IMergeResult, IResourcePreview, ISyncResourcePreview } from '../../../../platform/userDataSync/common/abstractSynchronizer.js';
-import { IRemoteUserData, IResourceRefHandle, IUserDataSyncLocalStoreService, IUserDataSyncConfiguration, IUserDataSyncEnablementService, IUserDataSyncLogService, IUserDataSyncStoreService, IUserDataSynchroniser, IWorkspaceState, SyncResource } from '../../../../platform/userDataSync/common/userDataSync.js';
+import { IRemoteUserData, IResourceRefHandle, IUserDataSyncLocalStoreService, IUserDataSyncConfiguration, IUserDataSyncEnablementService, IUserDataSyncLogService, IUserDataSyncStoreService, IUserDataSynchroniser, IWorkspaceState, SyncResource, IUserDataSyncResourcePreview } from '../../../../platform/userDataSync/common/userDataSync.js';
 import { EditSession, IEditSessionsStorageService } from './editSessions.js';
 import { IWorkspaceIdentityService } from '../../../services/workspaces/common/workspaceIdentityService.js';
 
@@ -75,11 +75,11 @@ export class WorkspaceStateSynchroniser extends AbstractSynchroniser implements
 		super({ syncResource: SyncResource.WorkspaceState, profile }, collection, fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService, uriIdentityService);
 	}
 
-	override async sync(): Promise<void> {
+	override async sync(): Promise<IUserDataSyncResourcePreview | null> {
 		const cancellationTokenSource = new CancellationTokenSource();
 		const folders = await this.workspaceIdentityService.getWorkspaceStateFolders(cancellationTokenSource.token);
 		if (!folders.length) {
-			return;
+			return null;
 		}
 
 		// Ensure we have latest state by sending out onWillSaveState event
@@ -87,7 +87,7 @@ export class WorkspaceStateSynchroniser extends AbstractSynchroniser implements
 
 		const keys = this.storageService.keys(StorageScope.WORKSPACE, StorageTarget.USER);
 		if (!keys.length) {
-			return;
+			return null;
 		}
 
 		const contributedData: IStringDictionary<string> = {};
@@ -100,6 +100,7 @@ export class WorkspaceStateSynchroniser extends AbstractSynchroniser implements
 
 		const content: IWorkspaceState = { folders, storage: contributedData, version: this.version };
 		await this.editSessionsStorageService.write('workspaceState', stringify(content));
+		return null;
 	}
 
 	override async apply(): Promise<ISyncResourcePreview | null> {

From 3a4f4164c7ec15e5607c47c7666c4bde99a21958 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Wed, 18 Dec 2024 15:49:37 +0100
Subject: [PATCH 355/479] Git - fix context key for unstageSelectedRanges
 (#236476)

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

diff --git a/extensions/git/package.json b/extensions/git/package.json
index 08349fd4783..d63027619d1 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -1054,7 +1054,7 @@
         },
         {
           "command": "git.unstageSelectedRanges",
-          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && isInDiffEditor && isInDiffRightEditor && resourceScheme == git"
+          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && resourceScheme == git"
         },
         {
           "command": "git.clean",

From a02cb4218adce96301f7561d7ce585cdeb84598f Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Wed, 18 Dec 2024 09:10:16 -0600
Subject: [PATCH 356/479] add `when` for terminal chat keybinding (#236480)

fix #236474
---
 .../terminalContrib/chat/browser/terminalChatActions.ts        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts
index deeb48f48c7..0d6fdd35361 100644
--- a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts
+++ b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts
@@ -224,7 +224,8 @@ registerActiveXtermAction({
 	),
 	keybinding: {
 		weight: KeybindingWeight.WorkbenchContrib,
-		primary: KeyMod.CtrlCmd | KeyCode.KeyR
+		primary: KeyMod.CtrlCmd | KeyCode.KeyR,
+		when: TerminalChatContextKeys.focused
 	},
 	menu: {
 		id: MENU_TERMINAL_CHAT_WIDGET_STATUS,

From cec5112d1172e69cee13d729f5bc21ceaad36519 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Wed, 18 Dec 2024 16:40:44 +0100
Subject: [PATCH 357/479] Fixes
 https://github.com/microsoft/vscode-copilot/issues/9818 (#236486)

---
 .../browser/controller/inlineCompletionsController.ts     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
index f3720436c2f..7c7e4495719 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
@@ -181,14 +181,16 @@ export class InlineCompletionsController extends Disposable {
 				return;
 			}
 
-			if (this.model.get()?.inlineEditAvailable.get()) {
-				// dont hide inline edits on blur
+			const model = this.model.get();
+			if (!model) { return; }
+			if (model.state.get()?.inlineCompletion?.request.isExplicitRequest && model.inlineEditAvailable.get()) {
+				// dont hide inline edits on blur when requested explicitly
 				return;
 			}
 
 			transaction(tx => {
 				/** @description InlineCompletionsController.onDidBlurEditorWidget */
-				this.model.get()?.stop('automatic', tx);
+				model.stop('automatic', tx);
 			});
 		}));
 

From 929ce7c1fa6bd6acccf703b5b1c491659b63ef11 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 18 Dec 2024 16:45:47 +0100
Subject: [PATCH 358/479] fixes a random bunch of leaking disposables (#236487)

Adds (disabled for now) disposable tracker that is based on the finalization registry, gist is that every GC'ed disposable that isn't disposed is a bug.
---
 .../ui/breadcrumbs/breadcrumbsWidget.ts       |  1 +
 src/vs/base/common/async.ts                   |  2 +-
 src/vs/base/common/lifecycle.ts               | 28 +++++++++++++++++++
 .../services/hoverService/hoverService.ts     |  2 +-
 .../codeAction/browser/codeActionModel.ts     |  1 +
 .../chat/browser/actions/chatActions.ts       |  4 +--
 .../debug/common/debugContentProvider.ts      |  9 ++++--
 .../browser/performance.contribution.ts       | 25 ++++++++++++++++-
 .../browser/searchTreeModel/fileMatch.ts      | 12 ++++----
 .../common/notificationService.ts             |  2 +-
 .../progress/browser/progressService.ts       |  5 +++-
 11 files changed, 75 insertions(+), 16 deletions(-)

diff --git a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts
index b87e883bd3a..a4cb3361f9d 100644
--- a/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts
+++ b/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts
@@ -282,6 +282,7 @@ export class BreadcrumbsWidget {
 			removed = this._items.splice(prefix, this._items.length - prefix, ...items.slice(prefix));
 			this._render(prefix);
 			dispose(removed);
+			dispose(items.slice(0, prefix));
 			this._focus(-1, undefined);
 		} catch (e) {
 			const newError = new Error(`BreadcrumbsItem#setItems: newItems: ${items.length}, prefix: ${prefix}, removed: ${removed.length}`);
diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts
index bd76ba77e4a..84feeb77704 100644
--- a/src/vs/base/common/async.ts
+++ b/src/vs/base/common/async.ts
@@ -557,7 +557,7 @@ export function disposableTimeout(handler: () => void, timeout = 0, store?: Disp
 	}, timeout);
 	const disposable = toDisposable(() => {
 		clearTimeout(timer);
-		store?.deleteAndLeak(disposable);
+		store?.delete(disposable);
 	});
 	store?.add(disposable);
 	return disposable;
diff --git a/src/vs/base/common/lifecycle.ts b/src/vs/base/common/lifecycle.ts
index 4cc2d172bf4..e04e62f76d3 100644
--- a/src/vs/base/common/lifecycle.ts
+++ b/src/vs/base/common/lifecycle.ts
@@ -44,6 +44,34 @@ export interface IDisposableTracker {
 	markAsSingleton(disposable: IDisposable): void;
 }
 
+export class GCBasedDisposableTracker implements IDisposableTracker {
+
+	private readonly _registry = new FinalizationRegistry<string>(heldValue => {
+		console.warn(`[LEAKED DISPOSABLE] ${heldValue}`);
+	});
+
+	trackDisposable(disposable: IDisposable): void {
+		const stack = new Error('CREATED via:').stack!;
+		this._registry.register(disposable, stack, disposable);
+	}
+
+	setParent(child: IDisposable, parent: IDisposable | null): void {
+		if (parent) {
+			this._registry.unregister(child);
+		} else {
+			this.trackDisposable(child);
+		}
+	}
+
+	markAsDisposed(disposable: IDisposable): void {
+		this._registry.unregister(disposable);
+	}
+
+	markAsSingleton(disposable: IDisposable): void {
+		this._registry.unregister(disposable);
+	}
+}
+
 export interface DisposableInfo {
 	value: IDisposable;
 	source: string | null;
diff --git a/src/vs/editor/browser/services/hoverService/hoverService.ts b/src/vs/editor/browser/services/hoverService/hoverService.ts
index b4164c04d1d..873ece14a4f 100644
--- a/src/vs/editor/browser/services/hoverService/hoverService.ts
+++ b/src/vs/editor/browser/services/hoverService/hoverService.ts
@@ -51,7 +51,7 @@ export class HoverService extends Disposable implements IHoverService {
 	) {
 		super();
 
-		contextMenuService.onDidShowContextMenu(() => this.hideHover());
+		this._register(contextMenuService.onDidShowContextMenu(() => this.hideHover()));
 		this._contextViewHandler = this._register(new ContextViewHandler(this._layoutService));
 	}
 
diff --git a/src/vs/editor/contrib/codeAction/browser/codeActionModel.ts b/src/vs/editor/contrib/codeAction/browser/codeActionModel.ts
index a909d559ed8..10381ff4ffc 100644
--- a/src/vs/editor/contrib/codeAction/browser/codeActionModel.ts
+++ b/src/vs/editor/contrib/codeAction/browser/codeActionModel.ts
@@ -235,6 +235,7 @@ export class CodeActionModel extends Disposable {
 						const codeActionSet = await getCodeActions(this._registry, model, trigger.selection, trigger.trigger, Progress.None, token);
 						const allCodeActions = [...codeActionSet.allActions];
 						if (token.isCancellationRequested) {
+							codeActionSet.dispose();
 							return emptyCodeActionSet;
 						}
 
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index 4cb15f40d68..a0bb888eb80 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -561,7 +561,7 @@ export class ChatCommandCenterRendering extends Disposable implements IWorkbench
 
 		const contextKeySet = new Set([ChatContextKeys.Setup.signedOut.key]);
 
-		actionViewItemService.register(MenuId.CommandCenter, MenuId.ChatCommandCenter, (action, options) => {
+		this._store.add(actionViewItemService.register(MenuId.CommandCenter, MenuId.ChatCommandCenter, (action, options) => {
 			if (!(action instanceof SubmenuItemAction)) {
 				return undefined;
 			}
@@ -607,6 +607,6 @@ export class ChatCommandCenterRendering extends Disposable implements IWorkbench
 			agentService.onDidChangeAgents,
 			chatQuotasService.onDidChangeQuotas,
 			Event.filter(contextKeyService.onDidChangeContext, e => e.affectsSome(contextKeySet))
-		));
+		)));
 	}
 }
diff --git a/src/vs/workbench/contrib/debug/common/debugContentProvider.ts b/src/vs/workbench/contrib/debug/common/debugContentProvider.ts
index 935d2c3db2d..5ad05e1cb7d 100644
--- a/src/vs/workbench/contrib/debug/common/debugContentProvider.ts
+++ b/src/vs/workbench/contrib/debug/common/debugContentProvider.ts
@@ -19,6 +19,7 @@ import { Range } from '../../../../editor/common/core/range.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
 import { ErrorNoTelemetry } from '../../../../base/common/errors.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 
 /**
  * Debug URI format
@@ -33,7 +34,7 @@ import { ErrorNoTelemetry } from '../../../../base/common/errors.js';
  * the arbitrary_path and the session id are encoded with 'encodeURIComponent'
  *
  */
-export class DebugContentProvider implements IWorkbenchContribution, ITextModelContentProvider {
+export class DebugContentProvider extends Disposable implements IWorkbenchContribution, ITextModelContentProvider {
 
 	private static INSTANCE: DebugContentProvider;
 
@@ -46,12 +47,14 @@ export class DebugContentProvider implements IWorkbenchContribution, ITextModelC
 		@ILanguageService private readonly languageService: ILanguageService,
 		@IEditorWorkerService private readonly editorWorkerService: IEditorWorkerService
 	) {
-		textModelResolverService.registerTextModelContentProvider(DEBUG_SCHEME, this);
+		super();
+		this._store.add(textModelResolverService.registerTextModelContentProvider(DEBUG_SCHEME, this));
 		DebugContentProvider.INSTANCE = this;
 	}
 
-	dispose(): void {
+	override dispose(): void {
 		this.pendingUpdates.forEach(cancellationSource => cancellationSource.dispose());
+		super.dispose();
 	}
 
 	provideTextContent(resource: uri): Promise<ITextModel> | null {
diff --git a/src/vs/workbench/contrib/performance/browser/performance.contribution.ts b/src/vs/workbench/contrib/performance/browser/performance.contribution.ts
index a4b1a39c3e4..bd69320c358 100644
--- a/src/vs/workbench/contrib/performance/browser/performance.contribution.ts
+++ b/src/vs/workbench/contrib/performance/browser/performance.contribution.ts
@@ -9,13 +9,15 @@ import { IInstantiationService, ServicesAccessor } from '../../../../platform/in
 import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
-import { Extensions, IWorkbenchContributionsRegistry, registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { Extensions, IWorkbenchContributionsRegistry, registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
 import { EditorExtensions, IEditorSerializer, IEditorFactoryRegistry } from '../../../common/editor.js';
 import { PerfviewContrib, PerfviewInput } from './perfviewEditor.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { InstantiationService, Trace } from '../../../../platform/instantiation/common/instantiationService.js';
 import { EventProfiling } from '../../../../base/common/event.js';
 import { InputLatencyContrib } from './inputLatencyContrib.js';
+import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { GCBasedDisposableTracker, setDisposableTracker } from '../../../../base/common/lifecycle.js';
 
 // -- startup performance view
 
@@ -136,3 +138,24 @@ Registry.as<IWorkbenchContributionsRegistry>(Extensions.Workbench).registerWorkb
 	InputLatencyContrib,
 	LifecyclePhase.Eventually
 );
+
+
+// -- track leaking disposables, those that get GC'ed before having been disposed
+
+// this is currently disabled because there is too many leaks and some false positives, e.g disposables from registers
+// like MenuRegistry, CommandsRegistery etc should be marked as singleton
+
+const _enableLeakDetection = false
+	// || Boolean("true") // done "weirdly" so that a lint warning prevents you from pushing this
+	;
+
+class DisposableTracking {
+	static readonly Id = 'perf.disposableTracking';
+	constructor(@IEnvironmentService envService: IEnvironmentService) {
+		if (!envService.isBuilt && _enableLeakDetection) {
+			setDisposableTracker(new GCBasedDisposableTracker());
+		}
+	}
+}
+
+registerWorkbenchContribution2(DisposableTracking.Id, DisposableTracking, WorkbenchPhase.Eventually);
diff --git a/src/vs/workbench/contrib/search/browser/searchTreeModel/fileMatch.ts b/src/vs/workbench/contrib/search/browser/searchTreeModel/fileMatch.ts
index 1b5d2fa717b..dfaf589263b 100644
--- a/src/vs/workbench/contrib/search/browser/searchTreeModel/fileMatch.ts
+++ b/src/vs/workbench/contrib/search/browser/searchTreeModel/fileMatch.ts
@@ -5,7 +5,7 @@
 
 import { RunOnceScheduler } from '../../../../../base/common/async.js';
 import { Lazy } from '../../../../../base/common/lazy.js';
-import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { themeColorFromId } from '../../../../../base/common/themables.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { TrackedRangeStickiness, MinimapPosition, ITextModel, FindMatch, IModelDeltaDecoration } from '../../../../../editor/common/model.js';
@@ -69,7 +69,7 @@ export class FileMatchImpl extends Disposable implements ISearchTreeFileMatch {
 	protected _resource: URI;
 	private _fileStat?: IFileStatWithPartialMetadata;
 	private _model: ITextModel | null = null;
-	private _modelListener: IDisposable | null = null;
+	private _modelListener: DisposableStore | null = null;
 	protected _textMatches: Map<string, ISearchTreeMatch>;
 
 	private _removedTextMatches: Set<string>;
@@ -132,10 +132,11 @@ export class FileMatchImpl extends Disposable implements ISearchTreeFileMatch {
 	}
 	bindModel(model: ITextModel): void {
 		this._model = model;
-		this._modelListener = this._model.onDidChangeContent(() => {
+		this._modelListener = new DisposableStore();
+		this._modelListener.add(this._model.onDidChangeContent(() => {
 			this._updateScheduler.schedule();
-		});
-		this._model.onWillDispose(() => this.onModelWillDispose());
+		}));
+		this._modelListener.add(this._model.onWillDispose(() => this.onModelWillDispose()));
 		this.updateHighlights();
 	}
 
@@ -360,4 +361,3 @@ export class FileMatchImpl extends Disposable implements ISearchTreeFileMatch {
 
 	//#endregion
 }
-
diff --git a/src/vs/workbench/services/notification/common/notificationService.ts b/src/vs/workbench/services/notification/common/notificationService.ts
index 151edfccf9f..f557bc098c1 100644
--- a/src/vs/workbench/services/notification/common/notificationService.ts
+++ b/src/vs/workbench/services/notification/common/notificationService.ts
@@ -272,7 +272,6 @@ export class NotificationService extends Disposable implements INotificationServ
 	}
 
 	prompt(severity: Severity, message: string, choices: IPromptChoice[], options?: IPromptOptions): INotificationHandle {
-		const toDispose = new DisposableStore();
 
 		// Handle neverShowAgain option accordingly
 		if (options?.neverShowAgain) {
@@ -300,6 +299,7 @@ export class NotificationService extends Disposable implements INotificationServ
 		}
 
 		let choiceClicked = false;
+		const toDispose = new DisposableStore();
 
 
 		// Convert choices into primary/secondary actions
diff --git a/src/vs/workbench/services/progress/browser/progressService.ts b/src/vs/workbench/services/progress/browser/progressService.ts
index 872300d3937..73b4c71daba 100644
--- a/src/vs/workbench/services/progress/browser/progressService.ts
+++ b/src/vs/workbench/services/progress/browser/progressService.ts
@@ -356,7 +356,10 @@ export class ProgressService extends Disposable implements IProgressService {
 			}
 
 			// Clear upon dispose
-			Event.once(notification.onDidClose)(() => notificationDisposables.dispose());
+			Event.once(notification.onDidClose)(() => {
+				notificationDisposables.dispose();
+				dispose(windowProgressDisposable);
+			});
 
 			return notification;
 		};

From 148a1ca4bd890aa4743327988070da0546180dd2 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Wed, 18 Dec 2024 17:41:28 +0100
Subject: [PATCH 359/479] TreeView: MaxCallStackError - Nesting (#236493)

Part of #233056
---
 src/vs/base/browser/ui/list/listView.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts
index e149029df4f..00a19352e91 100644
--- a/src/vs/base/browser/ui/list/listView.ts
+++ b/src/vs/base/browser/ui/list/listView.ts
@@ -9,7 +9,7 @@ import { DomEmitter } from '../../event.js';
 import { IMouseWheelEvent } from '../../mouseEvent.js';
 import { EventType as TouchEventType, Gesture, GestureEvent } from '../../touch.js';
 import { SmoothScrollableElement } from '../scrollbar/scrollableElement.js';
-import { distinct, equals } from '../../../common/arrays.js';
+import { distinct, equals, splice } from '../../../common/arrays.js';
 import { Delayer, disposableTimeout } from '../../../common/async.js';
 import { memoize } from '../../../common/decorators.js';
 import { Emitter, Event, IValueWithChangeEvent } from '../../../common/event.js';
@@ -643,7 +643,7 @@ export class ListView<T> implements IListView<T> {
 			this.items = inserted;
 		} else {
 			this.rangeMap.splice(start, deleteCount, inserted);
-			deleted = this.items.splice(start, deleteCount, ...inserted);
+			deleted = splice(this.items, start, deleteCount, inserted);
 		}
 
 		const delta = elements.length - deleteCount;

From 7d0efabd3b29e465be0c76c50ffedec391de3379 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Wed, 18 Dec 2024 17:47:19 +0100
Subject: [PATCH 360/479] Adds single observable logging (#236481)

* Adds single observable logging

* Improved observePosition

* Fixes CI

* Fixes tests
---
 src/vs/base/common/observableInternal/base.ts | 13 +++-
 .../base/common/observableInternal/derived.ts | 10 +++
 .../observableInternal/lazyObservableValue.ts |  7 +-
 .../base/common/observableInternal/logging.ts | 69 +++++++++++++++----
 src/vs/base/test/common/observable.test.ts    | 10 +--
 src/vs/editor/browser/observableCodeEditor.ts |  6 +-
 6 files changed, 89 insertions(+), 26 deletions(-)

diff --git a/src/vs/base/common/observableInternal/base.ts b/src/vs/base/common/observableInternal/base.ts
index 3ce43ead2ae..c28e773b268 100644
--- a/src/vs/base/common/observableInternal/base.ts
+++ b/src/vs/base/common/observableInternal/base.ts
@@ -6,7 +6,7 @@
 import { DebugNameData, DebugOwner, getFunctionName } from './debugName.js';
 import { DisposableStore, EqualityComparer, IDisposable, strictEquals } from './commonFacade/deps.js';
 import type { derivedOpts } from './derived.js';
-import { getLogger } from './logging.js';
+import { getLogger, logObservable } from './logging.js';
 import { keepObserved, recomputeInitiallyAndOnChange } from './utils.js';
 
 /**
@@ -67,6 +67,12 @@ export interface IObservable<T, TChange = unknown> {
 
 	flatten<TNew>(this: IObservable<IObservable<TNew>>): IObservable<TNew>;
 
+	/**
+	 * ONLY FOR DEBUGGING!
+	 * Logs computations of this derived.
+	*/
+	log(): IObservable<T, TChange>;
+
 	/**
 	 * Makes sure this value is computed eagerly.
 	 */
@@ -233,6 +239,11 @@ export abstract class ConvenientObservable<T, TChange> implements IObservable<T,
 		);
 	}
 
+	public log(): IObservable<T, TChange> {
+		logObservable(this);
+		return this;
+	}
+
 	/**
 	 * @sealed
 	 * Converts an observable of an observable value into a direct observable of the value.
diff --git a/src/vs/base/common/observableInternal/derived.ts b/src/vs/base/common/observableInternal/derived.ts
index 80cc9a72124..ba018041799 100644
--- a/src/vs/base/common/observableInternal/derived.ts
+++ b/src/vs/base/common/observableInternal/derived.ts
@@ -459,6 +459,16 @@ export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> im
 		}
 		super.removeObserver(observer);
 	}
+
+	public override log(): IObservable<T, void> {
+		if (!getLogger()) {
+			super.log();
+			getLogger()?.handleDerivedCreated(this);
+		} else {
+			super.log();
+		}
+		return this;
+	}
 }
 
 
diff --git a/src/vs/base/common/observableInternal/lazyObservableValue.ts b/src/vs/base/common/observableInternal/lazyObservableValue.ts
index 8a3f63c05d7..6c0f85aa876 100644
--- a/src/vs/base/common/observableInternal/lazyObservableValue.ts
+++ b/src/vs/base/common/observableInternal/lazyObservableValue.ts
@@ -6,6 +6,7 @@
 import { EqualityComparer } from './commonFacade/deps.js';
 import { BaseObservable, IObserver, ISettableObservable, ITransaction, TransactionImpl } from './base.js';
 import { DebugNameData } from './debugName.js';
+import { getLogger } from './logging.js';
 
 /**
  * Holds off updating observers until the value is actually read.
@@ -42,13 +43,15 @@ export class LazyObservableValue<T, TChange = void>
 		this._isUpToDate = true;
 
 		if (this._deltas.length > 0) {
-			for (const observer of this.observers) {
-				for (const change of this._deltas) {
+			for (const change of this._deltas) {
+				getLogger()?.handleObservableChanged(this, { change, didChange: true, oldValue: '(unknown)', newValue: this._value, hadValue: true });
+				for (const observer of this.observers) {
 					observer.handleChange(this, change);
 				}
 			}
 			this._deltas.length = 0;
 		} else {
+			getLogger()?.handleObservableChanged(this, { change: undefined, didChange: true, oldValue: '(unknown)', newValue: this._value, hadValue: true });
 			for (const observer of this.observers) {
 				observer.handleChange(this, undefined);
 			}
diff --git a/src/vs/base/common/observableInternal/logging.ts b/src/vs/base/common/observableInternal/logging.ts
index 0de37a858cb..0c343b548e4 100644
--- a/src/vs/base/common/observableInternal/logging.ts
+++ b/src/vs/base/common/observableInternal/logging.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { AutorunObserver } from './autorun.js';
-import { IObservable, ObservableValue, TransactionImpl } from './base.js';
+import { IObservable, TransactionImpl } from './base.js';
 import { Derived } from './derived.js';
 import { FromEventObservable } from './utils.js';
 
@@ -18,6 +18,18 @@ export function getLogger(): IObservableLogger | undefined {
 	return globalObservableLogger;
 }
 
+export function logObservable(obs: IObservable<any>): void {
+	if (!globalObservableLogger) {
+		const l = new ConsoleObservableLogger();
+		l.addFilteredObj(obs);
+		setLogger(l);
+	} else {
+		if (globalObservableLogger instanceof ConsoleObservableLogger) {
+			(globalObservableLogger as ConsoleObservableLogger).addFilteredObj(obs);
+		}
+	}
+}
+
 interface IChangeInformation {
 	oldValue: unknown;
 	newValue: unknown;
@@ -27,7 +39,7 @@ interface IChangeInformation {
 }
 
 export interface IObservableLogger {
-	handleObservableChanged(observable: ObservableValue<any, any>, info: IChangeInformation): void;
+	handleObservableChanged(observable: IObservable<any, any>, info: IChangeInformation): void;
 	handleFromEventObservableTriggered(observable: FromEventObservable<any, any>, info: IChangeInformation): void;
 
 	handleAutorunCreated(autorun: AutorunObserver): void;
@@ -44,6 +56,19 @@ export interface IObservableLogger {
 export class ConsoleObservableLogger implements IObservableLogger {
 	private indentation = 0;
 
+	private _filteredObjects: Set<unknown> | undefined;
+
+	public addFilteredObj(obj: unknown): void {
+		if (!this._filteredObjects) {
+			this._filteredObjects = new Set();
+		}
+		this._filteredObjects.add(obj);
+	}
+
+	private _isIncluded(obj: unknown): boolean {
+		return this._filteredObjects?.has(obj) ?? true;
+	}
+
 	private textToConsoleArgs(text: ConsoleText): unknown[] {
 		return consoleTextToArgs([
 			normalText(repeat('|  ', this.indentation)),
@@ -77,6 +102,7 @@ export class ConsoleObservableLogger implements IObservableLogger {
 	}
 
 	handleObservableChanged(observable: IObservable<unknown, unknown>, info: IChangeInformation): void {
+		if (!this._isIncluded(observable)) { return; }
 		console.log(...this.textToConsoleArgs([
 			formatKind('observable value changed'),
 			styled(observable.debugName, { color: 'BlueViolet' }),
@@ -130,7 +156,10 @@ export class ConsoleObservableLogger implements IObservableLogger {
 	}
 
 	handleDerivedRecomputed(derived: Derived<unknown>, info: IChangeInformation): void {
-		const changedObservables = this.changedObservablesSets.get(derived)!;
+		if (!this._isIncluded(derived)) { return; }
+
+		const changedObservables = this.changedObservablesSets.get(derived);
+		if (!changedObservables) { return; }
 		console.log(...this.textToConsoleArgs([
 			formatKind('derived recomputed'),
 			styled(derived.debugName, { color: 'BlueViolet' }),
@@ -142,6 +171,8 @@ export class ConsoleObservableLogger implements IObservableLogger {
 	}
 
 	handleFromEventObservableTriggered(observable: FromEventObservable<any, any>, info: IChangeInformation): void {
+		if (!this._isIncluded(observable)) { return; }
+
 		console.log(...this.textToConsoleArgs([
 			formatKind('observable from event triggered'),
 			styled(observable.debugName, { color: 'BlueViolet' }),
@@ -151,6 +182,8 @@ export class ConsoleObservableLogger implements IObservableLogger {
 	}
 
 	handleAutorunCreated(autorun: AutorunObserver): void {
+		if (!this._isIncluded(autorun)) { return; }
+
 		const existingHandleChange = autorun.handleChange;
 		this.changedObservablesSets.set(autorun, new Set());
 		autorun.handleChange = (observable, change) => {
@@ -160,13 +193,17 @@ export class ConsoleObservableLogger implements IObservableLogger {
 	}
 
 	handleAutorunTriggered(autorun: AutorunObserver): void {
-		const changedObservables = this.changedObservablesSets.get(autorun)!;
-		console.log(...this.textToConsoleArgs([
-			formatKind('autorun'),
-			styled(autorun.debugName, { color: 'BlueViolet' }),
-			this.formatChanges(changedObservables),
-			{ data: [{ fn: autorun._debugNameData.referenceFn ?? autorun._runFn }] }
-		]));
+		const changedObservables = this.changedObservablesSets.get(autorun);
+		if (!changedObservables) { return; }
+
+		if (this._isIncluded(autorun)) {
+			console.log(...this.textToConsoleArgs([
+				formatKind('autorun'),
+				styled(autorun.debugName, { color: 'BlueViolet' }),
+				this.formatChanges(changedObservables),
+				{ data: [{ fn: autorun._debugNameData.referenceFn ?? autorun._runFn }] }
+			]));
+		}
 		changedObservables.clear();
 		this.indentation++;
 	}
@@ -180,11 +217,13 @@ export class ConsoleObservableLogger implements IObservableLogger {
 		if (transactionName === undefined) {
 			transactionName = '';
 		}
-		console.log(...this.textToConsoleArgs([
-			formatKind('transaction'),
-			styled(transactionName, { color: 'BlueViolet' }),
-			{ data: [{ fn: transaction._fn }] }
-		]));
+		if (this._isIncluded(transaction)) {
+			console.log(...this.textToConsoleArgs([
+				formatKind('transaction'),
+				styled(transactionName, { color: 'BlueViolet' }),
+				{ data: [{ fn: transaction._fn }] }
+			]));
+		}
 		this.indentation++;
 	}
 
diff --git a/src/vs/base/test/common/observable.test.ts b/src/vs/base/test/common/observable.test.ts
index 2f897924323..3d7ed472fcd 100644
--- a/src/vs/base/test/common/observable.test.ts
+++ b/src/vs/base/test/common/observable.test.ts
@@ -1507,21 +1507,21 @@ export class LoggingObservableValue<T, TChange = void>
 	implements ISettableObservable<T, TChange> {
 	private value: T;
 
-	constructor(public readonly debugName: string, initialValue: T, private readonly log: Log) {
+	constructor(public readonly debugName: string, initialValue: T, private readonly logger: Log) {
 		super();
 		this.value = initialValue;
 	}
 
 	protected override onFirstObserverAdded(): void {
-		this.log.log(`${this.debugName}.firstObserverAdded`);
+		this.logger.log(`${this.debugName}.firstObserverAdded`);
 	}
 
 	protected override onLastObserverRemoved(): void {
-		this.log.log(`${this.debugName}.lastObserverRemoved`);
+		this.logger.log(`${this.debugName}.lastObserverRemoved`);
 	}
 
 	public get(): T {
-		this.log.log(`${this.debugName}.get`);
+		this.logger.log(`${this.debugName}.get`);
 		return this.value;
 	}
 
@@ -1537,7 +1537,7 @@ export class LoggingObservableValue<T, TChange = void>
 			return;
 		}
 
-		this.log.log(`${this.debugName}.set (value ${value})`);
+		this.logger.log(`${this.debugName}.set (value ${value})`);
 
 		this.value = value;
 
diff --git a/src/vs/editor/browser/observableCodeEditor.ts b/src/vs/editor/browser/observableCodeEditor.ts
index 404f10dbe46..781a9895212 100644
--- a/src/vs/editor/browser/observableCodeEditor.ts
+++ b/src/vs/editor/browser/observableCodeEditor.ts
@@ -266,13 +266,13 @@ export class ObservableCodeEditor extends Disposable {
 	}
 
 	public observePosition(position: IObservable<Position | null>, store: DisposableStore): IObservable<Point | null> {
-		const result = observableValueOpts<Point | null>({ owner: this, equalsFn: equalsIfDefined(Point.equals) }, new Point(0, 0));
+		let pos = position.get();
+		const result = observableValueOpts<Point | null>({ owner: this, debugName: () => `topLeftOfPosition${pos?.toString()}`, equalsFn: equalsIfDefined(Point.equals) }, new Point(0, 0));
 		const contentWidgetId = `observablePositionWidget` + (this._widgetCounter++);
 		const domNode = document.createElement('div');
 		const w: IContentWidget = {
 			getDomNode: () => domNode,
 			getPosition: () => {
-				const pos = position.get();
 				return pos ? { preference: [ContentWidgetPositionPreference.EXACT], position: position.get() } : null;
 			},
 			getId: () => contentWidgetId,
@@ -283,7 +283,7 @@ export class ObservableCodeEditor extends Disposable {
 		};
 		this.editor.addContentWidget(w);
 		store.add(autorun(reader => {
-			position.read(reader);
+			pos = position.read(reader);
 			this.editor.layoutContentWidget(w);
 		}));
 		store.add(toDisposable(() => {

From aaa5982ec9d269d9c63d0a5e762c7c307b8e5033 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Wed, 18 Dec 2024 09:50:52 -0800
Subject: [PATCH 361/479] debug: fix underflow/overflow in breakpoint edit
 widget (#236428)

Fixes #233819
---
 src/vs/editor/contrib/hover/browser/glyphHoverWidget.ts          | 1 +
 .../workbench/contrib/debug/browser/media/breakpointWidget.css   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/vs/editor/contrib/hover/browser/glyphHoverWidget.ts b/src/vs/editor/contrib/hover/browser/glyphHoverWidget.ts
index a6a120b040a..d40ff7189c5 100644
--- a/src/vs/editor/contrib/hover/browser/glyphHoverWidget.ts
+++ b/src/vs/editor/contrib/hover/browser/glyphHoverWidget.ts
@@ -180,6 +180,7 @@ export class GlyphHoverWidget extends Disposable implements IOverlayWidget, IHov
 		const left = editorLayout.glyphMarginLeft + editorLayout.glyphMarginWidth + (laneOrLine === 'lineNo' ? editorLayout.lineNumbersWidth : 0);
 		this._hover.containerDomNode.style.left = `${left}px`;
 		this._hover.containerDomNode.style.top = `${Math.max(Math.round(top), 0)}px`;
+		this._hover.containerDomNode.style.zIndex = '11'; // 1 more than the zone widget at 10 (#233819)
 	}
 
 	private _onMouseLeave(e: MouseEvent): void {
diff --git a/src/vs/workbench/contrib/debug/browser/media/breakpointWidget.css b/src/vs/workbench/contrib/debug/browser/media/breakpointWidget.css
index 4bbf07f03c7..27b11b0a392 100644
--- a/src/vs/workbench/contrib/debug/browser/media/breakpointWidget.css
+++ b/src/vs/workbench/contrib/debug/browser/media/breakpointWidget.css
@@ -6,6 +6,7 @@
 .monaco-editor .zone-widget .zone-widget-container.breakpoint-widget {
 	display: flex;
 	border-color: #007ACC;
+	background: var(--vscode-editor-background);
 
 	.breakpoint-select-container {
 		display: flex;

From 4fcae8834d70e4beadbeceeedd62d1e12484fe3e Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Wed, 18 Dec 2024 12:38:58 -0600
Subject: [PATCH 362/479] do not show no suggestions widget unless it was
 explicitly invoked (#236505)

---
 .../browser/terminal.suggest.contribution.ts     |  2 +-
 .../suggest/browser/terminalSuggestAddon.ts      | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts
index 82b9dc7d514..96676a5a12c 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts
@@ -192,7 +192,7 @@ registerActiveInstanceAction({
 		weight: KeybindingWeight.WorkbenchContrib + 1,
 		when: ContextKeyExpr.and(TerminalContextKeys.focus, TerminalContextKeys.terminalShellIntegrationEnabled, ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.Enabled}`, true))
 	},
-	run: (activeInstance) => TerminalSuggestContribution.get(activeInstance)?.addon?.requestCompletions()
+	run: (activeInstance) => TerminalSuggestContribution.get(activeInstance)?.addon?.requestCompletions(true)
 });
 
 registerActiveInstanceAction({
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
index 331d36a2e58..9f173cfc15a 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -129,7 +129,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		}));
 	}
 
-	private async _handleCompletionProviders(terminal: Terminal | undefined, token: CancellationToken, triggerCharacter?: boolean): Promise<void> {
+	private async _handleCompletionProviders(terminal: Terminal | undefined, token: CancellationToken, explicitlyInvoked?: boolean): Promise<void> {
 		// Nothing to handle if the terminal is not attached
 		if (!terminal?.element || !this._enableWidget || !this._promptInputModel) {
 			return;
@@ -156,7 +156,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 			await this._extensionService.activateByEvent('onTerminalCompletionsRequested');
 		}
 
-		const providedCompletions = await this._terminalCompletionService.provideCompletions(this._promptInputModel.prefix, this._promptInputModel.cursorIndex, this._shellType, token, triggerCharacter, doNotRequestExtensionCompletions);
+		const providedCompletions = await this._terminalCompletionService.provideCompletions(this._promptInputModel.prefix, this._promptInputModel.cursorIndex, this._shellType, token, doNotRequestExtensionCompletions);
 		if (!providedCompletions?.length || token.isCancellationRequested) {
 			return;
 		}
@@ -220,7 +220,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		if (token.isCancellationRequested) {
 			return;
 		}
-		this._showCompletions(model);
+		this._showCompletions(model, explicitlyInvoked);
 	}
 
 	setContainerWithOverflow(container: HTMLElement): void {
@@ -231,7 +231,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		this._screen = screen;
 	}
 
-	async requestCompletions(triggerCharacter?: boolean): Promise<void> {
+	async requestCompletions(explicitlyInvoked?: boolean): Promise<void> {
 		if (!this._promptInputModel) {
 			return;
 		}
@@ -245,7 +245,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		}
 		this._cancellationTokenSource = new CancellationTokenSource();
 		const token = this._cancellationTokenSource.token;
-		await this._handleCompletionProviders(this._terminal, token, triggerCharacter);
+		await this._handleCompletionProviders(this._terminal, token, explicitlyInvoked);
 	}
 
 	private _sync(promptInputState: IPromptInputModelState): void {
@@ -292,7 +292,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 						}
 						for (const char of provider.triggerCharacters) {
 							if (prefix?.endsWith(char)) {
-								this.requestCompletions(true);
+								this.requestCompletions();
 								sent = true;
 								break;
 							}
@@ -359,13 +359,13 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		};
 	}
 
-	private _showCompletions(model: SimpleCompletionModel): void {
+	private _showCompletions(model: SimpleCompletionModel, explicitlyInvoked?: boolean): void {
 		if (!this._terminal?.element) {
 			return;
 		}
 		const suggestWidget = this._ensureSuggestWidget(this._terminal);
 		suggestWidget.setCompletionModel(model);
-		if (!this._promptInputModel) {
+		if (!this._promptInputModel || !explicitlyInvoked && model.items.length === 0) {
 			return;
 		}
 		this._model = model;

From 4c3f5de78914fd38b4e3c3d46ccd7f777e233c39 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Wed, 18 Dec 2024 10:40:34 -0800
Subject: [PATCH 363/479] debug: make ctrl+c copy value(s) in debug views
 (#236501)

Not sure how this ever worked, but it was reported as a bug, and this makes it work.

Fixes #232767
---
 .../debug/browser/debug.contribution.ts       | 12 +++++++
 .../contrib/debug/browser/variablesView.ts    | 35 ++++++++++++++++---
 .../debug/browser/watchExpressionsView.ts     |  8 +++--
 .../workbench/contrib/debug/common/debug.ts   |  5 +++
 4 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
index 7c501db354f..6033b0cf9b5 100644
--- a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
@@ -63,6 +63,8 @@ import { ReplAccessibilityHelp } from './replAccessibilityHelp.js';
 import { ReplAccessibilityAnnouncer } from '../common/replAccessibilityAnnouncer.js';
 import { RunAndDebugAccessibilityHelp } from './runAndDebugAccessibilityHelp.js';
 import { DebugWatchAccessibilityAnnouncer } from '../common/debugAccessibilityAnnouncer.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { FocusedViewContext } from '../../../common/contextkeys.js';
 
 const debugCategory = nls.localize('debugCategory', "Debug");
 registerColors();
@@ -206,6 +208,16 @@ registerDebugViewMenuItem(MenuId.DebugWatchContext, REMOVE_WATCH_EXPRESSIONS_COM
 
 registerDebugViewMenuItem(MenuId.NotebookVariablesContext, COPY_NOTEBOOK_VARIABLE_VALUE_ID, COPY_NOTEBOOK_VARIABLE_VALUE_LABEL, 20, CONTEXT_VARIABLE_VALUE);
 
+KeybindingsRegistry.registerKeybindingRule({
+	id: COPY_VALUE_ID,
+	weight: KeybindingWeight.WorkbenchContrib,
+	when: ContextKeyExpr.or(
+		FocusedViewContext.isEqualTo(WATCH_VIEW_ID),
+		FocusedViewContext.isEqualTo(VARIABLES_VIEW_ID),
+	),
+	primary: KeyMod.CtrlCmd | KeyCode.KeyC
+});
+
 // Touch Bar
 if (isMacintosh) {
 
diff --git a/src/vs/workbench/contrib/debug/browser/variablesView.ts b/src/vs/workbench/contrib/debug/browser/variablesView.ts
index 222e0a7b57b..16d53c4f87e 100644
--- a/src/vs/workbench/contrib/debug/browser/variablesView.ts
+++ b/src/vs/workbench/contrib/debug/browser/variablesView.ts
@@ -40,8 +40,9 @@ import { IViewletViewOptions } from '../../../browser/parts/views/viewsViewlet.j
 import { IViewDescriptorService } from '../../../common/views.js';
 import { IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
+import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
-import { CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, CONTEXT_VARIABLES_FOCUSED, DataBreakpointSetType, DebugVisualizationType, IDataBreakpointInfoResponse, IDebugService, IExpression, IScope, IStackFrame, IViewModel, VARIABLES_VIEW_ID } from '../common/debug.js';
+import { CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, CONTEXT_VARIABLES_FOCUSED, DataBreakpointSetType, DebugVisualizationType, IDataBreakpointInfoResponse, IDebugService, IDebugViewWithVariables, IExpression, IScope, IStackFrame, IViewModel, VARIABLES_VIEW_ID, WATCH_VIEW_ID } from '../common/debug.js';
 import { getContextForVariable } from '../common/debugContext.js';
 import { ErrorScope, Expression, Scope, StackFrame, Variable, VisualizedExpression, getUriForDebugMemory } from '../common/debugModel.js';
 import { DebugVisualizer, IDebugVisualizerService } from '../common/debugVisualizers.js';
@@ -61,7 +62,7 @@ interface IVariablesContext {
 	variable: DebugProtocol.Variable;
 }
 
-export class VariablesView extends ViewPane {
+export class VariablesView extends ViewPane implements IDebugViewWithVariables {
 
 	private updateTreeScheduler: RunOnceScheduler;
 	private needsRefresh = false;
@@ -69,6 +70,10 @@ export class VariablesView extends ViewPane {
 	private savedViewState = new Map<string, IAsyncDataTreeViewState>();
 	private autoExpandedScopes = new Set<string>();
 
+	public get treeSelection() {
+		return this.tree.getSelection();
+	}
+
 	constructor(
 		options: IViewletViewOptions,
 		@IContextMenuService contextMenuService: IContextMenuService,
@@ -653,12 +658,34 @@ CommandsRegistry.registerCommand({
 		description: COPY_VALUE_LABEL,
 	},
 	id: COPY_VALUE_ID,
-	handler: async (accessor: ServicesAccessor, arg: Variable | Expression | IVariablesContext, ctx?: (Variable | Expression)[]) => {
+	handler: async (accessor: ServicesAccessor, arg: Variable | Expression | IVariablesContext | undefined, ctx?: (Variable | Expression)[]) => {
+		if (!arg) {
+			const viewService = accessor.get(IViewsService);
+			const view = viewService.getActiveViewWithId(WATCH_VIEW_ID) || viewService.getActiveViewWithId(VARIABLES_VIEW_ID);
+			if (view) {
+
+			}
+		}
 		const debugService = accessor.get(IDebugService);
 		const clipboardService = accessor.get(IClipboardService);
 		let elementContext = '';
 		let elements: (Variable | Expression)[];
-		if (arg instanceof Variable || arg instanceof Expression) {
+		if (!arg) {
+			const viewService = accessor.get(IViewsService);
+			const focusedView = viewService.getFocusedView();
+			let view: IDebugViewWithVariables | null | undefined;
+			if (focusedView?.id === WATCH_VIEW_ID) {
+				view = viewService.getActiveViewWithId<IDebugViewWithVariables>(WATCH_VIEW_ID);
+				elementContext = 'watch';
+			} else if (focusedView?.id === VARIABLES_VIEW_ID) {
+				view = viewService.getActiveViewWithId<IDebugViewWithVariables>(VARIABLES_VIEW_ID);
+				elementContext = 'variables';
+			}
+			if (!view) {
+				return;
+			}
+			elements = view.treeSelection.filter(e => e instanceof Expression || e instanceof Variable);
+		} else if (arg instanceof Variable || arg instanceof Expression) {
 			elementContext = 'watch';
 			elements = ctx ? ctx : [];
 		} else {
diff --git a/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts b/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
index b1b75a73bc0..b325c138b0a 100644
--- a/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
@@ -29,7 +29,7 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.js
 import { ViewAction, ViewPane } from '../../../browser/parts/views/viewPane.js';
 import { IViewletViewOptions } from '../../../browser/parts/views/viewsViewlet.js';
 import { IViewDescriptorService } from '../../../common/views.js';
-import { CONTEXT_CAN_VIEW_MEMORY, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_WATCH_EXPRESSIONS_EXIST, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_WATCH_ITEM_TYPE, IDebugConfiguration, IDebugService, IExpression, WATCH_VIEW_ID } from '../common/debug.js';
+import { CONTEXT_CAN_VIEW_MEMORY, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_WATCH_EXPRESSIONS_EXIST, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_WATCH_ITEM_TYPE, IDebugConfiguration, IDebugService, IDebugViewWithVariables, IExpression, WATCH_VIEW_ID } from '../common/debug.js';
 import { Expression, Variable, VisualizedExpression } from '../common/debugModel.js';
 import { AbstractExpressionDataSource, AbstractExpressionsRenderer, IExpressionTemplateData, IInputBoxOptions, renderViewTree } from './baseDebugView.js';
 import { DebugExpressionRenderer } from './debugExpressionRenderer.js';
@@ -40,7 +40,7 @@ const MAX_VALUE_RENDER_LENGTH_IN_VIEWLET = 1024;
 let ignoreViewUpdates = false;
 let useCachedEvaluation = false;
 
-export class WatchExpressionsView extends ViewPane {
+export class WatchExpressionsView extends ViewPane implements IDebugViewWithVariables {
 
 	private watchExpressionsUpdatedScheduler: RunOnceScheduler;
 	private needsRefresh = false;
@@ -51,6 +51,10 @@ export class WatchExpressionsView extends ViewPane {
 	private menu: IMenu;
 	private expressionRenderer: DebugExpressionRenderer;
 
+	public get treeSelection() {
+		return this.tree.getSelection();
+	}
+
 	constructor(
 		options: IViewletViewOptions,
 		@IContextMenuService contextMenuService: IContextMenuService,
diff --git a/src/vs/workbench/contrib/debug/common/debug.ts b/src/vs/workbench/contrib/debug/common/debug.ts
index d5387b10408..c0501554472 100644
--- a/src/vs/workbench/contrib/debug/common/debug.ts
+++ b/src/vs/workbench/contrib/debug/common/debug.ts
@@ -29,6 +29,7 @@ import { Source } from './debugSource.js';
 import { ITaskIdentifier } from '../../tasks/common/tasks.js';
 import { LiveTestResult } from '../../testing/common/testResult.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IView } from '../../../common/views.js';
 
 export const VIEWLET_ID = 'workbench.view.debug';
 
@@ -115,6 +116,10 @@ export const INTERNAL_CONSOLE_OPTIONS_SCHEMA = {
 	description: nls.localize('internalConsoleOptions', "Controls when the internal Debug Console should open.")
 };
 
+export interface IDebugViewWithVariables extends IView {
+	readonly treeSelection: IExpression[];
+}
+
 // raw
 
 export interface IRawModelUpdate {

From d6d5ebe048e65abd1377b76bdb21935c9bd5d283 Mon Sep 17 00:00:00 2001
From: Michael Lively <milively@microsoft.com>
Date: Wed, 18 Dec 2024 10:49:25 -0800
Subject: [PATCH 364/479] Splitting cells should maintain the current edit
 state (#236507)

* split cell command should be in editing mode

* stay in preview if splitting from that state

* writing the PR description made me realize that this was way simpler
---
 .../notebook/browser/contrib/cellCommands/cellCommands.ts       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands.ts b/src/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands.ts
index 261c8021562..2abc28493e9 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands.ts
@@ -205,6 +205,8 @@ registerAction2(class extends NotebookCellAction {
 					],
 					{ quotableLabel: 'Split Notebook Cell' }
 				);
+
+				context.notebookEditor.cellAt(index + 1)?.updateEditState(cell.getEditState(), 'splitCell');
 			}
 		}
 	}

From 91581cab6f837fb31161322a910f4c414aa40300 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Wed, 18 Dec 2024 12:53:00 -0600
Subject: [PATCH 365/479] focus debug console when it becomes visible 
 (#236502)

fix #236499
---
 src/vs/workbench/contrib/debug/browser/repl.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/contrib/debug/browser/repl.ts b/src/vs/workbench/contrib/debug/browser/repl.ts
index d09086152d6..e9ffbe5a57c 100644
--- a/src/vs/workbench/contrib/debug/browser/repl.ts
+++ b/src/vs/workbench/contrib/debug/browser/repl.ts
@@ -214,6 +214,7 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 					this.tree?.updateChildren(undefined, true, false);
 					this.onDidStyleChange();
 				}
+				this.focus();
 			}
 		}));
 		this._register(this.configurationService.onDidChangeConfiguration(e => {

From 7f9c7a41873b88861744d06aed33d2dbcaa3a92e Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Wed, 18 Dec 2024 11:03:57 -0800
Subject: [PATCH 366/479] testing: avoid profiles dropdown when there's a
 single profile (#236509)

Fixes #232767
---
 .../testing/browser/testingExplorerView.ts      | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
index 5e84db11b6a..dea0b909d04 100644
--- a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
@@ -346,6 +346,7 @@ export class TestingExplorerView extends ViewPane {
 		const profileActions: IAction[] = [];
 
 		let participatingGroups = 0;
+		let participatingProfiles = 0;
 		let hasConfigurable = false;
 		const defaults = this.testProfileService.getGroupDefaultProfiles(group);
 		for (const { profiles, controller } of this.testProfileService.all()) {
@@ -363,6 +364,7 @@ export class TestingExplorerView extends ViewPane {
 				}
 
 				hasConfigurable = hasConfigurable || profile.hasConfigurationHandler;
+				participatingProfiles++;
 				profileActions.push(new Action(
 					`${controller.id}.${profile.profileId}`,
 					defaults.includes(profile) ? localize('defaultTestProfile', '{0} (Default)', profile.label) : profile.label,
@@ -402,7 +404,7 @@ export class TestingExplorerView extends ViewPane {
 		const menuActions = getFlatContextMenuActions(menu);
 
 		const postActions: IAction[] = [];
-		if (profileActions.length > 1) {
+		if (participatingProfiles > 1) {
 			postActions.push(new Action(
 				'selectDefaultTestConfigurations',
 				localize('selectDefaultConfigs', 'Select Default Profile'),
@@ -423,9 +425,12 @@ export class TestingExplorerView extends ViewPane {
 		}
 
 		// show menu actions if there are any otherwise don't
-		return menuActions.length > 0
-			? Separator.join(profileActions, menuActions, postActions)
-			: Separator.join(profileActions, postActions);
+		return {
+			numberOfProfiles: participatingProfiles,
+			actions: menuActions.length > 0
+				? Separator.join(profileActions, menuActions, postActions)
+				: Separator.join(profileActions, postActions),
+		};
 	}
 
 	/**
@@ -438,7 +443,7 @@ export class TestingExplorerView extends ViewPane {
 
 	private getRunGroupDropdown(group: TestRunProfileBitset, defaultAction: IAction, options: IActionViewItemOptions) {
 		const dropdownActions = this.getTestConfigGroupActions(group);
-		if (dropdownActions.length < 2) {
+		if (dropdownActions.numberOfProfiles < 2) {
 			return super.getActionViewItem(defaultAction, options);
 		}
 
@@ -452,7 +457,7 @@ export class TestingExplorerView extends ViewPane {
 
 		return this.instantiationService.createInstance(
 			DropdownWithPrimaryActionViewItem,
-			primaryAction, this.getDropdownAction(), dropdownActions,
+			primaryAction, this.getDropdownAction(), dropdownActions.actions,
 			'',
 			options
 		);

From 9fc5861de2162b2f6ab6f316c655679fdaf61eb0 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 18 Dec 2024 11:51:32 -0800
Subject: [PATCH 367/479] Speculative fix when pwsh is 'powershell' on
 mac/linux

Fixes #219583
---
 src/vs/platform/shell/node/shellEnv.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/platform/shell/node/shellEnv.ts b/src/vs/platform/shell/node/shellEnv.ts
index 2d3ef3ead0d..31a1ebe1ecf 100644
--- a/src/vs/platform/shell/node/shellEnv.ts
+++ b/src/vs/platform/shell/node/shellEnv.ts
@@ -129,7 +129,7 @@ async function doResolveUnixShellEnv(logService: ILogService, token: Cancellatio
 		const name = basename(systemShellUnix);
 		let command: string, shellArgs: Array<string>;
 		const extraArgs = '';
-		if (/^pwsh(-preview)?$/.test(name)) {
+		if (/^(?:pwsh(?:-preview)|powershell)$/.test(name)) {
 			// Older versions of PowerShell removes double quotes sometimes so we use "double single quotes" which is how
 			// you escape single quotes inside of a single quoted string.
 			command = `& '${process.execPath}' ${extraArgs} -p '''${mark}'' + JSON.stringify(process.env) + ''${mark}'''`;

From c88542ef6216f589c6675b2aac96447b284708ef Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Wed, 18 Dec 2024 21:21:30 +0100
Subject: [PATCH 368/479] Fix navigation to single match in tree find (#236515)

fixes #236478
---
 src/vs/base/browser/ui/tree/abstractTree.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts
index 38570ae882d..b8144e58c23 100644
--- a/src/vs/base/browser/ui/tree/abstractTree.ts
+++ b/src/vs/base/browser/ui/tree/abstractTree.ts
@@ -1177,7 +1177,7 @@ export class FindController<T, TFilterData> extends AbstractFindController<T, TF
 		this.tree.refilter();
 
 		if (pattern) {
-			this.tree.focusNext(0, true, undefined, (node) => this.shouldAllowFocus(node));
+			this.tree.focusNext(0, true, undefined, (node) => !FuzzyScore.isDefault(node.filterData as any as FuzzyScore));
 		}
 
 		const focus = this.tree.getFocus();

From 1147139fbb8174119528d71a99cb9a0688170999 Mon Sep 17 00:00:00 2001
From: Joyce Er <joyce.er@microsoft.com>
Date: Wed, 18 Dec 2024 12:27:49 -0800
Subject: [PATCH 369/479] fix: copy from context menu for chat references does
 not work (#236518)

---
 .../chatReferencesContentPart.ts              | 30 +++++++++++++++++--
 .../files/browser/fileActions.contribution.ts |  2 +-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.ts
index 3b71a48f0cc..a06c21d966b 100644
--- a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.ts
@@ -19,7 +19,8 @@ import { localize, localize2 } from '../../../../../nls.js';
 import { getFlatContextMenuActions } from '../../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { MenuWorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
 import { Action2, IMenuService, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
-import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { ContextKeyExpr, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
 import { FileKind } from '../../../../../platform/files/common/files.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
@@ -476,7 +477,7 @@ registerAction2(class AddToChatAction extends Action2 {
 				id: MenuId.ChatAttachmentsContext,
 				group: 'chat',
 				order: 1,
-				when: ExplorerFolderContext.negate(),
+				when: ContextKeyExpr.and(ResourceContextKey.IsFileSystemResource, ExplorerFolderContext.negate()),
 			}]
 		});
 	}
@@ -498,4 +499,29 @@ registerAction2(class AddToChatAction extends Action2 {
 	}
 });
 
+registerAction2(class OpenChatReferenceLinkAction extends Action2 {
+
+	static readonly id = 'workbench.action.chat.copyLink';
+
+	constructor() {
+		super({
+			id: OpenChatReferenceLinkAction.id,
+			title: {
+				...localize2('copyLink', "Copy Link"),
+			},
+			f1: false,
+			menu: [{
+				id: MenuId.ChatAttachmentsContext,
+				group: 'chat',
+				order: 0,
+				when: ContextKeyExpr.or(ResourceContextKey.Scheme.isEqualTo(Schemas.http), ResourceContextKey.Scheme.isEqualTo(Schemas.https)),
+			}]
+		});
+	}
+
+	override async run(accessor: ServicesAccessor, resource: URI): Promise<void> {
+		await accessor.get(IClipboardService).writeResources([resource]);
+	}
+});
+
 //#endregion
diff --git a/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts b/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
index 9da55d34ce3..be7dddf26ff 100644
--- a/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
+++ b/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
@@ -770,7 +770,7 @@ MenuRegistry.appendMenuItem(MenuId.ChatAttachmentsContext, {
 	group: 'navigation',
 	order: 10,
 	command: openToSideCommand,
-	when: ContextKeyExpr.and(ResourceContextKey.HasResource, ExplorerFolderContext.toNegated())
+	when: ContextKeyExpr.and(ResourceContextKey.IsFileSystemResource, ExplorerFolderContext.toNegated())
 });
 
 MenuRegistry.appendMenuItem(MenuId.ChatAttachmentsContext, {

From e6e5856995525c808ad52547beb8fe19802207ea Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Wed, 18 Dec 2024 12:39:57 -0800
Subject: [PATCH 370/479] debug: fix unexpected behaviors with duplicate
 `name`s in `launch.json` (#236513)

Suffix duplicated launch configs with a config at the time they're read. In debug we assume the names are unique, so this should fix #231377 and probably other hidden issues as well.
---
 .../browser/debugConfigurationManager.ts      | 61 ++++++++++++-------
 1 file changed, 39 insertions(+), 22 deletions(-)

diff --git a/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts b/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts
index 0cc18f401f1..89edaf1e668 100644
--- a/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts
@@ -10,7 +10,6 @@ import { Emitter, Event } from '../../../../base/common/event.js';
 import * as json from '../../../../base/common/json.js';
 import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
 import { DisposableStore, IDisposable, dispose } from '../../../../base/common/lifecycle.js';
-import * as objects from '../../../../base/common/objects.js';
 import * as resources from '../../../../base/common/resources.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { URI as uri } from '../../../../base/common/uri.js';
@@ -27,16 +26,16 @@ import { IStorageService, StorageScope, StorageTarget } from '../../../../platfo
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { IWorkspaceContextService, IWorkspaceFolder, IWorkspaceFoldersChangeEvent, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
 import { IEditorPane } from '../../../common/editor.js';
-import { debugConfigure } from './debugIcons.js';
-import { CONTEXT_DEBUG_CONFIGURATION_TYPE, DebugConfigurationProviderTriggerKind, IAdapterManager, ICompound, IConfig, IConfigPresentation, IConfigurationManager, IDebugConfigurationProvider, IGlobalConfig, IGuessedDebugger, ILaunch } from '../common/debug.js';
-import { launchSchema } from '../common/debugSchemas.js';
-import { getVisibleAndSorted } from '../common/debugUtils.js';
 import { launchSchemaId } from '../../../services/configuration/common/configuration.js';
 import { ACTIVE_GROUP, IEditorService } from '../../../services/editor/common/editorService.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { IHistoryService } from '../../../services/history/common/history.js';
 import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { CONTEXT_DEBUG_CONFIGURATION_TYPE, DebugConfigurationProviderTriggerKind, IAdapterManager, ICompound, IConfig, IConfigPresentation, IConfigurationManager, IDebugConfigurationProvider, IGlobalConfig, IGuessedDebugger, ILaunch } from '../common/debug.js';
+import { launchSchema } from '../common/debugSchemas.js';
+import { getVisibleAndSorted } from '../common/debugUtils.js';
+import { debugConfigure } from './debugIcons.js';
 
 const jsonRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);
 jsonRegistry.registerSchema(launchSchemaId, launchSchema);
@@ -509,7 +508,7 @@ abstract class AbstractLaunch implements ILaunch {
 	) { }
 
 	getCompound(name: string): ICompound | undefined {
-		const config = this.getConfig();
+		const config = this.getDeduplicatedConfig();
 		if (!config || !config.compounds) {
 			return undefined;
 		}
@@ -518,7 +517,7 @@ abstract class AbstractLaunch implements ILaunch {
 	}
 
 	getConfigurationNames(ignoreCompoundsAndPresentation = false): string[] {
-		const config = this.getConfig();
+		const config = this.getDeduplicatedConfig();
 		if (!config || (!Array.isArray(config.configurations) && !Array.isArray(config.compounds))) {
 			return [];
 		} else {
@@ -540,21 +539,22 @@ abstract class AbstractLaunch implements ILaunch {
 
 	getConfiguration(name: string): IConfig | undefined {
 		// We need to clone the configuration in order to be able to make changes to it #42198
-		const config = objects.deepClone(this.getConfig());
+		const config = this.getDeduplicatedConfig();
 		if (!config || !config.configurations) {
 			return undefined;
 		}
 		const configuration = config.configurations.find(config => config && config.name === name);
-		if (configuration) {
-			if (this instanceof UserLaunch) {
-				configuration.__configurationTarget = ConfigurationTarget.USER;
-			} else if (this instanceof WorkspaceLaunch) {
-				configuration.__configurationTarget = ConfigurationTarget.WORKSPACE;
-			} else {
-				configuration.__configurationTarget = ConfigurationTarget.WORKSPACE_FOLDER;
-			}
+		if (!configuration) {
+			return;
+		}
+
+		if (this instanceof UserLaunch) {
+			return { ...configuration, __configurationTarget: ConfigurationTarget.USER };
+		} else if (this instanceof WorkspaceLaunch) {
+			return { ...configuration, __configurationTarget: ConfigurationTarget.WORKSPACE };
+		} else {
+			return { ...configuration, __configurationTarget: ConfigurationTarget.WORKSPACE_FOLDER };
 		}
-		return configuration;
 	}
 
 	async getInitialConfigurationContent(folderUri?: uri, type?: string, useInitialConfigs?: boolean, token?: CancellationToken): Promise<string> {
@@ -575,9 +575,28 @@ abstract class AbstractLaunch implements ILaunch {
 		return content;
 	}
 
+
 	get hidden(): boolean {
 		return false;
 	}
+
+	private getDeduplicatedConfig(): IGlobalConfig | undefined {
+		const original = this.getConfig();
+		return original && {
+			version: original.version,
+			compounds: original.compounds && distinguishConfigsByName(original.compounds),
+			configurations: original.configurations && distinguishConfigsByName(original.configurations),
+		};
+	}
+}
+
+function distinguishConfigsByName<T extends { name: string }>(things: readonly T[]): T[] {
+	const seen = new Map<string, number>();
+	return things.map(thing => {
+		const no = seen.get(thing.name) || 0;
+		seen.set(thing.name, no + 1);
+		return no === 0 ? thing : { ...thing, name: `${thing.name} (${no})` };
+	});
 }
 
 class Launch extends AbstractLaunch implements ILaunch {
@@ -655,11 +674,9 @@ class Launch extends AbstractLaunch implements ILaunch {
 	}
 
 	async writeConfiguration(configuration: IConfig): Promise<void> {
-		const fullConfig = objects.deepClone(this.getConfig()!);
-		if (!fullConfig.configurations) {
-			fullConfig.configurations = [];
-		}
-		fullConfig.configurations.push(configuration);
+		// note: we don't get the deduplicated config since we don't want that to 'leak' into the file
+		const fullConfig: Partial<IGlobalConfig> = this.getConfig() || {};
+		fullConfig.configurations = [...fullConfig.configurations || [], configuration];
 		await this.configurationService.updateValue('launch', fullConfig, { resource: this.workspace.uri }, ConfigurationTarget.WORKSPACE_FOLDER);
 	}
 }

From 3fd6eef7b9683b6581c0111fd0304ca8e1423035 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Wed, 18 Dec 2024 13:04:11 -0800
Subject: [PATCH 371/479] fix: workbench.debug.action.focusRepl resolving
 before focus is given (#236520)

Note: I intentionally did not keep this registered under the command palette because there is a similar duplicate command provided automatically from the views service.

Fixes #228852
---
 .../debug/browser/debug.contribution.ts       |  3 +--
 .../contrib/debug/browser/debugCommands.ts    |  8 -------
 .../workbench/contrib/debug/browser/repl.ts   | 24 ++++++++++++++++---
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
index 6033b0cf9b5..fe281b6c1b1 100644
--- a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
+++ b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts
@@ -31,7 +31,7 @@ import { CallStackEditorContribution } from './callStackEditorContribution.js';
 import { CallStackView } from './callStackView.js';
 import { ReplAccessibleView } from './replAccessibleView.js';
 import { registerColors } from './debugColors.js';
-import { ADD_CONFIGURATION_ID, ADD_TO_WATCH_ID, ADD_TO_WATCH_LABEL, CALLSTACK_BOTTOM_ID, CALLSTACK_BOTTOM_LABEL, CALLSTACK_DOWN_ID, CALLSTACK_DOWN_LABEL, CALLSTACK_TOP_ID, CALLSTACK_TOP_LABEL, CALLSTACK_UP_ID, CALLSTACK_UP_LABEL, CONTINUE_ID, CONTINUE_LABEL, COPY_EVALUATE_PATH_ID, COPY_EVALUATE_PATH_LABEL, COPY_STACK_TRACE_ID, COPY_VALUE_ID, COPY_VALUE_LABEL, DEBUG_COMMAND_CATEGORY, DEBUG_CONSOLE_QUICK_ACCESS_PREFIX, DEBUG_QUICK_ACCESS_PREFIX, DEBUG_RUN_COMMAND_ID, DEBUG_RUN_LABEL, DEBUG_START_COMMAND_ID, DEBUG_START_LABEL, DISCONNECT_AND_SUSPEND_ID, DISCONNECT_AND_SUSPEND_LABEL, DISCONNECT_ID, DISCONNECT_LABEL, EDIT_EXPRESSION_COMMAND_ID, FOCUS_REPL_ID, JUMP_TO_CURSOR_ID, NEXT_DEBUG_CONSOLE_ID, NEXT_DEBUG_CONSOLE_LABEL, OPEN_LOADED_SCRIPTS_LABEL, PAUSE_ID, PAUSE_LABEL, PREV_DEBUG_CONSOLE_ID, PREV_DEBUG_CONSOLE_LABEL, REMOVE_EXPRESSION_COMMAND_ID, RESTART_FRAME_ID, RESTART_LABEL, RESTART_SESSION_ID, SELECT_AND_START_ID, SELECT_AND_START_LABEL, SELECT_DEBUG_CONSOLE_ID, SELECT_DEBUG_CONSOLE_LABEL, SELECT_DEBUG_SESSION_ID, SELECT_DEBUG_SESSION_LABEL, SET_EXPRESSION_COMMAND_ID, SHOW_LOADED_SCRIPTS_ID, STEP_INTO_ID, STEP_INTO_LABEL, STEP_INTO_TARGET_ID, STEP_INTO_TARGET_LABEL, STEP_OUT_ID, STEP_OUT_LABEL, STEP_OVER_ID, STEP_OVER_LABEL, STOP_ID, STOP_LABEL, TERMINATE_THREAD_ID, TOGGLE_INLINE_BREAKPOINT_ID } from './debugCommands.js';
+import { ADD_CONFIGURATION_ID, ADD_TO_WATCH_ID, ADD_TO_WATCH_LABEL, CALLSTACK_BOTTOM_ID, CALLSTACK_BOTTOM_LABEL, CALLSTACK_DOWN_ID, CALLSTACK_DOWN_LABEL, CALLSTACK_TOP_ID, CALLSTACK_TOP_LABEL, CALLSTACK_UP_ID, CALLSTACK_UP_LABEL, CONTINUE_ID, CONTINUE_LABEL, COPY_EVALUATE_PATH_ID, COPY_EVALUATE_PATH_LABEL, COPY_STACK_TRACE_ID, COPY_VALUE_ID, COPY_VALUE_LABEL, DEBUG_COMMAND_CATEGORY, DEBUG_CONSOLE_QUICK_ACCESS_PREFIX, DEBUG_QUICK_ACCESS_PREFIX, DEBUG_RUN_COMMAND_ID, DEBUG_RUN_LABEL, DEBUG_START_COMMAND_ID, DEBUG_START_LABEL, DISCONNECT_AND_SUSPEND_ID, DISCONNECT_AND_SUSPEND_LABEL, DISCONNECT_ID, DISCONNECT_LABEL, EDIT_EXPRESSION_COMMAND_ID, JUMP_TO_CURSOR_ID, NEXT_DEBUG_CONSOLE_ID, NEXT_DEBUG_CONSOLE_LABEL, OPEN_LOADED_SCRIPTS_LABEL, PAUSE_ID, PAUSE_LABEL, PREV_DEBUG_CONSOLE_ID, PREV_DEBUG_CONSOLE_LABEL, REMOVE_EXPRESSION_COMMAND_ID, RESTART_FRAME_ID, RESTART_LABEL, RESTART_SESSION_ID, SELECT_AND_START_ID, SELECT_AND_START_LABEL, SELECT_DEBUG_CONSOLE_ID, SELECT_DEBUG_CONSOLE_LABEL, SELECT_DEBUG_SESSION_ID, SELECT_DEBUG_SESSION_LABEL, SET_EXPRESSION_COMMAND_ID, SHOW_LOADED_SCRIPTS_ID, STEP_INTO_ID, STEP_INTO_LABEL, STEP_INTO_TARGET_ID, STEP_INTO_TARGET_LABEL, STEP_OUT_ID, STEP_OUT_LABEL, STEP_OVER_ID, STEP_OVER_LABEL, STOP_ID, STOP_LABEL, TERMINATE_THREAD_ID, TOGGLE_INLINE_BREAKPOINT_ID } from './debugCommands.js';
 import { DebugConsoleQuickAccess } from './debugConsoleQuickAccess.js';
 import { RunToCursorAction, SelectionToReplAction, SelectionToWatchExpressionsAction } from './debugEditorActions.js';
 import { DebugEditorContribution } from './debugEditorContribution.js';
@@ -133,7 +133,6 @@ registerDebugCommandPaletteItem(DISCONNECT_ID, DISCONNECT_LABEL, CONTEXT_IN_DEBU
 registerDebugCommandPaletteItem(DISCONNECT_AND_SUSPEND_ID, DISCONNECT_AND_SUSPEND_LABEL, CONTEXT_IN_DEBUG_MODE, ContextKeyExpr.or(CONTEXT_FOCUSED_SESSION_IS_ATTACH, ContextKeyExpr.and(CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED)));
 registerDebugCommandPaletteItem(STOP_ID, STOP_LABEL, CONTEXT_IN_DEBUG_MODE, ContextKeyExpr.or(CONTEXT_FOCUSED_SESSION_IS_ATTACH.toNegated(), CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED));
 registerDebugCommandPaletteItem(CONTINUE_ID, CONTINUE_LABEL, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE.isEqualTo('stopped'));
-registerDebugCommandPaletteItem(FOCUS_REPL_ID, nls.localize2({ comment: ['Debug is a noun in this context, not a verb.'], key: 'debugFocusConsole' }, "Focus on Debug Console View"));
 registerDebugCommandPaletteItem(JUMP_TO_CURSOR_ID, nls.localize2('jumpToCursor', "Jump to Cursor"), CONTEXT_JUMP_TO_CURSOR_SUPPORTED);
 registerDebugCommandPaletteItem(JUMP_TO_CURSOR_ID, nls.localize2('SetNextStatement', "Set Next Statement"), CONTEXT_JUMP_TO_CURSOR_SUPPORTED);
 registerDebugCommandPaletteItem(RunToCursorAction.ID, RunToCursorAction.LABEL, CONTEXT_DEBUGGERS_AVAILABLE);
diff --git a/src/vs/workbench/contrib/debug/browser/debugCommands.ts b/src/vs/workbench/contrib/debug/browser/debugCommands.ts
index c6d45bda962..2d3cb0c46c8 100644
--- a/src/vs/workbench/contrib/debug/browser/debugCommands.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugCommands.ts
@@ -679,14 +679,6 @@ CommandsRegistry.registerCommand({
 	}
 });
 
-CommandsRegistry.registerCommand({
-	id: FOCUS_REPL_ID,
-	handler: async (accessor) => {
-		const viewsService = accessor.get(IViewsService);
-		await viewsService.openView(REPL_VIEW_ID, true);
-	}
-});
-
 CommandsRegistry.registerCommand({
 	id: 'debug.startFromConfig',
 	handler: async (accessor, config: IConfig) => {
diff --git a/src/vs/workbench/contrib/debug/browser/repl.ts b/src/vs/workbench/contrib/debug/browser/repl.ts
index e9ffbe5a57c..29504942045 100644
--- a/src/vs/workbench/contrib/debug/browser/repl.ts
+++ b/src/vs/workbench/contrib/debug/browser/repl.ts
@@ -11,7 +11,7 @@ import * as aria from '../../../../base/browser/ui/aria/aria.js';
 import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from '../../../../base/browser/ui/mouseCursor/mouseCursor.js';
 import { IAsyncDataSource, ITreeContextMenuEvent, ITreeNode } from '../../../../base/browser/ui/tree/tree.js';
 import { IAction } from '../../../../base/common/actions.js';
-import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { RunOnceScheduler, timeout } from '../../../../base/common/async.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { memoize } from '../../../../base/common/decorators.js';
@@ -71,6 +71,7 @@ import { CONTEXT_DEBUG_STATE, CONTEXT_IN_DEBUG_REPL, CONTEXT_MULTI_SESSION_REPL,
 import { Variable } from '../common/debugModel.js';
 import { ReplEvaluationResult, ReplGroup } from '../common/replModel.js';
 import { FocusSessionActionViewItem } from './debugActionViewItems.js';
+import { DEBUG_COMMAND_CATEGORY, FOCUS_REPL_ID } from './debugCommands.js';
 import { DebugExpressionRenderer } from './debugExpressionRenderer.js';
 import { debugConsoleClearAll, debugConsoleEvaluationPrompt } from './debugIcons.js';
 import './media/repl.css';
@@ -554,9 +555,10 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 		this.tree?.domFocus();
 	}
 
-	override focus(): void {
+	override async focus(): Promise<void> {
 		super.focus();
-		setTimeout(() => this.replInput.focus(), 0);
+		await timeout(0); // wait a task for the repl to get attached to the DOM, #83387
+		this.replInput.focus();
 	}
 
 	override getActionViewItem(action: IAction): IActionViewItem | undefined {
@@ -1209,3 +1211,19 @@ registerAction2(class extends Action2 {
 		}
 	}
 });
+
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: FOCUS_REPL_ID,
+			category: DEBUG_COMMAND_CATEGORY,
+			title: localize2({ comment: ['Debug is a noun in this context, not a verb.'], key: 'debugFocusConsole' }, "Focus on Debug Console View"),
+		});
+	}
+
+	override async run(accessor: ServicesAccessor) {
+		const viewsService = accessor.get(IViewsService);
+		const repl = await viewsService.openView<Repl>(REPL_VIEW_ID);
+		await repl?.focus();
+	}
+});

From 37c543ba48a33b8113f514951a8b3e39a04fd6bc Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Wed, 18 Dec 2024 22:26:30 +0100
Subject: [PATCH 372/479] Implements gutter indicator (off by default).
 (#236522)

* Implements gutter indicator (off by default).

* Adds isSingleLine method to monaco Range

* update
---
 src/vs/editor/browser/observableCodeEditor.ts |  16 ++
 src/vs/editor/browser/rect.ts                 | 135 +++++++++++++
 src/vs/editor/common/config/editorOptions.ts  |   8 +
 src/vs/editor/common/core/offsetRange.ts      |   4 +
 .../browser/model/inlineCompletionsModel.ts   |   2 +-
 .../view/inlineEdits/gutterIndicatorView.ts   | 189 ++++++++++++++++++
 .../browser/view/inlineEdits/indicatorView.ts |   4 +-
 .../browser/view/inlineEdits/utils.ts         |  10 +-
 .../browser/view/inlineEdits/view.ts          |  39 ++--
 src/vs/monaco.d.ts                            |   1 +
 10 files changed, 388 insertions(+), 20 deletions(-)
 create mode 100644 src/vs/editor/browser/rect.ts
 create mode 100644 src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts

diff --git a/src/vs/editor/browser/observableCodeEditor.ts b/src/vs/editor/browser/observableCodeEditor.ts
index 781a9895212..d8607ae319a 100644
--- a/src/vs/editor/browser/observableCodeEditor.ts
+++ b/src/vs/editor/browser/observableCodeEditor.ts
@@ -7,6 +7,8 @@ import { equalsIfDefined, itemsEquals } from '../../base/common/equals.js';
 import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../base/common/lifecycle.js';
 import { IObservable, ITransaction, TransactionImpl, autorun, autorunOpts, derived, derivedOpts, derivedWithSetter, observableFromEvent, observableSignal, observableValue, observableValueOpts } from '../../base/common/observable.js';
 import { EditorOption, FindComputedEditorOptionValueById } from '../common/config/editorOptions.js';
+import { LineRange } from '../common/core/lineRange.js';
+import { OffsetRange } from '../common/core/offsetRange.js';
 import { Position } from '../common/core/position.js';
 import { Selection } from '../common/core/selection.js';
 import { ICursorSelectionChangedEvent } from '../common/cursorEvents.js';
@@ -265,6 +267,20 @@ export class ObservableCodeEditor extends Disposable {
 		});
 	}
 
+	public observeLineOffsetRange(lineRange: IObservable<LineRange>, store: DisposableStore): IObservable<OffsetRange> {
+		const start = this.observePosition(lineRange.map(r => new Position(r.startLineNumber, 1)), store);
+		const end = this.observePosition(lineRange.map(r => new Position(r.endLineNumberExclusive + 1, 1)), store);
+
+		return derived(reader => {
+			start.read(reader);
+			end.read(reader);
+			const range = lineRange.read(reader);
+			const s = this.editor.getTopForLineNumber(range.startLineNumber) - this.scrollTop.read(reader);
+			const e = range.isEmpty ? s : (this.editor.getBottomForLineNumber(range.endLineNumberExclusive - 1) - this.scrollTop.read(reader));
+			return new OffsetRange(s, e);
+		});
+	}
+
 	public observePosition(position: IObservable<Position | null>, store: DisposableStore): IObservable<Point | null> {
 		let pos = position.get();
 		const result = observableValueOpts<Point | null>({ owner: this, debugName: () => `topLeftOfPosition${pos?.toString()}`, equalsFn: equalsIfDefined(Point.equals) }, new Point(0, 0));
diff --git a/src/vs/editor/browser/rect.ts b/src/vs/editor/browser/rect.ts
new file mode 100644
index 00000000000..b990944eb67
--- /dev/null
+++ b/src/vs/editor/browser/rect.ts
@@ -0,0 +1,135 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { OffsetRange } from '../common/core/offsetRange.js';
+import { Point } from './point.js';
+
+export class Rect {
+	public static fromPoint(point: Point): Rect {
+		return new Rect(point.x, point.y, point.x, point.y);
+	}
+
+	public static fromLeftTopRightBottom(left: number, top: number, right: number, bottom: number): Rect {
+		return new Rect(left, top, right, bottom);
+	}
+
+	public static fromLeftTopWidthHeight(left: number, top: number, width: number, height: number): Rect {
+		return new Rect(left, top, left + width, top + height);
+	}
+
+	public static fromRanges(leftRight: OffsetRange, topBottom: OffsetRange): Rect {
+		return new Rect(leftRight.start, topBottom.start, leftRight.endExclusive, topBottom.endExclusive);
+	}
+
+	public static hull(rects: Rect[]): Rect {
+		let left = Number.MAX_VALUE;
+		let top = Number.MAX_VALUE;
+		let right = Number.MIN_VALUE;
+		let bottom = Number.MIN_VALUE;
+
+		for (const rect of rects) {
+			left = Math.min(left, rect.left);
+			top = Math.min(top, rect.top);
+			right = Math.max(right, rect.right);
+			bottom = Math.max(bottom, rect.bottom);
+		}
+
+		return new Rect(left, top, right, bottom);
+	}
+
+	public readonly width = this.right - this.left;
+	public readonly height = this.bottom - this.top;
+
+	constructor(
+		public readonly left: number,
+		public readonly top: number,
+		public readonly right: number,
+		public readonly bottom: number,
+	) {
+		if (left > right || top > bottom) {
+			throw new Error('Invalid arguments');
+		}
+	}
+
+	withMargin(margin: number): Rect {
+		return new Rect(this.left - margin, this.top - margin, this.right + margin, this.bottom + margin);
+	}
+
+	intersectVertical(range: OffsetRange): Rect {
+		return new Rect(
+			this.left,
+			Math.max(this.top, range.start),
+			this.right,
+			Math.min(this.bottom, range.endExclusive),
+		);
+	}
+
+	toString(): string {
+		return `Rect{(${this.left},${this.top}), (${this.right},${this.bottom})}`;
+	}
+
+	intersect(parent: Rect): Rect | undefined {
+		const left = Math.max(this.left, parent.left);
+		const right = Math.min(this.right, parent.right);
+		const top = Math.max(this.top, parent.top);
+		const bottom = Math.min(this.bottom, parent.bottom);
+
+		if (left > right || top > bottom) {
+			return undefined;
+		}
+
+		return new Rect(left, top, right, bottom);
+	}
+
+	union(other: Rect): Rect {
+		return new Rect(
+			Math.min(this.left, other.left),
+			Math.min(this.top, other.top),
+			Math.max(this.right, other.right),
+			Math.max(this.bottom, other.bottom),
+		);
+	}
+
+	containsRect(other: Rect): boolean {
+		return this.left <= other.left
+			&& this.top <= other.top
+			&& this.right >= other.right
+			&& this.bottom >= other.bottom;
+	}
+
+	moveToBeContainedIn(parent: Rect): Rect {
+		const width = this.width;
+		const height = this.height;
+
+		let left = this.left;
+		let top = this.top;
+
+		if (left < parent.left) {
+			left = parent.left;
+		} else if (left + width > parent.right) {
+			left = parent.right - width;
+		}
+
+		if (top < parent.top) {
+			top = parent.top;
+		} else if (top + height > parent.bottom) {
+			top = parent.bottom - height;
+		}
+
+		return new Rect(left, top, left + width, top + height);
+	}
+
+	withWidth(width: number): Rect {
+		return new Rect(this.left, this.top, this.left + width, this.bottom);
+	}
+
+	withHeight(height: number): Rect {
+		return new Rect(this.left, this.top, this.right, this.top + height);
+	}
+
+	withTop(top: number): Rect {
+		return new Rect(this.left, top, this.right, this.bottom);
+	}
+}
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index 0c255963581..c7481985f2f 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -4198,6 +4198,7 @@ export interface IInlineSuggestOptions {
 			useMixedLinesDiff?: 'never' | 'whenPossible' | 'forStableInsertions' | 'afterJumpWhenPossible';
 			useInterleavedLinesDiff?: 'never' | 'always' | 'afterJump';
 			onlyShowWhenCloseToCursor?: boolean;
+			useGutterIndicator?: boolean;
 		};
 	};
 }
@@ -4230,6 +4231,7 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 					useMixedLinesDiff: 'forStableInsertions',
 					useInterleavedLinesDiff: 'never',
 					onlyShowWhenCloseToCursor: true,
+					useGutterIndicator: false,
 				},
 			},
 		};
@@ -4290,6 +4292,11 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 					default: defaults.edits.experimental.onlyShowWhenCloseToCursor,
 					description: nls.localize('inlineSuggest.edits.experimental.onlyShowWhenCloseToCursor', "Controls whether to only show inline suggestions when the cursor is close to the suggestion.")
 				},
+				'editor.inlineSuggest.edits.experimental.useGutterIndicator': {
+					type: 'boolean',
+					default: defaults.edits.experimental.useGutterIndicator,
+					description: nls.localize('inlineSuggest.edits.experimental.useGutterIndicator', "Controls whether to show a gutter indicator for inline suggestions.")
+				},
 			}
 		);
 	}
@@ -4313,6 +4320,7 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 					useMixedLinesDiff: stringSet(input.edits?.experimental?.useMixedLinesDiff, this.defaultValue.edits.experimental.useMixedLinesDiff, ['never', 'whenPossible', 'forStableInsertions', 'afterJumpWhenPossible']),
 					useInterleavedLinesDiff: stringSet(input.edits?.experimental?.useInterleavedLinesDiff, this.defaultValue.edits.experimental.useInterleavedLinesDiff, ['never', 'always', 'afterJump']),
 					onlyShowWhenCloseToCursor: boolean(input.edits?.experimental?.onlyShowWhenCloseToCursor, this.defaultValue.edits.experimental.onlyShowWhenCloseToCursor),
+					useGutterIndicator: boolean(input.edits?.experimental?.useGutterIndicator, this.defaultValue.edits.experimental.useGutterIndicator),
 				},
 			},
 		};
diff --git a/src/vs/editor/common/core/offsetRange.ts b/src/vs/editor/common/core/offsetRange.ts
index 5e2ef46d5a0..7e1aa41b29e 100644
--- a/src/vs/editor/common/core/offsetRange.ts
+++ b/src/vs/editor/common/core/offsetRange.ts
@@ -14,6 +14,10 @@ export interface IOffsetRange {
  * A range of offsets (0-based).
 */
 export class OffsetRange implements IOffsetRange {
+	public static fromTo(start: number, endExclusive: number): OffsetRange {
+		return new OffsetRange(start, endExclusive);
+	}
+
 	public static addRange(range: OffsetRange, sortedRanges: OffsetRange[]): void {
 		let i = 0;
 		while (i < sortedRanges.length && sortedRanges[i].endExclusive < range.start) {
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
index b2669bdf25f..a15005e75fa 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
@@ -549,7 +549,7 @@ export class InlineCompletionsModel extends Disposable {
 
 	public async previous(): Promise<void> { await this._deltaSelectedInlineCompletionIndex(-1); }
 
-	public async accept(editor: ICodeEditor): Promise<void> {
+	public async accept(editor: ICodeEditor = this._editor): Promise<void> {
 		if (editor.getModel() !== this.textModel) {
 			throw new BugIndicatingError();
 		}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts
new file mode 100644
index 00000000000..936ab8b56b3
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts
@@ -0,0 +1,189 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { renderIcon } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { IObservable, IReader, constObservable, derived, observableFromEvent } from '../../../../../../base/common/observable.js';
+import { buttonBackground, buttonForeground, buttonSecondaryBackground, buttonSecondaryForeground } from '../../../../../../platform/theme/common/colorRegistry.js';
+import { registerColor, transparent } from '../../../../../../platform/theme/common/colorUtils.js';
+import { ObservableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
+import { Rect } from '../../../../../browser/rect.js';
+import { EditorOption } from '../../../../../common/config/editorOptions.js';
+import { LineRange } from '../../../../../common/core/lineRange.js';
+import { OffsetRange } from '../../../../../common/core/offsetRange.js';
+import { StickyScrollController } from '../../../../stickyScroll/browser/stickyScrollController.js';
+import { InlineCompletionsModel } from '../../model/inlineCompletionsModel.js';
+import { mapOutFalsy, n } from './utils.js';
+
+export const inlineEditIndicatorPrimaryForeground = registerColor('inlineEdit.gutterIndicator.primaryForeground', buttonForeground, 'Foreground color for the primary inline edit gutter indicator.');
+export const inlineEditIndicatorPrimaryBackground = registerColor('inlineEdit.gutterIndicator.primaryBackground', buttonBackground, 'Background color for the primary inline edit gutter indicator.');
+
+export const inlineEditIndicatorSecondaryForeground = registerColor('inlineEdit.gutterIndicator.secondaryForeground', buttonSecondaryForeground, 'Foreground color for the secondary inline edit gutter indicator.');
+export const inlineEditIndicatorSecondaryBackground = registerColor('inlineEdit.gutterIndicator.secondaryBackground', buttonSecondaryBackground, 'Background color for the secondary inline edit gutter indicator.');
+
+export const inlineEditIndicatorsuccessfulForeground = registerColor('inlineEdit.gutterIndicator.successfulForeground', buttonForeground, 'Foreground color for the successful inline edit gutter indicator.');
+export const inlineEditIndicatorsuccessfulBackground = registerColor('inlineEdit.gutterIndicator.successfulBackground', { light: '#2e825c', dark: '#2e825c', hcLight: '#2e825c', hcDark: '#2e825c' }, 'Background color for the successful inline edit gutter indicator.');
+
+export const inlineEditIndicatorBackground = registerColor(
+	'inlineEdit.gutterIndicator.background',
+	{
+		hcDark: transparent('tab.inactiveBackground', 0.5),
+		hcLight: transparent('tab.inactiveBackground', 0.5),
+		dark: transparent('tab.inactiveBackground', 0.5),
+		light: '#5f5f5f18',
+	},
+	'Background color for the inline edit gutter indicator.'
+);
+
+
+export class InlineEditsGutterIndicator extends Disposable {
+	private readonly _state = derived(reader => {
+		const range = mapOutFalsy(this._originalRange).read(reader);
+		if (!range) {
+			return undefined;
+		}
+
+		return {
+			range,
+			lineOffsetRange: this._editorObs.observeLineOffsetRange(range, this._store),
+		};
+	});
+
+	private _stickyScrollController = StickyScrollController.get(this._editorObs.editor);
+	private readonly _stickyScrollHeight = this._stickyScrollController ? observableFromEvent(this._stickyScrollController.onDidChangeStickyScrollHeight, () => this._stickyScrollController!.stickyScrollWidgetHeight) : constObservable(0);
+
+
+	private readonly _layout = derived(reader => {
+		const s = this._state.read(reader);
+		if (!s) { return undefined; }
+
+		const layout = this._editorObs.layoutInfo.read(reader);
+
+		const fullViewPort = Rect.fromLeftTopRightBottom(0, 0, layout.width, layout.height);
+		const viewPortWithStickyScroll = fullViewPort.withTop(this._stickyScrollHeight.read(reader));
+
+		const targetVertRange = s.lineOffsetRange.read(reader);
+
+		const space = 1;
+
+		const targetRect = Rect.fromRanges(OffsetRange.fromTo(space, layout.lineNumbersLeft + layout.lineNumbersWidth + 4), targetVertRange);
+
+
+		const lineHeight = this._editorObs.getOption(EditorOption.lineHeight).read(reader);
+		const pillRect = targetRect.withHeight(lineHeight).withWidth(22);
+		const pillRectMoved = pillRect.moveToBeContainedIn(viewPortWithStickyScroll);
+
+		const rect = targetRect;
+
+		const iconRect = (targetRect.containsRect(pillRectMoved))
+			? pillRectMoved
+			: pillRectMoved.moveToBeContainedIn(fullViewPort.intersect(targetRect.union(fullViewPort.withHeight(lineHeight)))!); //viewPortWithStickyScroll.intersect(rect)!;
+
+		return {
+			rect,
+			iconRect,
+			mode: (iconRect.top === targetRect.top ? 'right' as const
+				: iconRect.top > targetRect.top ? 'top' as const : 'bottom' as const),
+			docked: rect.containsRect(iconRect) && viewPortWithStickyScroll.containsRect(iconRect),
+		};
+	});
+
+	private readonly _mode = derived(this, reader => {
+		const m = this._model.read(reader);
+		if (m && m.tabShouldAcceptInlineEdit.read(reader)) { return 'accept' as const; }
+		if (m && m.tabShouldJumpToInlineEdit.read(reader)) { return 'jump' as const; }
+		return 'inactive' as const;
+	});
+
+	private readonly _onClickAction = derived(this, reader => {
+		if (this._layout.map(d => d && d.docked).read(reader)) {
+			return {
+				label: 'Click to accept inline edit',
+				action: () => { this._model.get()?.accept(); }
+			};
+		} else {
+			return {
+				label: 'Click to jump to inline edit',
+				action: () => { this._model.get()?.jump(); }
+			};
+		}
+	});
+
+	private readonly _indicator = n.div({
+		class: 'inline-edits-view-gutter-indicator',
+		onclick: () => this._onClickAction.get().action(),
+		title: this._onClickAction.map(a => a.label),
+		style: {
+			position: 'absolute',
+			overflow: 'visible',
+		},
+	}, mapOutFalsy(this._layout).map(l => !l ? [] : [
+		n.div({
+			style: {
+				position: 'absolute',
+				background: 'var(--vscode-inlineEdit-gutterIndicator-background)',
+				borderRadius: '4px',
+				...rectToProps(reader => l.read(reader).rect),
+			}
+		}),
+		n.div({
+			class: 'icon',
+			style: {
+				cursor: 'pointer',
+				zIndex: '1000',
+				position: 'absolute',
+				backgroundColor: this._mode.map(v => ({
+					inactive: 'var(--vscode-inlineEdit-gutterIndicator-secondaryBackground)',
+					jump: 'var(--vscode-inlineEdit-gutterIndicator-primaryBackground)',
+					accept: 'var(--vscode-inlineEdit-gutterIndicator-successfulBackground)',
+				}[v])),
+				'--vscodeIconForeground': this._mode.map(v => ({
+					inactive: 'var(--vscode-inlineEdit-gutterIndicator-secondaryForeground)',
+					jump: 'var(--vscode-inlineEdit-gutterIndicator-primaryForeground)',
+					accept: 'var(--vscode-inlineEdit-gutterIndicator-successfulForeground)',
+				}[v])),
+				borderRadius: '4px',
+				display: 'flex',
+				justifyContent: 'center',
+				transition: 'background-color 0.2s ease-in-out',
+				...rectToProps(reader => l.read(reader).iconRect),
+			}
+		}, [
+			n.div({
+				style: {
+					rotate: l.map(l => ({ right: '0deg', bottom: '90deg', top: '-90deg' }[l.mode])),
+					transition: 'rotate 0.2s ease-in-out',
+				}
+			}, [
+				renderIcon(Codicon.arrowRight),
+			])
+		]),
+	])).keepUpdated(this._store);
+
+	constructor(
+		private readonly _editorObs: ObservableCodeEditor,
+		private readonly _originalRange: IObservable<LineRange | undefined>,
+		private readonly _model: IObservable<InlineCompletionsModel | undefined>,
+	) {
+		super();
+
+		this._register(this._editorObs.createOverlayWidget({
+			domNode: this._indicator.element,
+			position: constObservable(null),
+			allowEditorOverflow: false,
+			minContentWidthInPx: constObservable(0),
+		}));
+	}
+}
+
+function rectToProps(fn: (reader: IReader) => Rect): any {
+	return {
+		left: derived(reader => fn(reader).left),
+		top: derived(reader => fn(reader).top),
+		width: derived(reader => fn(reader).right - fn(reader).left),
+		height: derived(reader => fn(reader).bottom - fn(reader).top),
+	};
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/indicatorView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/indicatorView.ts
index 052451f326d..f5845663658 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/indicatorView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/indicatorView.ts
@@ -19,11 +19,9 @@ export interface IInlineEditsIndicatorState {
 	showAlways: boolean;
 }
 
-// editorHoverForeground
+
 export const inlineEditIndicatorForeground = registerColor('inlineEdit.indicator.foreground', buttonForeground, '');
-// editorHoverBackground
 export const inlineEditIndicatorBackground = registerColor('inlineEdit.indicator.background', buttonBackground, '');
-// editorHoverBorder
 export const inlineEditIndicatorBorder = registerColor('inlineEdit.indicator.border', buttonSeparator, '');
 
 export class InlineEditsIndicator extends Disposable {
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
index d9928a05b2e..73b9cbb5618 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
@@ -9,7 +9,7 @@ import { numberComparator } from '../../../../../../base/common/arrays.js';
 import { findFirstMin } from '../../../../../../base/common/arraysFind.js';
 import { BugIndicatingError } from '../../../../../../base/common/errors.js';
 import { Disposable, DisposableStore, toDisposable } from '../../../../../../base/common/lifecycle.js';
-import { derived, IObservable, IReader, observableValue, transaction } from '../../../../../../base/common/observable.js';
+import { derived, derivedObservableWithCache, IObservable, IReader, observableValue, transaction } from '../../../../../../base/common/observable.js';
 import { OS } from '../../../../../../base/common/platform.js';
 import { getIndentationLength, splitLines } from '../../../../../../base/common/strings.js';
 import { URI } from '../../../../../../base/common/uri.js';
@@ -329,6 +329,8 @@ export abstract class ObserverNode<T extends Element = Element> extends Disposab
 				} else {
 					this._element.tabIndex = value;
 				}
+			} else if (key.startsWith('on')) {
+				(this._element as any)[key] = value;
 			} else {
 				if (isObservable(value)) {
 					this._deriveds.push(derived(this, reader => {
@@ -425,12 +427,16 @@ type ElementAttributeKeys<T> = Partial<{
 }>;
 
 export function mapOutFalsy<T>(obs: IObservable<T | undefined | null | false>): IObservable<IObservable<T> | undefined | null | false> {
+	const nonUndefinedObs = derivedObservableWithCache<T | undefined | null | false>(undefined, (reader, lastValue) => obs.read(reader) || lastValue);
+
 	return derived(reader => {
+		nonUndefinedObs.read(reader);
 		const val = obs.read(reader);
 		if (!val) {
 			return undefined;
 		}
-		return obs as IObservable<T>;
+
+		return nonUndefinedObs as IObservable<T>;
 	});
 }
 
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.ts
index 945c91b9e13..68bc963e374 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { derived, IObservable, IReader } from '../../../../../../base/common/observable.js';
+import { autorunWithStore, derived, IObservable, IReader } from '../../../../../../base/common/observable.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { ICodeEditor } from '../../../../../browser/editorBrowser.js';
 import { observableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
@@ -15,6 +15,7 @@ import { StringText } from '../../../../../common/core/textEdit.js';
 import { DetailedLineRangeMapping, lineRangeMappingFromRangeMappings, RangeMapping } from '../../../../../common/diff/rangeMapping.js';
 import { TextModel } from '../../../../../common/model/textModel.js';
 import { InlineCompletionsModel } from '../../model/inlineCompletionsModel.js';
+import { InlineEditsGutterIndicator } from './gutterIndicatorView.js';
 import { IInlineEditsIndicatorState, InlineEditsIndicator } from './indicatorView.js';
 import { IOriginalEditorInlineDiffViewState, OriginalEditorInlineDiffView } from './inlineDiffView.js';
 import { InlineEditsSideBySideDiff } from './sideBySideDiff.js';
@@ -118,19 +119,29 @@ export class InlineEditsView extends Disposable {
 
 	protected readonly _inlineDiffView = this._register(new OriginalEditorInlineDiffView(this._editor, this._inlineDiffViewState, this._previewTextModel));
 
-	protected readonly _indicator = this._register(new InlineEditsIndicator(
-		this._editorObs,
-		derived<IInlineEditsIndicatorState | undefined>(reader => {
-			const state = this._uiState.read(reader);
-			if (!state) { return undefined; }
-
-			const range = state.originalDisplayRange;
-			const top = this._editor.getTopForLineNumber(range.startLineNumber) - this._editorObs.scrollTop.read(reader);
-
-			return { editTop: top, showAlways: state.state !== 'sideBySide' };
-		}),
-		this._model,
-	));
+	private readonly _useGutterIndicator = observableCodeEditor(this._editor).getOption(EditorOption.inlineSuggest).map(s => s.edits.experimental.useGutterIndicator);
+
+	protected readonly _indicator = this._register(autorunWithStore((reader, store) => {
+		if (this._useGutterIndicator.read(reader)) {
+			store.add(new InlineEditsGutterIndicator(
+				this._editorObs,
+				this._uiState.map(s => s && s.originalDisplayRange),
+				this._model,
+			));
+		} else {
+			store.add(new InlineEditsIndicator(
+				this._editorObs,
+				derived<IInlineEditsIndicatorState | undefined>(reader => {
+					const state = this._uiState.read(reader);
+					if (!state) { return undefined; }
+					const range = state.originalDisplayRange;
+					const top = this._editor.getTopForLineNumber(range.startLineNumber) - this._editorObs.scrollTop.read(reader);
+					return { editTop: top, showAlways: state.state !== 'sideBySide' };
+				}),
+				this._model,
+			));
+		}
+	}));
 
 	private determinRenderState(edit: InlineEditWithChanges, reader: IReader, diff: DetailedLineRangeMapping[]) {
 		if (edit.isCollapsed) {
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index 77cd7ae49a5..7b6d78e8552 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -4605,6 +4605,7 @@ declare namespace monaco.editor {
 				useMixedLinesDiff?: 'never' | 'whenPossible' | 'forStableInsertions' | 'afterJumpWhenPossible';
 				useInterleavedLinesDiff?: 'never' | 'always' | 'afterJump';
 				onlyShowWhenCloseToCursor?: boolean;
+				useGutterIndicator?: boolean;
 			};
 		};
 	}

From 0900a621135265c95c0a499b5123e2cae848ae1f Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Wed, 18 Dec 2024 15:40:29 -0600
Subject: [PATCH 373/479] get terminal completions to work for screen reader
 users (#236516)

fix #235022
---
 .../suggest/browser/simpleSuggestWidget.ts    | 72 ++++++++++++++++++-
 .../browser/simpleSuggestWidgetRenderer.ts    |  2 +-
 2 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
index 61fb7437cea..bc9c9ea0cba 100644
--- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
@@ -10,9 +10,9 @@ import { List } from '../../../../base/browser/ui/list/listWidget.js';
 import { ResizableHTMLElement } from '../../../../base/browser/ui/resizable/resizable.js';
 import { SimpleCompletionItem } from './simpleCompletionItem.js';
 import { LineContext, SimpleCompletionModel } from './simpleCompletionModel.js';
-import { SimpleSuggestWidgetItemRenderer, type ISimpleSuggestWidgetFontInfo } from './simpleSuggestWidgetRenderer.js';
+import { getAriaId, SimpleSuggestWidgetItemRenderer, type ISimpleSuggestWidgetFontInfo } from './simpleSuggestWidgetRenderer.js';
 import { TimeoutTimer } from '../../../../base/common/async.js';
-import { Emitter, Event } from '../../../../base/common/event.js';
+import { Emitter, Event, PauseableEmitter } from '../../../../base/common/event.js';
 import { MutableDisposable, Disposable } from '../../../../base/common/lifecycle.js';
 import { clamp } from '../../../../base/common/numbers.js';
 import { localize } from '../../../../nls.js';
@@ -68,7 +68,9 @@ export class SimpleSuggestWidget extends Disposable {
 	private _forceRenderingAbove: boolean = false;
 	private _preference?: WidgetPositionPreference;
 	private readonly _pendingLayout = this._register(new MutableDisposable());
-
+	// private _currentSuggestionDetails?: CancelablePromise<void>;
+	private _focusedItem?: SimpleCompletionItem;
+	private _ignoreFocusEvents: boolean = false;
 	readonly element: ResizableHTMLElement;
 	private readonly _messageElement: HTMLElement;
 	private readonly _listElement: HTMLElement;
@@ -83,6 +85,8 @@ export class SimpleSuggestWidget extends Disposable {
 	readonly onDidHide: Event<this> = this._onDidHide.event;
 	private readonly _onDidShow = this._register(new Emitter<this>());
 	readonly onDidShow: Event<this> = this._onDidShow.event;
+	private readonly _onDidFocus = new PauseableEmitter<ISimpleSelectedSuggestion>();
+	readonly onDidFocus: Event<ISimpleSelectedSuggestion> = this._onDidFocus.event;
 
 	get list(): List<SimpleCompletionItem> { return this._list; }
 
@@ -206,6 +210,7 @@ export class SimpleSuggestWidget extends Disposable {
 
 		this._register(this._list.onMouseDown(e => this._onListMouseDownOrTap(e)));
 		this._register(this._list.onTap(e => this._onListMouseDownOrTap(e)));
+		this._register(this._list.onDidChangeFocus(e => this._onListFocus(e)));
 		this._register(this._list.onDidChangeSelection(e => this._onListSelection(e)));
 		this._register(configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('editor.suggest.showIcons')) {
@@ -214,6 +219,67 @@ export class SimpleSuggestWidget extends Disposable {
 		}));
 	}
 
+	private _onListFocus(e: IListEvent<SimpleCompletionItem>): void {
+		if (this._ignoreFocusEvents) {
+			return;
+		}
+
+		if (this._state === State.Details) {
+			// This can happen when focus is in the details-panel and when
+			// arrow keys are pressed to select next/prev items
+			this._setState(State.Open);
+		}
+
+		if (!e.elements.length) {
+			// if (this._currentSuggestionDetails) {
+			// 	this._currentSuggestionDetails.cancel();
+			// 	this._currentSuggestionDetails = undefined;
+			// 	this._focusedItem = undefined;
+			// }
+			this._clearAriaActiveDescendant();
+			return;
+		}
+
+		if (!this._completionModel) {
+			return;
+		}
+
+		// this._ctxSuggestWidgetHasFocusedSuggestion.set(true);
+		const item = e.elements[0];
+		const index = e.indexes[0];
+
+		if (item !== this._focusedItem) {
+
+			// this._currentSuggestionDetails?.cancel();
+			// this._currentSuggestionDetails = undefined;
+
+			this._focusedItem = item;
+
+			this._list.reveal(index);
+			const id = getAriaId(index);
+			const node = dom.getActiveWindow().document.activeElement;
+			if (node && id) {
+				node.setAttribute('aria-haspopup', 'true');
+				node.setAttribute('aria-autocomplete', 'list');
+				node.setAttribute('aria-activedescendant', id);
+			} else {
+				this._clearAriaActiveDescendant();
+			}
+		}
+		// emit an event
+		this._onDidFocus.fire({ item, index, model: this._completionModel });
+	}
+
+	private _clearAriaActiveDescendant(): void {
+		const node = dom.getActiveWindow().document.activeElement;
+		if (!node) {
+			return;
+		}
+		node.setAttribute('aria-haspopup', 'false');
+		node.setAttribute('aria-autocomplete', 'both');
+		node.removeAttribute('aria-activedescendant');
+	}
+
 	private _cursorPosition?: { top: number; left: number; height: number };
 
 	setCompletionModel(completionModel: SimpleCompletionModel) {
diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer.ts
index 86e0f510b0f..83605e2156d 100644
--- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer.ts
@@ -14,7 +14,7 @@ import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 
 export function getAriaId(index: number): string {
-	return `simple-suggest-aria-id:${index}`;
+	return `simple-suggest-aria-id-${index}`;
 }
 
 export interface ISimpleSuggestionTemplateData {

From 4572abc566c41ae926fcd01c979f9e312c69a7ca Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Wed, 18 Dec 2024 13:51:49 -0800
Subject: [PATCH 374/479] debug: fix REPL input not resizing when pasting
 content that wraps (#236519)

Fixes #229541
---
 src/vs/workbench/contrib/debug/browser/repl.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/contrib/debug/browser/repl.ts b/src/vs/workbench/contrib/debug/browser/repl.ts
index 29504942045..4bcfe48be3e 100644
--- a/src/vs/workbench/contrib/debug/browser/repl.ts
+++ b/src/vs/workbench/contrib/debug/browser/repl.ts
@@ -109,7 +109,6 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 	private replInput!: CodeEditorWidget;
 	private replInputContainer!: HTMLElement;
 	private bodyContentDimension: dom.Dimension | undefined;
-	private replInputLineCount = 1;
 	private model: ITextModel | undefined;
 	private setHistoryNavigationEnablement!: (enabled: boolean) => void;
 	private scopedInstantiationService!: IInstantiationService;
@@ -476,9 +475,7 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 			revealLastElement(this.tree!);
 			this.history.add(this.replInput.getValue());
 			this.replInput.setValue('');
-			const shouldRelayout = this.replInputLineCount > 1;
-			this.replInputLineCount = 1;
-			if (shouldRelayout && this.bodyContentDimension) {
+			if (this.bodyContentDimension) {
 				// Trigger a layout to shrink a potential multi line input
 				this.layoutBodyContent(this.bodyContentDimension.height, this.bodyContentDimension.width);
 			}
@@ -737,12 +734,14 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 
 		this.replInput = this.scopedInstantiationService.createInstance(CodeEditorWidget, this.replInputContainer, options, getSimpleCodeEditorWidgetOptions());
 
+		let lastContentHeight = -1;
 		this._register(this.replInput.onDidChangeModelContent(() => {
 			const model = this.replInput.getModel();
 			this.setHistoryNavigationEnablement(!!model && model.getValue() === '');
-			const lineCount = model ? Math.min(10, model.getLineCount()) : 1;
-			if (lineCount !== this.replInputLineCount) {
-				this.replInputLineCount = lineCount;
+
+			const contentHeight = this.replInput.getContentHeight();
+			if (contentHeight !== lastContentHeight) {
+				lastContentHeight = contentHeight;
 				if (this.bodyContentDimension) {
 					this.layoutBodyContent(this.bodyContentDimension.height, this.bodyContentDimension.width);
 				}

From a7d5ca7e7d5d97e6cefa9fc9f4d16950829bdfd7 Mon Sep 17 00:00:00 2001
From: Michael Lively <milively@microsoft.com>
Date: Wed, 18 Dec 2024 14:12:51 -0800
Subject: [PATCH 375/479] Fix logic for notebook outline data source isEmpty()
 fn (#236525)

amend logic for notebook outline data source isEmpty()
---
 .../contrib/outline/notebookOutline.ts        | 61 ++++++++++++-------
 1 file changed, 39 insertions(+), 22 deletions(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts b/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts
index 7df78960c43..0e3812f9f8b 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/outline/notebookOutline.ts
@@ -346,6 +346,28 @@ export class NotebookQuickPickProvider implements IQuickPickDataSource<OutlineEn
 	}
 }
 
+/**
+ * Checks if the given outline entry should be filtered out of the outlinePane
+ *
+ * @param entry the OutlineEntry to check
+ * @param showMarkdownHeadersOnly whether to show only markdown headers
+ * @param showCodeCells whether to show code cells
+ * @param showCodeCellSymbols whether to show code cell symbols
+ * @returns true if the entry should be filtered out of the outlinePane, false if the entry should be visible.
+ */
+function filterEntry(entry: OutlineEntry, showMarkdownHeadersOnly: boolean, showCodeCells: boolean, showCodeCellSymbols: boolean): boolean {
+	// if any are true, return true, this entry should NOT be included in the outline
+	if (
+		(showMarkdownHeadersOnly && entry.cell.cellKind === CellKind.Markup && entry.level === NotebookOutlineConstants.NonHeaderOutlineLevel) ||	// show headers only   + cell is mkdn + is level 7 (not header)
+		(!showCodeCells && entry.cell.cellKind === CellKind.Code) ||																				// show code cells off + cell is code
+		(!showCodeCellSymbols && entry.cell.cellKind === CellKind.Code && entry.level > NotebookOutlineConstants.NonHeaderOutlineLevel)				// show symbols off    + cell is code + is level >7 (nb symbol levels)
+	) {
+		return true;
+	}
+
+	return false;
+}
+
 export class NotebookOutlinePaneProvider implements IDataSource<NotebookCellOutline, OutlineEntry> {
 
 	private readonly _disposables = new DisposableStore();
@@ -381,14 +403,14 @@ export class NotebookOutlinePaneProvider implements IDataSource<NotebookCellOutl
 			return undefined;
 		}
 
-		if (!this.filterEntry(newActive)) {
+		if (!filterEntry(newActive, this.showMarkdownHeadersOnly, this.showCodeCells, this.showCodeCellSymbols)) {
 			return newActive;
 		}
 
 		// find a valid parent
 		let parent = newActive.parent;
 		while (parent) {
-			if (this.filterEntry(parent)) {
+			if (filterEntry(parent, this.showMarkdownHeadersOnly, this.showCodeCells, this.showCodeCellSymbols)) {
 				parent = parent.parent;
 			} else {
 				return parent;
@@ -399,25 +421,6 @@ export class NotebookOutlinePaneProvider implements IDataSource<NotebookCellOutl
 		return undefined;
 	}
 
-	/**
-	 * Checks if the given outline entry should be filtered out of the outlinePane
-	 *
-	 * @param entry the OutlineEntry to check
-	 * @returns true if the entry should be filtered out of the outlinePane
-	 */
-	private filterEntry(entry: OutlineEntry): boolean {
-		// if any are true, return true, this entry should NOT be included in the outline
-		if (
-			(this.showMarkdownHeadersOnly && entry.cell.cellKind === CellKind.Markup && entry.level === NotebookOutlineConstants.NonHeaderOutlineLevel) ||	// show headers only   + cell is mkdn + is level 7 (not header)
-			(!this.showCodeCells && entry.cell.cellKind === CellKind.Code) ||																				// show code cells off + cell is code
-			(!this.showCodeCellSymbols && entry.cell.cellKind === CellKind.Code && entry.level > NotebookOutlineConstants.NonHeaderOutlineLevel)				// show symbols off    + cell is code + is level >7 (nb symbol levels)
-		) {
-			return true;
-		}
-
-		return false;
-	}
-
 	*getChildren(element: NotebookCellOutline | OutlineEntry): Iterable<OutlineEntry> {
 		const isOutline = element instanceof NotebookCellOutline;
 		const entries = isOutline ? this.outlineDataSourceRef?.object?.entries ?? [] : element.children;
@@ -518,7 +521,9 @@ export class NotebookCellOutline implements IOutline<OutlineEntry> {
 	private _breadcrumbsDataSource!: IBreadcrumbsDataSource<OutlineEntry>;
 
 	// view settings
+	private outlineShowCodeCells: boolean;
 	private outlineShowCodeCellSymbols: boolean;
+	private outlineShowMarkdownHeadersOnly: boolean;
 
 	// getters
 	get activeElement(): OutlineEntry | undefined {
@@ -538,7 +543,13 @@ export class NotebookCellOutline implements IOutline<OutlineEntry> {
 		return this._outlineDataSourceReference?.object?.uri;
 	}
 	get isEmpty(): boolean {
-		return this._outlineDataSourceReference?.object?.isEmpty ?? true;
+		if (!this._outlineDataSourceReference?.object?.entries) {
+			return true;
+		}
+
+		return !this._outlineDataSourceReference.object.entries.some(entry => {
+			return !filterEntry(entry, this.outlineShowMarkdownHeadersOnly, this.outlineShowCodeCells, this.outlineShowCodeCellSymbols);
+		});
 	}
 
 	private checkDelayer() {
@@ -558,7 +569,9 @@ export class NotebookCellOutline implements IOutline<OutlineEntry> {
 		@ILanguageFeaturesService private readonly _languageFeaturesService: ILanguageFeaturesService,
 		@INotebookExecutionStateService private readonly _notebookExecutionStateService: INotebookExecutionStateService,
 	) {
+		this.outlineShowCodeCells = this._configurationService.getValue<boolean>(NotebookSetting.outlineShowCodeCells);
 		this.outlineShowCodeCellSymbols = this._configurationService.getValue<boolean>(NotebookSetting.outlineShowCodeCellSymbols);
+		this.outlineShowMarkdownHeadersOnly = this._configurationService.getValue<boolean>(NotebookSetting.outlineShowMarkdownHeadersOnly);
 
 		this.initializeOutline();
 
@@ -615,6 +628,10 @@ export class NotebookCellOutline implements IOutline<OutlineEntry> {
 				e.affectsConfiguration(NotebookSetting.outlineShowCodeCellSymbols) ||
 				e.affectsConfiguration(NotebookSetting.breadcrumbsShowCodeCells)
 			) {
+				this.outlineShowCodeCells = this._configurationService.getValue<boolean>(NotebookSetting.outlineShowCodeCells);
+				this.outlineShowCodeCellSymbols = this._configurationService.getValue<boolean>(NotebookSetting.outlineShowCodeCellSymbols);
+				this.outlineShowMarkdownHeadersOnly = this._configurationService.getValue<boolean>(NotebookSetting.outlineShowMarkdownHeadersOnly);
+
 				this.delayedRecomputeState();
 			}
 		}));

From 6869b35a03738298550ab62968cc817ab15828e3 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Wed, 18 Dec 2024 14:16:19 -0800
Subject: [PATCH 376/479] Show chat participants and tools on extension
 features page (#236526)

* Show chat participants and tools on extension features page

* Remove "ID"
---
 .../platform/extensions/common/extensions.ts  | 19 ++++++-
 .../browser/chatParticipant.contribution.ts   | 54 +++++++++++++++++-
 .../common/chatParticipantContribTypes.ts     |  1 -
 .../tools/languageModelToolsContribution.ts   | 55 ++++++++++++++++++-
 4 files changed, 122 insertions(+), 7 deletions(-)

diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts
index 687fd50dc36..d6758a9b54d 100644
--- a/src/vs/platform/extensions/common/extensions.ts
+++ b/src/vs/platform/extensions/common/extensions.ts
@@ -167,6 +167,22 @@ export interface ILocalizationContribution {
 	minimalTranslations?: { [key: string]: string };
 }
 
+export interface IChatParticipantContribution {
+	id: string;
+	name: string;
+	fullName: string;
+	description?: string;
+	isDefault?: boolean;
+	commands?: { name: string }[];
+}
+
+export interface IToolContribution {
+	name: string;
+	displayName: string;
+	modelDescription: string;
+	userDescription?: string;
+}
+
 export interface IExtensionContributions {
 	commands?: ICommand[];
 	configuration?: any;
@@ -192,7 +208,8 @@ export interface IExtensionContributions {
 	readonly notebooks?: INotebookEntry[];
 	readonly notebookRenderer?: INotebookRendererContribution[];
 	readonly debugVisualizers?: IDebugVisualizationContribution[];
-	readonly chatParticipants?: ReadonlyArray<{ id: string }>;
+	readonly chatParticipants?: ReadonlyArray<IChatParticipantContribution>;
+	readonly languageModelTools?: ReadonlyArray<IToolContribution>;
 }
 
 export interface IExtensionCapabilities {
diff --git a/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts b/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
index 6326c643d9c..3d16ee993b7 100644
--- a/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts
@@ -7,12 +7,13 @@ import { coalesce, isNonEmptyArray } from '../../../../base/common/arrays.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { toErrorMessage } from '../../../../base/common/errorMessage.js';
 import { Event } from '../../../../base/common/event.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import { Disposable, DisposableMap, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import * as strings from '../../../../base/common/strings.js';
 import { localize, localize2 } from '../../../../nls.js';
 import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { ExtensionIdentifier, IExtensionManifest } from '../../../../platform/extensions/common/extensions.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
@@ -20,6 +21,7 @@ import { Registry } from '../../../../platform/registry/common/platform.js';
 import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IViewContainersRegistry, IViewDescriptor, IViewsRegistry, ViewContainer, ViewContainerLocation, Extensions as ViewExtensions } from '../../../common/views.js';
+import { IExtensionFeatureTableRenderer, IRenderedData, ITableData, IRowData, IExtensionFeaturesRegistry, Extensions } from '../../../services/extensionManagement/common/extensionFeatures.js';
 import { isProposedApiEnabled } from '../../../services/extensions/common/extensions.js';
 import * as extensionsRegistry from '../../../services/extensions/common/extensionsRegistry.js';
 import { showExtensionsWithIdsCommandId } from '../../extensions/browser/extensionsActions.js';
@@ -202,7 +204,7 @@ export class ChatExtensionPointHandler implements IWorkbenchContribution {
 						continue;
 					}
 
-					if ((providerDescriptor.defaultImplicitVariables || providerDescriptor.locations) && !isProposedApiEnabled(extension.description, 'chatParticipantAdditions')) {
+					if (providerDescriptor.locations && !isProposedApiEnabled(extension.description, 'chatParticipantAdditions')) {
 						this.logService.error(`Extension '${extension.description.identifier.value}' CANNOT use API proposal: chatParticipantAdditions.`);
 						continue;
 					}
@@ -423,3 +425,51 @@ export class ChatCompatibilityNotifier extends Disposable implements IWorkbenchC
 		}));
 	}
 }
+
+class ChatParticipantDataRenderer extends Disposable implements IExtensionFeatureTableRenderer {
+	readonly type = 'table';
+
+	shouldRender(manifest: IExtensionManifest): boolean {
+		return !!manifest.contributes?.chatParticipants;
+	}
+
+	render(manifest: IExtensionManifest): IRenderedData<ITableData> {
+		const nonDefaultContributions = manifest.contributes?.chatParticipants?.filter(c => !c.isDefault) ?? [];
+		if (!nonDefaultContributions.length) {
+			return { data: { headers: [], rows: [] }, dispose: () => { } };
+		}
+
+		const headers = [
+			localize('participantName', "Name"),
+			localize('participantFullName', "Full Name"),
+			localize('participantDescription', "Description"),
+			localize('participantCommands', "Commands"),
+		];
+
+		const rows: IRowData[][] = nonDefaultContributions.map(d => {
+			return [
+				'@' + d.name,
+				d.fullName,
+				d.description ?? '-',
+				d.commands?.length ? new MarkdownString(d.commands.map(c => `- /` + c.name).join('\n')) : '-'
+			];
+		});
+
+		return {
+			data: {
+				headers,
+				rows
+			},
+			dispose: () => { }
+		};
+	}
+}
+
+Registry.as<IExtensionFeaturesRegistry>(Extensions.ExtensionFeaturesRegistry).registerExtensionFeature({
+	id: 'chatParticipants',
+	label: localize('chatParticipants', "Chat Participants"),
+	access: {
+		canToggle: false
+	},
+	renderer: new SyncDescriptor(ChatParticipantDataRenderer),
+});
diff --git a/src/vs/workbench/contrib/chat/common/chatParticipantContribTypes.ts b/src/vs/workbench/contrib/chat/common/chatParticipantContribTypes.ts
index e17e9a1322f..211d7e7e9c9 100644
--- a/src/vs/workbench/contrib/chat/common/chatParticipantContribTypes.ts
+++ b/src/vs/workbench/contrib/chat/common/chatParticipantContribTypes.ts
@@ -25,7 +25,6 @@ export interface IRawChatParticipantContribution {
 	isSticky?: boolean;
 	sampleRequest?: string;
 	commands?: IRawChatCommandContribution[];
-	defaultImplicitVariables?: string[];
 	locations?: RawChatParticipantLocation[];
 	disambiguation?: { category: string; categoryName?: string /** Deprecated */; description: string; examples: string[] }[];
 }
diff --git a/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts b/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts
index de36f417e6a..e78ef045c61 100644
--- a/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts
+++ b/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.ts
@@ -3,19 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-
 import { IJSONSchema } from '../../../../../base/common/jsonSchema.js';
-import { DisposableMap } from '../../../../../base/common/lifecycle.js';
+import { DisposableMap, Disposable } from '../../../../../base/common/lifecycle.js';
 import { joinPath } from '../../../../../base/common/resources.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { localize } from '../../../../../nls.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
-import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
+import { ExtensionIdentifier, IExtensionManifest } from '../../../../../platform/extensions/common/extensions.js';
 import { ILogService } from '../../../../../platform/log/common/log.js';
 import { IWorkbenchContribution } from '../../../../common/contributions.js';
 import { ILanguageModelToolsService, IToolData } from '../languageModelToolsService.js';
 import * as extensionsRegistry from '../../../../services/extensions/common/extensionsRegistry.js';
 import { toolsParametersSchemaSchemaId } from './languageModelToolsParametersSchema.js';
+import { MarkdownString } from '../../../../../base/common/htmlContent.js';
+import { SyncDescriptor } from '../../../../../platform/instantiation/common/descriptors.js';
+import { Registry } from '../../../../../platform/registry/common/platform.js';
+import { IExtensionFeatureTableRenderer, IRenderedData, ITableData, IRowData, IExtensionFeaturesRegistry, Extensions } from '../../../../services/extensionManagement/common/extensionFeatures.js';
 
 export interface IRawToolContribution {
 	name: string;
@@ -192,3 +195,49 @@ export class LanguageModelToolsExtensionPointHandler implements IWorkbenchContri
 		});
 	}
 }
+
+class LanguageModelToolDataRenderer extends Disposable implements IExtensionFeatureTableRenderer {
+	readonly type = 'table';
+
+	shouldRender(manifest: IExtensionManifest): boolean {
+		return !!manifest.contributes?.languageModelTools;
+	}
+
+	render(manifest: IExtensionManifest): IRenderedData<ITableData> {
+		const contribs = manifest.contributes?.languageModelTools ?? [];
+		if (!contribs.length) {
+			return { data: { headers: [], rows: [] }, dispose: () => { } };
+		}
+
+		const headers = [
+			localize('toolTableName', "Name"),
+			localize('toolTableDisplayName', "Display Name"),
+			localize('toolTableDescription', "Description"),
+		];
+
+		const rows: IRowData[][] = contribs.map(t => {
+			return [
+				new MarkdownString(`\`${t.name}\``),
+				t.displayName,
+				t.userDescription ?? t.modelDescription,
+			];
+		});
+
+		return {
+			data: {
+				headers,
+				rows
+			},
+			dispose: () => { }
+		};
+	}
+}
+
+Registry.as<IExtensionFeaturesRegistry>(Extensions.ExtensionFeaturesRegistry).registerExtensionFeature({
+	id: 'languageModelTools',
+	label: localize('langModelTools', "Language Model Tools"),
+	access: {
+		canToggle: false
+	},
+	renderer: new SyncDescriptor(LanguageModelToolDataRenderer),
+});

From 37b1016c80c5e6cd667c382765651055ad9f0ba8 Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <me@tylerleonhardt.com>
Date: Wed, 18 Dec 2024 15:04:42 -0800
Subject: [PATCH 377/479] Lock some SCM strings (#236531)

Fixes https://github.com/microsoft/vscode/issues/236530
---
 extensions/git/package.nls.json | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
index d706b650c8a..6db253137e1 100644
--- a/extensions/git/package.nls.json
+++ b/extensions/git/package.nls.json
@@ -310,6 +310,8 @@
 		"message": "[Download Git for Windows](https://git-scm.com/download/win)\nAfter installing, please [reload](command:workbench.action.reloadWindow) (or [troubleshoot](command:git.showOutput)). Additional source control providers can be installed [from the Marketplace](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22).",
 		"comment": [
 			"{Locked='](command:workbench.action.reloadWindow'}",
+			"{Locked='](command:git.showOutput'}",
+			"{Locked='](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22'}",
 			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
@@ -318,6 +320,8 @@
 		"message": "[Download Git for macOS](https://git-scm.com/download/mac)\nAfter installing, please [reload](command:workbench.action.reloadWindow) (or [troubleshoot](command:git.showOutput)). Additional source control providers can be installed [from the Marketplace](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22).",
 		"comment": [
 			"{Locked='](command:workbench.action.reloadWindow'}",
+			"{Locked='](command:git.showOutput'}",
+			"{Locked='](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22'}",
 			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
@@ -326,11 +330,19 @@
 		"message": "Source control depends on Git being installed.\n[Download Git for Linux](https://git-scm.com/download/linux)\nAfter installing, please [reload](command:workbench.action.reloadWindow) (or [troubleshoot](command:git.showOutput)). Additional source control providers can be installed [from the Marketplace](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22).",
 		"comment": [
 			"{Locked='](command:workbench.action.reloadWindow'}",
+			"{Locked='](command:git.showOutput'}",
+			"{Locked='](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22'}",
 			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
 		]
 	},
-	"view.workbench.scm.missing": "Install Git, a popular source control system, to track code changes and collaborate with others. Learn more in our [Git guides](https://aka.ms/vscode-scm).",
+	"view.workbench.scm.missing": {
+		"message": "Install Git, a popular source control system, to track code changes and collaborate with others. Learn more in our [Git guides](https://aka.ms/vscode-scm).",
+		"comment": [
+			"{Locked='](https://aka.ms/vscode-scm'}",
+			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
+		]
+	},
 	"view.workbench.scm.disabled": {
 		"message": "If you would like to use Git features, please enable Git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 		"comment": [

From 03e9e31965788888ef75b7b5b5baa73897f2db0a Mon Sep 17 00:00:00 2001
From: SteVen Batten <sbatten@microsoft.com>
Date: Wed, 18 Dec 2024 17:25:00 -0800
Subject: [PATCH 378/479] Await remote extensions before checking enablement
 (#236538)

await remote extensions before checking enablement
---
 src/vs/workbench/contrib/chat/browser/chatSetup.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index aab4103ddac..f42fd26ada5 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -60,6 +60,7 @@ import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IHostService } from '../../../services/host/browser/host.js';
 import Severity from '../../../../base/common/severity.js';
+import { IRemoteExtensionsScannerService } from '../../../../platform/remote/common/remoteExtensionsScanner.js';
 
 const defaultChat = {
 	extensionId: product.defaultChatAgent?.extensionId ?? '',
@@ -1022,6 +1023,7 @@ class ChatSetupContext extends Disposable {
 		@IExtensionService private readonly extensionService: IExtensionService,
 		@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
 		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
+		@IRemoteExtensionsScannerService private readonly remoteExtensionsScannerService: IRemoteExtensionsScannerService,
 		@ILogService private readonly logService: ILogService
 	) {
 		super();
@@ -1047,6 +1049,7 @@ class ChatSetupContext extends Disposable {
 			}
 		}));
 
+		await this.remoteExtensionsScannerService.whenExtensionsReady();
 		const extensions = await this.extensionManagementService.getInstalled();
 		const defaultChatExtension = extensions.find(value => ExtensionIdentifier.equals(value.identifier.id, defaultChat.extensionId));
 		this.update({ installed: !!defaultChatExtension && this.extensionEnablementService.isEnabled(defaultChatExtension) });

From dd86be1a95485a849a2003721b6e08235c46b031 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Wed, 18 Dec 2024 17:33:45 -0800
Subject: [PATCH 379/479] lists: support user selection in lists, and adopt it
 in the debug console (#236534)

- Adds a `userSelection` option on lists that can be used to control behavior
- Uses the DND logic for handling scrolling near the top and bottom
- Preserved selected list elements while they're selected to ensure they
  can be accurately copied.
- The DOM events we get around selection are pretty poor. I support mouse
  here but I'm unclear if/how touch events should be handled.

![](https://memes.peet.io/img/24-12-f06c680d-f209-476b-8945-b6fc33efe502.mp4)

Fixes #228432, cc @joaomoreno
---
 src/vs/base/browser/ui/list/listView.ts       | 98 +++++++++++++++++--
 src/vs/base/browser/ui/list/listWidget.ts     |  1 +
 .../workbench/contrib/debug/browser/repl.ts   |  1 +
 3 files changed, 94 insertions(+), 6 deletions(-)

diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts
index 00a19352e91..36355a377ba 100644
--- a/src/vs/base/browser/ui/list/listView.ts
+++ b/src/vs/base/browser/ui/list/listView.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { DataTransfers, IDragAndDropData } from '../../dnd.js';
-import { $, addDisposableListener, animate, Dimension, getContentHeight, getContentWidth, getTopLeftOffset, getWindow, isAncestor, isHTMLElement, isSVGElement, scheduleAtNextAnimationFrame } from '../../dom.js';
+import { $, addDisposableListener, animate, Dimension, getContentHeight, getContentWidth, getDocument, getTopLeftOffset, getWindow, isAncestor, isHTMLElement, isSVGElement, scheduleAtNextAnimationFrame } from '../../dom.js';
 import { DomEmitter } from '../../event.js';
 import { IMouseWheelEvent } from '../../mouseEvent.js';
 import { EventType as TouchEventType, Gesture, GestureEvent } from '../../touch.js';
@@ -82,6 +82,7 @@ export interface IListViewOptions<T> extends IListViewOptionsUpdate {
 	readonly setRowHeight?: boolean;
 	readonly supportDynamicHeights?: boolean;
 	readonly mouseSupport?: boolean;
+	readonly userSelection?: boolean;
 	readonly accessibilityProvider?: IListViewAccessibilityProvider<T>;
 	readonly transformOptimization?: boolean;
 	readonly alwaysConsumeMouseWheel?: boolean;
@@ -105,7 +106,7 @@ const DefaultOptions = {
 	horizontalScrolling: false,
 	transformOptimization: true,
 	alwaysConsumeMouseWheel: true,
-};
+} satisfies IListViewOptions<any>;
 
 export class ElementsDragAndDropData<T, TContext = void> implements IDragAndDropData {
 
@@ -321,6 +322,8 @@ export class ListView<T> implements IListView<T> {
 	private currentDragFeedbackPosition: ListDragOverEffectPosition | undefined;
 	private currentDragFeedbackDisposable: IDisposable = Disposable.None;
 	private onDragLeaveTimeout: IDisposable = Disposable.None;
+	private currentSelectionDisposable: IDisposable = Disposable.None;
+	private currentSelectionBounds: IRange | undefined;
 
 	private readonly disposables: DisposableStore = new DisposableStore();
 
@@ -369,7 +372,7 @@ export class ListView<T> implements IListView<T> {
 		container: HTMLElement,
 		private virtualDelegate: IListVirtualDelegate<T>,
 		renderers: IListRenderer<any /* TODO@joao */, any>[],
-		options: IListViewOptions<T> = DefaultOptions as IListViewOptions<T>
+		options: IListViewOptions<T> = DefaultOptions
 	) {
 		if (options.horizontalScrolling && options.supportDynamicHeights) {
 			throw new Error('Horizontal scrolling and dynamic heights not supported simultaneously');
@@ -444,6 +447,12 @@ export class ListView<T> implements IListView<T> {
 		this.disposables.add(addDisposableListener(this.domNode, 'drop', e => this.onDrop(this.toDragEvent(e))));
 		this.disposables.add(addDisposableListener(this.domNode, 'dragleave', e => this.onDragLeave(this.toDragEvent(e))));
 		this.disposables.add(addDisposableListener(this.domNode, 'dragend', e => this.onDragEnd(e)));
+		if (options.userSelection) {
+			if (options.dnd) {
+				throw new Error('DND and user selection cannot be used simultaneously');
+			}
+			this.disposables.add(addDisposableListener(this.domNode, 'mousedown', e => this.onPotentialSelectionStart(e)));
+		}
 
 		this.setRowLineHeight = options.setRowLineHeight ?? DefaultOptions.setRowLineHeight;
 		this.setRowHeight = options.setRowHeight ?? DefaultOptions.setRowHeight;
@@ -768,7 +777,7 @@ export class ListView<T> implements IListView<T> {
 	}
 
 	get firstVisibleIndex(): number {
-		const range = this.getRenderRange(this.lastRenderTop, this.lastRenderHeight);
+		const range = this.getVisibleRange(this.lastRenderTop, this.lastRenderHeight);
 		return range.start;
 	}
 
@@ -1168,6 +1177,73 @@ export class ListView<T> implements IListView<T> {
 		this.dnd.onDragStart?.(this.currentDragData, event);
 	}
 
+	private onPotentialSelectionStart(e: MouseEvent) {
+		this.currentSelectionDisposable.dispose();
+		const doc = getDocument(this.domNode);
+
+		// Set up both the 'movement store' for watching the mouse, and the
+		// 'selection store' which lasts as long as there's a selection, even
+		// after the usr has stopped modifying it.
+		const selectionStore = this.currentSelectionDisposable = new DisposableStore();
+		const movementStore = selectionStore.add(new DisposableStore());
+
+		// The selection events we get from the DOM are fairly limited and we lack a 'selection end' event.
+		// Selection events also don't tell us where the input doing the selection is. So, make a poor
+		// assumption that a user is using the mouse, and base our events on that.
+		movementStore.add(addDisposableListener(this.domNode, 'selectstart', () => {
+			this.setupDragAndDropScrollTopAnimation(e);
+
+			movementStore.add(addDisposableListener(doc, 'mousemove', e => this.setupDragAndDropScrollTopAnimation(e)));
+
+			// The selection is cleared either on mouseup if there's no selection, or on next mousedown
+			// when `this.currentSelectionDisposable` is reset.
+			selectionStore.add(toDisposable(() => {
+				const previousRenderRange = this.getRenderRange(this.lastRenderTop, this.lastRenderHeight);
+				this.currentSelectionBounds = undefined;
+				this.render(previousRenderRange, this.lastRenderTop, this.lastRenderHeight, undefined, undefined);
+			}));
+			selectionStore.add(addDisposableListener(doc, 'selectionchange', () => {
+				const selection = doc.getSelection();
+				if (!selection) {
+					return;
+				}
+
+				let start = this.getIndexOfListElement(selection.anchorNode as HTMLElement);
+				let end = this.getIndexOfListElement(selection.focusNode as HTMLElement);
+				if (start !== undefined && end !== undefined) {
+					if (end < start) {
+						[start, end] = [end, start];
+					}
+					this.currentSelectionBounds = { start, end };
+				}
+			}));
+		}));
+
+		movementStore.add(addDisposableListener(doc, 'mouseup', () => {
+			movementStore.dispose();
+
+			if (doc.getSelection()?.isCollapsed !== false) {
+				selectionStore.dispose();
+			}
+		}));
+	}
+
+	private getIndexOfListElement(element: HTMLElement | null): number | undefined {
+		if (!element || !this.domNode.contains(element)) {
+			return undefined;
+		}
+
+		while (element && element !== this.domNode) {
+			if (element.dataset?.index) {
+				return Number(element.dataset.index);
+			}
+
+			element = element.parentElement;
+		}
+
+		return undefined;
+	}
+
 	private onDragOver(event: IListDragEvent<T>): boolean {
 		event.browserEvent.preventDefault(); // needed so that the drop event fires (https://stackoverflow.com/questions/21339924/drop-event-not-firing-in-chrome)
 
@@ -1327,7 +1403,7 @@ export class ListView<T> implements IListView<T> {
 
 	// DND scroll top animation
 
-	private setupDragAndDropScrollTopAnimation(event: DragEvent): void {
+	private setupDragAndDropScrollTopAnimation(event: DragEvent | MouseEvent): void {
 		if (!this.dragOverAnimationDisposable) {
 			const viewTop = getTopLeftOffset(this.domNode).top;
 			this.dragOverAnimationDisposable = animate(getWindow(this.domNode), this.animateDragAndDropScrollTop.bind(this, viewTop));
@@ -1401,13 +1477,23 @@ export class ListView<T> implements IListView<T> {
 		return undefined;
 	}
 
-	protected getRenderRange(renderTop: number, renderHeight: number): IRange {
+	private getVisibleRange(renderTop: number, renderHeight: number): IRange {
 		return {
 			start: this.rangeMap.indexAt(renderTop),
 			end: this.rangeMap.indexAfter(renderTop + renderHeight - 1)
 		};
 	}
 
+	protected getRenderRange(renderTop: number, renderHeight: number): IRange {
+		const range = this.getVisibleRange(renderTop, renderHeight);
+		if (this.currentSelectionBounds) {
+			range.start = Math.min(range.start, this.currentSelectionBounds.start);
+			range.end = Math.max(range.end, this.currentSelectionBounds.end + 1);
+		}
+
+		return range;
+	}
+
 	/**
 	 * Given a stable rendered state, checks every rendered element whether it needs
 	 * to be probed for dynamic height. Adjusts scroll height and top if necessary.
diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
index ae9d5a46fb4..78932044f96 100644
--- a/src/vs/base/browser/ui/list/listWidget.ts
+++ b/src/vs/base/browser/ui/list/listWidget.ts
@@ -1056,6 +1056,7 @@ export interface IListOptions<T> extends IListOptionsUpdate {
 	readonly setRowHeight?: boolean;
 	readonly supportDynamicHeights?: boolean;
 	readonly mouseSupport?: boolean;
+	readonly userSelection?: boolean;
 	readonly horizontalScrolling?: boolean;
 	readonly scrollByPage?: boolean;
 	readonly transformOptimization?: boolean;
diff --git a/src/vs/workbench/contrib/debug/browser/repl.ts b/src/vs/workbench/contrib/debug/browser/repl.ts
index 4bcfe48be3e..a9959c5d1c5 100644
--- a/src/vs/workbench/contrib/debug/browser/repl.ts
+++ b/src/vs/workbench/contrib/debug/browser/repl.ts
@@ -667,6 +667,7 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 				filter: this.filter,
 				accessibilityProvider: new ReplAccessibilityProvider(),
 				identityProvider,
+				userSelection: true,
 				mouseSupport: false,
 				findWidgetEnabled: true,
 				keyboardNavigationLabelProvider: { getKeyboardNavigationLabel: (e: IReplElement) => e.toString(true) },

From acd32b17b837b05a64275c297949753df46dbe6d Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Wed, 18 Dec 2024 20:17:02 -0800
Subject: [PATCH 380/479] Use IExtensionsWorkbenchService instead (#236540)

Use IExtensionsWorkbenchService
---
 src/vs/workbench/contrib/chat/browser/chatSetup.ts | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index f42fd26ada5..a325d5526f1 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -26,7 +26,6 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
-import { IExtensionManagementService } from '../../../../platform/extensionManagement/common/extensionManagement.js';
 import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
@@ -60,7 +59,6 @@ import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IHostService } from '../../../services/host/browser/host.js';
 import Severity from '../../../../base/common/severity.js';
-import { IRemoteExtensionsScannerService } from '../../../../platform/remote/common/remoteExtensionsScanner.js';
 
 const defaultChat = {
 	extensionId: product.defaultChatAgent?.extensionId ?? '',
@@ -1021,10 +1019,9 @@ class ChatSetupContext extends Disposable {
 		@IStorageService private readonly storageService: IStorageService,
 		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
 		@IExtensionService private readonly extensionService: IExtensionService,
-		@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
 		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
-		@IRemoteExtensionsScannerService private readonly remoteExtensionsScannerService: IRemoteExtensionsScannerService,
-		@ILogService private readonly logService: ILogService
+		@ILogService private readonly logService: ILogService,
+		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
 	) {
 		super();
 
@@ -1049,10 +1046,9 @@ class ChatSetupContext extends Disposable {
 			}
 		}));
 
-		await this.remoteExtensionsScannerService.whenExtensionsReady();
-		const extensions = await this.extensionManagementService.getInstalled();
+		const extensions = await this.extensionsWorkbenchService.queryLocal();
 		const defaultChatExtension = extensions.find(value => ExtensionIdentifier.equals(value.identifier.id, defaultChat.extensionId));
-		this.update({ installed: !!defaultChatExtension && this.extensionEnablementService.isEnabled(defaultChatExtension) });
+		this.update({ installed: !!defaultChatExtension?.local && this.extensionEnablementService.isEnabled(defaultChatExtension.local) });
 	}
 
 	update(context: { installed: boolean }): Promise<void>;

From d47f63e5dcde69292e29018bd6fbb4bc93ccaaf1 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Thu, 19 Dec 2024 10:35:34 +0100
Subject: [PATCH 381/479] Revert focus behavior fix for views/panels (#236556)

Revert "Fix inconsistent focus behavior when toggling views/panels (#235622)"

This reverts commit d5746c5593f6afe15e44a9f7877a064df6605d11.
---
 src/vs/workbench/browser/layout.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index 592bb4146af..bf1f54199d1 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -1783,9 +1783,9 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		else if (!hidden && !this.paneCompositeService.getActivePaneComposite(ViewContainerLocation.Sidebar)) {
 			const viewletToOpen = this.paneCompositeService.getLastActivePaneCompositeId(ViewContainerLocation.Sidebar);
 			if (viewletToOpen) {
-				const viewlet = this.paneCompositeService.openPaneComposite(viewletToOpen, ViewContainerLocation.Sidebar);
+				const viewlet = this.paneCompositeService.openPaneComposite(viewletToOpen, ViewContainerLocation.Sidebar, true);
 				if (!viewlet) {
-					this.paneCompositeService.openPaneComposite(this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.Sidebar)?.id, ViewContainerLocation.Sidebar);
+					this.paneCompositeService.openPaneComposite(this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.Sidebar)?.id, ViewContainerLocation.Sidebar, true);
 				}
 			}
 		}
@@ -1931,7 +1931,8 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			}
 
 			if (panelToOpen) {
-				this.paneCompositeService.openPaneComposite(panelToOpen, ViewContainerLocation.Panel);
+				const focus = !skipLayout;
+				this.paneCompositeService.openPaneComposite(panelToOpen, ViewContainerLocation.Panel, focus);
 			}
 		}
 
@@ -2030,7 +2031,8 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			}
 
 			if (panelToOpen) {
-				this.paneCompositeService.openPaneComposite(panelToOpen, ViewContainerLocation.AuxiliaryBar);
+				const focus = !skipLayout;
+				this.paneCompositeService.openPaneComposite(panelToOpen, ViewContainerLocation.AuxiliaryBar, focus);
 			}
 		}
 

From d74499bdb99fd78fb4c6ef819e9c76fa766cae1e Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Thu, 19 Dec 2024 08:23:06 +0100
Subject: [PATCH 382/479] @vscode/proxy-agent 0.28.0

---
 package-lock.json        | 8 ++++----
 package.json             | 2 +-
 remote/package-lock.json | 8 ++++----
 remote/package.json      | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 60dc545ca37..5f2b14c3e39 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,7 @@
         "@vscode/deviceid": "^0.1.1",
         "@vscode/iconv-lite-umd": "0.7.0",
         "@vscode/policy-watcher": "^1.1.8",
-        "@vscode/proxy-agent": "^0.27.0",
+        "@vscode/proxy-agent": "^0.28.0",
         "@vscode/ripgrep": "^1.15.9",
         "@vscode/spdlog": "^0.15.0",
         "@vscode/sqlite3": "5.1.8-vscode",
@@ -2848,9 +2848,9 @@
       }
     },
     "node_modules/@vscode/proxy-agent": {
-      "version": "0.27.0",
-      "resolved": "git+ssh://git@github.com/microsoft/vscode-proxy-agent.git#0803e0a7d1249bcb64ae9d256d0ee732b7246ea5",
-      "integrity": "sha512-ID1MOlynRkVN121n85Hs1enjW16B5Z1O6bMDkSPqvAMVD6eHUOqmgPZuEkBbRI43PfA6boUEY9Ndjp+0wPKtsg==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.28.0.tgz",
+      "integrity": "sha512-7rYF8ju0dP/ASpjjnuOCvzRosGLoKz0WOyNohREUskRdrvMEnYuEUXy84lHlH+4+MD8CZZjw2SUzhjHaJK1hxg==",
       "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "^3.0.0",
diff --git a/package.json b/package.json
index 8dd5e0a86a3..3316ae225ea 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.0",
     "@vscode/policy-watcher": "^1.1.8",
-    "@vscode/proxy-agent": "^0.27.0",
+    "@vscode/proxy-agent": "^0.28.0",
     "@vscode/ripgrep": "^1.15.9",
     "@vscode/spdlog": "^0.15.0",
     "@vscode/sqlite3": "5.1.8-vscode",
diff --git a/remote/package-lock.json b/remote/package-lock.json
index dfbff101a88..3cf22939861 100644
--- a/remote/package-lock.json
+++ b/remote/package-lock.json
@@ -13,7 +13,7 @@
         "@parcel/watcher": "2.5.0",
         "@vscode/deviceid": "^0.1.1",
         "@vscode/iconv-lite-umd": "0.7.0",
-        "@vscode/proxy-agent": "^0.27.0",
+        "@vscode/proxy-agent": "^0.28.0",
         "@vscode/ripgrep": "^1.15.9",
         "@vscode/spdlog": "^0.15.0",
         "@vscode/tree-sitter-wasm": "^0.0.4",
@@ -418,9 +418,9 @@
       "integrity": "sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg=="
     },
     "node_modules/@vscode/proxy-agent": {
-      "version": "0.27.0",
-      "resolved": "git+ssh://git@github.com/microsoft/vscode-proxy-agent.git#0803e0a7d1249bcb64ae9d256d0ee732b7246ea5",
-      "integrity": "sha512-ID1MOlynRkVN121n85Hs1enjW16B5Z1O6bMDkSPqvAMVD6eHUOqmgPZuEkBbRI43PfA6boUEY9Ndjp+0wPKtsg==",
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@vscode/proxy-agent/-/proxy-agent-0.28.0.tgz",
+      "integrity": "sha512-7rYF8ju0dP/ASpjjnuOCvzRosGLoKz0WOyNohREUskRdrvMEnYuEUXy84lHlH+4+MD8CZZjw2SUzhjHaJK1hxg==",
       "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "^3.0.0",
diff --git a/remote/package.json b/remote/package.json
index b5ebb761e09..5a61a15c051 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -8,7 +8,7 @@
     "@parcel/watcher": "2.5.0",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.0",
-    "@vscode/proxy-agent": "^0.27.0",
+    "@vscode/proxy-agent": "^0.28.0",
     "@vscode/ripgrep": "^1.15.9",
     "@vscode/spdlog": "^0.15.0",
     "@vscode/tree-sitter-wasm": "^0.0.4",

From 7e000daa484bbf6e434c9942c39bb2eee569619c Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Thu, 19 Dec 2024 10:55:10 +0100
Subject: [PATCH 383/479] recovery fix: fixing installing extensions everywhere
 when it is already installed locally (#236562)

* recovery fix: fixing installing extensions everywhere when it is already installed locally

* clean up
---
 .../extensions/browser/extensionsWorkbenchService.ts      | 8 +++++---
 .../common/extensionManagementService.ts                  | 8 ++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
index ae7df7d09b3..0967e7d34c7 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
@@ -2368,8 +2368,9 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 			if (extension?.isMalicious) {
 				throw new Error(nls.localize('malicious', "This extension is reported to be problematic."));
 			}
+			// TODO: @sandy081 - Install the extension only on servers where it is not installed
 			// Do not install if requested to enable and extension is already installed
-			if (!(installOptions.enable && extension?.local)) {
+			if (installOptions.installEverywhere || !(installOptions.enable && extension?.local)) {
 				if (!installable) {
 					if (!gallery) {
 						const id = isString(arg) ? arg : (<IExtension>arg).identifier.id;
@@ -2730,10 +2731,11 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		return this.extensionManagementService.installVSIX(vsix, manifest, installOptions);
 	}
 
-	private installFromGallery(extension: IExtension, gallery: IGalleryExtension, installOptions?: InstallOptions): Promise<ILocalExtension> {
+	private installFromGallery(extension: IExtension, gallery: IGalleryExtension, installOptions?: InstallExtensionOptions): Promise<ILocalExtension> {
 		installOptions = installOptions ?? {};
 		installOptions.pinned = extension.local?.pinned || !this.shouldAutoUpdateExtension(extension);
-		if (extension.local) {
+		// TODO: @sandy081 - Install the extension only on servers where it is not installed
+		if (!installOptions.installEverywhere && extension.local) {
 			installOptions.productVersion = this.getProductVersion();
 			installOptions.operation = InstallOperation.Update;
 			return this.extensionManagementService.updateFromGallery(gallery, extension.local, installOptions);
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
index d8236828324..bc0a4687128 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
@@ -466,7 +466,7 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 			installOptions = { ...(installOptions || {}), isMachineScoped };
 		}
 
-		if (installOptions.installEverywhere || (!installOptions.isMachineScoped && this.isExtensionsSyncEnabled())) {
+		if (!installOptions.isMachineScoped && this.isExtensionsSyncEnabled()) {
 			if (this.extensionManagementServerService.localExtensionManagementServer
 				&& !servers.includes(this.extensionManagementServerService.localExtensionManagementServer)
 				&& await this.extensionManagementServerService.localExtensionManagementServer.extensionManagementService.canInstall(gallery) === true) {
@@ -597,7 +597,7 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 		}
 	}
 
-	private async validateAndGetExtensionManagementServersToInstall(gallery: IGalleryExtension, installOptions?: InstallOptions): Promise<IExtensionManagementServer[]> {
+	private async validateAndGetExtensionManagementServersToInstall(gallery: IGalleryExtension, installOptions?: IWorkbenchInstallOptions): Promise<IExtensionManagementServer[]> {
 
 		const manifest = await this.extensionGalleryService.getManifest(gallery, CancellationToken.None);
 		if (!manifest) {
@@ -606,8 +606,8 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 
 		const servers: IExtensionManagementServer[] = [];
 
-		// Install Language pack on local and remote servers
-		if (isLanguagePackExtension(manifest)) {
+		// Install everywhere if asked to install everywhere or if the extension is a language pack
+		if (installOptions?.installEverywhere || isLanguagePackExtension(manifest)) {
 			servers.push(...this.servers.filter(server => server !== this.extensionManagementServerService.webExtensionManagementServer));
 		} else {
 			const server = this.getExtensionManagementServerToInstall(manifest);

From 7efdaa5e8eadfdb97428e86c0ade801d22ab5868 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 19 Dec 2024 11:34:50 +0100
Subject: [PATCH 384/479] don't show inline chat hint when line has too many
 comments or strings. (#236567)

The limit is 25% strings, comments, or regex token and (as before) lines ending in comments

https://github.com/microsoft/vscode-copilot-release/issues/3009
---
 .../browser/inlineChatCurrentLine.ts          | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
index 43e73454efd..08c9911fdb8 100644
--- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
+++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.ts
@@ -140,14 +140,32 @@ export class ShowInlineChatHintAction extends EditorAction2 {
 
 		model.tokenization.forceTokenization(position.lineNumber);
 		const tokens = model.tokenization.getLineTokens(position.lineNumber);
-		const tokenIndex = tokens.findTokenIndexAtOffset(position.column - 1);
-		const tokenType = tokens.getStandardTokenType(tokenIndex);
 
-		if (tokenType === StandardTokenType.Comment) {
+		let totalLength = 0;
+		let specialLength = 0;
+		let lastTokenType: StandardTokenType | undefined;
+
+		tokens.forEach(idx => {
+			const tokenType = tokens.getStandardTokenType(idx);
+			const startOffset = tokens.getStartOffset(idx);
+			const endOffset = tokens.getEndOffset(idx);
+			totalLength += endOffset - startOffset;
+
+			if (tokenType !== StandardTokenType.Other) {
+				specialLength += endOffset - startOffset;
+			}
+			lastTokenType = tokenType;
+		});
+
+		if (specialLength / totalLength > 0.25) {
 			ctrl.hide();
-		} else {
-			ctrl.show();
+			return;
+		}
+		if (lastTokenType === StandardTokenType.Comment) {
+			ctrl.hide();
+			return;
 		}
+		ctrl.show();
 	}
 }
 

From cbfd8ab51359eafff1b5258f25dc334b2d9e26e5 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 19 Dec 2024 02:50:00 -0800
Subject: [PATCH 385/479] Cache builtin commands and get all global commands
 for pwsh

This should make things quite a bit faster for expensive fetching of
commands. This also caches empty builtin commands so it's not attempted
every time.

Fixes #236097
Part of #235024
---
 .../src/terminalSuggestMain.ts                | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
index 4acd5b59f8a..13ff032037a 100644
--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
+++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
@@ -12,14 +12,14 @@ import codeCompletionSpec from './completions/code';
 import cdSpec from './completions/cd';
 
 let cachedAvailableCommands: Set<string> | undefined;
-let cachedBuiltinCommands: Map<string, string[]> | undefined;
+const cachedBuiltinCommands: Map<string, string[] | undefined> = new Map();
 
 export const availableSpecs = [codeCompletionSpec, codeInsidersCompletionSpec, cdSpec];
 
 function getBuiltinCommands(shell: string): string[] | undefined {
 	try {
 		const shellType = path.basename(shell, path.extname(shell));
-		const cachedCommands = cachedBuiltinCommands?.get(shellType);
+		const cachedCommands = cachedBuiltinCommands.get(shellType);
 		if (cachedCommands) {
 			return cachedCommands;
 		}
@@ -38,14 +38,14 @@ function getBuiltinCommands(shell: string): string[] | undefined {
 				break;
 			}
 			case 'fish': {
-				// TODO: ghost text in the command line prevents
-				// completions from working ATM for fish
+				// TODO: Ghost text in the command line prevents completions from working ATM for fish
 				const fishOutput = execSync('functions -n', options);
 				commands = fishOutput.split(', ').filter(filter);
 				break;
 			}
 			case 'pwsh': {
-				const output = execSync('Get-Command | Select-Object Name, CommandType, DisplayName | ConvertTo-Json', options);
+				// TODO: Select `CommandType, DisplayName` and map to a rich type with kind and detail
+				const output = execSync('Get-Command -All | Select-Object Name | ConvertTo-Json', options);
 				let json: any;
 				try {
 					json = JSON.parse(output);
@@ -53,17 +53,12 @@ function getBuiltinCommands(shell: string): string[] | undefined {
 					console.error('Error parsing pwsh output:', e);
 					return [];
 				}
-				// TODO: Return a rich type with kind and detail
 				commands = (json as any[]).map(e => e.Name);
 				break;
 			}
 		}
-		// TODO: Cache failure results too
-		if (commands?.length) {
-			cachedBuiltinCommands?.set(shellType, commands);
-			return commands;
-		}
-		return;
+		cachedBuiltinCommands.set(shellType, commands);
+		return commands;
 
 	} catch (error) {
 		console.error('Error fetching builtin commands:', error);

From 011e8ec6df9cfd2aef2da84a617d4489fb9f372a Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 19 Dec 2024 11:56:01 +0100
Subject: [PATCH 386/479] chat setup - use 1 service as source of truth for
 extensions (#236564)

---
 .../contrib/chat/browser/chatSetup.ts         | 28 +++++++------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index a325d5526f1..3e93dbf6375 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -43,7 +43,6 @@ import { IViewDescriptorService, ViewContainerLocation } from '../../../common/v
 import { IActivityService, ProgressBadge } from '../../../services/activity/common/activity.js';
 import { AuthenticationSession, IAuthenticationExtensionsService, IAuthenticationService } from '../../../services/authentication/common/authentication.js';
 import { IWorkbenchExtensionEnablementService } from '../../../services/extensionManagement/common/extensionManagement.js';
-import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { IWorkbenchLayoutService, Parts } from '../../../services/layout/browser/layoutService.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { IExtensionsWorkbenchService } from '../../extensions/common/extensions.js';
@@ -1018,7 +1017,6 @@ class ChatSetupContext extends Disposable {
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
 		@IStorageService private readonly storageService: IStorageService,
 		@IWorkspaceContextService private readonly workspaceContextService: IWorkspaceContextService,
-		@IExtensionService private readonly extensionService: IExtensionService,
 		@IWorkbenchExtensionEnablementService private readonly extensionEnablementService: IWorkbenchExtensionEnablementService,
 		@ILogService private readonly logService: ILogService,
 		@IExtensionsWorkbenchService private readonly extensionsWorkbenchService: IExtensionsWorkbenchService,
@@ -1030,25 +1028,19 @@ class ChatSetupContext extends Disposable {
 	}
 
 	private async checkExtensionInstallation(): Promise<void> {
-		this._register(this.extensionService.onDidChangeExtensions(result => {
-			for (const extension of result.removed) {
-				if (ExtensionIdentifier.equals(defaultChat.extensionId, extension.identifier)) {
-					this.update({ installed: false });
-					break;
-				}
-			}
 
-			for (const extension of result.added) {
-				if (ExtensionIdentifier.equals(defaultChat.extensionId, extension.identifier)) {
-					this.update({ installed: true });
-					break;
-				}
+		// Await extensions to be ready to be queries
+		await this.extensionsWorkbenchService.queryLocal();
+
+		// Listen to change and process extensions once
+		this._register(Event.runAndSubscribe(this.extensionsWorkbenchService.onChange, (e) => {
+			if (e && !ExtensionIdentifier.equals(e.identifier.id, defaultChat.extensionId)) {
+				return; // unrelated event
 			}
-		}));
 
-		const extensions = await this.extensionsWorkbenchService.queryLocal();
-		const defaultChatExtension = extensions.find(value => ExtensionIdentifier.equals(value.identifier.id, defaultChat.extensionId));
-		this.update({ installed: !!defaultChatExtension?.local && this.extensionEnablementService.isEnabled(defaultChatExtension.local) });
+			const defaultChatExtension = this.extensionsWorkbenchService.local.find(value => ExtensionIdentifier.equals(value.identifier.id, defaultChat.extensionId));
+			this.update({ installed: !!defaultChatExtension?.local && this.extensionEnablementService.isEnabled(defaultChatExtension.local) });
+		}));
 	}
 
 	update(context: { installed: boolean }): Promise<void>;

From 7f512c528d36154fe0cab63dcd75b505013fff44 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 19 Dec 2024 12:13:57 +0100
Subject: [PATCH 387/479] chat - fix setup in web based on remote connection

---
 .../chat/browser/actions/chatActions.ts       | 19 ++++++++++++++-----
 .../contrib/chat/browser/chat.contribution.ts |  2 ++
 .../contrib/chat/browser/chatSetup.ts         | 10 ++++++++--
 .../contrib/chat/common/chatContextKeys.ts    |  4 ++++
 .../electron-sandbox/chat.contribution.ts     |  2 --
 .../common/gettingStartedContent.ts           |  7 +++----
 6 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index a0bb888eb80..d1d7d951559 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -9,7 +9,7 @@ import { Codicon } from '../../../../../base/common/codicons.js';
 import { fromNowByDay } from '../../../../../base/common/date.js';
 import { Event } from '../../../../../base/common/event.js';
 import { KeyCode, KeyMod } from '../../../../../base/common/keyCodes.js';
-import { Disposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, markAsSingleton } from '../../../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
@@ -531,7 +531,10 @@ MenuRegistry.appendMenuItem(MenuId.CommandCenter, {
 	submenu: MenuId.ChatCommandCenter,
 	title: localize('title4', "Chat"),
 	icon: Codicon.copilot,
-	when: ContextKeyExpr.has('config.chat.commandCenter.enabled'),
+	when: ContextKeyExpr.and(
+		ChatContextKeys.supported,
+		ContextKeyExpr.has('config.chat.commandCenter.enabled')
+	),
 	order: 10001,
 });
 
@@ -541,7 +544,10 @@ registerAction2(class ToggleCopilotControl extends ToggleTitleBarConfigAction {
 			'chat.commandCenter.enabled',
 			localize('toggle.chatControl', 'Copilot Controls'),
 			localize('toggle.chatControlsDescription', "Toggle visibility of the Copilot Controls in title bar"), 4, false,
-			ContextKeyExpr.has('config.window.commandCenter')
+			ContextKeyExpr.and(
+				ChatContextKeys.supported,
+				ContextKeyExpr.has('config.window.commandCenter')
+			)
 		);
 	}
 });
@@ -561,7 +567,7 @@ export class ChatCommandCenterRendering extends Disposable implements IWorkbench
 
 		const contextKeySet = new Set([ChatContextKeys.Setup.signedOut.key]);
 
-		this._store.add(actionViewItemService.register(MenuId.CommandCenter, MenuId.ChatCommandCenter, (action, options) => {
+		const disposable = actionViewItemService.register(MenuId.CommandCenter, MenuId.ChatCommandCenter, (action, options) => {
 			if (!(action instanceof SubmenuItemAction)) {
 				return undefined;
 			}
@@ -607,6 +613,9 @@ export class ChatCommandCenterRendering extends Disposable implements IWorkbench
 			agentService.onDidChangeAgents,
 			chatQuotasService.onDidChangeQuotas,
 			Event.filter(contextKeyService.onDidChangeContext, e => e.affectsSome(contextKeySet))
-		)));
+		));
+
+		// Reduces flicker a bit on reload/restart
+		markAsSingleton(disposable);
 	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
index b03d4605d16..456c8817cd4 100644
--- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -81,6 +81,7 @@ import { Extensions, IConfigurationMigrationRegistry } from '../../../common/con
 import { ChatEditorOverlayController } from './chatEditorOverlay.js';
 import { ChatRelatedFilesContribution } from './contrib/chatInputRelatedFilesContrib.js';
 import { ChatQuotasService, ChatQuotasStatusBarEntry, IChatQuotasService } from './chatQuotasService.js';
+import { ChatSetupContribution } from './chatSetup.js';
 
 // Register configuration
 const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
@@ -316,6 +317,7 @@ registerWorkbenchContribution2(ChatEditorSaving.ID, ChatEditorSaving, WorkbenchP
 registerWorkbenchContribution2(ChatEditorAutoSaveDisabler.ID, ChatEditorAutoSaveDisabler, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2(ChatViewsWelcomeHandler.ID, ChatViewsWelcomeHandler, WorkbenchPhase.BlockStartup);
 registerWorkbenchContribution2(ChatGettingStartedContribution.ID, ChatGettingStartedContribution, WorkbenchPhase.Eventually);
+registerWorkbenchContribution2(ChatSetupContribution.ID, ChatSetupContribution, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2(ChatQuotasStatusBarEntry.ID, ChatQuotasStatusBarEntry, WorkbenchPhase.Eventually);
 
 registerChatActions();
diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
index 3e93dbf6375..53a86ec5245 100644
--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts
@@ -58,6 +58,8 @@ import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IHostService } from '../../../services/host/browser/host.js';
 import Severity from '../../../../base/common/severity.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { isWeb } from '../../../../base/common/platform.js';
 
 const defaultChat = {
 	extensionId: product.defaultChatAgent?.extensionId ?? '',
@@ -106,11 +108,15 @@ export class ChatSetupContribution extends Disposable implements IWorkbenchContr
 
 	constructor(
 		@IProductService private readonly productService: IProductService,
-		@IInstantiationService private readonly instantiationService: IInstantiationService
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService
 	) {
 		super();
 
-		if (!this.productService.defaultChatAgent) {
+		if (
+			!this.productService.defaultChatAgent ||			// needs product config
+			(isWeb && !this.environmentService.remoteAuthority)	// only enabled locally or a remote backend
+		) {
 			return;
 		}
 
diff --git a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
index f615233de50..be03126dd2d 100644
--- a/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
+++ b/src/vs/workbench/contrib/chat/common/chatContextKeys.ts
@@ -5,6 +5,8 @@
 
 import { localize } from '../../../../nls.js';
 import { ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
+import { RemoteNameContext } from '../../../common/contextkeys.js';
 import { ChatAgentLocation } from './chatAgents.js';
 
 export namespace ChatContextKeys {
@@ -27,7 +29,9 @@ export namespace ChatContextKeys {
 	export const inChatInput = new RawContextKey<boolean>('inChatInput', false, { type: 'boolean', description: localize('inInteractiveInput', "True when focus is in the chat input, false otherwise.") });
 	export const inChatSession = new RawContextKey<boolean>('inChat', false, { type: 'boolean', description: localize('inChat', "True when focus is in the chat widget, false otherwise.") });
 
+	export const supported = ContextKeyExpr.or(IsWebContext.toNegated(), RemoteNameContext.notEqualsTo('')); // supported on desktop and in web only with a remote connection
 	export const enabled = new RawContextKey<boolean>('chatIsEnabled', false, { type: 'boolean', description: localize('chatIsEnabled', "True when chat is enabled because a default chat participant is activated with an implementation.") });
+
 	export const panelParticipantRegistered = new RawContextKey<boolean>('chatPanelParticipantRegistered', false, { type: 'boolean', description: localize('chatParticipantRegistered', "True when a default chat participant is registered for the panel.") });
 	export const editingParticipantRegistered = new RawContextKey<boolean>('chatEditingParticipantRegistered', false, { type: 'boolean', description: localize('chatEditingParticipantRegistered', "True when a default chat participant is registered for editing.") });
 	export const chatEditingCanUndo = new RawContextKey<boolean>('chatEditingCanUndo', false, { type: 'boolean', description: localize('chatEditingCanUndo', "True when it is possible to undo an interaction in the editing panel.") });
diff --git a/src/vs/workbench/contrib/chat/electron-sandbox/chat.contribution.ts b/src/vs/workbench/contrib/chat/electron-sandbox/chat.contribution.ts
index e71f4342b15..0e888b7f864 100644
--- a/src/vs/workbench/contrib/chat/electron-sandbox/chat.contribution.ts
+++ b/src/vs/workbench/contrib/chat/electron-sandbox/chat.contribution.ts
@@ -6,7 +6,6 @@
 import { InlineVoiceChatAction, QuickVoiceChatAction, StartVoiceChatAction, VoiceChatInChatViewAction, StopListeningAction, StopListeningAndSubmitAction, KeywordActivationContribution, InstallSpeechProviderForVoiceChatAction, HoldToVoiceChatInChatViewAction, ReadChatResponseAloud, StopReadAloud, StopReadChatItemAloud } from './actions/voiceChatActions.js';
 import { registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js';
-import { ChatSetupContribution } from '../browser/chatSetup.js';
 
 registerAction2(StartVoiceChatAction);
 registerAction2(InstallSpeechProviderForVoiceChatAction);
@@ -24,4 +23,3 @@ registerAction2(StopReadChatItemAloud);
 registerAction2(StopReadAloud);
 
 registerWorkbenchContribution2(KeywordActivationContribution.ID, KeywordActivationContribution, WorkbenchPhase.AfterRestored);
-registerWorkbenchContribution2(ChatSetupContribution.ID, ChatSetupContribution, WorkbenchPhase.BlockRestore);
diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
index 7fd3e30163f..53c8ae80511 100644
--- a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
+++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
@@ -282,7 +282,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 				// 	id: 'settings',
 				// 	title: localize('gettingStarted.settings.title', "Tune your settings"),
 				// 	description: localize('gettingStarted.settings.description.interpolated', "Customize every aspect of VS Code and your extensions to your liking. Commonly used settings are listed first to get you started.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')),
-				// 	when: '!config.chat.experimental.offerSetup',
 				// 	media: {
 				// 		type: 'svg', altText: 'VS Code Settings', path: 'settings.svg'
 				// 	},
@@ -291,7 +290,7 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 				// 	id: 'settingsSync',
 				// 	title: localize('gettingStarted.settingsSync.title', "Sync settings across devices"),
 				// 	description: localize('gettingStarted.settingsSync.description.interpolated', "Keep your essential customizations backed up and updated across all your devices.\n{0}", Button(localize('enableSync', "Backup and Sync Settings"), 'command:workbench.userDataSync.actions.turnOn')),
-				// 	when: '!config.chat.experimental.offerSetup && syncStatus != uninitialized',
+				// 	when: 'syncStatus != uninitialized',
 				// 	completionEvents: ['onEvent:sync-enabled'],
 				// 	media: {
 				// 		type: 'svg', altText: 'The "Turn on Sync" entry in the settings gear menu.', path: 'settingsSync.svg'
@@ -318,7 +317,7 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 				// 	id: 'pickAFolderTask-Mac',
 				// 	title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"),
 				// 	description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VS Code.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFileFolder')),
-				// 	when: '!config.chat.experimental.offerSetup && isMac && workspaceFolderCount == 0',
+				// 	when: 'isMac && workspaceFolderCount == 0',
 				// 	media: {
 				// 		type: 'svg', altText: 'Explorer view showing buttons for opening folder and cloning repository.', path: 'openFolder.svg'
 				// 	}
@@ -327,7 +326,7 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 				// 	id: 'pickAFolderTask-Other',
 				// 	title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"),
 				// 	description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VS Code.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFolder')),
-				// 	when: '!config.chat.experimental.offerSetup && !isMac && workspaceFolderCount == 0',
+				// 	when: '!isMac && workspaceFolderCount == 0',
 				// 	media: {
 				// 		type: 'svg', altText: 'Explorer view showing buttons for opening folder and cloning repository.', path: 'openFolder.svg'
 				// 	}

From 22959031c000aa613a72c6336dda2487e4d514a2 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Thu, 19 Dec 2024 12:23:45 +0100
Subject: [PATCH 388/479] Enable dragging of editor from breadcrumbs in single
 tabs (#236571)

drag editor from single tab breadcrumbs
---
 .../browser/parts/editor/breadcrumbsControl.ts   | 16 +++++++++++-----
 .../browser/parts/editor/breadcrumbsModel.ts     |  2 +-
 .../browser/parts/editor/editorTitleControl.ts   |  3 ++-
 .../parts/editor/singleEditorTabsControl.ts      |  3 ++-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
index 51ca71f42d1..9a2581907c4 100644
--- a/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
@@ -25,7 +25,7 @@ import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/c
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
-import { fillInSymbolsDragData } from '../../../../platform/dnd/browser/dnd.js';
+import { fillInSymbolsDragData, LocalSelectionTransfer } from '../../../../platform/dnd/browser/dnd.js';
 import { FileKind, IFileService, IFileStat } from '../../../../platform/files/common/files.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { InstantiationService } from '../../../../platform/instantiation/common/instantiationService.js';
@@ -39,7 +39,7 @@ import { EditorResourceAccessor, IEditorPartOptions, SideBySideEditor } from '..
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
 import { ACTIVE_GROUP, ACTIVE_GROUP_TYPE, IEditorService, SIDE_GROUP, SIDE_GROUP_TYPE } from '../../../services/editor/common/editorService.js';
 import { IOutline } from '../../../services/outline/browser/outline.js';
-import { fillEditorsDragData } from '../../dnd.js';
+import { DraggedEditorIdentifier, fillEditorsDragData } from '../../dnd.js';
 import { DEFAULT_LABELS_CONTAINER, ResourceLabels } from '../../labels.js';
 import { BreadcrumbsConfig, IBreadcrumbsService } from './breadcrumbs.js';
 import { BreadcrumbsModel, FileElement, OutlineElement2 } from './breadcrumbsModel.js';
@@ -105,7 +105,7 @@ class OutlineItem extends BreadcrumbsItem {
 		this._disposables.add(toDisposable(() => { renderer.disposeTemplate(template); }));
 
 		if (element instanceof OutlineElement && outline.uri) {
-			this._disposables.add(this._instantiationService.invokeFunction(accessor => createBreadcrumbDndObserver(accessor, container, element.symbol.name, { symbol: element.symbol, uri: outline.uri! })));
+			this._disposables.add(this._instantiationService.invokeFunction(accessor => createBreadcrumbDndObserver(accessor, container, element.symbol.name, { symbol: element.symbol, uri: outline.uri! }, this.model, this.options.dragEditor)));
 		}
 	}
 }
@@ -151,12 +151,12 @@ class FileItem extends BreadcrumbsItem {
 		container.classList.add(FileKind[this.element.kind].toLowerCase());
 		this._disposables.add(label);
 
-		this._disposables.add(this._instantiationService.invokeFunction(accessor => createBreadcrumbDndObserver(accessor, container, basename(this.element.uri), this.element.uri)));
+		this._disposables.add(this._instantiationService.invokeFunction(accessor => createBreadcrumbDndObserver(accessor, container, basename(this.element.uri), this.element.uri, this.model, this.options.dragEditor)));
 	}
 }
 
 
-function createBreadcrumbDndObserver(accessor: ServicesAccessor, container: HTMLElement, label: string, item: URI | { symbol: DocumentSymbol; uri: URI }): IDisposable {
+function createBreadcrumbDndObserver(accessor: ServicesAccessor, container: HTMLElement, label: string, item: URI | { symbol: DocumentSymbol; uri: URI }, model: BreadcrumbsModel, dragEditor: boolean): IDisposable {
 	const instantiationService = accessor.get(IInstantiationService);
 
 	container.draggable = true;
@@ -183,6 +183,11 @@ function createBreadcrumbDndObserver(accessor: ServicesAccessor, container: HTML
 						kind: item.symbol.kind
 					}], event);
 				}
+
+				if (dragEditor && model.editor && model.editor?.input) {
+					const editorTransfer = LocalSelectionTransfer.getInstance<DraggedEditorIdentifier>();
+					editorTransfer.setData([new DraggedEditorIdentifier({ editor: model.editor.input, groupId: model.editor.group.id })], DraggedEditorIdentifier.prototype);
+				}
 			});
 
 			// Create drag image and remove when dropped
@@ -209,6 +214,7 @@ export interface IBreadcrumbsControlOptions {
 	readonly showSymbolIcons: boolean;
 	readonly showDecorationColors: boolean;
 	readonly showPlaceholder: boolean;
+	readonly dragEditor: boolean;
 	readonly widgetStyles?: IBreadcrumbsWidgetStyles;
 }
 
diff --git a/src/vs/workbench/browser/parts/editor/breadcrumbsModel.ts b/src/vs/workbench/browser/parts/editor/breadcrumbsModel.ts
index f49b2301ea5..1c4aaef090a 100644
--- a/src/vs/workbench/browser/parts/editor/breadcrumbsModel.ts
+++ b/src/vs/workbench/browser/parts/editor/breadcrumbsModel.ts
@@ -49,7 +49,7 @@ export class BreadcrumbsModel {
 
 	constructor(
 		readonly resource: URI,
-		editor: IEditorPane | undefined,
+		readonly editor: IEditorPane | undefined,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IWorkspaceContextService private readonly _workspaceService: IWorkspaceContextService,
 		@IOutlineService private readonly _outlineService: IOutlineService,
diff --git a/src/vs/workbench/browser/parts/editor/editorTitleControl.ts b/src/vs/workbench/browser/parts/editor/editorTitleControl.ts
index ac74f9b7728..65ef9fca411 100644
--- a/src/vs/workbench/browser/parts/editor/editorTitleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/editorTitleControl.ts
@@ -90,7 +90,8 @@ export class EditorTitleControl extends Themable {
 			showFileIcons: true,
 			showSymbolIcons: true,
 			showDecorationColors: false,
-			showPlaceholder: true
+			showPlaceholder: true,
+			dragEditor: false,
 		}));
 
 		// Breadcrumbs enablement & visibility change have an impact on layout
diff --git a/src/vs/workbench/browser/parts/editor/singleEditorTabsControl.ts b/src/vs/workbench/browser/parts/editor/singleEditorTabsControl.ts
index b8d31c0d171..a3b16b2d7fc 100644
--- a/src/vs/workbench/browser/parts/editor/singleEditorTabsControl.ts
+++ b/src/vs/workbench/browser/parts/editor/singleEditorTabsControl.ts
@@ -60,7 +60,8 @@ export class SingleEditorTabsControl extends EditorTabsControl {
 			showSymbolIcons: true,
 			showDecorationColors: false,
 			widgetStyles: { ...defaultBreadcrumbsWidgetStyles, breadcrumbsBackground: Color.transparent.toString() },
-			showPlaceholder: false
+			showPlaceholder: false,
+			dragEditor: true,
 		}));
 		this._register(this.breadcrumbsControlFactory.onDidEnablementChange(() => this.handleBreadcrumbsEnablementChange()));
 		titleContainer.classList.toggle('breadcrumbs', Boolean(this.breadcrumbsControl));

From 1b078e1a20c122f11d4df60dd836f9ee2f87c2f6 Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Thu, 19 Dec 2024 12:42:58 +0100
Subject: [PATCH 389/479] Disable word wrap in preview editor (#236574)

---
 .../browser/view/inlineEdits/sideBySideDiff.ts                  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
index 5f36bec5b33..b34dc44ac1d 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
@@ -268,6 +268,8 @@ export class InlineEditsSideBySideDiff extends Disposable {
 			},
 			readOnly: true,
 			wordWrap: 'off',
+			wordWrapOverride1: 'off',
+			wordWrapOverride2: 'off',
 		},
 		{ contributions: [], },
 		this._editor

From b392dd9337e935d639d6a7b18ae02164eda7c283 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Thu, 19 Dec 2024 12:51:27 +0100
Subject: [PATCH 390/479] simplification: tokenizeLineWithEdit ->
 tokenizeLinesAt (#236577)

---
 src/vs/editor/common/core/offsetEdit.ts       | 12 ++++++
 src/vs/editor/common/model/textModelTokens.ts | 38 ++++++-------------
 .../common/model/tokenizationTextModelPart.ts | 13 ++++---
 src/vs/editor/common/model/tokens.ts          |  4 +-
 .../editor/common/model/treeSitterTokens.ts   |  5 +--
 .../common/tokenizationTextModelPart.ts       | 31 +--------------
 src/vs/editor/common/tokens/lineTokens.ts     |  4 ++
 src/vs/editor/common/tokens/tokenArray.ts     | 25 ++++++++++++
 .../browser/model/provideInlineCompletions.ts | 18 ++++-----
 .../browser/view/ghostText/ghostTextView.ts   | 11 ++----
 10 files changed, 77 insertions(+), 84 deletions(-)

diff --git a/src/vs/editor/common/core/offsetEdit.ts b/src/vs/editor/common/core/offsetEdit.ts
index 426f90d22b6..d6886ee5fae 100644
--- a/src/vs/editor/common/core/offsetEdit.ts
+++ b/src/vs/editor/common/core/offsetEdit.ts
@@ -228,6 +228,10 @@ export class SingleOffsetEdit {
 		return new SingleOffsetEdit(OffsetRange.emptyAt(offset), text);
 	}
 
+	public static replace(range: OffsetRange, text: string): SingleOffsetEdit {
+		return new SingleOffsetEdit(range, text);
+	}
+
 	constructor(
 		public readonly replaceRange: OffsetRange,
 		public readonly newText: string,
@@ -240,6 +244,14 @@ export class SingleOffsetEdit {
 	get isEmpty() {
 		return this.newText.length === 0 && this.replaceRange.length === 0;
 	}
+
+	apply(str: string): string {
+		return str.substring(0, this.replaceRange.start) + this.newText + str.substring(this.replaceRange.endExclusive);
+	}
+
+	getRangeAfterApply(): OffsetRange {
+		return new OffsetRange(this.replaceRange.start, this.replaceRange.start + this.newText.length);
+	}
 }
 
 /**
diff --git a/src/vs/editor/common/model/textModelTokens.ts b/src/vs/editor/common/model/textModelTokens.ts
index 85068d38984..7dbbc93a131 100644
--- a/src/vs/editor/common/model/textModelTokens.ts
+++ b/src/vs/editor/common/model/textModelTokens.ts
@@ -17,7 +17,6 @@ import { nullTokenizeEncoded } from '../languages/nullTokenize.js';
 import { ITextModel } from '../model.js';
 import { FixedArray } from './fixedArray.js';
 import { IModelContentChange } from '../textModelEvents.js';
-import { ITokenizeLineWithEditResult, LineEditWithAdditionalLines } from '../tokenizationTextModelPart.js';
 import { ContiguousMultilineTokensBuilder } from '../tokens/contiguousMultilineTokensBuilder.js';
 import { LineTokens } from '../tokens/lineTokens.js';
 
@@ -102,38 +101,23 @@ export class TokenizerWithStateStoreAndTextModel<TState extends IState = IState>
 	}
 
 	/** assumes state is up to date */
-	public tokenizeLineWithEdit(lineNumber: number, edit: LineEditWithAdditionalLines): ITokenizeLineWithEditResult {
-		const lineStartState = this.getStartState(lineNumber);
+	public tokenizeLinesAt(lineNumber: number, lines: string[]): LineTokens[] | null {
+		const lineStartState: IState | null = this.getStartState(lineNumber);
 		if (!lineStartState) {
-			return { mainLineTokens: null, additionalLines: null };
+			return null;
 		}
 
-		const curLineContent = this._textModel.getLineContent(lineNumber);
-		const newLineContent = edit.lineEdit.apply(curLineContent);
-
-		const languageId = this._textModel.getLanguageIdAtPosition(lineNumber, 0);
-		const result = safeTokenize(
-			this._languageIdCodec,
-			languageId,
-			this.tokenizationSupport,
-			newLineContent,
-			true,
-			lineStartState
-		);
+		const languageId = this._textModel.getLanguageId();
+		const result: LineTokens[] = [];
 
-		let additionalLines: LineTokens[] | null = null;
-		if (edit.additionalLines) {
-			additionalLines = [];
-			let state = result.endState;
-			for (const line of edit.additionalLines) {
-				const r = safeTokenize(this._languageIdCodec, languageId, this.tokenizationSupport, line, true, state);
-				additionalLines.push(new LineTokens(r.tokens, line, this._languageIdCodec));
-				state = r.endState;
-			}
+		let state = lineStartState;
+		for (const line of lines) {
+			const r = safeTokenize(this._languageIdCodec, languageId, this.tokenizationSupport, line, true, state);
+			result.push(new LineTokens(r.tokens, line, this._languageIdCodec));
+			state = r.endState;
 		}
 
-		const mainLineTokens = new LineTokens(result.tokens, newLineContent, this._languageIdCodec);
-		return { mainLineTokens, additionalLines };
+		return result;
 	}
 
 	public hasAccurateTokensForLine(lineNumber: number): boolean {
diff --git a/src/vs/editor/common/model/tokenizationTextModelPart.ts b/src/vs/editor/common/model/tokenizationTextModelPart.ts
index 811c24b7256..f51bf1b98bc 100644
--- a/src/vs/editor/common/model/tokenizationTextModelPart.ts
+++ b/src/vs/editor/common/model/tokenizationTextModelPart.ts
@@ -25,7 +25,7 @@ import { AbstractTokens, AttachedViewHandler, AttachedViews } from './tokens.js'
 import { TreeSitterTokens } from './treeSitterTokens.js';
 import { ITreeSitterParserService } from '../services/treeSitterParserService.js';
 import { IModelContentChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelTokensChangedEvent } from '../textModelEvents.js';
-import { BackgroundTokenizationState, ITokenizationTextModelPart, ITokenizeLineWithEditResult, LineEditWithAdditionalLines } from '../tokenizationTextModelPart.js';
+import { BackgroundTokenizationState, ITokenizationTextModelPart } from '../tokenizationTextModelPart.js';
 import { ContiguousMultilineTokens } from '../tokens/contiguousMultilineTokens.js';
 import { ContiguousMultilineTokensBuilder } from '../tokens/contiguousMultilineTokensBuilder.js';
 import { ContiguousTokensStore } from '../tokens/contiguousTokensStore.js';
@@ -202,8 +202,8 @@ export class TokenizationTextModelPart extends TextModelPart implements ITokeniz
 		return this._tokens.getTokenTypeIfInsertingCharacter(lineNumber, column, character);
 	}
 
-	public tokenizeLineWithEdit(lineNumber: number, edit: LineEditWithAdditionalLines): ITokenizeLineWithEditResult {
-		return this._tokens.tokenizeLineWithEdit(lineNumber, edit);
+	public tokenizeLinesAt(lineNumber: number, lines: string[]): LineTokens[] | null {
+		return this._tokens.tokenizeLinesAt(lineNumber, lines);
 	}
 
 	// #endregion
@@ -648,12 +648,13 @@ class GrammarTokens extends AbstractTokens {
 		return this._tokenizer.getTokenTypeIfInsertingCharacter(position, character);
 	}
 
-	public tokenizeLineWithEdit(lineNumber: number, edit: LineEditWithAdditionalLines): ITokenizeLineWithEditResult {
+
+	public tokenizeLinesAt(lineNumber: number, lines: string[]): LineTokens[] | null {
 		if (!this._tokenizer) {
-			return { mainLineTokens: null, additionalLines: null };
+			return null;
 		}
 		this.forceTokenization(lineNumber);
-		return this._tokenizer.tokenizeLineWithEdit(lineNumber, edit);
+		return this._tokenizer.tokenizeLinesAt(lineNumber, lines);
 	}
 
 	public get hasTokens(): boolean {
diff --git a/src/vs/editor/common/model/tokens.ts b/src/vs/editor/common/model/tokens.ts
index 0e4ed56480c..493cd2d0662 100644
--- a/src/vs/editor/common/model/tokens.ts
+++ b/src/vs/editor/common/model/tokens.ts
@@ -13,7 +13,7 @@ import { ILanguageIdCodec } from '../languages.js';
 import { IAttachedView } from '../model.js';
 import { TextModel } from './textModel.js';
 import { IModelContentChangedEvent, IModelTokensChangedEvent } from '../textModelEvents.js';
-import { BackgroundTokenizationState, ITokenizeLineWithEditResult, LineEditWithAdditionalLines } from '../tokenizationTextModelPart.js';
+import { BackgroundTokenizationState } from '../tokenizationTextModelPart.js';
 import { LineTokens } from '../tokens/lineTokens.js';
 
 /**
@@ -131,7 +131,7 @@ export abstract class AbstractTokens extends Disposable {
 
 	public abstract getTokenTypeIfInsertingCharacter(lineNumber: number, column: number, character: string): StandardTokenType;
 
-	public abstract tokenizeLineWithEdit(lineNumber: number, edit: LineEditWithAdditionalLines): ITokenizeLineWithEditResult;
+	public abstract tokenizeLinesAt(lineNumber: number, lines: string[]): LineTokens[] | null;
 
 	public abstract get hasTokens(): boolean;
 }
diff --git a/src/vs/editor/common/model/treeSitterTokens.ts b/src/vs/editor/common/model/treeSitterTokens.ts
index 43ab00f0f0f..f4077388ef0 100644
--- a/src/vs/editor/common/model/treeSitterTokens.ts
+++ b/src/vs/editor/common/model/treeSitterTokens.ts
@@ -10,7 +10,6 @@ import { TextModel } from './textModel.js';
 import { ITreeSitterParserService } from '../services/treeSitterParserService.js';
 import { IModelContentChangedEvent } from '../textModelEvents.js';
 import { AbstractTokens } from './tokens.js';
-import { ITokenizeLineWithEditResult, LineEditWithAdditionalLines } from '../tokenizationTextModelPart.js';
 import { IDisposable, MutableDisposable } from '../../../base/common/lifecycle.js';
 
 export class TreeSitterTokens extends AbstractTokens {
@@ -95,9 +94,9 @@ export class TreeSitterTokens extends AbstractTokens {
 		// TODO @alexr00 implement once we have custom parsing and don't just feed in the whole text model value
 		return StandardTokenType.Other;
 	}
-	public override tokenizeLineWithEdit(lineNumber: number, edit: LineEditWithAdditionalLines): ITokenizeLineWithEditResult {
+	public override tokenizeLinesAt(lineNumber: number, lines: string[]): LineTokens[] | null {
 		// TODO @alexr00 understand what this is for and implement
-		return { mainLineTokens: null, additionalLines: null };
+		return null;
 	}
 	public override get hasTokens(): boolean {
 		// TODO @alexr00 once we have a token store, implement properly
diff --git a/src/vs/editor/common/tokenizationTextModelPart.ts b/src/vs/editor/common/tokenizationTextModelPart.ts
index 25e7569b2f9..6238c606552 100644
--- a/src/vs/editor/common/tokenizationTextModelPart.ts
+++ b/src/vs/editor/common/tokenizationTextModelPart.ts
@@ -3,8 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { OffsetEdit } from './core/offsetEdit.js';
-import { OffsetRange } from './core/offsetRange.js';
 import { Range } from './core/range.js';
 import { StandardTokenType } from './encodedTokenAttributes.js';
 import { LineTokens } from './tokens/lineTokens.js';
@@ -85,9 +83,10 @@ export interface ITokenizationTextModelPart {
 	getTokenTypeIfInsertingCharacter(lineNumber: number, column: number, character: string): StandardTokenType;
 
 	/**
+	 * Tokens the lines as if they were inserted at [lineNumber, lineNumber).
 	 * @internal
 	*/
-	tokenizeLineWithEdit(lineNumber: number, edit: LineEditWithAdditionalLines): ITokenizeLineWithEditResult;
+	tokenizeLinesAt(lineNumber: number, lines: string[]): LineTokens[] | null;
 
 	getLanguageId(): string;
 	getLanguageIdAtPosition(lineNumber: number, column: number): string;
@@ -97,32 +96,6 @@ export interface ITokenizationTextModelPart {
 	readonly backgroundTokenizationState: BackgroundTokenizationState;
 }
 
-export class LineEditWithAdditionalLines {
-	public static replace(range: OffsetRange, text: string): LineEditWithAdditionalLines {
-		return new LineEditWithAdditionalLines(
-			OffsetEdit.replace(range, text),
-			null,
-		);
-	}
-
-	constructor(
-		/**
-		 * The edit for the main line.
-		*/
-		readonly lineEdit: OffsetEdit,
-
-		/**
-		 * Full lines appended after the main line.
-		*/
-		readonly additionalLines: string[] | null,
-	) { }
-}
-
-export interface ITokenizeLineWithEditResult {
-	readonly mainLineTokens: LineTokens | null;
-	readonly additionalLines: LineTokens[] | null;
-}
-
 export const enum BackgroundTokenizationState {
 	InProgress = 1,
 	Completed = 2,
diff --git a/src/vs/editor/common/tokens/lineTokens.ts b/src/vs/editor/common/tokens/lineTokens.ts
index 7d2b07476d0..72d94d120d4 100644
--- a/src/vs/editor/common/tokens/lineTokens.ts
+++ b/src/vs/editor/common/tokens/lineTokens.ts
@@ -203,6 +203,10 @@ export class LineTokens implements IViewLineTokens {
 		return new SliceLineTokens(this, startOffset, endOffset, deltaOffset);
 	}
 
+	public sliceZeroCopy(range: OffsetRange): IViewLineTokens {
+		return this.sliceAndInflate(range.start, range.endExclusive, 0);
+	}
+
 	/**
 	 * @pure
 	 * @param insertTokens Must be sorted by offset.
diff --git a/src/vs/editor/common/tokens/tokenArray.ts b/src/vs/editor/common/tokens/tokenArray.ts
index 1b6891f223d..bc089d1604a 100644
--- a/src/vs/editor/common/tokens/tokenArray.ts
+++ b/src/vs/editor/common/tokens/tokenArray.ts
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { OffsetRange } from '../core/offsetRange.js';
+import { ILanguageIdCodec } from '../languages.js';
+import { LineTokens } from './lineTokens.js';
 
 /**
  * This class represents a sequence of tokens.
@@ -14,6 +16,14 @@ import { OffsetRange } from '../core/offsetRange.js';
  * TODO: Make this class more efficient (e.g. by using a Int32Array).
 */
 export class TokenArray {
+	public static fromLineTokens(lineTokens: LineTokens): TokenArray {
+		const tokenInfo: TokenInfo[] = [];
+		for (let i = 0; i < lineTokens.getCount(); i++) {
+			tokenInfo.push(new TokenInfo(lineTokens.getEndOffset(i) - lineTokens.getStartOffset(i), lineTokens.getMetadata(i)));
+		}
+		return TokenArray.create(tokenInfo);
+	}
+
 	public static create(tokenInfo: TokenInfo[]): TokenArray {
 		return new TokenArray(tokenInfo);
 	}
@@ -22,6 +32,10 @@ export class TokenArray {
 		private readonly _tokenInfo: TokenInfo[],
 	) { }
 
+	public toLineTokens(lineContent: string, decoder: ILanguageIdCodec): LineTokens {
+		return LineTokens.createFromTextAndMetadata(this.map((r, t) => ({ text: r.substring(lineContent), metadata: t.metadata })), decoder);
+	}
+
 	public forEach(cb: (range: OffsetRange, tokenInfo: TokenInfo) => void): void {
 		let lengthSum = 0;
 		for (const tokenInfo of this._tokenInfo) {
@@ -31,6 +45,17 @@ export class TokenArray {
 		}
 	}
 
+	public map<T>(cb: (range: OffsetRange, tokenInfo: TokenInfo) => T): T[] {
+		const result: T[] = [];
+		let lengthSum = 0;
+		for (const tokenInfo of this._tokenInfo) {
+			const range = new OffsetRange(lengthSum, lengthSum + tokenInfo.length);
+			result.push(cb(range, tokenInfo));
+			lengthSum += tokenInfo.length;
+		}
+		return result;
+	}
+
 	public slice(range: OffsetRange): TokenArray {
 		const result: TokenInfo[] = [];
 		let lengthSum = 0;
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
index befcccca81a..a240f67595d 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts
@@ -11,6 +11,7 @@ import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js
 import { SetMap } from '../../../../../base/common/map.js';
 import { generateUuid } from '../../../../../base/common/uuid.js';
 import { ISingleEditOperation } from '../../../../common/core/editOperation.js';
+import { SingleOffsetEdit } from '../../../../common/core/offsetEdit.js';
 import { OffsetRange } from '../../../../common/core/offsetRange.js';
 import { Position } from '../../../../common/core/position.js';
 import { Range } from '../../../../common/core/range.js';
@@ -21,7 +22,6 @@ import { ILanguageConfigurationService } from '../../../../common/languages/lang
 import { ITextModel } from '../../../../common/model.js';
 import { fixBracketsInLine } from '../../../../common/model/bracketPairsTextModelPart/fixBrackets.js';
 import { TextModelText } from '../../../../common/model/textModelText.js';
-import { LineEditWithAdditionalLines } from '../../../../common/tokenizationTextModelPart.js';
 import { SnippetParser, Text } from '../../../snippet/browser/snippetParser.js';
 import { getReadonlyEmptyArray } from '../utils.js';
 
@@ -412,17 +412,15 @@ function getDefaultRange(position: Position, model: ITextModel): Range {
 }
 
 function closeBrackets(text: string, position: Position, model: ITextModel, languageConfigurationService: ILanguageConfigurationService): string {
-	const lineStart = model.getLineContent(position.lineNumber).substring(0, position.column - 1);
-	const newLine = lineStart + text;
+	const currentLine = model.getLineContent(position.lineNumber);
+	const edit = SingleOffsetEdit.replace(new OffsetRange(position.column - 1, currentLine.length), text);
 
-	const edit = LineEditWithAdditionalLines.replace(OffsetRange.ofStartAndLength(position.column - 1, newLine.length - (position.column - 1)), text);
-	const newTokens = model.tokenization.tokenizeLineWithEdit(position.lineNumber, edit);
-	const slicedTokens = newTokens?.mainLineTokens?.sliceAndInflate(position.column - 1, newLine.length, 0);
-	if (!slicedTokens) {
+	const proposedLineTokens = model.tokenization.tokenizeLinesAt(position.lineNumber, [edit.apply(currentLine)]);
+	const textTokens = proposedLineTokens?.[0].sliceZeroCopy(edit.getRangeAfterApply());
+	if (!textTokens) {
 		return text;
 	}
 
-	const newText = fixBracketsInLine(slicedTokens, languageConfigurationService);
-
-	return newText;
+	const fixedText = fixBracketsInLine(textTokens, languageConfigurationService);
+	return fixedText;
 }
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts
index 8bff9b3efba..01df0592939 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.ts
@@ -18,7 +18,6 @@ import { Range } from '../../../../../common/core/range.js';
 import { StringBuilder } from '../../../../../common/core/stringBuilder.js';
 import { ILanguageService } from '../../../../../common/languages/language.js';
 import { IModelDeltaDecoration, ITextModel, InjectedTextCursorStops, PositionAffinity } from '../../../../../common/model.js';
-import { LineEditWithAdditionalLines } from '../../../../../common/tokenizationTextModelPart.js';
 import { LineTokens } from '../../../../../common/tokens/lineTokens.js';
 import { LineDecoration } from '../../../../../common/viewLayout/lineDecorations.js';
 import { RenderLineInput, renderViewLine } from '../../../../../common/viewLayout/viewLineRenderer.js';
@@ -63,16 +62,14 @@ export class GhostTextView extends Disposable {
 		const extraClassName = syntaxHighlightingEnabled ? ' syntax-highlighted' : '';
 		const { inlineTexts, additionalLines, hiddenRange } = computeGhostTextViewData(ghostText, textModel, 'ghost-text' + extraClassName);
 
+		const currentLine = textModel.getLineContent(ghostText.lineNumber);
 		const edit = new OffsetEdit(inlineTexts.map(t => SingleOffsetEdit.insert(t.column - 1, t.text)));
-		const tokens = syntaxHighlightingEnabled ? textModel.tokenization.tokenizeLineWithEdit(ghostText.lineNumber, new LineEditWithAdditionalLines(
-			edit,
-			additionalLines.map(l => l.content)
-		)) : undefined;
+		const tokens = syntaxHighlightingEnabled ? textModel.tokenization.tokenizeLinesAt(ghostText.lineNumber, [edit.apply(currentLine), ...additionalLines.map(l => l.content)]) : undefined;
 		const newRanges = edit.getNewTextRanges();
-		const inlineTextsWithTokens = inlineTexts.map((t, idx) => ({ ...t, tokens: tokens?.mainLineTokens?.getTokensInRange(newRanges[idx]) }));
+		const inlineTextsWithTokens = inlineTexts.map((t, idx) => ({ ...t, tokens: tokens?.[0]?.getTokensInRange(newRanges[idx]) }));
 
 		const tokenizedAdditionalLines: LineData[] = additionalLines.map((l, idx) => ({
-			content: tokens?.additionalLines?.[idx] ?? LineTokens.createEmpty(l.content, this._languageService.languageIdCodec),
+			content: tokens?.[idx + 1] ?? LineTokens.createEmpty(l.content, this._languageService.languageIdCodec),
 			decorations: l.decorations,
 		}));
 

From 41a58be380da2ab2211035600ed4859bce05a0bc Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Thu, 19 Dec 2024 12:52:16 +0100
Subject: [PATCH 391/479] Bug: The cursor must be within a commenting range to
 add a comment. (#236578)

Fixes #236559
---
 src/vs/workbench/contrib/comments/browser/commentNode.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/comments/browser/commentNode.ts b/src/vs/workbench/contrib/comments/browser/commentNode.ts
index f90a81288a3..89418b81318 100644
--- a/src/vs/workbench/contrib/comments/browser/commentNode.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentNode.ts
@@ -457,7 +457,7 @@ export class CommentNode<T extends IRange | ICellRange> extends Disposable {
 		this._register(this._reactionsActionBar);
 
 		const hasReactionHandler = this.commentService.hasReactionHandler(this.owner);
-		this.comment.commentReactions!.filter(reaction => !!reaction.count).map(reaction => {
+		this.comment.commentReactions?.filter(reaction => !!reaction.count).map(reaction => {
 			const action = new ReactionAction(`reaction.${reaction.label}`, `${reaction.label}`, reaction.hasReacted && (reaction.canEdit || hasReactionHandler) ? 'active' : '', (reaction.canEdit || hasReactionHandler), async () => {
 				try {
 					await this.commentService.toggleReaction(this.owner, this.resource, this.commentThread, this.comment, reaction);

From 2ba0803abfb1b749c432e4dc7a8315f98cc799a7 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Thu, 19 Dec 2024 13:02:00 +0100
Subject: [PATCH 392/479] multi root - allow `--remove` for removal of
 workspace folders (fix #204770) (#236580)

---
 src/vs/platform/environment/common/argv.ts    |  1 +
 src/vs/platform/environment/node/argv.ts      |  1 +
 .../launch/electron-main/launchMainService.ts |  1 +
 .../electron-main/nativeHostMainService.ts    |  1 +
 src/vs/platform/window/common/window.ts       |  4 +-
 .../platform/windows/electron-main/windows.ts |  1 +
 .../electron-main/windowsMainService.ts       | 39 ++++++-----
 src/vs/server/node/server.cli.ts              |  1 +
 src/vs/workbench/api/node/extHostCLIServer.ts |  7 +-
 src/vs/workbench/electron-sandbox/window.ts   | 67 +++++++++++--------
 .../host/browser/browserHostService.ts        | 21 ++++--
 11 files changed, 91 insertions(+), 53 deletions(-)

diff --git a/src/vs/platform/environment/common/argv.ts b/src/vs/platform/environment/common/argv.ts
index 87825ee7d2c..e0756ae8946 100644
--- a/src/vs/platform/environment/common/argv.ts
+++ b/src/vs/platform/environment/common/argv.ts
@@ -36,6 +36,7 @@ export interface NativeParsedArgs {
 	diff?: boolean;
 	merge?: boolean;
 	add?: boolean;
+	remove?: boolean;
 	goto?: boolean;
 	'new-window'?: boolean;
 	'reuse-window'?: boolean;
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
index 4ef107c79bc..606aa8b277f 100644
--- a/src/vs/platform/environment/node/argv.ts
+++ b/src/vs/platform/environment/node/argv.ts
@@ -81,6 +81,7 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
 	'diff': { type: 'boolean', cat: 'o', alias: 'd', args: ['file', 'file'], description: localize('diff', "Compare two files with each other.") },
 	'merge': { type: 'boolean', cat: 'o', alias: 'm', args: ['path1', 'path2', 'base', 'result'], description: localize('merge', "Perform a three-way merge by providing paths for two modified versions of a file, the common origin of both modified versions and the output file to save merge results.") },
 	'add': { type: 'boolean', cat: 'o', alias: 'a', args: 'folder', description: localize('add', "Add folder(s) to the last active window.") },
+	'remove': { type: 'boolean', cat: 'o', args: 'folder', description: localize('remove', "Remove folder(s) from the last active window.") },
 	'goto': { type: 'boolean', cat: 'o', alias: 'g', args: 'file:line[:character]', description: localize('goto', "Open a file at the path on the specified line and character position.") },
 	'new-window': { type: 'boolean', cat: 'o', alias: 'n', description: localize('newWindow', "Force to open a new window.") },
 	'reuse-window': { type: 'boolean', cat: 'o', alias: 'r', description: localize('reuseWindow', "Force to open a file or folder in an already opened window.") },
diff --git a/src/vs/platform/launch/electron-main/launchMainService.ts b/src/vs/platform/launch/electron-main/launchMainService.ts
index 36020f52cfc..df93721b40e 100644
--- a/src/vs/platform/launch/electron-main/launchMainService.ts
+++ b/src/vs/platform/launch/electron-main/launchMainService.ts
@@ -207,6 +207,7 @@ export class LaunchMainService implements ILaunchMainService {
 				diffMode: args.diff,
 				mergeMode: args.merge,
 				addMode: args.add,
+				removeMode: args.remove,
 				noRecentEntry: !!args['skip-add-to-recently-opened'],
 				gotoLineMode: args.goto
 			});
diff --git a/src/vs/platform/native/electron-main/nativeHostMainService.ts b/src/vs/platform/native/electron-main/nativeHostMainService.ts
index c3dbf1ee3ea..794c5aed575 100644
--- a/src/vs/platform/native/electron-main/nativeHostMainService.ts
+++ b/src/vs/platform/native/electron-main/nativeHostMainService.ts
@@ -220,6 +220,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 				diffMode: options.diffMode,
 				mergeMode: options.mergeMode,
 				addMode: options.addMode,
+				removeMode: options.removeMode,
 				gotoLineMode: options.gotoLineMode,
 				noRecentEntry: options.noRecentEntry,
 				waitMarkerFileURI: options.waitMarkerFileURI,
diff --git a/src/vs/platform/window/common/window.ts b/src/vs/platform/window/common/window.ts
index d547c37bf50..3a03481e55a 100644
--- a/src/vs/platform/window/common/window.ts
+++ b/src/vs/platform/window/common/window.ts
@@ -63,6 +63,7 @@ export interface IOpenWindowOptions extends IBaseOpenWindowsOptions {
 	readonly noRecentEntry?: boolean;
 
 	readonly addMode?: boolean;
+	readonly removeMode?: boolean;
 
 	readonly diffMode?: boolean;
 	readonly mergeMode?: boolean;
@@ -71,8 +72,9 @@ export interface IOpenWindowOptions extends IBaseOpenWindowsOptions {
 	readonly waitMarkerFileURI?: URI;
 }
 
-export interface IAddFoldersRequest {
+export interface IAddRemoveFoldersRequest {
 	readonly foldersToAdd: UriComponents[];
+	readonly foldersToRemove: UriComponents[];
 }
 
 interface IOpenedWindow {
diff --git a/src/vs/platform/windows/electron-main/windows.ts b/src/vs/platform/windows/electron-main/windows.ts
index dd5148103bd..6d14080654d 100644
--- a/src/vs/platform/windows/electron-main/windows.ts
+++ b/src/vs/platform/windows/electron-main/windows.ts
@@ -103,6 +103,7 @@ export interface IOpenConfiguration extends IBaseOpenConfiguration {
 	readonly diffMode?: boolean;
 	readonly mergeMode?: boolean;
 	addMode?: boolean;
+	removeMode?: boolean;
 	readonly gotoLineMode?: boolean;
 	readonly initialStartup?: boolean;
 	readonly noRecentEntry?: boolean;
diff --git a/src/vs/platform/windows/electron-main/windowsMainService.ts b/src/vs/platform/windows/electron-main/windowsMainService.ts
index d403852efcc..8db5f04b7e3 100644
--- a/src/vs/platform/windows/electron-main/windowsMainService.ts
+++ b/src/vs/platform/windows/electron-main/windowsMainService.ts
@@ -37,7 +37,7 @@ import product from '../../product/common/product.js';
 import { IProtocolMainService } from '../../protocol/electron-main/protocol.js';
 import { getRemoteAuthority } from '../../remote/common/remoteHosts.js';
 import { IStateService } from '../../state/node/state.js';
-import { IAddFoldersRequest, INativeOpenFileRequest, INativeWindowConfiguration, IOpenEmptyWindowOptions, IPath, IPathsToWaitFor, isFileToOpen, isFolderToOpen, isWorkspaceToOpen, IWindowOpenable, IWindowSettings } from '../../window/common/window.js';
+import { IAddRemoveFoldersRequest, INativeOpenFileRequest, INativeWindowConfiguration, IOpenEmptyWindowOptions, IPath, IPathsToWaitFor, isFileToOpen, isFolderToOpen, isWorkspaceToOpen, IWindowOpenable, IWindowSettings } from '../../window/common/window.js';
 import { CodeWindow } from './windowImpl.js';
 import { IOpenConfiguration, IOpenEmptyConfiguration, IWindowsCountChangedEvent, IWindowsMainService, OpenContext, getLastFocused } from './windows.js';
 import { findWindowOnExtensionDevelopmentPath, findWindowOnFile, findWindowOnWorkspaceOrFolder } from './windowsFinder.js';
@@ -287,11 +287,15 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 	async open(openConfig: IOpenConfiguration): Promise<ICodeWindow[]> {
 		this.logService.trace('windowsManager#open');
 
-		if (openConfig.addMode && (openConfig.initialStartup || !this.getLastActiveWindow())) {
-			openConfig.addMode = false; // Make sure addMode is only enabled if we have an active window
+		// Make sure addMode/removeMode is only enabled if we have an active window
+		if ((openConfig.addMode || openConfig.removeMode) && (openConfig.initialStartup || !this.getLastActiveWindow())) {
+			openConfig.addMode = false;
+			openConfig.removeMode = false;
 		}
 
 		const foldersToAdd: ISingleFolderWorkspacePathToOpen[] = [];
+		const foldersToRemove: ISingleFolderWorkspacePathToOpen[] = [];
+
 		const foldersToOpen: ISingleFolderWorkspacePathToOpen[] = [];
 
 		const workspacesToOpen: IWorkspacePathToOpen[] = [];
@@ -311,6 +315,10 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 					// When run with --add, take the folders that are to be opened as
 					// folders that should be added to the currently active window.
 					foldersToAdd.push(path);
+				} else if (openConfig.removeMode) {
+					// When run with --remove, take the folders that are to be opened as
+					// folders that should be removed from the currently active window.
+					foldersToRemove.push(path);
 				} else {
 					foldersToOpen.push(path);
 				}
@@ -360,7 +368,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		}
 
 		// Open based on config
-		const { windows: usedWindows, filesOpenedInWindow } = await this.doOpen(openConfig, workspacesToOpen, foldersToOpen, emptyWindowsWithBackupsToRestore, openOneEmptyWindow, filesToOpen, foldersToAdd);
+		const { windows: usedWindows, filesOpenedInWindow } = await this.doOpen(openConfig, workspacesToOpen, foldersToOpen, emptyWindowsWithBackupsToRestore, openOneEmptyWindow, filesToOpen, foldersToAdd, foldersToRemove);
 
 		this.logService.trace(`windowsManager#open used window count ${usedWindows.length} (workspacesToOpen: ${workspacesToOpen.length}, foldersToOpen: ${foldersToOpen.length}, emptyToRestore: ${emptyWindowsWithBackupsToRestore.length}, openOneEmptyWindow: ${openOneEmptyWindow})`);
 
@@ -463,7 +471,8 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		emptyToRestore: IEmptyWindowBackupInfo[],
 		openOneEmptyWindow: boolean,
 		filesToOpen: IFilesToOpen | undefined,
-		foldersToAdd: ISingleFolderWorkspacePathToOpen[]
+		foldersToAdd: ISingleFolderWorkspacePathToOpen[],
+		foldersToRemove: ISingleFolderWorkspacePathToOpen[]
 	): Promise<{ windows: ICodeWindow[]; filesOpenedInWindow: ICodeWindow | undefined }> {
 
 		// Keep track of used windows and remember
@@ -482,12 +491,12 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		// Settings can decide if files/folders open in new window or not
 		let { openFolderInNewWindow, openFilesInNewWindow } = this.shouldOpenNewWindow(openConfig);
 
-		// Handle folders to add by looking for the last active workspace (not on initial startup)
-		if (!openConfig.initialStartup && foldersToAdd.length > 0) {
-			const authority = foldersToAdd[0].remoteAuthority;
+		// Handle folders to add/remove by looking for the last active workspace (not on initial startup)
+		if (!openConfig.initialStartup && (foldersToAdd.length > 0 || foldersToRemove.length > 0)) {
+			const authority = foldersToAdd.at(0)?.remoteAuthority ?? foldersToRemove.at(0)?.remoteAuthority;
 			const lastActiveWindow = this.getLastActiveWindowForAuthority(authority);
 			if (lastActiveWindow) {
-				addUsedWindow(this.doAddFoldersToExistingWindow(lastActiveWindow, foldersToAdd.map(folderToAdd => folderToAdd.workspace.uri)));
+				addUsedWindow(this.doAddRemoveFoldersInExistingWindow(lastActiveWindow, foldersToAdd.map(folderToAdd => folderToAdd.workspace.uri), foldersToRemove.map(folderToRemove => folderToRemove.workspace.uri)));
 			}
 		}
 
@@ -671,13 +680,13 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		windowToFocus.focus();
 	}
 
-	private doAddFoldersToExistingWindow(window: ICodeWindow, foldersToAdd: URI[]): ICodeWindow {
-		this.logService.trace('windowsManager#doAddFoldersToExistingWindow', { foldersToAdd });
+	private doAddRemoveFoldersInExistingWindow(window: ICodeWindow, foldersToAdd: URI[], foldersToRemove: URI[]): ICodeWindow {
+		this.logService.trace('windowsManager#doAddRemoveFoldersToExistingWindow', { foldersToAdd, foldersToRemove });
 
 		window.focus(); // make sure window has focus
 
-		const request: IAddFoldersRequest = { foldersToAdd };
-		window.sendWhenReady('vscode:addFolders', CancellationToken.None, request);
+		const request: IAddRemoveFoldersRequest = { foldersToAdd, foldersToRemove };
+		window.sendWhenReady('vscode:addRemoveFolders', CancellationToken.None, request);
 
 		return window;
 	}
@@ -764,10 +773,10 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 		}
 
 		// Handle the case of multiple folders being opened from CLI while we are
-		// not in `--add` mode by creating an untitled workspace, only if:
+		// not in `--add` or `--remove` mode by creating an untitled workspace, only if:
 		// - they all share the same remote authority
 		// - there is no existing workspace to open that matches these folders
-		if (!openConfig.addMode && isCommandLineOrAPICall) {
+		if (!openConfig.addMode && !openConfig.removeMode && isCommandLineOrAPICall) {
 			const foldersToOpen = pathsToOpen.filter(path => isSingleFolderWorkspacePathToOpen(path));
 			if (foldersToOpen.length > 1) {
 				const remoteAuthority = foldersToOpen[0].remoteAuthority;
diff --git a/src/vs/server/node/server.cli.ts b/src/vs/server/node/server.cli.ts
index 7f20588c3bd..0535ddd998f 100644
--- a/src/vs/server/node/server.cli.ts
+++ b/src/vs/server/node/server.cli.ts
@@ -337,6 +337,7 @@ export async function main(desc: ProductDescription, args: string[]): Promise<vo
 			diffMode: parsedArgs.diff,
 			mergeMode: parsedArgs.merge,
 			addMode: parsedArgs.add,
+			removeMode: parsedArgs.remove,
 			gotoLineMode: parsedArgs.goto,
 			forceReuseWindow: parsedArgs['reuse-window'],
 			forceNewWindow: parsedArgs['new-window'],
diff --git a/src/vs/workbench/api/node/extHostCLIServer.ts b/src/vs/workbench/api/node/extHostCLIServer.ts
index e6261fb0b0c..01bc190d579 100644
--- a/src/vs/workbench/api/node/extHostCLIServer.ts
+++ b/src/vs/workbench/api/node/extHostCLIServer.ts
@@ -20,6 +20,7 @@ export interface OpenCommandPipeArgs {
 	diffMode?: boolean;
 	mergeMode?: boolean;
 	addMode?: boolean;
+	removeMode?: boolean;
 	gotoLineMode?: boolean;
 	forceReuseWindow?: boolean;
 	waitMarkerFilePath?: string;
@@ -119,7 +120,7 @@ export class CLIServerBase {
 	}
 
 	private async open(data: OpenCommandPipeArgs): Promise<undefined> {
-		const { fileURIs, folderURIs, forceNewWindow, diffMode, mergeMode, addMode, forceReuseWindow, gotoLineMode, waitMarkerFilePath, remoteAuthority } = data;
+		const { fileURIs, folderURIs, forceNewWindow, diffMode, mergeMode, addMode, removeMode, forceReuseWindow, gotoLineMode, waitMarkerFilePath, remoteAuthority } = data;
 		const urisToOpen: IWindowOpenable[] = [];
 		if (Array.isArray(folderURIs)) {
 			for (const s of folderURIs) {
@@ -144,8 +145,8 @@ export class CLIServerBase {
 			}
 		}
 		const waitMarkerFileURI = waitMarkerFilePath ? URI.file(waitMarkerFilePath) : undefined;
-		const preferNewWindow = !forceReuseWindow && !waitMarkerFileURI && !addMode;
-		const windowOpenArgs: IOpenWindowOptions = { forceNewWindow, diffMode, mergeMode, addMode, gotoLineMode, forceReuseWindow, preferNewWindow, waitMarkerFileURI, remoteAuthority };
+		const preferNewWindow = !forceReuseWindow && !waitMarkerFileURI && !addMode && !removeMode;
+		const windowOpenArgs: IOpenWindowOptions = { forceNewWindow, diffMode, mergeMode, addMode, removeMode, gotoLineMode, forceReuseWindow, preferNewWindow, waitMarkerFileURI, remoteAuthority };
 		this._commands.executeCommand('_remoteCLI.windowOpen', urisToOpen, windowOpenArgs);
 	}
 
diff --git a/src/vs/workbench/electron-sandbox/window.ts b/src/vs/workbench/electron-sandbox/window.ts
index c186b45d2ba..4babd90fe70 100644
--- a/src/vs/workbench/electron-sandbox/window.ts
+++ b/src/vs/workbench/electron-sandbox/window.ts
@@ -14,7 +14,7 @@ import { IFileService } from '../../platform/files/common/files.js';
 import { EditorResourceAccessor, IUntitledTextResourceEditorInput, SideBySideEditor, pathsToEditors, IResourceDiffEditorInput, IUntypedEditorInput, IEditorPane, isResourceEditorInput, IResourceMergeEditorInput } from '../common/editor.js';
 import { IEditorService } from '../services/editor/common/editorService.js';
 import { ITelemetryService } from '../../platform/telemetry/common/telemetry.js';
-import { WindowMinimumSize, IOpenFileRequest, IAddFoldersRequest, INativeRunActionInWindowRequest, INativeRunKeybindingInWindowRequest, INativeOpenFileRequest, hasNativeTitlebar } from '../../platform/window/common/window.js';
+import { WindowMinimumSize, IOpenFileRequest, IAddRemoveFoldersRequest, INativeRunActionInWindowRequest, INativeRunKeybindingInWindowRequest, INativeOpenFileRequest, hasNativeTitlebar } from '../../platform/window/common/window.js';
 import { ITitleService } from '../services/title/browser/titleService.js';
 import { IWorkbenchThemeService } from '../services/themes/common/workbenchThemeService.js';
 import { ApplyZoomTarget, applyZoom } from '../../platform/window/electron-sandbox/window.js';
@@ -84,8 +84,9 @@ export class NativeWindow extends BaseWindow {
 
 	private readonly customTitleContextMenuDisposable = this._register(new DisposableStore());
 
-	private readonly addFoldersScheduler = this._register(new RunOnceScheduler(() => this.doAddFolders(), 100));
+	private readonly addRemoveFoldersScheduler = this._register(new RunOnceScheduler(() => this.doAddRemoveFolders(), 100));
 	private pendingFoldersToAdd: URI[] = [];
+	private pendingFoldersToRemove: URI[] = [];
 
 	private isDocumentedEdited = false;
 
@@ -209,11 +210,11 @@ export class NativeWindow extends BaseWindow {
 		// Support openFiles event for existing and new files
 		ipcRenderer.on('vscode:openFiles', (event: unknown, request: IOpenFileRequest) => { this.onOpenFiles(request); });
 
-		// Support addFolders event if we have a workspace opened
-		ipcRenderer.on('vscode:addFolders', (event: unknown, request: IAddFoldersRequest) => { this.onAddFoldersRequest(request); });
+		// Support addRemoveFolders event for workspace management
+		ipcRenderer.on('vscode:addRemoveFolders', (event: unknown, request: IAddRemoveFoldersRequest) => this.onAddRemoveFoldersRequest(request));
 
 		// Message support
-		ipcRenderer.on('vscode:showInfoMessage', (event: unknown, message: string) => { this.notificationService.info(message); });
+		ipcRenderer.on('vscode:showInfoMessage', (event: unknown, message: string) => this.notificationService.info(message));
 
 		// Shell Environment Issue Notifications
 		ipcRenderer.on('vscode:showResolveShellEnvError', (event: unknown, message: string) => {
@@ -788,20 +789,6 @@ export class NativeWindow extends BaseWindow {
 		});
 	}
 
-	private async openTunnel(address: string, port: number): Promise<RemoteTunnel | string | undefined> {
-		const remoteAuthority = this.environmentService.remoteAuthority;
-		const addressProvider: IAddressProvider | undefined = remoteAuthority ? {
-			getAddress: async (): Promise<IAddress> => {
-				return (await this.remoteAuthorityResolverService.resolveAuthority(remoteAuthority)).authority;
-			}
-		} : undefined;
-		const tunnel = await this.tunnelService.getExistingTunnel(address, port);
-		if (!tunnel || (typeof tunnel === 'string')) {
-			return this.tunnelService.openTunnel(addressProvider, address, port);
-		}
-		return tunnel;
-	}
-
 	async resolveExternalUri(uri: URI, options?: OpenOptions): Promise<IResolvedExternalUri | undefined> {
 		let queryTunnel: RemoteTunnel | string | undefined;
 		if (options?.allowTunneling) {
@@ -826,6 +813,7 @@ export class NativeWindow extends BaseWindow {
 					}
 				}
 			}
+
 			if (portMappingRequest) {
 				const tunnel = await this.openTunnel(portMappingRequest.address, portMappingRequest.port);
 				if (tunnel && (typeof tunnel !== 'string')) {
@@ -861,6 +849,22 @@ export class NativeWindow extends BaseWindow {
 		return undefined;
 	}
 
+	private async openTunnel(address: string, port: number): Promise<RemoteTunnel | string | undefined> {
+		const remoteAuthority = this.environmentService.remoteAuthority;
+		const addressProvider: IAddressProvider | undefined = remoteAuthority ? {
+			getAddress: async (): Promise<IAddress> => {
+				return (await this.remoteAuthorityResolverService.resolveAuthority(remoteAuthority)).authority;
+			}
+		} : undefined;
+
+		const tunnel = await this.tunnelService.getExistingTunnel(address, port);
+		if (!tunnel || (typeof tunnel === 'string')) {
+			return this.tunnelService.openTunnel(addressProvider, address, port);
+		}
+
+		return tunnel;
+	}
+
 	private setupOpenHandlers(): void {
 
 		// Handle external open() calls
@@ -961,27 +965,32 @@ export class NativeWindow extends BaseWindow {
 
 	//#endregion
 
-	private onAddFoldersRequest(request: IAddFoldersRequest): void {
+	private onAddRemoveFoldersRequest(request: IAddRemoveFoldersRequest): void {
 
 		// Buffer all pending requests
 		this.pendingFoldersToAdd.push(...request.foldersToAdd.map(folder => URI.revive(folder)));
+		this.pendingFoldersToRemove.push(...request.foldersToRemove.map(folder => URI.revive(folder)));
 
 		// Delay the adding of folders a bit to buffer in case more requests are coming
-		if (!this.addFoldersScheduler.isScheduled()) {
-			this.addFoldersScheduler.schedule();
+		if (!this.addRemoveFoldersScheduler.isScheduled()) {
+			this.addRemoveFoldersScheduler.schedule();
 		}
 	}
 
-	private doAddFolders(): void {
-		const foldersToAdd: IWorkspaceFolderCreationData[] = [];
-
-		for (const folder of this.pendingFoldersToAdd) {
-			foldersToAdd.push(({ uri: folder }));
-		}
+	private async doAddRemoveFolders(): Promise<void> {
+		const foldersToAdd: IWorkspaceFolderCreationData[] = this.pendingFoldersToAdd.map(folder => ({ uri: folder }));
+		const foldersToRemove = this.pendingFoldersToRemove.slice(0);
 
 		this.pendingFoldersToAdd = [];
+		this.pendingFoldersToRemove = [];
+
+		if (foldersToAdd.length) {
+			await this.workspaceEditingService.addFolders(foldersToAdd);
+		}
 
-		this.workspaceEditingService.addFolders(foldersToAdd);
+		if (foldersToRemove.length) {
+			await this.workspaceEditingService.removeFolders(foldersToRemove);
+		}
 	}
 
 	private async onOpenFiles(request: INativeOpenFileRequest): Promise<void> {
diff --git a/src/vs/workbench/services/host/browser/browserHostService.ts b/src/vs/workbench/services/host/browser/browserHostService.ts
index afd2a3d1267..57cb6e482cf 100644
--- a/src/vs/workbench/services/host/browser/browserHostService.ts
+++ b/src/vs/workbench/services/host/browser/browserHostService.ts
@@ -40,6 +40,7 @@ import { coalesce } from '../../../../base/common/arrays.js';
 import { mainWindow, isAuxiliaryWindow } from '../../../../base/browser/window.js';
 import { isIOS, isMacintosh } from '../../../../base/common/platform.js';
 import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js';
+import { URI } from '../../../../base/common/uri.js';
 
 enum HostShutdownReason {
 
@@ -238,7 +239,9 @@ export class BrowserHostService extends Disposable implements IHostService {
 	private async doOpenWindow(toOpen: IWindowOpenable[], options?: IOpenWindowOptions): Promise<void> {
 		const payload = this.preservePayload(false /* not an empty window */, options);
 		const fileOpenables: IFileToOpen[] = [];
+
 		const foldersToAdd: IWorkspaceFolderCreationData[] = [];
+		const foldersToRemove: URI[] = [];
 
 		for (const openable of toOpen) {
 			openable.label = openable.label || this.getRecentLabel(openable);
@@ -246,7 +249,9 @@ export class BrowserHostService extends Disposable implements IHostService {
 			// Folder
 			if (isFolderToOpen(openable)) {
 				if (options?.addMode) {
-					foldersToAdd.push(({ uri: openable.folderUri }));
+					foldersToAdd.push({ uri: openable.folderUri });
+				} else if (options?.removeMode) {
+					foldersToRemove.push(openable.folderUri);
 				} else {
 					this.doOpen({ folderUri: openable.folderUri }, { reuse: this.shouldReuse(options, false /* no file */), payload });
 				}
@@ -263,11 +268,17 @@ export class BrowserHostService extends Disposable implements IHostService {
 			}
 		}
 
-		// Handle Folders to Add
-		if (foldersToAdd.length > 0) {
-			this.withServices(accessor => {
+		// Handle Folders to add or remove
+		if (foldersToAdd.length > 0 || foldersToRemove.length > 0) {
+			this.withServices(async accessor => {
 				const workspaceEditingService: IWorkspaceEditingService = accessor.get(IWorkspaceEditingService);
-				workspaceEditingService.addFolders(foldersToAdd);
+				if (foldersToAdd.length > 0) {
+					await workspaceEditingService.addFolders(foldersToAdd);
+				}
+
+				if (foldersToRemove.length > 0) {
+					await workspaceEditingService.removeFolders(foldersToRemove);
+				}
 			});
 		}
 

From 225d1ca870a984369bde1a7fcd75f863fc69fee1 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Thu, 19 Dec 2024 13:07:00 +0100
Subject: [PATCH 393/479] Improved value formatting in observable logging
 (#236579)

* Improved value formatting in observable logging

* substr -> substring
---
 src/vs/base/common/observableInternal/logging.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/vs/base/common/observableInternal/logging.ts b/src/vs/base/common/observableInternal/logging.ts
index 0c343b548e4..a6a5bb78a06 100644
--- a/src/vs/base/common/observableInternal/logging.ts
+++ b/src/vs/base/common/observableInternal/logging.ts
@@ -356,6 +356,14 @@ function formatArray(value: unknown[], availableLen: number): string {
 }
 
 function formatObject(value: object, availableLen: number): string {
+	if (typeof value.toString === 'function' && value.toString !== Object.prototype.toString) {
+		const val = value.toString();
+		if (val.length <= availableLen) {
+			return val;
+		}
+		return val.substring(0, availableLen - 3) + '...';
+	}
+
 	let result = '{ ';
 	let first = true;
 	for (const [key, val] of Object.entries(value)) {

From 9813e9a4a95b2c1c74fddf911ab09855ee6ba59c Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Thu, 19 Dec 2024 13:59:41 +0100
Subject: [PATCH 394/479] Revert "Pressing alt/opt makes the hover temporarily
 sticky (#236356)"

This reverts commit 317d55da7b91e07131403663d8aa6f9499e3a112.
---
 .../hover/browser/contentHoverController.ts   | 39 +++----------------
 .../browser/contentHoverWidgetWrapper.ts      | 26 +++----------
 2 files changed, 12 insertions(+), 53 deletions(-)

diff --git a/src/vs/editor/contrib/hover/browser/contentHoverController.ts b/src/vs/editor/contrib/hover/browser/contentHoverController.ts
index 09cb6efcab4..11ddb36fa83 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverController.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverController.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { DECREASE_HOVER_VERBOSITY_ACTION_ID, INCREASE_HOVER_VERBOSITY_ACTION_ID, SHOW_OR_FOCUS_HOVER_ACTION_ID } from './hoverActionIds.js';
-import { IKeyboardEvent, StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
-import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { IKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { ICodeEditor, IEditorMouseEvent, IPartialEditorMouseEvent } from '../../../browser/editorBrowser.js';
 import { ConfigurationChangedEvent, EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
@@ -22,9 +22,6 @@ import { ContentHoverWidgetWrapper } from './contentHoverWidgetWrapper.js';
 import './hover.css';
 import { Emitter } from '../../../../base/common/event.js';
 import { isOnColorDecorator } from '../../colorPicker/browser/hoverColorPicker/hoverColorPicker.js';
-import { KeyCode } from '../../../../base/common/keyCodes.js';
-import { EventType } from '../../../../base/browser/dom.js';
-import { mainWindow } from '../../../../base/browser/window.js';
 
 // sticky hover widget which doesn't disappear on focus out and such
 const _sticky = false
@@ -95,18 +92,11 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 		this._listenersStore.add(this._editor.onMouseDown((e: IEditorMouseEvent) => this._onEditorMouseDown(e)));
 		this._listenersStore.add(this._editor.onMouseUp(() => this._onEditorMouseUp()));
 		this._listenersStore.add(this._editor.onMouseMove((e: IEditorMouseEvent) => this._onEditorMouseMove(e)));
+		this._listenersStore.add(this._editor.onKeyDown((e: IKeyboardEvent) => this._onKeyDown(e)));
 		this._listenersStore.add(this._editor.onMouseLeave((e) => this._onEditorMouseLeave(e)));
 		this._listenersStore.add(this._editor.onDidChangeModel(() => this._cancelSchedulerAndHide()));
 		this._listenersStore.add(this._editor.onDidChangeModelContent(() => this._cancelScheduler()));
 		this._listenersStore.add(this._editor.onDidScrollChange((e: IScrollEvent) => this._onEditorScrollChanged(e)));
-		const keyDownListener = (e: KeyboardEvent) => this._onKeyDown(e);
-		const keyUpListener = (e: KeyboardEvent) => this._onKeyUp(e);
-		mainWindow.addEventListener(EventType.KEY_DOWN, keyDownListener);
-		mainWindow.addEventListener(EventType.KEY_UP, keyUpListener);
-		this._listenersStore.add(toDisposable(() => {
-			mainWindow.removeEventListener(EventType.KEY_DOWN, keyDownListener);
-			mainWindow.removeEventListener(EventType.KEY_UP, keyUpListener);
-		}));
 	}
 
 	private _unhookListeners(): void {
@@ -165,9 +155,6 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 		if (_sticky) {
 			return;
 		}
-		if (this._contentWidget) {
-			this._contentWidget.temporarilySticky = false;
-		}
 		this.hideContentHover();
 	}
 
@@ -247,15 +234,11 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 		this.hideContentHover();
 	}
 
-	private _onKeyDown(e: KeyboardEvent): void {
-		if (!this._contentWidget) {
+	private _onKeyDown(e: IKeyboardEvent): void {
+		if (!this._editor.hasModel()) {
 			return;
 		}
-		const event = new StandardKeyboardEvent(e);
-		if (event.keyCode === KeyCode.Alt) {
-			this._contentWidget.temporarilySticky = true;
-		}
-		const isPotentialKeyboardShortcut = this._isPotentialKeyboardShortcut(event);
+		const isPotentialKeyboardShortcut = this._isPotentialKeyboardShortcut(e);
 		if (isPotentialKeyboardShortcut) {
 			return;
 		}
@@ -265,16 +248,6 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 		this.hideContentHover();
 	}
 
-	private _onKeyUp(e: KeyboardEvent): void {
-		if (!this._contentWidget) {
-			return;
-		}
-		const event = new StandardKeyboardEvent(e);
-		if (event.keyCode === KeyCode.Alt) {
-			this._contentWidget.temporarilySticky = false;
-		}
-	}
-
 	private _isPotentialKeyboardShortcut(e: IKeyboardEvent): boolean {
 		if (!this._editor.hasModel() || !this._contentWidget) {
 			return false;
diff --git a/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts b/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts
index 228e9533d29..ad9a9920967 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.ts
@@ -27,7 +27,6 @@ export class ContentHoverWidgetWrapper extends Disposable implements IHoverWidge
 
 	private _currentResult: ContentHoverResult | null = null;
 	private _renderedContentHover: RenderedContentHover | undefined;
-	private _temporarilySticky: boolean = false;
 
 	private readonly _contentHoverWidget: ContentHoverWidget;
 	private readonly _participants: IEditorHoverParticipant[];
@@ -163,25 +162,11 @@ export class ContentHoverWidgetWrapper extends Disposable implements IHoverWidge
 		if (currentHoverResultIsEmpty) {
 			currentHoverResult = null;
 		}
-		const hoverVisible = this._contentHoverWidget.isVisible;
-		if (!hoverVisible) {
-			this._renderResult(currentHoverResult);
-		} else {
-			if (this._temporarilySticky) {
-				return;
-			} else {
-				this._renderResult(currentHoverResult);
-			}
-		}
-	}
-
-	private _renderResult(currentHoverResult: ContentHoverResult | null): void {
 		this._currentResult = currentHoverResult;
 		if (this._currentResult) {
 			this._showHover(this._currentResult);
 		} else {
-			this._contentHoverWidget.hide();
-			this._participants.forEach(participant => participant.handleHide?.());
+			this._hideHover();
 		}
 	}
 
@@ -230,6 +215,11 @@ export class ContentHoverWidgetWrapper extends Disposable implements IHoverWidge
 		}
 	}
 
+	private _hideHover(): void {
+		this._contentHoverWidget.hide();
+		this._participants.forEach(participant => participant.handleHide?.());
+	}
+
 	private _getHoverContext(): IEditorHoverContext {
 		const hide = () => {
 			this.hide();
@@ -303,10 +293,6 @@ export class ContentHoverWidgetWrapper extends Disposable implements IHoverWidge
 		}
 	}
 
-	public set temporarilySticky(value: boolean) {
-		this._temporarilySticky = value;
-	}
-
 	public startShowingAtRange(range: Range, mode: HoverStartMode, source: HoverStartSource, focus: boolean): void {
 		this._startShowingOrUpdateHover(new HoverRangeAnchor(0, range, undefined, undefined), mode, source, focus, null);
 	}

From aea3ab47f5d820198b0f68d34b3846b483f9e809 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Thu, 19 Dec 2024 14:07:44 +0100
Subject: [PATCH 395/479] Fix compilation errors

---
 .../editor/contrib/hover/browser/contentHoverController.ts   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/vs/editor/contrib/hover/browser/contentHoverController.ts b/src/vs/editor/contrib/hover/browser/contentHoverController.ts
index 11ddb36fa83..acbabe6a83e 100644
--- a/src/vs/editor/contrib/hover/browser/contentHoverController.ts
+++ b/src/vs/editor/contrib/hover/browser/contentHoverController.ts
@@ -22,6 +22,7 @@ import { ContentHoverWidgetWrapper } from './contentHoverWidgetWrapper.js';
 import './hover.css';
 import { Emitter } from '../../../../base/common/event.js';
 import { isOnColorDecorator } from '../../colorPicker/browser/hoverColorPicker/hoverColorPicker.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
 
 // sticky hover widget which doesn't disappear on focus out and such
 const _sticky = false
@@ -235,14 +236,14 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 	}
 
 	private _onKeyDown(e: IKeyboardEvent): void {
-		if (!this._editor.hasModel()) {
+		if (!this._contentWidget) {
 			return;
 		}
 		const isPotentialKeyboardShortcut = this._isPotentialKeyboardShortcut(e);
 		if (isPotentialKeyboardShortcut) {
 			return;
 		}
-		if (this._contentWidget.isFocused && event.keyCode === KeyCode.Tab) {
+		if (this._contentWidget.isFocused && e.keyCode === KeyCode.Tab) {
 			return;
 		}
 		this.hideContentHover();

From 5385e31b3f7883a5524deec90f1df5faa49c4287 Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Thu, 19 Dec 2024 14:10:37 +0100
Subject: [PATCH 396/479] Trigger inline edits on paste (#236584)

---
 src/vs/editor/browser/observableCodeEditor.ts       | 13 ++++++++++++-
 .../controller/inlineCompletionsController.ts       |  6 ++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/vs/editor/browser/observableCodeEditor.ts b/src/vs/editor/browser/observableCodeEditor.ts
index d8607ae319a..3633d4cac45 100644
--- a/src/vs/editor/browser/observableCodeEditor.ts
+++ b/src/vs/editor/browser/observableCodeEditor.ts
@@ -14,7 +14,7 @@ import { Selection } from '../common/core/selection.js';
 import { ICursorSelectionChangedEvent } from '../common/cursorEvents.js';
 import { IModelDeltaDecoration, ITextModel } from '../common/model.js';
 import { IModelContentChangedEvent } from '../common/textModelEvents.js';
-import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IOverlayWidget, IOverlayWidgetPosition } from './editorBrowser.js';
+import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IOverlayWidget, IOverlayWidgetPosition, IPasteEvent } from './editorBrowser.js';
 import { Point } from './point.js';
 
 /**
@@ -94,6 +94,16 @@ export class ObservableCodeEditor extends Disposable {
 			}
 		}));
 
+		this._register(this.editor.onDidPaste((e) => {
+			this._beginUpdate();
+			try {
+				this._forceUpdate();
+				this.onDidPaste.trigger(this._currentTransaction, e);
+			} finally {
+				this._endUpdate();
+			}
+		}));
+
 		this._register(this.editor.onDidChangeModelContent(e => {
 			this._beginUpdate();
 			try {
@@ -213,6 +223,7 @@ export class ObservableCodeEditor extends Disposable {
 	public readonly cursorLineNumber = derived<number | null>(this, reader => this.cursorPosition.read(reader)?.lineNumber ?? null);
 
 	public readonly onDidType = observableSignal<string>(this);
+	public readonly onDidPaste = observableSignal<IPasteEvent>(this);
 
 	public readonly scrollTop = observableFromEvent(this.editor.onDidScrollChange, () => this.editor.getScrollTop());
 	public readonly scrollLeft = observableFromEvent(this.editor.onDidScrollChange, () => this.editor.getScrollLeft());
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
index 7c7e4495719..79fdfb85afd 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
@@ -140,6 +140,12 @@ export class InlineCompletionsController extends Disposable {
 			}
 		}));
 
+		this._register(runOnChange(this._editorObs.onDidPaste, (_value, _changes) => {
+			if (this._enabled.get()) {
+				this.model.get()?.trigger();
+			}
+		}));
+
 		this._register(this._commandService.onDidExecuteCommand((e) => {
 			// These commands don't trigger onDidType.
 			const commands = new Set([

From 05519998aeb60a492478948e6e196586a24c04c6 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Thu, 19 Dec 2024 05:10:51 -0800
Subject: [PATCH 397/479] Ignore bg terminals for confirmOnExit

Fixes #235575
---
 .../contrib/terminal/browser/terminalService.ts        | 10 +++++++---
 .../contrib/terminal/common/terminalConfiguration.ts   |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/terminal/browser/terminalService.ts b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
index 70d2aa007ec..698559d3b2c 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
@@ -95,6 +95,10 @@ export class TerminalService extends Disposable implements ITerminalService {
 	get instances(): ITerminalInstance[] {
 		return this._terminalGroupService.instances.concat(this._terminalEditorService.instances).concat(this._backgroundedTerminalInstances);
 	}
+	/** Gets all non-background terminals. */
+	get foregroundInstances(): ITerminalInstance[] {
+		return this._terminalGroupService.instances.concat(this._terminalEditorService.instances);
+	}
 	get detachedInstances(): Iterable<IDetachedTerminalInstance> {
 		return this._detachedXterms;
 	}
@@ -417,7 +421,6 @@ export class TerminalService extends Disposable implements ITerminalService {
 		if (instance.target !== TerminalLocation.Editor &&
 			instance.hasChildProcesses &&
 			(this._terminalConfigurationService.config.confirmOnKill === 'panel' || this._terminalConfigurationService.config.confirmOnKill === 'always')) {
-
 			const veto = await this._showTerminalCloseConfirmation(true);
 			if (veto) {
 				return;
@@ -904,10 +907,11 @@ export class TerminalService extends Disposable implements ITerminalService {
 
 	protected async _showTerminalCloseConfirmation(singleTerminal?: boolean): Promise<boolean> {
 		let message: string;
-		if (this.instances.length === 1 || singleTerminal) {
+		const foregroundInstances = this.foregroundInstances;
+		if (foregroundInstances.length === 1 || singleTerminal) {
 			message = nls.localize('terminalService.terminalCloseConfirmationSingular', "Do you want to terminate the active terminal session?");
 		} else {
-			message = nls.localize('terminalService.terminalCloseConfirmationPlural', "Do you want to terminate the {0} active terminal sessions?", this.instances.length);
+			message = nls.localize('terminalService.terminalCloseConfirmationPlural', "Do you want to terminate the {0} active terminal sessions?", foregroundInstances.length);
 		}
 		const { confirmed } = await this._dialogService.confirm({
 			type: 'warning',
diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index beea86681fb..b90a67cbbc6 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -366,7 +366,7 @@ const terminalConfiguration: IConfigurationNode = {
 			default: 'never'
 		},
 		[TerminalSettingId.ConfirmOnKill]: {
-			description: localize('terminal.integrated.confirmOnKill', "Controls whether to confirm killing terminals when they have child processes. When set to editor, terminals in the editor area will be marked as changed when they have child processes. Note that child process detection may not work well for shells like Git Bash which don't run their processes as child processes of the shell."),
+			description: localize('terminal.integrated.confirmOnKill', "Controls whether to confirm killing terminals when they have child processes. When set to editor, terminals in the editor area will be marked as changed when they have child processes. Note that child process detection may not work well for shells like Git Bash which don't run their processes as child processes of the shell. Background terminals like those launched by some extensions will not trigger the confirmation."),
 			type: 'string',
 			enum: ['never', 'editor', 'panel', 'always'],
 			enumDescriptions: [

From 4051adf0a86f9ec6543be6b27840614c816a7323 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Thu, 19 Dec 2024 15:10:05 +0100
Subject: [PATCH 398/479] Fix TypeError for undefined isShowingFilterResults
 (#236590)

fix #236521
---
 src/vs/workbench/contrib/files/browser/views/explorerView.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/files/browser/views/explorerView.ts b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
index e77296ffed9..1c718837501 100644
--- a/src/vs/workbench/contrib/files/browser/views/explorerView.ts
+++ b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
@@ -964,7 +964,7 @@ export class ExplorerView extends ViewPane implements IExplorerView {
 	}
 
 	hasPhantomElements(): boolean {
-		return this.findProvider.isShowingFilterResults();
+		return !!this.findProvider?.isShowingFilterResults();
 	}
 
 	override dispose(): void {

From 25b88b7e4a8f1a96487896ca8b5fe8aa045af54e Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Thu, 19 Dec 2024 15:46:46 +0100
Subject: [PATCH 399/479] Git - fix encoding issue with stage selected ranges
 (#236484)

---
 extensions/git/src/git.ts        |  4 ++--
 extensions/git/src/repository.ts | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index f2b9100d79a..d6a6bd52cfc 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -1657,9 +1657,9 @@ export class Repository {
 		await this.exec(args);
 	}
 
-	async stage(path: string, data: string): Promise<void> {
+	async stage(path: string, data: string, encoding: string): Promise<void> {
 		const child = this.stream(['hash-object', '--stdin', '-w', '--path', sanitizePath(path)], { stdio: [null, null, null] });
-		child.stdin!.end(data, 'utf8');
+		child.stdin!.end(iconv.encode(data, encoding));
 
 		const { exitCode, stdout } = await exec(child);
 		const hash = stdout.toString('utf8');
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index ac2649242f2..0c4b50cd5e5 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -7,6 +7,7 @@ import TelemetryReporter from '@vscode/extension-telemetry';
 import * as fs from 'fs';
 import * as path from 'path';
 import picomatch from 'picomatch';
+import * as iconv from '@vscode/iconv-lite-umd';
 import { CancellationError, CancellationToken, CancellationTokenSource, Command, commands, Disposable, Event, EventEmitter, FileDecoration, l10n, LogLevel, LogOutputChannel, Memento, ProgressLocation, ProgressOptions, QuickDiffProvider, RelativePattern, scm, SourceControl, SourceControlInputBox, SourceControlInputBoxValidation, SourceControlInputBoxValidationType, SourceControlResourceDecorations, SourceControlResourceGroup, SourceControlResourceState, TabInputNotebookDiff, TabInputTextDiff, TabInputTextMultiDiff, ThemeColor, Uri, window, workspace, WorkspaceEdit } from 'vscode';
 import { ActionButton } from './actionButton';
 import { ApiRepository } from './api/api1';
@@ -24,6 +25,7 @@ import { StatusBarCommands } from './statusbar';
 import { toGitUri } from './uri';
 import { anyEvent, combinedDisposable, debounceEvent, dispose, EmptyDisposable, eventToPromise, filterEvent, find, IDisposable, isDescendant, onceEvent, pathEquals, relativePath } from './util';
 import { IFileWatcher, watch } from './watch';
+import { detectEncoding } from './encoding';
 
 const timeout = (millis: number) => new Promise(c => setTimeout(c, millis));
 
@@ -1215,7 +1217,17 @@ export class Repository implements Disposable {
 	async stage(resource: Uri, contents: string): Promise<void> {
 		const path = relativePath(this.repository.root, resource.fsPath).replace(/\\/g, '/');
 		await this.run(Operation.Stage, async () => {
-			await this.repository.stage(path, contents);
+			const configFiles = workspace.getConfiguration('files', Uri.file(resource.fsPath));
+			let encoding = configFiles.get<string>('encoding') ?? 'utf8';
+			const autoGuessEncoding = configFiles.get<boolean>('autoGuessEncoding') === true;
+			const candidateGuessEncodings = configFiles.get<string[]>('candidateGuessEncodings') ?? [];
+
+			if (autoGuessEncoding) {
+				encoding = detectEncoding(Buffer.from(contents), candidateGuessEncodings) ?? encoding;
+			}
+
+			encoding = iconv.encodingExists(encoding) ? encoding : 'utf8';
+			await this.repository.stage(path, contents, encoding);
 
 			this._onDidChangeOriginalResource.fire(resource);
 			this.closeDiffEditors([], [...resource.fsPath]);

From 986871f71ae46e0b7b27362f1456986abc7a1fbe Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Thu, 19 Dec 2024 16:20:19 +0100
Subject: [PATCH 400/479] Proper fix for #236537 (#236596)

- Support installEveryWhere option by installing the extension only on servers on which it is not installed
---
 .../browser/extensionsWorkbenchService.ts     | 47 ++++++++++++++---
 .../contrib/extensions/common/extensions.ts   |  1 +
 .../common/extensionManagement.ts             |  3 +-
 .../common/extensionManagementService.ts      | 50 +++++++++++++++----
 .../test/browser/workbenchTestServices.ts     |  3 +-
 5 files changed, 84 insertions(+), 20 deletions(-)

diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
index 0967e7d34c7..33692adf148 100644
--- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
@@ -2342,35 +2342,69 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 		} else {
 			let installableInfo: IExtensionInfo | undefined;
 			let gallery: IGalleryExtension | undefined;
+
+			// Install by id
 			if (isString(arg)) {
 				extension = this.local.find(e => areSameExtensions(e.identifier, { id: arg }));
 				if (!extension?.isBuiltin) {
 					installableInfo = { id: arg, version: installOptions.version, preRelease: installOptions.installPreReleaseVersion ?? this.preferPreReleases };
 				}
-			} else if (arg.gallery) {
+			}
+			// Install by gallery
+			else if (arg.gallery) {
 				extension = arg;
 				gallery = arg.gallery;
 				if (installOptions.version && installOptions.version !== gallery?.version) {
 					installableInfo = { id: extension.identifier.id, version: installOptions.version };
 				}
-			} else if (arg.resourceExtension) {
+			}
+			// Install by resource
+			else if (arg.resourceExtension) {
 				extension = arg;
 				installable = arg.resourceExtension;
 			}
+
 			if (installableInfo) {
 				const targetPlatform = extension?.server ? await extension.server.extensionManagementService.getTargetPlatform() : undefined;
 				gallery = (await this.galleryService.getExtensions([installableInfo], { targetPlatform }, CancellationToken.None)).at(0);
 			}
+
 			if (!extension && gallery) {
 				extension = this.instantiationService.createInstance(Extension, ext => this.getExtensionState(ext), ext => this.getRuntimeState(ext), undefined, undefined, gallery, undefined);
 				(<Extension>extension).setExtensionsControlManifest(await this.extensionManagementService.getExtensionsControlManifest());
 			}
+
 			if (extension?.isMalicious) {
 				throw new Error(nls.localize('malicious', "This extension is reported to be problematic."));
 			}
-			// TODO: @sandy081 - Install the extension only on servers where it is not installed
-			// Do not install if requested to enable and extension is already installed
-			if (installOptions.installEverywhere || !(installOptions.enable && extension?.local)) {
+
+			if (gallery) {
+				// If requested to install everywhere
+				// then install the extension in all the servers where it is not installed
+				if (installOptions.installEverywhere) {
+					installOptions.servers = [];
+					const installableServers = await this.extensionManagementService.getInstallableServers(gallery);
+					for (const extensionsServer of this.extensionsServers) {
+						if (installableServers.includes(extensionsServer.server) && !extensionsServer.local.find(e => areSameExtensions(e.identifier, gallery.identifier))) {
+							installOptions.servers.push(extensionsServer.server);
+						}
+					}
+				}
+				// If requested to enable and extension is already installed
+				// Check if the extension is disabled because of extension kind
+				// If so, install the extension in the server that is compatible.
+				else if (installOptions.enable && extension?.local) {
+					installOptions.servers = [];
+					if (extension.enablementState === EnablementState.DisabledByExtensionKind) {
+						const [installableServer] = await this.extensionManagementService.getInstallableServers(gallery);
+						if (installableServer) {
+							installOptions.servers.push(installableServer);
+						}
+					}
+				}
+			}
+
+			if (!installOptions.servers || installOptions.servers.length) {
 				if (!installable) {
 					if (!gallery) {
 						const id = isString(arg) ? arg : (<IExtension>arg).identifier.id;
@@ -2734,8 +2768,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
 	private installFromGallery(extension: IExtension, gallery: IGalleryExtension, installOptions?: InstallExtensionOptions): Promise<ILocalExtension> {
 		installOptions = installOptions ?? {};
 		installOptions.pinned = extension.local?.pinned || !this.shouldAutoUpdateExtension(extension);
-		// TODO: @sandy081 - Install the extension only on servers where it is not installed
-		if (!installOptions.installEverywhere && extension.local) {
+		if (extension.local && !installOptions.servers) {
 			installOptions.productVersion = this.getProductVersion();
 			installOptions.operation = InstallOperation.Update;
 			return this.extensionManagementService.updateFromGallery(gallery, extension.local, installOptions);
diff --git a/src/vs/workbench/contrib/extensions/common/extensions.ts b/src/vs/workbench/contrib/extensions/common/extensions.ts
index 4cd9d5ea1d4..e8f26f634ca 100644
--- a/src/vs/workbench/contrib/extensions/common/extensions.ts
+++ b/src/vs/workbench/contrib/extensions/common/extensions.ts
@@ -112,6 +112,7 @@ export interface InstallExtensionOptions extends IWorkbenchInstallOptions {
 	version?: string;
 	justification?: string | { reason: string; action: string };
 	enable?: boolean;
+	installEverywhere?: boolean;
 }
 
 export interface IExtensionsNotification {
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts
index 2bc9bc6e793..1deee908d89 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagement.ts
@@ -60,7 +60,7 @@ export type DidUninstallExtensionOnServerEvent = DidUninstallExtensionEvent & {
 export type DidChangeProfileForServerEvent = DidChangeProfileEvent & { server: IExtensionManagementServer };
 
 export interface IWorkbenchInstallOptions extends InstallOptions {
-	readonly installEverywhere?: boolean;
+	servers?: IExtensionManagementServer[];
 }
 
 export const IWorkbenchExtensionManagementService = refineServiceDecorator<IProfileAwareExtensionManagementService, IWorkbenchExtensionManagementService>(IProfileAwareExtensionManagementService);
@@ -84,6 +84,7 @@ export interface IWorkbenchExtensionManagementService extends IProfileAwareExten
 
 	canInstall(extension: IGalleryExtension | IResourceExtension): Promise<true | IMarkdownString>;
 
+	getInstallableServers(extension: IGalleryExtension): Promise<IExtensionManagementServer[]>;
 	installVSIX(location: URI, manifest: IExtensionManifest, installOptions?: InstallOptions): Promise<ILocalExtension>;
 	installFromGallery(gallery: IGalleryExtension, installOptions?: IWorkbenchInstallOptions): Promise<ILocalExtension>;
 	installFromLocation(location: URI): Promise<ILocalExtension>;
diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
index bc0a4687128..7bc18909d7f 100644
--- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
+++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
@@ -554,6 +554,14 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 		}
 	}
 
+	async getInstallableServers(gallery: IGalleryExtension): Promise<IExtensionManagementServer[]> {
+		const manifest = await this.extensionGalleryService.getManifest(gallery, CancellationToken.None);
+		if (!manifest) {
+			return Promise.reject(localize('Manifest is not found', "Installing Extension {0} failed: Manifest is not found.", gallery.displayName || gallery.name));
+		}
+		return this.getInstallableExtensionManagementServers(manifest);
+	}
+
 	private async uninstallExtensionFromWorkspace(extension: ILocalExtension): Promise<void> {
 		if (!extension.isWorkspaceScoped) {
 			throw new Error('The extension is not a workspace extension');
@@ -606,11 +614,25 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 
 		const servers: IExtensionManagementServer[] = [];
 
-		// Install everywhere if asked to install everywhere or if the extension is a language pack
-		if (installOptions?.installEverywhere || isLanguagePackExtension(manifest)) {
+		if (installOptions?.servers?.length) {
+			const installableServers = this.getInstallableExtensionManagementServers(manifest);
+			servers.push(...installOptions.servers);
+			for (const server of servers) {
+				if (!installableServers.includes(server)) {
+					const error = new Error(localize('cannot be installed in server', "Cannot install the '{0}' extension because it is not available in the '{1}' setup.", gallery.displayName || gallery.name, server.label));
+					error.name = ExtensionManagementErrorCode.Unsupported;
+					throw error;
+				}
+			}
+		}
+
+		// Language packs should be installed on both local and remote servers
+		else if (isLanguagePackExtension(manifest)) {
 			servers.push(...this.servers.filter(server => server !== this.extensionManagementServerService.webExtensionManagementServer));
-		} else {
-			const server = this.getExtensionManagementServerToInstall(manifest);
+		}
+
+		else {
+			const [server] = this.getInstallableExtensionManagementServers(manifest);
 			if (server) {
 				servers.push(server);
 			}
@@ -633,27 +655,33 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 		return servers;
 	}
 
-	private getExtensionManagementServerToInstall(manifest: IExtensionManifest): IExtensionManagementServer | null {
+	private getInstallableExtensionManagementServers(manifest: IExtensionManifest): IExtensionManagementServer[] {
 		// Only local server
 		if (this.servers.length === 1 && this.extensionManagementServerService.localExtensionManagementServer) {
-			return this.extensionManagementServerService.localExtensionManagementServer;
+			return [this.extensionManagementServerService.localExtensionManagementServer];
 		}
 
+		const servers: IExtensionManagementServer[] = [];
+
 		const extensionKind = this.extensionManifestPropertiesService.getExtensionKind(manifest);
 		for (const kind of extensionKind) {
 			if (kind === 'ui' && this.extensionManagementServerService.localExtensionManagementServer) {
-				return this.extensionManagementServerService.localExtensionManagementServer;
+				servers.push(this.extensionManagementServerService.localExtensionManagementServer);
 			}
 			if (kind === 'workspace' && this.extensionManagementServerService.remoteExtensionManagementServer) {
-				return this.extensionManagementServerService.remoteExtensionManagementServer;
+				servers.push(this.extensionManagementServerService.remoteExtensionManagementServer);
 			}
 			if (kind === 'web' && this.extensionManagementServerService.webExtensionManagementServer) {
-				return this.extensionManagementServerService.webExtensionManagementServer;
+				servers.push(this.extensionManagementServerService.webExtensionManagementServer);
 			}
 		}
 
-		// Local server can accept any extension. So return local server if not compatible server found.
-		return this.extensionManagementServerService.localExtensionManagementServer;
+		// Local server can accept any extension.
+		if (this.extensionManagementServerService.localExtensionManagementServer && !servers.includes(this.extensionManagementServerService.localExtensionManagementServer)) {
+			servers.push(this.extensionManagementServerService.localExtensionManagementServer);
+		}
+
+		return servers;
 	}
 
 	private isExtensionsSyncEnabled(): boolean {
diff --git a/src/vs/workbench/test/browser/workbenchTestServices.ts b/src/vs/workbench/test/browser/workbenchTestServices.ts
index a914f4586d4..259de7b24b0 100644
--- a/src/vs/workbench/test/browser/workbenchTestServices.ts
+++ b/src/vs/workbench/test/browser/workbenchTestServices.ts
@@ -160,7 +160,7 @@ import { ILayoutOffsetInfo } from '../../../platform/layout/browser/layoutServic
 import { IUserDataProfile, IUserDataProfilesService, toUserDataProfile, UserDataProfilesService } from '../../../platform/userDataProfile/common/userDataProfile.js';
 import { UserDataProfileService } from '../../services/userDataProfile/common/userDataProfileService.js';
 import { IUserDataProfileService } from '../../services/userDataProfile/common/userDataProfile.js';
-import { EnablementState, IResourceExtension, IScannedExtension, IWebExtensionsScannerService, IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from '../../services/extensionManagement/common/extensionManagement.js';
+import { EnablementState, IExtensionManagementServer, IResourceExtension, IScannedExtension, IWebExtensionsScannerService, IWorkbenchExtensionEnablementService, IWorkbenchExtensionManagementService } from '../../services/extensionManagement/common/extensionManagement.js';
 import { ILocalExtension, IGalleryExtension, InstallOptions, UninstallOptions, IExtensionsControlManifest, IGalleryMetadata, IExtensionManagementParticipant, Metadata, InstallExtensionResult, InstallExtensionInfo, UninstallExtensionInfo } from '../../../platform/extensionManagement/common/extensionManagement.js';
 import { Codicon } from '../../../base/common/codicons.js';
 import { IRemoteExtensionsScannerService } from '../../../platform/remote/common/remoteExtensionsScanner.js';
@@ -2246,6 +2246,7 @@ export class TestWorkbenchExtensionManagementService implements IWorkbenchExtens
 	installResourceExtension(): Promise<ILocalExtension> { throw new Error('Method not implemented.'); }
 	getExtensions(): Promise<IResourceExtension[]> { throw new Error('Method not implemented.'); }
 	resetPinnedStateForAllUserExtensions(pinned: boolean): Promise<void> { throw new Error('Method not implemented.'); }
+	getInstallableServers(extension: IGalleryExtension): Promise<IExtensionManagementServer[]> { throw new Error('Method not implemented.'); }
 }
 
 export class TestUserDataProfileService implements IUserDataProfileService {

From f990dfb385d69e035810e3bd3102d301dd2157b7 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Thu, 19 Dec 2024 16:27:08 +0100
Subject: [PATCH 401/479] Git - expose `env` through the extension API
 (#236598)

---
 extensions/git/src/api/api1.ts | 11 ++++++++++-
 extensions/git/src/git.ts      |  5 +++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/extensions/git/src/api/api1.ts b/extensions/git/src/api/api1.ts
index 8cc0b99f113..e559c0cb807 100644
--- a/extensions/git/src/api/api1.ts
+++ b/extensions/git/src/api/api1.ts
@@ -72,7 +72,6 @@ export class ApiRepositoryUIState implements RepositoryUIState {
 }
 
 export class ApiRepository implements Repository {
-
 	#repository: BaseRepository;
 
 	readonly rootUri: Uri;
@@ -311,9 +310,19 @@ export class ApiRepository implements Repository {
 export class ApiGit implements Git {
 	#model: Model;
 
+	private _env: { [key: string]: string } | undefined;
+
 	constructor(model: Model) { this.#model = model; }
 
 	get path(): string { return this.#model.git.path; }
+
+	get env(): { [key: string]: string } {
+		if (this._env === undefined) {
+			this._env = Object.freeze(this.#model.git.env);
+		}
+
+		return this._env;
+	}
 }
 
 export class ApiImpl implements API {
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index d6a6bd52cfc..87ea23e3a85 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -315,7 +315,7 @@ export interface IGitOptions {
 	gitPath: string;
 	userAgent: string;
 	version: string;
-	env?: any;
+	env?: { [key: string]: string };
 }
 
 function getGitErrorCode(stderr: string): string | undefined {
@@ -369,7 +369,8 @@ export class Git {
 	readonly path: string;
 	readonly userAgent: string;
 	readonly version: string;
-	private env: any;
+	readonly env: { [key: string]: string };
+
 	private commandsToLog: string[] = [];
 
 	private _onOutput = new EventEmitter();

From ffbf5a7f28058787dc6476ad436b550412fce981 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Thu, 19 Dec 2024 16:51:06 +0100
Subject: [PATCH 402/479] Use indices for queue processing instead of
 Array.shift() (#236601)

* Use indices instead of Array.shift()

* :lipstick:
---
 src/vs/base/browser/ui/tree/abstractTree.ts  | 8 ++++----
 src/vs/base/browser/ui/tree/asyncDataTree.ts | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts
index b8144e58c23..09ce418bda9 100644
--- a/src/vs/base/browser/ui/tree/abstractTree.ts
+++ b/src/vs/base/browser/ui/tree/abstractTree.ts
@@ -3080,16 +3080,16 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 		}
 
 		const root = this.model.getNode();
-		const queue = [root];
+		const stack = [root];
 
-		while (queue.length > 0) {
-			const node = queue.shift()!;
+		while (stack.length > 0) {
+			const node = stack.pop()!;
 
 			if (node !== root && node.collapsible) {
 				state.expanded[getId(node.element)] = node.collapsed ? 0 : 1;
 			}
 
-			insertInto(queue, queue.length, node.children);
+			insertInto(stack, stack.length, node.children);
 		}
 
 		return state;
diff --git a/src/vs/base/browser/ui/tree/asyncDataTree.ts b/src/vs/base/browser/ui/tree/asyncDataTree.ts
index 9d0d2cbf4b2..dd6059051f0 100644
--- a/src/vs/base/browser/ui/tree/asyncDataTree.ts
+++ b/src/vs/base/browser/ui/tree/asyncDataTree.ts
@@ -24,7 +24,7 @@ import { isIterable } from '../../../common/types.js';
 import { CancellationToken, CancellationTokenSource } from '../../../common/cancellation.js';
 import { IContextViewProvider } from '../contextview/contextview.js';
 import { FuzzyScore } from '../../../common/filters.js';
-import { splice } from '../../../common/arrays.js';
+import { insertInto, splice } from '../../../common/arrays.js';
 import { localize } from '../../../../nls.js';
 
 interface IAsyncDataTreeNode<TInput, T> {
@@ -1350,7 +1350,7 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 				expanded.push(getId(node.element!.element as T));
 			}
 
-			stack.push(...node.children);
+			insertInto(stack, stack.length, node.children);
 		}
 
 		return { focus, selection, expanded, scrollTop: this.scrollTop };

From 613ad56601c62ff8fea04a62444217470fbc496d Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Thu, 19 Dec 2024 17:03:58 +0100
Subject: [PATCH 403/479] code cleanup (#236595)

* code cleanup

* Fix CI
---
 .../view/inlineEdits/gutterIndicatorView.ts   | 82 +++++++++++--------
 .../browser/view/inlineEdits/utils.ts         | 11 ++-
 2 files changed, 53 insertions(+), 40 deletions(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts
index 936ab8b56b3..bcfa7d7463b 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts
@@ -40,21 +40,36 @@ export const inlineEditIndicatorBackground = registerColor(
 
 
 export class InlineEditsGutterIndicator extends Disposable {
-	private readonly _state = derived(reader => {
-		const range = mapOutFalsy(this._originalRange).read(reader);
-		if (!range) {
-			return undefined;
-		}
+	constructor(
+		private readonly _editorObs: ObservableCodeEditor,
+		private readonly _originalRange: IObservable<LineRange | undefined>,
+		private readonly _model: IObservable<InlineCompletionsModel | undefined>,
+	) {
+		super();
+
+		this._register(this._editorObs.createOverlayWidget({
+			domNode: this._indicator.element,
+			position: constObservable(null),
+			allowEditorOverflow: false,
+			minContentWidthInPx: constObservable(0),
+		}));
+	}
+
+	private readonly _originalRangeObs = mapOutFalsy(this._originalRange);
 
+	private readonly _state = derived(reader => {
+		const range = this._originalRangeObs.read(reader);
+		if (!range) { return undefined; }
 		return {
 			range,
 			lineOffsetRange: this._editorObs.observeLineOffsetRange(range, this._store),
 		};
 	});
 
-	private _stickyScrollController = StickyScrollController.get(this._editorObs.editor);
-	private readonly _stickyScrollHeight = this._stickyScrollController ? observableFromEvent(this._stickyScrollController.onDidChangeStickyScrollHeight, () => this._stickyScrollController!.stickyScrollWidgetHeight) : constObservable(0);
-
+	private readonly _stickyScrollController = StickyScrollController.get(this._editorObs.editor);
+	private readonly _stickyScrollHeight = this._stickyScrollController
+		? observableFromEvent(this._stickyScrollController.onDidChangeStickyScrollHeight, () => this._stickyScrollController!.stickyScrollWidgetHeight)
+		: constObservable(0);
 
 	private readonly _layout = derived(reader => {
 		const s = this._state.read(reader);
@@ -85,13 +100,13 @@ export class InlineEditsGutterIndicator extends Disposable {
 		return {
 			rect,
 			iconRect,
-			mode: (iconRect.top === targetRect.top ? 'right' as const
+			arrowDirection: (iconRect.top === targetRect.top ? 'right' as const
 				: iconRect.top > targetRect.top ? 'top' as const : 'bottom' as const),
 			docked: rect.containsRect(iconRect) && viewPortWithStickyScroll.containsRect(iconRect),
 		};
 	});
 
-	private readonly _mode = derived(this, reader => {
+	private readonly _tabAction = derived(this, reader => {
 		const m = this._model.read(reader);
 		if (m && m.tabShouldAcceptInlineEdit.read(reader)) { return 'accept' as const; }
 		if (m && m.tabShouldJumpToInlineEdit.read(reader)) { return 'jump' as const; }
@@ -135,16 +150,20 @@ export class InlineEditsGutterIndicator extends Disposable {
 				cursor: 'pointer',
 				zIndex: '1000',
 				position: 'absolute',
-				backgroundColor: this._mode.map(v => ({
-					inactive: 'var(--vscode-inlineEdit-gutterIndicator-secondaryBackground)',
-					jump: 'var(--vscode-inlineEdit-gutterIndicator-primaryBackground)',
-					accept: 'var(--vscode-inlineEdit-gutterIndicator-successfulBackground)',
-				}[v])),
-				'--vscodeIconForeground': this._mode.map(v => ({
-					inactive: 'var(--vscode-inlineEdit-gutterIndicator-secondaryForeground)',
-					jump: 'var(--vscode-inlineEdit-gutterIndicator-primaryForeground)',
-					accept: 'var(--vscode-inlineEdit-gutterIndicator-successfulForeground)',
-				}[v])),
+				backgroundColor: this._tabAction.map(v => {
+					switch (v) {
+						case 'inactive': return 'var(--vscode-inlineEdit-gutterIndicator-secondaryBackground)';
+						case 'jump': return 'var(--vscode-inlineEdit-gutterIndicator-primaryBackground)';
+						case 'accept': return 'var(--vscode-inlineEdit-gutterIndicator-successfulBackground)';
+					}
+				}),
+				'--vscodeIconForeground': this._tabAction.map(v => {
+					switch (v) {
+						case 'inactive': return 'var(--vscode-inlineEdit-gutterIndicator-secondaryForeground)';
+						case 'jump': return 'var(--vscode-inlineEdit-gutterIndicator-primaryForeground)';
+						case 'accept': return 'var(--vscode-inlineEdit-gutterIndicator-successfulForeground)';
+					}
+				}),
 				borderRadius: '4px',
 				display: 'flex',
 				justifyContent: 'center',
@@ -154,7 +173,13 @@ export class InlineEditsGutterIndicator extends Disposable {
 		}, [
 			n.div({
 				style: {
-					rotate: l.map(l => ({ right: '0deg', bottom: '90deg', top: '-90deg' }[l.mode])),
+					rotate: l.map(l => {
+						switch (l.arrowDirection) {
+							case 'right': return '0deg';
+							case 'bottom': return '90deg';
+							case 'top': return '-90deg';
+						}
+					}),
 					transition: 'rotate 0.2s ease-in-out',
 				}
 			}, [
@@ -162,21 +187,6 @@ export class InlineEditsGutterIndicator extends Disposable {
 			])
 		]),
 	])).keepUpdated(this._store);
-
-	constructor(
-		private readonly _editorObs: ObservableCodeEditor,
-		private readonly _originalRange: IObservable<LineRange | undefined>,
-		private readonly _model: IObservable<InlineCompletionsModel | undefined>,
-	) {
-		super();
-
-		this._register(this._editorObs.createOverlayWidget({
-			domNode: this._indicator.element,
-			position: constObservable(null),
-			allowEditorOverflow: false,
-			minContentWidthInPx: constObservable(0),
-		}));
-	}
 }
 
 function rectToProps(fn: (reader: IReader) => Rect): any {
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
index 73b9cbb5618..b99b0478bdc 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
@@ -423,20 +423,23 @@ type ElementAttributeKeys<T> = Partial<{
 	? never
 	: T[K] extends object
 	? ElementAttributeKeys<T[K]>
-	: Value<T[K] | undefined | null>
+	: Value<number | T[K] | undefined | null>
 }>;
 
-export function mapOutFalsy<T>(obs: IObservable<T | undefined | null | false>): IObservable<IObservable<T> | undefined | null | false> {
+type RemoveFalsy<T> = T extends false | undefined | null ? never : T;
+type Falsy<T> = T extends false | undefined | null ? T : never;
+
+export function mapOutFalsy<T>(obs: IObservable<T>): IObservable<IObservable<RemoveFalsy<T>> | Falsy<T>> {
 	const nonUndefinedObs = derivedObservableWithCache<T | undefined | null | false>(undefined, (reader, lastValue) => obs.read(reader) || lastValue);
 
 	return derived(reader => {
 		nonUndefinedObs.read(reader);
 		const val = obs.read(reader);
 		if (!val) {
-			return undefined;
+			return undefined as Falsy<T>;
 		}
 
-		return nonUndefinedObs as IObservable<T>;
+		return nonUndefinedObs as IObservable<RemoveFalsy<T>>;
 	});
 }
 

From 9945f3b953f1c330bc4a9b1dd02b17304d56eead Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Thu, 19 Dec 2024 10:55:15 -0600
Subject: [PATCH 404/479] Revert "focus debug console when it becomes visible "
 (#236607)

---
 src/vs/workbench/contrib/debug/browser/repl.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/vs/workbench/contrib/debug/browser/repl.ts b/src/vs/workbench/contrib/debug/browser/repl.ts
index a9959c5d1c5..edef7e72b70 100644
--- a/src/vs/workbench/contrib/debug/browser/repl.ts
+++ b/src/vs/workbench/contrib/debug/browser/repl.ts
@@ -214,7 +214,6 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 					this.tree?.updateChildren(undefined, true, false);
 					this.onDidStyleChange();
 				}
-				this.focus();
 			}
 		}));
 		this._register(this.configurationService.onDidChangeConfiguration(e => {

From ceab34bc36825ebd163e625426c2d6518c177a0b Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Thu, 19 Dec 2024 18:10:29 +0100
Subject: [PATCH 405/479] icon themes: remove fontCharacterRegex (#236610)

---
 src/vs/platform/theme/common/iconRegistry.ts           |  4 +---
 .../services/themes/browser/fileIconThemeData.ts       |  4 ++--
 .../services/themes/browser/productIconThemeData.ts    |  6 +++---
 .../services/themes/common/fileIconThemeSchema.ts      |  6 ++----
 .../services/themes/common/iconExtensionPoint.ts       | 10 ++--------
 5 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/vs/platform/theme/common/iconRegistry.ts b/src/vs/platform/theme/common/iconRegistry.ts
index 775c1cf1d4a..88cee9c3ddb 100644
--- a/src/vs/platform/theme/common/iconRegistry.ts
+++ b/src/vs/platform/theme/common/iconRegistry.ts
@@ -152,10 +152,8 @@ export const fontStyleRegex = /^(normal|italic|(oblique[ \w\s-]+))$/;
 export const fontWeightRegex = /^(normal|bold|lighter|bolder|(\d{0-1000}))$/;
 export const fontSizeRegex = /^([\w_.%+-]+)$/;
 export const fontFormatRegex = /^woff|woff2|truetype|opentype|embedded-opentype|svg$/;
-export const fontCharacterRegex = /^([^\\]|\\[a-fA-F0-9]+)$/u;
 export const fontColorRegex = /^#[0-9a-fA-F]{0,6}$/;
 
-export const fontCharacterErrorMessage = localize('schema.fontCharacter.formatError', 'The fontCharacter must be a single letter or a backslash followed by unicode code points in hexadecimal.');
 export const fontIdErrorMessage = localize('schema.fontId.formatError', 'The font ID must only contain letters, numbers, underscores and dashes.');
 
 class IconRegistry implements IIconRegistry {
@@ -170,7 +168,7 @@ class IconRegistry implements IIconRegistry {
 				type: 'object',
 				properties: {
 					fontId: { type: 'string', description: localize('iconDefinition.fontId', 'The id of the font to use. If not set, the font that is defined first is used.'), pattern: fontIdRegex.source, patternErrorMessage: fontIdErrorMessage },
-					fontCharacter: { type: 'string', description: localize('iconDefinition.fontCharacter', 'The font character associated with the icon definition.'), pattern: fontCharacterRegex.source, patternErrorMessage: fontCharacterErrorMessage }
+					fontCharacter: { type: 'string', description: localize('iconDefinition.fontCharacter', 'The font character associated with the icon definition.') }
 				},
 				additionalProperties: false,
 				defaultSnippets: [{ body: { fontCharacter: '\\\\e030' } }]
diff --git a/src/vs/workbench/services/themes/browser/fileIconThemeData.ts b/src/vs/workbench/services/themes/browser/fileIconThemeData.ts
index e1d349be481..a6e4c965f49 100644
--- a/src/vs/workbench/services/themes/browser/fileIconThemeData.ts
+++ b/src/vs/workbench/services/themes/browser/fileIconThemeData.ts
@@ -13,7 +13,7 @@ import { getParseErrorMessage } from '../../../../base/common/jsonErrorMessages.
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IExtensionResourceLoaderService } from '../../../../platform/extensionResourceLoader/common/extensionResourceLoader.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
-import { fontCharacterRegex, fontColorRegex, fontSizeRegex } from '../../../../platform/theme/common/iconRegistry.js';
+import { fontColorRegex, fontSizeRegex } from '../../../../platform/theme/common/iconRegistry.js';
 import * as css from '../../../../base/browser/cssValue.js';
 import { fileIconSelectorEscape } from '../../../../editor/common/services/getIconClasses.js';
 
@@ -424,7 +424,7 @@ export class FileIconThemeLoader {
 					if (definition.fontColor && definition.fontColor.match(fontColorRegex)) {
 						body.push(css.inline`color: ${css.hexColorValue(definition.fontColor)};`);
 					}
-					if (definition.fontCharacter && definition.fontCharacter.match(fontCharacterRegex)) {
+					if (definition.fontCharacter) {
 						body.push(css.inline`content: ${css.stringValue(definition.fontCharacter)};`);
 					}
 					const fontSize = definition.fontSize ?? (definition.fontId ? fontSizes.get(definition.fontId) : undefined);
diff --git a/src/vs/workbench/services/themes/browser/productIconThemeData.ts b/src/vs/workbench/services/themes/browser/productIconThemeData.ts
index 1e0a9fa295c..824a35ca9e9 100644
--- a/src/vs/workbench/services/themes/browser/productIconThemeData.ts
+++ b/src/vs/workbench/services/themes/browser/productIconThemeData.ts
@@ -13,7 +13,7 @@ import { getParseErrorMessage } from '../../../../base/common/jsonErrorMessages.
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { isObject, isString } from '../../../../base/common/types.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
-import { IconDefinition, getIconRegistry, IconContribution, IconFontDefinition, IconFontSource, fontIdRegex, fontWeightRegex, fontStyleRegex, fontFormatRegex, fontCharacterRegex, fontCharacterErrorMessage } from '../../../../platform/theme/common/iconRegistry.js';
+import { IconDefinition, getIconRegistry, IconContribution, IconFontDefinition, IconFontSource, fontIdRegex, fontWeightRegex, fontStyleRegex, fontFormatRegex } from '../../../../platform/theme/common/iconRegistry.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { IExtensionResourceLoaderService } from '../../../../platform/extensionResourceLoader/common/extensionResourceLoader.js';
 
@@ -244,7 +244,7 @@ function _loadProductIconThemeDocument(fileService: IExtensionResourceLoaderServ
 
 		for (const iconId in contentValue.iconDefinitions) {
 			const definition = contentValue.iconDefinitions[iconId];
-			if (isString(definition.fontCharacter) && definition.fontCharacter.match(fontCharacterRegex)) {
+			if (isString(definition.fontCharacter)) {
 				const fontId = definition.fontId ?? primaryFontId;
 				const fontDefinition = sanitizedFonts.get(fontId);
 				if (fontDefinition) {
@@ -255,7 +255,7 @@ function _loadProductIconThemeDocument(fileService: IExtensionResourceLoaderServ
 					warnings.push(nls.localize('error.icon.font', 'Skipping icon definition \'{0}\'. Unknown font.', iconId));
 				}
 			} else {
-				warnings.push(nls.localize('error.icon.fontCharacter', 'Skipping icon definition \'{0}\': {1}', iconId, fontCharacterErrorMessage));
+				warnings.push(nls.localize('error.icon.fontCharacter', 'Skipping icon definition \'{0}\': Needs to be defined', iconId));
 			}
 		}
 		return { iconDefinitions };
diff --git a/src/vs/workbench/services/themes/common/fileIconThemeSchema.ts b/src/vs/workbench/services/themes/common/fileIconThemeSchema.ts
index f51191117c5..6a8ece75403 100644
--- a/src/vs/workbench/services/themes/common/fileIconThemeSchema.ts
+++ b/src/vs/workbench/services/themes/common/fileIconThemeSchema.ts
@@ -7,7 +7,7 @@ import * as nls from '../../../../nls.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { Extensions as JSONExtensions, IJSONContributionRegistry } from '../../../../platform/jsonschemas/common/jsonContributionRegistry.js';
 import { IJSONSchema } from '../../../../base/common/jsonSchema.js';
-import { fontWeightRegex, fontStyleRegex, fontSizeRegex, fontIdRegex, fontCharacterRegex, fontColorRegex, fontCharacterErrorMessage, fontIdErrorMessage } from '../../../../platform/theme/common/iconRegistry.js';
+import { fontWeightRegex, fontStyleRegex, fontSizeRegex, fontIdRegex, fontColorRegex, fontIdErrorMessage } from '../../../../platform/theme/common/iconRegistry.js';
 
 const schemaId = 'vscode://schemas/icon-theme';
 const schema: IJSONSchema = {
@@ -208,9 +208,7 @@ const schema: IJSONSchema = {
 					},
 					fontCharacter: {
 						type: 'string',
-						description: nls.localize('schema.fontCharacter', 'When using a glyph font: The character in the font to use.'),
-						pattern: fontCharacterRegex.source,
-						patternErrorMessage: fontCharacterErrorMessage
+						description: nls.localize('schema.fontCharacter', 'When using a glyph font: The character in the font to use.')
 					},
 					fontColor: {
 						type: 'string',
diff --git a/src/vs/workbench/services/themes/common/iconExtensionPoint.ts b/src/vs/workbench/services/themes/common/iconExtensionPoint.ts
index 9b554226c3f..08a9b059113 100644
--- a/src/vs/workbench/services/themes/common/iconExtensionPoint.ts
+++ b/src/vs/workbench/services/themes/common/iconExtensionPoint.ts
@@ -5,7 +5,7 @@
 
 import * as nls from '../../../../nls.js';
 import { ExtensionsRegistry } from '../../extensions/common/extensionsRegistry.js';
-import { IIconRegistry, Extensions as IconRegistryExtensions, fontCharacterErrorMessage, fontCharacterRegex } from '../../../../platform/theme/common/iconRegistry.js';
+import { IIconRegistry, Extensions as IconRegistryExtensions } from '../../../../platform/theme/common/iconRegistry.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import * as resources from '../../../../base/common/resources.js';
@@ -53,9 +53,7 @@ const iconConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint<IIco
 								},
 								fontCharacter: {
 									description: nls.localize('contributes.icon.default.fontCharacter', 'The character for the icon in the icon font.'),
-									type: 'string',
-									pattern: fontCharacterRegex.source,
-									patternErrorMessage: fontCharacterErrorMessage
+									type: 'string'
 								}
 							},
 							required: ['fontPath', 'fontCharacter'],
@@ -105,10 +103,6 @@ export class IconExtensionPoint {
 							collector.warn(nls.localize('invalid.icons.default.fontPath.extension', "Expected `contributes.icons.default.fontPath` to have file extension 'woff', woff2' or 'ttf', is '{0}'.", fileExt));
 							return;
 						}
-						if (!defaultIcon.fontCharacter.match(fontCharacterRegex)) {
-							collector.warn(nls.localize('invalid.icons.default.fontCharacter', 'Invalid `contributes.icons.default.fontCharacter`: {0}', fontCharacterErrorMessage));
-							return;
-						}
 						const extensionLocation = extension.description.extensionLocation;
 						const iconFontLocation = resources.joinPath(extensionLocation, defaultIcon.fontPath);
 						const fontId = getFontId(extension.description, defaultIcon.fontPath);

From 27abe271cd5b3173e072b94d7508177aab96f60f Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Thu, 19 Dec 2024 19:15:05 +0100
Subject: [PATCH 406/479] Implements experimental word replacement and
 insertion views. (#236618)

---
 src/vs/editor/browser/rect.ts                 |   3 +-
 .../diffEditorViewZones/renderLines.ts        |  33 +-
 src/vs/editor/common/config/editorOptions.ts  |  19 ++
 src/vs/editor/common/core/range.ts            |   4 +
 .../defaultLinesDiffComputer.ts               |  19 +-
 .../heuristicSequenceOptimizations.ts         |  18 +-
 .../linesSliceCharSequence.ts                 |  29 ++
 .../common/diff/documentDiffProvider.ts       |   2 +
 .../editor/common/diff/linesDiffComputer.ts   |   1 +
 .../view/inlineEdits/gutterIndicatorView.ts   |  15 +-
 .../browser/view/inlineEdits/utils.ts         |  14 +
 .../browser/view/inlineEdits/view.ts          |  69 +++--
 .../view/inlineEdits/viewAndDiffProducer.ts   |   1 +
 .../view/inlineEdits/wordReplacementView.ts   | 285 ++++++++++++++++++
 src/vs/monaco.d.ts                            |   3 +
 15 files changed, 467 insertions(+), 48 deletions(-)
 create mode 100644 src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/wordReplacementView.ts

diff --git a/src/vs/editor/browser/rect.ts b/src/vs/editor/browser/rect.ts
index b990944eb67..6de464d201a 100644
--- a/src/vs/editor/browser/rect.ts
+++ b/src/vs/editor/browser/rect.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { BugIndicatingError } from '../../base/common/errors.js';
 import { OffsetRange } from '../common/core/offsetRange.js';
 import { Point } from './point.js';
 
@@ -49,7 +50,7 @@ export class Rect {
 		public readonly bottom: number,
 	) {
 		if (left > right || top > bottom) {
-			throw new Error('Invalid arguments');
+			throw new BugIndicatingError('Invalid arguments');
 		}
 	}
 
diff --git a/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.ts b/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.ts
index d2ff0bf9fb8..ce0eea0bcaa 100644
--- a/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.ts
+++ b/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.ts
@@ -17,7 +17,7 @@ import { InlineDecoration, ViewLineRenderingData } from '../../../../../common/v
 
 const ttPolicy = createTrustedTypesPolicy('diffEditorWidget', { createHTML: value => value });
 
-export function renderLines(source: LineSource, options: RenderOptions, decorations: InlineDecoration[], domNode: HTMLElement): RenderLinesResult {
+export function renderLines(source: LineSource, options: RenderOptions, decorations: InlineDecoration[], domNode: HTMLElement, noExtra = false): RenderLinesResult {
 	applyFontInfo(domNode, options.fontInfo);
 
 	const hasCharChanges = (decorations.length > 0);
@@ -44,7 +44,8 @@ export function renderLines(source: LineSource, options: RenderOptions, decorati
 					source.mightContainNonBasicASCII,
 					source.mightContainRTL,
 					options,
-					sb
+					sb,
+					noExtra,
 				));
 				renderedLineCount++;
 				lastBreakOffset = breakOffset;
@@ -61,6 +62,7 @@ export function renderLines(source: LineSource, options: RenderOptions, decorati
 				source.mightContainRTL,
 				options,
 				sb,
+				noExtra,
 			));
 			renderedLineCount++;
 		}
@@ -125,7 +127,25 @@ export class RenderOptions {
 		public readonly renderWhitespace: FindComputedEditorOptionValueById<EditorOption.renderWhitespace>,
 		public readonly renderControlCharacters: boolean,
 		public readonly fontLigatures: FindComputedEditorOptionValueById<EditorOption.fontLigatures>,
+		public readonly setWidth = true,
 	) { }
+
+	public withSetWidth(setWidth: boolean): RenderOptions {
+		return new RenderOptions(
+			this.tabSize,
+			this.fontInfo,
+			this.disableMonospaceOptimizations,
+			this.typicalHalfwidthCharacterWidth,
+			this.scrollBeyondLastColumn,
+			this.lineHeight,
+			this.lineDecorationsWidth,
+			this.stopRenderingLineAfter,
+			this.renderWhitespace,
+			this.renderControlCharacters,
+			this.fontLigatures,
+			setWidth,
+		);
+	}
 }
 
 export interface RenderLinesResult {
@@ -143,16 +163,21 @@ function renderOriginalLine(
 	mightContainRTL: boolean,
 	options: RenderOptions,
 	sb: StringBuilder,
+	noExtra: boolean,
 ): number {
 
 	sb.appendString('<div class="view-line');
-	if (!hasCharChanges) {
+	if (!noExtra && !hasCharChanges) {
 		// No char changes
 		sb.appendString(' char-delete');
 	}
 	sb.appendString('" style="top:');
 	sb.appendString(String(viewLineIdx * options.lineHeight));
-	sb.appendString('px;width:1000000px;">');
+	if (options.setWidth) {
+		sb.appendString('px;width:1000000px;">');
+	} else {
+		sb.appendString('px;">');
+	}
 
 	const lineContent = lineTokens.getLineContent();
 	const isBasicASCII = ViewLineRenderingData.isBasicASCII(lineContent, mightContainNonBasicASCII);
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index c7481985f2f..e355a960db9 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -4197,6 +4197,9 @@ export interface IInlineSuggestOptions {
 			enabled?: boolean;
 			useMixedLinesDiff?: 'never' | 'whenPossible' | 'forStableInsertions' | 'afterJumpWhenPossible';
 			useInterleavedLinesDiff?: 'never' | 'always' | 'afterJump';
+			useWordInsertionView?: 'never' | 'whenPossible';
+			useWordReplacementView?: 'never' | 'whenPossible';
+
 			onlyShowWhenCloseToCursor?: boolean;
 			useGutterIndicator?: boolean;
 		};
@@ -4230,6 +4233,8 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 					enabled: true,
 					useMixedLinesDiff: 'forStableInsertions',
 					useInterleavedLinesDiff: 'never',
+					useWordInsertionView: 'never',
+					useWordReplacementView: 'never',
 					onlyShowWhenCloseToCursor: true,
 					useGutterIndicator: false,
 				},
@@ -4287,6 +4292,18 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 					description: nls.localize('inlineSuggest.edits.experimental.useInterleavedLinesDiff', "Controls whether to enable experimental interleaved lines diff in inline suggestions."),
 					enum: ['never', 'always', 'afterJump'],
 				},
+				'editor.inlineSuggest.edits.experimental.useWordInsertionView': {
+					type: 'string',
+					default: defaults.edits.experimental.useWordInsertionView,
+					description: nls.localize('inlineSuggest.edits.experimental.useWordInsertionView', "Controls whether to enable experimental word insertion view in inline suggestions."),
+					enum: ['never', 'whenPossible'],
+				},
+				'editor.inlineSuggest.edits.experimental.useWordReplacementView': {
+					type: 'string',
+					default: defaults.edits.experimental.useWordReplacementView,
+					description: nls.localize('inlineSuggest.edits.experimental.useWordReplacementView', "Controls whether to enable experimental word replacement view in inline suggestions."),
+					enum: ['never', 'whenPossible'],
+				},
 				'editor.inlineSuggest.edits.experimental.onlyShowWhenCloseToCursor': {
 					type: 'boolean',
 					default: defaults.edits.experimental.onlyShowWhenCloseToCursor,
@@ -4319,6 +4336,8 @@ class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, I
 					enabled: boolean(input.edits?.experimental?.enabled, this.defaultValue.edits.experimental.enabled),
 					useMixedLinesDiff: stringSet(input.edits?.experimental?.useMixedLinesDiff, this.defaultValue.edits.experimental.useMixedLinesDiff, ['never', 'whenPossible', 'forStableInsertions', 'afterJumpWhenPossible']),
 					useInterleavedLinesDiff: stringSet(input.edits?.experimental?.useInterleavedLinesDiff, this.defaultValue.edits.experimental.useInterleavedLinesDiff, ['never', 'always', 'afterJump']),
+					useWordInsertionView: stringSet(input.edits?.experimental?.useWordInsertionView, this.defaultValue.edits.experimental.useWordInsertionView, ['never', 'whenPossible']),
+					useWordReplacementView: stringSet(input.edits?.experimental?.useWordReplacementView, this.defaultValue.edits.experimental.useWordReplacementView, ['never', 'whenPossible']),
 					onlyShowWhenCloseToCursor: boolean(input.edits?.experimental?.onlyShowWhenCloseToCursor, this.defaultValue.edits.experimental.onlyShowWhenCloseToCursor),
 					useGutterIndicator: boolean(input.edits?.experimental?.useGutterIndicator, this.defaultValue.edits.experimental.useGutterIndicator),
 				},
diff --git a/src/vs/editor/common/core/range.ts b/src/vs/editor/common/core/range.ts
index 954c18e137f..f75717c6d50 100644
--- a/src/vs/editor/common/core/range.ts
+++ b/src/vs/editor/common/core/range.ts
@@ -364,6 +364,10 @@ export class Range {
 		return new Range(this.startLineNumber + lineCount, this.startColumn, this.endLineNumber + lineCount, this.endColumn);
 	}
 
+	public isSingleLine(): boolean {
+		return this.startLineNumber === this.endLineNumber;
+	}
+
 	// ---
 
 	public static fromPositions(start: IPosition, end: IPosition = start): Range {
diff --git a/src/vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.ts
index 3d3a14eb86b..884cd838698 100644
--- a/src/vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.ts
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.ts
@@ -106,7 +106,7 @@ export class DefaultLinesDiffComputer implements ILinesDiffComputer {
 					const characterDiffs = this.refineDiff(originalLines, modifiedLines, new SequenceDiff(
 						new OffsetRange(seq1Offset, seq1Offset + 1),
 						new OffsetRange(seq2Offset, seq2Offset + 1),
-					), timeout, considerWhitespaceChanges);
+					), timeout, considerWhitespaceChanges, options);
 					for (const a of characterDiffs.mappings) {
 						alignments.push(a);
 					}
@@ -130,7 +130,7 @@ export class DefaultLinesDiffComputer implements ILinesDiffComputer {
 			seq1LastStart = diff.seq1Range.endExclusive;
 			seq2LastStart = diff.seq2Range.endExclusive;
 
-			const characterDiffs = this.refineDiff(originalLines, modifiedLines, diff, timeout, considerWhitespaceChanges);
+			const characterDiffs = this.refineDiff(originalLines, modifiedLines, diff, timeout, considerWhitespaceChanges, options);
 			if (characterDiffs.hitTimeout) {
 				hitTimeout = true;
 			}
@@ -145,7 +145,7 @@ export class DefaultLinesDiffComputer implements ILinesDiffComputer {
 
 		let moves: MovedText[] = [];
 		if (options.computeMoves) {
-			moves = this.computeMoves(changes, originalLines, modifiedLines, originalLinesHashes, modifiedLinesHashes, timeout, considerWhitespaceChanges);
+			moves = this.computeMoves(changes, originalLines, modifiedLines, originalLinesHashes, modifiedLinesHashes, timeout, considerWhitespaceChanges, options);
 		}
 
 		// Make sure all ranges are valid
@@ -190,6 +190,7 @@ export class DefaultLinesDiffComputer implements ILinesDiffComputer {
 		hashedModifiedLines: number[],
 		timeout: ITimeout,
 		considerWhitespaceChanges: boolean,
+		options: ILinesDiffComputerOptions,
 	): MovedText[] {
 		const moves = computeMovedLines(
 			changes,
@@ -203,14 +204,14 @@ export class DefaultLinesDiffComputer implements ILinesDiffComputer {
 			const moveChanges = this.refineDiff(originalLines, modifiedLines, new SequenceDiff(
 				m.original.toOffsetRange(),
 				m.modified.toOffsetRange(),
-			), timeout, considerWhitespaceChanges);
+			), timeout, considerWhitespaceChanges, options);
 			const mappings = lineRangeMappingFromRangeMappings(moveChanges.mappings, new ArrayText(originalLines), new ArrayText(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 } {
+	private refineDiff(originalLines: string[], modifiedLines: string[], diff: SequenceDiff, timeout: ITimeout, considerWhitespaceChanges: boolean, options: ILinesDiffComputerOptions): { mappings: RangeMapping[]; hitTimeout: boolean } {
 		const lineRangeMapping = toLineRangeMapping(diff);
 		const rangeMapping = lineRangeMapping.toRangeMapping2(originalLines, modifiedLines);
 
@@ -227,8 +228,14 @@ export class DefaultLinesDiffComputer implements ILinesDiffComputer {
 		if (check) { SequenceDiff.assertSorted(diffs); }
 		diffs = optimizeSequenceDiffs(slice1, slice2, diffs);
 		if (check) { SequenceDiff.assertSorted(diffs); }
-		diffs = extendDiffsToEntireWordIfAppropriate(slice1, slice2, diffs);
+		diffs = extendDiffsToEntireWordIfAppropriate(slice1, slice2, diffs, (seq, idx) => seq.findWordContaining(idx));
 		if (check) { SequenceDiff.assertSorted(diffs); }
+
+		if (options.extendToSubwords) {
+			diffs = extendDiffsToEntireWordIfAppropriate(slice1, slice2, diffs, (seq, idx) => seq.findSubWordContaining(idx), true);
+			if (check) { SequenceDiff.assertSorted(diffs); }
+		}
+
 		diffs = removeShortMatches(slice1, slice2, diffs);
 		if (check) { SequenceDiff.assertSorted(diffs); }
 		diffs = removeVeryShortMatchingTextBetweenLongDiffs(slice1, slice2, diffs);
diff --git a/src/vs/editor/common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations.ts
index c205457ac53..20de8dd1ab0 100644
--- a/src/vs/editor/common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations.ts
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations.ts
@@ -219,7 +219,13 @@ export function removeShortMatches(sequence1: ISequence, sequence2: ISequence, s
 	return result;
 }
 
-export function extendDiffsToEntireWordIfAppropriate(sequence1: LinesSliceCharSequence, sequence2: LinesSliceCharSequence, sequenceDiffs: SequenceDiff[]): SequenceDiff[] {
+export function extendDiffsToEntireWordIfAppropriate(
+	sequence1: LinesSliceCharSequence,
+	sequence2: LinesSliceCharSequence,
+	sequenceDiffs: SequenceDiff[],
+	findParent: (seq: LinesSliceCharSequence, idx: number) => OffsetRange | undefined,
+	force: boolean = false,
+): SequenceDiff[] {
 	const equalMappings = SequenceDiff.invert(sequenceDiffs, sequence1.length);
 
 	const additional: SequenceDiff[] = [];
@@ -231,8 +237,8 @@ export function extendDiffsToEntireWordIfAppropriate(sequence1: LinesSliceCharSe
 			return;
 		}
 
-		const w1 = sequence1.findWordContaining(pair.offset1);
-		const w2 = sequence2.findWordContaining(pair.offset2);
+		const w1 = findParent(sequence1, pair.offset1);
+		const w2 = findParent(sequence2, pair.offset2);
 		if (!w1 || !w2) {
 			return;
 		}
@@ -252,8 +258,8 @@ export function extendDiffsToEntireWordIfAppropriate(sequence1: LinesSliceCharSe
 				break;
 			}
 
-			const v1 = sequence1.findWordContaining(next.seq1Range.start);
-			const v2 = sequence2.findWordContaining(next.seq2Range.start);
+			const v1 = findParent(sequence1, next.seq1Range.start);
+			const v2 = findParent(sequence2, next.seq2Range.start);
 			// Because there is an intersection, we know that the words are not empty.
 			const v = new SequenceDiff(v1!, v2!);
 			const equalPart = v.intersect(next)!;
@@ -271,7 +277,7 @@ export function extendDiffsToEntireWordIfAppropriate(sequence1: LinesSliceCharSe
 			}
 		}
 
-		if (equalChars1 + equalChars2 < (w.seq1Range.length + w.seq2Range.length) * 2 / 3) {
+		if ((force && equalChars1 + equalChars2 < w.seq1Range.length + w.seq2Range.length) || equalChars1 + equalChars2 < (w.seq1Range.length + w.seq2Range.length) * 2 / 3) {
 			additional.push(w);
 		}
 
diff --git a/src/vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence.ts b/src/vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence.ts
index b56245bbc0f..25b4a6127f8 100644
--- a/src/vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence.ts
+++ b/src/vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence.ts
@@ -144,6 +144,31 @@ export class LinesSliceCharSequence implements ISequence {
 		return new OffsetRange(start, end);
 	}
 
+	/** fooBar has the two sub-words foo and bar */
+	public findSubWordContaining(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]) && !isUpperCase(this.elements[start])) {
+			start--;
+		}
+
+		// find end
+		let end = offset;
+		while (end < this.elements.length && isWordChar(this.elements[end]) && !isUpperCase(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;
 	}
@@ -165,6 +190,10 @@ function isWordChar(charCode: number): boolean {
 		|| charCode >= CharCode.Digit0 && charCode <= CharCode.Digit9;
 }
 
+function isUpperCase(charCode: number): boolean {
+	return charCode >= CharCode.A && charCode <= CharCode.Z;
+}
+
 const enum CharBoundaryCategory {
 	WordLower,
 	WordUpper,
diff --git a/src/vs/editor/common/diff/documentDiffProvider.ts b/src/vs/editor/common/diff/documentDiffProvider.ts
index da88be843cb..6f6f06a9d73 100644
--- a/src/vs/editor/common/diff/documentDiffProvider.ts
+++ b/src/vs/editor/common/diff/documentDiffProvider.ts
@@ -45,6 +45,8 @@ export interface IDocumentDiffProviderOptions {
 	 * If set, the diff computation should compute moves in addition to insertions and deletions.
 	 */
 	computeMoves: boolean;
+
+	extendToSubwords?: boolean;
 }
 
 /**
diff --git a/src/vs/editor/common/diff/linesDiffComputer.ts b/src/vs/editor/common/diff/linesDiffComputer.ts
index 054d1eebfdd..6a384b6d8a5 100644
--- a/src/vs/editor/common/diff/linesDiffComputer.ts
+++ b/src/vs/editor/common/diff/linesDiffComputer.ts
@@ -13,6 +13,7 @@ export interface ILinesDiffComputerOptions {
 	readonly ignoreTrimWhitespace: boolean;
 	readonly maxComputationTimeMs: number;
 	readonly computeMoves: boolean;
+	readonly extendToSubwords?: boolean;
 }
 
 export class LinesDiff {
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts
index bcfa7d7463b..b0f8b3dc54d 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts
@@ -6,7 +6,7 @@
 import { renderIcon } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { IObservable, IReader, constObservable, derived, observableFromEvent } from '../../../../../../base/common/observable.js';
+import { IObservable, constObservable, derived, observableFromEvent } from '../../../../../../base/common/observable.js';
 import { buttonBackground, buttonForeground, buttonSecondaryBackground, buttonSecondaryForeground } from '../../../../../../platform/theme/common/colorRegistry.js';
 import { registerColor, transparent } from '../../../../../../platform/theme/common/colorUtils.js';
 import { ObservableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
@@ -16,7 +16,7 @@ import { LineRange } from '../../../../../common/core/lineRange.js';
 import { OffsetRange } from '../../../../../common/core/offsetRange.js';
 import { StickyScrollController } from '../../../../stickyScroll/browser/stickyScrollController.js';
 import { InlineCompletionsModel } from '../../model/inlineCompletionsModel.js';
-import { mapOutFalsy, n } from './utils.js';
+import { mapOutFalsy, n, rectToProps } from './utils.js';
 
 export const inlineEditIndicatorPrimaryForeground = registerColor('inlineEdit.gutterIndicator.primaryForeground', buttonForeground, 'Foreground color for the primary inline edit gutter indicator.');
 export const inlineEditIndicatorPrimaryBackground = registerColor('inlineEdit.gutterIndicator.primaryBackground', buttonBackground, 'Background color for the primary inline edit gutter indicator.');
@@ -157,7 +157,7 @@ export class InlineEditsGutterIndicator extends Disposable {
 						case 'accept': return 'var(--vscode-inlineEdit-gutterIndicator-successfulBackground)';
 					}
 				}),
-				'--vscodeIconForeground': this._tabAction.map(v => {
+				['--vscodeIconForeground' as any]: this._tabAction.map(v => {
 					switch (v) {
 						case 'inactive': return 'var(--vscode-inlineEdit-gutterIndicator-secondaryForeground)';
 						case 'jump': return 'var(--vscode-inlineEdit-gutterIndicator-primaryForeground)';
@@ -188,12 +188,3 @@ export class InlineEditsGutterIndicator extends Disposable {
 		]),
 	])).keepUpdated(this._store);
 }
-
-function rectToProps(fn: (reader: IReader) => Rect): any {
-	return {
-		left: derived(reader => fn(reader).left),
-		top: derived(reader => fn(reader).top),
-		width: derived(reader => fn(reader).right - fn(reader).left),
-		height: derived(reader => fn(reader).bottom - fn(reader).top),
-	};
-}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
index b99b0478bdc..a70a0721491 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
@@ -16,6 +16,7 @@ import { URI } from '../../../../../../base/common/uri.js';
 import { MenuEntryActionViewItem } from '../../../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { ObservableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
 import { Point } from '../../../../../browser/point.js';
+import { Rect } from '../../../../../browser/rect.js';
 import { EditorOption } from '../../../../../common/config/editorOptions.js';
 import { LineRange } from '../../../../../common/core/lineRange.js';
 import { OffsetRange } from '../../../../../common/core/offsetRange.js';
@@ -173,9 +174,13 @@ type SVGElementTagNameMap2 = {
 		width: number;
 		height: number;
 		transform: string;
+		viewBox: string;
+		fill: string;
 	};
 	path: SVGElement & {
 		d: string;
+		stroke: string;
+		fill: string;
 	};
 	linearGradient: SVGElement & {
 		id: string;
@@ -465,3 +470,12 @@ export function observeElementPosition(element: HTMLElement, store: DisposableSt
 		left
 	};
 }
+
+export function rectToProps(fn: (reader: IReader) => Rect) {
+	return {
+		left: derived(reader => fn(reader).left),
+		top: derived(reader => fn(reader).top),
+		width: derived(reader => fn(reader).right - fn(reader).left),
+		height: derived(reader => fn(reader).bottom - fn(reader).top),
+	};
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.ts
index 68bc963e374..dfb11c8bebf 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.ts
@@ -4,14 +4,15 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { autorunWithStore, derived, IObservable, IReader } from '../../../../../../base/common/observable.js';
+import { autorunWithStore, derived, IObservable, IReader, mapObservableArrayCached } from '../../../../../../base/common/observable.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { ICodeEditor } from '../../../../../browser/editorBrowser.js';
 import { observableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
 import { EditorOption } from '../../../../../common/config/editorOptions.js';
 import { LineRange } from '../../../../../common/core/lineRange.js';
 import { Position } from '../../../../../common/core/position.js';
-import { StringText } from '../../../../../common/core/textEdit.js';
+import { SingleTextEdit, StringText } from '../../../../../common/core/textEdit.js';
+import { TextLength } from '../../../../../common/core/textLength.js';
 import { DetailedLineRangeMapping, lineRangeMappingFromRangeMappings, RangeMapping } from '../../../../../common/diff/rangeMapping.js';
 import { TextModel } from '../../../../../common/model/textModel.js';
 import { InlineCompletionsModel } from '../../model/inlineCompletionsModel.js';
@@ -22,12 +23,15 @@ import { InlineEditsSideBySideDiff } from './sideBySideDiff.js';
 import { applyEditToModifiedRangeMappings, createReindentEdit } from './utils.js';
 import './view.css';
 import { InlineEditWithChanges } from './viewAndDiffProducer.js';
+import { WordInsertView, WordReplacementView } from './wordReplacementView.js';
 
 export class InlineEditsView extends Disposable {
 	private readonly _editorObs = observableCodeEditor(this._editor);
 
 	private readonly _useMixedLinesDiff = observableCodeEditor(this._editor).getOption(EditorOption.inlineSuggest).map(s => s.edits.experimental.useMixedLinesDiff);
 	private readonly _useInterleavedLinesDiff = observableCodeEditor(this._editor).getOption(EditorOption.inlineSuggest).map(s => s.edits.experimental.useInterleavedLinesDiff);
+	private readonly _useWordReplacementView = observableCodeEditor(this._editor).getOption(EditorOption.inlineSuggest).map(s => s.edits.experimental.useWordReplacementView);
+	private readonly _useWordInsertionView = observableCodeEditor(this._editor).getOption(EditorOption.inlineSuggest).map(s => s.edits.experimental.useWordInsertionView);
 
 	constructor(
 		private readonly _editor: ICodeEditor,
@@ -39,7 +43,7 @@ export class InlineEditsView extends Disposable {
 	}
 
 	private readonly _uiState = derived<{
-		state: 'collapsed' | 'mixedLines' | 'ghostText' | 'interleavedLines' | 'sideBySide';
+		state: ReturnType<typeof InlineEditsView.prototype.determineRenderState>;
 		diff: DetailedLineRangeMapping[];
 		edit: InlineEditWithChanges;
 		newText: string;
@@ -57,9 +61,9 @@ export class InlineEditsView extends Disposable {
 		let newText = edit.edit.apply(edit.originalText);
 		let diff = lineRangeMappingFromRangeMappings(mappings, edit.originalText, new StringText(newText));
 
-		const state = this.determinRenderState(edit, reader, diff);
+		const state = this.determineRenderState(edit, reader, diff, new StringText(newText));
 
-		if (state === 'sideBySide') {
+		if (state.kind === 'sideBySide') {
 			const indentationAdjustmentEdit = createReindentEdit(newText, edit.modifiedLineRange);
 			newText = indentationAdjustmentEdit.applyToString(newText);
 
@@ -98,7 +102,7 @@ export class InlineEditsView extends Disposable {
 		this._editor,
 		this._edit,
 		this._previewTextModel,
-		this._uiState.map(s => s && s.state === 'sideBySide' ? ({
+		this._uiState.map(s => s && s.state.kind === 'sideBySide' ? ({
 			edit: s.edit,
 			newTextLineCount: s.newTextLineCount,
 			originalDisplayRange: s.originalDisplayRange,
@@ -108,17 +112,27 @@ export class InlineEditsView extends Disposable {
 	private readonly _inlineDiffViewState = derived<IOriginalEditorInlineDiffViewState | undefined>(this, reader => {
 		const e = this._uiState.read(reader);
 		if (!e) { return undefined; }
-
+		if (e.state.kind === 'wordReplacements') {
+			return undefined;
+		}
 		return {
 			modifiedText: new StringText(e.newText),
 			diff: e.diff,
-			mode: e.state === 'collapsed' ? 'sideBySide' : e.state,
+			mode: e.state.kind === 'collapsed' ? 'sideBySide' : e.state.kind,
 			modifiedCodeEditor: this._sideBySide.previewEditor,
 		};
 	});
 
 	protected readonly _inlineDiffView = this._register(new OriginalEditorInlineDiffView(this._editor, this._inlineDiffViewState, this._previewTextModel));
 
+	protected readonly _wordReplacementViews = mapObservableArrayCached(this, this._uiState.map(s => s?.state.kind === 'wordReplacements' ? s.state.replacements : []), (e, store) => {
+		if (e.range.isEmpty()) {
+			return store.add(this._instantiationService.createInstance(WordInsertView, this._editorObs, e));
+		} else {
+			return store.add(this._instantiationService.createInstance(WordReplacementView, this._editorObs, e));
+		}
+	}).recomputeInitiallyAndOnChange(this._store);
+
 	private readonly _useGutterIndicator = observableCodeEditor(this._editor).getOption(EditorOption.inlineSuggest).map(s => s.edits.experimental.useGutterIndicator);
 
 	protected readonly _indicator = this._register(autorunWithStore((reader, store) => {
@@ -136,37 +150,54 @@ export class InlineEditsView extends Disposable {
 					if (!state) { return undefined; }
 					const range = state.originalDisplayRange;
 					const top = this._editor.getTopForLineNumber(range.startLineNumber) - this._editorObs.scrollTop.read(reader);
-					return { editTop: top, showAlways: state.state !== 'sideBySide' };
+					return { editTop: top, showAlways: state.state.kind !== 'sideBySide' };
 				}),
 				this._model,
 			));
 		}
 	}));
 
-	private determinRenderState(edit: InlineEditWithChanges, reader: IReader, diff: DetailedLineRangeMapping[]) {
+	private determineRenderState(edit: InlineEditWithChanges, reader: IReader, diff: DetailedLineRangeMapping[], newText: StringText) {
 		if (edit.isCollapsed) {
-			return 'collapsed';
+			return { kind: 'collapsed' as const };
 		}
 
 		if (
-			(this._useMixedLinesDiff.read(reader) === 'whenPossible' || (edit.userJumpedToIt && this._useMixedLinesDiff.read(reader) === 'afterJumpWhenPossible'))
-			&& diff.every(m => OriginalEditorInlineDiffView.supportsInlineDiffRendering(m))
+			this._useMixedLinesDiff.read(reader) === 'forStableInsertions'
+			&& isInsertionAfterPosition(diff, edit.cursorPosition)
 		) {
-			return 'mixedLines';
+			return { kind: 'ghostText' as const };
+		}
+
+		if (diff.length === 1 && diff[0].original.length === 1 && diff[0].modified.length === 1) {
+			const inner = diff.flatMap(d => d.innerChanges!);
+			if (inner.every(
+				m => (m.originalRange.isEmpty() && this._useWordInsertionView.read(reader) === 'whenPossible'
+					|| !m.originalRange.isEmpty() && this._useWordReplacementView.read(reader) === 'whenPossible')
+					&& TextLength.ofRange(m.originalRange).columnCount < 100
+					&& TextLength.ofRange(m.modifiedRange).columnCount < 100
+			)) {
+				return {
+					kind: 'wordReplacements' as const,
+					replacements: inner.map(i =>
+						new SingleTextEdit(i.originalRange, newText.getValueOfRange(i.modifiedRange))
+					)
+				};
+			}
 		}
 
 		if (
-			this._useMixedLinesDiff.read(reader) === 'forStableInsertions'
-			&& isInsertionAfterPosition(diff, edit.cursorPosition)
+			(this._useMixedLinesDiff.read(reader) === 'whenPossible' || (edit.userJumpedToIt && this._useMixedLinesDiff.read(reader) === 'afterJumpWhenPossible'))
+			&& diff.every(m => OriginalEditorInlineDiffView.supportsInlineDiffRendering(m))
 		) {
-			return 'ghostText';
+			return { kind: 'mixedLines' as const };
 		}
 
 		if (this._useInterleavedLinesDiff.read(reader) === 'always' || (edit.userJumpedToIt && this._useInterleavedLinesDiff.read(reader) === 'afterJump')) {
-			return 'interleavedLines';
+			return { kind: 'interleavedLines' as const };
 		}
 
-		return 'sideBySide';
+		return { kind: 'sideBySide' as const };
 	}
 }
 
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/viewAndDiffProducer.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/viewAndDiffProducer.ts
index ed40c6c0edb..f56b4d2c986 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/viewAndDiffProducer.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/viewAndDiffProducer.ts
@@ -47,6 +47,7 @@ export class InlineEditsViewAndDiffProducer extends Disposable {
 				computeMoves: false,
 				ignoreTrimWhitespace: false,
 				maxComputationTimeMs: 1000,
+				extendToSubwords: true,
 			}, CancellationToken.None);
 			return result;
 		});
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/wordReplacementView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/wordReplacementView.ts
new file mode 100644
index 00000000000..6e6f213d38a
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/wordReplacementView.ts
@@ -0,0 +1,285 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { constObservable, derived } from '../../../../../../base/common/observable.js';
+import { editorHoverStatusBarBackground } from '../../../../../../platform/theme/common/colorRegistry.js';
+import { registerColor, transparent } from '../../../../../../platform/theme/common/colorUtils.js';
+import { ObservableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
+import { Point } from '../../../../../browser/point.js';
+import { Rect } from '../../../../../browser/rect.js';
+import { LineSource, renderLines, RenderOptions } from '../../../../../browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js';
+import { EditorOption } from '../../../../../common/config/editorOptions.js';
+import { SingleOffsetEdit } from '../../../../../common/core/offsetEdit.js';
+import { OffsetRange } from '../../../../../common/core/offsetRange.js';
+import { SingleTextEdit } from '../../../../../common/core/textEdit.js';
+import { ILanguageService } from '../../../../../common/languages/language.js';
+import { LineTokens } from '../../../../../common/tokens/lineTokens.js';
+import { TokenArray } from '../../../../../common/tokens/tokenArray.js';
+import { mapOutFalsy, n, rectToProps } from './utils.js';
+
+export const transparentHoverBackground = registerColor(
+	'inlineEdit.wordReplacementView.background',
+	{
+		light: transparent(editorHoverStatusBarBackground, 0.1),
+		dark: transparent(editorHoverStatusBarBackground, 0.5),
+		hcLight: transparent(editorHoverStatusBarBackground, 0.1),
+		hcDark: transparent(editorHoverStatusBarBackground, 0.1),
+	},
+	'Background color for the inline edit word replacement view.'
+);
+
+export class WordReplacementView extends Disposable {
+	private readonly _start = this._editor.observePosition(constObservable(this._edit.range.getStartPosition()), this._store);
+	private readonly _end = this._editor.observePosition(constObservable(this._edit.range.getEndPosition()), this._store);
+
+	private readonly _line = document.createElement('div');
+
+	private readonly _text = derived(reader => {
+		const tm = this._editor.model.get()!;
+		const origLine = tm.getLineContent(this._edit.range.startLineNumber);
+
+		const edit = SingleOffsetEdit.replace(new OffsetRange(this._edit.range.startColumn - 1, this._edit.range.endColumn - 1), this._edit.text);
+		const lineToTokenize = edit.apply(origLine);
+		const t = tm.tokenization.tokenizeLinesAt(this._edit.range.startLineNumber, [lineToTokenize])?.[0];
+		let tokens: LineTokens;
+		if (t) {
+			tokens = TokenArray.fromLineTokens(t).slice(edit.getRangeAfterApply()).toLineTokens(this._edit.text, this._languageService.languageIdCodec);
+		} else {
+			tokens = LineTokens.createEmpty(this._edit.text, this._languageService.languageIdCodec);
+		}
+		renderLines(new LineSource([tokens]), RenderOptions.fromEditor(this._editor.editor).withSetWidth(false), [], this._line, true);
+	});
+
+	private readonly _layout = derived(this, reader => {
+		this._text.read(reader);
+		const start = this._start.read(reader);
+		const end = this._end.read(reader);
+		if (!start || !end) {
+			return undefined;
+		}
+		const contentLeft = this._editor.layoutInfoContentLeft.read(reader);
+		const lineHeight = this._editor.getOption(EditorOption.lineHeight).read(reader);
+		if (start.x > end.x) {
+			return undefined;
+		}
+		const original = Rect.fromLeftTopWidthHeight(start.x + contentLeft - this._editor.scrollLeft.read(reader), start.y, end.x - start.x, lineHeight);
+		const w = this._editor.getOption(EditorOption.fontInfo).read(reader).typicalHalfwidthCharacterWidth;
+		const modified = Rect.fromLeftTopWidthHeight(original.left + 20, original.top + lineHeight + 5, this._edit.text.length * w + 5, original.height);
+		const background = Rect.hull([original, modified]).withMargin(4);
+
+		return {
+			original,
+			modified,
+			background,
+			lowerBackground: background.intersectVertical(new OffsetRange(original.bottom, Number.MAX_SAFE_INTEGER)),
+		};
+	});
+
+
+
+	private readonly _div = n.div({
+		class: 'word-replacement',
+	}, [
+		derived(reader => {
+			const layout = mapOutFalsy(this._layout).read(reader);
+			if (!layout) {
+				return [];
+			}
+
+			return [
+				n.div({
+					style: {
+						position: 'absolute',
+						...rectToProps(reader => layout.read(reader).lowerBackground),
+						borderRadius: '4px',
+						background: 'var(--vscode-editor-background)'
+					}
+				}, []),
+				n.div({
+					style: {
+						position: 'absolute',
+						...rectToProps(reader => layout.read(reader).modified),
+						borderRadius: '4px',
+						padding: '0px',
+						textAlign: 'center',
+						background: 'var(--vscode-inlineEdit-modifiedChangedTextBackground)',
+						fontFamily: this._editor.getOption(EditorOption.fontFamily),
+						fontSize: this._editor.getOption(EditorOption.fontSize),
+						fontWeight: this._editor.getOption(EditorOption.fontWeight),
+					}
+				}, [
+					this._line,
+				]),
+				n.div({
+					style: {
+						position: 'absolute',
+						...rectToProps(reader => layout.read(reader).original),
+						borderRadius: '4px',
+						boxSizing: 'border-box',
+						background: 'var(--vscode-inlineEdit-originalChangedTextBackground)',
+					}
+				}, []),
+				n.div({
+					style: {
+						position: 'absolute',
+						...rectToProps(reader => layout.read(reader).background),
+						borderRadius: '4px',
+
+						border: '1px solid var(--vscode-editorHoverWidget-border)',
+						//background: 'rgba(122, 122, 122, 0.12)', looks better
+						background: 'var(--vscode-inlineEdit-wordReplacementView-background)',
+					}
+				}, []),
+
+				n.svg({
+					width: 11,
+					height: 13,
+					viewBox: '0 0 11 13',
+					fill: 'none',
+					style: {
+						position: 'absolute',
+						left: derived(reader => layout.read(reader).modified.left - 15),
+						top: derived(reader => layout.read(reader).modified.top),
+					}
+				}, [
+					n.svgElem('path', {
+						d: 'M1 0C1 2.98966 1 4.92087 1 7.49952C1 8.60409 1.89543 9.5 3 9.5H10.5',
+						stroke: 'var(--vscode-editorHoverWidget-foreground)',
+					}),
+					n.svgElem('path', {
+						d: 'M6 6.5L9.99999 9.49998L6 12.5',
+						stroke: 'var(--vscode-editorHoverWidget-foreground)',
+					})
+				]),
+
+			];
+		})
+	]).keepUpdated(this._store);
+
+	constructor(
+		private readonly _editor: ObservableCodeEditor,
+		/** Must be single-line in both sides */
+		private readonly _edit: SingleTextEdit,
+		@ILanguageService private readonly _languageService: ILanguageService,
+	) {
+		super();
+
+		this._register(this._editor.createOverlayWidget({
+			domNode: this._div.element,
+			minContentWidthInPx: constObservable(0),
+			position: constObservable({ preference: { top: 0, left: 0 } }),
+			allowEditorOverflow: false,
+		}));
+	}
+}
+
+export class WordInsertView extends Disposable {
+	private readonly _start = this._editor.observePosition(constObservable(this._edit.range.getStartPosition()), this._store);
+
+	private readonly _layout = derived(this, reader => {
+		const start = this._start.read(reader);
+		if (!start) {
+			return undefined;
+		}
+		const contentLeft = this._editor.layoutInfoContentLeft.read(reader);
+		const lineHeight = this._editor.getOption(EditorOption.lineHeight).read(reader);
+
+		const w = this._editor.getOption(EditorOption.fontInfo).read(reader).typicalHalfwidthCharacterWidth;
+		const width = this._edit.text.length * w + 5;
+
+		const center = new Point(contentLeft + start.x + w / 2 - this._editor.scrollLeft.read(reader), start.y);
+
+		const modified = Rect.fromLeftTopWidthHeight(center.x - width / 2, center.y + lineHeight + 5, width, lineHeight);
+		const background = Rect.hull([Rect.fromPoint(center), modified]).withMargin(4);
+
+		return {
+			modified,
+			center,
+			background,
+			lowerBackground: background.intersectVertical(new OffsetRange(modified.top - 2, Number.MAX_SAFE_INTEGER)),
+		};
+	});
+
+	private readonly _div = n.div({
+		class: 'word-insert',
+	}, [
+		derived(reader => {
+			const layout = mapOutFalsy(this._layout).read(reader);
+			if (!layout) {
+				return [];
+			}
+
+			return [
+				n.div({
+					style: {
+						position: 'absolute',
+						...rectToProps(reader => layout.read(reader).lowerBackground),
+						borderRadius: '4px',
+						background: 'var(--vscode-editor-background)'
+					}
+				}, []),
+				n.div({
+					style: {
+						position: 'absolute',
+						...rectToProps(reader => layout.read(reader).modified),
+						borderRadius: '4px',
+						padding: '0px',
+						textAlign: 'center',
+						background: 'var(--vscode-inlineEdit-modifiedChangedTextBackground)',
+						fontFamily: this._editor.getOption(EditorOption.fontFamily),
+						fontSize: this._editor.getOption(EditorOption.fontSize),
+						fontWeight: this._editor.getOption(EditorOption.fontWeight),
+					}
+				}, [
+					this._edit.text,
+				]),
+				n.div({
+					style: {
+						position: 'absolute',
+						...rectToProps(reader => layout.read(reader).background),
+						borderRadius: '4px',
+						border: '1px solid var(--vscode-editorHoverWidget-border)',
+						//background: 'rgba(122, 122, 122, 0.12)', looks better
+						background: 'var(--vscode-inlineEdit-wordReplacementView-background)',
+					}
+				}, []),
+				n.svg({
+					viewBox: '0 0 12 18',
+					width: 12,
+					height: 18,
+					fill: 'none',
+					style: {
+						position: 'absolute',
+						left: derived(reader => layout.read(reader).center.x - 9),
+						top: derived(reader => layout.read(reader).center.y + 4),
+						transform: 'scale(1.4, 1.4)',
+					}
+				}, [
+					n.svgElem('path', {
+						d: 'M5.06445 0H7.35759C7.35759 0 7.35759 8.47059 7.35759 11.1176C7.35759 13.7647 9.4552 18 13.4674 18C17.4795 18 -2.58445 18 0.281373 18C3.14719 18 5.06477 14.2941 5.06477 11.1176C5.06477 7.94118 5.06445 0 5.06445 0Z',
+						fill: 'var(--vscode-inlineEdit-modifiedChangedTextBackground)',
+					})
+				])
+
+			];
+		})
+	]).keepUpdated(this._store);
+
+	constructor(
+		private readonly _editor: ObservableCodeEditor,
+		/** Must be single-line in both sides */
+		private readonly _edit: SingleTextEdit,
+	) {
+		super();
+
+		this._register(this._editor.createOverlayWidget({
+			domNode: this._div.element,
+			minContentWidthInPx: constObservable(0),
+			position: constObservable({ preference: { top: 0, left: 0 } }),
+			allowEditorOverflow: false,
+		}));
+	}
+}
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index 7b6d78e8552..c1df5f99ffe 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -773,6 +773,7 @@ declare namespace monaco {
 		 * Moves the range by the given amount of lines.
 		 */
 		delta(lineCount: number): Range;
+		isSingleLine(): boolean;
 		static fromPositions(start: IPosition, end?: IPosition): Range;
 		/**
 		 * Create a `Range` from an `IRange`.
@@ -4604,6 +4605,8 @@ declare namespace monaco.editor {
 				enabled?: boolean;
 				useMixedLinesDiff?: 'never' | 'whenPossible' | 'forStableInsertions' | 'afterJumpWhenPossible';
 				useInterleavedLinesDiff?: 'never' | 'always' | 'afterJump';
+				useWordInsertionView?: 'never' | 'whenPossible';
+				useWordReplacementView?: 'never' | 'whenPossible';
 				onlyShowWhenCloseToCursor?: boolean;
 				useGutterIndicator?: boolean;
 			};

From a6210a08ac0156635424b396625d52256ac188fc Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Thu, 19 Dec 2024 12:18:50 -0600
Subject: [PATCH 407/479] user aria alert vs native when navigating in terminal
 accessible view (#236622)

fix #236621
---
 .../accessibility/browser/terminal.accessibility.contribution.ts | 1 +
 1 file changed, 1 insertion(+)

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 5c69ee4bae9..b0f68a6eecf 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
@@ -33,6 +33,7 @@ import { BufferContentTracker } from './bufferContentTracker.js';
 import { TerminalAccessibilityHelpProvider } from './terminalAccessibilityHelp.js';
 import { ICommandWithEditorLine, TerminalAccessibleBufferProvider } from './terminalAccessibleBufferProvider.js';
 import { TextAreaSyncAddon } from './textAreaSyncAddon.js';
+import { alert } from '../../../../../base/browser/ui/aria/aria.js';
 
 // #region Terminal Contributions
 

From 8be4be068e75248770be81abb5e8fc9f5d2e2302 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Thu, 19 Dec 2024 19:21:00 +0100
Subject: [PATCH 408/479] Fixes bug (#236620)

---
 .../browser/view/inlineEdits/gutterIndicatorView.ts             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts
index b0f8b3dc54d..739f12b4feb 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts
@@ -108,8 +108,8 @@ export class InlineEditsGutterIndicator extends Disposable {
 
 	private readonly _tabAction = derived(this, reader => {
 		const m = this._model.read(reader);
-		if (m && m.tabShouldAcceptInlineEdit.read(reader)) { return 'accept' as const; }
 		if (m && m.tabShouldJumpToInlineEdit.read(reader)) { return 'jump' as const; }
+		if (m && m.tabShouldAcceptInlineEdit.read(reader)) { return 'accept' as const; }
 		return 'inactive' as const;
 	});
 

From d55cb9a7a04ab9b894b3d3f51ae5a0f4589bf924 Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <me@tylerleonhardt.com>
Date: Thu, 19 Dec 2024 10:25:37 -0800
Subject: [PATCH 409/479] Use claims to force an idToken in Broker flow
 (#236623)

Looks like the Broker doesn't support `forceRefresh`... This is an alternative way of forcing a refresh.

Fixes https://github.com/microsoft/vscode/issues/229456
---
 .../src/node/cachedPublicClientApplication.ts        | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts b/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
index 7396da17990..0f27c2c0e4d 100644
--- a/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
+++ b/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
@@ -102,9 +102,19 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 			);
 			if (fiveMinutesBefore < new Date()) {
 				this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}] [${request.account.username}] id token is expired or about to expire. Forcing refresh...`);
-				result = await this._sequencer.queue(() => this._pca.acquireTokenSilent({ ...request, forceRefresh: true }));
+				const newRequest = this._isBrokerAvailable
+					// HACK: Broker doesn't support forceRefresh so we need to pass in claims which will force a refresh
+					? { ...request, claims: '{ "id_token": {}}' }
+					: { ...request, forceRefresh: true };
+				result = await this._sequencer.queue(() => this._pca.acquireTokenSilent(newRequest));
 				this._logger.debug(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}] [${request.account.username}] got refreshed result`);
 			}
+			const newIdTokenExpirationInSecs = (result.idTokenClaims as { exp?: number }).exp;
+			if (newIdTokenExpirationInSecs) {
+				if (new Date(newIdTokenExpirationInSecs * 1000) < new Date()) {
+					this._logger.error(`[acquireTokenSilent] [${this._clientId}] [${this._authority}] [${request.scopes.join(' ')}] [${request.account.username}] id token is still expired.`);
+				}
+			}
 		}
 
 		// this._setupRefresh(result);

From fe68aa5447827cbdc970fa14e572ab8c0b572f71 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Thu, 19 Dec 2024 12:52:06 -0600
Subject: [PATCH 410/479] fix go to symbol in accessible view (#236624)

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

diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts b/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
index c9acf7b6a28..fde082ed5d5 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibleView.ts
@@ -78,7 +78,7 @@ export class AccessibleView extends Disposable implements ITextModelContentProvi
 	private _hasAssignedKeybindings: IContextKey<boolean>;
 
 	private _codeBlocks?: ICodeBlock[];
-	private _inQuickPick: boolean = false;
+	private _isInQuickPick: boolean = false;
 
 	get editorWidget() { return this._editorWidget; }
 	private _container: HTMLElement;
@@ -352,6 +352,7 @@ export class AccessibleView extends Disposable implements ITextModelContentProvi
 		if (!this._currentProvider) {
 			return;
 		}
+		this._isInQuickPick = true;
 		this._instantiationService.createInstance(AccessibleViewSymbolQuickPick, this).show(this._currentProvider);
 	}
 
@@ -388,11 +389,11 @@ export class AccessibleView extends Disposable implements ITextModelContentProvi
 	}
 
 	getSymbols(): IAccessibleViewSymbol[] | undefined {
-		const provider = this._currentProvider instanceof AccessibleContentProvider ? this._currentProvider : undefined;
+		const provider = this._currentProvider ? this._currentProvider : undefined;
 		if (!this._currentContent || !provider) {
 			return;
 		}
-		const symbols: IAccessibleViewSymbol[] = provider.getSymbols?.() || [];
+		const symbols: IAccessibleViewSymbol[] = 'getSymbols' in provider ? provider.getSymbols?.() || [] : [];
 		if (symbols?.length) {
 			return symbols;
 		}
@@ -416,7 +417,7 @@ export class AccessibleView extends Disposable implements ITextModelContentProvi
 	}
 
 	configureKeybindings(unassigned: boolean): void {
-		this._inQuickPick = true;
+		this._isInQuickPick = true;
 		const provider = this._updateLastProvider();
 		const items = unassigned ? provider?.options?.configureKeybindingItems : provider?.options?.configuredKeybindingItems;
 		if (!items) {
@@ -440,7 +441,7 @@ export class AccessibleView extends Disposable implements ITextModelContentProvi
 				this.show(provider);
 			}
 			disposables.dispose();
-			this._inQuickPick = false;
+			this._isInQuickPick = false;
 		}));
 	}
 
@@ -495,6 +496,7 @@ export class AccessibleView extends Disposable implements ITextModelContentProvi
 		if (lineNumber === undefined) {
 			return;
 		}
+		this._isInQuickPick = false;
 		this.show(provider, undefined, undefined, { lineNumber, column: 1 });
 		this._updateContextKeys(provider, true);
 	}
@@ -609,11 +611,14 @@ export class AccessibleView extends Disposable implements ITextModelContentProvi
 		this._updateToolbar(this._currentProvider.actions, provider.options.type);
 
 		const hide = (e?: KeyboardEvent | IKeyboardEvent): void => {
-			if (!this._inQuickPick) {
+			if (!this._isInQuickPick) {
 				provider.onClose();
 			}
 			e?.stopPropagation();
 			this._contextViewService.hideContextView();
+			if (this._isInQuickPick) {
+				return;
+			}
 			this._updateContextKeys(provider, false);
 			this._lastProvider = undefined;
 			this._currentContent = undefined;
@@ -938,11 +943,15 @@ class AccessibleViewSymbolQuickPick {
 		for (const symbol of symbols) {
 			picks.push({
 				label: symbol.label,
-				ariaLabel: symbol.ariaLabel
+				ariaLabel: symbol.ariaLabel,
+				firstListItem: symbol.firstListItem,
+				lineNumber: symbol.lineNumber,
+				endLineNumber: symbol.endLineNumber,
+				markdownToParse: symbol.markdownToParse
 			});
 		}
 		quickPick.canSelectMany = false;
-		quickPick.items = symbols;
+		quickPick.items = picks;
 		quickPick.show();
 		disposables.add(quickPick.onDidAccept(() => {
 			this._accessibleView.showSymbol(provider, quickPick.selectedItems[0]);

From d34e04970c4ad3955693708dd2c481bf7c8ccd80 Mon Sep 17 00:00:00 2001
From: RedCMD <33529441+RedCMD@users.noreply.github.com>
Date: Fri, 20 Dec 2024 07:54:50 +1300
Subject: [PATCH 411/479] Add `outdated` and `recentlyUpdated` suggestions to
 extension filter (#235884)

---
 src/vs/workbench/contrib/extensions/common/extensionQuery.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/extensions/common/extensionQuery.ts b/src/vs/workbench/contrib/extensions/common/extensionQuery.ts
index d6cd57bb5bc..68320b1455a 100644
--- a/src/vs/workbench/contrib/extensions/common/extensionQuery.ts
+++ b/src/vs/workbench/contrib/extensions/common/extensionQuery.ts
@@ -12,7 +12,7 @@ export class Query {
 	}
 
 	static suggestions(query: string): string[] {
-		const commands = ['installed', 'updates', 'enabled', 'disabled', 'builtin', 'featured', 'popular', 'recommended', 'recentlyPublished', 'workspaceUnsupported', 'deprecated', 'sort', 'category', 'tag', 'ext', 'id'] as const;
+		const commands = ['installed', 'updates', 'enabled', 'disabled', 'builtin', 'featured', 'popular', 'recommended', 'recentlyPublished', 'workspaceUnsupported', 'deprecated', 'sort', 'category', 'tag', 'ext', 'id', 'outdated', 'recentlyUpdated'] as const;
 		const subcommands = {
 			'sort': ['installs', 'rating', 'name', 'publishedDate', 'updateDate'],
 			'category': EXTENSION_CATEGORIES.map(c => `"${c.toLowerCase()}"`),

From 1cbc2eedcd75198db22137ab81701d09d6ee1290 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Thu, 19 Dec 2024 13:30:17 -0600
Subject: [PATCH 412/479] rm `auto` as a type for voice synthesizer setting
 (#236616)

fix #229403
---
 .../accessibility/browser/accessibilityConfiguration.ts      | 5 ++---
 .../chat/electron-sandbox/actions/voiceChatActions.ts        | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts b/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
index 32eff1e1594..fc060c2832e 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.ts
@@ -806,14 +806,13 @@ export class DynamicSpeechAccessibilityConfiguration extends Disposable implemen
 				},
 				[AccessibilityVoiceSettingId.AutoSynthesize]: {
 					'type': 'string',
-					'enum': ['on', 'off', 'auto'],
+					'enum': ['on', 'off'],
 					'enumDescriptions': [
 						localize('accessibility.voice.autoSynthesize.on', "Enable the feature. When a screen reader is enabled, note that this will disable aria updates."),
 						localize('accessibility.voice.autoSynthesize.off', "Disable the feature."),
-						localize('accessibility.voice.autoSynthesize.auto', "When a screen reader is detected, disable the feature. Otherwise, enable the feature.")
 					],
 					'markdownDescription': localize('autoSynthesize', "Whether a textual response should automatically be read out aloud when speech was used as input. For example in a chat session, a response is automatically synthesized when voice was used as chat request."),
-					'default': this.productService.quality !== 'stable' ? 'auto' : 'off',
+					'default': this.productService.quality !== 'stable' ? 'on' : 'off',
 					'tags': ['accessibility']
 				}
 			}
diff --git a/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts b/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
index 57310027bc9..f3fe9985e72 100644
--- a/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
+++ b/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
@@ -369,8 +369,8 @@ class VoiceChatSessions {
 		if (!response) {
 			return;
 		}
-		const autoSynthesize = this.configurationService.getValue<'on' | 'off' | 'auto'>(AccessibilityVoiceSettingId.AutoSynthesize);
-		if (autoSynthesize === 'on' || autoSynthesize === 'auto' && !this.accessibilityService.isScreenReaderOptimized()) {
+		const autoSynthesize = this.configurationService.getValue<'on' | 'off'>(AccessibilityVoiceSettingId.AutoSynthesize);
+		if (autoSynthesize === 'on' || (autoSynthesize !== 'off' && !this.accessibilityService.isScreenReaderOptimized())) {
 			let context: IVoiceChatSessionController | 'focused';
 			if (controller.context === 'inline') {
 				// This is ugly, but the lightweight inline chat turns into

From 2a99d4331539247b4933b992ec768653d3634b61 Mon Sep 17 00:00:00 2001
From: Joyce Er <joyce.er@microsoft.com>
Date: Thu, 19 Dec 2024 11:44:22 -0800
Subject: [PATCH 413/479] fix: don't watch untitled files for chat editing
 (#236634)

---
 .../chatEditing/chatEditingModifiedFileEntry.ts  | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
index 6becb086793..aa105b2e767 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts
@@ -6,6 +6,7 @@
 import { RunOnceScheduler } from '../../../../../base/common/async.js';
 import { Emitter } from '../../../../../base/common/event.js';
 import { Disposable, IReference, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../../base/common/network.js';
 import { IObservable, ITransaction, observableValue, transaction } from '../../../../../base/common/observable.js';
 import { themeColorFromId } from '../../../../../base/common/themables.js';
 import { URI } from '../../../../../base/common/uri.js';
@@ -171,12 +172,15 @@ export class ChatEditingModifiedFileEntry extends Disposable implements IModifie
 
 
 		this._register(this.doc.onDidChangeContent(e => this._mirrorEdits(e)));
-		this._register(this._fileService.watch(this.modifiedURI));
-		this._register(this._fileService.onDidFilesChange(e => {
-			if (e.affects(this.modifiedURI) && kind === ChatEditKind.Created && e.gotDeleted()) {
-				this._onDidDelete.fire();
-			}
-		}));
+
+		if (this.modifiedURI.scheme !== Schemas.untitled) {
+			this._register(this._fileService.watch(this.modifiedURI));
+			this._register(this._fileService.onDidFilesChange(e => {
+				if (e.affects(this.modifiedURI) && kind === ChatEditKind.Created && e.gotDeleted()) {
+					this._onDidDelete.fire();
+				}
+			}));
+		}
 
 		this._register(toDisposable(() => {
 			this._clearCurrentEditLineDecoration();

From 2217f51cf8d7022cafe49301a523ea55cbddc5b4 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Thu, 19 Dec 2024 21:01:41 +0100
Subject: [PATCH 414/479] Fix title bar focus command when hidden (#236635)

fix #236597
---
 src/vs/workbench/browser/parts/titlebar/titlebarPart.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
index 3facaf51e23..32dad57a218 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
@@ -54,6 +54,7 @@ import { IBaseActionViewItemOptions } from '../../../../base/browser/ui/actionba
 import { IHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { safeIntl } from '../../../../base/common/date.js';
+import { TitleBarVisibleContext } from '../../../common/contextkeys.js';
 
 export interface ITitleVariable {
 	readonly name: string;
@@ -119,11 +120,12 @@ export class BrowserTitleService extends MultiWindowParts<BrowserTitlebarPart> i
 					title: localize2('focusTitleBar', 'Focus Title Bar'),
 					category: Categories.View,
 					f1: true,
+					precondition: TitleBarVisibleContext
 				});
 			}
 
 			run(): void {
-				that.getPartByDocument(getActiveDocument()).focus();
+				that.getPartByDocument(getActiveDocument())?.focus();
 			}
 		}));
 	}

From e48d729d217084342cacf71bbfa6c1fa0d867feb Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <me@tylerleonhardt.com>
Date: Thu, 19 Dec 2024 12:09:55 -0800
Subject: [PATCH 415/479] Apply margin to action items (#236638)

Fixes https://github.com/microsoft/vscode/issues/233699
---
 .../platform/quickinput/browser/media/quickInput.css   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/vs/platform/quickinput/browser/media/quickInput.css b/src/vs/platform/quickinput/browser/media/quickInput.css
index 9108ee9ae80..53f42dfa5ae 100644
--- a/src/vs/platform/quickinput/browser/media/quickInput.css
+++ b/src/vs/platform/quickinput/browser/media/quickInput.css
@@ -26,8 +26,14 @@
 	flex: 1;
 }
 
-.quick-input-inline-action-bar {
-	margin: 2px 0 0 5px;
+/* give some space between input and action bar */
+.quick-input-inline-action-bar > .actions-container > .action-item:first-child {
+	margin-left: 5px;
+}
+
+/* center horizontally */
+.quick-input-inline-action-bar > .actions-container > .action-item {
+	margin-top: 2px;
 }
 
 .quick-input-title {

From 358e96ab1e9017d8dc90b7a24e617d9f39e017b4 Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <me@tylerleonhardt.com>
Date: Thu, 19 Dec 2024 12:40:19 -0800
Subject: [PATCH 416/479] Cancel if the user dismisses the modal (#236642)

Fixes https://github.com/microsoft/vscode/issues/235364
---
 .../microsoft-authentication/src/node/authProvider.ts     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/extensions/microsoft-authentication/src/node/authProvider.ts b/extensions/microsoft-authentication/src/node/authProvider.ts
index af34273afa4..cc8eb2bc5c7 100644
--- a/extensions/microsoft-authentication/src/node/authProvider.ts
+++ b/extensions/microsoft-authentication/src/node/authProvider.ts
@@ -2,7 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { AccountInfo, AuthenticationResult, ServerError } from '@azure/msal-node';
+import { AccountInfo, AuthenticationResult, ClientAuthError, ClientAuthErrorCodes, ServerError } from '@azure/msal-node';
 import { AuthenticationGetSessionOptions, AuthenticationProvider, AuthenticationProviderAuthenticationSessionsChangeEvent, AuthenticationProviderSessionOptions, AuthenticationSession, AuthenticationSessionAccountInformation, CancellationError, env, EventEmitter, ExtensionContext, l10n, LogOutputChannel, Uri, window } from 'vscode';
 import { Environment } from '@azure/ms-rest-azure-env';
 import { CachedPublicClientApplicationManager } from './publicClientCache';
@@ -229,6 +229,12 @@ export class MsalAuthProvider implements AuthenticationProvider {
 				throw e;
 			}
 
+			// The user closed the modal window
+			if ((e as ClientAuthError).errorCode === ClientAuthErrorCodes.userCanceled) {
+				this._telemetryReporter.sendLoginFailedEvent();
+				throw e;
+			}
+
 			// The user wants to try the loopback client or we got an error likely due to spinning up the server
 			const loopbackClient = new UriHandlerLoopbackClient(this._uriHandler, redirectUri, this._logger);
 			try {

From ad359b1ca9090f340655e8839a76abb9b59f8761 Mon Sep 17 00:00:00 2001
From: Michael Lively <milively@microsoft.com>
Date: Thu, 19 Dec 2024 12:58:38 -0800
Subject: [PATCH 417/479] Clear nb selection highlights on non-explicit cursor
 events (#236641)

ugh I overthought this. clear on non-explicit cursor events. (ie typing)
---
 .../browser/contrib/multicursor/notebookSelectionHighlight.ts    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookSelectionHighlight.ts b/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookSelectionHighlight.ts
index a7e82c41a73..305e4d8fde4 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookSelectionHighlight.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/multicursor/notebookSelectionHighlight.ts
@@ -63,6 +63,7 @@ class NotebookSelectionHighlighter extends Disposable implements INotebookEditor
 			this.anchorDisposables.clear();
 			this.anchorDisposables.add(this.anchorCell[1].onDidChangeCursorPosition((e) => {
 				if (e.reason !== CursorChangeReason.Explicit) {
+					this.clearNotebookSelectionDecorations();
 					return;
 				}
 

From 6ec5e7b296e7d96e8fbd87d1329bf5642d738da2 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Thu, 19 Dec 2024 13:06:18 -0800
Subject: [PATCH 418/479] debug: fix tree 'measuring node not in DOM error'
 (#236645)

---
 .../workbench/contrib/debug/browser/repl.ts   | 40 ++++++++++++-------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/vs/workbench/contrib/debug/browser/repl.ts b/src/vs/workbench/contrib/debug/browser/repl.ts
index edef7e72b70..04823d1f137 100644
--- a/src/vs/workbench/contrib/debug/browser/repl.ts
+++ b/src/vs/workbench/contrib/debug/browser/repl.ts
@@ -174,7 +174,11 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 			this.onDidFocusSession(this.debugService.getViewModel().focusedSession);
 		}
 
-		this._register(this.debugService.getViewModel().onDidFocusSession(async session => this.onDidFocusSession(session)));
+		this._register(this.debugService.getViewModel().onDidFocusSession(session => {
+			if (this.isVisible()) {
+				this.onDidFocusSession(session);
+			}
+		}));
 		this._register(this.debugService.getViewModel().onDidEvaluateLazyExpression(async e => {
 			if (e instanceof Variable && this.tree?.hasNode(e)) {
 				await this.tree.updateChildren(e, false, true);
@@ -201,19 +205,27 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 			}
 		}));
 		this._register(this.onDidChangeBodyVisibility(visible => {
-			if (visible) {
-				if (!this.model) {
-					this.model = this.modelService.getModel(Repl.URI) || this.modelService.createModel('', null, Repl.URI, true);
-				}
-				this.setMode();
-				this.replInput.setModel(this.model);
-				this.updateInputDecoration();
-				this.refreshReplElements(true);
-				if (this.styleChangedWhenInvisible) {
-					this.styleChangedWhenInvisible = false;
-					this.tree?.updateChildren(undefined, true, false);
-					this.onDidStyleChange();
-				}
+			if (!visible) {
+				return;
+			}
+			if (!this.model) {
+				this.model = this.modelService.getModel(Repl.URI) || this.modelService.createModel('', null, Repl.URI, true);
+			}
+
+			const focusedSession = this.debugService.getViewModel().focusedSession;
+			if (this.tree && this.tree.getInput() !== focusedSession) {
+				this.onDidFocusSession(focusedSession);
+			}
+
+			this.setMode();
+			this.replInput.setModel(this.model);
+			this.updateInputDecoration();
+			this.refreshReplElements(true);
+
+			if (this.styleChangedWhenInvisible) {
+				this.styleChangedWhenInvisible = false;
+				this.tree?.updateChildren(undefined, true, false);
+				this.onDidStyleChange();
 			}
 		}));
 		this._register(this.configurationService.onDidChangeConfiguration(e => {

From f442df17470c5b95936acc79bbca27509177cf31 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Thu, 19 Dec 2024 22:06:52 +0100
Subject: [PATCH 419/479] Git - better match git conflict decorations (#236646)

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

diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index dde1c99049a..95ab9ada071 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -309,7 +309,7 @@ async function categorizeResourceByResolution(resources: Resource[]): Promise<{
 	const isBothAddedOrModified = (s: Resource) => s.type === Status.BOTH_MODIFIED || s.type === Status.BOTH_ADDED;
 	const isAnyDeleted = (s: Resource) => s.type === Status.DELETED_BY_THEM || s.type === Status.DELETED_BY_US;
 	const possibleUnresolved = merge.filter(isBothAddedOrModified);
-	const promises = possibleUnresolved.map(s => grep(s.resourceUri.fsPath, /^<{7}|^={7}|^>{7}/));
+	const promises = possibleUnresolved.map(s => grep(s.resourceUri.fsPath, /^<{7}\s|^={7}$|^>{7}\s/));
 	const unresolvedBothModified = await Promise.all<boolean>(promises);
 	const resolved = possibleUnresolved.filter((_s, i) => !unresolvedBothModified[i]);
 	const deletionConflicts = merge.filter(s => isAnyDeleted(s));

From ee8c3e9e8acd54968405d96dea233b31c32c6830 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Thu, 19 Dec 2024 15:52:14 -0600
Subject: [PATCH 420/479] add `Terminal: resize suggest widget size` command
 (#236639)

fix #235091
---
 .../suggest/browser/terminal.suggest.contribution.ts        | 6 ++++++
 .../terminalContrib/suggest/browser/terminalSuggestAddon.ts | 4 ++++
 .../terminalContrib/suggest/common/terminal.suggest.ts      | 1 +
 .../services/suggest/browser/simpleSuggestWidget.ts         | 4 ++++
 4 files changed, 15 insertions(+)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts
index 96676a5a12c..35a845c1f7b 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts
@@ -195,6 +195,12 @@ registerActiveInstanceAction({
 	run: (activeInstance) => TerminalSuggestContribution.get(activeInstance)?.addon?.requestCompletions(true)
 });
 
+registerActiveInstanceAction({
+	id: TerminalSuggestCommandId.ResetWidgetSize,
+	title: localize2('workbench.action.terminal.resetSuggestWidgetSize', 'Reset Suggest Widget Size'),
+	run: (activeInstance) => TerminalSuggestContribution.get(activeInstance)?.addon?.resetWidgetSize()
+});
+
 registerActiveInstanceAction({
 	id: TerminalSuggestCommandId.SelectPrevSuggestion,
 	title: localize2('workbench.action.terminal.selectPrevSuggestion', 'Select the Previous Suggestion'),
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
index 9f173cfc15a..94650c7525c 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -231,6 +231,10 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		this._screen = screen;
 	}
 
+	resetWidgetSize(): void {
+		this._suggestWidget?.resetWidgetSize();
+	}
+
 	async requestCompletions(explicitlyInvoked?: boolean): Promise<void> {
 		if (!this._promptInputModel) {
 			return;
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminal.suggest.ts b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminal.suggest.ts
index b9fe0dcbe60..0b62f790124 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/common/terminal.suggest.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/common/terminal.suggest.ts
@@ -13,6 +13,7 @@ export const enum TerminalSuggestCommandId {
 	HideSuggestWidget = 'workbench.action.terminal.hideSuggestWidget',
 	ClearSuggestCache = 'workbench.action.terminal.clearSuggestCache',
 	RequestCompletions = 'workbench.action.terminal.requestCompletions',
+	ResetWidgetSize = 'workbench.action.terminal.resetSuggestWidgetSize',
 }
 
 export const defaultTerminalSuggestCommandsToSkipShell = [
diff --git a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
index bc9c9ea0cba..af70d32b896 100644
--- a/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.ts
@@ -290,6 +290,10 @@ export class SimpleSuggestWidget extends Disposable {
 		return this._completionModel?.items.length !== 0;
 	}
 
+	resetWidgetSize(): void {
+		this._persistedSize.reset();
+	}
+
 	showSuggestions(selectionIndex: number, isFrozen: boolean, isAuto: boolean, cursorPosition: { top: number; left: number; height: number }): void {
 		this._cursorPosition = cursorPosition;
 

From 41793c2d43f18397608003a7af524ce660b0b4c3 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Thu, 19 Dec 2024 16:26:26 -0600
Subject: [PATCH 421/479] use keyboard vs key icon for configure keybinding
 action icons (#236649)

fix #229827
---
 .../contrib/accessibility/browser/accessibleViewActions.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.ts b/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.ts
index d1be576a131..f587bd7cb1e 100644
--- a/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.ts
+++ b/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.ts
@@ -233,7 +233,7 @@ class AccessibilityHelpConfigureKeybindingsAction extends Action2 {
 		super({
 			id: AccessibilityCommandId.AccessibilityHelpConfigureKeybindings,
 			precondition: ContextKeyExpr.and(accessibilityHelpIsShown, accessibleViewHasUnassignedKeybindings),
-			icon: Codicon.key,
+			icon: Codicon.recordKeys,
 			keybinding: {
 				primary: KeyMod.Alt | KeyCode.KeyK,
 				weight: KeybindingWeight.WorkbenchContrib
@@ -260,7 +260,7 @@ class AccessibilityHelpConfigureAssignedKeybindingsAction extends Action2 {
 		super({
 			id: AccessibilityCommandId.AccessibilityHelpConfigureAssignedKeybindings,
 			precondition: ContextKeyExpr.and(accessibilityHelpIsShown, accessibleViewHasAssignedKeybindings),
-			icon: Codicon.key,
+			icon: Codicon.recordKeys,
 			keybinding: {
 				primary: KeyMod.Alt | KeyCode.KeyA,
 				weight: KeybindingWeight.WorkbenchContrib

From 38c3ebef2e3e9069552b835855271dcf0ac3fe4e Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Thu, 19 Dec 2024 17:39:08 -0800
Subject: [PATCH 422/479] Remove repeated call, warn on invalid persisted data
 (#236658)

---
 src/vs/workbench/contrib/chat/common/chatModel.ts | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/common/chatModel.ts b/src/vs/workbench/contrib/chat/common/chatModel.ts
index 14fa03dffa0..d1b092b114c 100644
--- a/src/vs/workbench/contrib/chat/common/chatModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatModel.ts
@@ -999,12 +999,17 @@ export class ChatModel extends Disposable implements IChatModel {
 	) {
 		super();
 
-		this._isImported = (!!initialData && !isSerializableSessionData(initialData)) || (initialData?.isImported ?? false);
-		this._sessionId = (isSerializableSessionData(initialData) && initialData.sessionId) || generateUuid();
+		const isValid = isSerializableSessionData(initialData);
+		if (initialData && !isValid) {
+			this.logService.warn(`ChatModel#constructor: Loaded malformed session data: ${JSON.stringify(initialData)}`);
+		}
+
+		this._isImported = (!!initialData && !isValid) || (initialData?.isImported ?? false);
+		this._sessionId = (isValid && initialData.sessionId) || generateUuid();
 		this._requests = initialData ? this._deserialize(initialData) : [];
-		this._creationDate = (isSerializableSessionData(initialData) && initialData.creationDate) || Date.now();
-		this._lastMessageDate = (isSerializableSessionData(initialData) && initialData.lastMessageDate) || this._creationDate;
-		this._customTitle = isSerializableSessionData(initialData) ? initialData.customTitle : undefined;
+		this._creationDate = (isValid && initialData.creationDate) || Date.now();
+		this._lastMessageDate = (isValid && initialData.lastMessageDate) || this._creationDate;
+		this._customTitle = isValid ? initialData.customTitle : undefined;
 
 		this._initialRequesterAvatarIconUri = initialData?.requesterAvatarIconUri && URI.revive(initialData.requesterAvatarIconUri);
 		this._initialResponderAvatarIconUri = isUriComponents(initialData?.responderAvatarIconUri) ? URI.revive(initialData.responderAvatarIconUri) : initialData?.responderAvatarIconUri;

From 89f808979a5151bd91324e65d4f7ab1b62896983 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Thu, 19 Dec 2024 19:39:33 -0800
Subject: [PATCH 423/479] Cancel request tool calls when cancelling chat
 request (#236663)

* Cancel request tool calls when cancelling chat request
Fix #232775

* Don't invoke tool if cancelled before

* Fix tests
---
 .../chat/browser/languageModelToolsService.ts | 72 +++++++++++++++++--
 .../contrib/chat/common/chatServiceImpl.ts    | 11 ++-
 .../chat/common/languageModelToolsService.ts  |  1 +
 .../browser/languageModelToolsService.test.ts | 71 +++++++++++++++++-
 .../chat/test/common/mockChatService.ts       |  7 +-
 .../common/mockLanguageModelToolsService.ts   |  3 +
 .../test/browser/inlineChatController.test.ts |  3 +
 7 files changed, 156 insertions(+), 12 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/languageModelToolsService.ts b/src/vs/workbench/contrib/chat/browser/languageModelToolsService.ts
index 2b3f6b2dc49..d0bce841451 100644
--- a/src/vs/workbench/contrib/chat/browser/languageModelToolsService.ts
+++ b/src/vs/workbench/contrib/chat/browser/languageModelToolsService.ts
@@ -5,11 +5,11 @@
 
 import { renderStringAsPlaintext } from '../../../../base/browser/markdownRenderer.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
-import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { CancellationError, isCancellationError } from '../../../../base/common/errors.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { Iterable } from '../../../../base/common/iterator.js';
-import { Disposable, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, dispose, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { localize } from '../../../../nls.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
@@ -37,6 +37,9 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
 	private _tools = new Map<string, IToolEntry>();
 	private _toolContextKeys = new Set<string>();
 
+
+	private _callsByRequestId = new Map<string, IDisposable[]>();
+
 	constructor(
 		@IExtensionService private readonly _extensionService: IExtensionService,
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
@@ -141,10 +144,34 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
 		// Shortcut to write to the model directly here, but could call all the way back to use the real stream.
 		let toolInvocation: ChatToolInvocation | undefined;
 
+		let requestId: string | undefined;
+		let store: DisposableStore | undefined;
 		try {
 			if (dto.context) {
-				const model = this._chatService.getSession(dto.context?.sessionId) as ChatModel;
+				store = new DisposableStore();
+				const model = this._chatService.getSession(dto.context?.sessionId) as ChatModel | undefined;
+				if (!model) {
+					throw new Error(`Tool called for unknown chat session`);
+				}
+
 				const request = model.getRequests().at(-1)!;
+				requestId = request.id;
+
+				// Replace the token with a new token that we can cancel when cancelToolCallsForRequest is called
+				if (!this._callsByRequestId.has(requestId)) {
+					this._callsByRequestId.set(requestId, []);
+				}
+				this._callsByRequestId.get(requestId)!.push(store);
+
+				const source = new CancellationTokenSource();
+				store.add(toDisposable(() => {
+					toolInvocation!.confirmed.complete(false);
+					source.dispose(true);
+				}));
+				store.add(token.onCancellationRequested(() => {
+					source.cancel();
+				}));
+				token = source.token;
 
 				const prepared = tool.impl.prepareToolInvocation ?
 					await tool.impl.prepareToolInvocation(dto.parameters, token)
@@ -153,9 +180,7 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
 				const defaultMessage = localize('toolInvocationMessage', "Using {0}", `"${tool.data.displayName}"`);
 				const invocationMessage = prepared?.invocationMessage ?? defaultMessage;
 				toolInvocation = new ChatToolInvocation(invocationMessage, prepared?.confirmationMessages);
-				token.onCancellationRequested(() => {
-					toolInvocation!.confirmed.complete(false);
-				});
+
 				model.acceptResponseProgress(request, toolInvocation);
 				if (prepared?.confirmationMessages) {
 					const userConfirmed = await toolInvocation.confirmed.p;
@@ -176,6 +201,9 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
 				}
 			}
 
+			if (token.isCancellationRequested) {
+				throw new CancellationError();
+			}
 
 			const result = await tool.impl.invoke(dto, countTokens, token);
 			this._telemetryService.publicLog2<LanguageModelToolInvokedEvent, LanguageModelToolInvokedClassification>(
@@ -200,7 +228,39 @@ export class LanguageModelToolsService extends Disposable implements ILanguageMo
 			throw err;
 		} finally {
 			toolInvocation?.isCompleteDeferred.complete();
+
+			if (requestId && store) {
+				this.cleanupCallDisposables(requestId, store);
+			}
+		}
+	}
+
+	private cleanupCallDisposables(requestId: string, store: DisposableStore): void {
+		const disposables = this._callsByRequestId.get(requestId);
+		if (disposables) {
+			const index = disposables.indexOf(store);
+			if (index > -1) {
+				disposables.splice(index, 1);
+			}
+			if (disposables.length === 0) {
+				this._callsByRequestId.delete(requestId);
+			}
 		}
+		store.dispose();
+	}
+
+	cancelToolCallsForRequest(requestId: string): void {
+		const calls = this._callsByRequestId.get(requestId);
+		if (calls) {
+			calls.forEach(call => call.dispose());
+			this._callsByRequestId.delete(requestId);
+		}
+	}
+
+	public override dispose(): void {
+		super.dispose();
+
+		this._callsByRequestId.forEach(calls => dispose(calls));
 	}
 }
 
diff --git a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
index d5a8839dd11..6cfb29ce0c9 100644
--- a/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
+++ b/src/vs/workbench/contrib/chat/common/chatServiceImpl.ts
@@ -33,6 +33,7 @@ import { ChatServiceTelemetry } from './chatServiceTelemetry.js';
 import { IChatSlashCommandService } from './chatSlashCommands.js';
 import { IChatVariablesService } from './chatVariables.js';
 import { ChatMessageRole, IChatMessage } from './languageModels.js';
+import { ILanguageModelToolsService } from './languageModelToolsService.js';
 
 const serializedChatKey = 'interactive.sessions';
 
@@ -86,7 +87,8 @@ const maxPersistedSessions = 25;
 class CancellableRequest implements IDisposable {
 	constructor(
 		public readonly cancellationTokenSource: CancellationTokenSource,
-		public requestId?: string | undefined
+		public requestId: string | undefined,
+		@ILanguageModelToolsService private readonly toolsService: ILanguageModelToolsService
 	) { }
 
 	dispose() {
@@ -94,6 +96,10 @@ class CancellableRequest implements IDisposable {
 	}
 
 	cancel() {
+		if (this.requestId) {
+			this.toolsService.cancelToolCallsForRequest(this.requestId);
+		}
+
 		this.cancellationTokenSource.cancel();
 	}
 }
@@ -778,7 +784,8 @@ export class ChatService extends Disposable implements IChatService {
 			}
 		};
 		const rawResponsePromise = sendRequestInternal();
-		this._pendingRequests.set(model.sessionId, new CancellableRequest(source));
+		// Note- requestId is not known at this point, assigned later
+		this._pendingRequests.set(model.sessionId, this.instantiationService.createInstance(CancellableRequest, source, undefined));
 		rawResponsePromise.finally(() => {
 			this._pendingRequests.deleteAndDispose(model.sessionId);
 		});
diff --git a/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts b/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
index f2251ca8166..f69be4fed5c 100644
--- a/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
+++ b/src/vs/workbench/contrib/chat/common/languageModelToolsService.ts
@@ -86,4 +86,5 @@ export interface ILanguageModelToolsService {
 	getTool(id: string): IToolData | undefined;
 	getToolByName(name: string): IToolData | undefined;
 	invokeTool(invocation: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult>;
+	cancelToolCallsForRequest(requestId: string): void;
 }
diff --git a/src/vs/workbench/contrib/chat/test/browser/languageModelToolsService.test.ts b/src/vs/workbench/contrib/chat/test/browser/languageModelToolsService.test.ts
index 9679c7a8908..fb866bbfade 100644
--- a/src/vs/workbench/contrib/chat/test/browser/languageModelToolsService.test.ts
+++ b/src/vs/workbench/contrib/chat/test/browser/languageModelToolsService.test.ts
@@ -6,24 +6,32 @@
 import * as assert from 'assert';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
+import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { ContextKeyService } from '../../../../../platform/contextkey/browser/contextKeyService.js';
 import { ContextKeyEqualsExpr, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
 import { LanguageModelToolsService } from '../../browser/languageModelToolsService.js';
+import { IChatModel } from '../../common/chatModel.js';
+import { IChatService } from '../../common/chatService.js';
 import { IToolData, IToolImpl, IToolInvocation } from '../../common/languageModelToolsService.js';
-import { ContextKeyService } from '../../../../../platform/contextkey/browser/contextKeyService.js';
-import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
+import { MockChatService } from '../common/mockChatService.js';
+import { CancellationError, isCancellationError } from '../../../../../base/common/errors.js';
+import { Barrier } from '../../../../../base/common/async.js';
 
 suite('LanguageModelToolsService', () => {
 	const store = ensureNoDisposablesAreLeakedInTestSuite();
 
 	let contextKeyService: IContextKeyService;
 	let service: LanguageModelToolsService;
+	let chatService: MockChatService;
 
 	setup(() => {
 		const instaService = workbenchInstantiationService({
-			contextKeyService: () => store.add(new ContextKeyService(new TestConfigurationService))
+			contextKeyService: () => store.add(new ContextKeyService(new TestConfigurationService)),
 		}, store);
 		contextKeyService = instaService.get(IContextKeyService);
+		chatService = new MockChatService();
+		instaService.stub(IChatService, chatService);
 		service = store.add(instaService.createInstance(LanguageModelToolsService));
 	});
 
@@ -122,4 +130,61 @@ suite('LanguageModelToolsService', () => {
 		const result = await service.invokeTool(dto, async () => 0, CancellationToken.None);
 		assert.strictEqual(result.content[0].value, 'result');
 	});
+
+	test('cancel tool call', async () => {
+		const toolData: IToolData = {
+			id: 'testTool',
+			modelDescription: 'Test Tool',
+			displayName: 'Test Tool'
+		};
+
+		store.add(service.registerToolData(toolData));
+
+		const toolBarrier = new Barrier();
+		const toolImpl: IToolImpl = {
+			invoke: async (invocation, countTokens, cancelToken) => {
+				assert.strictEqual(invocation.callId, '1');
+				assert.strictEqual(invocation.toolId, 'testTool');
+				assert.deepStrictEqual(invocation.parameters, { a: 1 });
+				await toolBarrier.wait();
+				if (cancelToken.isCancellationRequested) {
+					throw new CancellationError();
+				} else {
+					throw new Error('Tool call should be cancelled');
+				}
+			}
+		};
+
+		store.add(service.registerToolImplementation('testTool', toolImpl));
+
+		const sessionId = 'sessionId';
+		const requestId = 'requestId';
+		const dto: IToolInvocation = {
+			callId: '1',
+			toolId: 'testTool',
+			tokenBudget: 100,
+			parameters: {
+				a: 1
+			},
+			context: {
+				sessionId
+			},
+		};
+		chatService.addSession({
+			sessionId: sessionId,
+			getRequests: () => {
+				return [{
+					id: requestId
+				}];
+			},
+			acceptResponseProgress: () => { }
+		} as any as IChatModel);
+
+		const toolPromise = service.invokeTool(dto, async () => 0, CancellationToken.None);
+		service.cancelToolCallsForRequest(requestId);
+		toolBarrier.open();
+		await assert.rejects(toolPromise, err => {
+			return isCancellationError(err);
+		}, 'Expected tool call to be cancelled');
+	});
 });
diff --git a/src/vs/workbench/contrib/chat/test/common/mockChatService.ts b/src/vs/workbench/contrib/chat/test/common/mockChatService.ts
index ad4262a7dbd..31fbb654b63 100644
--- a/src/vs/workbench/contrib/chat/test/common/mockChatService.ts
+++ b/src/vs/workbench/contrib/chat/test/common/mockChatService.ts
@@ -15,6 +15,8 @@ export class MockChatService implements IChatService {
 	_serviceBrand: undefined;
 	transferredSessionData: IChatTransferredSessionData | undefined;
 
+	private sessions = new Map<string, IChatModel>();
+
 	isEnabled(location: ChatAgentLocation): boolean {
 		throw new Error('Method not implemented.');
 	}
@@ -27,9 +29,12 @@ export class MockChatService implements IChatService {
 	startSession(location: ChatAgentLocation, token: CancellationToken): ChatModel | undefined {
 		throw new Error('Method not implemented.');
 	}
+	addSession(session: IChatModel): void {
+		this.sessions.set(session.sessionId, session);
+	}
 	getSession(sessionId: string): IChatModel | undefined {
 		// eslint-disable-next-line local/code-no-dangerous-type-assertions
-		return {} as IChatModel;
+		return this.sessions.get(sessionId) ?? {} as IChatModel;
 	}
 	getOrRestoreSession(sessionId: string): IChatModel | undefined {
 		throw new Error('Method not implemented.');
diff --git a/src/vs/workbench/contrib/chat/test/common/mockLanguageModelToolsService.ts b/src/vs/workbench/contrib/chat/test/common/mockLanguageModelToolsService.ts
index a192334cb9d..d854a0beb5e 100644
--- a/src/vs/workbench/contrib/chat/test/common/mockLanguageModelToolsService.ts
+++ b/src/vs/workbench/contrib/chat/test/common/mockLanguageModelToolsService.ts
@@ -13,6 +13,9 @@ export class MockLanguageModelToolsService implements ILanguageModelToolsService
 
 	constructor() { }
 
+	cancelToolCallsForRequest(requestId: string): void {
+	}
+
 	onDidChangeTools: Event<void> = Event.None;
 
 	registerToolData(toolData: IToolData): IDisposable {
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 7d07547770e..75db4dbb7f1 100644
--- a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
+++ b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
@@ -71,6 +71,8 @@ import { ITextModelService } from '../../../../../editor/common/services/resolve
 import { TextModelResolverService } from '../../../../services/textmodelResolver/common/textModelResolverService.js';
 import { ChatInputBoxContentProvider } from '../../../chat/browser/chatEdinputInputContentProvider.js';
 import { IObservable, observableValue } from '../../../../../base/common/observable.js';
+import { ILanguageModelToolsService } from '../../../chat/common/languageModelToolsService.js';
+import { MockLanguageModelToolsService } from '../../../chat/test/common/mockLanguageModelToolsService.js';
 
 suite('InlineChatController', function () {
 
@@ -198,6 +200,7 @@ suite('InlineChatController', function () {
 			[IWorkbenchAssignmentService, new NullWorkbenchAssignmentService()],
 			[ILanguageModelsService, new SyncDescriptor(LanguageModelsService)],
 			[ITextModelService, new SyncDescriptor(TextModelResolverService)],
+			[ILanguageModelToolsService, new SyncDescriptor(MockLanguageModelToolsService)],
 		);
 
 		instaService = store.add((store.add(workbenchInstantiationService(undefined, store))).createChild(serviceCollection));

From 77cec55e495ea7b9dceee6f589c781799e325d20 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Fri, 20 Dec 2024 08:53:35 +0100
Subject: [PATCH 424/479] Git - git installation welcome view should use
 remoteName context key (#236672)

---
 extensions/git/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/git/package.json b/extensions/git/package.json
index d63027619d1..53aa0fad747 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -3372,22 +3372,22 @@
       {
         "view": "scm",
         "contents": "%view.workbench.scm.missing%",
-        "when": "config.git.enabled && git.missing"
+        "when": "config.git.enabled && git.missing && remoteName != ''"
       },
       {
         "view": "scm",
         "contents": "%view.workbench.scm.missing.mac%",
-        "when": "config.git.enabled && git.missing && isMac"
+        "when": "config.git.enabled && git.missing && remoteName == '' && isMac"
       },
       {
         "view": "scm",
         "contents": "%view.workbench.scm.missing.windows%",
-        "when": "config.git.enabled && git.missing && isWindows"
+        "when": "config.git.enabled && git.missing && remoteName == '' && isWindows"
       },
       {
         "view": "scm",
         "contents": "%view.workbench.scm.missing.linux%",
-        "when": "config.git.enabled && git.missing && isLinux"
+        "when": "config.git.enabled && git.missing && remoteName == '' && isLinux"
       },
       {
         "view": "scm",

From da59ef74e2587e707944db56bcc0f84a9e6e3ff8 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Fri, 20 Dec 2024 09:11:12 +0100
Subject: [PATCH 425/479] workbench.action.focus*GroupWithoutWrap commands fail
 to focus *-most group when sibebar/panel is focused (fix #236648) (#236673)

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

diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts
index 1bbe6258eb0..20c084c9603 100644
--- a/src/vs/workbench/browser/parts/editor/editorCommands.ts
+++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts
@@ -312,6 +312,7 @@ function registerActiveEditorMoveCopyCommand(): void {
 			} else if (sourceGroup.id !== targetGroup.id) {
 				sourceGroup.copyEditors(editors.map(editor => ({ editor })), targetGroup);
 			}
+
 			targetGroup.focus();
 		}
 	}
@@ -972,8 +973,8 @@ function registerFocusEditorGroupWihoutWrapCommands(): void {
 		CommandsRegistry.registerCommand(command.id, async (accessor: ServicesAccessor) => {
 			const editorGroupsService = accessor.get(IEditorGroupsService);
 
-			const group = editorGroupsService.findGroup({ direction: command.direction }, editorGroupsService.activeGroup, false);
-			group?.focus();
+			const group = editorGroupsService.findGroup({ direction: command.direction }, editorGroupsService.activeGroup, false) ?? editorGroupsService.activeGroup;
+			group.focus();
 		});
 	}
 }

From b9084edd1cf2414e21de4f9e5b5acae240a22218 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Fri, 20 Dec 2024 10:08:22 +0100
Subject: [PATCH 426/479] Git - file system provider should throw
 `FileNotFound` if the resource does not exist in git instead of returning an
 empty file (#236676)

---
 extensions/git/src/fileSystemProvider.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extensions/git/src/fileSystemProvider.ts b/extensions/git/src/fileSystemProvider.ts
index af80924ae13..24ae4e6df9a 100644
--- a/extensions/git/src/fileSystemProvider.ts
+++ b/extensions/git/src/fileSystemProvider.ts
@@ -192,7 +192,8 @@ export class GitFileSystemProvider implements FileSystemProvider {
 		try {
 			return await repository.buffer(sanitizeRef(ref, path, repository), path);
 		} catch (err) {
-			return new Uint8Array(0);
+			// File does not exist in git (ex: git ignored)
+			throw FileSystemError.FileNotFound();
 		}
 	}
 

From 91ced52bc8547ce1c21138ee4a6a5061cf995c92 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Fri, 20 Dec 2024 11:01:48 +0100
Subject: [PATCH 427/479] Add the possibility to define context keys on
 CodeEditorWidgets

---
 .../browser/widget/codeEditor/codeEditorWidget.ts     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts
index ed20f95580a..3bd2f0a903e 100644
--- a/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts
+++ b/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts
@@ -290,6 +290,11 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 		}));
 
 		this._contextKeyService = this._register(contextKeyService.createScoped(this._domElement));
+		if (codeEditorWidgetOptions.contextKeyValues) {
+			for (const [key, value] of Object.entries(codeEditorWidgetOptions.contextKeyValues)) {
+				this._contextKeyService.createKey(key, value);
+			}
+		}
 		this._notificationService = notificationService;
 		this._codeEditorService = codeEditorService;
 		this._commandService = commandService;
@@ -1988,6 +1993,12 @@ export interface ICodeEditorWidgetOptions {
 	 * Defaults to MenuId.SimpleEditorContext or MenuId.EditorContext depending on whether the widget is simple.
 	 */
 	contextMenuId?: MenuId;
+
+	/**
+	 * Define extra context keys that will be defined in the context service
+	 * for the editor.
+	 */
+	contextKeyValues?: Record<string, ContextKeyValue>;
 }
 
 class ModelData {

From 7d4b23f21adb12d47f582388ce96f9e447908f77 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Fri, 20 Dec 2024 11:02:35 +0100
Subject: [PATCH 428/479] Move `getOuterEditor` near the
 EmbeddedCodeEditorWidget

---
 .../widget/codeEditor/embeddedCodeEditorWidget.ts     | 10 +++++++++-
 .../gotoSymbol/browser/peek/referencesController.ts   |  3 ++-
 src/vs/editor/contrib/peekView/browser/peekView.ts    | 11 +----------
 .../workbench/contrib/scm/browser/quickDiffWidget.ts  |  3 ++-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget.ts
index b716aa61109..3852374d394 100644
--- a/src/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget.ts
+++ b/src/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget.ts
@@ -13,7 +13,7 @@ import { ILanguageFeaturesService } from '../../../common/services/languageFeatu
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 
@@ -61,3 +61,11 @@ export class EmbeddedCodeEditorWidget extends CodeEditorWidget {
 		super.updateOptions(this._overwriteOptions);
 	}
 }
+
+export function getOuterEditor(accessor: ServicesAccessor): ICodeEditor | null {
+	const editor = accessor.get(ICodeEditorService).getFocusedCodeEditor();
+	if (editor instanceof EmbeddedCodeEditorWidget) {
+		return editor.getParentEditor();
+	}
+	return editor;
+}
diff --git a/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.ts b/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.ts
index 175e4c8b49c..48ba268a699 100644
--- a/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.ts
+++ b/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.ts
@@ -14,7 +14,8 @@ import { Position } from '../../../../common/core/position.js';
 import { Range } from '../../../../common/core/range.js';
 import { IEditorContribution } from '../../../../common/editorCommon.js';
 import { Location } from '../../../../common/languages.js';
-import { getOuterEditor, PeekContext } from '../../../peekView/browser/peekView.js';
+import { PeekContext } from '../../../peekView/browser/peekView.js';
+import { getOuterEditor } from '../../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import * as nls from '../../../../../nls.js';
 import { CommandsRegistry } from '../../../../../platform/commands/common/commands.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
diff --git a/src/vs/editor/contrib/peekView/browser/peekView.ts b/src/vs/editor/contrib/peekView/browser/peekView.ts
index 17084e7ae64..c774617241f 100644
--- a/src/vs/editor/contrib/peekView/browser/peekView.ts
+++ b/src/vs/editor/contrib/peekView/browser/peekView.ts
@@ -16,7 +16,6 @@ import * as objects from '../../../../base/common/objects.js';
 import './media/peekViewWidget.css';
 import { ICodeEditor } from '../../../browser/editorBrowser.js';
 import { EditorContributionInstantiation, registerEditorContribution } from '../../../browser/editorExtensions.js';
-import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
 import { EmbeddedCodeEditorWidget } from '../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
 import { IEditorContribution } from '../../../common/editorCommon.js';
@@ -25,7 +24,7 @@ import * as nls from '../../../../nls.js';
 import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
-import { createDecorator, IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { activeContrastBorder, contrastBorder, editorForeground, editorInfoForeground, registerColor } from '../../../../platform/theme/common/colorRegistry.js';
 
 export const IPeekViewService = createDecorator<IPeekViewService>('IPeekViewService');
@@ -79,14 +78,6 @@ class PeekContextController implements IEditorContribution {
 
 registerEditorContribution(PeekContextController.ID, PeekContextController, EditorContributionInstantiation.Eager); // eager because it needs to define a context key
 
-export function getOuterEditor(accessor: ServicesAccessor): ICodeEditor | null {
-	const editor = accessor.get(ICodeEditorService).getFocusedCodeEditor();
-	if (editor instanceof EmbeddedCodeEditorWidget) {
-		return editor.getParentEditor();
-	}
-	return editor;
-}
-
 export interface IPeekViewStyles extends IStyles {
 	headerBackgroundColor?: Color;
 	primaryHeadingColor?: Color;
diff --git a/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts b/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts
index 8ac67f6cd53..37ed63fb396 100644
--- a/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts
+++ b/src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts
@@ -13,7 +13,7 @@ import { ISelectOptionItem } from '../../../../base/browser/ui/selectBox/selectB
 import { SelectActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { defaultSelectBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { IColorTheme, IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { getOuterEditor, peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground, PeekViewWidget } from '../../../../editor/contrib/peekView/browser/peekView.js';
+import { peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground, PeekViewWidget } from '../../../../editor/contrib/peekView/browser/peekView.js';
 import { editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
 import { IMenu, IMenuService, MenuId, MenuItemAction, MenuRegistry } from '../../../../platform/actions/common/actions.js';
 import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from '../../../../editor/browser/editorBrowser.js';
@@ -48,6 +48,7 @@ import { gotoNextLocation, gotoPreviousLocation } from '../../../../platform/the
 import { Codicon } from '../../../../base/common/codicons.js';
 import { Color } from '../../../../base/common/color.js';
 import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { getOuterEditor } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 
 export const isQuickDiffVisible = new RawContextKey<boolean>('dirtyDiffVisible', false);
 

From 9cb7a27bd0bdecd16003711015d0a5172d5a8804 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Fri, 20 Dec 2024 11:14:30 +0100
Subject: [PATCH 429/479] Make Tab and Escape work when focus is in the preview

---
 .../browser/controller/commands.ts            | 28 +++++++++++++++----
 .../controller/inlineCompletionContextKeys.ts |  3 ++
 .../controller/inlineCompletionsController.ts | 14 +++++++++-
 .../view/inlineEdits/sideBySideDiff.ts        |  9 ++++--
 4 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts
index f183f9f896f..2fe48fc4eb9 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.ts
@@ -11,7 +11,8 @@ import { Action2, MenuId } from '../../../../../platform/actions/common/actions.
 import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
-import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { INotificationService, Severity } from '../../../../../platform/notification/common/notification.js';
 import { ICodeEditor } from '../../../../browser/editorBrowser.js';
 import { EditorAction, EditorCommand, ServicesAccessor } from '../../../../browser/editorExtensions.js';
 import { EditorContextKeys } from '../../../../common/editorContextKeys.js';
@@ -19,7 +20,6 @@ import { Context as SuggestContext } from '../../../suggest/browser/suggest.js';
 import { inlineSuggestCommitId, showNextInlineSuggestionActionId, showPreviousInlineSuggestionActionId } from './commandIds.js';
 import { InlineCompletionContextKeys } from './inlineCompletionContextKeys.js';
 import { InlineCompletionsController } from './inlineCompletionsController.js';
-import { INotificationService, Severity } from '../../../../../platform/notification/common/notification.js';
 
 export class ShowNextInlineSuggestionAction extends EditorAction {
 	public static ID = showNextInlineSuggestionActionId;
@@ -211,14 +211,21 @@ export class AcceptInlineCompletion extends EditorAction {
 		});
 	}
 
-	public async run(accessor: ServicesAccessor | undefined, editor: ICodeEditor): Promise<void> {
-		const controller = InlineCompletionsController.get(editor);
+	public async run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void> {
+		const controller = InlineCompletionsController.getInFocusedEditorOrParent(accessor);
 		if (controller) {
 			controller.model.get()?.accept(controller.editor);
 			controller.editor.focus();
 		}
 	}
 }
+KeybindingsRegistry.registerKeybindingRule({
+	id: inlineSuggestCommitId,
+	weight: 202, // greater than jump
+	primary: KeyCode.Tab,
+	when: ContextKeyExpr.and(InlineCompletionContextKeys.inInlineEditsPreviewEditor)
+});
+
 
 export class JumpToNextInlineEdit extends EditorAction {
 	constructor() {
@@ -276,14 +283,23 @@ export class HideInlineCompletion extends EditorAction {
 		});
 	}
 
-	public async run(accessor: ServicesAccessor | undefined, editor: ICodeEditor): Promise<void> {
-		const controller = InlineCompletionsController.get(editor);
+	public async run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void> {
+		const controller = InlineCompletionsController.getInFocusedEditorOrParent(accessor);
 		transaction(tx => {
 			controller?.model.get()?.stop('explicitCancel', tx);
 		});
+		controller?.editor.focus();
 	}
 }
 
+KeybindingsRegistry.registerKeybindingRule({
+	id: HideInlineCompletion.ID,
+	weight: -1, // very weak
+	primary: KeyCode.Escape,
+	secondary: [KeyMod.Shift | KeyCode.Escape],
+	when: ContextKeyExpr.and(InlineCompletionContextKeys.inInlineEditsPreviewEditor)
+});
+
 export class ToggleAlwaysShowInlineSuggestionToolbar extends Action2 {
 	public static ID = 'editor.action.inlineSuggest.toggleAlwaysShowToolbar';
 
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.ts
index 7fbd4dc19fc..834adac93ca 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.ts
@@ -5,6 +5,7 @@
 
 import { RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
 import { localize } from '../../../../../nls.js';
+import * as nls from '../../../../../nls.js';
 
 export abstract class InlineCompletionContextKeys {
 
@@ -19,4 +20,6 @@ export abstract class InlineCompletionContextKeys {
 	public static readonly inlineEditVisible = new RawContextKey<boolean>('inlineEditIsVisible', false, localize('inlineEditVisible', "Whether an inline edit is visible"));
 	public static readonly tabShouldJumpToInlineEdit = new RawContextKey<boolean | undefined>('tabShouldJumpToInlineEdit', false, localize('tabShouldJumpToInlineEdit', "Whether tab should jump to an inline edit."));
 	public static readonly tabShouldAcceptInlineEdit = new RawContextKey<boolean | undefined>('tabShouldAcceptInlineEdit', false, localize('tabShouldAcceptInlineEdit', "Whether tab should accept the inline edit."));
+
+	public static readonly inInlineEditsPreviewEditor = new RawContextKey<boolean>('inInlineEditsPreviewEditor', true, nls.localize('inInlineEditsPreviewEditor', "Whether the current code editor is showing an inline edits preview"));
 }
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
index 79fdfb85afd..b2b4b8ca6c6 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.ts
@@ -16,7 +16,7 @@ import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../..
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
 import { hotClassGetOriginalInstance } from '../../../../../platform/observable/common/wrapInHotClass.js';
 import { CoreEditingCommands } from '../../../../browser/coreCommands.js';
@@ -36,6 +36,7 @@ import { ObservableContextKeyService } from '../utils.js';
 import { inlineSuggestCommitId } from './commandIds.js';
 import { InlineCompletionContextKeys } from './inlineCompletionContextKeys.js';
 import { InlineCompletionsView } from '../view/inlineCompletionsView.js';
+import { getOuterEditor } from '../../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 
 export class InlineCompletionsController extends Disposable {
 	private static readonly _instances = new Set<InlineCompletionsController>();
@@ -43,6 +44,17 @@ export class InlineCompletionsController extends Disposable {
 	public static hot = createHotClass(InlineCompletionsController);
 	public static ID = 'editor.contrib.inlineCompletionsController';
 
+	/**
+	 * Find the controller in the focused editor or in the outer editor (if applicable)
+	 */
+	public static getInFocusedEditorOrParent(accessor: ServicesAccessor): InlineCompletionsController | null {
+		const outerEditor = getOuterEditor(accessor);
+		if (!outerEditor) {
+			return null;
+		}
+		return InlineCompletionsController.get(outerEditor);
+	}
+
 	public static get(editor: ICodeEditor): InlineCompletionsController | null {
 		return hotClassGetOriginalInstance(editor.getContribution<InlineCompletionsController>(InlineCompletionsController.ID));
 	}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
index b34dc44ac1d..042dc653cf9 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
@@ -28,11 +28,11 @@ import { Range } from '../../../../../common/core/range.js';
 import { Command } from '../../../../../common/languages.js';
 import { ITextModel } from '../../../../../common/model.js';
 import { StickyScrollController } from '../../../../stickyScroll/browser/stickyScrollController.js';
+import { InlineCompletionContextKeys } from '../../controller/inlineCompletionContextKeys.js';
 import { CustomizedMenuWorkbenchToolBar } from '../../hintsWidget/inlineCompletionsHintsWidget.js';
 import { PathBuilder, StatusBarViewItem, getOffsetForPos, mapOutFalsy, maxContentWidthInRange, n } from './utils.js';
 import { InlineEditWithChanges } from './viewAndDiffProducer.js';
 
-
 export const originalBackgroundColor = registerColor(
 	'inlineEdit.originalBackground',
 	Color.transparent,
@@ -271,7 +271,12 @@ export class InlineEditsSideBySideDiff extends Disposable {
 			wordWrapOverride1: 'off',
 			wordWrapOverride2: 'off',
 		},
-		{ contributions: [], },
+		{
+			contextKeyValues: {
+				[InlineCompletionContextKeys.inInlineEditsPreviewEditor.key]: true,
+			},
+			contributions: [],
+		},
 		this._editor
 	));
 

From 1730c76f6b3f2d6ab5819031cded0a6e24d54b6e Mon Sep 17 00:00:00 2001
From: zWing <371657110@qq.com>
Date: Fri, 20 Dec 2024 18:29:31 +0800
Subject: [PATCH 430/479] fix(git-ext): fix limitWarning block the git status
 progress (#226577)

---
 extensions/git/src/repository.ts | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 0c4b50cd5e5..9e6e0196abe 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -2359,24 +2359,26 @@ export class Repository implements Disposable {
 				const yes = { title: l10n.t('Yes') };
 				const no = { title: l10n.t('No') };
 
-				const result = await window.showWarningMessage(`${gitWarn} ${addKnown}`, yes, no, neverAgain);
-				if (result === yes) {
-					this.ignore([Uri.file(folderPath)]);
-				} else {
+				window.showWarningMessage(`${gitWarn} ${addKnown}`, yes, no, neverAgain).then(result => {
+					if (result === yes) {
+						this.ignore([Uri.file(folderPath)]);
+					} else {
+						if (result === neverAgain) {
+							config.update('ignoreLimitWarning', true, false);
+						}
+
+						this.didWarnAboutLimit = true;
+					}
+				});
+			} else {
+				const ok = { title: l10n.t('OK') };
+				window.showWarningMessage(gitWarn, ok, neverAgain).then(result => {
 					if (result === neverAgain) {
 						config.update('ignoreLimitWarning', true, false);
 					}
 
 					this.didWarnAboutLimit = true;
-				}
-			} else {
-				const ok = { title: l10n.t('OK') };
-				const result = await window.showWarningMessage(gitWarn, ok, neverAgain);
-				if (result === neverAgain) {
-					config.update('ignoreLimitWarning', true, false);
-				}
-
-				this.didWarnAboutLimit = true;
+				});
 			}
 		}
 

From c1cff695d70848d892cc09908996e7f7a790e374 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Fri, 20 Dec 2024 11:40:15 +0100
Subject: [PATCH 431/479] Consistent layout actions for
 views/containers/activitybar (#236686)

consistent layout actions
---
 .../browser/actions/layoutActions.ts          | 44 +++----------------
 .../parts/activitybar/activitybarPart.ts      | 25 ++++++-----
 .../parts/auxiliarybar/auxiliaryBarActions.ts |  4 +-
 .../browser/parts/paneCompositeBar.ts         |  2 +-
 .../browser/parts/panel/panelActions.ts       | 13 +-----
 .../views/browser/viewDescriptorService.ts    |  8 +---
 6 files changed, 25 insertions(+), 71 deletions(-)

diff --git a/src/vs/workbench/browser/actions/layoutActions.ts b/src/vs/workbench/browser/actions/layoutActions.ts
index 75253e235de..aed2fe31f74 100644
--- a/src/vs/workbench/browser/actions/layoutActions.ts
+++ b/src/vs/workbench/browser/actions/layoutActions.ts
@@ -181,17 +181,6 @@ MenuRegistry.appendMenuItems([{
 		when: ContextKeyExpr.and(ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right'), ContextKeyExpr.equals('viewContainerLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar))),
 		order: 1
 	}
-}, {
-	id: MenuId.ViewTitleContext,
-	item: {
-		group: '3_workbench_layout_move',
-		command: {
-			id: ToggleSidebarPositionAction.ID,
-			title: localize('move sidebar right', "Move Primary Side Bar Right")
-		},
-		when: ContextKeyExpr.and(ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right'), ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar))),
-		order: 1
-	}
 }, {
 	id: MenuId.ViewContainerTitleContext,
 	item: {
@@ -204,36 +193,25 @@ MenuRegistry.appendMenuItems([{
 		order: 1
 	}
 }, {
-	id: MenuId.ViewTitleContext,
-	item: {
-		group: '3_workbench_layout_move',
-		command: {
-			id: ToggleSidebarPositionAction.ID,
-			title: localize('move sidebar left', "Move Primary Side Bar Left")
-		},
-		when: ContextKeyExpr.and(ContextKeyExpr.equals('config.workbench.sideBar.location', 'right'), ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar))),
-		order: 1
-	}
-}, {
-	id: MenuId.ViewTitleContext,
+	id: MenuId.ViewContainerTitleContext,
 	item: {
 		group: '3_workbench_layout_move',
 		command: {
 			id: ToggleSidebarPositionAction.ID,
 			title: localize('move second sidebar left', "Move Secondary Side Bar Left")
 		},
-		when: ContextKeyExpr.and(ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right'), ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.AuxiliaryBar))),
+		when: ContextKeyExpr.and(ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right'), ContextKeyExpr.equals('viewContainerLocation', ViewContainerLocationToString(ViewContainerLocation.AuxiliaryBar))),
 		order: 1
 	}
 }, {
-	id: MenuId.ViewTitleContext,
+	id: MenuId.ViewContainerTitleContext,
 	item: {
 		group: '3_workbench_layout_move',
 		command: {
 			id: ToggleSidebarPositionAction.ID,
 			title: localize('move second sidebar right', "Move Secondary Side Bar Right")
 		},
-		when: ContextKeyExpr.and(ContextKeyExpr.equals('config.workbench.sideBar.location', 'right'), ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.AuxiliaryBar))),
+		when: ContextKeyExpr.and(ContextKeyExpr.equals('config.workbench.sideBar.location', 'right'), ContextKeyExpr.equals('viewContainerLocation', ViewContainerLocationToString(ViewContainerLocation.AuxiliaryBar))),
 		order: 1
 	}
 }]);
@@ -291,9 +269,10 @@ MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
 
 // Toggle Sidebar Visibility
 
-class ToggleSidebarVisibilityAction extends Action2 {
+export class ToggleSidebarVisibilityAction extends Action2 {
 
 	static readonly ID = 'workbench.action.toggleSidebarVisibility';
+	static readonly LABEL = localize('compositePart.hideSideBarLabel', "Hide Primary Side Bar");
 
 	constructor() {
 		super({
@@ -349,17 +328,6 @@ MenuRegistry.appendMenuItems([
 			when: ContextKeyExpr.and(SideBarVisibleContext, ContextKeyExpr.equals('viewContainerLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar))),
 			order: 2
 		}
-	}, {
-		id: MenuId.ViewTitleContext,
-		item: {
-			group: '3_workbench_layout_move',
-			command: {
-				id: ToggleSidebarVisibilityAction.ID,
-				title: localize('compositePart.hideSideBarLabel', "Hide Primary Side Bar"),
-			},
-			when: ContextKeyExpr.and(SideBarVisibleContext, ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar))),
-			order: 2
-		}
 	}, {
 		id: MenuId.LayoutControlMenu,
 		item: {
diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
index 0935255446a..f2af5fb3a2f 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
@@ -11,7 +11,7 @@ import { Part } from '../../part.js';
 import { ActivityBarPosition, IWorkbenchLayoutService, LayoutSettings, Parts, Position } from '../../../services/layout/browser/layoutService.js';
 import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
-import { ToggleSidebarPositionAction } from '../../actions/layoutActions.js';
+import { ToggleSidebarPositionAction, ToggleSidebarVisibilityAction } from '../../actions/layoutActions.js';
 import { IThemeService, IColorTheme, registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
 import { ACTIVITY_BAR_BACKGROUND, ACTIVITY_BAR_BORDER, ACTIVITY_BAR_FOREGROUND, ACTIVITY_BAR_ACTIVE_BORDER, ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_INACTIVE_FOREGROUND, ACTIVITY_BAR_ACTIVE_BACKGROUND, ACTIVITY_BAR_DRAG_AND_DROP_BORDER, ACTIVITY_BAR_ACTIVE_FOCUS_BORDER } from '../../../common/theme.js';
 import { activeContrastBorder, contrastBorder, focusBorder } from '../../../../platform/theme/common/colorRegistry.js';
@@ -371,10 +371,16 @@ export class ActivityBarCompositeBar extends PaneCompositeBar {
 	getActivityBarContextMenuActions(): IAction[] {
 		const activityBarPositionMenu = this.menuService.getMenuActions(MenuId.ActivityBarPositionMenu, this.contextKeyService, { shouldForwardArgs: true, renderShortTitle: true });
 		const positionActions = getContextMenuActions(activityBarPositionMenu).secondary;
-		return [
+		const actions = [
 			new SubmenuAction('workbench.action.panel.position', localize('activity bar position', "Activity Bar Position"), positionActions),
-			toAction({ id: ToggleSidebarPositionAction.ID, label: ToggleSidebarPositionAction.getLabel(this.layoutService), run: () => this.instantiationService.invokeFunction(accessor => new ToggleSidebarPositionAction().run(accessor)) })
+			toAction({ id: ToggleSidebarPositionAction.ID, label: ToggleSidebarPositionAction.getLabel(this.layoutService), run: () => this.instantiationService.invokeFunction(accessor => new ToggleSidebarPositionAction().run(accessor)) }),
 		];
+
+		if (this.part === Parts.SIDEBAR_PART) {
+			actions.push(toAction({ id: ToggleSidebarVisibilityAction.ID, label: ToggleSidebarVisibilityAction.LABEL, run: () => this.instantiationService.invokeFunction(accessor => new ToggleSidebarVisibilityAction().run(accessor)) }));
+		}
+
+		return actions;
 	}
 
 }
@@ -493,15 +499,10 @@ MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
 MenuRegistry.appendMenuItem(MenuId.ViewContainerTitleContext, {
 	submenu: MenuId.ActivityBarPositionMenu,
 	title: localize('positionActivituBar', "Activity Bar Position"),
-	when: ContextKeyExpr.equals('viewContainerLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar)),
-	group: '3_workbench_layout_move',
-	order: 1
-});
-
-MenuRegistry.appendMenuItem(MenuId.ViewTitleContext, {
-	submenu: MenuId.ActivityBarPositionMenu,
-	title: localize('positionActivituBar', "Activity Bar Position"),
-	when: ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar)),
+	when: ContextKeyExpr.or(
+		ContextKeyExpr.equals('viewContainerLocation', ViewContainerLocationToString(ViewContainerLocation.Sidebar)),
+		ContextKeyExpr.equals('viewContainerLocation', ViewContainerLocationToString(ViewContainerLocation.AuxiliaryBar))
+	),
 	group: '3_workbench_layout_move',
 	order: 1
 });
diff --git a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts
index e564a8d49d7..e5cc8c36550 100644
--- a/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts
+++ b/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts
@@ -149,14 +149,14 @@ MenuRegistry.appendMenuItems([
 			order: 2
 		}
 	}, {
-		id: MenuId.ViewTitleContext,
+		id: MenuId.ViewContainerTitleContext,
 		item: {
 			group: '3_workbench_layout_move',
 			command: {
 				id: ToggleAuxiliaryBarAction.ID,
 				title: localize2('hideAuxiliaryBar', 'Hide Secondary Side Bar'),
 			},
-			when: ContextKeyExpr.and(AuxiliaryBarVisibleContext, ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.AuxiliaryBar))),
+			when: ContextKeyExpr.and(AuxiliaryBarVisibleContext, ContextKeyExpr.equals('viewContainerLocation', ViewContainerLocationToString(ViewContainerLocation.AuxiliaryBar))),
 			order: 2
 		}
 	}
diff --git a/src/vs/workbench/browser/parts/paneCompositeBar.ts b/src/vs/workbench/browser/parts/paneCompositeBar.ts
index 05b43a296e1..89d07a87bc0 100644
--- a/src/vs/workbench/browser/parts/paneCompositeBar.ts
+++ b/src/vs/workbench/browser/parts/paneCompositeBar.ts
@@ -99,7 +99,7 @@ export class PaneCompositeBar extends Disposable {
 
 	constructor(
 		protected readonly options: IPaneCompositeBarOptions,
-		private readonly part: Parts,
+		protected readonly part: Parts,
 		private readonly paneCompositePart: IPaneCompositePart,
 		@IInstantiationService protected readonly instantiationService: IInstantiationService,
 		@IStorageService private readonly storageService: IStorageService,
diff --git a/src/vs/workbench/browser/parts/panel/panelActions.ts b/src/vs/workbench/browser/parts/panel/panelActions.ts
index b3be54f49d7..6e43176a62e 100644
--- a/src/vs/workbench/browser/parts/panel/panelActions.ts
+++ b/src/vs/workbench/browser/parts/panel/panelActions.ts
@@ -14,7 +14,7 @@ import { ContextKeyExpr, ContextKeyExpression } from '../../../../platform/conte
 import { Codicon } from '../../../../base/common/codicons.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
-import { ViewContainerLocationToString, ViewContainerLocation, IViewDescriptorService } from '../../../common/views.js';
+import { ViewContainerLocation, IViewDescriptorService } from '../../../common/views.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { IPaneCompositePartService } from '../../../services/panecomposite/browser/panecomposite.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
@@ -326,17 +326,6 @@ MenuRegistry.appendMenuItems([
 			when: ContextKeyExpr.or(ContextKeyExpr.equals('config.workbench.layoutControl.type', 'toggles'), ContextKeyExpr.equals('config.workbench.layoutControl.type', 'both')),
 			order: 1
 		}
-	}, {
-		id: MenuId.ViewTitleContext,
-		item: {
-			group: '3_workbench_layout_move',
-			command: {
-				id: TogglePanelAction.ID,
-				title: localize2('hidePanel', 'Hide Panel'),
-			},
-			when: ContextKeyExpr.and(PanelVisibleContext, ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.Panel))),
-			order: 2
-		}
 	}
 ]);
 
diff --git a/src/vs/workbench/services/views/browser/viewDescriptorService.ts b/src/vs/workbench/services/views/browser/viewDescriptorService.ts
index ad59c3e2a2a..c667e719ae4 100644
--- a/src/vs/workbench/services/views/browser/viewDescriptorService.ts
+++ b/src/vs/workbench/services/views/browser/viewDescriptorService.ts
@@ -792,16 +792,12 @@ export class ViewDescriptorService extends Disposable implements IViewDescriptor
 								order: index,
 							}, {
 								id: MenuId.ViewContainerTitleContext,
-								when: ContextKeyExpr.and(
-									ContextKeyExpr.equals('viewContainer', viewContainerModel.viewContainer.id),
-								),
+								when: ContextKeyExpr.equals('viewContainer', viewContainerModel.viewContainer.id),
 								order: index,
 								group: '1_toggleVisibility'
 							}, {
 								id: MenuId.ViewTitleContext,
-								when: ContextKeyExpr.and(
-									ContextKeyExpr.or(...viewContainerModel.visibleViewDescriptors.map(v => ContextKeyExpr.equals('view', v.id)))
-								),
+								when: ContextKeyExpr.or(...viewContainerModel.visibleViewDescriptors.map(v => ContextKeyExpr.equals('view', v.id))),
 								order: index,
 								group: '2_toggleVisibility'
 							}]

From d239347a1c75707cfa7d9b4d9bfe5b7f28277c37 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Fri, 20 Dec 2024 12:05:21 +0100
Subject: [PATCH 432/479] Add a context key for whether commenting is enabled
 (#236679)

---
 .../workbench/contrib/comments/browser/commentService.ts  | 3 +++
 .../contrib/comments/common/commentContextKeys.ts         | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/src/vs/workbench/contrib/comments/browser/commentService.ts b/src/vs/workbench/contrib/comments/browser/commentService.ts
index ca5a8aa59d9..b7d1cde9aea 100644
--- a/src/vs/workbench/contrib/comments/browser/commentService.ts
+++ b/src/vs/workbench/contrib/comments/browser/commentService.ts
@@ -167,6 +167,7 @@ export class CommentService extends Disposable implements ICommentService {
 	private _commentMenus = new Map<string, CommentMenus>();
 	private _isCommentingEnabled: boolean = true;
 	private _workspaceHasCommenting: IContextKey<boolean>;
+	private _commentingEnabled: IContextKey<boolean>;
 
 	private _continueOnComments = new Map<string, PendingCommentThread[]>(); // uniqueOwner -> PendingCommentThread[]
 	private _continueOnCommentProviders = new Set<IContinueOnCommentProvider>();
@@ -190,6 +191,7 @@ export class CommentService extends Disposable implements ICommentService {
 		this._handleConfiguration();
 		this._handleZenMode();
 		this._workspaceHasCommenting = CommentContextKeys.WorkspaceHasCommenting.bindTo(contextKeyService);
+		this._commentingEnabled = CommentContextKeys.commentingEnabled.bindTo(contextKeyService);
 		const storageListener = this._register(new DisposableStore());
 
 		const storageEvent = Event.debounce(this.storageService.onDidChangeValue(StorageScope.WORKSPACE, CONTINUE_ON_COMMENTS, storageListener), (last, event) => last?.external ? last : event, 500);
@@ -277,6 +279,7 @@ export class CommentService extends Disposable implements ICommentService {
 	enableCommenting(enable: boolean): void {
 		if (enable !== this._isCommentingEnabled) {
 			this._isCommentingEnabled = enable;
+			this._commentingEnabled.set(enable);
 			this._onDidChangeCommentingEnabled.fire(enable);
 		}
 	}
diff --git a/src/vs/workbench/contrib/comments/common/commentContextKeys.ts b/src/vs/workbench/contrib/comments/common/commentContextKeys.ts
index 210465efe6f..2a5d0776c45 100644
--- a/src/vs/workbench/contrib/comments/common/commentContextKeys.ts
+++ b/src/vs/workbench/contrib/comments/common/commentContextKeys.ts
@@ -66,4 +66,12 @@ export namespace CommentContextKeys {
 	 * The comment widget is focused.
 	 */
 	export const commentFocused = new RawContextKey<boolean>('commentFocused', false, { type: 'boolean', description: nls.localize('commentFocused', "Set when the comment is focused") });
+
+	/**
+	 * A context key that is set when commenting is enabled.
+	 */
+	export const commentingEnabled = new RawContextKey<boolean>('commentingEnabled', true, {
+		description: nls.localize('commentingEnabled', "Whether commenting functionality is enabled"),
+		type: 'boolean'
+	});
 }

From 692fbdbd4d72edbd6bb2507f6a71d320f3a12647 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 20 Dec 2024 04:52:33 -0800
Subject: [PATCH 433/479] Set multi-line setting to a valid value when
 disabling

Fixes #231562
---
 .../terminalContrib/clipboard/browser/terminalClipboard.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/clipboard/browser/terminalClipboard.ts b/src/vs/workbench/contrib/terminalContrib/clipboard/browser/terminalClipboard.ts
index ae9dc0b6699..e8ba759f61f 100644
--- a/src/vs/workbench/contrib/terminalContrib/clipboard/browser/terminalClipboard.ts
+++ b/src/vs/workbench/contrib/terminalContrib/clipboard/browser/terminalClipboard.ts
@@ -95,7 +95,7 @@ export async function shouldPasteTerminalText(accessor: ServicesAccessor, text:
 	}
 
 	if (result.confirmed && checkboxChecked) {
-		await configurationService.updateValue(TerminalSettingId.EnableMultiLinePasteWarning, false);
+		await configurationService.updateValue(TerminalSettingId.EnableMultiLinePasteWarning, 'never');
 	}
 
 	if (result.singleLine) {

From 78cd9519c5c7b2b8ddb0a092e658d240db6bcbe0 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 20 Dec 2024 05:10:57 -0800
Subject: [PATCH 434/479] Close the terminal view when there's only one visible
 view

Part of #236517
---
 .../workbench/contrib/terminal/browser/terminalGroupService.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminal/browser/terminalGroupService.ts b/src/vs/workbench/contrib/terminal/browser/terminalGroupService.ts
index ff4c4103eba..6f5040cd4d7 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalGroupService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalGroupService.ts
@@ -83,7 +83,7 @@ export class TerminalGroupService extends Disposable implements ITerminalGroupSe
 	hidePanel(): void {
 		// Hide the panel if the terminal is in the panel and it has no sibling views
 		const panel = this._viewDescriptorService.getViewContainerByViewId(TERMINAL_VIEW_ID);
-		if (panel && this._viewDescriptorService.getViewContainerModel(panel).activeViewDescriptors.length === 1) {
+		if (panel && this._viewDescriptorService.getViewContainerModel(panel).visibleViewDescriptors.length === 1) {
 			this._viewsService.closeView(TERMINAL_VIEW_ID);
 			TerminalContextKeys.tabsMouse.bindTo(this._contextKeyService).set(false);
 		}

From 2dc420d6387896b49298a05288704ccf75220271 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 20 Dec 2024 05:31:07 -0800
Subject: [PATCH 435/479] Create terminal when toggled without contents

Fixes #236517
---
 .../contrib/terminal/browser/terminalView.ts    | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
index b71064b87f0..38e6d342942 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
@@ -57,6 +57,11 @@ export class TerminalViewPane extends ViewPane {
 	private _terminalTabbedView?: TerminalTabbedView;
 	get terminalTabbedView(): TerminalTabbedView | undefined { return this._terminalTabbedView; }
 	private _isInitialized: boolean = false;
+	/**
+	 * Tracks an active promise of terminal creation requested by this component. This helps prevent
+	 * double creation for example when toggling a terminal's visibility and focusing it.
+	 */
+	private _isTerminalBeingCreated: boolean = false;
 	private readonly _newDropdown: MutableDisposable<DropdownWithPrimaryActionViewItem> = this._register(new MutableDisposable());
 	private readonly _dropdownMenu: IMenu;
 	private readonly _singleTabMenu: IMenu;
@@ -164,7 +169,8 @@ export class TerminalViewPane extends ViewPane {
 			if (!wasInitialized) {
 				switch (hideOnStartup) {
 					case 'never':
-						this._terminalService.createTerminal({ location: TerminalLocation.Panel });
+						this._isTerminalBeingCreated = true;
+						this._terminalService.createTerminal({ location: TerminalLocation.Panel }).finally(() => this._isTerminalBeingCreated = false);
 						break;
 					case 'whenEmpty':
 						if (this._terminalService.restoredGroupCount === 0) {
@@ -175,7 +181,10 @@ export class TerminalViewPane extends ViewPane {
 				return;
 			}
 
-			this._terminalService.createTerminal({ location: TerminalLocation.Panel });
+			if (!this._isTerminalBeingCreated) {
+				this._isTerminalBeingCreated = true;
+				this._terminalService.createTerminal({ location: TerminalLocation.Panel }).finally(() => this._isTerminalBeingCreated = false);
+			}
 		}
 	}
 
@@ -320,6 +329,10 @@ export class TerminalViewPane extends ViewPane {
 	override focus() {
 		super.focus();
 		if (this._terminalService.connectionState === TerminalConnectionState.Connected) {
+			if (this._terminalGroupService.instances.length === 0 && !this._isTerminalBeingCreated) {
+				this._isTerminalBeingCreated = true;
+				this._terminalService.createTerminal({ location: TerminalLocation.Panel }).finally(() => this._isTerminalBeingCreated = false);
+			}
 			this._terminalGroupService.showPanel(true);
 			return;
 		}

From 8d0d731b7c53b7656e9a7014b14b797dd1796a1a Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Fri, 20 Dec 2024 14:31:20 +0100
Subject: [PATCH 436/479] SCM - add scm.historyProviderCount context key
 (#236694)

---
 .../contrib/scm/browser/scm.contribution.ts   | 12 ++-----
 .../contrib/scm/common/scmService.ts          | 34 +++++++++++++++----
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
index 0c2d7c1af5f..09ecabe67ee 100644
--- a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
+++ b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
@@ -38,8 +38,6 @@ import { IViewsService } from '../../../services/views/common/viewsService.js';
 import { IListService, WorkbenchList } from '../../../../platform/list/browser/listService.js';
 import { isSCMRepository } from './util.js';
 import { SCMHistoryViewPane } from './scmHistoryViewPane.js';
-import { IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
-import { RemoteNameContext } from '../../../common/contextkeys.js';
 import { QuickDiffModelService, IQuickDiffModelService } from './quickDiffModel.js';
 import { QuickDiffEditorController } from './quickDiffWidget.js';
 import { EditorContributionInstantiation, registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
@@ -137,14 +135,8 @@ viewsRegistry.registerViews([{
 	weight: 40,
 	order: 2,
 	when: ContextKeyExpr.and(
-		// Repository Count
-		ContextKeyExpr.and(
-			ContextKeyExpr.has('scm.providerCount'),
-			ContextKeyExpr.notEquals('scm.providerCount', 0)),
-		// Not Serverless
-		ContextKeyExpr.and(
-			IsWebContext,
-			RemoteNameContext.isEqualTo(''))?.negate()
+		ContextKeyExpr.has('scm.historyProviderCount'),
+		ContextKeyExpr.notEquals('scm.historyProviderCount', 0),
 	),
 	containerIcon: sourceControlViewIcon
 }], viewContainer);
diff --git a/src/vs/workbench/contrib/scm/common/scmService.ts b/src/vs/workbench/contrib/scm/common/scmService.ts
index c9af734400a..14c69f73b0d 100644
--- a/src/vs/workbench/contrib/scm/common/scmService.ts
+++ b/src/vs/workbench/contrib/scm/common/scmService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
 import { Event, Emitter } from '../../../../base/common/event.js';
 import { ISCMService, ISCMProvider, ISCMInput, ISCMRepository, IInputValidator, ISCMInputChangeEvent, SCMInputChangeReason, InputValidationType, IInputValidation } from './scm.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
@@ -17,6 +17,7 @@ import { Iterable } from '../../../../base/common/iterator.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
+import { runOnChange } from '../../../../base/common/observable.js';
 
 class SCMInput extends Disposable implements ISCMInput {
 
@@ -188,7 +189,7 @@ class SCMRepository implements ISCMRepository {
 	constructor(
 		public readonly id: string,
 		public readonly provider: ISCMProvider,
-		private disposable: IDisposable,
+		private readonly disposables: DisposableStore,
 		inputHistory: SCMInputHistory
 	) {
 		this.input = new SCMInput(this, inputHistory);
@@ -204,7 +205,7 @@ class SCMRepository implements ISCMRepository {
 	}
 
 	dispose(): void {
-		this.disposable.dispose();
+		this.disposables.dispose();
 		this.provider.dispose();
 	}
 }
@@ -355,6 +356,7 @@ export class SCMService implements ISCMService {
 
 	private inputHistory: SCMInputHistory;
 	private providerCount: IContextKey<number>;
+	private historyProviderCount: IContextKey<number>;
 
 	private readonly _onDidAddProvider = new Emitter<ISCMRepository>();
 	readonly onDidAddRepository: Event<ISCMRepository> = this._onDidAddProvider.event;
@@ -370,7 +372,9 @@ export class SCMService implements ISCMService {
 		@IUriIdentityService private readonly uriIdentityService: IUriIdentityService
 	) {
 		this.inputHistory = new SCMInputHistory(storageService, workspaceContextService);
+
 		this.providerCount = contextKeyService.createKey('scm.providerCount', 0);
+		this.historyProviderCount = contextKeyService.createKey('scm.historyProviderCount', 0);
 	}
 
 	registerSCMProvider(provider: ISCMProvider): ISCMRepository {
@@ -380,17 +384,33 @@ export class SCMService implements ISCMService {
 			throw new Error(`SCM Provider ${provider.id} already exists.`);
 		}
 
-		const disposable = toDisposable(() => {
+		const disposables = new DisposableStore();
+
+		const historyProviderCount = () => {
+			return Array.from(this._repositories.values())
+				.filter(r => !!r.provider.historyProvider).length;
+		};
+
+		disposables.add(toDisposable(() => {
 			this._repositories.delete(provider.id);
 			this._onDidRemoveProvider.fire(repository);
+
 			this.providerCount.set(this._repositories.size);
-		});
+			this.historyProviderCount.set(historyProviderCount());
+		}));
 
-		const repository = new SCMRepository(provider.id, provider, disposable, this.inputHistory);
+		const repository = new SCMRepository(provider.id, provider, disposables, this.inputHistory);
 		this._repositories.set(provider.id, repository);
-		this._onDidAddProvider.fire(repository);
+
+		disposables.add(runOnChange(provider.historyProvider, () => {
+			this.historyProviderCount.set(historyProviderCount());
+		}));
 
 		this.providerCount.set(this._repositories.size);
+		this.historyProviderCount.set(historyProviderCount());
+
+		this._onDidAddProvider.fire(repository);
+
 		return repository;
 	}
 

From f7fd6660f9f11e5a270fee834ca0382416ba9dfe Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 20 Dec 2024 05:35:12 -0800
Subject: [PATCH 437/479] Add hideOnLastClosed setting

Fixes #236517
---
 src/vs/platform/terminal/common/terminal.ts                  | 1 +
 src/vs/workbench/contrib/terminal/browser/terminalService.ts | 2 +-
 src/vs/workbench/contrib/terminal/common/terminal.ts         | 1 +
 .../contrib/terminal/common/terminalConfiguration.ts         | 5 +++++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/vs/platform/terminal/common/terminal.ts b/src/vs/platform/terminal/common/terminal.ts
index 8235e8a0ab4..246ccaf6a76 100644
--- a/src/vs/platform/terminal/common/terminal.ts
+++ b/src/vs/platform/terminal/common/terminal.ts
@@ -103,6 +103,7 @@ export const enum TerminalSettingId {
 	EnablePersistentSessions = 'terminal.integrated.enablePersistentSessions',
 	PersistentSessionReviveProcess = 'terminal.integrated.persistentSessionReviveProcess',
 	HideOnStartup = 'terminal.integrated.hideOnStartup',
+	HideOnLastClosed = 'terminal.integrated.hideOnLastClosed',
 	CustomGlyphs = 'terminal.integrated.customGlyphs',
 	RescaleOverlappingGlyphs = 'terminal.integrated.rescaleOverlappingGlyphs',
 	PersistentSessionScrollback = 'terminal.integrated.persistentSessionScrollback',
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalService.ts b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
index 698559d3b2c..7fea79a51a7 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalService.ts
@@ -208,7 +208,7 @@ export class TerminalService extends Disposable implements ITerminalService {
 		// down. When shutting down the panel is locked in place so that it is restored upon next
 		// launch.
 		this._register(this._terminalGroupService.onDidChangeActiveInstance(instance => {
-			if (!instance && !this._isShuttingDown) {
+			if (!instance && !this._isShuttingDown && this._terminalConfigService.config.hideOnLastClosed) {
 				this._terminalGroupService.hidePanel();
 			}
 			if (instance?.shellType) {
diff --git a/src/vs/workbench/contrib/terminal/common/terminal.ts b/src/vs/workbench/contrib/terminal/common/terminal.ts
index cf5c306bb70..6fbd41d8637 100644
--- a/src/vs/workbench/contrib/terminal/common/terminal.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminal.ts
@@ -211,6 +211,7 @@ export interface ITerminalConfiguration {
 	experimental?: {
 		windowsUseConptyDll?: boolean;
 	};
+	hideOnLastClosed: boolean;
 }
 
 export interface ITerminalFont {
diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
index b90a67cbbc6..6743ad25d3c 100644
--- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
+++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
@@ -549,6 +549,11 @@ const terminalConfiguration: IConfigurationNode = {
 			],
 			default: 'never'
 		},
+		[TerminalSettingId.HideOnLastClosed]: {
+			description: localize('terminal.integrated.hideOnLastClosed', "Whether to hide the terminal view when the last terminal is closed. This will only happen when the terminal is the only visible view in the view container."),
+			type: 'boolean',
+			default: true
+		},
 		[TerminalSettingId.CustomGlyphs]: {
 			markdownDescription: localize('terminal.integrated.customGlyphs', "Whether to draw custom glyphs for block element and box drawing characters instead of using the font, which typically yields better rendering with continuous lines. Note that this doesn't work when {0} is disabled.", `\`#${TerminalSettingId.GpuAcceleration}#\``),
 			type: 'boolean',

From 502a7e5d43b277bd4b8783f837a7cba65234e4f4 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Fri, 20 Dec 2024 15:16:06 +0100
Subject: [PATCH 438/479] SCM - do not show "Open in External Terminal" action
 when connected to a remote (#236697)

---
 .../contrib/scm/browser/scm.contribution.ts        | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
index 09ecabe67ee..7f8e9c71a09 100644
--- a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
+++ b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
@@ -41,6 +41,7 @@ import { SCMHistoryViewPane } from './scmHistoryViewPane.js';
 import { QuickDiffModelService, IQuickDiffModelService } from './quickDiffModel.js';
 import { QuickDiffEditorController } from './quickDiffWidget.js';
 import { EditorContributionInstantiation, registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
+import { RemoteNameContext } from '../../../common/contextkeys.js';
 
 ModesRegistry.registerLanguage({
 	id: 'scminput',
@@ -529,7 +530,12 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
 		id: 'scm.openInTerminal',
 		title: localize('open in external terminal', "Open in External Terminal")
 	},
-	when: ContextKeyExpr.and(ContextKeyExpr.equals('scmProviderHasRootUri', true), ContextKeyExpr.or(ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'external'), ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both')))
+	when: ContextKeyExpr.and(
+		RemoteNameContext.isEqualTo(''),
+		ContextKeyExpr.equals('scmProviderHasRootUri', true),
+		ContextKeyExpr.or(
+			ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'external'),
+			ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both')))
 });
 
 MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
@@ -538,7 +544,11 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
 		id: 'scm.openInIntegratedTerminal',
 		title: localize('open in integrated terminal', "Open in Integrated Terminal")
 	},
-	when: ContextKeyExpr.and(ContextKeyExpr.equals('scmProviderHasRootUri', true), ContextKeyExpr.or(ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'integrated'), ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both')))
+	when: ContextKeyExpr.and(
+		ContextKeyExpr.equals('scmProviderHasRootUri', true),
+		ContextKeyExpr.or(
+			ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'integrated'),
+			ContextKeyExpr.equals('config.terminal.sourceControlRepositoriesKind', 'both')))
 });
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({

From d8c2678e9a4153f56a4160481b1c983558637b6a Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Fri, 20 Dec 2024 15:25:40 +0100
Subject: [PATCH 439/479] Add share context menu action (#236699)

share context menu action
---
 src/vs/workbench/browser/parts/titlebar/titlebarActions.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts b/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts
index f84bf3f06b7..e4b8a3e6b9d 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts
@@ -64,6 +64,12 @@ registerAction2(class ToggleNavigationControl extends ToggleTitleBarConfigAction
 	}
 });
 
+registerAction2(class ToggleShareControl extends ToggleTitleBarConfigAction {
+	constructor() {
+		super('workbench.experimental.share.enabled', localize('toggle.share', 'Share'), localize('toggle.shareDescription', "Toggle visibility of the Share action in title bar"), 2, false, ContextKeyExpr.has('config.window.commandCenter'));
+	}
+});
+
 registerAction2(class ToggleLayoutControl extends ToggleTitleBarConfigAction {
 	constructor() {
 		super(LayoutSettings.LAYOUT_ACTIONS, localize('toggle.layout', 'Layout Controls'), localize('toggle.layoutDescription', "Toggle visibility of the Layout Controls in title bar"), 3, true);

From b8b4db329e93816f34611d1a653057c323485463 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Fri, 20 Dec 2024 16:51:58 +0100
Subject: [PATCH 440/479] Git - cleanup `vscode-merge-base` git config key when
 deleteing a branch (#236716)

---
 extensions/git/src/git.ts        |  6 +++---
 extensions/git/src/repository.ts | 11 +++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index 87ea23e3a85..62bae1422df 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -1166,11 +1166,11 @@ export class Repository {
 		return this.git.spawn(args, options);
 	}
 
-	async config(scope: string, key: string, value: any = null, options: SpawnOptions = {}): Promise<string> {
-		const args = ['config'];
+	async config(command: string, scope: string, key: string, value: any = null, options: SpawnOptions = {}): Promise<string> {
+		const args = ['config', command];
 
 		if (scope) {
-			args.push('--' + scope);
+			args.push(`--${scope}`);
 		}
 
 		args.push(key);
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 9e6e0196abe..ec66d510c72 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -1082,15 +1082,15 @@ export class Repository implements Disposable {
 	}
 
 	getConfig(key: string): Promise<string> {
-		return this.run(Operation.Config(true), () => this.repository.config('local', key));
+		return this.run(Operation.Config(true), () => this.repository.config('get', 'local', key));
 	}
 
 	getGlobalConfig(key: string): Promise<string> {
-		return this.run(Operation.Config(true), () => this.repository.config('global', key));
+		return this.run(Operation.Config(true), () => this.repository.config('get', 'global', key));
 	}
 
 	setConfig(key: string, value: string): Promise<string> {
-		return this.run(Operation.Config(false), () => this.repository.config('local', key, value));
+		return this.run(Operation.Config(false), () => this.repository.config('set', 'local', key, value));
 	}
 
 	log(options?: LogOptions & { silent?: boolean }): Promise<Commit[]> {
@@ -1465,7 +1465,10 @@ export class Repository implements Disposable {
 	}
 
 	async deleteBranch(name: string, force?: boolean): Promise<void> {
-		await this.run(Operation.DeleteBranch, () => this.repository.deleteBranch(name, force));
+		return this.run(Operation.DeleteBranch, async () => {
+			await this.repository.deleteBranch(name, force);
+			await this.repository.config('unset', 'local', `branch.${name}.vscode-merge-base`);
+		});
 	}
 
 	async renameBranch(name: string): Promise<void> {

From 5cdf4dd74bae97e2701de972294aa3e501c01920 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 20 Dec 2024 08:14:37 -0800
Subject: [PATCH 441/479] Register editor gpu acceleration with included:false

Fixes #235730
---
 src/vs/editor/common/config/editorOptions.ts | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index e355a960db9..5fe2028e366 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -5833,15 +5833,14 @@ export const EditorOptions = {
 		EditorOption.experimentalGpuAcceleration, 'experimentalGpuAcceleration',
 		'off' as 'off' | 'on',
 		['off', 'on'] as const,
-		undefined
-		// TODO: Uncomment when we want to expose the setting to VS Code users
-		// {
-		// 	enumDescriptions: [
-		// 		nls.localize('experimentalGpuAcceleration.off', "Use regular DOM-based rendering."),
-		// 		nls.localize('experimentalGpuAcceleration.on', "Use GPU acceleration."),
-		// 	],
-		// 	description: nls.localize('experimentalGpuAcceleration', "Controls whether to use the (very) experimental GPU acceleration to render the editor.")
-		// }
+		{
+			included: false, // Hide the setting from users while it's unstable
+			enumDescriptions: [
+				nls.localize('experimentalGpuAcceleration.off', "Use regular DOM-based rendering."),
+				nls.localize('experimentalGpuAcceleration.on', "Use GPU acceleration."),
+			],
+			description: nls.localize('experimentalGpuAcceleration', "Controls whether to use the (very) experimental GPU acceleration to render the editor.")
+		}
 	)),
 	experimentalWhitespaceRendering: register(new EditorStringEnumOption(
 		EditorOption.experimentalWhitespaceRendering, 'experimentalWhitespaceRendering',

From decaa08e9945fad06912b5aafbd8f0f0e88e11c2 Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Fri, 20 Dec 2024 17:15:05 +0100
Subject: [PATCH 442/479] Use correct context keys for share provider title
 context action (#236718)

use correct context keys for share provider titile context action
---
 .../browser/parts/titlebar/titlebarActions.ts        |  8 +-------
 .../contrib/chat/browser/actions/chatActions.ts      |  2 +-
 .../workbench/contrib/share/browser/shareService.ts  | 12 ++++++++++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts b/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts
index e4b8a3e6b9d..e09172e4a7f 100644
--- a/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts
+++ b/src/vs/workbench/browser/parts/titlebar/titlebarActions.ts
@@ -64,15 +64,9 @@ registerAction2(class ToggleNavigationControl extends ToggleTitleBarConfigAction
 	}
 });
 
-registerAction2(class ToggleShareControl extends ToggleTitleBarConfigAction {
-	constructor() {
-		super('workbench.experimental.share.enabled', localize('toggle.share', 'Share'), localize('toggle.shareDescription', "Toggle visibility of the Share action in title bar"), 2, false, ContextKeyExpr.has('config.window.commandCenter'));
-	}
-});
-
 registerAction2(class ToggleLayoutControl extends ToggleTitleBarConfigAction {
 	constructor() {
-		super(LayoutSettings.LAYOUT_ACTIONS, localize('toggle.layout', 'Layout Controls'), localize('toggle.layoutDescription', "Toggle visibility of the Layout Controls in title bar"), 3, true);
+		super(LayoutSettings.LAYOUT_ACTIONS, localize('toggle.layout', 'Layout Controls'), localize('toggle.layoutDescription', "Toggle visibility of the Layout Controls in title bar"), 4, true);
 	}
 });
 
diff --git a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
index d1d7d951559..f0ece5fa2b9 100644
--- a/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
+++ b/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts
@@ -543,7 +543,7 @@ registerAction2(class ToggleCopilotControl extends ToggleTitleBarConfigAction {
 		super(
 			'chat.commandCenter.enabled',
 			localize('toggle.chatControl', 'Copilot Controls'),
-			localize('toggle.chatControlsDescription', "Toggle visibility of the Copilot Controls in title bar"), 4, false,
+			localize('toggle.chatControlsDescription', "Toggle visibility of the Copilot Controls in title bar"), 5, false,
 			ContextKeyExpr.and(
 				ChatContextKeys.supported,
 				ContextKeyExpr.has('config.window.commandCenter')
diff --git a/src/vs/workbench/contrib/share/browser/shareService.ts b/src/vs/workbench/contrib/share/browser/shareService.ts
index 0d684acf736..9a94bd370be 100644
--- a/src/vs/workbench/contrib/share/browser/shareService.ts
+++ b/src/vs/workbench/contrib/share/browser/shareService.ts
@@ -9,11 +9,13 @@ import { URI } from '../../../../base/common/uri.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { score } from '../../../../editor/common/languageSelector.js';
 import { localize } from '../../../../nls.js';
-import { ISubmenuItem } from '../../../../platform/actions/common/actions.js';
-import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { ISubmenuItem, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { ILabelService } from '../../../../platform/label/common/label.js';
 import { IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { ToggleTitleBarConfigAction } from '../../../browser/parts/titlebar/titlebarActions.js';
+import { WorkspaceFolderCountContext } from '../../../common/contextkeys.js';
 import { IShareProvider, IShareService, IShareableItem } from '../common/share.js';
 
 export const ShareProviderCountContext = new RawContextKey<number>('shareProviderCount', 0, localize('shareProviderCount', "The number of available share providers"));
@@ -84,3 +86,9 @@ export class ShareService implements IShareService {
 		return;
 	}
 }
+
+registerAction2(class ToggleShareControl extends ToggleTitleBarConfigAction {
+	constructor() {
+		super('workbench.experimental.share.enabled', localize('toggle.share', 'Share'), localize('toggle.shareDescription', "Toggle visibility of the Share action in title bar"), 3, false, ContextKeyExpr.and(ContextKeyExpr.has('config.window.commandCenter'), ContextKeyExpr.and(ShareProviderCountContext.notEqualsTo(0), WorkspaceFolderCountContext.notEqualsTo(0))));
+	}
+});

From 62948ea6d834ffed42b20fc0cba28ffaa3cf0cbe Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 20 Dec 2024 08:23:25 -0800
Subject: [PATCH 443/479] Indicate when terminal sticky scroll is truncated

Fixes #199974
---
 .../stickyScroll/browser/terminalStickyScrollOverlay.ts        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts b/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts
index 7b3d3de3371..0da38ee5994 100644
--- a/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts
+++ b/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts
@@ -265,6 +265,7 @@ export class TerminalStickyScrollOverlay extends Disposable {
 		const rowOffset = !isPartialCommand && command.endMarker ? Math.max(buffer.viewportY - command.endMarker.line + 1, 0) : 0;
 		const maxLineCount = Math.min(this._rawMaxLineCount, Math.floor(xterm.rows * Constants.StickyScrollPercentageCap));
 		const stickyScrollLineCount = Math.min(promptRowCount + commandRowCount - 1, maxLineCount) - rowOffset;
+		const isTruncated = stickyScrollLineCount < promptRowCount + commandRowCount - 1;
 
 		// Hide sticky scroll if it's currently on a line that contains it
 		if (buffer.viewportY <= stickyScrollLineStart) {
@@ -293,7 +294,7 @@ export class TerminalStickyScrollOverlay extends Disposable {
 				start: stickyScrollLineStart + rowOffset,
 				end: stickyScrollLineStart + rowOffset + Math.max(stickyScrollLineCount - 1, 0)
 			}
-		});
+		}) + (isTruncated ? '\x1b[0m …' : '');
 
 		// If a partial command's sticky scroll would show nothing, just hide it. This is another
 		// edge case when using a pager or interactive editor.

From 12708746496225474c020218d3eae298977266f5 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 20 Dec 2024 09:43:35 -0800
Subject: [PATCH 444/479] Suppress exit warning after ctrl+d

Fixes #160325
---
 src/vs/workbench/contrib/terminal/browser/terminal.ts        | 5 +++++
 .../workbench/contrib/terminal/browser/terminalInstance.ts   | 2 +-
 .../contrib/terminal/browser/xterm/xtermTerminal.ts          | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.ts b/src/vs/workbench/contrib/terminal/browser/terminal.ts
index 2a56aeca979..ead75598c0e 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminal.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminal.ts
@@ -1095,6 +1095,11 @@ export interface IXtermTerminal extends IDisposable {
 	 */
 	readonly isGpuAccelerated: boolean;
 
+	/**
+	 * The last `onData` input event fired by {@link RawXtermTerminal.onData}.
+	 */
+	readonly lastInputEvent: string | undefined;
+
 	/**
 	 * Attached the terminal to the given element
 	 * @param container Container the terminal will be rendered in
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
index 0a1646792a0..df286dd974a 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
@@ -1598,7 +1598,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		} else {
 			if (exitMessage) {
 				const failedDuringLaunch = this._processManager.processState === ProcessState.KilledDuringLaunch;
-				if (failedDuringLaunch || this._terminalConfigurationService.config.showExitAlert) {
+				if (failedDuringLaunch || (this._terminalConfigurationService.config.showExitAlert && this.xterm?.lastInputEvent !== /*Ctrl+D*/'\x04')) {
 					// Always show launch failures
 					this._notificationService.notify({
 						message: exitMessage,
diff --git a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts
index 5ef6d497196..4e860821f7e 100644
--- a/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts
+++ b/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts
@@ -96,6 +96,8 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 	private static _suggestedRendererType: 'dom' | undefined = undefined;
 	private _attached?: { container: HTMLElement; options: IXtermAttachToElementOptions };
 	private _isPhysicalMouseWheel = MouseWheelClassifier.INSTANCE.isPhysicalMouseWheel();
+	private _lastInputEvent: string | undefined;
+	get lastInputEvent(): string | undefined { return this._lastInputEvent; }
 
 	// Always on addons
 	private _markNavigationAddon: MarkNavigationAddon;
@@ -256,6 +258,7 @@ export class XtermTerminal extends Disposable implements IXtermTerminal, IDetach
 				this._anyFocusedTerminalHasSelection.set(this.raw.hasSelection());
 			}
 		}));
+		this._register(this.raw.onData(e => this._lastInputEvent = e));
 
 		// Load addons
 		this._updateUnicodeVersion();

From 1be76b3c97bbe6ce32822c2e7baac4d115376478 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Fri, 20 Dec 2024 09:47:26 -0800
Subject: [PATCH 445/479] Fix response toString for inline refs

Fixes #236655
---
 .../contrib/chat/common/chatModel.ts          | 98 +++++++++++++------
 .../Response_inline_reference.0.snap          |  4 +-
 .../chat/test/common/chatModel.test.ts        |  9 +-
 3 files changed, 78 insertions(+), 33 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/common/chatModel.ts b/src/vs/workbench/contrib/chat/common/chatModel.ts
index 14fa03dffa0..3cf9a8585c7 100644
--- a/src/vs/workbench/contrib/chat/common/chatModel.ts
+++ b/src/vs/workbench/contrib/chat/common/chatModel.ts
@@ -9,6 +9,7 @@ import { Emitter, Event } from '../../../../base/common/event.js';
 import { IMarkdownString, MarkdownString, isMarkdownString } from '../../../../base/common/htmlContent.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { revive } from '../../../../base/common/marshalling.js';
+import { Schemas } from '../../../../base/common/network.js';
 import { equals } from '../../../../base/common/objects.js';
 import { basename, isEqual } from '../../../../base/common/resources.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
@@ -397,38 +398,12 @@ export class Response extends Disposable implements IResponse {
 	}
 
 	private _updateRepr(quiet?: boolean) {
-		const inlineRefToRepr = (part: IChatContentInlineReference) =>
-			'uri' in part.inlineReference
-				? basename(part.inlineReference.uri)
-				: 'name' in part.inlineReference
-					? part.inlineReference.name
-					: basename(part.inlineReference);
-
-		this._responseRepr = this._responseParts.map(part => {
-			if (part.kind === 'treeData') {
-				return '';
-			} else if (part.kind === 'inlineReference') {
-				return inlineRefToRepr(part);
-			} else if (part.kind === 'command') {
-				return part.command.title;
-			} else if (part.kind === 'textEditGroup') {
-				return localize('editsSummary', "Made changes.");
-			} else if (part.kind === 'progressMessage' || part.kind === 'codeblockUri' || part.kind === 'toolInvocation' || part.kind === 'toolInvocationSerialized') {
-				return '';
-			} else if (part.kind === 'confirmation') {
-				return `${part.title}\n${part.message}`;
-			} else {
-				return part.content.value;
-			}
-		})
-			.filter(s => s.length > 0)
-			.join('\n\n');
-
+		this._responseRepr = this.partsToRepr(this._responseParts);
 		this._responseRepr += this._citations.length ? '\n\n' + getCodeCitationsMessage(this._citations) : '';
 
 		this._markdownContent = this._responseParts.map(part => {
 			if (part.kind === 'inlineReference') {
-				return inlineRefToRepr(part);
+				return this.inlineRefToRepr(part);
 			} else if (part.kind === 'markdownContent' || part.kind === 'markdownVuln') {
 				return part.content.value;
 			} else {
@@ -442,6 +417,73 @@ export class Response extends Disposable implements IResponse {
 			this._onDidChangeValue.fire();
 		}
 	}
+
+	private partsToRepr(parts: readonly IChatProgressResponseContent[]): string {
+		const blocks: string[] = [];
+		let currentBlockSegments: string[] = [];
+
+		for (const part of parts) {
+			let segment: { text: string; isBlock?: boolean } | undefined;
+			switch (part.kind) {
+				case 'treeData':
+				case 'progressMessage':
+				case 'codeblockUri':
+				case 'toolInvocation':
+				case 'toolInvocationSerialized':
+					// Ignore
+					continue;
+				case 'inlineReference':
+					segment = { text: this.inlineRefToRepr(part) };
+					break;
+				case 'command':
+					segment = { text: part.command.title, isBlock: true };
+					break;
+				case 'textEditGroup':
+					segment = { text: localize('editsSummary', "Made changes."), isBlock: true };
+					break;
+				case 'confirmation':
+					segment = { text: `${part.title}\n${part.message}`, isBlock: true };
+					break;
+				default:
+					segment = { text: part.content.value };
+					break;
+			}
+
+			if (segment.isBlock) {
+				if (currentBlockSegments.length) {
+					blocks.push(currentBlockSegments.join(''));
+					currentBlockSegments = [];
+				}
+				blocks.push(segment.text);
+			} else {
+				currentBlockSegments.push(segment.text);
+			}
+		}
+
+		if (currentBlockSegments.length) {
+			blocks.push(currentBlockSegments.join(''));
+		}
+
+		return blocks.join('\n\n');
+	}
+
+	private inlineRefToRepr(part: IChatContentInlineReference) {
+		if ('uri' in part.inlineReference) {
+			return this.uriToRepr(part.inlineReference.uri);
+		}
+
+		return 'name' in part.inlineReference
+			? '`' + part.inlineReference.name + '`'
+			: this.uriToRepr(part.inlineReference);
+	}
+
+	private uriToRepr(uri: URI): string {
+		if (uri.scheme === Schemas.http || uri.scheme === Schemas.https) {
+			return uri.toString(false);
+		}
+
+		return basename(uri);
+	}
 }
 
 export class ChatResponseModel extends Disposable implements IChatResponseModel {
diff --git a/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_inline_reference.0.snap b/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_inline_reference.0.snap
index b26d84334a0..3a54719571d 100644
--- a/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_inline_reference.0.snap
+++ b/src/vs/workbench/contrib/chat/test/common/__snapshots__/Response_inline_reference.0.snap
@@ -1,7 +1,7 @@
 [
   {
     content: {
-      value: "text before",
+      value: "text before ",
       isTrusted: false,
       supportThemeIcons: false,
       supportHtml: false
@@ -14,7 +14,7 @@
   },
   {
     content: {
-      value: "text after",
+      value: " text after",
       isTrusted: false,
       supportThemeIcons: false,
       supportHtml: false
diff --git a/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts b/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts
index be40ba599bd..c9c2059b307 100644
--- a/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts
+++ b/src/vs/workbench/contrib/chat/test/common/chatModel.test.ts
@@ -191,10 +191,13 @@ suite('Response', () => {
 
 	test('inline reference', async () => {
 		const response = store.add(new Response([]));
-		response.updateContent({ content: new MarkdownString('text before'), kind: 'markdownContent' });
-		response.updateContent({ inlineReference: URI.parse('https://microsoft.com'), kind: 'inlineReference' });
-		response.updateContent({ content: new MarkdownString('text after'), kind: 'markdownContent' });
+		response.updateContent({ content: new MarkdownString('text before '), kind: 'markdownContent' });
+		response.updateContent({ inlineReference: URI.parse('https://microsoft.com/'), kind: 'inlineReference' });
+		response.updateContent({ content: new MarkdownString(' text after'), kind: 'markdownContent' });
 		await assertSnapshot(response.value);
+
+		assert.strictEqual(response.toString(), 'text before https://microsoft.com/ text after');
+
 	});
 });
 

From 437450a35c25538b5a8719aeee03d060be883f0c Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Fri, 20 Dec 2024 10:08:18 -0800
Subject: [PATCH 446/479] Explain exitCode undefined in more detail

Fixes #236670
---
 src/vscode-dts/vscode.d.ts | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/vscode-dts/vscode.d.ts b/src/vscode-dts/vscode.d.ts
index c9ecff2b0b9..7edf86d0780 100644
--- a/src/vscode-dts/vscode.d.ts
+++ b/src/vscode-dts/vscode.d.ts
@@ -7724,10 +7724,17 @@ declare module 'vscode' {
 		/**
 		 * The exit code reported by the shell.
 		 *
-		 * Note that `undefined` means the shell either did not report an exit  code (ie. the shell
-		 * integration script is misbehaving) or the shell reported a command started before the command
-		 * finished (eg. a sub-shell was opened). Generally this should not happen, depending on the use
-		 * case, it may be best to treat this as a failure.
+		 * When this is `undefined` it can mean several things:
+		 *
+		 * - The shell either did not report an exit  code (ie. the shell integration script is
+		 *   misbehaving)
+		 * - The shell reported a command started before the command finished (eg. a sub-shell was
+		 *   opened).
+		 * - The user canceled the command via ctrl+c.
+		 * - The user pressed enter when there was no input.
+		 *
+		 * Generally this should not happen. Depending on the use case, it may be best to treat this
+		 * as a failure.
 		 *
 		 * @example
 		 * const execution = shellIntegration.executeCommand({

From dfdece69e67e45a2a563929608c69dad8de6fe6e Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Fri, 20 Dec 2024 12:23:36 -0600
Subject: [PATCH 447/479] fix types for task API props (#236735)

fix #231858
---
 src/vs/workbench/api/common/extHostTypes.ts | 6 ++++--
 src/vscode-dts/vscode.d.ts                  | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
index 90f82a69ce0..d388236e837 100644
--- a/src/vs/workbench/api/common/extHostTypes.ts
+++ b/src/vs/workbench/api/common/extHostTypes.ts
@@ -2343,7 +2343,9 @@ export class ShellExecution implements vscode.ShellExecution {
 				throw illegalArgument('command');
 			}
 			this._command = arg0;
-			this._args = arg1 as (string | vscode.ShellQuotedString)[];
+			if (arg1) {
+				this._args = arg1;
+			}
 			this._options = arg2;
 		} else {
 			if (typeof arg0 !== 'string') {
@@ -2380,7 +2382,7 @@ export class ShellExecution implements vscode.ShellExecution {
 		return this._args;
 	}
 
-	set args(value: (string | vscode.ShellQuotedString)[]) {
+	set args(value: (string | vscode.ShellQuotedString)[] | undefined) {
 		this._args = value || [];
 	}
 
diff --git a/src/vscode-dts/vscode.d.ts b/src/vscode-dts/vscode.d.ts
index c9ecff2b0b9..3e389318075 100644
--- a/src/vscode-dts/vscode.d.ts
+++ b/src/vscode-dts/vscode.d.ts
@@ -8668,12 +8668,12 @@ declare module 'vscode' {
 		/**
 		 * The shell command. Is `undefined` if created with a full command line.
 		 */
-		command: string | ShellQuotedString;
+		command: string | ShellQuotedString | undefined;
 
 		/**
 		 * The shell args. Is `undefined` if created with a full command line.
 		 */
-		args: Array<string | ShellQuotedString>;
+		args: Array<string | ShellQuotedString> | undefined;
 
 		/**
 		 * The shell options used when the command line is executed in a shell.

From 23aee3d360c197e156556dd9a4984c813bd818dc Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Fri, 20 Dec 2024 12:28:50 -0600
Subject: [PATCH 448/479] Revert "Reland fix custom task shell doesn't work
 without manually passing in "run command" arg/flag" (#236726)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Revert "Reland fix custom task shell doesn't work without manually passing in…"

This reverts commit 330ab6c2928963dd83a7d90a271d9f2eb8db90d2.
---
 src/vs/platform/terminal/common/terminal.ts   |  1 -
 .../tasks/browser/terminalTaskSystem.ts       | 33 ++++++++-----------
 .../browser/terminalProfileResolverService.ts |  1 -
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/vs/platform/terminal/common/terminal.ts b/src/vs/platform/terminal/common/terminal.ts
index 246ccaf6a76..97fc8e80462 100644
--- a/src/vs/platform/terminal/common/terminal.ts
+++ b/src/vs/platform/terminal/common/terminal.ts
@@ -872,7 +872,6 @@ export interface ITerminalProfile {
 	overrideName?: boolean;
 	color?: string;
 	icon?: ThemeIcon | URI | { light: URI; dark: URI };
-	isAutomationShell?: boolean;
 }
 
 export interface ITerminalDimensionsOverride extends Readonly<ITerminalDimensions> {
diff --git a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
index 3b2c1e51c7f..e44eaa47cf9 100644
--- a/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
+++ b/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
@@ -1112,6 +1112,7 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 				color: task.configurationProperties.icon?.color || undefined,
 				waitOnExit
 			};
+			let shellSpecified: boolean = false;
 			const shellOptions: IShellConfiguration | undefined = task.command.options && task.command.options.shell;
 			if (shellOptions) {
 				if (shellOptions.executable) {
@@ -1120,12 +1121,12 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 						shellLaunchConfig.args = undefined;
 					}
 					shellLaunchConfig.executable = await this._resolveVariable(variableResolver, shellOptions.executable);
+					shellSpecified = true;
 				}
 				if (shellOptions.args) {
 					shellLaunchConfig.args = await this._resolveVariables(variableResolver, shellOptions.args.slice());
 				}
 			}
-			const taskShellArgsSpecified = (defaultProfile.isAutomationShell ? shellLaunchConfig.args : shellOptions?.args) !== undefined;
 			if (shellLaunchConfig.args === undefined) {
 				shellLaunchConfig.args = [];
 			}
@@ -1138,34 +1139,29 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 				windowsShellArgs = true;
 				// If we don't have a cwd, then the terminal uses the home dir.
 				const userHome = await this._pathService.userHome();
-				if (basename === 'cmd.exe') {
-					if ((options.cwd && isUNC(options.cwd)) || (!options.cwd && isUNC(userHome.fsPath))) {
-						return undefined;
-					}
-					if (!taskShellArgsSpecified) {
-						toAdd.push('/d', '/c');
-					}
-				} else if ((basename === 'powershell.exe') || (basename === 'pwsh.exe')) {
-					if (!taskShellArgsSpecified) {
+				if (basename === 'cmd.exe' && ((options.cwd && isUNC(options.cwd)) || (!options.cwd && isUNC(userHome.fsPath)))) {
+					return undefined;
+				}
+				if ((basename === 'powershell.exe') || (basename === 'pwsh.exe')) {
+					if (!shellSpecified) {
 						toAdd.push('-Command');
 					}
 				} else if ((basename === 'bash.exe') || (basename === 'zsh.exe')) {
 					windowsShellArgs = false;
-					if (!taskShellArgsSpecified) {
+					if (!shellSpecified) {
 						toAdd.push('-c');
 					}
 				} else if (basename === 'wsl.exe') {
-					if (!taskShellArgsSpecified) {
+					if (!shellSpecified) {
 						toAdd.push('-e');
 					}
 				} else {
-					if (!taskShellArgsSpecified) {
-						// Push `-c` for unknown shells if the user didn't specify the args
-						toAdd.push('-c');
+					if (!shellSpecified) {
+						toAdd.push('/d', '/c');
 					}
 				}
 			} else {
-				if (!taskShellArgsSpecified) {
+				if (!shellSpecified) {
 					// Under Mac remove -l to not start it as a login shell.
 					if (platform === Platform.Platform.Mac) {
 						// Background on -l on osx https://github.com/microsoft/vscode/issues/107563
@@ -1272,12 +1268,11 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 		const combinedShellArgs: string[] = Objects.deepClone(configuredShellArgs);
 		shellCommandArgs.forEach(element => {
 			const shouldAddShellCommandArg = configuredShellArgs.every((arg, index) => {
-				const isDuplicated = arg.toLowerCase() === element.toLowerCase();
-				if (isDuplicated && (configuredShellArgs.length > index + 1)) {
+				if ((arg.toLowerCase() === element) && (configuredShellArgs.length > index + 1)) {
 					// We can still add the argument, but only if not all of the following arguments begin with "-".
 					return !configuredShellArgs.slice(index + 1).every(testArg => testArg.startsWith('-'));
 				} else {
-					return !isDuplicated;
+					return arg.toLowerCase() !== element;
 				}
 			});
 			if (shouldAddShellCommandArg) {
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts b/src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts
index e54a12a1b44..6208cfc0413 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts
@@ -268,7 +268,6 @@ export abstract class BaseTerminalProfileResolverService extends Disposable impl
 		const automationProfile = this._configurationService.getValue(`terminal.integrated.automationProfile.${this._getOsKey(options.os)}`);
 		if (this._isValidAutomationProfile(automationProfile, options.os)) {
 			automationProfile.icon = this._getCustomIcon(automationProfile.icon) || Codicon.tools;
-			automationProfile.isAutomationShell = true;
 			return automationProfile;
 		}
 

From 0f2ee1f669f1e3219be9f8764aafb34208f1f586 Mon Sep 17 00:00:00 2001
From: Joyce Er <joyce.er@microsoft.com>
Date: Fri, 20 Dec 2024 10:29:11 -0800
Subject: [PATCH 449/479] fix: promote suggested file to working set when
 opened (#236737)

---
 .../contrib/chat/browser/chatEditing/chatEditingSession.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
index 31e9a672a13..8552946891f 100644
--- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
+++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts
@@ -265,8 +265,8 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 			}
 			if (existingTransientEntries.has(uri)) {
 				existingTransientEntries.delete(uri);
-			} else if (!this._workingSet.has(uri) && !this._removedTransientEntries.has(uri)) {
-				// Don't add as a transient entry if it's already part of the working set
+			} else if ((!this._workingSet.has(uri) || this._workingSet.get(uri)?.state === WorkingSetEntryState.Suggested) && !this._removedTransientEntries.has(uri)) {
+				// Don't add as a transient entry if it's already a confirmed part of the working set
 				// or if the user has intentionally removed it from the working set
 				activeEditors.add(uri);
 			}

From 720422ca070ad31eaafb8ab0e1b89a7d781f5e07 Mon Sep 17 00:00:00 2001
From: Joyce Er <joyce.er@microsoft.com>
Date: Fri, 20 Dec 2024 10:29:24 -0800
Subject: [PATCH 450/479] chore: bump milestone in work notebook (#236730)

---
 .vscode/notebooks/my-work.github-issues | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vscode/notebooks/my-work.github-issues b/.vscode/notebooks/my-work.github-issues
index b47a08b5a18..e8b184f8e57 100644
--- a/.vscode/notebooks/my-work.github-issues
+++ b/.vscode/notebooks/my-work.github-issues
@@ -7,7 +7,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "// list of repos we work in\n$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n// current milestone name\n$MILESTONE=milestone:\"November 2024\"\n"
+    "value": "// list of repos we work in\n$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n// current milestone name\n$MILESTONE=milestone:\"January 2025\"\n"
   },
   {
     "kind": 1,

From eee5e7643a2481ee1dac9a7e75f922ccc4e40f40 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Fri, 20 Dec 2024 10:29:40 -0800
Subject: [PATCH 451/479] cli: propagate server-data-dir and extensions-dir
 when installing service (#236734)

Fixes #236195
---
 cli/src/bin/code/main.rs    |  4 +--
 cli/src/commands/tunnels.rs | 55 ++++++++++++++++++++++++-------------
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/cli/src/bin/code/main.rs b/cli/src/bin/code/main.rs
index 0e4809b78c7..b73d0aa885b 100644
--- a/cli/src/bin/code/main.rs
+++ b/cli/src/bin/code/main.rs
@@ -103,7 +103,7 @@ async fn main() -> Result<(), std::convert::Infallible> {
 				serve_web::serve_web(context!(), sw_args).await
 			}
 
-			Some(args::Commands::Tunnel(tunnel_args)) => match tunnel_args.subcommand {
+			Some(args::Commands::Tunnel(mut tunnel_args)) => match tunnel_args.subcommand.take() {
 				Some(args::TunnelSubcommand::Prune) => tunnels::prune(context!()).await,
 				Some(args::TunnelSubcommand::Unregister) => tunnels::unregister(context!()).await,
 				Some(args::TunnelSubcommand::Kill) => tunnels::kill(context!()).await,
@@ -116,7 +116,7 @@ async fn main() -> Result<(), std::convert::Infallible> {
 					tunnels::user(context!(), user_command).await
 				}
 				Some(args::TunnelSubcommand::Service(service_args)) => {
-					tunnels::service(context_no_logger(), service_args).await
+					tunnels::service(context_no_logger(), tunnel_args, service_args).await
 				}
 				Some(args::TunnelSubcommand::ForwardInternal(forward_args)) => {
 					tunnels::forward(context_no_logger(), forward_args).await
diff --git a/cli/src/commands/tunnels.rs b/cli/src/commands/tunnels.rs
index 2a0b4c7ddce..f52fa714793 100644
--- a/cli/src/commands/tunnels.rs
+++ b/cli/src/commands/tunnels.rs
@@ -21,7 +21,7 @@ use tokio::{
 
 use super::{
 	args::{
-		AuthProvider, CliCore, CommandShellArgs, ExistingTunnelArgs, TunnelForwardArgs,
+		AuthProvider, CliCore, CommandShellArgs, ExistingTunnelArgs, TunnelArgs, TunnelForwardArgs,
 		TunnelRenameArgs, TunnelServeArgs, TunnelServiceSubCommands, TunnelUserSubCommands,
 	},
 	CommandContext,
@@ -104,12 +104,16 @@ fn fulfill_existing_tunnel_args(
 }
 
 struct TunnelServiceContainer {
-	args: CliCore,
+	core_args: CliCore,
+	tunnel_args: TunnelArgs,
 }
 
 impl TunnelServiceContainer {
-	fn new(args: CliCore) -> Self {
-		Self { args }
+	fn new(core_args: CliCore, tunnel_args: TunnelArgs) -> Self {
+		Self {
+			core_args,
+			tunnel_args,
+		}
 	}
 }
 
@@ -120,7 +124,8 @@ impl ServiceContainer for TunnelServiceContainer {
 		log: log::Logger,
 		launcher_paths: LauncherPaths,
 	) -> Result<(), AnyError> {
-		let csa = (&self.args).into();
+		let mut csa = (&self.core_args).into();
+		self.tunnel_args.serve_args.server_args.apply_to(&mut csa);
 		serve_with_csa(
 			launcher_paths,
 			log,
@@ -242,8 +247,27 @@ async fn is_port_available(host: IpAddr, port: u16) -> bool {
 		.is_ok()
 }
 
+fn make_service_args<'a: 'c, 'b: 'c, 'c>(
+	root_path: &'a str,
+	tunnel_args: &'b TunnelArgs,
+) -> Vec<&'c str> {
+	let mut args = ["--verbose", "--cli-data-dir", root_path, "tunnel"].to_vec();
+
+	if let Some(d) = tunnel_args.serve_args.server_args.extensions_dir.as_ref() {
+		args.extend_from_slice(&["--extensions-dir", d]);
+	}
+	if let Some(d) = tunnel_args.serve_args.server_args.server_data_dir.as_ref() {
+		args.extend_from_slice(&["--server-data-dir", d]);
+	}
+
+	args.extend_from_slice(&["service", "internal-run"]);
+
+	args
+}
+
 pub async fn service(
 	ctx: CommandContext,
+	tunnel_args: TunnelArgs,
 	service_args: TunnelServiceSubCommands,
 ) -> Result<i32, AnyError> {
 	let manager = create_service_manager(ctx.log.clone(), &ctx.paths);
@@ -265,20 +289,10 @@ pub async fn service(
 			legal::require_consent(&ctx.paths, args.accept_server_license_terms)?;
 
 			let current_exe = canonical_exe().map_err(|e| wrap(e, "could not get current exe"))?;
+			let root_path = ctx.paths.root().as_os_str().to_string_lossy();
+			let args = make_service_args(&root_path, &tunnel_args);
 
-			manager
-				.register(
-					current_exe,
-					&[
-						"--verbose",
-						"--cli-data-dir",
-						ctx.paths.root().as_os_str().to_string_lossy().as_ref(),
-						"tunnel",
-						"service",
-						"internal-run",
-					],
-				)
-				.await?;
+			manager.register(current_exe, &args).await?;
 			ctx.log.result(format!("Service successfully installed! You can use `{APPLICATION_NAME} tunnel service log` to monitor it, and `{APPLICATION_NAME} tunnel service uninstall` to remove it."));
 		}
 		TunnelServiceSubCommands::Uninstall => {
@@ -289,7 +303,10 @@ pub async fn service(
 		}
 		TunnelServiceSubCommands::InternalRun => {
 			manager
-				.run(ctx.paths.clone(), TunnelServiceContainer::new(ctx.args))
+				.run(
+					ctx.paths.clone(),
+					TunnelServiceContainer::new(ctx.args, tunnel_args),
+				)
 				.await?;
 		}
 	}

From 15da1932a92e1ba185931b57be5a07a9f2e1cd08 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Fri, 20 Dec 2024 12:36:07 -0600
Subject: [PATCH 452/479] Allow completions to be requested earlier (#236630)

---
 .../terminal/browser/terminalInstance.ts      | 52 ++++++++++-
 .../browser/terminal.suggest.contribution.ts  | 91 +++++++++----------
 .../suggest/browser/terminalSuggestAddon.ts   | 16 +++-
 3 files changed, 107 insertions(+), 52 deletions(-)

diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
index df286dd974a..589b1deaf9c 100644
--- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
+++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
@@ -504,8 +504,9 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			// Resolve the executable ahead of time if shell integration is enabled, this should not
 			// be done for custom PTYs as that would cause extension Pseudoterminal-based terminals
 			// to hang in resolver extensions
+			let os: OperatingSystem | undefined;
 			if (!this.shellLaunchConfig.customPtyImplementation && this._terminalConfigurationService.config.shellIntegration?.enabled && !this.shellLaunchConfig.executable) {
-				const os = await this._processManager.getBackendOS();
+				os = await this._processManager.getBackendOS();
 				const defaultProfile = (await this._terminalProfileResolverService.getDefaultProfile({ remoteAuthority: this.remoteAuthority, os }));
 				this.shellLaunchConfig.executable = defaultProfile.path;
 				this.shellLaunchConfig.args = defaultProfile.args;
@@ -521,6 +522,12 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 				}
 			}
 
+			// Resolve the shell type ahead of time to allow features that depend upon it to work
+			// before the process is actually created (like terminal suggest manual request)
+			if (os && this.shellLaunchConfig.executable) {
+				this.setShellType(guessShellTypeFromExecutable(os, this.shellLaunchConfig.executable));
+			}
+
 			await this._createProcess();
 
 			// Re-establish the title after reconnect
@@ -2656,3 +2663,46 @@ export class TerminalInstanceColorProvider implements IXtermColorProvider {
 		return theme.getColor(SIDE_BAR_BACKGROUND);
 	}
 }
+
+function guessShellTypeFromExecutable(os: OperatingSystem, executable: string): TerminalShellType | undefined {
+	const exeBasename = path.basename(executable);
+	const generalShellTypeMap: Map<TerminalShellType, RegExp> = new Map([
+		[GeneralShellType.Julia, /^julia$/],
+		[GeneralShellType.NuShell, /^nu$/],
+		[GeneralShellType.PowerShell, /^pwsh(-preview)?|powershell$/],
+		[GeneralShellType.Python, /^py(?:thon)?$/]
+	]);
+	for (const [shellType, pattern] of generalShellTypeMap) {
+		if (exeBasename.match(pattern)) {
+			return shellType;
+		}
+	}
+
+	if (os === OperatingSystem.Windows) {
+		const windowsShellTypeMap: Map<TerminalShellType, RegExp> = new Map([
+			[WindowsShellType.CommandPrompt, /^cmd$/],
+			[WindowsShellType.GitBash, /^bash$/],
+			[WindowsShellType.Wsl, /^wsl$/]
+		]);
+		for (const [shellType, pattern] of windowsShellTypeMap) {
+			if (exeBasename.match(pattern)) {
+				return shellType;
+			}
+		}
+	} else {
+		const posixShellTypes: PosixShellType[] = [
+			PosixShellType.Bash,
+			PosixShellType.Csh,
+			PosixShellType.Fish,
+			PosixShellType.Ksh,
+			PosixShellType.Sh,
+			PosixShellType.Zsh,
+		];
+		for (const type of posixShellTypes) {
+			if (exeBasename === type) {
+				return type;
+			}
+		}
+	}
+	return undefined;
+}
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts
index 35a845c1f7b..473de7f5f08 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts
@@ -12,14 +12,13 @@ import { DisposableStore, MutableDisposable, toDisposable } from '../../../../..
 import { isWindows } from '../../../../../base/common/platform.js';
 import { localize2 } from '../../../../../nls.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
-import { ContextKeyExpr, IContextKey, IContextKeyService, IReadableSet } from '../../../../../platform/contextkey/common/contextkey.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
-import { GeneralShellType, TerminalLocation, TerminalSettingId } from '../../../../../platform/terminal/common/terminal.js';
+import { GeneralShellType, TerminalLocation } from '../../../../../platform/terminal/common/terminal.js';
 import { ITerminalContribution, ITerminalInstance, IXtermTerminal } from '../../../terminal/browser/terminal.js';
 import { registerActiveInstanceAction } from '../../../terminal/browser/terminalActions.js';
 import { registerTerminalContribution, type ITerminalContributionContext } from '../../../terminal/browser/terminalExtensions.js';
-import { TERMINAL_CONFIG_SECTION, type ITerminalConfiguration } from '../../../terminal/common/terminal.js';
 import { TerminalContextKeys } from '../../../terminal/common/terminalContextKey.js';
 import { TerminalSuggestCommandId } from '../common/terminal.suggest.js';
 import { terminalSuggestConfigSection, TerminalSuggestSettingId, type ITerminalSuggestConfiguration } from '../common/terminalSuggestConfiguration.js';
@@ -42,8 +41,7 @@ class TerminalSuggestContribution extends DisposableStore implements ITerminalCo
 
 	private readonly _addon: MutableDisposable<SuggestAddon> = new MutableDisposable();
 	private readonly _pwshAddon: MutableDisposable<PwshCompletionProviderAddon> = new MutableDisposable();
-	private _terminalSuggestWidgetContextKeys: IReadableSet<string> = new Set(TerminalContextKeys.suggestWidgetVisible.key);
-	private _terminalSuggestWidgetVisibleContextKey: IContextKey<boolean>;
+	private readonly _terminalSuggestWidgetVisibleContextKey: IContextKey<boolean>;
 
 	get addon(): SuggestAddon | undefined { return this._addon.value; }
 	get pwshAddon(): PwshCompletionProviderAddon | undefined { return this._pwshAddon.value; }
@@ -87,23 +85,15 @@ class TerminalSuggestContribution extends DisposableStore implements ITerminalCo
 		if (!enabled) {
 			return;
 		}
+		this._loadAddons(xterm.raw);
 		this.add(Event.runAndSubscribe(this._ctx.instance.onDidChangeShellType, async () => {
-			this._loadAddons(xterm.raw);
-		}));
-		this.add(this._contextKeyService.onDidChangeContext(e => {
-			if (e.affectsSome(this._terminalSuggestWidgetContextKeys)) {
-				this._loadAddons(xterm.raw);
-			}
-		}));
-		this.add(this._configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(TerminalSettingId.SendKeybindingsToShell)) {
-				this._loadAddons(xterm.raw);
-			}
+			this._refreshAddons();
 		}));
 	}
 
 	private _loadPwshCompletionAddon(xterm: RawXtermTerminal): void {
 		if (this._ctx.instance.shellType !== GeneralShellType.PowerShell) {
+			this._pwshAddon.clear();
 			return;
 		}
 		const pwshCompletionProviderAddon = this._pwshAddon.value = this._instantiationService.createInstance(PwshCompletionProviderAddon, undefined, this._ctx.instance.capabilities);
@@ -139,42 +129,47 @@ class TerminalSuggestContribution extends DisposableStore implements ITerminalCo
 	}
 
 	private _loadAddons(xterm: RawXtermTerminal): void {
-		const sendingKeybindingsToShell = this._configurationService.getValue<ITerminalConfiguration>(TERMINAL_CONFIG_SECTION).sendKeybindingsToShell;
-		if (sendingKeybindingsToShell || !this._ctx.instance.shellType) {
-			this._addon.clear();
-			this._pwshAddon.clear();
+		// Don't re-create the addon
+		if (this._addon.value) {
 			return;
 		}
-		if (this._terminalSuggestWidgetVisibleContextKey) {
-			const addon = this._addon.value = this._instantiationService.createInstance(SuggestAddon, this._ctx.instance.shellType, this._ctx.instance.capabilities, this._terminalSuggestWidgetVisibleContextKey);
-			xterm.loadAddon(addon);
-			this._loadPwshCompletionAddon(xterm);
-			if (this._ctx.instance.target === TerminalLocation.Editor) {
-				addon.setContainerWithOverflow(xterm.element!);
-			} else {
-				addon.setContainerWithOverflow(dom.findParentWithClass(xterm.element!, 'panel')!);
-			}
-			addon.setScreen(xterm.element!.querySelector('.xterm-screen')!);
-			this.add(this._ctx.instance.onDidBlur(() => addon.hideSuggestWidget()));
-			this.add(addon.onAcceptedCompletion(async text => {
-				this._ctx.instance.focus();
-				this._ctx.instance.sendText(text, false);
-			}));
-			const clipboardContrib = TerminalClipboardContribution.get(this._ctx.instance)!;
-			this.add(clipboardContrib.onWillPaste(() => addon.isPasting = true));
-			this.add(clipboardContrib.onDidPaste(() => {
-				// Delay this slightly as synchronizing the prompt input is debounced
-				setTimeout(() => addon.isPasting = false, 100);
+
+		const addon = this._addon.value = this._instantiationService.createInstance(SuggestAddon, this._ctx.instance.shellType, this._ctx.instance.capabilities, this._terminalSuggestWidgetVisibleContextKey);
+		xterm.loadAddon(addon);
+		this._loadPwshCompletionAddon(xterm);
+		if (this._ctx.instance.target === TerminalLocation.Editor) {
+			addon.setContainerWithOverflow(xterm.element!);
+		} else {
+			addon.setContainerWithOverflow(dom.findParentWithClass(xterm.element!, 'panel')!);
+		}
+		addon.setScreen(xterm.element!.querySelector('.xterm-screen')!);
+		this.add(this._ctx.instance.onDidBlur(() => addon.hideSuggestWidget()));
+		this.add(addon.onAcceptedCompletion(async text => {
+			this._ctx.instance.focus();
+			this._ctx.instance.sendText(text, false);
+		}));
+		const clipboardContrib = TerminalClipboardContribution.get(this._ctx.instance)!;
+		this.add(clipboardContrib.onWillPaste(() => addon.isPasting = true));
+		this.add(clipboardContrib.onDidPaste(() => {
+			// Delay this slightly as synchronizing the prompt input is debounced
+			setTimeout(() => addon.isPasting = false, 100);
+		}));
+		if (!isWindows) {
+			let barrier: AutoOpenBarrier | undefined;
+			this.add(addon.onDidReceiveCompletions(() => {
+				barrier?.open();
+				barrier = undefined;
 			}));
-			if (!isWindows) {
-				let barrier: AutoOpenBarrier | undefined;
-				this.add(addon.onDidReceiveCompletions(() => {
-					barrier?.open();
-					barrier = undefined;
-				}));
-			}
 		}
 	}
+
+	private _refreshAddons(): void {
+		const addon = this._addon.value;
+		if (!addon) {
+			return;
+		}
+		addon.shellType = this._ctx.instance.shellType;
+	}
 }
 
 registerTerminalContribution(TerminalSuggestContribution.ID, TerminalSuggestContribution);
@@ -190,7 +185,7 @@ registerActiveInstanceAction({
 		primary: KeyMod.CtrlCmd | KeyCode.Space,
 		mac: { primary: KeyMod.WinCtrl | KeyCode.Space },
 		weight: KeybindingWeight.WorkbenchContrib + 1,
-		when: ContextKeyExpr.and(TerminalContextKeys.focus, TerminalContextKeys.terminalShellIntegrationEnabled, ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.Enabled}`, true))
+		when: ContextKeyExpr.and(TerminalContextKeys.focus, ContextKeyExpr.equals(`config.${TerminalSuggestSettingId.Enabled}`, true))
 	},
 	run: (activeInstance) => TerminalSuggestContribution.get(activeInstance)?.addon?.requestCompletions(true)
 });
diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
index 94650c7525c..f750d76f089 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -73,6 +73,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 	private _cancellationTokenSource: CancellationTokenSource | undefined;
 
 	isPasting: boolean = false;
+	shellType: TerminalShellType | undefined;
 
 	private readonly _onBell = this._register(new Emitter<void>());
 	readonly onBell = this._onBell.event;
@@ -89,8 +90,10 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		[TerminalCompletionItemKind.Argument, Codicon.symbolVariable]
 	]);
 
+	private _shouldSyncWhenReady: boolean = false;
+
 	constructor(
-		private readonly _shellType: TerminalShellType | undefined,
+		shellType: TerminalShellType | undefined,
 		private readonly _capabilities: ITerminalCapabilityStore,
 		private readonly _terminalSuggestWidgetVisibleContextKey: IContextKey<boolean>,
 		@ITerminalCompletionService private readonly _terminalCompletionService: ITerminalCompletionService,
@@ -101,6 +104,8 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 	) {
 		super();
 
+		this.shellType = shellType;
+
 		this._register(Event.runAndSubscribe(Event.any(
 			this._capabilities.onDidAddCapabilityType,
 			this._capabilities.onDidRemoveCapabilityType
@@ -113,6 +118,10 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 						this._promptInputModel.onDidChangeInput(e => this._sync(e)),
 						this._promptInputModel.onDidFinishInput(() => this.hideSuggestWidget()),
 					);
+					if (this._shouldSyncWhenReady) {
+						this._sync(this._promptInputModel);
+						this._shouldSyncWhenReady = false;
+					}
 				}
 				this._register(commandDetection.onCommandExecuted(() => this.hideSuggestWidget()));
 			} else {
@@ -140,7 +149,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 			return;
 		}
 
-		if (!this._shellType) {
+		if (!this.shellType) {
 			return;
 		}
 
@@ -156,7 +165,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 			await this._extensionService.activateByEvent('onTerminalCompletionsRequested');
 		}
 
-		const providedCompletions = await this._terminalCompletionService.provideCompletions(this._promptInputModel.prefix, this._promptInputModel.cursorIndex, this._shellType, token, doNotRequestExtensionCompletions);
+		const providedCompletions = await this._terminalCompletionService.provideCompletions(this._promptInputModel.prefix, this._promptInputModel.cursorIndex, this.shellType, token, doNotRequestExtensionCompletions);
 		if (!providedCompletions?.length || token.isCancellationRequested) {
 			return;
 		}
@@ -237,6 +246,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 
 	async requestCompletions(explicitlyInvoked?: boolean): Promise<void> {
 		if (!this._promptInputModel) {
+			this._shouldSyncWhenReady = true;
 			return;
 		}
 

From 7cf9dbecf611fbc38c006439e704ccc807fa5c0f Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Fri, 20 Dec 2024 10:52:07 -0800
Subject: [PATCH 453/479] Fix escaping of raw values that contain `&` in md
 preview

Fixes #236660
---
 extensions/markdown-language-features/src/util/dom.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/extensions/markdown-language-features/src/util/dom.ts b/extensions/markdown-language-features/src/util/dom.ts
index 0f6c00da9da..8bbce79c303 100644
--- a/extensions/markdown-language-features/src/util/dom.ts
+++ b/extensions/markdown-language-features/src/util/dom.ts
@@ -5,7 +5,10 @@
 import * as vscode from 'vscode';
 
 export function escapeAttribute(value: string | vscode.Uri): string {
-	return value.toString().replace(/"/g, '&quot;');
+	return value.toString()
+		.replace(/&/g, '&amp;')
+		.replace(/"/g, '&quot;')
+		.replace(/'/g, '&#39;');
 }
 
 export function getNonce() {

From 094e96a2eacd2b0a14af7884c2988b00261f8505 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Fri, 20 Dec 2024 19:55:45 +0100
Subject: [PATCH 454/479] Introduces IObservableWithChange so that typescript
 does not show the default type for TChange in hovers. (#236629)

* Introduces IObservableWithChange so that typescript does not show the default type for TChange in hovers.

This should make it easier to understand types when observables (potentially nested) are involved.

* Fixes monaco editor
---
 build/monaco/monaco.usage.recipe              |  2 +-
 src/vs/base/common/event.ts                   | 16 +++++-----
 .../base/common/observableInternal/autorun.ts |  4 +--
 src/vs/base/common/observableInternal/base.ts | 29 ++++++++++++-------
 .../base/common/observableInternal/derived.ts |  8 ++---
 .../base/common/observableInternal/index.ts   |  2 +-
 .../base/common/observableInternal/logging.ts |  8 ++---
 .../base/common/observableInternal/utils.ts   | 16 +++++-----
 src/vs/base/test/common/observable.test.ts    | 10 +++----
 src/vs/editor/browser/observableCodeEditor.ts |  6 ++--
 .../diffEditor/components/diffEditorSash.ts   |  2 +-
 .../widget/diffEditor/diffEditorOptions.ts    |  4 +--
 .../diffEditor/features/gutterFeature.ts      |  2 +-
 .../editor/browser/widget/diffEditor/utils.ts |  4 +--
 .../browser/model/inlineCompletionsModel.ts   |  4 +--
 .../widget/observableCodeEditor.test.ts       |  4 +--
 .../browser/model/textModelDiffs.ts           |  6 ++--
 .../chatEdit/notebookChatActionsOverlay.ts    |  6 ++--
 .../contrib/testing/common/observableUtils.ts |  6 ++--
 19 files changed, 73 insertions(+), 66 deletions(-)

diff --git a/build/monaco/monaco.usage.recipe b/build/monaco/monaco.usage.recipe
index e3c8cdd0916..a3369eb25a7 100644
--- a/build/monaco/monaco.usage.recipe
+++ b/build/monaco/monaco.usage.recipe
@@ -35,6 +35,6 @@ import * as editorAPI from './vs/editor/editor.api';
 	a = editorAPI.editor;
 	a = editorAPI.languages;
 
-	const o: IObservable<number, number> = null!;
+	const o: IObservable<number> = null!;
 	o.TChange;
 })();
diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts
index 82921d00dac..d49f2ef276f 100644
--- a/src/vs/base/common/event.ts
+++ b/src/vs/base/common/event.ts
@@ -9,7 +9,7 @@ import { onUnexpectedError } from './errors.js';
 import { createSingleCallFunction } from './functional.js';
 import { combinedDisposable, Disposable, DisposableMap, DisposableStore, IDisposable, toDisposable } from './lifecycle.js';
 import { LinkedList } from './linkedList.js';
-import { IObservable, IObserver } from './observable.js';
+import { IObservable, IObservableWithChange, IObserver } from './observable.js';
 import { StopWatch } from './stopwatch.js';
 import { MicrotaskDelay } from './symbols.js';
 
@@ -666,7 +666,7 @@ export namespace Event {
 		private _counter = 0;
 		private _hasChanged = false;
 
-		constructor(readonly _observable: IObservable<T, any>, store: DisposableStore | undefined) {
+		constructor(readonly _observable: IObservable<T>, store: DisposableStore | undefined) {
 			const options: EmitterOptions = {
 				onWillAddFirstListener: () => {
 					_observable.addObserver(this);
@@ -687,21 +687,21 @@ export namespace Event {
 			}
 		}
 
-		beginUpdate<T>(_observable: IObservable<T, void>): void {
+		beginUpdate<T>(_observable: IObservable<T>): void {
 			// assert(_observable === this.obs);
 			this._counter++;
 		}
 
-		handlePossibleChange<T>(_observable: IObservable<T, unknown>): void {
+		handlePossibleChange<T>(_observable: IObservable<T>): void {
 			// assert(_observable === this.obs);
 		}
 
-		handleChange<T, TChange>(_observable: IObservable<T, TChange>, _change: TChange): void {
+		handleChange<T, TChange>(_observable: IObservableWithChange<T, TChange>, _change: TChange): void {
 			// assert(_observable === this.obs);
 			this._hasChanged = true;
 		}
 
-		endUpdate<T>(_observable: IObservable<T, void>): void {
+		endUpdate<T>(_observable: IObservable<T>): void {
 			// assert(_observable === this.obs);
 			this._counter--;
 			if (this._counter === 0) {
@@ -718,7 +718,7 @@ export namespace Event {
 	 * Creates an event emitter that is fired when the observable changes.
 	 * Each listeners subscribes to the emitter.
 	 */
-	export function fromObservable<T>(obs: IObservable<T, any>, store?: DisposableStore): Event<T> {
+	export function fromObservable<T>(obs: IObservable<T>, store?: DisposableStore): Event<T> {
 		const observer = new EmitterObserver(obs, store);
 		return observer.emitter.event;
 	}
@@ -726,7 +726,7 @@ export namespace Event {
 	/**
 	 * Each listener is attached to the observable directly.
 	 */
-	export function fromObservableLight(observable: IObservable<any>): Event<void> {
+	export function fromObservableLight(observable: IObservable<unknown>): Event<void> {
 		return (listener, thisArgs, disposables) => {
 			let count = 0;
 			let didChange = false;
diff --git a/src/vs/base/common/observableInternal/autorun.ts b/src/vs/base/common/observableInternal/autorun.ts
index b8a62629937..d2425e11012 100644
--- a/src/vs/base/common/observableInternal/autorun.ts
+++ b/src/vs/base/common/observableInternal/autorun.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IChangeContext, IObservable, IObserver, IReader } from './base.js';
+import { IChangeContext, IObservable, IObservableWithChange, IObserver, IReader } from './base.js';
 import { DebugNameData, IDebugNameData } from './debugName.js';
 import { assertFn, BugIndicatingError, DisposableStore, IDisposable, markAsDisposed, onBugIndicatingError, toDisposable, trackDisposable } from './commonFacade/deps.js';
 import { getLogger } from './logging.js';
@@ -286,7 +286,7 @@ export class AutorunObserver<TChangeSummary = any> implements IObserver, IReader
 		}
 	}
 
-	public handleChange<T, TChange>(observable: IObservable<T, TChange>, change: TChange): void {
+	public handleChange<T, TChange>(observable: IObservableWithChange<T, TChange>, change: TChange): void {
 		if (this.dependencies.has(observable) && !this.dependenciesToBeRemoved.has(observable)) {
 			try {
 				const shouldReact = this._handleChange ? this._handleChange({
diff --git a/src/vs/base/common/observableInternal/base.ts b/src/vs/base/common/observableInternal/base.ts
index c28e773b268..f2aa0466f78 100644
--- a/src/vs/base/common/observableInternal/base.ts
+++ b/src/vs/base/common/observableInternal/base.ts
@@ -9,6 +9,13 @@ import type { derivedOpts } from './derived.js';
 import { getLogger, logObservable } from './logging.js';
 import { keepObserved, recomputeInitiallyAndOnChange } from './utils.js';
 
+/**
+ * Represents an observable value.
+ *
+ * @template T The type of the values the observable can hold.
+ */
+export interface IObservable<T> extends IObservableWithChange<T, unknown> { }
+
 /**
  * Represents an observable value.
  *
@@ -18,7 +25,7 @@ import { keepObserved, recomputeInitiallyAndOnChange } from './utils.js';
  * While observers can miss temporary values of an observable,
  * they will receive all change values (as long as they are subscribed)!
  */
-export interface IObservable<T, TChange = unknown> {
+export interface IObservableWithChange<T, TChange = unknown> {
 	/**
 	 * Returns the current value.
 	 *
@@ -71,7 +78,7 @@ export interface IObservable<T, TChange = unknown> {
 	 * ONLY FOR DEBUGGING!
 	 * Logs computations of this derived.
 	*/
-	log(): IObservable<T, TChange>;
+	log(): IObservableWithChange<T, TChange>;
 
 	/**
 	 * Makes sure this value is computed eagerly.
@@ -98,7 +105,7 @@ export interface IReader {
 	/**
 	 * Reads the value of an observable and subscribes to it.
 	 */
-	readObservable<T>(observable: IObservable<T, any>): T;
+	readObservable<T>(observable: IObservableWithChange<T, any>): T;
 }
 
 /**
@@ -143,7 +150,7 @@ export interface IObserver {
 	 *
 	 * @param change Indicates how or why the value changed.
 	 */
-	handleChange<T, TChange>(observable: IObservable<T, TChange>, change: TChange): void;
+	handleChange<T, TChange>(observable: IObservableWithChange<T, TChange>, change: TChange): void;
 }
 
 export interface ISettable<T, TChange = void> {
@@ -162,7 +169,7 @@ export interface ITransaction {
 	 * Calls {@link Observer.beginUpdate} immediately
 	 * and {@link Observer.endUpdate} when the transaction ends.
 	 */
-	updateObserver(observer: IObserver, observable: IObservable<any, any>): void;
+	updateObserver(observer: IObserver, observable: IObservableWithChange<any, any>): void;
 }
 
 let _recomputeInitiallyAndOnChange: typeof recomputeInitiallyAndOnChange;
@@ -185,7 +192,7 @@ export function _setDerivedOpts(derived: typeof _derived) {
 	_derived = derived;
 }
 
-export abstract class ConvenientObservable<T, TChange> implements IObservable<T, TChange> {
+export abstract class ConvenientObservable<T, TChange> implements IObservableWithChange<T, TChange> {
 	get TChange(): TChange { return null!; }
 
 	public abstract get(): T;
@@ -239,7 +246,7 @@ export abstract class ConvenientObservable<T, TChange> implements IObservable<T,
 		);
 	}
 
-	public log(): IObservable<T, TChange> {
+	public log(): IObservableWithChange<T, TChange> {
 		logObservable(this);
 		return this;
 	}
@@ -248,7 +255,7 @@ export abstract class ConvenientObservable<T, TChange> implements IObservable<T,
 	 * @sealed
 	 * Converts an observable of an observable value into a direct observable of the value.
 	*/
-	public flatten<TNew>(this: IObservable<IObservable<TNew, any>>): IObservable<TNew, unknown> {
+	public flatten<TNew>(this: IObservable<IObservableWithChange<TNew, any>>): IObservable<TNew> {
 		return _derived(
 			{
 				owner: undefined,
@@ -390,7 +397,7 @@ export class TransactionImpl implements ITransaction {
 /**
  * A settable observable.
  */
-export interface ISettableObservable<T, TChange = void> extends IObservable<T, TChange>, ISettable<T, TChange> {
+export interface ISettableObservable<T, TChange = void> extends IObservableWithChange<T, TChange>, ISettable<T, TChange> {
 }
 
 /**
@@ -505,11 +512,11 @@ export interface IChangeTracker {
 }
 
 export interface IChangeContext {
-	readonly changedObservable: IObservable<any, any>;
+	readonly changedObservable: IObservableWithChange<any, any>;
 	readonly change: unknown;
 
 	/**
 	 * Returns if the given observable caused the change.
 	 */
-	didChange<T, TChange>(observable: IObservable<T, TChange>): this is { change: TChange };
+	didChange<T, TChange>(observable: IObservableWithChange<T, TChange>): this is { change: TChange };
 }
diff --git a/src/vs/base/common/observableInternal/derived.ts b/src/vs/base/common/observableInternal/derived.ts
index ba018041799..5421b023df9 100644
--- a/src/vs/base/common/observableInternal/derived.ts
+++ b/src/vs/base/common/observableInternal/derived.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BaseObservable, IChangeContext, IObservable, IObserver, IReader, ISettableObservable, ITransaction, _setDerivedOpts, } from './base.js';
+import { BaseObservable, IChangeContext, IObservable, IObservableWithChange, IObserver, IReader, ISettableObservable, ITransaction, _setDerivedOpts, } from './base.js';
 import { DebugNameData, DebugOwner, IDebugNameData } from './debugName.js';
 import { BugIndicatingError, DisposableStore, EqualityComparer, IDisposable, assertFn, onBugIndicatingError, strictEquals } from './commonFacade/deps.js';
 import { getLogger } from './logging.js';
@@ -386,7 +386,7 @@ export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> im
 		assertFn(() => this.updateCount >= 0);
 	}
 
-	public handlePossibleChange<T>(observable: IObservable<T, unknown>): void {
+	public handlePossibleChange<T>(observable: IObservable<T>): void {
 		// In all other states, observers already know that we might have changed.
 		if (this.state === DerivedState.upToDate && this.dependencies.has(observable) && !this.dependenciesToBeRemoved.has(observable)) {
 			this.state = DerivedState.dependenciesMightHaveChanged;
@@ -396,7 +396,7 @@ export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> im
 		}
 	}
 
-	public handleChange<T, TChange>(observable: IObservable<T, TChange>, change: TChange): void {
+	public handleChange<T, TChange>(observable: IObservableWithChange<T, TChange>, change: TChange): void {
 		if (this.dependencies.has(observable) && !this.dependenciesToBeRemoved.has(observable)) {
 			let shouldReact = false;
 			try {
@@ -460,7 +460,7 @@ export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> im
 		super.removeObserver(observer);
 	}
 
-	public override log(): IObservable<T, void> {
+	public override log(): IObservableWithChange<T, void> {
 		if (!getLogger()) {
 			super.log();
 			getLogger()?.handleDerivedCreated(this);
diff --git a/src/vs/base/common/observableInternal/index.ts b/src/vs/base/common/observableInternal/index.ts
index 9295f2697d5..873cf946171 100644
--- a/src/vs/base/common/observableInternal/index.ts
+++ b/src/vs/base/common/observableInternal/index.ts
@@ -7,7 +7,7 @@
 
 export { observableValueOpts } from './api.js';
 export { autorun, autorunDelta, autorunHandleChanges, autorunOpts, autorunWithStore, autorunWithStoreHandleChanges } from './autorun.js';
-export { asyncTransaction, disposableObservableValue, globalTransaction, observableValue, subtransaction, transaction, TransactionImpl, type IChangeContext, type IChangeTracker, type IObservable, type IObserver, type IReader, type ISettable, type ISettableObservable, type ITransaction, } from './base.js';
+export { asyncTransaction, disposableObservableValue, globalTransaction, observableValue, subtransaction, transaction, TransactionImpl, type IChangeContext, type IChangeTracker, type IObservable, type IObservableWithChange, type IObserver, type IReader, type ISettable, type ISettableObservable, type ITransaction, } from './base.js';
 export { derived, derivedDisposable, derivedHandleChanges, derivedOpts, derivedWithSetter, derivedWithStore } from './derived.js';
 export { ObservableLazy, ObservableLazyPromise, ObservablePromise, PromiseResult, } from './promise.js';
 export { derivedWithCancellationToken, waitForState } from './utilsCancellation.js';
diff --git a/src/vs/base/common/observableInternal/logging.ts b/src/vs/base/common/observableInternal/logging.ts
index a6a5bb78a06..8dc526a45be 100644
--- a/src/vs/base/common/observableInternal/logging.ts
+++ b/src/vs/base/common/observableInternal/logging.ts
@@ -39,7 +39,7 @@ interface IChangeInformation {
 }
 
 export interface IObservableLogger {
-	handleObservableChanged(observable: IObservable<any, any>, info: IChangeInformation): void;
+	handleObservableChanged(observable: IObservable<any>, info: IChangeInformation): void;
 	handleFromEventObservableTriggered(observable: FromEventObservable<any, any>, info: IChangeInformation): void;
 
 	handleAutorunCreated(autorun: AutorunObserver): void;
@@ -101,7 +101,7 @@ export class ConsoleObservableLogger implements IObservableLogger {
 			: [normalText(` (unchanged)`)];
 	}
 
-	handleObservableChanged(observable: IObservable<unknown, unknown>, info: IChangeInformation): void {
+	handleObservableChanged(observable: IObservable<unknown>, info: IChangeInformation): void {
 		if (!this._isIncluded(observable)) { return; }
 		console.log(...this.textToConsoleArgs([
 			formatKind('observable value changed'),
@@ -110,9 +110,9 @@ export class ConsoleObservableLogger implements IObservableLogger {
 		]));
 	}
 
-	private readonly changedObservablesSets = new WeakMap<object, Set<IObservable<any, any>>>();
+	private readonly changedObservablesSets = new WeakMap<object, Set<IObservable<any>>>();
 
-	formatChanges(changes: Set<IObservable<any, any>>): ConsoleText | undefined {
+	formatChanges(changes: Set<IObservable<any>>): ConsoleText | undefined {
 		if (changes.size === 0) {
 			return undefined;
 		}
diff --git a/src/vs/base/common/observableInternal/utils.ts b/src/vs/base/common/observableInternal/utils.ts
index 2fb57d1a42a..c42f12f7b8e 100644
--- a/src/vs/base/common/observableInternal/utils.ts
+++ b/src/vs/base/common/observableInternal/utils.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { autorun, autorunOpts, autorunWithStoreHandleChanges } from './autorun.js';
-import { BaseObservable, ConvenientObservable, IObservable, IObserver, IReader, ITransaction, _setKeepObserved, _setRecomputeInitiallyAndOnChange, observableValue, subtransaction, transaction } from './base.js';
+import { BaseObservable, ConvenientObservable, IObservable, IObservableWithChange, IObserver, IReader, ITransaction, _setKeepObserved, _setRecomputeInitiallyAndOnChange, observableValue, subtransaction, transaction } from './base.js';
 import { DebugNameData, DebugOwner, IDebugNameData, getDebugName, } from './debugName.js';
 import { BugIndicatingError, DisposableStore, EqualityComparer, Event, IDisposable, IValueWithChangeEvent, strictEquals, toDisposable } from './commonFacade/deps.js';
 import { derived, derivedOpts } from './derived.js';
@@ -259,7 +259,7 @@ export function observableSignal<TDelta = void>(debugNameOrOwner: string | objec
 	}
 }
 
-export interface IObservableSignal<TChange> extends IObservable<void, TChange> {
+export interface IObservableSignal<TChange> extends IObservableWithChange<void, TChange> {
 	trigger(tx: ITransaction | undefined, change: TChange): void;
 }
 
@@ -434,11 +434,11 @@ export class KeepAliveObserver implements IObserver {
 		private readonly _handleValue: ((value: any) => void) | undefined,
 	) { }
 
-	beginUpdate<T>(observable: IObservable<T, void>): void {
+	beginUpdate<T>(observable: IObservable<T>): void {
 		this._counter++;
 	}
 
-	endUpdate<T>(observable: IObservable<T, void>): void {
+	endUpdate<T>(observable: IObservable<T>): void {
 		this._counter--;
 		if (this._counter === 0 && this._forceRecompute) {
 			if (this._handleValue) {
@@ -449,11 +449,11 @@ export class KeepAliveObserver implements IObserver {
 		}
 	}
 
-	handlePossibleChange<T>(observable: IObservable<T, unknown>): void {
+	handlePossibleChange<T>(observable: IObservable<T>): void {
 		// NO OP
 	}
 
-	handleChange<T, TChange>(observable: IObservable<T, TChange>, change: TChange): void {
+	handleChange<T, TChange>(observable: IObservableWithChange<T, TChange>, change: TChange): void {
 		// NO OP
 	}
 }
@@ -625,7 +625,7 @@ export function derivedConstOnceDefined<T>(owner: DebugOwner, fn: (reader: IRead
 
 type RemoveUndefined<T> = T extends undefined ? never : T;
 
-export function runOnChange<T, TChange>(observable: IObservable<T, TChange>, cb: (value: T, previousValue: undefined | T, deltas: RemoveUndefined<TChange>[]) => void): IDisposable {
+export function runOnChange<T, TChange>(observable: IObservableWithChange<T, TChange>, cb: (value: T, previousValue: undefined | T, deltas: RemoveUndefined<TChange>[]) => void): IDisposable {
 	let _previousValue: T | undefined;
 	return autorunWithStoreHandleChanges({
 		createEmptyChangeSummary: () => ({ deltas: [] as RemoveUndefined<TChange>[], didChange: false }),
@@ -649,7 +649,7 @@ export function runOnChange<T, TChange>(observable: IObservable<T, TChange>, cb:
 	});
 }
 
-export function runOnChangeWithStore<T, TChange>(observable: IObservable<T, TChange>, cb: (value: T, previousValue: undefined | T, deltas: RemoveUndefined<TChange>[], store: DisposableStore) => void): IDisposable {
+export function runOnChangeWithStore<T, TChange>(observable: IObservableWithChange<T, TChange>, cb: (value: T, previousValue: undefined | T, deltas: RemoveUndefined<TChange>[], store: DisposableStore) => void): IDisposable {
 	const store = new DisposableStore();
 	const disposable = runOnChange(observable, (value, previousValue: undefined | T, deltas) => {
 		store.clear();
diff --git a/src/vs/base/test/common/observable.test.ts b/src/vs/base/test/common/observable.test.ts
index 3d7ed472fcd..5d33ac30a9c 100644
--- a/src/vs/base/test/common/observable.test.ts
+++ b/src/vs/base/test/common/observable.test.ts
@@ -8,7 +8,7 @@ import { setUnexpectedErrorHandler } from '../../common/errors.js';
 import { Emitter, Event } from '../../common/event.js';
 import { DisposableStore } from '../../common/lifecycle.js';
 import { autorun, autorunHandleChanges, derived, derivedDisposable, IObservable, IObserver, ISettableObservable, ITransaction, keepObserved, observableFromEvent, observableSignal, observableValue, transaction, waitForState } from '../../common/observable.js';
-import { BaseObservable } from '../../common/observableInternal/base.js';
+import { BaseObservable, IObservableWithChange } from '../../common/observableInternal/base.js';
 import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
 
 suite('observables', () => {
@@ -1486,18 +1486,18 @@ export class LoggingObserver implements IObserver {
 	constructor(public readonly debugName: string, private readonly log: Log) {
 	}
 
-	beginUpdate<T>(observable: IObservable<T, void>): void {
+	beginUpdate<T>(observable: IObservable<T>): void {
 		this.count++;
 		this.log.log(`${this.debugName}.beginUpdate (count ${this.count})`);
 	}
-	endUpdate<T>(observable: IObservable<T, void>): void {
+	endUpdate<T>(observable: IObservable<T>): void {
 		this.log.log(`${this.debugName}.endUpdate (count ${this.count})`);
 		this.count--;
 	}
-	handleChange<T, TChange>(observable: IObservable<T, TChange>, change: TChange): void {
+	handleChange<T, TChange>(observable: IObservableWithChange<T, TChange>, change: TChange): void {
 		this.log.log(`${this.debugName}.handleChange (count ${this.count})`);
 	}
-	handlePossibleChange<T>(observable: IObservable<T, unknown>): void {
+	handlePossibleChange<T>(observable: IObservable<T>): void {
 		this.log.log(`${this.debugName}.handlePossibleChange`);
 	}
 }
diff --git a/src/vs/editor/browser/observableCodeEditor.ts b/src/vs/editor/browser/observableCodeEditor.ts
index 3633d4cac45..ac1ab182fa4 100644
--- a/src/vs/editor/browser/observableCodeEditor.ts
+++ b/src/vs/editor/browser/observableCodeEditor.ts
@@ -5,7 +5,7 @@
 
 import { equalsIfDefined, itemsEquals } from '../../base/common/equals.js';
 import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../base/common/lifecycle.js';
-import { IObservable, ITransaction, TransactionImpl, autorun, autorunOpts, derived, derivedOpts, derivedWithSetter, observableFromEvent, observableSignal, observableValue, observableValueOpts } from '../../base/common/observable.js';
+import { IObservable, IObservableWithChange, ITransaction, TransactionImpl, autorun, autorunOpts, derived, derivedOpts, derivedWithSetter, observableFromEvent, observableSignal, observableValue, observableValueOpts } from '../../base/common/observable.js';
 import { EditorOption, FindComputedEditorOptionValueById } from '../common/config/editorOptions.js';
 import { LineRange } from '../common/core/lineRange.js';
 import { OffsetRange } from '../common/core/offsetRange.js';
@@ -155,13 +155,13 @@ export class ObservableCodeEditor extends Disposable {
 	public readonly isReadonly = observableFromEvent(this, this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.readOnly));
 
 	private readonly _versionId = observableValueOpts<number | null, IModelContentChangedEvent | undefined>({ owner: this, lazy: true }, this.editor.getModel()?.getVersionId() ?? null);
-	public readonly versionId: IObservable<number | null, IModelContentChangedEvent | undefined> = this._versionId;
+	public readonly versionId: IObservableWithChange<number | null, IModelContentChangedEvent | undefined> = this._versionId;
 
 	private readonly _selections = observableValueOpts<Selection[] | null, ICursorSelectionChangedEvent | undefined>(
 		{ owner: this, equalsFn: equalsIfDefined(itemsEquals(Selection.selectionsEqual)), lazy: true },
 		this.editor.getSelections() ?? null
 	);
-	public readonly selections: IObservable<Selection[] | null, ICursorSelectionChangedEvent | undefined> = this._selections;
+	public readonly selections: IObservableWithChange<Selection[] | null, ICursorSelectionChangedEvent | undefined> = this._selections;
 
 
 	public readonly positions = derivedOpts<readonly Position[] | null>(
diff --git a/src/vs/editor/browser/widget/diffEditor/components/diffEditorSash.ts b/src/vs/editor/browser/widget/diffEditor/components/diffEditorSash.ts
index 8abaddcceb9..468e6323c7f 100644
--- a/src/vs/editor/browser/widget/diffEditor/components/diffEditorSash.ts
+++ b/src/vs/editor/browser/widget/diffEditor/components/diffEditorSash.ts
@@ -62,7 +62,7 @@ export class DiffEditorSash extends Disposable {
 		private readonly _domNode: HTMLElement,
 		private readonly _dimensions: { height: IObservable<number>; width: IObservable<number> },
 		private readonly _enabled: IObservable<boolean>,
-		private readonly _boundarySashes: IObservable<IBoundarySashes | undefined, void>,
+		private readonly _boundarySashes: IObservable<IBoundarySashes | undefined>,
 		public readonly sashLeft: ISettableObservable<number>,
 		private readonly _resetSash: () => void,
 	) {
diff --git a/src/vs/editor/browser/widget/diffEditor/diffEditorOptions.ts b/src/vs/editor/browser/widget/diffEditor/diffEditorOptions.ts
index 0c1a533681f..3d2e483ca15 100644
--- a/src/vs/editor/browser/widget/diffEditor/diffEditorOptions.ts
+++ b/src/vs/editor/browser/widget/diffEditor/diffEditorOptions.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IObservable, ISettableObservable, derived, derivedConstOnceDefined, observableFromEvent, observableValue } from '../../../../base/common/observable.js';
+import { IObservable, IObservableWithChange, ISettableObservable, derived, derivedConstOnceDefined, observableFromEvent, observableValue } from '../../../../base/common/observable.js';
 import { Constants } from '../../../../base/common/uint.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
 import { diffEditorDefaultOptions } from '../../../common/config/diffEditor.js';
@@ -15,7 +15,7 @@ import { DiffEditorViewModel, DiffState } from './diffEditorViewModel.js';
 export class DiffEditorOptions {
 	private readonly _options: ISettableObservable<IEditorOptions & Required<IDiffEditorBaseOptions>, { changedOptions: IDiffEditorOptions }>;
 
-	public get editorOptions(): IObservable<IEditorOptions, { changedOptions: IEditorOptions }> { return this._options; }
+	public get editorOptions(): IObservableWithChange<IEditorOptions, { changedOptions: IEditorOptions }> { return this._options; }
 
 	private readonly _diffEditorWidth = observableValue<number>(this, 0);
 
diff --git a/src/vs/editor/browser/widget/diffEditor/features/gutterFeature.ts b/src/vs/editor/browser/widget/diffEditor/features/gutterFeature.ts
index 556378aebf3..17ff41896b4 100644
--- a/src/vs/editor/browser/widget/diffEditor/features/gutterFeature.ts
+++ b/src/vs/editor/browser/widget/diffEditor/features/gutterFeature.ts
@@ -50,7 +50,7 @@ export class DiffEditorGutter extends Disposable {
 		private readonly _editors: DiffEditorEditors,
 		private readonly _options: DiffEditorOptions,
 		private readonly _sashLayout: SashLayout,
-		private readonly _boundarySashes: IObservable<IBoundarySashes | undefined, void>,
+		private readonly _boundarySashes: IObservable<IBoundarySashes | undefined>,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
 		@IMenuService private readonly _menuService: IMenuService,
diff --git a/src/vs/editor/browser/widget/diffEditor/utils.ts b/src/vs/editor/browser/widget/diffEditor/utils.ts
index d34d60fd457..47faca2f8cf 100644
--- a/src/vs/editor/browser/widget/diffEditor/utils.ts
+++ b/src/vs/editor/browser/widget/diffEditor/utils.ts
@@ -7,7 +7,7 @@ import { IDimension } from '../../../../base/browser/dom.js';
 import { findLast } from '../../../../base/common/arraysFind.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { Disposable, DisposableStore, IDisposable, IReference, toDisposable } from '../../../../base/common/lifecycle.js';
-import { IObservable, ISettableObservable, autorun, autorunHandleChanges, autorunOpts, autorunWithStore, observableValue, transaction } from '../../../../base/common/observable.js';
+import { IObservable, IObservableWithChange, ISettableObservable, autorun, autorunHandleChanges, autorunOpts, autorunWithStore, observableValue, transaction } from '../../../../base/common/observable.js';
 import { ElementSizeObserver } from '../../config/elementSizeObserver.js';
 import { ICodeEditor, IOverlayWidget, IViewZone } from '../../editorBrowser.js';
 import { Position } from '../../../common/core/position.js';
@@ -126,7 +126,7 @@ export class ObservableElementSizeObserver extends Disposable {
 	}
 }
 
-export function animatedObservable(targetWindow: Window, base: IObservable<number, boolean>, store: DisposableStore): IObservable<number> {
+export function animatedObservable(targetWindow: Window, base: IObservableWithChange<number, boolean>, store: DisposableStore): IObservable<number> {
 	let targetVal = base.get();
 	let startVal = targetVal;
 	let curVal = targetVal;
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
index a15005e75fa..b77a2c0df81 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts
@@ -7,7 +7,7 @@ import { mapFindFirst } from '../../../../../base/common/arraysFind.js';
 import { itemsEquals } from '../../../../../base/common/equals.js';
 import { BugIndicatingError, onUnexpectedError, onUnexpectedExternalError } from '../../../../../base/common/errors.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
-import { IObservable, IReader, ITransaction, autorun, derived, derivedHandleChanges, derivedOpts, observableSignal, observableValue, recomputeInitiallyAndOnChange, subtransaction, transaction } from '../../../../../base/common/observable.js';
+import { IObservable, IObservableWithChange, IReader, ITransaction, autorun, derived, derivedHandleChanges, derivedOpts, observableSignal, observableValue, recomputeInitiallyAndOnChange, subtransaction, transaction } from '../../../../../base/common/observable.js';
 import { commonPrefixLength, firstNonWhitespaceIndex } from '../../../../../base/common/strings.js';
 import { isDefined } from '../../../../../base/common/types.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
@@ -63,7 +63,7 @@ export class InlineCompletionsModel extends Disposable {
 	constructor(
 		public readonly textModel: ITextModel,
 		private readonly _selectedSuggestItem: IObservable<SuggestItemInfo | undefined>,
-		public readonly _textModelVersionId: IObservable<number | null, IModelContentChangedEvent | undefined>,
+		public readonly _textModelVersionId: IObservableWithChange<number | null, IModelContentChangedEvent | undefined>,
 		private readonly _positions: IObservable<readonly Position[]>,
 		private readonly _debounceValue: IFeatureDebounceInformation,
 		private readonly _enabled: IObservable<boolean>,
diff --git a/src/vs/editor/test/browser/widget/observableCodeEditor.test.ts b/src/vs/editor/test/browser/widget/observableCodeEditor.test.ts
index d9144896afe..e8406d868f8 100644
--- a/src/vs/editor/test/browser/widget/observableCodeEditor.test.ts
+++ b/src/vs/editor/test/browser/widget/observableCodeEditor.test.ts
@@ -112,7 +112,7 @@ suite("CodeEditorWidget", () => {
 		}));
 
 	test("listener interaction (unforced)", () => {
-		let derived: IObservable<string, unknown>;
+		let derived: IObservable<string>;
 		let log: Log;
 		withEditorSetupTestFixture(
 			(editor, disposables) => {
@@ -143,7 +143,7 @@ suite("CodeEditorWidget", () => {
 	});
 
 	test("listener interaction ()", () => {
-		let derived: IObservable<string, unknown>;
+		let derived: IObservable<string>;
 		let log: Log;
 		withEditorSetupTestFixture(
 			(editor, disposables) => {
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.ts b/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.ts
index 63512ae0e38..2741b6681d4 100644
--- a/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.ts
+++ b/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.ts
@@ -12,7 +12,7 @@ import { LineRangeEdit } from './editing.js';
 import { LineRange } from './lineRange.js';
 import { ReentrancyBarrier } from '../../../../../base/common/controlFlow.js';
 import { IMergeDiffComputer } from './diffComputer.js';
-import { autorun, IObservable, IReader, ITransaction, observableSignal, observableValue, transaction } from '../../../../../base/common/observable.js';
+import { autorun, IObservableWithChange, IReader, ITransaction, observableSignal, observableValue, transaction } from '../../../../../base/common/observable.js';
 import { UndoRedoGroup } from '../../../../../platform/undoRedo/common/undoRedo.js';
 
 export class TextModelDiffs extends Disposable {
@@ -61,14 +61,14 @@ export class TextModelDiffs extends Disposable {
 		}));
 	}
 
-	public get state(): IObservable<TextModelDiffState, TextModelDiffChangeReason> {
+	public get state(): IObservableWithChange<TextModelDiffState, TextModelDiffChangeReason> {
 		return this._state;
 	}
 
 	/**
 	 * Diffs from base to input.
 	*/
-	public get diffs(): IObservable<DetailedLineRangeMapping[], TextModelDiffChangeReason> {
+	public get diffs(): IObservableWithChange<DetailedLineRangeMapping[], TextModelDiffChangeReason> {
 		return this._diffs;
 	}
 
diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.ts
index 552a657df4d..7ac61fbcb30 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.ts
@@ -24,7 +24,7 @@ import { navigationBearingFakeActionId } from '../../../../chat/browser/chatEdit
 export class NotebookChatActionsOverlayController extends Disposable {
 	constructor(
 		private readonly notebookEditor: INotebookEditor,
-		cellDiffInfo: IObservable<CellDiffInfo[] | undefined, unknown>,
+		cellDiffInfo: IObservable<CellDiffInfo[] | undefined>,
 		deletedCellDecorator: INotebookDeletedCellDecorator,
 		@IChatEditingService private readonly _chatEditingService: IChatEditingService,
 		@IInstantiationService instantiationService: IInstantiationService,
@@ -60,7 +60,7 @@ export class NotebookChatActionsOverlay extends Disposable {
 	constructor(
 		private readonly notebookEditor: INotebookEditor,
 		entry: IModifiedFileEntry,
-		cellDiffInfo: IObservable<CellDiffInfo[] | undefined, unknown>,
+		cellDiffInfo: IObservable<CellDiffInfo[] | undefined>,
 		nextEntry: IModifiedFileEntry,
 		previousEntry: IModifiedFileEntry,
 		deletedCellDecorator: INotebookDeletedCellDecorator,
@@ -196,7 +196,7 @@ export class NotebookChatActionsOverlay extends Disposable {
 class NextPreviousChangeActionRunner extends ActionRunner {
 	constructor(
 		private readonly notebookEditor: INotebookEditor,
-		private readonly cellDiffInfo: IObservable<CellDiffInfo[] | undefined, unknown>,
+		private readonly cellDiffInfo: IObservable<CellDiffInfo[] | undefined>,
 		private readonly entry: IModifiedFileEntry,
 		private readonly next: IModifiedFileEntry,
 		private readonly direction: 'next' | 'previous',
diff --git a/src/vs/workbench/contrib/testing/common/observableUtils.ts b/src/vs/workbench/contrib/testing/common/observableUtils.ts
index 3153f2e5bd8..9294c905002 100644
--- a/src/vs/workbench/contrib/testing/common/observableUtils.ts
+++ b/src/vs/workbench/contrib/testing/common/observableUtils.ts
@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IDisposable } from '../../../../base/common/lifecycle.js';
-import { IObservable, IObserver } from '../../../../base/common/observable.js';
+import { IObservableWithChange, IObserver } from '../../../../base/common/observable.js';
 
-export function onObservableChange<T>(observable: IObservable<unknown, T>, callback: (value: T) => void): IDisposable {
+export function onObservableChange<T>(observable: IObservableWithChange<unknown, T>, callback: (value: T) => void): IDisposable {
 	const o: IObserver = {
 		beginUpdate() { },
 		endUpdate() { },
 		handlePossibleChange(observable) {
 			observable.reportChanges();
 		},
-		handleChange<T2, TChange>(_observable: IObservable<T2, TChange>, change: TChange) {
+		handleChange<T2, TChange>(_observable: IObservableWithChange<T2, TChange>, change: TChange) {
 			callback(change as any as T);
 		}
 	};

From 83c336d7d606a8d2c6f50c403a7fecc770e20cbe Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Fri, 20 Dec 2024 20:01:59 +0100
Subject: [PATCH 455/479] Log when a derived gets cleared (#236739)

---
 src/vs/base/common/observableInternal/derived.ts |  1 +
 src/vs/base/common/observableInternal/logging.ts | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/src/vs/base/common/observableInternal/derived.ts b/src/vs/base/common/observableInternal/derived.ts
index 5421b023df9..54a1e99296d 100644
--- a/src/vs/base/common/observableInternal/derived.ts
+++ b/src/vs/base/common/observableInternal/derived.ts
@@ -220,6 +220,7 @@ export class Derived<T, TChangeSummary = any> extends BaseObservable<T, void> im
 		 */
 		this.state = DerivedState.initial;
 		this.value = undefined;
+		getLogger()?.handleDerivedCleared(this);
 		for (const d of this.dependencies) {
 			d.removeObserver(this);
 		}
diff --git a/src/vs/base/common/observableInternal/logging.ts b/src/vs/base/common/observableInternal/logging.ts
index 8dc526a45be..f0bc82170d8 100644
--- a/src/vs/base/common/observableInternal/logging.ts
+++ b/src/vs/base/common/observableInternal/logging.ts
@@ -48,6 +48,7 @@ export interface IObservableLogger {
 
 	handleDerivedCreated(observable: Derived<any>): void;
 	handleDerivedRecomputed(observable: Derived<any>, info: IChangeInformation): void;
+	handleDerivedCleared(observable: Derived<any>): void;
 
 	handleBeginTransaction(transaction: TransactionImpl): void;
 	handleEndTransaction(): void;
@@ -170,6 +171,15 @@ export class ConsoleObservableLogger implements IObservableLogger {
 		changedObservables.clear();
 	}
 
+	handleDerivedCleared(derived: Derived<unknown>): void {
+		if (!this._isIncluded(derived)) { return; }
+
+		console.log(...this.textToConsoleArgs([
+			formatKind('derived cleared'),
+			styled(derived.debugName, { color: 'BlueViolet' }),
+		]));
+	}
+
 	handleFromEventObservableTriggered(observable: FromEventObservable<any, any>, info: IChangeInformation): void {
 		if (!this._isIncluded(observable)) { return; }
 

From b9f07f1e9478a470353503582e8f5192a84a65e9 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Fri, 20 Dec 2024 20:02:18 +0100
Subject: [PATCH 456/479] Adds color descriptions. (#236741)

---
 .../view/inlineEdits/gutterIndicatorView.ts   | 40 +++++++++++++++----
 .../browser/view/inlineEdits/indicatorView.ts |  9 ++---
 .../view/inlineEdits/sideBySideDiff.ts        | 18 ++++-----
 .../view/inlineEdits/wordReplacementView.ts   |  4 +-
 4 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts
index 739f12b4feb..a3d7dcddbc1 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts
@@ -17,15 +17,39 @@ import { OffsetRange } from '../../../../../common/core/offsetRange.js';
 import { StickyScrollController } from '../../../../stickyScroll/browser/stickyScrollController.js';
 import { InlineCompletionsModel } from '../../model/inlineCompletionsModel.js';
 import { mapOutFalsy, n, rectToProps } from './utils.js';
+import { localize } from '../../../../../../nls.js';
+export const inlineEditIndicatorPrimaryForeground = registerColor(
+	'inlineEdit.gutterIndicator.primaryForeground',
+	buttonForeground,
+	localize('inlineEdit.gutterIndicator.primaryForeground', 'Foreground color for the primary inline edit gutter indicator.')
+);
+export const inlineEditIndicatorPrimaryBackground = registerColor(
+	'inlineEdit.gutterIndicator.primaryBackground',
+	buttonBackground,
+	localize('inlineEdit.gutterIndicator.primaryBackground', 'Background color for the primary inline edit gutter indicator.')
+);
 
-export const inlineEditIndicatorPrimaryForeground = registerColor('inlineEdit.gutterIndicator.primaryForeground', buttonForeground, 'Foreground color for the primary inline edit gutter indicator.');
-export const inlineEditIndicatorPrimaryBackground = registerColor('inlineEdit.gutterIndicator.primaryBackground', buttonBackground, 'Background color for the primary inline edit gutter indicator.');
-
-export const inlineEditIndicatorSecondaryForeground = registerColor('inlineEdit.gutterIndicator.secondaryForeground', buttonSecondaryForeground, 'Foreground color for the secondary inline edit gutter indicator.');
-export const inlineEditIndicatorSecondaryBackground = registerColor('inlineEdit.gutterIndicator.secondaryBackground', buttonSecondaryBackground, 'Background color for the secondary inline edit gutter indicator.');
+export const inlineEditIndicatorSecondaryForeground = registerColor(
+	'inlineEdit.gutterIndicator.secondaryForeground',
+	buttonSecondaryForeground,
+	localize('inlineEdit.gutterIndicator.secondaryForeground', 'Foreground color for the secondary inline edit gutter indicator.')
+);
+export const inlineEditIndicatorSecondaryBackground = registerColor(
+	'inlineEdit.gutterIndicator.secondaryBackground',
+	buttonSecondaryBackground,
+	localize('inlineEdit.gutterIndicator.secondaryBackground', 'Background color for the secondary inline edit gutter indicator.')
+);
 
-export const inlineEditIndicatorsuccessfulForeground = registerColor('inlineEdit.gutterIndicator.successfulForeground', buttonForeground, 'Foreground color for the successful inline edit gutter indicator.');
-export const inlineEditIndicatorsuccessfulBackground = registerColor('inlineEdit.gutterIndicator.successfulBackground', { light: '#2e825c', dark: '#2e825c', hcLight: '#2e825c', hcDark: '#2e825c' }, 'Background color for the successful inline edit gutter indicator.');
+export const inlineEditIndicatorsuccessfulForeground = registerColor(
+	'inlineEdit.gutterIndicator.successfulForeground',
+	buttonForeground,
+	localize('inlineEdit.gutterIndicator.successfulForeground', 'Foreground color for the successful inline edit gutter indicator.')
+);
+export const inlineEditIndicatorsuccessfulBackground = registerColor(
+	'inlineEdit.gutterIndicator.successfulBackground',
+	{ light: '#2e825c', dark: '#2e825c', hcLight: '#2e825c', hcDark: '#2e825c' },
+	localize('inlineEdit.gutterIndicator.successfulBackground', 'Background color for the successful inline edit gutter indicator.')
+);
 
 export const inlineEditIndicatorBackground = registerColor(
 	'inlineEdit.gutterIndicator.background',
@@ -35,7 +59,7 @@ export const inlineEditIndicatorBackground = registerColor(
 		dark: transparent('tab.inactiveBackground', 0.5),
 		light: '#5f5f5f18',
 	},
-	'Background color for the inline edit gutter indicator.'
+	localize('inlineEdit.gutterIndicator.background', 'Background color for the inline edit gutter indicator.')
 );
 
 
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/indicatorView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/indicatorView.ts
index f5845663658..00b129bbbfb 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/indicatorView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/indicatorView.ts
@@ -13,16 +13,15 @@ import { registerColor } from '../../../../../../platform/theme/common/colorUtil
 import { ObservableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
 import { OffsetRange } from '../../../../../common/core/offsetRange.js';
 import { InlineCompletionsModel } from '../../model/inlineCompletionsModel.js';
+import { localize } from '../../../../../../nls.js';
 
 export interface IInlineEditsIndicatorState {
 	editTop: number;
 	showAlways: boolean;
 }
-
-
-export const inlineEditIndicatorForeground = registerColor('inlineEdit.indicator.foreground', buttonForeground, '');
-export const inlineEditIndicatorBackground = registerColor('inlineEdit.indicator.background', buttonBackground, '');
-export const inlineEditIndicatorBorder = registerColor('inlineEdit.indicator.border', buttonSeparator, '');
+export const inlineEditIndicatorForeground = registerColor('inlineEdit.indicator.foreground', buttonForeground, localize('inlineEdit.indicator.foreground', 'Foreground color for the inline edit indicator.'));
+export const inlineEditIndicatorBackground = registerColor('inlineEdit.indicator.background', buttonBackground, localize('inlineEdit.indicator.background', 'Background color for the inline edit indicator.'));
+export const inlineEditIndicatorBorder = registerColor('inlineEdit.indicator.border', buttonSeparator, localize('inlineEdit.indicator.border', 'Border color for the inline edit indicator.'));
 
 export class InlineEditsIndicator extends Disposable {
 	private readonly _indicator = h('div.inline-edits-view-indicator', {
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
index 042dc653cf9..7198e4870e9 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
@@ -32,48 +32,48 @@ import { InlineCompletionContextKeys } from '../../controller/inlineCompletionCo
 import { CustomizedMenuWorkbenchToolBar } from '../../hintsWidget/inlineCompletionsHintsWidget.js';
 import { PathBuilder, StatusBarViewItem, getOffsetForPos, mapOutFalsy, maxContentWidthInRange, n } from './utils.js';
 import { InlineEditWithChanges } from './viewAndDiffProducer.js';
+import { localize } from '../../../../../../nls.js';
 
 export const originalBackgroundColor = registerColor(
 	'inlineEdit.originalBackground',
 	Color.transparent,
-	'',
+	localize('inlineEdit.originalBackground', 'Background color for the original text in inline edits.'),
 	true
 );
 export const modifiedBackgroundColor = registerColor(
 	'inlineEdit.modifiedBackground',
 	Color.transparent,
-	'',
+	localize('inlineEdit.modifiedBackground', 'Background color for the modified text in inline edits.'),
 	true
 );
 
 export const originalChangedLineBackgroundColor = registerColor(
 	'inlineEdit.originalChangedLineBackground',
 	Color.transparent,
-	'',
+	localize('inlineEdit.originalChangedLineBackground', 'Background color for the changed lines in the original text of inline edits.'),
 	true
 );
 
 export const originalChangedTextOverlayColor = registerColor(
 	'inlineEdit.originalChangedTextBackground',
 	diffRemoved,
-	'',
+	localize('inlineEdit.originalChangedTextBackground', 'Overlay color for the changed text in the original text of inline edits.'),
 	true
 );
 
 export const modifiedChangedLineBackgroundColor = registerColor(
 	'inlineEdit.modifiedChangedLineBackground',
 	Color.transparent,
-	'',
+	localize('inlineEdit.modifiedChangedLineBackground', 'Background color for the changed lines in the modified text of inline edits.'),
 	true
 );
 
 export const modifiedChangedTextOverlayColor = registerColor(
 	'inlineEdit.modifiedChangedTextBackground',
 	diffInserted,
-	'',
+	localize('inlineEdit.modifiedChangedTextBackground', 'Overlay color for the changed text in the modified text of inline edits.'),
 	true
 );
-
 export const originalBorder = registerColor(
 	'inlineEdit.originalBorder',
 	{
@@ -82,7 +82,7 @@ export const originalBorder = registerColor(
 		hcDark: editorLineHighlightBorder,
 		hcLight: editorLineHighlightBorder
 	},
-	''
+	localize('inlineEdit.originalBorder', 'Border color for the original text in inline edits.')
 );
 
 export const modifiedBorder = registerColor(
@@ -93,7 +93,7 @@ export const modifiedBorder = registerColor(
 		hcDark: editorLineHighlightBorder,
 		hcLight: editorLineHighlightBorder
 	},
-	''
+	localize('inlineEdit.modifiedBorder', 'Border color for the modified text in inline edits.')
 );
 
 export class InlineEditsSideBySideDiff extends Disposable {
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/wordReplacementView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/wordReplacementView.ts
index 6e6f213d38a..19f28075c33 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/wordReplacementView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/wordReplacementView.ts
@@ -19,7 +19,7 @@ import { ILanguageService } from '../../../../../common/languages/language.js';
 import { LineTokens } from '../../../../../common/tokens/lineTokens.js';
 import { TokenArray } from '../../../../../common/tokens/tokenArray.js';
 import { mapOutFalsy, n, rectToProps } from './utils.js';
-
+import { localize } from '../../../../../../nls.js';
 export const transparentHoverBackground = registerColor(
 	'inlineEdit.wordReplacementView.background',
 	{
@@ -28,7 +28,7 @@ export const transparentHoverBackground = registerColor(
 		hcLight: transparent(editorHoverStatusBarBackground, 0.1),
 		hcDark: transparent(editorHoverStatusBarBackground, 0.1),
 	},
-	'Background color for the inline edit word replacement view.'
+	localize('inlineEdit.wordReplacementView.background', 'Background color for the inline edit word replacement view.')
 );
 
 export class WordReplacementView extends Disposable {

From 5d5976d10cde46dabc31bf264f637b8f6da413a9 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Fri, 20 Dec 2024 11:22:59 -0800
Subject: [PATCH 457/479] fix: macos external terminal not opening in darkwin
 remotes (#236426)

Closes #236425
---
 build/gulpfile.reh.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
index 4f00317173d..e0df76f1c8f 100644
--- a/build/gulpfile.reh.js
+++ b/build/gulpfile.reh.js
@@ -63,6 +63,9 @@ const serverResourceIncludes = [
 	'out-build/vs/base/node/cpuUsage.sh',
 	'out-build/vs/base/node/ps.sh',
 
+	// External Terminal
+	'out-build/vs/workbench/contrib/externalTerminal/**/*.scpt',
+
 	// Terminal shell integration
 	'out-build/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1',
 	'out-build/vs/workbench/contrib/terminal/common/scripts/CodeTabExpansion.psm1',

From 9ee30e50da91f818e60c1c3ccf156f64c097bff1 Mon Sep 17 00:00:00 2001
From: Megan Rogge <merogge@microsoft.com>
Date: Fri, 20 Dec 2024 14:05:31 -0600
Subject: [PATCH 458/479] fix terminal completion issues with
 `replacementIndex` (#236728)

fix replacement index weirdness + more
---
 .../suggest/browser/terminalSuggestAddon.ts          | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
index f750d76f089..52d7c1b8c37 100644
--- a/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+++ b/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
@@ -64,7 +64,6 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 	private _leadingLineContent?: string;
 	private _cursorIndexDelta: number = 0;
 	private _requestedCompletionsIndex: number = 0;
-	private _providerReplacementIndex: number = 0;
 
 	private _lastUserData?: string;
 	static lastAcceptedCompletionTimestamp: number = 0;
@@ -171,11 +170,6 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		}
 		this._onDidReceiveCompletions.fire();
 
-		// ATM, the two providers calculate the same replacement index / prefix, so we can just take the first one
-		// TODO: figure out if we can add support for multiple replacement indices
-		const replacementIndices = [...new Set(providedCompletions.map(c => c.replacementIndex))];
-		const replacementIndex = replacementIndices.length === 1 ? replacementIndices[0] : 0;
-		this._providerReplacementIndex = replacementIndex;
 		this._requestedCompletionsIndex = this._promptInputModel.cursorIndex;
 
 		this._currentPromptInputState = {
@@ -186,7 +180,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 			ghostTextIndex: this._promptInputModel.ghostTextIndex
 		};
 
-		this._leadingLineContent = this._currentPromptInputState.prefix.substring(replacementIndex, replacementIndex + this._promptInputModel.cursorIndex + this._cursorIndexDelta);
+		this._leadingLineContent = this._currentPromptInputState.prefix.substring(0, this._requestedCompletionsIndex + this._cursorIndexDelta);
 
 		const completions = providedCompletions.flat();
 		if (!completions?.length) {
@@ -339,7 +333,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 
 		if (this._terminalSuggestWidgetVisibleContextKey.get()) {
 			this._cursorIndexDelta = this._currentPromptInputState.cursorIndex - (this._requestedCompletionsIndex);
-			let normalizedLeadingLineContent = this._currentPromptInputState.value.substring(this._providerReplacementIndex, this._requestedCompletionsIndex + this._cursorIndexDelta);
+			let normalizedLeadingLineContent = this._currentPromptInputState.value.substring(0, this._requestedCompletionsIndex + this._cursorIndexDelta);
 			if (this._isFilteringDirectories) {
 				normalizedLeadingLineContent = normalizePathSeparator(normalizedLeadingLineContent, this._pathSeparator);
 			}
@@ -458,7 +452,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 		// The replacement text is any text after the replacement index for the completions, this
 		// includes any text that was there before the completions were requested and any text added
 		// since to refine the completion.
-		const replacementText = currentPromptInputState.value.substring(suggestion.item.completion.replacementIndex ?? this._providerReplacementIndex, currentPromptInputState.cursorIndex);
+		const replacementText = currentPromptInputState.value.substring(suggestion.item.completion.replacementIndex, currentPromptInputState.cursorIndex);
 
 		// Right side of replacement text in the same word
 		let rightSideReplacementText = '';

From 3751af286f68efe9a7ef11315ed0bfb06b8b8c14 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <hdieterichs@microsoft.com>
Date: Fri, 20 Dec 2024 22:25:17 +0100
Subject: [PATCH 459/479] Implements inline edit indicator hover (#236738)

---
 .../browser/view/inlineCompletionsView.ts     |   2 +-
 .../view/inlineEdits/gutterIndicatorMenu.ts   | 152 ++++++++++++
 .../view/inlineEdits/gutterIndicatorView.ts   |  83 ++++++-
 .../view/inlineEdits/sideBySideDiff.ts        |   4 +-
 .../browser/view/inlineEdits/utils.ts         | 229 +++++++++++-------
 .../browser/view/inlineEdits/view.css         |  21 +-
 .../browser/view/inlineEdits/view.ts          |   4 +-
 7 files changed, 395 insertions(+), 100 deletions(-)
 create mode 100644 src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorMenu.ts

diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts
index baaf3c08205..fa303f3fc6e 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.ts
@@ -48,7 +48,7 @@ export class InlineCompletionsView extends Disposable {
 	constructor(
 		private readonly _editor: ICodeEditor,
 		private readonly _model: IObservable<InlineCompletionsModel | undefined>,
-		@IInstantiationService private readonly _instantiationService: IInstantiationService
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 	) {
 		super();
 
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorMenu.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorMenu.ts
new file mode 100644
index 00000000000..95168505a40
--- /dev/null
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorMenu.ts
@@ -0,0 +1,152 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { renderIcon } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { KeybindingLabel, unthemedKeybindingLabelOptions } from '../../../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { ResolvedKeybinding } from '../../../../../../base/common/keybindings.js';
+import { IObservable, autorun, constObservable, derived, derivedWithStore, observableFromEvent, observableValue } from '../../../../../../base/common/observable.js';
+import { OS } from '../../../../../../base/common/platform.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { localize } from '../../../../../../nls.js';
+import { ICommandService } from '../../../../../../platform/commands/common/commands.js';
+import { IContextKeyService } from '../../../../../../platform/contextkey/common/contextkey.js';
+import { IKeybindingService } from '../../../../../../platform/keybinding/common/keybinding.js';
+import { Command } from '../../../../../common/languages.js';
+import { AcceptInlineCompletion, HideInlineCompletion, JumpToNextInlineEdit } from '../../controller/commands.js';
+import { ChildNode, FirstFnArg, LiveElement, n } from './utils.js';
+
+export class GutterIndicatorMenuContent {
+	constructor(
+		private readonly _selectionOverride: IObservable<'jump' | 'accept' | undefined>,
+		private readonly _close: (focusEditor: boolean) => void,
+		private readonly _extensionCommands: IObservable<readonly Command[] | undefined>,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@IKeybindingService private readonly _keybindingService: IKeybindingService,
+		@ICommandService private readonly _commandService: ICommandService,
+	) {
+	}
+
+	public toDisposableLiveElement(): LiveElement {
+		return this._createHoverContent().toDisposableLiveElement();
+	}
+
+	private _createHoverContent() {
+		const activeElement = observableValue<string | undefined>('active', undefined);
+		const activeElementOrDefault = derived(reader => this._selectionOverride.read(reader) ?? activeElement.read(reader));
+
+		const createOptionArgs = (options: { id: string; title: string; icon: ThemeIcon; commandId: string; commandArgs?: unknown[] }): FirstFnArg<typeof option> => {
+			return {
+				title: options.title,
+				icon: options.icon,
+				keybinding: this._getKeybinding(options.commandArgs ? undefined : options.commandId),
+				isActive: activeElementOrDefault.map(v => v === options.id),
+				onHoverChange: v => activeElement.set(v ? options.id : undefined, undefined),
+				onAction: () => {
+					this._close(true);
+					return this._commandService.executeCommand(options.commandId, ...(options.commandArgs ?? []));
+				},
+			};
+		};
+
+		// TODO make this menu contributable!
+		return hoverContent([
+			// TODO: make header dynamic, get from extension
+			header(localize('inlineEdit', "Inline Edit")),
+			option(createOptionArgs({ id: 'jump', title: localize('jump', "Jump"), icon: Codicon.arrowRight, commandId: new JumpToNextInlineEdit().id })),
+			option(createOptionArgs({ id: 'accept', title: localize('accept', "Accept"), icon: Codicon.check, commandId: new AcceptInlineCompletion().id })),
+			option(createOptionArgs({ id: 'reject', title: localize('reject', "Reject"), icon: Codicon.close, commandId: new HideInlineCompletion().id })),
+			separator(),
+			this._extensionCommands?.map(c => c && c.length > 0 ? [
+				...c.map(c => option(createOptionArgs({ id: c.id, title: c.title, icon: Codicon.symbolEvent, commandId: c.id, commandArgs: c.arguments }))),
+				separator()
+			] : []),
+			option(createOptionArgs({ id: 'settings', title: localize('settings', "Settings"), icon: Codicon.gear, commandId: 'workbench.action.openSettings', commandArgs: ['inlineSuggest.edits'] })),
+		]);
+	}
+
+	private _getKeybinding(commandId: string | undefined) {
+		if (!commandId) {
+			return constObservable(undefined);
+		}
+		return observableFromEvent(this._contextKeyService.onDidChangeContext, () => this._keybindingService.lookupKeybinding(commandId, this._contextKeyService, true));
+	}
+}
+
+function hoverContent(content: ChildNode) {
+	return n.div({
+		class: 'content',
+		style: {
+			margin: 4,
+			minWidth: 150,
+		}
+	}, content);
+}
+
+function header(title: string) {
+	return n.div({
+		class: 'header',
+		style: {
+			color: 'var(--vscode-descriptionForeground)',
+			fontSize: '12px',
+			fontWeight: '600',
+			padding: '0 10px',
+			lineHeight: 26,
+		}
+	}, [title]);
+}
+
+function option(props: {
+	title: string;
+	icon: ThemeIcon;
+	keybinding: IObservable<ResolvedKeybinding | undefined>;
+	isActive?: IObservable<boolean>;
+	onHoverChange?: (isHovered: boolean) => void;
+	onAction?: () => void;
+}) {
+	return derivedWithStore((_reader, store) => n.div({
+		class: ['monaco-menu-option', props.isActive?.map(v => v && 'active')],
+		onmouseenter: () => props.onHoverChange?.(true),
+		onmouseleave: () => props.onHoverChange?.(false),
+		onclick: props.onAction,
+		onkeydown: e => {
+			if (e.key === 'Enter') {
+				props.onAction?.();
+			}
+		},
+		tabIndex: 0,
+	}, [
+		n.elem('span', {
+			style: {
+				fontSize: 16,
+				display: 'flex',
+			}
+		}, [renderIcon(props.icon)]),
+		n.elem('span', {}, [props.title]),
+		n.div({
+			style: { marginLeft: 'auto', opacity: '0.6' },
+			ref: elem => {
+				const keybindingLabel = store.add(new KeybindingLabel(elem, OS, { disableTitle: true, ...unthemedKeybindingLabelOptions }));
+				store.add(autorun(reader => {
+					keybindingLabel.set(props.keybinding.read(reader));
+				}));
+			}
+		})
+	]));
+}
+
+function separator() {
+	return n.div({
+		class: 'menu-separator',
+		style: {
+			color: 'var(--vscode-editorActionList-foreground)',
+			padding: '2px 0',
+		}
+	}, n.div({
+		style: {
+			borderBottom: '1px solid var(--vscode-editorHoverWidget-border)',
+		}
+	}));
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts
index a3d7dcddbc1..e0a1ce126d0 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/gutterIndicatorView.ts
@@ -6,16 +6,21 @@
 import { renderIcon } from '../../../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
-import { IObservable, constObservable, derived, observableFromEvent } from '../../../../../../base/common/observable.js';
+import { IObservable, autorun, constObservable, derived, observableFromEvent, observableValue } from '../../../../../../base/common/observable.js';
+import { IHoverService } from '../../../../../../platform/hover/browser/hover.js';
+import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { buttonBackground, buttonForeground, buttonSecondaryBackground, buttonSecondaryForeground } from '../../../../../../platform/theme/common/colorRegistry.js';
 import { registerColor, transparent } from '../../../../../../platform/theme/common/colorUtils.js';
 import { ObservableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
 import { Rect } from '../../../../../browser/rect.js';
+import { HoverService } from '../../../../../browser/services/hoverService/hoverService.js';
+import { HoverWidget } from '../../../../../browser/services/hoverService/hoverWidget.js';
 import { EditorOption } from '../../../../../common/config/editorOptions.js';
 import { LineRange } from '../../../../../common/core/lineRange.js';
 import { OffsetRange } from '../../../../../common/core/offsetRange.js';
 import { StickyScrollController } from '../../../../stickyScroll/browser/stickyScrollController.js';
 import { InlineCompletionsModel } from '../../model/inlineCompletionsModel.js';
+import { GutterIndicatorMenuContent } from './gutterIndicatorMenu.js';
 import { mapOutFalsy, n, rectToProps } from './utils.js';
 import { localize } from '../../../../../../nls.js';
 export const inlineEditIndicatorPrimaryForeground = registerColor(
@@ -62,12 +67,14 @@ export const inlineEditIndicatorBackground = registerColor(
 	localize('inlineEdit.gutterIndicator.background', 'Background color for the inline edit gutter indicator.')
 );
 
-
 export class InlineEditsGutterIndicator extends Disposable {
 	constructor(
 		private readonly _editorObs: ObservableCodeEditor,
 		private readonly _originalRange: IObservable<LineRange | undefined>,
 		private readonly _model: IObservable<InlineCompletionsModel | undefined>,
+		private readonly _shouldShowHover: IObservable<boolean>,
+		@IHoverService private readonly _hoverService: HoverService,
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 	) {
 		super();
 
@@ -77,6 +84,14 @@ export class InlineEditsGutterIndicator extends Disposable {
 			allowEditorOverflow: false,
 			minContentWidthInPx: constObservable(0),
 		}));
+
+		this._register(autorun(reader => {
+			if (this._shouldShowHover.read(reader)) {
+				this._showHover();
+			} else {
+				this._hoverService.hideHover();
+			}
+		}));
 	}
 
 	private readonly _originalRangeObs = mapOutFalsy(this._originalRange);
@@ -132,44 +147,88 @@ export class InlineEditsGutterIndicator extends Disposable {
 
 	private readonly _tabAction = derived(this, reader => {
 		const m = this._model.read(reader);
-		if (m && m.tabShouldJumpToInlineEdit.read(reader)) { return 'jump' as const; }
-		if (m && m.tabShouldAcceptInlineEdit.read(reader)) { return 'accept' as const; }
+		if (this._editorObs.isFocused.read(reader)) {
+			if (m && m.tabShouldJumpToInlineEdit.read(reader)) { return 'jump' as const; }
+			if (m && m.tabShouldAcceptInlineEdit.read(reader)) { return 'accept' as const; }
+		}
 		return 'inactive' as const;
 	});
 
 	private readonly _onClickAction = derived(this, reader => {
 		if (this._layout.map(d => d && d.docked).read(reader)) {
 			return {
-				label: 'Click to accept inline edit',
+				selectionOverride: 'accept' as const,
 				action: () => { this._model.get()?.accept(); }
 			};
 		} else {
 			return {
-				label: 'Click to jump to inline edit',
+				selectionOverride: 'jump' as const,
 				action: () => { this._model.get()?.jump(); }
 			};
 		}
 	});
 
+	private readonly _iconRef = n.ref<HTMLDivElement>();
+	private _hoverVisible: boolean = false;
+	private readonly _isHoveredOverIcon = observableValue(this, false);
+	private readonly _hoverSelectionOverride = derived(this, reader => this._isHoveredOverIcon.read(reader) ? this._onClickAction.read(reader).selectionOverride : undefined);
+
+	private _showHover(): void {
+		if (this._hoverVisible) {
+			return;
+		}
+
+		const content = this._instantiationService.createInstance(
+			GutterIndicatorMenuContent,
+			this._hoverSelectionOverride,
+			(focusEditor) => {
+				h?.dispose();
+				if (focusEditor) {
+					this._editorObs.editor.focus();
+				}
+			},
+			this._model.map((m, r) => m?.state.read(r)?.inlineCompletion?.inlineCompletion.source.inlineCompletions.commands),
+		).toDisposableLiveElement();
+		const h = this._hoverService.showHover({
+			target: this._iconRef.element,
+			content: content.element,
+		}) as HoverWidget | undefined;
+		if (h) {
+			this._hoverVisible = true;
+			h.onDispose(() => {
+				content.dispose();
+				this._hoverVisible = false;
+			});
+		} else {
+			content.dispose();
+		}
+	}
+
 	private readonly _indicator = n.div({
 		class: 'inline-edits-view-gutter-indicator',
 		onclick: () => this._onClickAction.get().action(),
-		title: this._onClickAction.map(a => a.label),
 		style: {
 			position: 'absolute',
 			overflow: 'visible',
 		},
-	}, mapOutFalsy(this._layout).map(l => !l ? [] : [
+	}, mapOutFalsy(this._layout).map(layout => !layout ? [] : [
 		n.div({
 			style: {
 				position: 'absolute',
 				background: 'var(--vscode-inlineEdit-gutterIndicator-background)',
 				borderRadius: '4px',
-				...rectToProps(reader => l.read(reader).rect),
+				...rectToProps(reader => layout.read(reader).rect),
 			}
 		}),
 		n.div({
 			class: 'icon',
+			ref: this._iconRef,
+			onmouseenter: () => {
+				// TODO show hover when hovering ghost text etc.
+				this._isHoveredOverIcon.set(true, undefined);
+				this._showHover();
+			},
+			onmouseleave: () => { this._isHoveredOverIcon.set(false, undefined); },
 			style: {
 				cursor: 'pointer',
 				zIndex: '1000',
@@ -192,12 +251,12 @@ export class InlineEditsGutterIndicator extends Disposable {
 				display: 'flex',
 				justifyContent: 'center',
 				transition: 'background-color 0.2s ease-in-out',
-				...rectToProps(reader => l.read(reader).iconRect),
+				...rectToProps(reader => layout.read(reader).iconRect),
 			}
 		}, [
 			n.div({
 				style: {
-					rotate: l.map(l => {
+					rotate: layout.map(l => {
 						switch (l.arrowDirection) {
 							case 'right': return '0deg';
 							case 'bottom': return '90deg';
@@ -207,7 +266,7 @@ export class InlineEditsGutterIndicator extends Disposable {
 					transition: 'rotate 0.2s ease-in-out',
 				}
 			}, [
-				renderIcon(Codicon.arrowRight),
+				renderIcon(Codicon.arrowRight)
 			])
 		]),
 	])).keepUpdated(this._store);
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
index 7198e4870e9..e1feaa2eb8b 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/sideBySideDiff.ts
@@ -180,13 +180,15 @@ export class InlineEditsSideBySideDiff extends Disposable {
 	private readonly _editorContainerTopLeft = observableValue<IObservable<Point | undefined> | undefined>(this, undefined);
 
 	private readonly _editorContainer = n.div({
-		class: 'editorContainer',
+		class: ['editorContainer', this._editorObs.getOption(EditorOption.inlineSuggest).map(v => !v.edits.experimental.useGutterIndicator && 'showHover')],
 		style: { position: 'absolute' },
 	}, [
 		n.div({ class: 'preview', style: {}, ref: this.previewRef }),
 		n.div({ class: 'toolbar', style: {}, ref: this.toolbarRef }),
 	]).keepUpdated(this._store);
 
+	public readonly isHovered = this._editorContainer.getIsHovered(this._store);
+
 	protected readonly _toolbar = this._register(this._instantiationService.createInstance(CustomizedMenuWorkbenchToolBar, this.toolbarRef.element, MenuId.InlineEditsActions, {
 		menuOptions: { renderShortTitle: true },
 		toolbarOptions: {
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
index a70a0721491..57e0eb3393e 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getDomNodePagePosition, h, isSVGElement } from '../../../../../../base/browser/dom.js';
+import { addDisposableListener, getDomNodePagePosition, h, isSVGElement } from '../../../../../../base/browser/dom.js';
 import { KeybindingLabel, unthemedKeybindingLabelOptions } from '../../../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
 import { numberComparator } from '../../../../../../base/common/arrays.js';
 import { findFirstMin } from '../../../../../../base/common/arraysFind.js';
 import { BugIndicatingError } from '../../../../../../base/common/errors.js';
-import { Disposable, DisposableStore, toDisposable } from '../../../../../../base/common/lifecycle.js';
+import { DisposableStore, IDisposable, toDisposable } from '../../../../../../base/common/lifecycle.js';
 import { derived, derivedObservableWithCache, IObservable, IReader, observableValue, transaction } from '../../../../../../base/common/observable.js';
 import { OS } from '../../../../../../base/common/platform.js';
 import { getIndentationLength, splitLines } from '../../../../../../base/common/strings.js';
@@ -164,7 +164,7 @@ export class PathBuilder {
 }
 
 type Value<T> = T | IObservable<T>;
-type ValueOrList<T> = Value<T> | Value<T>[];
+type ValueOrList<T> = Value<T> | ValueOrList<T>[];
 type ValueOrList2<T> = ValueOrList<T> | ValueOrList<ValueOrList<T>>;
 
 type Element = HTMLElement | SVGElement;
@@ -203,16 +203,18 @@ type SVGElementTagNameMap2 = {
 type DomTagCreateFn<TMap extends Record<string, any>> =
 	<TTag extends keyof TMap>(
 		tag: TTag,
-		attributes: ElementAttributeKeys<TMap[TTag]> & { class?: Value<string | string[]>; ref?: IRef<TMap[TTag]> },
-		children?: ValueOrList2<Element | string | ObserverNode | undefined>,
+		attributes: ElementAttributeKeys<TMap[TTag]> & { class?: ValueOrList<string | false | undefined>; ref?: IRef<TMap[TTag]> },
+		children?: ChildNode,
 	) => ObserverNode<TMap[TTag]>;
 
 type DomCreateFn<TAttributes, TResult extends Element> =
 	(
-		attributes: ElementAttributeKeys<TAttributes> & { class?: Value<string | string[]>; ref?: IRef<TResult> },
-		children?: ValueOrList2<Element | string | ObserverNode | undefined>,
+		attributes: ElementAttributeKeys<TAttributes> & { class?: ValueOrList<string | false | undefined>; ref?: IRef<TResult> },
+		children?: ChildNode,
 	) => ObserverNode<TResult>;
 
+export type ChildNode = ValueOrList2<Element | string | ObserverNode | undefined>;
+
 export namespace n {
 	function nodeNs<TMap extends Record<string, any>>(elementNs: string | undefined = undefined): DomTagCreateFn<TMap> {
 		return (tag, attributes, children) => {
@@ -233,35 +235,37 @@ export namespace n {
 	}
 
 	export const div: DomCreateFn<HTMLDivElement, HTMLDivElement> = node<HTMLElementTagNameMap, 'div'>('div');
+
+	export const elem = nodeNs<HTMLElementTagNameMap>(undefined);
+
 	export const svg: DomCreateFn<SVGElementTagNameMap2['svg'], SVGElement> = node<SVGElementTagNameMap2, 'svg'>('svg', 'http://www.w3.org/2000/svg');
 
 	export const svgElem = nodeNs<SVGElementTagNameMap2>('http://www.w3.org/2000/svg');
 
-	export function ref<T = Element>(): Ref<T> {
-		return new Ref<T>();
+	export function ref<T = Element>(): IRefWithVal<T> {
+		let value: T | undefined = undefined;
+		const result: IRef<T> = function (val: T) {
+			value = val;
+		};
+		Object.defineProperty(result, 'element', {
+			get() {
+				if (!value) {
+					throw new BugIndicatingError('Make sure the ref is set before accessing the element. Maybe wrong initialization order?');
+				}
+				return value;
+			}
+		});
+		return result as any;
 	}
 }
 
-export interface IRef<T> {
-	setValue(value: T): void;
-}
-
-export class Ref<T> implements IRef<T> {
-	private _value: T | undefined = undefined;
-
-	public setValue(value: T): void {
-		this._value = value;
-	}
+export type IRef<T> = (value: T) => void;
 
-	public get element(): T {
-		if (!this._value) {
-			throw new BugIndicatingError('Make sure the ref is set before accessing the element. Maybe wrong initialization order?');
-		}
-		return this._value;
-	}
+export interface IRefWithVal<T> extends IRef<T> {
+	readonly element: T;
 }
 
-export abstract class ObserverNode<T extends Element = Element> extends Disposable {
+export abstract class ObserverNode<T extends Element = Element> {
 	private readonly _deriveds: (IObservable<any>)[] = [];
 
 	protected readonly _element: T;
@@ -270,48 +274,23 @@ export abstract class ObserverNode<T extends Element = Element> extends Disposab
 		tag: string,
 		ref: IRef<T> | undefined,
 		ns: string | undefined,
-		className: Value<string | string[]> | undefined,
+		className: ValueOrList<string | undefined | false> | undefined,
 		attributes: ElementAttributeKeys<T>,
-		children: ValueOrList2<Element | string | ObserverNode | undefined> | undefined,
+		children: ChildNode,
 	) {
-		super();
-
 		this._element = (ns ? document.createElementNS(ns, tag) : document.createElement(tag)) as unknown as T;
 		if (ref) {
-			ref.setValue(this._element);
-		}
-
-		function setClassName(domNode: Element, className: string | string[]) {
-			if (isSVGElement(domNode)) {
-				if (Array.isArray(className)) {
-					domNode.setAttribute('class', className.join(' '));
-				} else {
-					domNode.setAttribute('class', className);
-				}
-			} else {
-				if (Array.isArray(className)) {
-					domNode.className = className.join(' ');
-				} else {
-					domNode.className = className;
-				}
-			}
+			ref(this._element);
 		}
 
 		if (className) {
-			if (isObservable(className)) {
+			if (hasObservable(className)) {
 				this._deriveds.push(derived(this, reader => {
-					setClassName(this._element, className.read(reader));
+					setClassName(this._element, getClassName(className, reader));
 				}));
 			} else {
-				setClassName(this._element, className);
-			}
-		}
-
-		function convertCssValue(value: any): string {
-			if (typeof value === 'number') {
-				return value + 'px';
+				setClassName(this._element, getClassName(className, undefined));
 			}
-			return value;
 		}
 
 		for (const [key, value] of Object.entries(attributes)) {
@@ -347,36 +326,26 @@ export abstract class ObserverNode<T extends Element = Element> extends Disposab
 			}
 		}
 
-		function getChildren(reader: IReader | undefined, children: ValueOrList2<Element | string | ObserverNode | undefined>): (Element | string)[] {
-			if (isObservable(children)) {
-				return getChildren(reader, children.read(reader));
-			}
-			if (Array.isArray(children)) {
-				return children.flatMap(c => getChildren(reader, c));
-			}
-			if (children instanceof ObserverNode) {
-				if (reader) {
-					children.readEffect(reader);
+		if (children) {
+			function getChildren(reader: IReader | undefined, children: ValueOrList2<Element | string | ObserverNode | undefined>): (Element | string)[] {
+				if (isObservable(children)) {
+					return getChildren(reader, children.read(reader));
 				}
-				return [children._element];
-			}
-			if (children) {
-				return [children];
-			}
-			return [];
-		}
-
-		function childrenIsObservable(children: ValueOrList2<Element | string | ObserverNode | undefined>): boolean {
-			if (isObservable(children)) {
-				return true;
-			}
-			if (Array.isArray(children)) {
-				return children.some(c => childrenIsObservable(c));
+				if (Array.isArray(children)) {
+					return children.flatMap(c => getChildren(reader, c));
+				}
+				if (children instanceof ObserverNode) {
+					if (reader) {
+						children.readEffect(reader);
+					}
+					return [children._element];
+				}
+				if (children) {
+					return [children];
+				}
+				return [];
 			}
-			return false;
-		}
 
-		if (children) {
 			const d = derived(this, reader => {
 				this._element.replaceChildren(...getChildren(reader, children));
 			});
@@ -399,12 +368,102 @@ export abstract class ObserverNode<T extends Element = Element> extends Disposab
 		}).recomputeInitiallyAndOnChange(store);
 		return this as unknown as ObserverNodeWithElement<T>;
 	}
+
+	/**
+	 * Creates a live element that will keep the element updated as long as the returned object is not disposed.
+	*/
+	toDisposableLiveElement() {
+		const store = new DisposableStore();
+		this.keepUpdated(store);
+		return new LiveElement(this._element, store);
+	}
+}
+
+
+
+function setClassName(domNode: Element, className: string) {
+	if (isSVGElement(domNode)) {
+		domNode.setAttribute('class', className);
+	} else {
+		domNode.className = className;
+	}
+}
+
+function resolve<T>(value: ValueOrList<T>, reader: IReader | undefined, cb: (val: T) => void): void {
+	if (isObservable(value)) {
+		cb(value.read(reader));
+	}
+	if (Array.isArray(value)) {
+		for (const v of value) {
+			resolve(v, reader, cb);
+		}
+	}
+	cb(value as any);
+}
+
+function getClassName(className: ValueOrList<string | undefined | false> | undefined, reader: IReader | undefined): string {
+	let result = '';
+	resolve(className, reader, val => {
+		if (val) {
+			if (result.length === 0) {
+				result = val;
+			} else {
+				result += ' ' + val;
+			}
+		}
+	});
+	return result;
+}
+
+function hasObservable(value: ValueOrList<unknown>): boolean {
+	if (isObservable(value)) {
+		return true;
+	}
+	if (Array.isArray(value)) {
+		return value.some(v => hasObservable(v));
+	}
+	return false;
+}
+function convertCssValue(value: any): string {
+	if (typeof value === 'number') {
+		return value + 'px';
+	}
+	return value;
+}
+
+
+function childrenIsObservable(children: ValueOrList2<Element | string | ObserverNode | undefined>): boolean {
+	if (isObservable(children)) {
+		return true;
+	}
+	if (Array.isArray(children)) {
+		return children.some(c => childrenIsObservable(c));
+	}
+	return false;
+}
+
+export class LiveElement<T extends Element = HTMLElement> {
+	constructor(
+		public readonly element: T,
+		private readonly _disposable: IDisposable,
+	) { }
+
+	dispose() {
+		this._disposable.dispose();
+	}
 }
 
 export class ObserverNodeWithElement<T extends Element = Element> extends ObserverNode<T> {
 	public get element() {
 		return this._element;
 	}
+
+	public getIsHovered(store: DisposableStore): IObservable<boolean> {
+		const hovered = observableValue<boolean>('hovered', false);
+		store.add(addDisposableListener(this._element, 'mouseenter', () => hovered.set(true, undefined)));
+		store.add(addDisposableListener(this._element, 'mouseleave', () => hovered.set(false, undefined)));
+		return hovered;
+	}
 }
 
 function setOrRemoveAttribute(element: Element, key: string, value: unknown) {
@@ -479,3 +538,5 @@ export function rectToProps(fn: (reader: IReader) => Rect) {
 		height: derived(reader => fn(reader).bottom - fn(reader).top),
 	};
 }
+
+export type FirstFnArg<T> = T extends (arg: infer U) => any ? U : never;
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.css b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.css
index e5531dc7b4b..0a46a149042 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.css
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.css
@@ -77,7 +77,7 @@
 	}
 
 	.inline-edits-view {
-		&.toolbarDropdownVisible, .editorContainer:hover {
+		&.toolbarDropdownVisible, .editorContainer.showHover:hover {
 			.toolbar {
 				display: block;
 			}
@@ -165,3 +165,22 @@
 		border-left: solid var(--vscode-inlineEdit-modifiedChangedTextBackground) 3px;
 	}
 }
+
+.monaco-menu-option {
+	color: var(--vscode-editorActionList-foreground);
+	font-size: 13px;
+	padding: 0 10px;
+	line-height: 26px;
+	display: flex;
+	gap: 8px;
+	align-items: center;
+	border-radius: 4px;
+	cursor: pointer;
+
+	&.active {
+		background: var(--vscode-editorActionList-focusBackground);
+		color: var(--vscode-editorActionList-focusForeground);
+		outline: 1px solid var(--vscode-menu-selectionBorder, transparent);
+		outline-offset: -1px;
+	}
+}
diff --git a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.ts b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.ts
index dfb11c8bebf..4282852af53 100644
--- a/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.ts
+++ b/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.ts
@@ -137,10 +137,12 @@ export class InlineEditsView extends Disposable {
 
 	protected readonly _indicator = this._register(autorunWithStore((reader, store) => {
 		if (this._useGutterIndicator.read(reader)) {
-			store.add(new InlineEditsGutterIndicator(
+			store.add(this._instantiationService.createInstance(
+				InlineEditsGutterIndicator,
 				this._editorObs,
 				this._uiState.map(s => s && s.originalDisplayRange),
 				this._model,
+				this._sideBySide.isHovered,
 			));
 		} else {
 			store.add(new InlineEditsIndicator(

From 0c51035590b20878d940ceb3cac0d54c4eb54bbc Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Fri, 20 Dec 2024 13:59:08 -0800
Subject: [PATCH 460/479] testing: fix errors peeks being oversized relative to
 their contents (#236763)

Fixes #214011
---
 src/vs/base/browser/ui/list/listView.ts       |  2 +
 .../contrib/zoneWidget/browser/zoneWidget.ts  | 14 ++--
 .../contrib/debug/browser/callStackWidget.ts  |  8 +++
 .../testResultsView/testMessageStack.ts       | 49 -------------
 .../testResultsView/testResultsViewContent.ts | 37 +++++++---
 .../testing/browser/testingOutputPeek.ts      | 70 +++++++++++--------
 6 files changed, 85 insertions(+), 95 deletions(-)
 delete mode 100644 src/vs/workbench/contrib/testing/browser/testResultsView/testMessageStack.ts

diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts
index 36355a377ba..e305b7de4b9 100644
--- a/src/vs/base/browser/ui/list/listView.ts
+++ b/src/vs/base/browser/ui/list/listView.ts
@@ -567,6 +567,8 @@ export class ListView<T> implements IListView<T> {
 
 		if (this.supportDynamicHeights) {
 			this._rerender(this.lastRenderTop, this.lastRenderHeight);
+		} else {
+			this._onDidChangeContentHeight.fire(this.contentHeight); // otherwise fired in _rerender()
 		}
 	}
 
diff --git a/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts b/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts
index 51988af7d17..a38f1639eea 100644
--- a/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts
+++ b/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts
@@ -29,7 +29,6 @@ export interface IOptions {
 	frameColor?: Color | string;
 	arrowColor?: Color;
 	keepEditorSelection?: boolean;
-	allowUnlimitedHeight?: boolean;
 	ordinal?: number;
 	showInHiddenAreas?: boolean;
 }
@@ -376,6 +375,11 @@ export abstract class ZoneWidget implements IHorizontalSashLayoutProvider {
 		return result;
 	}
 
+	/** Gets the maximum widget height in lines. */
+	protected _getMaximumHeightInLines(): number | undefined {
+		return Math.max(12, (this.editor.getLayoutInfo().height / this.editor.getOption(EditorOption.lineHeight)) * 0.8);
+	}
+
 	private _showImpl(where: Range, heightInLines: number): void {
 		const position = where.getStartPosition();
 		const layoutInfo = this.editor.getLayoutInfo();
@@ -389,8 +393,8 @@ export abstract class ZoneWidget implements IHorizontalSashLayoutProvider {
 		const lineHeight = this.editor.getOption(EditorOption.lineHeight);
 
 		// adjust heightInLines to viewport
-		if (!this.options.allowUnlimitedHeight) {
-			const maxHeightInLines = Math.max(12, (this.editor.getLayoutInfo().height / lineHeight) * 0.8);
+		const maxHeightInLines = this._getMaximumHeightInLines();
+		if (maxHeightInLines !== undefined) {
 			heightInLines = Math.min(heightInLines, maxHeightInLines);
 		}
 
@@ -493,7 +497,9 @@ export abstract class ZoneWidget implements IHorizontalSashLayoutProvider {
 		// implement in subclass
 	}
 
-	protected _relayout(newHeightInLines: number): void {
+	protected _relayout(_newHeightInLines: number): void {
+		const maxHeightInLines = this._getMaximumHeightInLines();
+		const newHeightInLines = maxHeightInLines === undefined ? _newHeightInLines : Math.min(maxHeightInLines, _newHeightInLines);
 		if (this._viewZone && this._viewZone.heightInLines !== newHeightInLines) {
 			this.editor.changeViewZones(accessor => {
 				if (this._viewZone) {
diff --git a/src/vs/workbench/contrib/debug/browser/callStackWidget.ts b/src/vs/workbench/contrib/debug/browser/callStackWidget.ts
index dc2c12dd730..2948bbb715b 100644
--- a/src/vs/workbench/contrib/debug/browser/callStackWidget.ts
+++ b/src/vs/workbench/contrib/debug/browser/callStackWidget.ts
@@ -119,10 +119,18 @@ export class CallStackWidget extends Disposable {
 	private readonly currentFramesDs = this._register(new DisposableStore());
 	private cts?: CancellationTokenSource;
 
+	public get onDidChangeContentHeight() {
+		return this.list.onDidChangeContentHeight;
+	}
+
 	public get onDidScroll() {
 		return this.list.onDidScroll;
 	}
 
+	public get contentHeight() {
+		return this.list.contentHeight;
+	}
+
 	constructor(
 		container: HTMLElement,
 		containingEditor: ICodeEditor | undefined,
diff --git a/src/vs/workbench/contrib/testing/browser/testResultsView/testMessageStack.ts b/src/vs/workbench/contrib/testing/browser/testResultsView/testMessageStack.ts
deleted file mode 100644
index fe0592cb567..00000000000
--- a/src/vs/workbench/contrib/testing/browser/testResultsView/testMessageStack.ts
+++ /dev/null
@@ -1,49 +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 { Disposable } from '../../../../../base/common/lifecycle.js';
-import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
-import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { AnyStackFrame, CallStackFrame, CallStackWidget } from '../../../debug/browser/callStackWidget.js';
-import { ITestMessageStackFrame } from '../../common/testTypes.js';
-
-export class TestResultStackWidget extends Disposable {
-	private readonly widget: CallStackWidget;
-
-	public get onDidScroll() {
-		return this.widget.onDidScroll;
-	}
-
-	constructor(
-		private readonly container: HTMLElement,
-		containingEditor: ICodeEditor | undefined,
-		@IInstantiationService instantiationService: IInstantiationService,
-	) {
-		super();
-
-		this.widget = this._register(instantiationService.createInstance(
-			CallStackWidget,
-			container,
-			containingEditor,
-		));
-	}
-
-	public collapseAll() {
-		this.widget.collapseAll();
-	}
-
-	public update(messageFrame: AnyStackFrame, stack: ITestMessageStackFrame[]) {
-		this.widget.setFrames([messageFrame, ...stack.map(frame => new CallStackFrame(
-			frame.label,
-			frame.uri,
-			frame.position?.lineNumber,
-			frame.position?.column,
-		))]);
-	}
-
-	public layout(height?: number, width?: number) {
-		this.widget.layout(height ?? this.container.clientHeight, width);
-	}
-}
diff --git a/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsViewContent.ts b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsViewContent.ts
index 421afad78f2..5f2990a413a 100644
--- a/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsViewContent.ts
+++ b/src/vs/workbench/contrib/testing/browser/testResultsView/testResultsViewContent.ts
@@ -14,7 +14,6 @@ import { Emitter, Event, Relay } from '../../../../../base/common/event.js';
 import { KeyCode } from '../../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore, IDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
 import { observableValue } from '../../../../../base/common/observable.js';
-import './testResultsViewContent.css';
 import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
 import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
 import { localize } from '../../../../../nls.js';
@@ -28,12 +27,7 @@ import { IInstantiationService, ServicesAccessor } from '../../../../../platform
 import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
 import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
 import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
-import { CustomStackFrame } from '../../../debug/browser/callStackWidget.js';
-import * as icons from '../icons.js';
-import { TestResultStackWidget } from './testMessageStack.js';
-import { DiffContentProvider, IPeekOutputRenderer, MarkdownTestMessagePeek, PlainTextMessagePeek, TerminalMessagePeek } from './testResultsOutput.js';
-import { equalsSubject, getSubjectTestItem, InspectSubject, MessageSubject, TaskSubject, TestOutputSubject } from './testResultsSubject.js';
-import { OutputPeekTree } from './testResultsTree.js';
+import { AnyStackFrame, CallStackFrame, CallStackWidget, CustomStackFrame } from '../../../debug/browser/callStackWidget.js';
 import { TestCommandId } from '../../common/constants.js';
 import { IObservableValue } from '../../common/observableValue.js';
 import { capabilityContextKeys, ITestProfileService } from '../../common/testProfileService.js';
@@ -41,6 +35,11 @@ import { LiveTestResult } from '../../common/testResult.js';
 import { ITestFollowup, ITestService } from '../../common/testService.js';
 import { ITestMessageStackFrame, TestRunProfileBitset } from '../../common/testTypes.js';
 import { TestingContextKeys } from '../../common/testingContextKeys.js';
+import * as icons from '../icons.js';
+import { DiffContentProvider, IPeekOutputRenderer, MarkdownTestMessagePeek, PlainTextMessagePeek, TerminalMessagePeek } from './testResultsOutput.js';
+import { equalsSubject, getSubjectTestItem, InspectSubject, MessageSubject, TaskSubject, TestOutputSubject } from './testResultsSubject.js';
+import { OutputPeekTree } from './testResultsTree.js';
+import './testResultsViewContent.css';
 
 const enum SubView {
 	Diff = 0,
@@ -183,7 +182,7 @@ export class TestResultsViewContent extends Disposable {
 	private contextKeyTestMessage!: IContextKey<string>;
 	private contextKeyResultOutdated!: IContextKey<boolean>;
 	private stackContainer!: HTMLElement;
-	private callStackWidget!: TestResultStackWidget;
+	private callStackWidget!: CallStackWidget;
 	private currentTopFrame?: MessageStackFrame;
 	private isDoingLayoutUpdate?: boolean;
 
@@ -209,6 +208,14 @@ export class TestResultsViewContent extends Disposable {
 		};
 	}
 
+	public get onDidChangeContentHeight() {
+		return this.callStackWidget.onDidChangeContentHeight;
+	}
+
+	public get contentHeight() {
+		return this.callStackWidget?.contentHeight || 0;
+	}
+
 	constructor(
 		private readonly editor: ICodeEditor | undefined,
 		private readonly options: {
@@ -233,7 +240,7 @@ export class TestResultsViewContent extends Disposable {
 
 		const messageContainer = this.messageContainer = dom.$('.test-output-peek-message-container');
 		this.stackContainer = dom.append(containerElement, dom.$('.test-output-call-stack-container'));
-		this.callStackWidget = this._register(this.instantiationService.createInstance(TestResultStackWidget, this.stackContainer, this.editor));
+		this.callStackWidget = this._register(this.instantiationService.createInstance(CallStackWidget, this.stackContainer, this.editor));
 		this.followupWidget = this._register(this.instantiationService.createInstance(FollowupActionWidget, this.editor));
 		this.onCloseEmitter.input = this.followupWidget.onClose;
 
@@ -315,13 +322,22 @@ export class TestResultsViewContent extends Disposable {
 			this.currentSubjectStore.clear();
 			const callFrames = this.getCallFrames(opts.subject) || [];
 			const topFrame = await this.prepareTopFrame(opts.subject, callFrames);
-			this.callStackWidget.update(topFrame, callFrames);
+			this.setCallStackFrames(topFrame, callFrames);
 
 			this.followupWidget.show(opts.subject);
 			this.populateFloatingClick(opts.subject);
 		});
 	}
 
+	private setCallStackFrames(messageFrame: AnyStackFrame, stack: ITestMessageStackFrame[]) {
+		this.callStackWidget.setFrames([messageFrame, ...stack.map(frame => new CallStackFrame(
+			frame.label,
+			frame.uri,
+			frame.position?.lineNumber,
+			frame.position?.column,
+		))]);
+	}
+
 	/**
 	 * Collapses all displayed stack frames.
 	 */
@@ -375,7 +391,6 @@ export class TestResultsViewContent extends Disposable {
 				}));
 			}
 
-
 			if (provider.onDidContentSizeChange) {
 				this.currentSubjectStore.add(provider.onDidContentSizeChange(() => {
 					if (this.dimension && !this.isDoingLayoutUpdate) {
diff --git a/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts b/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
index 3ea9c37de5c..808e68a6ca9 100644
--- a/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
+++ b/src/vs/workbench/contrib/testing/browser/testingOutputPeek.ts
@@ -6,16 +6,16 @@
 import * as dom from '../../../../base/browser/dom.js';
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
 import { IAction } from '../../../../base/common/actions.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { Color } from '../../../../base/common/color.js';
-import { Emitter, Event } from '../../../../base/common/event.js';
+import { Event } from '../../../../base/common/event.js';
 import { stripIcons } from '../../../../base/common/iconLabels.js';
 import { Iterable } from '../../../../base/common/iterator.js';
 import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import { Lazy } from '../../../../base/common/lazy.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { derived, disposableObservableValue, observableValue } from '../../../../base/common/observable.js';
-import { count } from '../../../../base/common/strings.js';
 import { URI } from '../../../../base/common/uri.js';
 import { ICodeEditor, isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { EditorAction2 } from '../../../../editor/browser/editorExtensions.js';
@@ -678,10 +678,8 @@ export class TestingOutputPeekController extends Disposable implements IEditorCo
 
 
 class TestResultsPeek extends PeekViewWidget {
-	private static lastHeightInLines?: number;
-
-	private readonly visibilityChange = this._disposables.add(new Emitter<boolean>());
 	public readonly current = observableValue<InspectSubject | undefined>('testPeekCurrent', undefined);
+	private resizeOnNextContentHeightUpdate = false;
 	private content!: TestResultsViewContent;
 	private scopedContextKeyService!: IContextKeyService;
 	private dimension?: dom.Dimension;
@@ -701,10 +699,22 @@ class TestResultsPeek extends PeekViewWidget {
 		super(editor, { showFrame: true, frameWidth: 1, showArrow: true, isResizeable: true, isAccessible: true, className: 'test-output-peek' }, instantiationService);
 
 		this._disposables.add(themeService.onDidColorThemeChange(this.applyTheme, this));
-		this._disposables.add(this.onDidClose(() => this.visibilityChange.fire(false)));
 		peekViewService.addExclusiveWidget(editor, this);
 	}
 
+	protected override _getMaximumHeightInLines(): number | undefined {
+		const defaultMaxHeight = super._getMaximumHeightInLines();
+		const contentHeight = this.content?.contentHeight;
+		if (!contentHeight) { // undefined or 0
+			return defaultMaxHeight;
+		}
+
+		const lineHeight = this.editor.getOption(EditorOption.lineHeight);
+		// 41 is experimentally determined to be the overhead of the peek view itself
+		// to avoid showing scrollbars by default in its content.
+		return Math.min(defaultMaxHeight || Infinity, (contentHeight + 41) / lineHeight);
+	}
+
 	private applyTheme() {
 		const theme = this.themeService.getColorTheme();
 		const current = this.current.get();
@@ -764,6 +774,27 @@ class TestResultsPeek extends PeekViewWidget {
 
 	protected override _fillBody(containerElement: HTMLElement): void {
 		this.content.fillBody(containerElement);
+
+		// Resize on height updates for a short time to allow any heights made
+		// by editor contributions to come into effect before.
+		const contentHeightSettleTimer = this._disposables.add(new RunOnceScheduler(() => {
+			this.resizeOnNextContentHeightUpdate = false;
+		}, 500));
+
+		this._disposables.add(this.content.onDidChangeContentHeight(height => {
+			if (!this.resizeOnNextContentHeightUpdate || !height) {
+				return;
+			}
+
+			const displayed = this._getMaximumHeightInLines();
+			if (displayed) {
+				this._relayout(Math.min(displayed, this.getVisibleEditorLines() / 2));
+				if (!contentHeightSettleTimer.isScheduled()) {
+					contentHeightSettleTimer.schedule();
+				}
+			}
+		}));
+
 		this._disposables.add(this.content.onDidRequestReveal(sub => {
 			TestingOutputPeekController.get(this.editor)?.show(sub instanceof MessageSubject
 				? sub.messageUri
@@ -780,7 +811,6 @@ class TestResultsPeek extends PeekViewWidget {
 			return this.showInPlace(subject);
 		}
 
-		const message = subject.message;
 		const previous = this.current;
 		const revealLocation = subject.revealLocation?.range.getStartPosition();
 		if (!revealLocation && !previous) {
@@ -792,13 +822,8 @@ class TestResultsPeek extends PeekViewWidget {
 			return this.showInPlace(subject);
 		}
 
-		// If there is a stack we want to display, ensure the default size is large-ish
-		const peekLines = TestResultsPeek.lastHeightInLines || Math.max(
-			inspectSubjectHasStack(subject) ? Math.ceil(this.getVisibleEditorLines() / 2) : 0,
-			hintMessagePeekHeight(message)
-		);
-
-		this.show(revealLocation, peekLines);
+		this.resizeOnNextContentHeightUpdate = true;
+		this.show(revealLocation, 10); // 10 is just a random number, we resize once content is available
 		this.editor.revealRangeNearTopIfOutsideViewport(Range.fromPositions(revealLocation), ScrollType.Smooth);
 
 		return this.showInPlace(subject);
@@ -832,11 +857,6 @@ class TestResultsPeek extends PeekViewWidget {
 		await this.content.reveal({ subject, preserveFocus: false });
 	}
 
-	protected override _relayout(newHeightInLines: number): void {
-		super._relayout(newHeightInLines);
-		TestResultsPeek.lastHeightInLines = newHeightInLines;
-	}
-
 	/** @override */
 	protected override _doLayoutBody(height: number, width: number) {
 		super._doLayoutBody(height, width);
@@ -919,23 +939,11 @@ export class TestResultsView extends ViewPane {
 	}
 }
 
-const hintMessagePeekHeight = (msg: ITestMessage) => {
-	const msgHeight = ITestMessage.isDiffable(msg)
-		? Math.max(hintPeekStrHeight(msg.actual), hintPeekStrHeight(msg.expected))
-		: hintPeekStrHeight(typeof msg.message === 'string' ? msg.message : msg.message.value);
-
-	// add 8ish lines for the size of the title and decorations in the peek.
-	return msgHeight + 8;
-};
-
 const firstLine = (str: string) => {
 	const index = str.indexOf('\n');
 	return index === -1 ? str : str.slice(0, index);
 };
 
-
-const hintPeekStrHeight = (str: string) => Math.min(count(str, '\n'), 24);
-
 function getOuterEditorFromDiffEditor(codeEditorService: ICodeEditorService): ICodeEditor | null {
 	const diffEditors = codeEditorService.listDiffEditors();
 

From 13d2a615cb98a1dc3371dcea2f03d8e65b2d83e6 Mon Sep 17 00:00:00 2001
From: Joyce Er <joyce.er@microsoft.com>
Date: Fri, 20 Dec 2024 14:33:52 -0800
Subject: [PATCH 461/479] fix: don't register Cloud Changes action if not
 configured in product.json (#236764)

---
 .../contrib/editSessions/browser/editSessionsStorageService.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts b/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts
index b056dbf64a2..1bb5eb33737 100644
--- a/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts
+++ b/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts
@@ -455,6 +455,9 @@ export class EditSessionsWorkbenchService extends Disposable implements IEditSes
 	}
 
 	private registerSignInAction() {
+		if (!this.serverConfiguration?.url) {
+			return;
+		}
 		const that = this;
 		const id = 'workbench.editSessions.actions.signIn';
 		const when = ContextKeyExpr.and(ContextKeyExpr.equals(EDIT_SESSIONS_PENDING_KEY, false), ContextKeyExpr.equals(EDIT_SESSIONS_SIGNED_IN_KEY, false));

From 68252d3d7b25bc50c67abad5f32c885012deb985 Mon Sep 17 00:00:00 2001
From: Joyce Er <joyce.er@microsoft.com>
Date: Fri, 20 Dec 2024 20:22:20 -0800
Subject: [PATCH 462/479] fix: don't leak listener in share contribution
 (#236767)

---
 .../contrib/share/browser/share.contribution.ts   | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/contrib/share/browser/share.contribution.ts b/src/vs/workbench/contrib/share/browser/share.contribution.ts
index cd1cfc176e0..3566792aa9d 100644
--- a/src/vs/workbench/contrib/share/browser/share.contribution.ts
+++ b/src/vs/workbench/contrib/share/browser/share.contribution.ts
@@ -32,7 +32,7 @@ import { IProgressService, ProgressLocation } from '../../../../platform/progres
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { workbenchConfigurationNodeBase } from '../../../common/configuration.js';
-import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 
 const targetMenus = [
 	MenuId.EditorContextShare,
@@ -44,7 +44,7 @@ const targetMenus = [
 	MenuId.ExplorerContextShare
 ];
 
-class ShareWorkbenchContribution {
+class ShareWorkbenchContribution extends Disposable {
 	private static SHARE_ENABLED_SETTING = 'workbench.experimental.share.enabled';
 
 	private _disposables: DisposableStore | undefined;
@@ -53,10 +53,12 @@ class ShareWorkbenchContribution {
 		@IShareService private readonly shareService: IShareService,
 		@IConfigurationService private readonly configurationService: IConfigurationService
 	) {
+		super();
+
 		if (this.configurationService.getValue<boolean>(ShareWorkbenchContribution.SHARE_ENABLED_SETTING)) {
 			this.registerActions();
 		}
-		this.configurationService.onDidChangeConfiguration(e => {
+		this._register(this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(ShareWorkbenchContribution.SHARE_ENABLED_SETTING)) {
 				const settingValue = this.configurationService.getValue<boolean>(ShareWorkbenchContribution.SHARE_ENABLED_SETTING);
 				if (settingValue === true && this._disposables === undefined) {
@@ -66,7 +68,12 @@ class ShareWorkbenchContribution {
 					this._disposables = undefined;
 				}
 			}
-		});
+		}));
+	}
+
+	override dispose(): void {
+		super.dispose();
+		this._disposables?.dispose();
 	}
 
 	private registerActions() {

From d4de5ceba46823bafe63733df924e63990afef72 Mon Sep 17 00:00:00 2001
From: Joyce Er <joyce.er@microsoft.com>
Date: Fri, 20 Dec 2024 20:23:36 -0800
Subject: [PATCH 463/479] test: adopt `ensureNoDisposablesAreLeakedInTestSuite`
 (#236766)

* test: adopt `ensureNoDisposablesAreLeakedInTestSuite`

* test: adopt `ensureNoDisposablesAreLeakedInTestSuite`
---
 eslint.config.js                                         | 1 -
 .../editSessions/test/browser/editSessions.test.ts       | 9 +++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/eslint.config.js b/eslint.config.js
index aa9fd4930c5..db83d096edd 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -229,7 +229,6 @@ export default tseslint.config(
 						'src/vs/workbench/api/test/node/extHostTunnelService.test.ts',
 						'src/vs/workbench/contrib/bulkEdit/test/browser/bulkCellEdits.test.ts',
 						'src/vs/workbench/contrib/chat/test/common/chatWordCounter.test.ts',
-						'src/vs/workbench/contrib/editSessions/test/browser/editSessions.test.ts',
 						'src/vs/workbench/contrib/extensions/test/common/extensionQuery.test.ts',
 						'src/vs/workbench/contrib/notebook/test/browser/notebookExecutionService.test.ts',
 						'src/vs/workbench/contrib/notebook/test/browser/notebookExecutionStateService.test.ts',
diff --git a/src/vs/workbench/contrib/editSessions/test/browser/editSessions.test.ts b/src/vs/workbench/contrib/editSessions/test/browser/editSessions.test.ts
index 38aeb6c161b..359c7be57d5 100644
--- a/src/vs/workbench/contrib/editSessions/test/browser/editSessions.test.ts
+++ b/src/vs/workbench/contrib/editSessions/test/browser/editSessions.test.ts
@@ -50,11 +50,13 @@ import { TestStorageService } from '../../../../test/common/workbenchTestService
 import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
 import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js';
 import { IWorkspaceIdentityService, WorkspaceIdentityService } from '../../../../services/workspaces/common/workspaceIdentityService.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
 
 const folderName = 'test-folder';
 const folderUri = URI.file(`/${folderName}`);
 
 suite('Edit session sync', () => {
+
 	let instantiationService: TestInstantiationService;
 	let editSessionsContribution: EditSessionsContribution;
 	let fileService: FileService;
@@ -63,6 +65,7 @@ suite('Edit session sync', () => {
 	const disposables = new DisposableStore();
 
 	suiteSetup(() => {
+
 		sandbox = sinon.createSandbox();
 
 		instantiationService = new TestInstantiationService();
@@ -172,6 +175,10 @@ suite('Edit session sync', () => {
 		disposables.clear();
 	});
 
+	suiteTeardown(() => {
+		disposables.dispose();
+	});
+
 	test('Can apply edit session', async function () {
 		const fileUri = joinPath(folderUri, 'dir1', 'README.md');
 		const fileContents = '# readme';
@@ -218,4 +225,6 @@ suite('Edit session sync', () => {
 		// Verify that we did not attempt to write the edit session
 		assert.equal(writeStub.called, false);
 	});
+
+	ensureNoDisposablesAreLeakedInTestSuite();
 });

From d6a59b79698b81cc1f0a74113189b7106453bb78 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Sat, 21 Dec 2024 12:59:52 -0800
Subject: [PATCH 464/479] debug: fix mismatched indentation for folders in
 loaded scripts (#236750)

* debug: fix mismatched indentation for folders in loaded scripts

Fixes #228241

* fix test
---
 .../contrib/debug/browser/baseDebugView.ts    |  2 +-
 .../debug/browser/loadedScriptsView.ts        | 78 ++++++++++---------
 .../debug/test/browser/baseDebugView.test.ts  |  2 +-
 3 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/src/vs/workbench/contrib/debug/browser/baseDebugView.ts b/src/vs/workbench/contrib/debug/browser/baseDebugView.ts
index 9576b7e5bb7..d5ba5f0c856 100644
--- a/src/vs/workbench/contrib/debug/browser/baseDebugView.ts
+++ b/src/vs/workbench/contrib/debug/browser/baseDebugView.ts
@@ -51,7 +51,7 @@ export interface IVariableTemplateData {
 
 export function renderViewTree(container: HTMLElement): HTMLElement {
 	const treeContainer = $('.');
-	treeContainer.classList.add('debug-view-content');
+	treeContainer.classList.add('debug-view-content', 'file-icon-themable-tree');
 	container.appendChild(treeContainer);
 	return treeContainer;
 }
diff --git a/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts b/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts
index 3c6e37f7bc0..4876cc3a797 100644
--- a/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/loadedScriptsView.ts
@@ -3,47 +3,46 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from '../../../../nls.js';
-import { IViewletViewOptions } from '../../../browser/parts/views/viewsViewlet.js';
-import { normalize, isAbsolute, posix } from '../../../../base/common/path.js';
-import { ViewPane, ViewAction } from '../../../browser/parts/views/viewPane.js';
-import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
-import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { renderViewTree } from './baseDebugView.js';
-import { IDebugSession, IDebugService, CONTEXT_LOADED_SCRIPTS_ITEM_TYPE, LOADED_SCRIPTS_VIEW_ID } from '../common/debug.js';
-import { Source } from '../common/debugSource.js';
-import { IWorkspaceContextService, IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
-import { IContextKey, IContextKeyService, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
-import { normalizeDriveLetter, tildify } from '../../../../base/common/labels.js';
-import { isWindows } from '../../../../base/common/platform.js';
-import { URI } from '../../../../base/common/uri.js';
-import { ltrim } from '../../../../base/common/strings.js';
-import { RunOnceScheduler } from '../../../../base/common/async.js';
-import { ResourceLabels, IResourceLabelProps, IResourceLabelOptions, IResourceLabel } from '../../../browser/labels.js';
-import { FileKind } from '../../../../platform/files/common/files.js';
 import { IListVirtualDelegate } from '../../../../base/browser/ui/list/list.js';
-import { ITreeNode, ITreeFilter, TreeVisibility, TreeFilterResult, ITreeElement } from '../../../../base/browser/ui/tree/tree.js';
 import { IListAccessibilityProvider } from '../../../../base/browser/ui/list/listWidget.js';
-import { IEditorService } from '../../../services/editor/common/editorService.js';
-import { WorkbenchCompressibleObjectTree } from '../../../../platform/list/browser/listService.js';
-import { dispose } from '../../../../base/common/lifecycle.js';
-import { createMatches, FuzzyScore } from '../../../../base/common/filters.js';
-import { DebugContentProvider } from '../common/debugContentProvider.js';
-import { ILabelService } from '../../../../platform/label/common/label.js';
+import { TreeFindMode } from '../../../../base/browser/ui/tree/abstractTree.js';
 import type { ICompressedTreeNode } from '../../../../base/browser/ui/tree/compressedObjectTreeModel.js';
 import type { ICompressibleTreeRenderer } from '../../../../base/browser/ui/tree/objectTree.js';
-import { registerAction2, MenuId } from '../../../../platform/actions/common/actions.js';
+import { ITreeElement, ITreeFilter, ITreeNode, TreeFilterResult, TreeVisibility } from '../../../../base/browser/ui/tree/tree.js';
+import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { Codicon } from '../../../../base/common/codicons.js';
-
-import { IViewDescriptorService } from '../../../common/views.js';
+import { createMatches, FuzzyScore } from '../../../../base/common/filters.js';
+import { normalizeDriveLetter, tildify } from '../../../../base/common/labels.js';
+import { dispose } from '../../../../base/common/lifecycle.js';
+import { isAbsolute, normalize, posix } from '../../../../base/common/path.js';
+import { isWindows } from '../../../../base/common/platform.js';
+import { ltrim } from '../../../../base/common/strings.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as nls from '../../../../nls.js';
+import { MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr, IContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { FileKind } from '../../../../platform/files/common/files.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ILabelService } from '../../../../platform/label/common/label.js';
+import { WorkbenchCompressibleObjectTree } from '../../../../platform/list/browser/listService.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
-import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IFileIconTheme, IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IWorkspaceContextService, IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { IResourceLabel, IResourceLabelOptions, IResourceLabelProps, ResourceLabels } from '../../../browser/labels.js';
+import { ViewAction, ViewPane } from '../../../browser/parts/views/viewPane.js';
+import { IViewletViewOptions } from '../../../browser/parts/views/viewsViewlet.js';
+import { IViewDescriptorService } from '../../../common/views.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IPathService } from '../../../services/path/common/pathService.js';
-import { TreeFindMode } from '../../../../base/browser/ui/tree/abstractTree.js';
-import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { CONTEXT_LOADED_SCRIPTS_ITEM_TYPE, IDebugService, IDebugSession, LOADED_SCRIPTS_VIEW_ID } from '../common/debug.js';
+import { DebugContentProvider } from '../common/debugContentProvider.js';
+import { Source } from '../common/debugSource.js';
+import { renderViewTree } from './baseDebugView.js';
 
 const NEW_STYLE_COMPRESS = true;
 
@@ -439,7 +438,7 @@ export class LoadedScriptsView extends ViewPane {
 		@IOpenerService openerService: IOpenerService,
 		@IThemeService themeService: IThemeService,
 		@ITelemetryService telemetryService: ITelemetryService,
-		@IHoverService hoverService: IHoverService
+		@IHoverService hoverService: IHoverService,
 	) {
 		super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
 		this.loadedScriptsItemType = CONTEXT_LOADED_SCRIPTS_ITEM_TYPE.bindTo(contextKeyService);
@@ -449,8 +448,7 @@ export class LoadedScriptsView extends ViewPane {
 		super.renderBody(container);
 
 		this.element.classList.add('debug-pane');
-		container.classList.add('debug-loaded-scripts');
-		container.classList.add('show-file-icons');
+		container.classList.add('debug-loaded-scripts', 'show-file-icons');
 
 		this.treeContainer = renderViewTree(container);
 
@@ -461,6 +459,14 @@ export class LoadedScriptsView extends ViewPane {
 		this.treeLabels = this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this.onDidChangeBodyVisibility });
 		this._register(this.treeLabels);
 
+		const onFileIconThemeChange = (fileIconTheme: IFileIconTheme) => {
+			this.treeContainer.classList.toggle('align-icons-and-twisties', fileIconTheme.hasFileIcons && !fileIconTheme.hasFolderIcons);
+			this.treeContainer.classList.toggle('hide-arrows', fileIconTheme.hidesExplorerArrows === true);
+		};
+
+		this._register(this.themeService.onDidFileIconThemeChange(onFileIconThemeChange));
+		onFileIconThemeChange(this.themeService.getFileIconTheme());
+
 		this.tree = this.instantiationService.createInstance(WorkbenchCompressibleObjectTree<LoadedScriptsItem, FuzzyScore>,
 			'LoadedScriptsView',
 			this.treeContainer,
diff --git a/src/vs/workbench/contrib/debug/test/browser/baseDebugView.test.ts b/src/vs/workbench/contrib/debug/test/browser/baseDebugView.test.ts
index fcefad3c516..9122412e421 100644
--- a/src/vs/workbench/contrib/debug/test/browser/baseDebugView.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/baseDebugView.test.ts
@@ -106,7 +106,7 @@ suite('Debug - Base Debug View', () => {
 		const container = $('.container');
 		const treeContainer = renderViewTree(container);
 
-		assert.strictEqual(treeContainer.className, 'debug-view-content');
+		assert.strictEqual(treeContainer.className, 'debug-view-content file-icon-themable-tree');
 		assert.strictEqual(container.childElementCount, 1);
 		assert.strictEqual(container.firstChild, treeContainer);
 		assert.strictEqual(dom.isHTMLDivElement(treeContainer), true);

From d953d84d9018aef819147320ed58e5b517d2b0a2 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Sat, 21 Dec 2024 13:01:00 -0800
Subject: [PATCH 465/479] debug: allow filter/search on debug values (#236768)

* debug: allow filter/search on debug values

I think this is something that never worked, or at least not for a long
while. Implementing match highlighting in values in the era of
linkification and ANSI support was a little more complex, but this works
well now.

![](https://memes.peet.io/img/24-12-b1f699dc-f20c-4c93-a5ce-f768473fff62.png)

Fixes #230945

* fix test
---
 .../contrib/debug/browser/baseDebugView.ts    | 30 ++++++-
 .../debug/browser/debugANSIHandling.ts        | 29 ++++--
 .../debug/browser/debugExpressionRenderer.ts  | 13 +--
 .../contrib/debug/browser/linkDetector.ts     | 89 +++++++++++++++----
 .../debug/browser/media/debugViewlet.css      |  6 ++
 .../contrib/debug/browser/variablesView.ts    |  4 +-
 .../debug/browser/watchExpressionsView.ts     |  4 +-
 .../test/browser/debugANSIHandling.test.ts    |  8 +-
 .../debug/test/browser/linkDetector.test.ts   | 64 +++++++++++++
 9 files changed, 208 insertions(+), 39 deletions(-)

diff --git a/src/vs/workbench/contrib/debug/browser/baseDebugView.ts b/src/vs/workbench/contrib/debug/browser/baseDebugView.ts
index d5ba5f0c856..efb22ae81c1 100644
--- a/src/vs/workbench/contrib/debug/browser/baseDebugView.ts
+++ b/src/vs/workbench/contrib/debug/browser/baseDebugView.ts
@@ -9,19 +9,21 @@ import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { HighlightedLabel, IHighlight } from '../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { IInputValidationOptions, InputBox } from '../../../../base/browser/ui/inputbox/inputBox.js';
+import { IKeyboardNavigationLabelProvider } from '../../../../base/browser/ui/list/list.js';
 import { IAsyncDataSource, ITreeNode, ITreeRenderer } from '../../../../base/browser/ui/tree/tree.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { FuzzyScore, createMatches } from '../../../../base/common/filters.js';
 import { createSingleCallFunction } from '../../../../base/common/functional.js';
 import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { DisposableStore, IDisposable, dispose, toDisposable } from '../../../../base/common/lifecycle.js';
+import { removeAnsiEscapeCodes } from '../../../../base/common/strings.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { localize } from '../../../../nls.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 import { defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
-import { IDebugService, IExpression } from '../common/debug.js';
+import { IDebugService, IExpression, IScope } from '../common/debug.js';
 import { Variable } from '../common/debugModel.js';
 import { IDebugVisualizerService } from '../common/debugVisualizers.js';
 import { LinkDetector } from './linkDetector.js';
@@ -78,6 +80,32 @@ export interface IExpressionTemplateData {
 	currentElement: IExpression | undefined;
 }
 
+/** Splits highlights based on matching of the {@link expressionAndScopeLabelProvider} */
+export const splitExpressionOrScopeHighlights = (e: IExpression | IScope, highlights: IHighlight[]) => {
+	const nameEndsAt = e.name.length;
+	const labelBeginsAt = e.name.length + 2;
+	const name: IHighlight[] = [];
+	const value: IHighlight[] = [];
+	for (const hl of highlights) {
+		if (hl.start < nameEndsAt) {
+			name.push({ start: hl.start, end: Math.min(hl.end, nameEndsAt) });
+		}
+		if (hl.end > labelBeginsAt) {
+			value.push({ start: Math.max(hl.start - labelBeginsAt, 0), end: hl.end - labelBeginsAt });
+		}
+	}
+
+	return { name, value };
+};
+
+/** Keyboard label provider for expression and scope tree elements. */
+export const expressionAndScopeLabelProvider: IKeyboardNavigationLabelProvider<IExpression | IScope> = {
+	getKeyboardNavigationLabel(e) {
+		const stripAnsi = e.getSession()?.rememberedCapabilities?.supportsANSIStyling;
+		return `${e.name}: ${stripAnsi ? removeAnsiEscapeCodes(e.value) : e.value}`;
+	},
+};
+
 export abstract class AbstractExpressionDataSource<Input, Element extends IExpression> implements IAsyncDataSource<Input, Element> {
 	constructor(
 		@IDebugService protected debugService: IDebugService,
diff --git a/src/vs/workbench/contrib/debug/browser/debugANSIHandling.ts b/src/vs/workbench/contrib/debug/browser/debugANSIHandling.ts
index 16923a73f61..4db2d7eb8c7 100644
--- a/src/vs/workbench/contrib/debug/browser/debugANSIHandling.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugANSIHandling.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { IHighlight } from '../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
 import { Color, RGBA } from '../../../../base/common/color.js';
 import { isDefined } from '../../../../base/common/types.js';
 import { editorHoverBackground, listActiveSelectionBackground, listFocusBackground, listInactiveFocusBackground, listInactiveSelectionBackground } from '../../../../platform/theme/common/colorRegistry.js';
@@ -16,7 +17,7 @@ import { ILinkDetector } from './linkDetector.js';
  * @param text The content to stylize.
  * @returns An {@link HTMLSpanElement} that contains the potentially stylized text.
  */
-export function handleANSIOutput(text: string, linkDetector: ILinkDetector, workspaceFolder: IWorkspaceFolder | undefined): HTMLSpanElement {
+export function handleANSIOutput(text: string, linkDetector: ILinkDetector, workspaceFolder: IWorkspaceFolder | undefined, highlights: IHighlight[] | undefined): HTMLSpanElement {
 
 	const root: HTMLSpanElement = document.createElement('span');
 	const textLength: number = text.length;
@@ -27,6 +28,7 @@ export function handleANSIOutput(text: string, linkDetector: ILinkDetector, work
 	let customUnderlineColor: RGBA | string | undefined;
 	let colorsInverted: boolean = false;
 	let currentPos: number = 0;
+	let unprintedChars = 0;
 	let buffer: string = '';
 
 	while (currentPos < textLength) {
@@ -58,8 +60,10 @@ export function handleANSIOutput(text: string, linkDetector: ILinkDetector, work
 
 			if (sequenceFound) {
 
+				unprintedChars += 2 + ansiSequence.length;
+
 				// Flush buffer with previous styles.
-				appendStylizedStringToContainer(root, buffer, styleNames, linkDetector, workspaceFolder, customFgColor, customBgColor, customUnderlineColor);
+				appendStylizedStringToContainer(root, buffer, styleNames, linkDetector, workspaceFolder, customFgColor, customBgColor, customUnderlineColor, highlights, currentPos - buffer.length - unprintedChars);
 
 				buffer = '';
 
@@ -105,7 +109,7 @@ export function handleANSIOutput(text: string, linkDetector: ILinkDetector, work
 
 	// Flush remaining text buffer if not empty.
 	if (buffer) {
-		appendStylizedStringToContainer(root, buffer, styleNames, linkDetector, workspaceFolder, customFgColor, customBgColor, customUnderlineColor);
+		appendStylizedStringToContainer(root, buffer, styleNames, linkDetector, workspaceFolder, customFgColor, customBgColor, customUnderlineColor, highlights, currentPos - buffer.length);
 	}
 
 	return root;
@@ -395,6 +399,8 @@ export function handleANSIOutput(text: string, linkDetector: ILinkDetector, work
  * @param customTextColor If provided, will apply custom color with inline style.
  * @param customBackgroundColor If provided, will apply custom backgroundColor with inline style.
  * @param customUnderlineColor If provided, will apply custom textDecorationColor with inline style.
+ * @param highlights The ranges to highlight.
+ * @param offset The starting index of the stringContent in the original text.
  */
 export function appendStylizedStringToContainer(
 	root: HTMLElement,
@@ -402,15 +408,24 @@ export function appendStylizedStringToContainer(
 	cssClasses: string[],
 	linkDetector: ILinkDetector,
 	workspaceFolder: IWorkspaceFolder | undefined,
-	customTextColor?: RGBA | string,
-	customBackgroundColor?: RGBA | string,
-	customUnderlineColor?: RGBA | string,
+	customTextColor: RGBA | string | undefined,
+	customBackgroundColor: RGBA | string | undefined,
+	customUnderlineColor: RGBA | string | undefined,
+	highlights: IHighlight[] | undefined,
+	offset: number,
 ): void {
 	if (!root || !stringContent) {
 		return;
 	}
 
-	const container = linkDetector.linkify(stringContent, true, workspaceFolder);
+	const container = linkDetector.linkify(
+		stringContent,
+		true,
+		workspaceFolder,
+		undefined,
+		undefined,
+		highlights?.map(h => ({ start: h.start - offset, end: h.end - offset, extraClasses: h.extraClasses })),
+	);
 
 	container.className = cssClasses.join(' ');
 	if (customTextColor) {
diff --git a/src/vs/workbench/contrib/debug/browser/debugExpressionRenderer.ts b/src/vs/workbench/contrib/debug/browser/debugExpressionRenderer.ts
index 767950dc826..0835365d408 100644
--- a/src/vs/workbench/contrib/debug/browser/debugExpressionRenderer.ts
+++ b/src/vs/workbench/contrib/debug/browser/debugExpressionRenderer.ts
@@ -16,7 +16,7 @@ import { observableConfigValue } from '../../../../platform/observable/common/pl
 import { IDebugSession, IExpressionValue } from '../common/debug.js';
 import { Expression, ExpressionContainer, Variable } from '../common/debugModel.js';
 import { ReplEvaluationResult } from '../common/replModel.js';
-import { IVariableTemplateData } from './baseDebugView.js';
+import { IVariableTemplateData, splitExpressionOrScopeHighlights } from './baseDebugView.js';
 import { handleANSIOutput } from './debugANSIHandling.js';
 import { COPY_EVALUATE_PATH_ID, COPY_VALUE_ID } from './debugCommands.js';
 import { DebugLinkHoverBehavior, DebugLinkHoverBehaviorTypeData, ILinkDetector, LinkDetector } from './linkDetector.js';
@@ -32,6 +32,7 @@ export interface IRenderValueOptions {
 	/** If not false, a rich hover will be shown on the element. */
 	hover?: false | IValueHoverOptions;
 	colorize?: boolean;
+	highlights?: IHighlight[];
 
 	/**
 	 * Indicates areas where VS Code implicitly always supported ANSI escape
@@ -90,6 +91,7 @@ export class DebugExpressionRenderer {
 
 	renderVariable(data: IVariableTemplateData, variable: Variable, options: IRenderVariableOptions = {}): IDisposable {
 		const displayType = this.displayType.get();
+		const highlights = splitExpressionOrScopeHighlights(variable, options.highlights || []);
 
 		if (variable.available) {
 			data.type.textContent = '';
@@ -103,7 +105,7 @@ export class DebugExpressionRenderer {
 				}
 			}
 
-			data.label.set(text, options.highlights, variable.type && !displayType ? variable.type : variable.name);
+			data.label.set(text, highlights.name, variable.type && !displayType ? variable.type : variable.name);
 			data.name.classList.toggle('virtual', variable.presentationHint?.kind === 'virtual');
 			data.name.classList.toggle('internal', variable.presentationHint?.visibility === 'internal');
 		} else if (variable.value && typeof variable.name === 'string' && variable.name) {
@@ -122,6 +124,7 @@ export class DebugExpressionRenderer {
 			showChanged: options.showChanged,
 			maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
 			hover: { commands },
+			highlights: highlights.value,
 			colorize: true,
 			session: variable.getSession(),
 		});
@@ -184,9 +187,9 @@ export class DebugExpressionRenderer {
 		}
 
 		if (supportsANSI) {
-			container.appendChild(handleANSIOutput(value, linkDetector, session ? session.root : undefined));
+			container.appendChild(handleANSIOutput(value, linkDetector, session ? session.root : undefined, options.highlights));
 		} else {
-			container.appendChild(linkDetector.linkify(value, false, session?.root, true, hoverBehavior));
+			container.appendChild(linkDetector.linkify(value, false, session?.root, true, hoverBehavior, options.highlights));
 		}
 
 		if (options.hover !== false) {
@@ -199,7 +202,7 @@ export class DebugExpressionRenderer {
 				if (supportsANSI) {
 					// note: intentionally using `this.linkDetector` so we don't blindly linkify the
 					// entire contents and instead only link file paths that it contains.
-					hoverContentsPre.appendChild(handleANSIOutput(value, this.linkDetector, session ? session.root : undefined));
+					hoverContentsPre.appendChild(handleANSIOutput(value, this.linkDetector, session ? session.root : undefined, options.highlights));
 				} else {
 					hoverContentsPre.textContent = value;
 				}
diff --git a/src/vs/workbench/contrib/debug/browser/linkDetector.ts b/src/vs/workbench/contrib/debug/browser/linkDetector.ts
index 98a89453a5a..8d08e6f1be9 100644
--- a/src/vs/workbench/contrib/debug/browser/linkDetector.ts
+++ b/src/vs/workbench/contrib/debug/browser/linkDetector.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { getWindow } from '../../../../base/browser/dom.js';
+import { getWindow, isHTMLElement, reset } from '../../../../base/browser/dom.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { KeyCode } from '../../../../base/common/keyCodes.js';
@@ -23,6 +23,8 @@ import { IDebugSession } from '../common/debug.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
 import { IPathService } from '../../../services/path/common/pathService.js';
+import { IHighlight } from '../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
+import { Iterable } from '../../../../base/common/iterator.js';
 
 const CONTROL_CODES = '\\u0000-\\u0020\\u007f-\\u009f';
 const WEB_LINK_REGEX = new RegExp('(?:[a-zA-Z][a-zA-Z0-9+.-]{2,}:\\/\\/|data:|www\\.)[^\\s' + CONTROL_CODES + '"]{2,}[^\\s' + CONTROL_CODES + '"\')}\\],:;.!?]', 'ug');
@@ -42,6 +44,7 @@ type LinkPart = {
 	kind: LinkKind;
 	value: string;
 	captures: string[];
+	index: number;
 };
 
 export const enum DebugLinkHoverBehavior {
@@ -61,7 +64,7 @@ export type DebugLinkHoverBehaviorTypeData = { type: DebugLinkHoverBehavior.None
 	| { type: DebugLinkHoverBehavior.Rich; store: DisposableStore };
 
 export interface ILinkDetector {
-	linkify(text: string, splitLines?: boolean, workspaceFolder?: IWorkspaceFolder, includeFulltext?: boolean, hoverBehavior?: DebugLinkHoverBehaviorTypeData): HTMLElement;
+	linkify(text: string, splitLines?: boolean, workspaceFolder?: IWorkspaceFolder, includeFulltext?: boolean, hoverBehavior?: DebugLinkHoverBehaviorTypeData, highlights?: IHighlight[]): HTMLElement;
 	linkifyLocation(text: string, locationReference: number, session: IDebugSession, hoverBehavior?: DebugLinkHoverBehaviorTypeData): HTMLElement;
 }
 
@@ -88,11 +91,11 @@ export class LinkDetector implements ILinkDetector {
 	 * If a `hoverBehavior` is passed, hovers may be added using the workbench hover service.
 	 * This should be preferred for new code where hovers are desirable.
 	 */
-	linkify(text: string, splitLines?: boolean, workspaceFolder?: IWorkspaceFolder, includeFulltext?: boolean, hoverBehavior?: DebugLinkHoverBehaviorTypeData): HTMLElement {
-		return this._linkify(text, splitLines, workspaceFolder, includeFulltext, hoverBehavior);
+	linkify(text: string, splitLines?: boolean, workspaceFolder?: IWorkspaceFolder, includeFulltext?: boolean, hoverBehavior?: DebugLinkHoverBehaviorTypeData, highlights?: IHighlight[]): HTMLElement {
+		return this._linkify(text, splitLines, workspaceFolder, includeFulltext, hoverBehavior, highlights);
 	}
 
-	private _linkify(text: string, splitLines?: boolean, workspaceFolder?: IWorkspaceFolder, includeFulltext?: boolean, hoverBehavior?: DebugLinkHoverBehaviorTypeData, defaultRef?: { locationReference: number; session: IDebugSession }): HTMLElement {
+	private _linkify(text: string, splitLines?: boolean, workspaceFolder?: IWorkspaceFolder, includeFulltext?: boolean, hoverBehavior?: DebugLinkHoverBehaviorTypeData, highlights?: IHighlight[], defaultRef?: { locationReference: number; session: IDebugSession }): HTMLElement {
 		if (splitLines) {
 			const lines = text.split('\n');
 			for (let i = 0; i < lines.length - 1; i++) {
@@ -102,7 +105,7 @@ export class LinkDetector implements ILinkDetector {
 				// Remove the last element ('') that split added.
 				lines.pop();
 			}
-			const elements = lines.map(line => this._linkify(line, false, workspaceFolder, includeFulltext, hoverBehavior, defaultRef));
+			const elements = lines.map(line => this._linkify(line, false, workspaceFolder, includeFulltext, hoverBehavior, highlights, defaultRef));
 			if (elements.length === 1) {
 				// Do not wrap single line with extra span.
 				return elements[0];
@@ -115,21 +118,26 @@ export class LinkDetector implements ILinkDetector {
 		const container = document.createElement('span');
 		for (const part of this.detectLinks(text)) {
 			try {
+				let node: Node;
 				switch (part.kind) {
 					case 'text':
-						container.appendChild(defaultRef ? this.linkifyLocation(part.value, defaultRef.locationReference, defaultRef.session, hoverBehavior) : document.createTextNode(part.value));
+						node = defaultRef ? this.linkifyLocation(part.value, defaultRef.locationReference, defaultRef.session, hoverBehavior) : document.createTextNode(part.value);
 						break;
 					case 'web':
-						container.appendChild(this.createWebLink(includeFulltext ? text : undefined, part.value, hoverBehavior));
+						node = this.createWebLink(includeFulltext ? text : undefined, part.value, hoverBehavior);
 						break;
 					case 'path': {
 						const path = part.captures[0];
 						const lineNumber = part.captures[1] ? Number(part.captures[1]) : 0;
 						const columnNumber = part.captures[2] ? Number(part.captures[2]) : 0;
-						container.appendChild(this.createPathLink(includeFulltext ? text : undefined, part.value, path, lineNumber, columnNumber, workspaceFolder, hoverBehavior));
+						node = this.createPathLink(includeFulltext ? text : undefined, part.value, path, lineNumber, columnNumber, workspaceFolder, hoverBehavior);
 						break;
 					}
+					default:
+						node = document.createTextNode(part.value);
 				}
+
+				container.append(...this.applyHighlights(node, part.index, part.value.length, highlights));
 			} catch (e) {
 				container.appendChild(document.createTextNode(part.value));
 			}
@@ -137,6 +145,50 @@ export class LinkDetector implements ILinkDetector {
 		return container;
 	}
 
+	private applyHighlights(node: Node, startIndex: number, length: number, highlights: IHighlight[] | undefined): Iterable<Node | string> {
+		const children: (Node | string)[] = [];
+		let currentIndex = startIndex;
+		const endIndex = startIndex + length;
+
+		for (const highlight of highlights || []) {
+			if (highlight.end <= currentIndex || highlight.start >= endIndex) {
+				continue;
+			}
+
+			if (highlight.start > currentIndex) {
+				children.push(node.textContent!.substring(currentIndex - startIndex, highlight.start - startIndex));
+				currentIndex = highlight.start;
+			}
+
+			const highlightEnd = Math.min(highlight.end, endIndex);
+			const highlightedText = node.textContent!.substring(currentIndex - startIndex, highlightEnd - startIndex);
+			const highlightSpan = document.createElement('span');
+			highlightSpan.classList.add('highlight');
+			if (highlight.extraClasses) {
+				highlightSpan.classList.add(...highlight.extraClasses);
+			}
+			highlightSpan.textContent = highlightedText;
+			children.push(highlightSpan);
+			currentIndex = highlightEnd;
+		}
+
+		if (currentIndex === startIndex) {
+			return Iterable.single(node); // no changes made
+		}
+
+		if (currentIndex < endIndex) {
+			children.push(node.textContent!.substring(currentIndex - startIndex));
+		}
+
+		// reuse the element if it's a link
+		if (isHTMLElement(node)) {
+			reset(node, ...children);
+			return Iterable.single(node);
+		}
+
+		return children;
+	}
+
 	/**
 	 * Linkifies a location reference.
 	 */
@@ -161,8 +213,8 @@ export class LinkDetector implements ILinkDetector {
 	 */
 	makeReferencedLinkDetector(locationReference: number, session: IDebugSession): ILinkDetector {
 		return {
-			linkify: (text, splitLines, workspaceFolder, includeFulltext, hoverBehavior) =>
-				this._linkify(text, splitLines, workspaceFolder, includeFulltext, hoverBehavior, { locationReference, session }),
+			linkify: (text, splitLines, workspaceFolder, includeFulltext, hoverBehavior, highlights) =>
+				this._linkify(text, splitLines, workspaceFolder, includeFulltext, hoverBehavior, highlights, { locationReference, session }),
 			linkifyLocation: this.linkifyLocation.bind(this),
 		};
 	}
@@ -295,16 +347,16 @@ export class LinkDetector implements ILinkDetector {
 
 	private detectLinks(text: string): LinkPart[] {
 		if (text.length > MAX_LENGTH) {
-			return [{ kind: 'text', value: text, captures: [] }];
+			return [{ kind: 'text', value: text, captures: [], index: 0 }];
 		}
 
 		const regexes: RegExp[] = [WEB_LINK_REGEX, PATH_LINK_REGEX];
 		const kinds: LinkKind[] = ['web', 'path'];
 		const result: LinkPart[] = [];
 
-		const splitOne = (text: string, regexIndex: number) => {
+		const splitOne = (text: string, regexIndex: number, baseIndex: number) => {
 			if (regexIndex >= regexes.length) {
-				result.push({ value: text, kind: 'text', captures: [] });
+				result.push({ value: text, kind: 'text', captures: [], index: baseIndex });
 				return;
 			}
 			const regex = regexes[regexIndex];
@@ -314,23 +366,24 @@ export class LinkDetector implements ILinkDetector {
 			while ((match = regex.exec(text)) !== null) {
 				const stringBeforeMatch = text.substring(currentIndex, match.index);
 				if (stringBeforeMatch) {
-					splitOne(stringBeforeMatch, regexIndex + 1);
+					splitOne(stringBeforeMatch, regexIndex + 1, baseIndex + currentIndex);
 				}
 				const value = match[0];
 				result.push({
 					value: value,
 					kind: kinds[regexIndex],
-					captures: match.slice(1)
+					captures: match.slice(1),
+					index: baseIndex + match.index
 				});
 				currentIndex = match.index + value.length;
 			}
 			const stringAfterMatches = text.substring(currentIndex);
 			if (stringAfterMatches) {
-				splitOne(stringAfterMatches, regexIndex + 1);
+				splitOne(stringAfterMatches, regexIndex + 1, baseIndex + currentIndex);
 			}
 		};
 
-		splitOne(text, 0);
+		splitOne(text, 0, 0);
 		return result;
 	}
 }
diff --git a/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css b/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css
index 90dfb51bc60..f795c6c22eb 100644
--- a/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css
+++ b/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css
@@ -274,6 +274,12 @@
 	font-family: var(--monaco-monospace-font);
 	font-weight: normal;
 }
+.debug-view-content .monaco-tl-contents .highlight {
+	color: unset !important;
+	background-color: var(--vscode-list-filterMatchBackground);
+	outline: 1px dotted var(--vscode-list-filterMatchBorder);
+	outline-offset: -1px;
+}
 
 /* Breakpoints */
 
diff --git a/src/vs/workbench/contrib/debug/browser/variablesView.ts b/src/vs/workbench/contrib/debug/browser/variablesView.ts
index 16d53c4f87e..74c22d9ee97 100644
--- a/src/vs/workbench/contrib/debug/browser/variablesView.ts
+++ b/src/vs/workbench/contrib/debug/browser/variablesView.ts
@@ -46,7 +46,7 @@ import { CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS
 import { getContextForVariable } from '../common/debugContext.js';
 import { ErrorScope, Expression, Scope, StackFrame, Variable, VisualizedExpression, getUriForDebugMemory } from '../common/debugModel.js';
 import { DebugVisualizer, IDebugVisualizerService } from '../common/debugVisualizers.js';
-import { AbstractExpressionDataSource, AbstractExpressionsRenderer, IExpressionTemplateData, IInputBoxOptions, renderViewTree } from './baseDebugView.js';
+import { AbstractExpressionDataSource, AbstractExpressionsRenderer, expressionAndScopeLabelProvider, IExpressionTemplateData, IInputBoxOptions, renderViewTree } from './baseDebugView.js';
 import { ADD_TO_WATCH_ID, ADD_TO_WATCH_LABEL, COPY_EVALUATE_PATH_ID, COPY_EVALUATE_PATH_LABEL, COPY_VALUE_ID, COPY_VALUE_LABEL } from './debugCommands.js';
 import { DebugExpressionRenderer } from './debugExpressionRenderer.js';
 
@@ -138,7 +138,7 @@ export class VariablesView extends ViewPane implements IDebugViewWithVariables {
 			this.instantiationService.createInstance(VariablesDataSource), {
 			accessibilityProvider: new VariablesAccessibilityProvider(),
 			identityProvider: { getId: (element: IExpression | IScope) => element.getId() },
-			keyboardNavigationLabelProvider: { getKeyboardNavigationLabel: (e: IExpression | IScope) => e.name },
+			keyboardNavigationLabelProvider: expressionAndScopeLabelProvider,
 			overrideStyles: this.getLocationBasedColors().listOverrideStyles
 		});
 
diff --git a/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts b/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
index b325c138b0a..a56d4aae462 100644
--- a/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
+++ b/src/vs/workbench/contrib/debug/browser/watchExpressionsView.ts
@@ -31,7 +31,7 @@ import { IViewletViewOptions } from '../../../browser/parts/views/viewsViewlet.j
 import { IViewDescriptorService } from '../../../common/views.js';
 import { CONTEXT_CAN_VIEW_MEMORY, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_WATCH_EXPRESSIONS_EXIST, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_WATCH_ITEM_TYPE, IDebugConfiguration, IDebugService, IDebugViewWithVariables, IExpression, WATCH_VIEW_ID } from '../common/debug.js';
 import { Expression, Variable, VisualizedExpression } from '../common/debugModel.js';
-import { AbstractExpressionDataSource, AbstractExpressionsRenderer, IExpressionTemplateData, IInputBoxOptions, renderViewTree } from './baseDebugView.js';
+import { AbstractExpressionDataSource, AbstractExpressionsRenderer, expressionAndScopeLabelProvider, IExpressionTemplateData, IInputBoxOptions, renderViewTree } from './baseDebugView.js';
 import { DebugExpressionRenderer } from './debugExpressionRenderer.js';
 import { watchExpressionsAdd, watchExpressionsRemoveAll } from './debugIcons.js';
 import { VariablesRenderer, VisualizedVariableRenderer } from './variablesView.js';
@@ -109,7 +109,7 @@ export class WatchExpressionsView extends ViewPane implements IDebugViewWithVari
 						return undefined;
 					}
 
-					return e.name;
+					return expressionAndScopeLabelProvider.getKeyboardNavigationLabel(e);
 				}
 			},
 			dnd: new WatchExpressionsDragAndDrop(this.debugService),
diff --git a/src/vs/workbench/contrib/debug/test/browser/debugANSIHandling.test.ts b/src/vs/workbench/contrib/debug/test/browser/debugANSIHandling.test.ts
index eb31a388b2e..17d23dc6303 100644
--- a/src/vs/workbench/contrib/debug/test/browser/debugANSIHandling.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/debugANSIHandling.test.ts
@@ -51,8 +51,8 @@ suite('Debug - ANSI Handling', () => {
 
 		assert.strictEqual(0, root.children.length);
 
-		appendStylizedStringToContainer(root, 'content1', ['class1', 'class2'], linkDetector, session.root);
-		appendStylizedStringToContainer(root, 'content2', ['class2', 'class3'], linkDetector, session.root);
+		appendStylizedStringToContainer(root, 'content1', ['class1', 'class2'], linkDetector, session.root, undefined, undefined, undefined, undefined, 0);
+		appendStylizedStringToContainer(root, 'content2', ['class2', 'class3'], linkDetector, session.root, undefined, undefined, undefined, undefined, 0);
 
 		assert.strictEqual(2, root.children.length);
 
@@ -82,7 +82,7 @@ suite('Debug - ANSI Handling', () => {
 	 * @returns An {@link HTMLSpanElement} that contains the stylized text.
 	 */
 	function getSequenceOutput(sequence: string): HTMLSpanElement {
-		const root: HTMLSpanElement = handleANSIOutput(sequence, linkDetector, session.root);
+		const root: HTMLSpanElement = handleANSIOutput(sequence, linkDetector, session.root, []);
 		assert.strictEqual(1, root.children.length);
 		const child: Node = root.lastChild!;
 		if (isHTMLSpanElement(child)) {
@@ -395,7 +395,7 @@ suite('Debug - ANSI Handling', () => {
 		if (elementsExpected === undefined) {
 			elementsExpected = assertions.length;
 		}
-		const root: HTMLSpanElement = handleANSIOutput(sequence, linkDetector, session.root);
+		const root: HTMLSpanElement = handleANSIOutput(sequence, linkDetector, session.root, []);
 		assert.strictEqual(elementsExpected, root.children.length);
 		for (let i = 0; i < elementsExpected; i++) {
 			const child: Node = root.children[i];
diff --git a/src/vs/workbench/contrib/debug/test/browser/linkDetector.test.ts b/src/vs/workbench/contrib/debug/test/browser/linkDetector.test.ts
index c078c4a371e..9e2d0c8c767 100644
--- a/src/vs/workbench/contrib/debug/test/browser/linkDetector.test.ts
+++ b/src/vs/workbench/contrib/debug/test/browser/linkDetector.test.ts
@@ -13,6 +13,7 @@ import { ITunnelService } from '../../../../../platform/tunnel/common/tunnel.js'
 import { WorkspaceFolder } from '../../../../../platform/workspace/common/workspace.js';
 import { LinkDetector } from '../../browser/linkDetector.js';
 import { workbenchInstantiationService } from '../../../../test/browser/workbenchTestServices.js';
+import { IHighlight } from '../../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
 
 suite('Debug - Link Detector', () => {
 
@@ -168,4 +169,67 @@ suite('Debug - Link Detector', () => {
 		assertElementIsLink(output.children[1].children[0]);
 		assert.strictEqual(isWindows ? 'C:/foo/bar.js:12:34' : '/Users/foo/bar.js:12:34', output.children[1].children[0].textContent);
 	});
+
+	test('highlightNoLinks', () => {
+		const input = 'I am a string';
+		const highlights: IHighlight[] = [{ start: 2, end: 5 }];
+		const expectedOutput = '<span>I <span class="highlight">am </span>a string</span>';
+		const output = linkDetector.linkify(input, false, undefined, false, undefined, highlights);
+
+		assert.strictEqual(1, output.children.length);
+		assert.strictEqual('SPAN', output.tagName);
+		assert.strictEqual(expectedOutput, output.outerHTML);
+	});
+
+	test('highlightWithLink', () => {
+		const input = isWindows ? 'C:\\foo\\bar.js:12:34' : '/Users/foo/bar.js:12:34';
+		const highlights: IHighlight[] = [{ start: 0, end: 5 }];
+		const expectedOutput = isWindows ? '<span><a tabindex="0"><span class="highlight">C:\\fo</span>o\\bar.js:12:34</a></span>' : '<span><a tabindex="0"><span class="highlight">/User</span>s/foo/bar.js:12:34</a></span>';
+		const output = linkDetector.linkify(input, false, undefined, false, undefined, highlights);
+
+		assert.strictEqual(1, output.children.length);
+		assert.strictEqual('SPAN', output.tagName);
+		assert.strictEqual('A', output.firstElementChild!.tagName);
+		assert.strictEqual(expectedOutput, output.outerHTML);
+		assertElementIsLink(output.firstElementChild!);
+	});
+
+	test('highlightOverlappingLinkStart', () => {
+		const input = isWindows ? 'C:\\foo\\bar.js:12:34' : '/Users/foo/bar.js:12:34';
+		const highlights: IHighlight[] = [{ start: 0, end: 10 }];
+		const expectedOutput = isWindows ? '<span><a tabindex="0"><span class="highlight">C:\\foo\\bar</span>.js:12:34</a></span>' : '<span><a tabindex="0"><span class="highlight">/Users/foo</span>/bar.js:12:34</a></span>';
+		const output = linkDetector.linkify(input, false, undefined, false, undefined, highlights);
+
+		assert.strictEqual(1, output.children.length);
+		assert.strictEqual('SPAN', output.tagName);
+		assert.strictEqual('A', output.firstElementChild!.tagName);
+		assert.strictEqual(expectedOutput, output.outerHTML);
+		assertElementIsLink(output.firstElementChild!);
+	});
+
+	test('highlightOverlappingLinkEnd', () => {
+		const input = isWindows ? 'C:\\foo\\bar.js:12:34' : '/Users/foo/bar.js:12:34';
+		const highlights: IHighlight[] = [{ start: 10, end: 20 }];
+		const expectedOutput = isWindows ? '<span><a tabindex="0">C:\\foo\\bar<span class="highlight">.js:12:34</span></a></span>' : '<span><a tabindex="0">/Users/foo<span class="highlight">/bar.js:12</span>:34</a></span>';
+		const output = linkDetector.linkify(input, false, undefined, false, undefined, highlights);
+
+		assert.strictEqual(1, output.children.length);
+		assert.strictEqual('SPAN', output.tagName);
+		assert.strictEqual('A', output.firstElementChild!.tagName);
+		assert.strictEqual(expectedOutput, output.outerHTML);
+		assertElementIsLink(output.firstElementChild!);
+	});
+
+	test('highlightOverlappingLinkStartAndEnd', () => {
+		const input = isWindows ? 'C:\\foo\\bar.js:12:34' : '/Users/foo/bar.js:12:34';
+		const highlights: IHighlight[] = [{ start: 5, end: 15 }];
+		const expectedOutput = isWindows ? '<span><a tabindex="0">C:\\fo<span class="highlight">o\\bar.js:1</span>2:34</a></span>' : '<span><a tabindex="0">/User<span class="highlight">s/foo/bar.</span>js:12:34</a></span>';
+		const output = linkDetector.linkify(input, false, undefined, false, undefined, highlights);
+
+		assert.strictEqual(1, output.children.length);
+		assert.strictEqual('SPAN', output.tagName);
+		assert.strictEqual('A', output.firstElementChild!.tagName);
+		assert.strictEqual(expectedOutput, output.outerHTML);
+		assertElementIsLink(output.firstElementChild!);
+	});
 });

From 151ef3514e76629f4e7bf3951439b1e0dae0a6e5 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Sun, 22 Dec 2024 14:09:59 +0100
Subject: [PATCH 466/479] SCM - disable actions for resource groups that do not
 have any resources (#236813)

---
 extensions/git/package.json                   | 14 ++++++-------
 src/vs/workbench/contrib/scm/browser/menus.ts | 20 ++++++++++---------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/extensions/git/package.json b/extensions/git/package.json
index 53aa0fad747..4556255d3da 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -163,14 +163,14 @@
         "title": "%command.stageAll%",
         "category": "Git",
         "icon": "$(add)",
-        "enablement": "!operationInProgress"
+        "enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
       },
       {
         "command": "git.stageAllTracked",
         "title": "%command.stageAllTracked%",
         "category": "Git",
         "icon": "$(add)",
-        "enablement": "!operationInProgress"
+        "enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
       },
       {
         "command": "git.stageAllUntracked",
@@ -243,7 +243,7 @@
         "title": "%command.unstageAll%",
         "category": "Git",
         "icon": "$(remove)",
-        "enablement": "!operationInProgress"
+        "enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
       },
       {
         "command": "git.unstageSelectedRanges",
@@ -270,14 +270,14 @@
         "title": "%command.cleanAll%",
         "category": "Git",
         "icon": "$(discard)",
-        "enablement": "!operationInProgress"
+        "enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
       },
       {
         "command": "git.cleanAllTracked",
         "title": "%command.cleanAllTracked%",
         "category": "Git",
         "icon": "$(discard)",
-        "enablement": "!operationInProgress"
+        "enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
       },
       {
         "command": "git.cleanAllUntracked",
@@ -889,14 +889,14 @@
         "title": "%command.viewChanges%",
         "icon": "$(diff-multiple)",
         "category": "Git",
-        "enablement": "!operationInProgress"
+        "enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
       },
       {
         "command": "git.viewStagedChanges",
         "title": "%command.viewStagedChanges%",
         "icon": "$(diff-multiple)",
         "category": "Git",
-        "enablement": "!operationInProgress"
+        "enablement": "!operationInProgress && scmResourceGroupResourceCount > 0"
       },
       {
         "command": "git.viewUntrackedChanges",
diff --git a/src/vs/workbench/contrib/scm/browser/menus.ts b/src/vs/workbench/contrib/scm/browser/menus.ts
index f14d8ea79f6..352f63b6f3e 100644
--- a/src/vs/workbench/contrib/scm/browser/menus.ts
+++ b/src/vs/workbench/contrib/scm/browser/menus.ts
@@ -6,7 +6,7 @@
 import { IAction } from '../../../../base/common/actions.js';
 import { equals } from '../../../../base/common/arrays.js';
 import { Emitter } from '../../../../base/common/event.js';
-import { DisposableStore, IDisposable, dispose } from '../../../../base/common/lifecycle.js';
+import { DisposableStore, IDisposable, MutableDisposable, dispose } from '../../../../base/common/lifecycle.js';
 import './media/scm.css';
 import { localize } from '../../../../nls.js';
 import { getActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
@@ -70,13 +70,14 @@ interface IContextualResourceMenuItem {
 
 class SCMMenusItem implements IDisposable {
 
-	private _resourceGroupMenu: IMenu | undefined;
+	private readonly _resourceGroupMenu = new MutableDisposable<IMenu>();
 	get resourceGroupMenu(): IMenu {
-		if (!this._resourceGroupMenu) {
-			this._resourceGroupMenu = this.menuService.createMenu(MenuId.SCMResourceGroupContext, this.contextKeyService);
-		}
+		const contextKeyService = this.contextKeyService.createOverlay([
+			['scmResourceGroupResourceCount', this.group.resources.length],
+		]);
 
-		return this._resourceGroupMenu;
+		this._resourceGroupMenu.value = this.menuService.createMenu(MenuId.SCMResourceGroupContext, contextKeyService);
+		return this._resourceGroupMenu.value;
 	}
 
 	private _resourceFolderMenu: IMenu | undefined;
@@ -92,8 +93,9 @@ class SCMMenusItem implements IDisposable {
 	private contextualResourceMenus: Map<string /* contextValue */, IContextualResourceMenuItem> | undefined;
 
 	constructor(
-		private contextKeyService: IContextKeyService,
-		private menuService: IMenuService
+		private readonly group: ISCMResourceGroup,
+		private readonly contextKeyService: IContextKeyService,
+		private readonly menuService: IMenuService
 	) { }
 
 	getResourceMenu(resource: ISCMResource): IMenu {
@@ -206,7 +208,7 @@ export class SCMRepositoryMenus implements ISCMRepositoryMenus, IDisposable {
 				['multiDiffEditorEnableViewChanges', group.multiDiffEditorEnableViewChanges],
 			]);
 
-			result = new SCMMenusItem(contextKeyService, this.menuService);
+			result = new SCMMenusItem(group, contextKeyService, this.menuService);
 			this.resourceGroupMenusItems.set(group, result);
 		}
 

From 2e5cbd49c8252d6e1dc44de2ce8f63899a8774f7 Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Mon, 23 Dec 2024 19:22:49 +0900
Subject: [PATCH 467/479] chore: update electron@32.2.7 (#236843)

* chore: update electron@32.2.7

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

diff --git a/.npmrc b/.npmrc
index 22256e5d8e7..27692c2409e 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1,6 +1,6 @@
 disturl="https://electronjs.org/headers"
-target="32.2.6"
-ms_build_id="10629634"
+target="32.2.7"
+ms_build_id="10660205"
 runtime="electron"
 build_from_source="true"
 legacy-peer-deps="true"
diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt
index 17ec96faa2a..293250496af 100644
--- a/build/checksums/electron.txt
+++ b/build/checksums/electron.txt
@@ -1,75 +1,75 @@
-bb4164f7b554606b2c4daaf43e81bf2e2b5cf0d4441cfdd74f04653237fcf655 *chromedriver-v32.2.6-darwin-arm64.zip
-a0fc3df1c6cd17bfe62ffbb1eba3655ca625dea5046e5d2b3dbb0e9e349cd10e *chromedriver-v32.2.6-darwin-x64.zip
-671d6dab890747ea73ba5589327eef7612670950a20e5f88c7d8a301b5491e26 *chromedriver-v32.2.6-linux-arm64.zip
-55bfd4e33fef1506261d4cb3074988e1970c2a762ca76a8f1197512a1766723c *chromedriver-v32.2.6-linux-armv7l.zip
-d3c7a45c8c75152db927b3596f506995e72631df870b302b7dbcbd3399e54a3a *chromedriver-v32.2.6-linux-x64.zip
-567f77d09708942901c6cdce6708b995f6ac779faceebb4ed383ca5003e2de4e *chromedriver-v32.2.6-mas-arm64.zip
-b3a28181b1d077742f1be632a802e15b5a36a260b1cfe0e429735de9f52d074a *chromedriver-v32.2.6-mas-x64.zip
-a113f5bd747b6eeb033f4d6ea2f53cf332d9b45d6340af514dd938bac7f99419 *chromedriver-v32.2.6-win32-arm64.zip
-3b3237a788fad0a6be63a69b93c28b6052db23aeaa1a75d2589be15b4c2c0f2f *chromedriver-v32.2.6-win32-ia32.zip
-1096c131cf8e3f98a01525e93d573eaf4fd23492d8dd78a211e39c448e69e463 *chromedriver-v32.2.6-win32-x64.zip
-8e6fcf3171c3fcdcb117f641ec968bb53be3d38696e388636bf34f04c10b987d *electron-api.json
-b1b20784a97e64992c92480e69af828a110d834372479b26759f1559b3da80fc *electron-v32.2.6-darwin-arm64-dsym-snapshot.zip
-f11dd5a84229430ec59b4335415a4b308dc4330ff7b9febae20165fbdd862e92 *electron-v32.2.6-darwin-arm64-dsym.zip
-cc96cf91f6b108dc927d8f7daee2fe27ae8a492c932993051508aa779e816445 *electron-v32.2.6-darwin-arm64-symbols.zip
-fcb6bbb6aa3c1020b4045dbe9f2a5286173d5025248550f55631e70568e91775 *electron-v32.2.6-darwin-arm64.zip
-d2bfeea27fc91936b4f71d0f5c577e5ad0ea094edba541dfa348948fd65c3331 *electron-v32.2.6-darwin-x64-dsym-snapshot.zip
-5e7684cc12c0dee11fb933b68301d0fe68d3198d1daeadd5e1b4cf52743f79bf *electron-v32.2.6-darwin-x64-dsym.zip
-6d2a7d41ab14fc7d3c5e4b35d5d425edb2d13978dcc332e781ec8b7bcfe6a794 *electron-v32.2.6-darwin-x64-symbols.zip
-c0964ee5fdcefb1003ffd7ef574b07e5147856f3a94bb4335f78c409f8cf2eca *electron-v32.2.6-darwin-x64.zip
-604d88b9d434ea66ddf234dd129dcef3d468b95b0da47e2f1555a682c8d0de28 *electron-v32.2.6-linux-arm64-debug.zip
-f448e91df42fc84177bcd46378e49ee648f6114984fc57af4a84690a5197c23e *electron-v32.2.6-linux-arm64-symbols.zip
-9e4f9345cae06e8e5679b228e7b7ac21b8733e3fcda8903e3dcbc8171c53f8be *electron-v32.2.6-linux-arm64.zip
-604d88b9d434ea66ddf234dd129dcef3d468b95b0da47e2f1555a682c8d0de28 *electron-v32.2.6-linux-armv7l-debug.zip
-c85d5ca3f38dc4140040bcde6a37ac9c7510bb542f12e1ffce695a35f68e3c13 *electron-v32.2.6-linux-armv7l-symbols.zip
-df4b490a9c501d83c5305f20b2a9d1aa100d2e878e59ebafde477f21d35e3300 *electron-v32.2.6-linux-armv7l.zip
-a5aa67da85ee318ff0770d55a506f62e6e5a10e967dfab272a94bcd91922e075 *electron-v32.2.6-linux-x64-debug.zip
-671eb342a58e056f0dee5a6e9c69a6a96ee2141f81d306fa1a0e2635e22aa7c0 *electron-v32.2.6-linux-x64-symbols.zip
-a3231409db7f8ac2cc446708f17e2abac0f8549c166eaab2f427e8d0f864208d *electron-v32.2.6-linux-x64.zip
-8b8d0aeadcf21633216a9cce87d323ad6aa21e38ec82092cd5f65bf171be025f *electron-v32.2.6-mas-arm64-dsym-snapshot.zip
-298931236955b83d174738d3325931e9672a8333bf854fc5f471168b0f7e70be *electron-v32.2.6-mas-arm64-dsym.zip
-53e4c666a6f5f87aa150b1c2f34532e3711e00b0237fb103dcbef64d65979429 *electron-v32.2.6-mas-arm64-symbols.zip
-bedbc78acc3bc6cb30e5fe1f133562104152022273ec21a83cd32a0eece9003f *electron-v32.2.6-mas-arm64.zip
-9ba3def756c90460867d968af5417996991bf3b4b306dba4c9fbde43de2f771d *electron-v32.2.6-mas-x64-dsym-snapshot.zip
-e4a3f9392934bb4ef82a214fec2ce1f319ea409b89bf03b2a2a4ab7a55688d0c *electron-v32.2.6-mas-x64-dsym.zip
-55c54fd01faf5767493183001a440b837b63f8b8d64c36f7b42fa7217af36dcd *electron-v32.2.6-mas-x64-symbols.zip
-1efe974cd426a288d617750c864e6edbf28495c3b851a5bc806af19cda7a274d *electron-v32.2.6-mas-x64.zip
-88c50d34dc48a55a11014349d2d278f895f1615405614dbfcf27dff5f5030cf1 *electron-v32.2.6-win32-arm64-pdb.zip
-b0b2211bf0f11924bcd693b6783627c7f6c9a066117bcf05c10766064c79794c *electron-v32.2.6-win32-arm64-symbols.zip
-48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.6-win32-arm64-toolchain-profile.zip
-2b7962348f23410863cb6562d79654ce534666bab9f75965b5c8ebee61f49657 *electron-v32.2.6-win32-arm64.zip
-d248ab4ec8b4a5aec414c7a404e0efd9b9a73083f7c5cb6c657c2ed58c4cbe94 *electron-v32.2.6-win32-ia32-pdb.zip
-2ef98197d66d94aee4978047f22ba07538d259b25a8f5f301d9564a13649e72c *electron-v32.2.6-win32-ia32-symbols.zip
-48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.6-win32-ia32-toolchain-profile.zip
-e85dbf85d58cab5b06cdb8e76fde3a25306e7c1808f5bb30925ba7e29ff14d13 *electron-v32.2.6-win32-ia32.zip
-9d76b0c0d475cc062b2a951fbfb3b17837880102fb6cc042e2736dfebbfa0e5d *electron-v32.2.6-win32-x64-pdb.zip
-3d7b93bafc633429f5c9f820bcb4843d504b12e454b3ecebb1b69c15b5f4080f *electron-v32.2.6-win32-x64-symbols.zip
-48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.6-win32-x64-toolchain-profile.zip
-77d5e5b76b49767e6a3ad292dc315fbc7cdccd557ac38da9093b8ac6da9262d5 *electron-v32.2.6-win32-x64.zip
-a52935712eb4fc2c12ac4ae611a57e121da3b6165c2de1abd7392ed4261287e2 *electron.d.ts
-6345ea55fda07544434c90c276cdceb2662044b9e0355894db67ca95869af22a *ffmpeg-v32.2.6-darwin-arm64.zip
-4c1347e8653727513a22be013008c2760d19200977295b98506b3b9947e74090 *ffmpeg-v32.2.6-darwin-x64.zip
-3f1eafaf4cd90ab43ba0267429189be182435849a166a2cbe1faefc0d07217c4 *ffmpeg-v32.2.6-linux-arm64.zip
-3db919bc57e1a5bf7c1bae1d7aeacf4a331990ea82750391c0b24a046d9a2812 *ffmpeg-v32.2.6-linux-armv7l.zip
-fe7d779dddbfb5da5999a7607fc5e3c7a6ab7c65e8da9fee1384918865231612 *ffmpeg-v32.2.6-linux-x64.zip
-e09ae881113d1b3103aec918e7c95c36f82b2db63657320c380c94386f689138 *ffmpeg-v32.2.6-mas-arm64.zip
-ee316e435662201a81fcededc62582dc87a0bd5c9fd0f6a8a55235eca806652f *ffmpeg-v32.2.6-mas-x64.zip
-415395968d31e13056cefcb589ed550a0e80d7c3d0851ee3ba29e4dcdf174210 *ffmpeg-v32.2.6-win32-arm64.zip
-17f61a5293b707c984cee52b57a7e505cde994d22828e31c016434521638e419 *ffmpeg-v32.2.6-win32-ia32.zip
-f9b47951a553eec21636b3cc15eccf0a2ba272567146ec8a6e2eeb91a985fd62 *ffmpeg-v32.2.6-win32-x64.zip
-7d2b596bd94e4d5c7befba11662dc563a02f18c183da12ebd56f38bb6f4382e9 *hunspell_dictionaries.zip
-06bca9a33142b5834fbca6d10d7f3303b0b5c52e7222fe783db109cd4c5260ed *libcxx-objects-v32.2.6-linux-arm64.zip
-7ab8ff5a4e1d3a6639978ed718d2732df9c1a4dd4dcd3e18f6746a2168d353a9 *libcxx-objects-v32.2.6-linux-armv7l.zip
-ba96792896751e11fdba63e5e336e323979986176aa1848122ca3757c854352e *libcxx-objects-v32.2.6-linux-x64.zip
-1f858d484f4ce27f9f3c4a120b2881f88c17c81129ca10e495b50398fb2eed64 *libcxx_headers.zip
-4566afb06a6dd8bd895dba5350a5705868203321116a1ae0a216d5a4a6bfb289 *libcxxabi_headers.zip
-350f5419c14aede5802c4f0ef5204ddbbe0eb7d5263524da38d19f43620d8530 *mksnapshot-v32.2.6-darwin-arm64.zip
-9f4e4943df4502943994ffa17525b7b5b9a1d889dbc5aeb28bfc40f9146323ec *mksnapshot-v32.2.6-darwin-x64.zip
-6295ad1a4ab3b24ac99ec85d35ebfce3861e58185b94d20077e364e81ad935f8 *mksnapshot-v32.2.6-linux-arm64-x64.zip
-ed9e1931165a2ff85c1af9f10b3bf8ba05d2dae31331d1d4f5ff1512078e4411 *mksnapshot-v32.2.6-linux-armv7l-x64.zip
-6680c63b11e4638708d88c130474ceb2ee92fc58c62cfcd3bf33dda9fee771c2 *mksnapshot-v32.2.6-linux-x64.zip
-5a4c45b755b7bbdcad51345f5eb2935ba988987650f9b8540c7ef04015207a2f *mksnapshot-v32.2.6-mas-arm64.zip
-1e6243d6a1b68f327457b9dae244ffaeadc265b07a99d9c36f1abcff31e36856 *mksnapshot-v32.2.6-mas-x64.zip
-407099537b17860ce7dcea6ba582a854314c29dc152a6df0abcc77ebb0187b4c *mksnapshot-v32.2.6-win32-arm64-x64.zip
-f9107536378e19ae9305386dacf6fae924c7ddaad0cf0a6f49694e1e8af6ded5 *mksnapshot-v32.2.6-win32-ia32.zip
-82a142db76a2cc5dfb9a89e4cd721cfebc0f3077d2415d8f3d86bb7411f0fe27 *mksnapshot-v32.2.6-win32-x64.zip
+0729d2cb830425c4591b40d7189c2f7da020f5adb887a49a4faa022d551b1e6f *chromedriver-v32.2.7-darwin-arm64.zip
+a7d61c68d3b3522c0ec383915b6ab3d9f269d9ada0e09aa87a4e7d9fc24fe928 *chromedriver-v32.2.7-darwin-x64.zip
+45314c8c7127f6083469c2c067aa78beb20055ba4d7a63eb2108b27e594a647a *chromedriver-v32.2.7-linux-arm64.zip
+7e976a7131dcfd55f781c073ae59c8a24a1393119d831fbac13c6a335eb71467 *chromedriver-v32.2.7-linux-armv7l.zip
+3437feb5d8e7157476d2e7a6558346061cd7e46506874bc7870eed8a3a43642a *chromedriver-v32.2.7-linux-x64.zip
+3737301add80a936374acb17b84bb3a715fab9fbce049816ea7a51fa53d3b35e *chromedriver-v32.2.7-mas-arm64.zip
+8b8b62f48a5e8b8a340b47348a2cc5dd4ba38789f76bc5567c039587538081a9 *chromedriver-v32.2.7-mas-x64.zip
+24b666e3ab41eb1c66ab0f2361af0529b2b8e1e5ef153cfcef36adc700f9ed6d *chromedriver-v32.2.7-win32-arm64.zip
+6d40251661afb1835adbef85e317fd520c0f1378156614c82befb348c3122c2d *chromedriver-v32.2.7-win32-ia32.zip
+483012da9903d8d75e5e251a3262667c9a0a012a492b93dbe1237c7827eba778 *chromedriver-v32.2.7-win32-x64.zip
+1e9b2b9011f56fa26f4d9fa57254ef1d0bdb34405a9bdf83a652f6258347e46d *electron-api.json
+c0ea4a21f2e7e946300bf587a4e31f72ef996c497eaa94e6b8f788b917b896e5 *electron-v32.2.7-darwin-arm64-dsym-snapshot.zip
+1e6e84e56cfb3a2473cab41577c160d3afcbda8337dda17c5295da90266433c9 *electron-v32.2.7-darwin-arm64-dsym.zip
+9f460100fb71ef098bec26e9a09978ec1b1663165d6a358bfc398f5548a844c3 *electron-v32.2.7-darwin-arm64-symbols.zip
+71e76a0a81a0c1c10e9e4862caf96437ba85a18c8fa7d8e15d59e3c057b893bd *electron-v32.2.7-darwin-arm64.zip
+e406d690365f332826843c86c6a1b5c0320a84b0527ad8700a0e995b12a35f8c *electron-v32.2.7-darwin-x64-dsym-snapshot.zip
+53d6fb64d717af80f024284161a432aaffb47631ef7548f18f33016c3376871a *electron-v32.2.7-darwin-x64-dsym.zip
+3c9187db2cc0570d7b01651fa78294df7d451c87c361335cee80a61c1c561b67 *electron-v32.2.7-darwin-x64-symbols.zip
+34310ed51d32b6c02ba3e3f447b0807ea85804d1f2b239e02a9de58b9080fbf8 *electron-v32.2.7-darwin-x64.zip
+e884f2f9f3d001488888929b8affe053a60a7a780af7d0ec8d7023023f40ca52 *electron-v32.2.7-linux-arm64-debug.zip
+fd88e47e7b564b006f68641b5c328721bbc8d87cfc9e569d9733354d263cddee *electron-v32.2.7-linux-arm64-symbols.zip
+fb6e1f24385c3058844bd768320d5b332b4cbd011ab930e7252dc330c8ee17b3 *electron-v32.2.7-linux-arm64.zip
+e884f2f9f3d001488888929b8affe053a60a7a780af7d0ec8d7023023f40ca52 *electron-v32.2.7-linux-armv7l-debug.zip
+f338ea7ea592c3ccdad1bb788e9b936610f825ac69290e48d394790d5266dce3 *electron-v32.2.7-linux-armv7l-symbols.zip
+4a95643e88cadfb011354d25cafe242cdb8c5327d65f86b4fbabe64717367ed2 *electron-v32.2.7-linux-armv7l.zip
+e6e0fce9f6d95a84653b537b741967cae48c4c70c8026c02293c979074225b46 *electron-v32.2.7-linux-x64-debug.zip
+122cc565d0ccd2774e298645473869752d27d2632aa97583d93b499e9b02f22b *electron-v32.2.7-linux-x64-symbols.zip
+98007545e1d3700b32de5cb5eebcc10b9d105fb0dad6396155fdab1b40abb638 *electron-v32.2.7-linux-x64.zip
+556d9ca239ee1206c9d67affa836ebb651db88eea6bee48cb7b43fa75851c72d *electron-v32.2.7-mas-arm64-dsym-snapshot.zip
+662a3742b94fcbf7ab91a7c20e1430825ae7852e915fcb558d6357a310d631c6 *electron-v32.2.7-mas-arm64-dsym.zip
+edd0763ead7ffd5bf5072539e5ca0be9252b9590e674e6e44e69b2057c329d79 *electron-v32.2.7-mas-arm64-symbols.zip
+a4483f5246ecadfa48b1fc671d92b5dfbc09fbd88fe386f2ce48f10de79f2127 *electron-v32.2.7-mas-arm64.zip
+a9aad4c413d4851fa3463eeef7015e3a3e77a501192965db1c5b870fa31a9660 *electron-v32.2.7-mas-x64-dsym-snapshot.zip
+96c20e5c4b73febd3458679e9cc939f5f8255a327b06f49188ab2e3fe8311ea3 *electron-v32.2.7-mas-x64-dsym.zip
+6ac844957373114e04411d3af1cb6507e35174d1dc279cce41cb92bbf2ea5d26 *electron-v32.2.7-mas-x64-symbols.zip
+888b830b991dab6cf2c4351e112a48f24a4748efefcd763d693a79161199e65a *electron-v32.2.7-mas-x64.zip
+27759db6bcdd16d4ff5548684361ba4372d885d3142bf02db59837c3634b1934 *electron-v32.2.7-win32-arm64-pdb.zip
+6019e6ec58e9b6da335f20874efebc42d034a179163180b3b6faedf2963ae577 *electron-v32.2.7-win32-arm64-symbols.zip
+48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.7-win32-arm64-toolchain-profile.zip
+2c755fdd4f9fda618b2db6b8c7210c5f3106a88b1e87b83e8433b4ab4a628cc2 *electron-v32.2.7-win32-arm64.zip
+4dce0b21d1c2093cc4f7c0eaf9453a38377e0076d811da3c7391f105fc1d6afb *electron-v32.2.7-win32-ia32-pdb.zip
+9a0a9c3746cd40ddc9c926755633b16676714e2138d7a2d888f658a26f617039 *electron-v32.2.7-win32-ia32-symbols.zip
+48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.7-win32-ia32-toolchain-profile.zip
+6c338c5cd0b0587349ab0f119ca8f7d2728b1c3a43fe241741087f5fdf139c9c *electron-v32.2.7-win32-ia32.zip
+fa240d324c5376aa12ed2aef26597764d9bfc2fdd0d16d7f76afc2c3e3c65a29 *electron-v32.2.7-win32-x64-pdb.zip
+f645b53771cbcdfaa041d9cf9581348821d82c1b185ddb913759e2d62ee2410a *electron-v32.2.7-win32-x64-symbols.zip
+48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.7-win32-x64-toolchain-profile.zip
+819ab19b7111dfd39dff506b3cb5cd2e1d8f4bb17f96ba74b987b2eac14b6c63 *electron-v32.2.7-win32-x64.zip
+ce41b10c28bd43249cd3b409e081b1c83a2b691381bdd2e3bf208ec40ca176b8 *electron.d.ts
+d2491071a641ce2e0f63c1f52e3a412856dd83ca17d021af1166d6e5b4de5638 *ffmpeg-v32.2.7-darwin-arm64.zip
+5c5589b2c93f834e595eb692aa768b934245d2631df69bc4cad3a6602bba0e67 *ffmpeg-v32.2.7-darwin-x64.zip
+3f1eafaf4cd90ab43ba0267429189be182435849a166a2cbe1faefc0d07217c4 *ffmpeg-v32.2.7-linux-arm64.zip
+3db919bc57e1a5bf7c1bae1d7aeacf4a331990ea82750391c0b24a046d9a2812 *ffmpeg-v32.2.7-linux-armv7l.zip
+fe7d779dddbfb5da5999a7607fc5e3c7a6ab7c65e8da9fee1384918865231612 *ffmpeg-v32.2.7-linux-x64.zip
+feeef1ab10543c813f730cc7a482b43eda35d40f1285b950e1a6d7805db2332a *ffmpeg-v32.2.7-mas-arm64.zip
+96ef45180589c854fedf2d0601a20e70a65220c0820c45d0dfd4ec64724c58e0 *ffmpeg-v32.2.7-mas-x64.zip
+ab4ab9cd62e40c4d3064004caa9de680cb72d8180d4facc1be06bdc886c23410 *ffmpeg-v32.2.7-win32-arm64.zip
+90b5e2ebd4ff683eda97cc43ebbdee9b133b27edd2a34ae7ef37e7969d1d68be *ffmpeg-v32.2.7-win32-ia32.zip
+8452085c0a650035f30a4b76e2ce1791f9b392ea7262109d29f7fe383fc41ddb *ffmpeg-v32.2.7-win32-x64.zip
+78b415ebb9040dacabb6eb776a8d4837dda9a9b1ec9d64ee15db28dbb8598862 *hunspell_dictionaries.zip
+a30057c37e6be5732944084575a2278616297242ae51bd474c683263cbc0c3e4 *libcxx-objects-v32.2.7-linux-arm64.zip
+f9e9d1ff1a03a3e609ab8e727b1f89e77934509a4afdb849698b70e701c2176f *libcxx-objects-v32.2.7-linux-armv7l.zip
+bb66e3b48f8e0706126b2b8b08827a4adda6f56c509eae4d136fcffd5414c353 *libcxx-objects-v32.2.7-linux-x64.zip
+5181518d7da83fea5d8b033ab4fb7ed300f73bd8d20b8c26b624128233bd6ab2 *libcxx_headers.zip
+6030ad099859b62cbdd9021b2cdb453a744a2751cb1dab30519e3e8708ad72d6 *libcxxabi_headers.zip
+d3dcc4925a6bd55bc305fd41805ffee77dc8821730ac75cf4ee9ed2ca4ebdccb *mksnapshot-v32.2.7-darwin-arm64.zip
+e6dfad3c30f4f38509b2fc972dd05cef06142c4832d931edba19742e06161279 *mksnapshot-v32.2.7-darwin-x64.zip
+25ba5be47a721700f16af10945e71408ed86ffd6800b5d5ef04d38c0d77aa446 *mksnapshot-v32.2.7-linux-arm64-x64.zip
+f7e8b50691712206587d81844bd63271f2dd49253c946a5b66bd6f169ccf94d6 *mksnapshot-v32.2.7-linux-armv7l-x64.zip
+a0b119abe93c0231601b6c699cce4b78e89def766c24f9a8a06cfab3feca8f6c *mksnapshot-v32.2.7-linux-x64.zip
+e3e8a496a1eaf6c8ce623fa4b139e5458cf3ce3702ea3560cded839087b60792 *mksnapshot-v32.2.7-mas-arm64.zip
+c03219273c82022c29e277d07ce1d0980d25c22d39269fa3eef9547f57ec410b *mksnapshot-v32.2.7-mas-x64.zip
+7684cb9c6f621db05b6e68080fade81f46d0ff8eeac94080bd635f035069d13e *mksnapshot-v32.2.7-win32-arm64-x64.zip
+f7ca1d557e3d0f878b13f57dc0e00932f7a97f3dd0f0cc3bbbd565a06718bd17 *mksnapshot-v32.2.7-win32-ia32.zip
+d9d8dd33561eb648e5ebd00f99418122d9a915ec63fe967e7cb0ff64ef8ee199 *mksnapshot-v32.2.7-win32-x64.zip
diff --git a/cgmanifest.json b/cgmanifest.json
index 832a3f604b7..1795c44c937 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -528,12 +528,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "10e0ce069260b2cc984c301d5a7ecb3492f0c2f0"
+					"commitHash": "3007f859dad930ae80bafffc6042a146a45e4e4d"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "32.2.6"
+			"version": "32.2.7"
 		},
 		{
 			"component": {
diff --git a/package-lock.json b/package-lock.json
index 5f2b14c3e39..23a24c728bd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -95,7 +95,7 @@
         "cssnano": "^6.0.3",
         "debounce": "^1.0.0",
         "deemon": "^1.8.0",
-        "electron": "32.2.6",
+        "electron": "32.2.7",
         "eslint": "^9.11.1",
         "eslint-formatter-compact": "^8.40.0",
         "eslint-plugin-header": "3.1.1",
@@ -6103,9 +6103,9 @@
       "dev": true
     },
     "node_modules/electron": {
-      "version": "32.2.6",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-32.2.6.tgz",
-      "integrity": "sha512-aGG1MLvWCf+ECUFBCmaCF52F8312OPAJfph2D0FSsFmlbfnJuNevZCbty2lFzsiIMtU7/QRo6d0ksbgR4s7y3w==",
+      "version": "32.2.7",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-32.2.7.tgz",
+      "integrity": "sha512-y8jbQRG3xogF70XPlk5c+dWe5iRfUBo28o2NMpKd/CcW7ENIaWtBlGima8/8nmRdAaYTy1+yIt6KB0Lon9H8cA==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
diff --git a/package.json b/package.json
index 3316ae225ea..ba5004eed3e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.97.0",
-  "distro": "45ffe59ad7c51acf28b541a2aa76cc73437ff118",
+  "distro": "baf3347105f6082ae1df942fd1c052cd06f7a7f0",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -153,7 +153,7 @@
     "cssnano": "^6.0.3",
     "debounce": "^1.0.0",
     "deemon": "^1.8.0",
-    "electron": "32.2.6",
+    "electron": "32.2.7",
     "eslint": "^9.11.1",
     "eslint-formatter-compact": "^8.40.0",
     "eslint-plugin-header": "3.1.1",

From fca210cd103a496f25c23786b861a67f4d1ee16b Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 23 Dec 2024 12:56:24 +0100
Subject: [PATCH 468/479] Git - escape shell-sensitive characters (#236849)

---
 extensions/git/src/git.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index 62bae1422df..5bdfd655dbc 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -348,10 +348,15 @@ function getGitErrorCode(stderr: string): string | undefined {
 	return undefined;
 }
 
-// https://github.com/microsoft/vscode/issues/89373
-// https://github.com/git-for-windows/git/issues/2478
 function sanitizePath(path: string): string {
-	return path.replace(/^([a-z]):\\/i, (_, letter) => `${letter.toUpperCase()}:\\`);
+	return path
+		// Drive letter
+		// https://github.com/microsoft/vscode/issues/89373
+		// https://github.com/git-for-windows/git/issues/2478
+		.replace(/^([a-z]):\\/i, (_, letter) => `${letter.toUpperCase()}:\\`)
+		// Shell-sensitive characters
+		// https://github.com/microsoft/vscode/issues/133566
+		.replace(/(["'\\\$!><#()\[\]*&^| ;{}?`])/g, '\\$1');
 }
 
 const COMMIT_FORMAT = '%H%n%aN%n%aE%n%at%n%ct%n%P%n%D%n%B';

From 4fa5611d67dc84e105e9cd155a746f2d7813d9a0 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Tue, 24 Dec 2024 02:02:40 +0100
Subject: [PATCH 469/479] Git - handle the diff editor for untracked files now
 that we throw `FileNotFound` if the file does not exist (#236863)

---
 extensions/git/src/fileSystemProvider.ts | 3 ++-
 extensions/git/src/repository.ts         | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/extensions/git/src/fileSystemProvider.ts b/extensions/git/src/fileSystemProvider.ts
index 24ae4e6df9a..0847fe8d745 100644
--- a/extensions/git/src/fileSystemProvider.ts
+++ b/extensions/git/src/fileSystemProvider.ts
@@ -192,7 +192,8 @@ export class GitFileSystemProvider implements FileSystemProvider {
 		try {
 			return await repository.buffer(sanitizeRef(ref, path, repository), path);
 		} catch (err) {
-			// File does not exist in git (ex: git ignored)
+			// File does not exist in git. This could be
+			// because the file is untracked or ignored
 			throw FileSystemError.FileNotFound();
 		}
 	}
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index ec66d510c72..4bf7fa32ef0 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -560,13 +560,11 @@ class ResourceCommandResolver {
 		switch (resource.type) {
 			case Status.INDEX_MODIFIED:
 			case Status.INDEX_RENAMED:
-			case Status.INDEX_ADDED:
 			case Status.INTENT_TO_RENAME:
 			case Status.TYPE_CHANGED:
 				return { original: toGitUri(resource.original, 'HEAD') };
 
 			case Status.MODIFIED:
-			case Status.UNTRACKED:
 				return { original: toGitUri(resource.resourceUri, '~') };
 
 			case Status.DELETED_BY_US:

From 7da68c033c76bd21d5faabe830f255550a5c7710 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Fri, 27 Dec 2024 16:50:29 +1100
Subject: [PATCH 470/479] Remove console.log (#236006)

---
 .../browser/contrib/chatEdit/notebookSynchronizerService.ts      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizerService.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizerService.ts
index 1e4cf151fae..9788828cf87 100644
--- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizerService.ts
+++ b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizerService.ts
@@ -28,7 +28,6 @@ class NotebookSynchronizerSaveParticipant extends NotebookSaveParticipant {
 	}
 
 	override async participate(workingCopy: IStoredFileWorkingCopy<IStoredFileWorkingCopyModel>, context: IStoredFileWorkingCopySaveParticipantContext, progress: IProgress<IProgressStep>, token: CancellationToken): Promise<void> {
-		console.log('notebook synchronizer participate');
 		const session = this._chatEditingService.currentEditingSessionObs.get();
 
 		if (!session) {

From 0a66dc39ff0a3476dd5f711df232cba4d713a57d Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <me@tylerleonhardt.com>
Date: Fri, 27 Dec 2024 14:31:53 -0500
Subject: [PATCH 471/479] Adopt concept of flows in Microsoft Auth (#237006)

And only use Loopback flow when not running in Remote Extension Host.
---
 .../src/node/authProvider.ts                  | 125 ++++++++----------
 .../src/node/flows.ts                         | 105 +++++++++++++++
 2 files changed, 159 insertions(+), 71 deletions(-)
 create mode 100644 extensions/microsoft-authentication/src/node/flows.ts

diff --git a/extensions/microsoft-authentication/src/node/authProvider.ts b/extensions/microsoft-authentication/src/node/authProvider.ts
index cc8eb2bc5c7..0a352c8eb86 100644
--- a/extensions/microsoft-authentication/src/node/authProvider.ts
+++ b/extensions/microsoft-authentication/src/node/authProvider.ts
@@ -3,18 +3,17 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { AccountInfo, AuthenticationResult, ClientAuthError, ClientAuthErrorCodes, ServerError } from '@azure/msal-node';
-import { AuthenticationGetSessionOptions, AuthenticationProvider, AuthenticationProviderAuthenticationSessionsChangeEvent, AuthenticationProviderSessionOptions, AuthenticationSession, AuthenticationSessionAccountInformation, CancellationError, env, EventEmitter, ExtensionContext, l10n, LogOutputChannel, Uri, window } from 'vscode';
+import { AuthenticationGetSessionOptions, AuthenticationProvider, AuthenticationProviderAuthenticationSessionsChangeEvent, AuthenticationProviderSessionOptions, AuthenticationSession, AuthenticationSessionAccountInformation, CancellationError, EventEmitter, ExtensionContext, ExtensionKind, l10n, LogOutputChannel, window } from 'vscode';
 import { Environment } from '@azure/ms-rest-azure-env';
 import { CachedPublicClientApplicationManager } from './publicClientCache';
-import { UriHandlerLoopbackClient } from '../common/loopbackClientAndOpener';
 import { UriEventHandler } from '../UriEventHandler';
 import { ICachedPublicClientApplication } from '../common/publicClientCache';
 import { MicrosoftAccountType, MicrosoftAuthenticationTelemetryReporter } from '../common/telemetryReporter';
-import { loopbackTemplate } from './loopbackTemplate';
 import { ScopeData } from '../common/scopeData';
 import { EventBufferer } from '../common/event';
 import { BetterTokenStorage } from '../betterSecretStorage';
 import { IStoredSession } from '../AADHelper';
+import { ExtensionHost, getMsalFlows } from './flows';
 
 const redirectUri = 'https://vscode.dev/redirect';
 const MSA_TID = '9188040d-6c67-4c5b-b112-36a304b66dad';
@@ -187,86 +186,70 @@ export class MsalAuthProvider implements AuthenticationProvider {
 
 		this._logger.info('[createSession]', `[${scopeData.scopeStr}]`, 'starting');
 		const cachedPca = await this.getOrCreatePublicClientApplication(scopeData.clientId, scopeData.tenant);
-		let result: AuthenticationResult | undefined;
-
-		try {
-			const windowHandle = window.nativeHandle ? Buffer.from(window.nativeHandle) : undefined;
-			result = await cachedPca.acquireTokenInteractive({
-				openBrowser: async (url: string) => { await env.openExternal(Uri.parse(url)); },
-				scopes: scopeData.scopesToSend,
-				// The logic for rendering one or the other of these templates is in the
-				// template itself, so we pass the same one for both.
-				successTemplate: loopbackTemplate,
-				errorTemplate: loopbackTemplate,
-				// Pass the label of the account to the login hint so that we prefer signing in to that account
-				loginHint: options.account?.label,
-				// If we aren't logging in to a specific account, then we can use the prompt to make sure they get
-				// the option to choose a different account.
-				prompt: options.account?.label ? undefined : 'select_account',
-				windowHandle
-			});
-		} catch (e) {
-			if (e instanceof CancellationError) {
-				const yes = l10n.t('Yes');
-				const result = await window.showErrorMessage(
-					l10n.t('Having trouble logging in?'),
-					{
-						modal: true,
-						detail: l10n.t('Would you like to try a different way to sign in to your Microsoft account? ({0})', 'protocol handler')
-					},
-					yes
-				);
-				if (!result) {
-					this._telemetryReporter.sendLoginFailedEvent();
-					throw e;
-				}
+
+		// Used for showing a friendlier message to the user when the explicitly cancel a flow.
+		let userCancelled: boolean | undefined;
+		const yes = l10n.t('Yes');
+		const no = l10n.t('No');
+		const promptToContinue = async (mode: string) => {
+			if (userCancelled === undefined) {
+				// We haven't had a failure yet so wait to prompt
+				return;
 			}
-			// This error comes from the backend and is likely not due to the user's machine
-			// failing to open a port or something local that would require us to try the
-			// URL handler loopback client.
-			if (e instanceof ServerError) {
-				this._telemetryReporter.sendLoginFailedEvent();
-				throw e;
+			const message = userCancelled
+				? l10n.t('Having trouble logging in? Would you like to try a different way? ({0})', mode)
+				: l10n.t('You have not yet finished authorizing this extension to use your Microsoft Account. Would you like to try a different way? ({0})', mode);
+			const result = await window.showWarningMessage(message, yes, no);
+			if (result !== yes) {
+				throw new CancellationError();
 			}
+		};
 
-			// The user closed the modal window
-			if ((e as ClientAuthError).errorCode === ClientAuthErrorCodes.userCanceled) {
-				this._telemetryReporter.sendLoginFailedEvent();
-				throw e;
-			}
+		const flows = getMsalFlows({
+			extensionHost: typeof navigator === 'undefined'
+				? this._context.extension.extensionKind === ExtensionKind.UI ? ExtensionHost.Local : ExtensionHost.Remote
+				: ExtensionHost.WebWorker,
+		});
 
-			// The user wants to try the loopback client or we got an error likely due to spinning up the server
-			const loopbackClient = new UriHandlerLoopbackClient(this._uriHandler, redirectUri, this._logger);
+		let lastError: Error | undefined;
+		for (const flow of flows) {
+			if (flow !== flows[0]) {
+				try {
+					await promptToContinue(flow.label);
+				} finally {
+					this._telemetryReporter.sendLoginFailedEvent();
+				}
+			}
 			try {
-				const windowHandle = window.nativeHandle ? Buffer.from(window.nativeHandle) : undefined;
-				result = await cachedPca.acquireTokenInteractive({
-					openBrowser: (url: string) => loopbackClient.openBrowser(url),
+				const result = await flow.trigger({
+					cachedPca,
 					scopes: scopeData.scopesToSend,
-					loopbackClient,
 					loginHint: options.account?.label,
-					prompt: options.account?.label ? undefined : 'select_account',
-					windowHandle
+					windowHandle: window.nativeHandle ? Buffer.from(window.nativeHandle) : undefined,
+					logger: this._logger,
+					uriHandler: this._uriHandler
 				});
+
+				const session = this.sessionFromAuthenticationResult(result, scopeData.originalScopes);
+				this._telemetryReporter.sendLoginEvent(session.scopes);
+				this._logger.info('[createSession]', `[${scopeData.scopeStr}]`, 'returned session');
+				this._onDidChangeSessionsEmitter.fire({ added: [session], changed: [], removed: [] });
+				return session;
 			} catch (e) {
-				this._telemetryReporter.sendLoginFailedEvent();
-				throw e;
+				lastError = e;
+				if (e instanceof ServerError || (e as ClientAuthError)?.errorCode === ClientAuthErrorCodes.userCanceled) {
+					this._telemetryReporter.sendLoginFailedEvent();
+					throw e;
+				}
+				// Continue to next flow
+				if (e instanceof CancellationError) {
+					userCancelled = true;
+				}
 			}
 		}
 
-		if (!result) {
-			this._telemetryReporter.sendLoginFailedEvent();
-			throw new Error('No result returned from MSAL');
-		}
-
-		const session = this.sessionFromAuthenticationResult(result, scopeData.originalScopes);
-		this._telemetryReporter.sendLoginEvent(session.scopes);
-		this._logger.info('[createSession]', `[${scopeData.scopeStr}]`, 'returned session');
-		// This is the only scenario in which we need to fire the _onDidChangeSessionsEmitter out of band...
-		// the badge flow (when the client passes no options in to getSession) will only remove a badge if a session
-		// was created that _matches the scopes_ that that badge requests. See `onDidChangeSessions` for more info.
-		// TODO: This should really be fixed in Core.
-		this._onDidChangeSessionsEmitter.fire({ added: [session], changed: [], removed: [] });
-		return session;
+		this._telemetryReporter.sendLoginFailedEvent();
+		throw lastError ?? new Error('No auth flow succeeded');
 	}
 
 	async removeSession(sessionId: string): Promise<void> {
diff --git a/extensions/microsoft-authentication/src/node/flows.ts b/extensions/microsoft-authentication/src/node/flows.ts
new file mode 100644
index 00000000000..3e1d8c513f0
--- /dev/null
+++ b/extensions/microsoft-authentication/src/node/flows.ts
@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { AuthenticationResult } from '@azure/msal-node';
+import { Uri, LogOutputChannel, env } from 'vscode';
+import { ICachedPublicClientApplication } from '../common/publicClientCache';
+import { UriHandlerLoopbackClient } from '../common/loopbackClientAndOpener';
+import { UriEventHandler } from '../UriEventHandler';
+import { loopbackTemplate } from './loopbackTemplate';
+
+const redirectUri = 'https://vscode.dev/redirect';
+
+export const enum ExtensionHost {
+	WebWorker,
+	Remote,
+	Local
+}
+
+interface IMsalFlowOptions {
+	supportsRemoteExtensionHost: boolean;
+	supportsWebWorkerExtensionHost: boolean;
+}
+
+interface IMsalFlowTriggerOptions {
+	cachedPca: ICachedPublicClientApplication;
+	scopes: string[];
+	loginHint?: string;
+	windowHandle?: Buffer;
+	logger: LogOutputChannel;
+	uriHandler: UriEventHandler;
+}
+
+interface IMsalFlow {
+	readonly label: string;
+	readonly options: IMsalFlowOptions;
+	trigger(options: IMsalFlowTriggerOptions): Promise<AuthenticationResult>;
+}
+
+class DefaultLoopbackFlow implements IMsalFlow {
+	label = 'default';
+	options: IMsalFlowOptions = {
+		supportsRemoteExtensionHost: true,
+		supportsWebWorkerExtensionHost: true
+	};
+
+	async trigger({ cachedPca, scopes, loginHint, windowHandle, logger }: IMsalFlowTriggerOptions): Promise<AuthenticationResult> {
+		logger.info('Trying default msal flow...');
+		return await cachedPca.acquireTokenInteractive({
+			openBrowser: async (url: string) => { await env.openExternal(Uri.parse(url)); },
+			scopes,
+			successTemplate: loopbackTemplate,
+			errorTemplate: loopbackTemplate,
+			loginHint,
+			prompt: loginHint ? undefined : 'select_account',
+			windowHandle
+		});
+	}
+}
+
+class UrlHandlerFlow implements IMsalFlow {
+	label = 'protocol handler';
+	options: IMsalFlowOptions = {
+		supportsRemoteExtensionHost: false,
+		supportsWebWorkerExtensionHost: false
+	};
+
+	async trigger({ cachedPca, scopes, loginHint, windowHandle, logger, uriHandler }: IMsalFlowTriggerOptions): Promise<AuthenticationResult> {
+		logger.info('Trying protocol handler flow...');
+		const loopbackClient = new UriHandlerLoopbackClient(uriHandler, redirectUri, logger);
+		return await cachedPca.acquireTokenInteractive({
+			openBrowser: (url: string) => loopbackClient.openBrowser(url),
+			scopes,
+			loopbackClient,
+			loginHint,
+			prompt: loginHint ? undefined : 'select_account',
+			windowHandle
+		});
+	}
+}
+
+const allFlows: IMsalFlow[] = [
+	new DefaultLoopbackFlow(),
+	new UrlHandlerFlow()
+];
+
+export interface IMsalFlowQuery {
+	extensionHost: ExtensionHost;
+}
+
+export function getMsalFlows(query: IMsalFlowQuery): IMsalFlow[] {
+	return allFlows.filter(flow => {
+		let useFlow: boolean = true;
+		switch (query.extensionHost) {
+			case ExtensionHost.Remote:
+				useFlow &&= flow.options.supportsRemoteExtensionHost;
+				break;
+			case ExtensionHost.WebWorker:
+				useFlow &&= flow.options.supportsWebWorkerExtensionHost;
+				break;
+		}
+		return useFlow;
+	});
+}

From 1410d77f6fdd80ceb2e522449096fc97e821aa01 Mon Sep 17 00:00:00 2001
From: Tyler James Leonhardt <me@tylerleonhardt.com>
Date: Sat, 28 Dec 2024 03:36:05 -0500
Subject: [PATCH 472/479] reverse cancellation and sequencer (#237029)

When we cancel, then the promise should be cancelled. If we don't do this, we hang on the first interaction request until we timeout.

Fixes the 2nd point in https://github.com/microsoft/vscode/issues/236825#issuecomment-2563882150
---
 .../src/node/cachedPublicClientApplication.ts               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts b/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
index 0f27c2c0e4d..616b3e1120d 100644
--- a/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
+++ b/extensions/microsoft-authentication/src/node/cachedPublicClientApplication.ts
@@ -133,11 +133,11 @@ export class CachedPublicClientApplication implements ICachedPublicClientApplica
 				cancellable: true,
 				title: l10n.t('Signing in to Microsoft...')
 			},
-			(_process, token) => raceCancellationAndTimeoutError(
-				this._sequencer.queue(() => this._pca.acquireTokenInteractive(request)),
+			(_process, token) => this._sequencer.queue(() => raceCancellationAndTimeoutError(
+				this._pca.acquireTokenInteractive(request),
 				token,
 				1000 * 60 * 5
-			)
+			))
 		);
 		// this._setupRefresh(result);
 		if (this._isBrokerAvailable) {

From a3261eae42b18ff8cb685cf649c27c8b27985eec Mon Sep 17 00:00:00 2001
From: Benjamin Christopher Simmonds
 <44439583+benibenj@users.noreply.github.com>
Date: Sun, 29 Dec 2024 08:44:19 +0100
Subject: [PATCH 473/479] Fix default tree find modes (#237057)

fix #236770
---
 src/vs/base/browser/ui/tree/abstractTree.ts  |  2 +-
 src/vs/base/browser/ui/tree/asyncDataTree.ts | 27 ++++++++++++++------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts
index 09ce418bda9..cff0e6614d3 100644
--- a/src/vs/base/browser/ui/tree/abstractTree.ts
+++ b/src/vs/base/browser/ui/tree/abstractTree.ts
@@ -947,7 +947,7 @@ interface IAbstractFindControllerOptions extends IFindWidgetOptions {
 	showNotFoundMessage?: boolean;
 }
 
-interface IFindControllerOptions extends IAbstractFindControllerOptions {
+export interface IFindControllerOptions extends IAbstractFindControllerOptions {
 	defaultFindMode?: TreeFindMode;
 	defaultFindMatchType?: TreeFindMatchType;
 }
diff --git a/src/vs/base/browser/ui/tree/asyncDataTree.ts b/src/vs/base/browser/ui/tree/asyncDataTree.ts
index dd6059051f0..f6c47bb9283 100644
--- a/src/vs/base/browser/ui/tree/asyncDataTree.ts
+++ b/src/vs/base/browser/ui/tree/asyncDataTree.ts
@@ -7,7 +7,7 @@ import { IDragAndDropData } from '../../dnd.js';
 import { IIdentityProvider, IKeyboardNavigationLabelProvider, IListDragAndDrop, IListDragOverReaction, IListVirtualDelegate } from '../list/list.js';
 import { ElementsDragAndDropData, ListViewTargetSector } from '../list/listView.js';
 import { IListStyles } from '../list/listWidget.js';
-import { ComposedTreeDelegate, TreeFindMode as TreeFindMode, IAbstractTreeOptions, IAbstractTreeOptionsUpdate, TreeFindMatchType, AbstractTreePart, LabelFuzzyScore, FindFilter, FindController, ITreeFindToggleChangeEvent } from './abstractTree.js';
+import { ComposedTreeDelegate, TreeFindMode as TreeFindMode, IAbstractTreeOptions, IAbstractTreeOptionsUpdate, TreeFindMatchType, AbstractTreePart, LabelFuzzyScore, FindFilter, FindController, ITreeFindToggleChangeEvent, IFindControllerOptions } from './abstractTree.js';
 import { ICompressedTreeElement, ICompressedTreeNode } from './compressedObjectTreeModel.js';
 import { getVisibleState, isFilterResult } from './indexTreeModel.js';
 import { CompressibleObjectTree, ICompressibleKeyboardNavigationLabelProvider, ICompressibleObjectTreeOptions, ICompressibleTreeRenderer, IObjectTreeOptions, IObjectTreeSetChildrenOptions, ObjectTree } from './objectTree.js';
@@ -629,7 +629,12 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 		this.tree.onDidChangeCollapseState(this._onDidChangeCollapseState, this, this.disposables);
 
 		if (asyncFindEnabled) {
-			const findOptions = { styles: options.findWidgetStyles, showNotFoundMessage: options.showNotFoundMessage };
+			const findOptions: IFindControllerOptions = {
+				styles: options.findWidgetStyles,
+				showNotFoundMessage: options.showNotFoundMessage,
+				defaultFindMatchType: options.defaultFindMatchType,
+				defaultFindMode: options.defaultFindMode,
+			};
 			this.findController = this.disposables.add(new AsyncFindController(this.tree, options.findProvider!, findFilter!, this.tree.options.contextViewProvider!, findOptions));
 
 			this.focusNavigationFilter = node => this.findController!.shouldFocusWhenNavigating(node);
@@ -657,8 +662,18 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
 		return new ObjectTree(user, container, objectTreeDelegate, objectTreeRenderers, objectTreeOptions);
 	}
 
-	updateOptions(options: IAsyncDataTreeOptionsUpdate = {}): void {
-		this.tree.updateOptions(options);
+	updateOptions(optionsUpdate: IAsyncDataTreeOptionsUpdate = {}): void {
+		if (this.findController) {
+			if (optionsUpdate.defaultFindMode !== undefined) {
+				this.findController.mode = optionsUpdate.defaultFindMode;
+			}
+
+			if (optionsUpdate.defaultFindMatchType !== undefined) {
+				this.findController.matchType = optionsUpdate.defaultFindMatchType;
+			}
+		}
+
+		this.tree.updateOptions(optionsUpdate);
 	}
 
 	get options(): IAsyncDataTreeOptions<T, TFilterData> {
@@ -1513,10 +1528,6 @@ export class CompressibleAsyncDataTree<TInput, T, TFilterData = void> extends As
 		};
 	}
 
-	override updateOptions(options: ICompressibleAsyncDataTreeOptionsUpdate = {}): void {
-		this.tree.updateOptions(options);
-	}
-
 	override getViewState(): IAsyncDataTreeViewState {
 		if (!this.identityProvider) {
 			throw new TreeError(this.user, 'Can\'t get tree view state without an identity provider');

From 6d6cfdc3a6a1836a29a7034d88958c0b91df5def Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Mon, 30 Dec 2024 21:10:42 +0100
Subject: [PATCH 474/479] Git - add git blame editor decoration hover provider
 (#237102)

* Initial implementation

* Refactor editor decoration type
---
 extensions/git/src/blame.ts | 190 +++++++++++++++++++++++++++---------
 1 file changed, 145 insertions(+), 45 deletions(-)

diff --git a/extensions/git/src/blame.ts b/extensions/git/src/blame.ts
index 5c65fbcf1fc..753af17766a 100644
--- a/extensions/git/src/blame.ts
+++ b/extensions/git/src/blame.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DecorationOptions, l10n, Position, Range, TextEditor, TextEditorChange, TextEditorDecorationType, TextEditorChangeKind, ThemeColor, Uri, window, workspace, EventEmitter, ConfigurationChangeEvent, StatusBarItem, StatusBarAlignment, Command, MarkdownString } from 'vscode';
+import { DecorationOptions, l10n, Position, Range, TextEditor, TextEditorChange, TextEditorDecorationType, TextEditorChangeKind, ThemeColor, Uri, window, workspace, EventEmitter, ConfigurationChangeEvent, StatusBarItem, StatusBarAlignment, Command, MarkdownString, languages, HoverProvider, CancellationToken, Hover, TextDocument } from 'vscode';
 import { Model } from './model';
 import { dispose, fromNow, IDisposable } from './util';
 import { Repository } from './repository';
 import { throttle } from './decorators';
-import { BlameInformation } from './git';
+import { BlameInformation, Commit } from './git';
 import { fromGitUri, isGitUri } from './uri';
 import { emojify, ensureEmojis } from './emoji';
 import { getWorkingTreeAndIndexDiffInformation, getWorkingTreeDiffInformation } from './staging';
@@ -55,6 +55,15 @@ function mapModifiedLineNumberToOriginalLineNumber(lineNumber: number, changes:
 	return lineNumber;
 }
 
+function getEditorDecorationRange(lineNumber: number): Range {
+	const position = new Position(lineNumber, Number.MAX_SAFE_INTEGER);
+	return new Range(position, position);
+}
+
+function isBlameInformation(object: any): object is BlameInformation {
+	return Array.isArray((object as BlameInformation).ranges);
+}
+
 type BlameInformationTemplateTokens = {
 	readonly hash: string;
 	readonly hashShort: string;
@@ -191,32 +200,63 @@ export class GitBlameController {
 		});
 	}
 
-	getBlameInformationHover(documentUri: Uri, blameInformation: BlameInformation | string): MarkdownString {
-		if (typeof blameInformation === 'string') {
-			return new MarkdownString(blameInformation, true);
+	async getBlameInformationDetailedHover(documentUri: Uri, blameInformation: BlameInformation): Promise<MarkdownString | undefined> {
+		const repository = this._model.getRepository(documentUri);
+		if (!repository) {
+			return this.getBlameInformationHover(documentUri, blameInformation);
+		}
+
+		try {
+			const commit = await repository.getCommit(blameInformation.hash);
+			return this.getBlameInformationHover(documentUri, commit);
+		} catch {
+			return this.getBlameInformationHover(documentUri, blameInformation);
 		}
+	}
 
+	getBlameInformationHover(documentUri: Uri, blameInformationOrCommit: BlameInformation | Commit): MarkdownString {
 		const markdownString = new MarkdownString();
-		markdownString.supportThemeIcons = true;
 		markdownString.isTrusted = true;
+		markdownString.supportHtml = true;
+		markdownString.supportThemeIcons = true;
 
-		if (blameInformation.authorName) {
-			markdownString.appendMarkdown(`$(account) **${blameInformation.authorName}**`);
+		if (blameInformationOrCommit.authorName) {
+			markdownString.appendMarkdown(`$(account) **${blameInformationOrCommit.authorName}**`);
 
-			if (blameInformation.authorDate) {
-				const dateString = new Date(blameInformation.authorDate).toLocaleString(undefined, { year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' });
-				markdownString.appendMarkdown(`, $(history) ${fromNow(blameInformation.authorDate, true, true)} (${dateString})`);
+			if (blameInformationOrCommit.authorDate) {
+				const dateString = new Date(blameInformationOrCommit.authorDate).toLocaleString(undefined, { year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' });
+				markdownString.appendMarkdown(`, $(history) ${fromNow(blameInformationOrCommit.authorDate, true, true)} (${dateString})`);
 			}
 
 			markdownString.appendMarkdown('\n\n');
 		}
 
-		markdownString.appendMarkdown(`${emojify(blameInformation.subject ?? '')}\n\n`);
+		markdownString.appendMarkdown(`${emojify(isBlameInformation(blameInformationOrCommit) ? blameInformationOrCommit.subject ?? '' : blameInformationOrCommit.message)}\n\n`);
 		markdownString.appendMarkdown(`---\n\n`);
 
-		markdownString.appendMarkdown(`[$(eye) View Commit](command:git.blameStatusBarItem.viewCommit?${encodeURIComponent(JSON.stringify([documentUri, blameInformation.hash]))} "${l10n.t('View Commit')}")`);
+		if (!isBlameInformation(blameInformationOrCommit) && blameInformationOrCommit.shortStat) {
+			markdownString.appendMarkdown(`<span>${blameInformationOrCommit.shortStat.files === 1 ?
+				l10n.t('{0} file changed', blameInformationOrCommit.shortStat.files) :
+				l10n.t('{0} files changed', blameInformationOrCommit.shortStat.files)}</span>`);
+
+			if (blameInformationOrCommit.shortStat.insertions) {
+				markdownString.appendMarkdown(`,&nbsp;<span style="color:var(--vscode-scmGraph-historyItemHoverAdditionsForeground);">${blameInformationOrCommit.shortStat.insertions === 1 ?
+					l10n.t('{0} insertion{1}', blameInformationOrCommit.shortStat.insertions, '(+)') :
+					l10n.t('{0} insertions{1}', blameInformationOrCommit.shortStat.insertions, '(+)')}</span>`);
+			}
+
+			if (blameInformationOrCommit.shortStat.deletions) {
+				markdownString.appendMarkdown(`,&nbsp;<span style="color:var(--vscode-scmGraph-historyItemHoverDeletionsForeground);">${blameInformationOrCommit.shortStat.deletions === 1 ?
+					l10n.t('{0} deletion{1}', blameInformationOrCommit.shortStat.deletions, '(-)') :
+					l10n.t('{0} deletions{1}', blameInformationOrCommit.shortStat.deletions, '(-)')}</span>`);
+			}
+
+			markdownString.appendMarkdown(`\n\n---\n\n`);
+		}
+
+		markdownString.appendMarkdown(`[$(eye) View Commit](command:git.blameStatusBarItem.viewCommit?${encodeURIComponent(JSON.stringify([documentUri, blameInformationOrCommit.hash]))} "${l10n.t('View Commit')}")`);
 		markdownString.appendMarkdown('&nbsp;&nbsp;&nbsp;&nbsp;');
-		markdownString.appendMarkdown(`[$(copy) ${blameInformation.hash.substring(0, 8)}](command:git.blameStatusBarItem.copyContent?${encodeURIComponent(JSON.stringify(blameInformation.hash))} "${l10n.t('Copy Commit Hash')}")`);
+		markdownString.appendMarkdown(`[$(copy) ${blameInformationOrCommit.hash.substring(0, 8)}](command:git.blameStatusBarItem.copyContent?${encodeURIComponent(JSON.stringify(blameInformationOrCommit.hash))} "${l10n.t('Copy Commit Hash')}")`);
 
 		return markdownString;
 	}
@@ -411,36 +451,81 @@ export class GitBlameController {
 	}
 }
 
-class GitBlameEditorDecoration {
-	private readonly _decorationType: TextEditorDecorationType;
+class GitBlameEditorDecoration implements HoverProvider {
+	private _decoration: TextEditorDecorationType | undefined;
+	private get decoration(): TextEditorDecorationType {
+		if (!this._decoration) {
+			this._decoration = window.createTextEditorDecorationType({
+				after: {
+					color: new ThemeColor('git.blame.editorDecorationForeground')
+				}
+			});
+		}
+
+		return this._decoration;
+	}
+
+	private _hoverDisposable: IDisposable | undefined;
 	private _disposables: IDisposable[] = [];
 
 	constructor(private readonly _controller: GitBlameController) {
-		this._decorationType = window.createTextEditorDecorationType({
-			after: {
-				color: new ThemeColor('git.blame.editorDecorationForeground')
-			}
-		});
-		this._disposables.push(this._decorationType);
-
 		workspace.onDidChangeConfiguration(this._onDidChangeConfiguration, this, this._disposables);
 		window.onDidChangeActiveTextEditor(this._onDidChangeActiveTextEditor, this, this._disposables);
-
 		this._controller.onDidChangeBlameInformation(e => this._updateDecorations(e), this, this._disposables);
+
+		this._onDidChangeConfiguration();
 	}
 
-	private _onDidChangeConfiguration(e: ConfigurationChangeEvent): void {
-		if (!e.affectsConfiguration('git.blame.editorDecoration.enabled') &&
+	async provideHover(document: TextDocument, position: Position, token: CancellationToken): Promise<Hover | undefined> {
+		if (token.isCancellationRequested) {
+			return undefined;
+		}
+
+		const textEditor = window.activeTextEditor;
+		if (!textEditor) {
+			return undefined;
+		}
+
+		// Position must be at the end of the line
+		if (position.character !== document.lineAt(position.line).range.end.character) {
+			return undefined;
+		}
+
+		// Get blame information
+		const blameInformation = this._controller.textEditorBlameInformation
+			.get(textEditor)?.find(blame => blame.lineNumber === position.line);
+
+		if (!blameInformation || typeof blameInformation.blameInformation === 'string') {
+			return undefined;
+		}
+
+		const contents = await this._controller.getBlameInformationDetailedHover(textEditor.document.uri, blameInformation.blameInformation);
+
+		if (!contents || token.isCancellationRequested) {
+			return undefined;
+		}
+
+		return { range: getEditorDecorationRange(position.line), contents: [contents] };
+	}
+
+	private _onDidChangeConfiguration(e?: ConfigurationChangeEvent): void {
+		if (e &&
+			!e.affectsConfiguration('git.blame.editorDecoration.enabled') &&
 			!e.affectsConfiguration('git.blame.editorDecoration.template')) {
 			return;
 		}
 
-		for (const textEditor of window.visibleTextEditors) {
-			if (this._getConfiguration().enabled) {
-				this._updateDecorations(textEditor);
-			} else {
-				textEditor.setDecorations(this._decorationType, []);
+		if (this._getConfiguration().enabled) {
+			if (window.activeTextEditor) {
+				this._registerHoverProvider();
+				this._updateDecorations(window.activeTextEditor);
 			}
+		} else {
+			this._decoration?.dispose();
+			this._decoration = undefined;
+
+			this._hoverDisposable?.dispose();
+			this._hoverDisposable = undefined;
 		}
 	}
 
@@ -449,11 +534,15 @@ class GitBlameEditorDecoration {
 			return;
 		}
 
+		// Clear decorations
 		for (const editor of window.visibleTextEditors) {
 			if (editor !== window.activeTextEditor) {
-				editor.setDecorations(this._decorationType, []);
+				editor.setDecorations(this.decoration, []);
 			}
 		}
+
+		// Register hover provider
+		this._registerHoverProvider();
 	}
 
 	private _getConfiguration(): { enabled: boolean; template: string } {
@@ -472,14 +561,14 @@ class GitBlameEditorDecoration {
 
 		// Only support resources with `file` and `git` schemes
 		if (textEditor.document.uri.scheme !== 'file' && !isGitUri(textEditor.document.uri)) {
-			textEditor.setDecorations(this._decorationType, []);
+			textEditor.setDecorations(this.decoration, []);
 			return;
 		}
 
 		// Get blame information
 		const blameInformation = this._controller.textEditorBlameInformation.get(textEditor);
 		if (!blameInformation) {
-			textEditor.setDecorations(this._decorationType, []);
+			textEditor.setDecorations(this.decoration, []);
 			return;
 		}
 
@@ -488,32 +577,43 @@ class GitBlameEditorDecoration {
 			const contentText = typeof blame.blameInformation !== 'string'
 				? this._controller.formatBlameInformationMessage(template, blame.blameInformation)
 				: blame.blameInformation;
-			const hoverMessage = typeof blame.blameInformation !== 'string'
-				? this._controller.getBlameInformationHover(textEditor.document.uri, blame.blameInformation)
-				: undefined;
 
-			return this._createDecoration(blame.lineNumber, contentText, hoverMessage);
+			return this._createDecoration(blame.lineNumber, contentText);
 		});
 
-		textEditor.setDecorations(this._decorationType, decorations);
+		textEditor.setDecorations(this.decoration, decorations);
 	}
 
-	private _createDecoration(lineNumber: number, contentText: string, hoverMessage: MarkdownString | undefined): DecorationOptions {
-		const position = new Position(lineNumber, Number.MAX_SAFE_INTEGER);
-
+	private _createDecoration(lineNumber: number, contentText: string): DecorationOptions {
 		return {
-			hoverMessage,
-			range: new Range(position, position),
+			range: getEditorDecorationRange(lineNumber),
 			renderOptions: {
 				after: {
-					contentText: `${contentText}`,
+					contentText,
 					margin: '0 0 0 50px'
 				}
 			},
 		};
 	}
 
+	private _registerHoverProvider(): void {
+		this._hoverDisposable?.dispose();
+
+		if (window.activeTextEditor?.document.uri.scheme === 'file' ||
+			window.activeTextEditor?.document.uri.scheme === 'git') {
+			this._hoverDisposable = languages.registerHoverProvider({
+				pattern: window.activeTextEditor.document.uri.fsPath
+			}, this);
+		}
+	}
+
 	dispose() {
+		this._decoration?.dispose();
+		this._decoration = undefined;
+
+		this._hoverDisposable?.dispose();
+		this._hoverDisposable = undefined;
+
 		this._disposables = dispose(this._disposables);
 	}
 }

From ba56ac5291229995c0e0907127668461551911e7 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Thu, 2 Jan 2025 16:44:45 +0100
Subject: [PATCH 475/479] Git - refactor git blame code (#237185)

Refactor git blame code
---
 extensions/git/src/blame.ts | 259 ++++++++++++++++++------------------
 1 file changed, 127 insertions(+), 132 deletions(-)

diff --git a/extensions/git/src/blame.ts b/extensions/git/src/blame.ts
index 753af17766a..3893b4bff4f 100644
--- a/extensions/git/src/blame.ts
+++ b/extensions/git/src/blame.ts
@@ -64,6 +64,10 @@ function isBlameInformation(object: any): object is BlameInformation {
 	return Array.isArray((object as BlameInformation).ranges);
 }
 
+function isResourceSchemeSupported(uri: Uri): boolean {
+	return uri.scheme === 'file' || isGitUri(uri);
+}
+
 type BlameInformationTemplateTokens = {
 	readonly hash: string;
 	readonly hashShort: string;
@@ -156,28 +160,30 @@ class GitBlameInformationCache {
 export class GitBlameController {
 	private readonly _subjectMaxLength = 50;
 
-	private readonly _onDidChangeBlameInformation = new EventEmitter<TextEditor>();
+	private readonly _onDidChangeBlameInformation = new EventEmitter<void>();
 	public readonly onDidChangeBlameInformation = this._onDidChangeBlameInformation.event;
 
-	readonly textEditorBlameInformation = new Map<TextEditor, readonly LineBlameInformation[]>();
+	private _textEditorBlameInformation: LineBlameInformation[] | undefined;
+	get textEditorBlameInformation(): readonly LineBlameInformation[] | undefined {
+		return this._textEditorBlameInformation;
+	}
+	private set textEditorBlameInformation(blameInformation: LineBlameInformation[] | undefined) {
+		this._textEditorBlameInformation = blameInformation;
+		this._onDidChangeBlameInformation.fire();
+	}
 
 	private readonly _repositoryBlameCache = new GitBlameInformationCache();
 
+	private _editorDecoration: GitBlameEditorDecoration | undefined;
+	private _statusBarItem: GitBlameStatusBarItem | undefined;
+
 	private _repositoryDisposables = new Map<Repository, IDisposable[]>();
+	private _enablementDisposables: IDisposable[] = [];
 	private _disposables: IDisposable[] = [];
 
 	constructor(private readonly _model: Model) {
-		this._disposables.push(new GitBlameEditorDecoration(this));
-		this._disposables.push(new GitBlameStatusBarItem(this));
-
-		this._model.onDidOpenRepository(this._onDidOpenRepository, this, this._disposables);
-		this._model.onDidCloseRepository(this._onDidCloseRepository, this, this._disposables);
-
-		window.onDidChangeActiveTextEditor(e => this._updateTextEditorBlameInformation(e), this, this._disposables);
-		window.onDidChangeTextEditorSelection(e => this._updateTextEditorBlameInformation(e.textEditor, true), this, this._disposables);
-		window.onDidChangeTextEditorDiffInformation(e => this._updateTextEditorBlameInformation(e.textEditor), this, this._disposables);
-
-		this._updateTextEditorBlameInformation(window.activeTextEditor);
+		workspace.onDidChangeConfiguration(this._onDidChangeConfiguration, this, this._disposables);
+		this._onDidChangeConfiguration();
 	}
 
 	formatBlameInformationMessage(template: string, blameInformation: BlameInformation): string {
@@ -261,6 +267,57 @@ export class GitBlameController {
 		return markdownString;
 	}
 
+	private _onDidChangeConfiguration(e?: ConfigurationChangeEvent): void {
+		if (e &&
+			!e.affectsConfiguration('git.blame.editorDecoration.enabled') &&
+			!e.affectsConfiguration('git.blame.statusBarItem.enabled')) {
+			return;
+		}
+
+		const config = workspace.getConfiguration('git');
+		const editorDecorationEnabled = config.get<boolean>('blame.editorDecoration.enabled') === true;
+		const statusBarItemEnabled = config.get<boolean>('blame.statusBarItem.enabled') === true;
+
+		// Editor decoration
+		if (editorDecorationEnabled) {
+			if (!this._editorDecoration) {
+				this._editorDecoration = new GitBlameEditorDecoration(this);
+			}
+		} else {
+			this._editorDecoration?.dispose();
+			this._editorDecoration = undefined;
+		}
+
+		// StatusBar item
+		if (statusBarItemEnabled) {
+			if (!this._statusBarItem) {
+				this._statusBarItem = new GitBlameStatusBarItem(this);
+			}
+		} else {
+			this._statusBarItem?.dispose();
+			this._statusBarItem = undefined;
+		}
+
+		// Listeners
+		if (editorDecorationEnabled || statusBarItemEnabled) {
+			if (this._enablementDisposables.length === 0) {
+				this._model.onDidOpenRepository(this._onDidOpenRepository, this, this._enablementDisposables);
+				this._model.onDidCloseRepository(this._onDidCloseRepository, this, this._enablementDisposables);
+				for (const repository of this._model.repositories) {
+					this._onDidOpenRepository(repository);
+				}
+
+				window.onDidChangeActiveTextEditor(e => this._updateTextEditorBlameInformation(e), this, this._enablementDisposables);
+				window.onDidChangeTextEditorSelection(e => this._updateTextEditorBlameInformation(e.textEditor, true), this, this._enablementDisposables);
+				window.onDidChangeTextEditorDiffInformation(e => this._updateTextEditorBlameInformation(e.textEditor), this, this._enablementDisposables);
+			}
+		} else {
+			this._enablementDisposables = dispose(this._enablementDisposables);
+		}
+
+		this._updateTextEditorBlameInformation(window.activeTextEditor);
+	}
+
 	private _onDidOpenRepository(repository: Repository): void {
 		const repositoryDisposables: IDisposable[] = [];
 		repository.onDidRunGitStatus(() => this._onDidRunGitStatus(repository), this, repositoryDisposables);
@@ -290,9 +347,7 @@ export class GitBlameController {
 			this._repositoryBlameCache.deleteBlameInformation(repository, 'file');
 			this._repositoryBlameCache.setRepositoryHEAD(repository, repository.HEAD.commit);
 
-			for (const textEditor of window.visibleTextEditors) {
-				this._updateTextEditorBlameInformation(textEditor);
-			}
+			this._updateTextEditorBlameInformation(window.activeTextEditor);
 		}
 	}
 
@@ -320,7 +375,12 @@ export class GitBlameController {
 
 	@throttle
 	private async _updateTextEditorBlameInformation(textEditor: TextEditor | undefined, showBlameInformationForPositionZero = false): Promise<void> {
-		if (!textEditor?.diffInformation || textEditor !== window.activeTextEditor) {
+		if (textEditor) {
+			if (!textEditor.diffInformation || textEditor !== window.activeTextEditor) {
+				return;
+			}
+		} else {
+			this.textEditorBlameInformation = undefined;
 			return;
 		}
 
@@ -329,14 +389,19 @@ export class GitBlameController {
 			return;
 		}
 
+		// Only support resources with `file` and `git` schemes
+		if (!isResourceSchemeSupported(textEditor.document.uri)) {
+			this.textEditorBlameInformation = undefined;
+			return;
+		}
+
 		// Do not show blame information when there is a single selection and it is at the beginning
 		// of the file [0, 0, 0, 0] unless the user explicitly navigates the cursor there. We do this
 		// to avoid showing blame information when the editor is not focused.
 		if (!showBlameInformationForPositionZero && textEditor.selections.length === 1 &&
 			textEditor.selections[0].start.line === 0 && textEditor.selections[0].start.character === 0 &&
 			textEditor.selections[0].end.line === 0 && textEditor.selections[0].end.character === 0) {
-			this.textEditorBlameInformation.set(textEditor, []);
-			this._onDidChangeBlameInformation.fire(textEditor);
+			this.textEditorBlameInformation = undefined;
 			return;
 		}
 
@@ -437,8 +502,7 @@ export class GitBlameController {
 			}
 		}
 
-		this.textEditorBlameInformation.set(textEditor, lineBlameInformation);
-		this._onDidChangeBlameInformation.fire(textEditor);
+		this.textEditorBlameInformation = lineBlameInformation;
 	}
 
 	dispose() {
@@ -452,26 +516,22 @@ export class GitBlameController {
 }
 
 class GitBlameEditorDecoration implements HoverProvider {
-	private _decoration: TextEditorDecorationType | undefined;
-	private get decoration(): TextEditorDecorationType {
-		if (!this._decoration) {
-			this._decoration = window.createTextEditorDecorationType({
-				after: {
-					color: new ThemeColor('git.blame.editorDecorationForeground')
-				}
-			});
-		}
-
-		return this._decoration;
-	}
+	private _decoration: TextEditorDecorationType;
 
 	private _hoverDisposable: IDisposable | undefined;
 	private _disposables: IDisposable[] = [];
 
 	constructor(private readonly _controller: GitBlameController) {
+		this._decoration = window.createTextEditorDecorationType({
+			after: {
+				color: new ThemeColor('git.blame.editorDecorationForeground')
+			}
+		});
+		this._disposables.push(this._decoration);
+
 		workspace.onDidChangeConfiguration(this._onDidChangeConfiguration, this, this._disposables);
 		window.onDidChangeActiveTextEditor(this._onDidChangeActiveTextEditor, this, this._disposables);
-		this._controller.onDidChangeBlameInformation(e => this._updateDecorations(e), this, this._disposables);
+		this._controller.onDidChangeBlameInformation(() => this._onDidChangeBlameInformation(), this, this._disposables);
 
 		this._onDidChangeConfiguration();
 	}
@@ -492,14 +552,14 @@ class GitBlameEditorDecoration implements HoverProvider {
 		}
 
 		// Get blame information
-		const blameInformation = this._controller.textEditorBlameInformation
-			.get(textEditor)?.find(blame => blame.lineNumber === position.line);
+		const blameInformation = this._controller.textEditorBlameInformation;
+		const lineBlameInformation = blameInformation?.find(blame => blame.lineNumber === position.line);
 
-		if (!blameInformation || typeof blameInformation.blameInformation === 'string') {
+		if (!lineBlameInformation || typeof lineBlameInformation.blameInformation === 'string') {
 			return undefined;
 		}
 
-		const contents = await this._controller.getBlameInformationDetailedHover(textEditor.document.uri, blameInformation.blameInformation);
+		const contents = await this._controller.getBlameInformationDetailedHover(textEditor.document.uri, lineBlameInformation.blameInformation);
 
 		if (!contents || token.isCancellationRequested) {
 			return undefined;
@@ -509,35 +569,19 @@ class GitBlameEditorDecoration implements HoverProvider {
 	}
 
 	private _onDidChangeConfiguration(e?: ConfigurationChangeEvent): void {
-		if (e &&
-			!e.affectsConfiguration('git.blame.editorDecoration.enabled') &&
-			!e.affectsConfiguration('git.blame.editorDecoration.template')) {
+		if (e && !e.affectsConfiguration('git.blame.editorDecoration.template')) {
 			return;
 		}
 
-		if (this._getConfiguration().enabled) {
-			if (window.activeTextEditor) {
-				this._registerHoverProvider();
-				this._updateDecorations(window.activeTextEditor);
-			}
-		} else {
-			this._decoration?.dispose();
-			this._decoration = undefined;
-
-			this._hoverDisposable?.dispose();
-			this._hoverDisposable = undefined;
-		}
+		this._registerHoverProvider();
+		this._onDidChangeBlameInformation();
 	}
 
 	private _onDidChangeActiveTextEditor(): void {
-		if (!this._getConfiguration().enabled) {
-			return;
-		}
-
 		// Clear decorations
 		for (const editor of window.visibleTextEditors) {
 			if (editor !== window.activeTextEditor) {
-				editor.setDecorations(this.decoration, []);
+				editor.setDecorations(this._decoration, []);
 			}
 		}
 
@@ -545,34 +589,23 @@ class GitBlameEditorDecoration implements HoverProvider {
 		this._registerHoverProvider();
 	}
 
-	private _getConfiguration(): { enabled: boolean; template: string } {
-		const config = workspace.getConfiguration('git');
-		const enabled = config.get<boolean>('blame.editorDecoration.enabled', false);
-		const template = config.get<string>('blame.editorDecoration.template', '${subject}, ${authorName} (${authorDateAgo})');
-
-		return { enabled, template };
-	}
-
-	private _updateDecorations(textEditor: TextEditor): void {
-		const { enabled, template } = this._getConfiguration();
-		if (!enabled) {
-			return;
-		}
-
-		// Only support resources with `file` and `git` schemes
-		if (textEditor.document.uri.scheme !== 'file' && !isGitUri(textEditor.document.uri)) {
-			textEditor.setDecorations(this.decoration, []);
+	private _onDidChangeBlameInformation(): void {
+		const textEditor = window.activeTextEditor;
+		if (!textEditor) {
 			return;
 		}
 
 		// Get blame information
-		const blameInformation = this._controller.textEditorBlameInformation.get(textEditor);
+		const blameInformation = this._controller.textEditorBlameInformation;
 		if (!blameInformation) {
-			textEditor.setDecorations(this.decoration, []);
+			textEditor.setDecorations(this._decoration, []);
 			return;
 		}
 
 		// Set decorations for the editor
+		const config = workspace.getConfiguration('git');
+		const template = config.get<string>('blame.editorDecoration.template', '${subject}, ${authorName} (${authorDateAgo})');
+
 		const decorations = blameInformation.map(blame => {
 			const contentText = typeof blame.blameInformation !== 'string'
 				? this._controller.formatBlameInformationMessage(template, blame.blameInformation)
@@ -581,7 +614,7 @@ class GitBlameEditorDecoration implements HoverProvider {
 			return this._createDecoration(blame.lineNumber, contentText);
 		});
 
-		textEditor.setDecorations(this.decoration, decorations);
+		textEditor.setDecorations(this._decoration, decorations);
 	}
 
 	private _createDecoration(lineNumber: number, contentText: string): DecorationOptions {
@@ -599,8 +632,7 @@ class GitBlameEditorDecoration implements HoverProvider {
 	private _registerHoverProvider(): void {
 		this._hoverDisposable?.dispose();
 
-		if (window.activeTextEditor?.document.uri.scheme === 'file' ||
-			window.activeTextEditor?.document.uri.scheme === 'git') {
+		if (window.activeTextEditor && isResourceSchemeSupported(window.activeTextEditor.document.uri)) {
 			this._hoverDisposable = languages.registerHoverProvider({
 				pattern: window.activeTextEditor.document.uri.fsPath
 			}, this);
@@ -608,9 +640,6 @@ class GitBlameEditorDecoration implements HoverProvider {
 	}
 
 	dispose() {
-		this._decoration?.dispose();
-		this._decoration = undefined;
-
 		this._hoverDisposable?.dispose();
 		this._hoverDisposable = undefined;
 
@@ -619,70 +648,33 @@ class GitBlameEditorDecoration implements HoverProvider {
 }
 
 class GitBlameStatusBarItem {
-	private _statusBarItem: StatusBarItem | undefined;
-
+	private _statusBarItem: StatusBarItem;
 	private _disposables: IDisposable[] = [];
 
 	constructor(private readonly _controller: GitBlameController) {
-		workspace.onDidChangeConfiguration(this._onDidChangeConfiguration, this, this._disposables);
-		window.onDidChangeActiveTextEditor(this._onDidChangeActiveTextEditor, this, this._disposables);
+		this._statusBarItem = window.createStatusBarItem('git.blame', StatusBarAlignment.Right, 200);
+		this._statusBarItem.name = l10n.t('Git Blame Information');
+		this._disposables.push(this._statusBarItem);
 
-		this._controller.onDidChangeBlameInformation(e => this._updateStatusBarItem(e), this, this._disposables);
+		workspace.onDidChangeConfiguration(this._onDidChangeConfiguration, this, this._disposables);
+		this._controller.onDidChangeBlameInformation(() => this._onDidChangeBlameInformation(), this, this._disposables);
 	}
 
 	private _onDidChangeConfiguration(e: ConfigurationChangeEvent): void {
-		if (!e.affectsConfiguration('git.blame.statusBarItem.enabled') &&
-			!e.affectsConfiguration('git.blame.statusBarItem.template')) {
+		if (!e.affectsConfiguration('git.blame.statusBarItem.template')) {
 			return;
 		}
 
-		if (this._getConfiguration().enabled) {
-			if (window.activeTextEditor) {
-				this._updateStatusBarItem(window.activeTextEditor);
-			}
-		} else {
-			this._statusBarItem?.dispose();
-			this._statusBarItem = undefined;
-		}
+		this._onDidChangeBlameInformation();
 	}
 
-	private _onDidChangeActiveTextEditor(): void {
-		if (!this._getConfiguration().enabled) {
-			return;
-		}
-
+	private _onDidChangeBlameInformation(): void {
 		if (!window.activeTextEditor) {
-			this._statusBarItem?.hide();
-		}
-	}
-
-	private _getConfiguration(): { enabled: boolean; template: string } {
-		const config = workspace.getConfiguration('git');
-		const enabled = config.get<boolean>('blame.statusBarItem.enabled', false);
-		const template = config.get<string>('blame.statusBarItem.template', '${authorName} (${authorDateAgo})');
-
-		return { enabled, template };
-	}
-
-	private _updateStatusBarItem(textEditor: TextEditor): void {
-		const { enabled, template } = this._getConfiguration();
-		if (!enabled || textEditor !== window.activeTextEditor) {
-			return;
-		}
-
-		if (!this._statusBarItem) {
-			this._statusBarItem = window.createStatusBarItem('git.blame', StatusBarAlignment.Right, 200);
-			this._statusBarItem.name = l10n.t('Git Blame Information');
-			this._disposables.push(this._statusBarItem);
-		}
-
-		// Only support resources with `file` and `git` schemes
-		if (textEditor.document.uri.scheme !== 'file' && !isGitUri(textEditor.document.uri)) {
 			this._statusBarItem.hide();
 			return;
 		}
 
-		const blameInformation = this._controller.textEditorBlameInformation.get(textEditor);
+		const blameInformation = this._controller.textEditorBlameInformation;
 		if (!blameInformation || blameInformation.length === 0) {
 			this._statusBarItem.hide();
 			return;
@@ -693,12 +685,15 @@ class GitBlameStatusBarItem {
 			this._statusBarItem.tooltip = l10n.t('Git Blame Information');
 			this._statusBarItem.command = undefined;
 		} else {
+			const config = workspace.getConfiguration('git');
+			const template = config.get<string>('blame.statusBarItem.template', '${authorName} (${authorDateAgo})');
+
 			this._statusBarItem.text = `$(git-commit) ${this._controller.formatBlameInformationMessage(template, blameInformation[0].blameInformation)}`;
-			this._statusBarItem.tooltip = this._controller.getBlameInformationHover(textEditor.document.uri, blameInformation[0].blameInformation);
+			this._statusBarItem.tooltip = this._controller.getBlameInformationHover(window.activeTextEditor.document.uri, blameInformation[0].blameInformation);
 			this._statusBarItem.command = {
 				title: l10n.t('View Commit'),
 				command: 'git.blameStatusBarItem.viewCommit',
-				arguments: [textEditor.document.uri, blameInformation[0].blameInformation.hash]
+				arguments: [window.activeTextEditor.document.uri, blameInformation[0].blameInformation.hash]
 			} satisfies Command;
 		}
 

From 92bae09f4dba58bb5eed52d75ba22ffd4424e1c6 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Thu, 2 Jan 2025 16:45:45 +0100
Subject: [PATCH 476/479] Git - update git blame settings (#237187)

---
 extensions/git/package.json | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/extensions/git/package.json b/extensions/git/package.json
index 4556255d3da..748ac40f1ae 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -3203,38 +3203,22 @@
         "git.blame.editorDecoration.enabled": {
           "type": "boolean",
           "default": false,
-          "markdownDescription": "%config.blameEditorDecoration.enabled%",
-          "scope": "resource",
-          "tags": [
-            "experimental"
-          ]
+          "markdownDescription": "%config.blameEditorDecoration.enabled%"
         },
         "git.blame.editorDecoration.template": {
           "type": "string",
           "default": "${subject}, ${authorName} (${authorDateAgo})",
-          "markdownDescription": "%config.blameEditorDecoration.template%",
-          "scope": "resource",
-          "tags": [
-            "experimental"
-          ]
+          "markdownDescription": "%config.blameEditorDecoration.template%"
         },
         "git.blame.statusBarItem.enabled": {
           "type": "boolean",
           "default": false,
-          "markdownDescription": "%config.blameStatusBarItem.enabled%",
-          "scope": "resource",
-          "tags": [
-            "experimental"
-          ]
+          "markdownDescription": "%config.blameStatusBarItem.enabled%"
         },
         "git.blame.statusBarItem.template": {
           "type": "string",
           "default": "${authorName} (${authorDateAgo})",
-          "markdownDescription": "%config.blameStatusBarItem.template%",
-          "scope": "resource",
-          "tags": [
-            "experimental"
-          ]
+          "markdownDescription": "%config.blameStatusBarItem.template%"
         }
       }
     },

From 2bdb3e9b41bd72048ea2067a350d8536c82fc7f6 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Thu, 2 Jan 2025 16:46:09 +0100
Subject: [PATCH 477/479] Git - git blame hover commands polish (#237190)

---
 extensions/git/src/blame.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/extensions/git/src/blame.ts b/extensions/git/src/blame.ts
index 3893b4bff4f..3c7d61dd1e1 100644
--- a/extensions/git/src/blame.ts
+++ b/extensions/git/src/blame.ts
@@ -260,9 +260,11 @@ export class GitBlameController {
 			markdownString.appendMarkdown(`\n\n---\n\n`);
 		}
 
-		markdownString.appendMarkdown(`[$(eye) View Commit](command:git.blameStatusBarItem.viewCommit?${encodeURIComponent(JSON.stringify([documentUri, blameInformationOrCommit.hash]))} "${l10n.t('View Commit')}")`);
-		markdownString.appendMarkdown('&nbsp;&nbsp;&nbsp;&nbsp;');
-		markdownString.appendMarkdown(`[$(copy) ${blameInformationOrCommit.hash.substring(0, 8)}](command:git.blameStatusBarItem.copyContent?${encodeURIComponent(JSON.stringify(blameInformationOrCommit.hash))} "${l10n.t('Copy Commit Hash')}")`);
+		markdownString.appendMarkdown(`[\`$(git-commit) ${blameInformationOrCommit.hash.substring(0, 8)} \`](command:git.blameStatusBarItem.viewCommit?${encodeURIComponent(JSON.stringify([documentUri, blameInformationOrCommit.hash]))} "${l10n.t('View Commit')}")`);
+		markdownString.appendMarkdown('&nbsp;');
+		markdownString.appendMarkdown(`[$(copy)](command:git.blameStatusBarItem.copyContent?${encodeURIComponent(JSON.stringify(blameInformationOrCommit.hash))} "${l10n.t('Copy Commit Hash')}")`);
+		markdownString.appendMarkdown('&nbsp;&nbsp;|&nbsp;&nbsp;');
+		markdownString.appendMarkdown(`[$(gear)](command:workbench.action.openSettings?%5B%22git.blame%22%5D "${l10n.t('Open Settings')}")`);
 
 		return markdownString;
 	}

From c97bc9def4cabb7fd445607b00e97ddcd2b6afe7 Mon Sep 17 00:00:00 2001
From: Roman Nikitenko <rnikiten@redhat.com>
Date: Fri, 3 Jan 2025 16:39:23 +0200
Subject: [PATCH 478/479] chore: Update lock files after resolving conflicts

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>

rh-pre-commit.version: 2.2.0
rh-pre-commit.check-secrets: ENABLED
---
 .../package-lock.json                         |  2 +-
 code/extensions/package-lock.json             |  1 +
 code/package-lock.json                        | 22 ------
 code/remote/package-lock.json                 | 78 +++++++++----------
 4 files changed, 41 insertions(+), 62 deletions(-)

diff --git a/code/extensions/microsoft-authentication/package-lock.json b/code/extensions/microsoft-authentication/package-lock.json
index 538bbc19d78..0ee986f3e6d 100644
--- a/code/extensions/microsoft-authentication/package-lock.json
+++ b/code/extensions/microsoft-authentication/package-lock.json
@@ -16,7 +16,7 @@
         "@azure/msal-node": "^2.16.2",
         "@azure/msal-node-extensions": "^1.5.0",
         "@vscode/extension-telemetry": "^0.9.8",
-		"keytar": "workspace:*",
+        "keytar": "workspace:*",
         "vscode-tas-client": "^0.1.84"
       },
       "devDependencies": {
diff --git a/code/extensions/package-lock.json b/code/extensions/package-lock.json
index 6ffc720a89b..aa142087652 100644
--- a/code/extensions/package-lock.json
+++ b/code/extensions/package-lock.json
@@ -14,6 +14,7 @@
       },
       "devDependencies": {
         "@parcel/watcher": "2.5.0",
+        "crypto": "1.0.1",
         "esbuild": "0.23.0",
         "vscode-grammar-updater": "^1.1.0"
       }
diff --git a/code/package-lock.json b/code/package-lock.json
index 4cec82c0248..40ac8d8d8a2 100644
--- a/code/package-lock.json
+++ b/code/package-lock.json
@@ -12577,28 +12577,6 @@
         }
       }
     },
-    "node_modules/node-html-markdown": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/node-html-markdown/-/node-html-markdown-1.3.0.tgz",
-      "integrity": "sha512-OeFi3QwC/cPjvVKZ114tzzu+YoR+v9UXW5RwSXGUqGb0qCl0DvP406tzdL7SFn8pZrMyzXoisfG2zcuF9+zw4g==",
-      "dev": true,
-      "dependencies": {
-        "node-html-parser": "^6.1.1"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/node-html-parser": {
-      "version": "6.1.13",
-      "resolved": "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.13.tgz",
-      "integrity": "sha512-qIsTMOY4C/dAa5Q5vsobRpOOvPfC4pB61UVW2uSwZNUp0QU/jCekTal1vMmbO0DgdHeLUJpv/ARmDqErVxA3Sg==",
-      "dev": true,
-      "dependencies": {
-        "css-select": "^5.1.0",
-        "he": "1.2.0"
-      }
-    },
     "node_modules/node-pty": {
       "version": "1.1.0-beta22",
       "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta22.tgz",
diff --git a/code/remote/package-lock.json b/code/remote/package-lock.json
index 16818856cbd..5d5d092f103 100644
--- a/code/remote/package-lock.json
+++ b/code/remote/package-lock.json
@@ -1151,6 +1151,33 @@
         "node": ">=8"
       }
     },
+    "node_modules/font-finder": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/font-finder/-/font-finder-1.1.0.tgz",
+      "integrity": "sha512-wpCL2uIbi6GurJbU7ZlQ3nGd61Ho+dSU6U83/xJT5UPFfN35EeCW/rOtS+5k+IuEZu2SYmHzDIPL9eA5tSYRAw==",
+      "license": "MIT",
+      "dependencies": {
+        "get-system-fonts": "^2.0.0",
+        "promise-stream-reader": "^1.0.1"
+      },
+      "engines": {
+        "node": ">8.0.0"
+      }
+    },
+    "node_modules/font-ligatures": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/font-ligatures/-/font-ligatures-1.4.1.tgz",
+      "integrity": "sha512-7W6zlfyhvCqShZ5ReUWqmSd9vBaUudW0Hxis+tqUjtHhsPU+L3Grf8mcZAtCiXHTzorhwdRTId2WeH/88gdFkw==",
+      "license": "MIT",
+      "dependencies": {
+        "font-finder": "^1.0.3",
+        "lru-cache": "^6.0.0",
+        "opentype.js": "^0.8.0"
+      },
+      "engines": {
+        "node": ">8.0.0"
+      }
+    },
     "node_modules/foreground-child": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
@@ -1190,33 +1217,6 @@
         "node": ">= 0.12"
       }
     },
-    "node_modules/font-finder": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/font-finder/-/font-finder-1.1.0.tgz",
-      "integrity": "sha512-wpCL2uIbi6GurJbU7ZlQ3nGd61Ho+dSU6U83/xJT5UPFfN35EeCW/rOtS+5k+IuEZu2SYmHzDIPL9eA5tSYRAw==",
-      "license": "MIT",
-      "dependencies": {
-        "get-system-fonts": "^2.0.0",
-        "promise-stream-reader": "^1.0.1"
-      },
-      "engines": {
-        "node": ">8.0.0"
-      }
-    },
-    "node_modules/font-ligatures": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/font-ligatures/-/font-ligatures-1.4.1.tgz",
-      "integrity": "sha512-7W6zlfyhvCqShZ5ReUWqmSd9vBaUudW0Hxis+tqUjtHhsPU+L3Grf8mcZAtCiXHTzorhwdRTId2WeH/88gdFkw==",
-      "license": "MIT",
-      "dependencies": {
-        "font-finder": "^1.0.3",
-        "lru-cache": "^6.0.0",
-        "opentype.js": "^0.8.0"
-      },
-      "engines": {
-        "node": ">8.0.0"
-      }
-    },
     "node_modules/fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@@ -1788,6 +1788,18 @@
         "url": "https://github.com/sponsors/panva"
       }
     },
+    "node_modules/opentype.js": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/opentype.js/-/opentype.js-0.8.0.tgz",
+      "integrity": "sha512-FQHR4oGP+a0m/f6yHoRpBOIbn/5ZWxKd4D/djHVJu8+KpBTYrJda0b7mLcgDEMWXE9xBCJm+qb0yv6FcvPjukg==",
+      "license": "MIT",
+      "dependencies": {
+        "tiny-inflate": "^1.0.2"
+      },
+      "bin": {
+        "ot": "bin/ot"
+      }
+    },
     "node_modules/package-json-from-dist": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
@@ -1825,18 +1837,6 @@
       "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
       "license": "ISC"
     },
-    "node_modules/opentype.js": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/opentype.js/-/opentype.js-0.8.0.tgz",
-      "integrity": "sha512-FQHR4oGP+a0m/f6yHoRpBOIbn/5ZWxKd4D/djHVJu8+KpBTYrJda0b7mLcgDEMWXE9xBCJm+qb0yv6FcvPjukg==",
-      "license": "MIT",
-      "dependencies": {
-        "tiny-inflate": "^1.0.2"
-      },
-      "bin": {
-        "ot": "bin/ot"
-      }
-    },
     "node_modules/pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",

From f14588e5cb7a9be4dbc7331f701f8f1460f47e0a Mon Sep 17 00:00:00 2001
From: Roman Nikitenko <rnikiten@redhat.com>
Date: Tue, 7 Jan 2025 19:37:02 +0000
Subject: [PATCH 479/479] fix: Fix fetching product.json file content

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
---
 code/src/vs/platform/product/common/che/product.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/src/vs/platform/product/common/che/product.ts b/code/src/vs/platform/product/common/che/product.ts
index 1c261e11f7c..d91f8f6f19b 100644
--- a/code/src/vs/platform/product/common/che/product.ts
+++ b/code/src/vs/platform/product/common/che/product.ts
@@ -1,5 +1,5 @@
 /**********************************************************************
- * Copyright (c) 2024 Red Hat, Inc.
+ * Copyright (c) 2024-2025 Red Hat, Inc.
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -9,17 +9,17 @@
  ***********************************************************************/
 /* eslint-disable header/header */
 
+import { FileAccess } from '../../../../base/common/network.js';
 import { IProductConfiguration } from '../../../../base/common/product.js';
 
 export function loadFromFileSystem(): IProductConfiguration {
-	const href = `./oss-dev/static/product.json`;
-
+	const href = FileAccess.asBrowserUri('vs/../../product.json').toString(true);
 	try {
-		var xmlhttp = new XMLHttpRequest();
-		xmlhttp.open("GET", href, false);
+		const xmlhttp = new XMLHttpRequest();
+		xmlhttp.open('GET', href, false);
 		xmlhttp.send();
 
-		if (xmlhttp.status == 200 && xmlhttp.readyState == 4) {
+		if (xmlhttp.status === 200 && xmlhttp.readyState === 4) {
 			return JSON.parse(xmlhttp.responseText);
 		}