Merge branch 'main' into aiday/issue157055

Author: aiday-mar

build/azure-pipelines/win32/product-build-win32.yml

@@ -156,6 +156,7 @@ steps:
         $ErrorActionPreference = "Stop"
         exec { node build\lib\policies }
       displayName: Generate Group Policy definitions
+      retryCountOnTaskFailure: 3
 
   - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}:
     - powershell: |

extensions/git/package.json

@@ -13,6 +13,7 @@
     "diffCommand",
     "contribMergeEditorToolbar",
     "contribViewsWelcome",
+    "editSessionIdentityProvider",
     "scmActionButton",
     "scmSelectedProvider",
     "scmValidation",
@@ -24,6 +25,7 @@
   ],
   "activationEvents": [
     "*",
+    "onEditSession:file",
     "onFileSystem:git",
     "onFileSystem:git-show"
   ],

extensions/git/src/editSessionIdentityProvider.ts

@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as path from 'path';
+import * as vscode from 'vscode';
+import { Model } from './model';
+
+export class GitEditSessionIdentityProvider implements vscode.EditSessionIdentityProvider, vscode.Disposable {
+
+	private providerRegistration: vscode.Disposable;
+
+	constructor(private model: Model) {
+		this.providerRegistration = vscode.workspace.registerEditSessionIdentityProvider('file', this);
+	}
+
+	dispose() {
+		this.providerRegistration.dispose();
+	}
+
+	async provideEditSessionIdentity(workspaceFolder: vscode.WorkspaceFolder, _token: vscode.CancellationToken): Promise<string | undefined> {
+		await this.model.openRepository(path.dirname(workspaceFolder.uri.fsPath));
+
+		const repository = this.model.getRepository(workspaceFolder.uri);
+		await repository?.status();
+
+		if (!repository || !repository?.HEAD?.upstream) {
+			return undefined;
+		}
+
+		return JSON.stringify({
+			remote: repository.remotes.find((remote) => remote.name === repository.HEAD?.upstream?.remote)?.pushUrl ?? null,
+			ref: repository.HEAD?.name ?? null,
+			sha: repository.HEAD?.commit ?? null,
+		});
+	}
+}

extensions/git/src/main.ts

@@ -28,6 +28,7 @@ import { OutputChannelLogger } from './log';
 import { createIPCServer, IPCServer } from './ipc/ipcServer';
 import { GitEditor } from './gitEditor';
 import { GitPostCommitCommandsProvider } from './postCommitCommands';
+import { GitEditSessionIdentityProvider } from './editSessionIdentityProvider';
 
 const deactivateTasks: { (): Promise<any> }[] = [];
 
@@ -115,7 +116,8 @@ async function createModel(context: ExtensionContext, outputChannelLogger: Outpu
 		new GitFileSystemProvider(model),
 		new GitDecorations(model),
 		new GitProtocolHandler(),
-		new GitTimelineProvider(model, cc)
+		new GitTimelineProvider(model, cc),
+		new GitEditSessionIdentityProvider(model)
 	);
 
 	const postCommitCommandsProvider = new GitPostCommitCommandsProvider();

extensions/git/src/repository.ts

@@ -87,6 +87,7 @@ export class Resource implements SourceControlResourceState {
 		return this.resources[1];
 	}
 
+	@memoize
 	get command(): Command {
 		return this._commandResolver.resolveDefaultCommand(this);
 	}
@@ -938,8 +939,7 @@ export class Repository implements Disposable {
 
 		workspace.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('git.mergeEditor')) {
-				// this.mergeGroup.resourceStates = this.mergeGroup.resourceStates.map(r => r.clone());
-				this.status();
+				this.mergeGroup.resourceStates = this.mergeGroup.resourceStates.map(r => r.clone());
 			}
 		}, undefined, this.disposables);
 

extensions/git/src/typings/vscode.proposed.contribEditSessions.d.ts

@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  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' {
+
+	// https://github.com/microsoft/vscode/issues/157734
+
+	export namespace workspace {
+		/**
+		 *
+		 * @param scheme The URI scheme that this provider can provide edit session identities for.
+		 * @param provider A provider which can convert URIs for workspace folders of scheme @param scheme to
+		 * an edit session identifier which is stable across machines. This enables edit sessions to be resolved.
+		 */
+		export function registerEditSessionIdentityProvider(scheme: string, provider: EditSessionIdentityProvider): Disposable;
+	}
+
+	export interface EditSessionIdentityProvider {
+		/**
+		 *
+		 * @param workspaceFolder The workspace folder to provide an edit session identity for.
+		 * @param token A cancellation token for the request.
+		 * @returns An string representing the edit session identity for the requested workspace folder.
+		 */
+		provideEditSessionIdentity(workspaceFolder: WorkspaceFolder, token: CancellationToken): ProviderResult<string>;
+	}
+}

