Merge branch 'main' into tyriar/234103__233856

Author: Tyriar

build/win32/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "inno_updater"
-version = "0.11.1"
+version = "0.12.0"
 authors = ["Microsoft <[email protected]>"]
 build = "build.rs"
 

build/win32/Cargo.toml

@@ -37,7 +37,10 @@
       {
         "language": "csharp",
         "scopeName": "source.cs",
-        "path": "./syntaxes/csharp.tmLanguage.json"
+        "path": "./syntaxes/csharp.tmLanguage.json",
+        "tokenTypes": {
+          "meta.interpolation": "other"
+        }
       }
     ],
     "snippets": [

build/win32/inno_updater.exe

@@ -34,6 +34,7 @@
     "scmValidation",
     "tabInputMultiDiff",
     "tabInputTextMerge",
+    "textEditorDiffInformation",
     "timeline"
   ],
   "categories": [

extensions/csharp/package.json

@@ -20,6 +20,7 @@
 		"../../src/vscode-dts/vscode.proposed.scmTextDocument.d.ts",
 		"../../src/vscode-dts/vscode.proposed.tabInputMultiDiff.d.ts",
 		"../../src/vscode-dts/vscode.proposed.tabInputTextMerge.d.ts",
+		"../../src/vscode-dts/vscode.proposed.textEditorDiffInformation.d.ts",
 		"../../src/vscode-dts/vscode.proposed.timeline.d.ts",
 		"../../src/vscode-dts/vscode.proposed.quickInputButtonLocation.d.ts",
 		"../types/lib.textEncoder.d.ts"

extensions/git/package.json

@@ -71,8 +71,8 @@ export class DefaultExtensionsInitializer extends Disposable {
 
 	private getDefaultExtensionVSIXsLocation(): URI {
 		// appRoot = C:\Users\<name>\AppData\Local\Programs\Microsoft VS Code Insiders\resources\app
-		// extensionsPath = C:\Users\<name>\AppData\Local\Programs\Microsoft VS Code Insiders\extras\extensions
-		return URI.file(join(dirname(dirname(this.environmentService.appRoot)), 'extras', 'extensions'));
+		// extensionsPath = C:\Users\<name>\AppData\Local\Programs\Microsoft VS Code Insiders\bootstrap\extensions
+		return URI.file(join(dirname(dirname(this.environmentService.appRoot)), 'bootstrap', 'extensions'));
 	}
 
 }

extensions/git/tsconfig.json

@@ -3,8 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { equals } from '../../../base/common/arrays.js';
 import { IDisposable } from '../../../base/common/lifecycle.js';
 import { URI } from '../../../base/common/uri.js';
+import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.js';
 
 export interface IResolvableEditorModel extends IDisposable {
 
@@ -376,3 +378,29 @@ export interface ITextEditorOptions extends IEditorOptions {
 	 */
 	selectionSource?: TextEditorSelectionSource | string;
 }
+
+export type ITextEditorDiff = [
+	originalStartLineNumber: number,
+	originalEndLineNumber: number,
+	modifiedStartLineNumber: number,
+	modifiedEndLineNumber: number
+];
+
+export interface ITextEditorDiffInformation {
+	readonly documentVersion: number;
+	readonly original: URI | undefined;
+	readonly modified: URI | undefined;
+	readonly diff: readonly ITextEditorDiff[];
+}
+
+export function isTextEditorDiffInformationEqual(
+	uriIdentityService: IUriIdentityService,
+	diff1: ITextEditorDiffInformation | undefined,
+	diff2: ITextEditorDiffInformation | undefined): boolean {
+	return diff1?.documentVersion === diff2?.documentVersion &&
+		uriIdentityService.extUri.isEqual(diff1?.original, diff2?.original) &&
+		uriIdentityService.extUri.isEqual(diff1?.modified, diff2?.modified) &&
+		equals<ITextEditorDiff>(diff1?.diff, diff2?.diff, (a, b) => {
+			return a[0] === b[0] && a[1] === b[1] && a[2] === b[2] && a[3] === b[3];
+		});
+}

src/vs/code/electron-utility/sharedProcess/contrib/defaultExtensionsInitializer.ts

@@ -364,6 +364,9 @@ const _allApiProposals = {
 	testRelatedCode: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testRelatedCode.d.ts',
 	},
+	textEditorDiffInformation: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.textEditorDiffInformation.d.ts',
+	},
 	textSearchComplete2: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.textSearchComplete2.d.ts',
 	},

src/vs/platform/editor/common/editor.ts

@@ -32,6 +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';
 
 
 class TextEditorSnapshot {
@@ -296,14 +297,15 @@ export class MainThreadDocumentsAndEditors {
 		@IUriIdentityService uriIdentityService: IUriIdentityService,
 		@IClipboardService private readonly _clipboardService: IClipboardService,
 		@IPathService pathService: IPathService,
-		@IConfigurationService configurationService: IConfigurationService
+		@IConfigurationService configurationService: IConfigurationService,
+		@IDirtyDiffModelService dirtyDiffModelService: IDirtyDiffModelService
 	) {
 		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));
+		this._mainThreadEditors = this._toDispose.add(new MainThreadTextEditors(this, extHostContext, codeEditorService, this._editorService, this._editorGroupService, configurationService, dirtyDiffModelService, uriIdentityService));
 		extHostContext.set(MainContext.MainThreadTextEditors, this._mainThreadEditors);
 
 		// It is expected that the ctor of the state computer calls our `_onDelta`.