extensions/references-view/src/extension.ts

@@ -22,5 +22,9 @@ export function activate(context: vscode.ExtensionContext): SymbolTree {
 		tree.setInput(input);
 	}
 
-	return { setInput };
+	function getInput(): SymbolTreeInput<unknown> | undefined {
+		return tree.getInput();
+	}
+
+	return { setInput, getInput };
 }

extensions/references-view/src/references-view.d.ts

@@ -6,17 +6,19 @@
 import * as vscode from 'vscode';
 
 /**
- * This interface describes the shape for the references viewlet API. It consists
- * of a single `setInput` function which must be called with a full implementation
- * of the `SymbolTreeInput`-interface. To acquire this API use the default mechanics, e.g:
+ * This interface describes the shape for the references viewlet API. It includes
+ * a single `setInput` function which must be called with a full implementation
+ * of the `SymbolTreeInput`-interface. You can also use `getInput` function to
+ * get the current `SymbolTreeInput`. To acquire this API use the default mechanics, e.g:
  *
  * ```ts
  * // get references viewlet API
  * const api = await vscode.extensions.getExtension<SymbolTree>('vscode.references-view').activate();
  *
  * // instantiate and set input which updates the view
  * const myInput: SymbolTreeInput<MyItems> = ...
- * api.setInput(myInput)
+ * api.setInput(myInput);
+ * const currentInput = api.getInput();
  * ```
  */
 export interface SymbolTree {
@@ -27,6 +29,13 @@ export interface SymbolTree {
 	 * @param input A symbol tree input object
 	 */
 	setInput(input: SymbolTreeInput<unknown>): void;
+
+	/**
+	 * Get the contents of the references viewlet.
+	 *
+	 * @returns The current symbol tree input object
+	 */
+	getInput(): SymbolTreeInput<unknown> | undefined;
 }
 
 /**

extensions/references-view/src/types/index.ts

@@ -19,13 +19,15 @@ export function register(tree: SymbolsTree, context: vscode.ExtensionContext): v
 		}
 	}
 
-	function setTypeHierarchyDirection(value: TypeHierarchyDirection, anchor: TypeItem | unknown) {
+	function setTypeHierarchyDirection(value: TypeHierarchyDirection, anchor: TypeItem | vscode.Location | unknown) {
 		direction.value = value;
 
 		let newInput: TypesTreeInput | undefined;
 		const oldInput = tree.getInput();
 		if (anchor instanceof TypeItem) {
 			newInput = new TypesTreeInput(new vscode.Location(anchor.item.uri, anchor.item.selectionRange.start), direction.value);
+		} else if (anchor instanceof vscode.Location) {
+			newInput = new TypesTreeInput(anchor, direction.value);
 		} else if (oldInput instanceof TypesTreeInput) {
 			newInput = new TypesTreeInput(oldInput.location, direction.value);
 		}
@@ -36,8 +38,8 @@ export function register(tree: SymbolsTree, context: vscode.ExtensionContext): v
 
 	context.subscriptions.push(
 		vscode.commands.registerCommand('references-view.showTypeHierarchy', showTypeHierarchy),
-		vscode.commands.registerCommand('references-view.showSupertypes', (item: TypeItem | unknown) => setTypeHierarchyDirection(TypeHierarchyDirection.Supertypes, item)),
-		vscode.commands.registerCommand('references-view.showSubtypes', (item: TypeItem | unknown) => setTypeHierarchyDirection(TypeHierarchyDirection.Subtypes, item)),
+		vscode.commands.registerCommand('references-view.showSupertypes', (item: TypeItem | vscode.Location | unknown) => setTypeHierarchyDirection(TypeHierarchyDirection.Supertypes, item)),
+		vscode.commands.registerCommand('references-view.showSubtypes', (item: TypeItem | vscode.Location | unknown) => setTypeHierarchyDirection(TypeHierarchyDirection.Subtypes, item)),
 		vscode.commands.registerCommand('references-view.removeTypeItem', removeTypeItem)
 	);
 }

src/vs/base/browser/ui/tree/abstractTree.ts

@@ -663,7 +663,7 @@ export interface ICaseSensitiveToggleOpts {
 export class ModeToggle extends Toggle {
 	constructor(opts?: ICaseSensitiveToggleOpts) {
 		super({
-			icon: Codicon.filter,
+			icon: Codicon.listFilter,
 			title: localize('filter', "Filter"),
 			isChecked: opts?.isChecked ?? false,
 			inputActiveOptionBorder: opts?.inputActiveOptionBorder,