Merge branch 'main' into tyriar/162070_2

Author: meganrogge

ThirdPartyNotices.txt

@@ -450,7 +450,21 @@ export class Model implements IRemoteSourcePublisherRegistry, IPostCommitCommand
 				.forEach(p => this.eventuallyScanPossibleGitRepository(p));
 		};
 
-		const statusListener = repository.onDidRunGitStatus(checkForSubmodules);
+		const updateMergeChanges = () => {
+			// set mergeChanges context
+			const mergeChanges: Uri[] = [];
+			for (const { repository } of this.openRepositories.values()) {
+				for (const state of repository.mergeGroup.resourceStates) {
+					mergeChanges.push(state.resourceUri);
+				}
+			}
+			commands.executeCommand('setContext', 'git.mergeChanges', mergeChanges);
+		};
+
+		const statusListener = repository.onDidRunGitStatus(() => {
+			checkForSubmodules();
+			updateMergeChanges();
+		});
 		checkForSubmodules();
 
 		const dispose = () => {
@@ -466,6 +480,7 @@ export class Model implements IRemoteSourcePublisherRegistry, IPostCommitCommand
 
 		const openRepository = { repository, dispose };
 		this.openRepositories.push(openRepository);
+		updateMergeChanges();
 		this._onDidOpenRepository.fire(repository);
 	}
 

extensions/git/src/model.ts

@@ -2103,9 +2103,6 @@ export class Repository implements Disposable {
 		// set count badge
 		this.setCountBadge();
 
-		// set mergeChanges context
-		commands.executeCommand('setContext', 'git.mergeChanges', merge.map(item => item.resourceUri));
-
 		this._onDidChangeStatus.fire();
 
 		this._sourceControl.commitTemplate = await this.getInputTemplate();

extensions/git/src/repository.ts

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.72.0",
-  "distro": "a75e0e9bdfca0851f24bfad4a244226c87a0c2c4",
+  "distro": "d4b1b117d224d627ec65bb0fd0b02fdee65303aa",
   "author": {
     "name": "Microsoft Corporation"
   },

package.json

@@ -45,7 +45,7 @@ import { IPartOptions } from 'vs/workbench/browser/part';
 import { StringSHA1 } from 'vs/base/common/hash';
 import { URI } from 'vs/base/common/uri';
 import { Extensions, IProfileStorageRegistry } from 'vs/workbench/services/userDataProfile/common/userDataProfileStorageRegistry';
-import { WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
+import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
 
 interface ICachedPanel {
 	id: string;
@@ -110,7 +110,7 @@ export abstract class BasePanelPart extends CompositePart<PaneComposite> impleme
 	private compositeBar: CompositeBar;
 	private readonly compositeActions = new Map<string, { activityAction: PanelActivityAction; pinnedAction: ToggleCompositePinnedAction }>();
 
-	private globalToolBar: WorkbenchToolBar | undefined;
+	private globalToolBar: ToolBar | undefined;
 	private globalActions: CompositeMenuActions;
 
 	private readonly panelDisposables: Map<string, IDisposable> = new Map<string, IDisposable>();
@@ -549,13 +549,12 @@ export abstract class BasePanelPart extends CompositePart<PaneComposite> impleme
 		const globalTitleActionsContainer = element.appendChild($('.global-actions'));
 
 		// Global Actions Toolbar
-		this.globalToolBar = this._register(this.instantiationService.createInstance(WorkbenchToolBar, globalTitleActionsContainer, {
+		this.globalToolBar = this._register(new ToolBar(globalTitleActionsContainer, this.contextMenuService, {
 			actionViewItemProvider: action => this.actionViewItemProvider(action),
 			orientation: ActionsOrientation.HORIZONTAL,
 			getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
 			anchorAlignmentProvider: () => this.getTitleAreaDropDownAnchorAlignment(),
-			toggleMenuTitle: localize('moreActions', "More Actions..."),
-			resetMenu: this.globalActions.menuId
+			toggleMenuTitle: localize('moreActions', "More Actions...")
 		}));
 
 		this.updateGlobalToolbarActions();

src/vs/workbench/browser/parts/panel/panelPart.ts

@@ -210,11 +210,16 @@ export class BrowserWindow extends Disposable {
 							[
 								localize('openExternalDialogButtonRetry', "Try again"),
 								localize('openExternalDialogButtonInstall', "Install {0}", this.productService.nameLong),
-								localize('openExternalDialogButtonContinue', "Continue here")
+								localize('openExternalDialogButtonCancel', "Cancel")
 							],
 							{
 								cancelId: 2,
-								detail: localize('openExternalDialogDetail', "We tried opening {0} on your computer.", this.productService.nameLong)
+								detail: localize(
+									'openExternalDialogDetail.v2',
+									"We launched {0} on your computer.\n\nIf {1} did not launch, try again or install it below.",
+									this.productService.nameLong,
+									this.productService.nameLong,
+								)
 							},
 						);
 

src/vs/workbench/browser/window.ts

@@ -18,7 +18,7 @@ import { localize } from 'vs/nls';
 import { ConfirmResult, IDialogOptions, IDialogService } from 'vs/platform/dialogs/common/dialogs';
 import { IEditorModel } from 'vs/platform/editor/common/editor';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IRevertOptions } from 'vs/workbench/common/editor';
+import { IRevertOptions, SaveSourceRegistry } from 'vs/workbench/common/editor';
 import { EditorModel } from 'vs/workbench/common/editor/editorModel';
 import { MergeEditorInputData } from 'vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
 import { conflictMarkers } from 'vs/workbench/contrib/mergeEditor/browser/mergeMarkers/mergeMarkersController';
@@ -269,6 +269,8 @@ export class WorkspaceMergeEditorModeFactory implements IMergeEditorInputModelFa
 	) {
 	}
 
+	private static readonly FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('merge-editor.source', localize('merge-editor.source', "Before Resolving Conflicts In Merge Editor"));
+
 	public async createInputModel(args: MergeEditorArgs): Promise<IMergeEditorInputModel> {
 		const store = new DisposableStore();
 
@@ -302,7 +304,7 @@ export class WorkspaceMergeEditorModeFactory implements IMergeEditorInputModelFa
 			throw new BugIndicatingError();
 		}
 		// So that "Don't save" does revert the file
-		await resultTextFileModel.save();
+		await resultTextFileModel.save({ source: WorkspaceMergeEditorModeFactory.FILE_SAVED_SOURCE });
 
 		const lines = resultTextFileModel.textEditorModel!.getLinesContent();
 		const hasConflictMarkers = lines.some(l => l.startsWith(conflictMarkers.start));

src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.ts

@@ -104,7 +104,7 @@ export class ConflictActionsFactory extends Disposable {
 			if (!state.conflicting && !state.isInputIncluded(inputNumber)) {
 				result.push(
 					!state.isInputIncluded(inputNumber)
-						? command(localize('accept', "$(pass) Accept {0}", inputData.title), async () => {
+						? command(localize('accept', "Accept {0}", inputData.title), async () => {
 							transaction((tx) => {
 								model.setState(
 									modifiedBaseRange,
@@ -114,7 +114,7 @@ export class ConflictActionsFactory extends Disposable {
 								);
 							});
 						})
-						: command(localize('remove', "$(error) Remove {0}", inputData.title), async () => {
+						: command(localize('remove', "Remove {0}", inputData.title), async () => {
 							transaction((tx) => {
 								model.setState(
 									modifiedBaseRange,
@@ -129,7 +129,7 @@ export class ConflictActionsFactory extends Disposable {
 				if (modifiedBaseRange.canBeCombined && state.isEmpty) {
 					result.push(
 						state.input1 && state.input2
-							? command(localize('removeBoth', "$(error) Remove Both"), async () => {
+							? command(localize('removeBoth', "Remove Both"), async () => {
 								transaction((tx) => {
 									model.setState(
 										modifiedBaseRange,
@@ -139,7 +139,7 @@ export class ConflictActionsFactory extends Disposable {
 									);
 								});
 							})
-							: command(localize('acceptBoth', "$(pass) Accept Both"), async () => {
+							: command(localize('acceptBoth', "Accept Both"), async () => {
 								transaction((tx) => {
 									model.setState(
 										modifiedBaseRange,
@@ -204,7 +204,7 @@ export class ConflictActionsFactory extends Disposable {
 
 			const stateToggles: IContentWidgetAction[] = [];
 			if (state.input1) {
-				result.push(command(localize('remove', "$(error) Remove {0}", model.input1.title), async () => {
+				result.push(command(localize('remove', "Remove {0}", model.input1.title), async () => {
 					transaction((tx) => {
 						model.setState(
 							modifiedBaseRange,
@@ -217,7 +217,7 @@ export class ConflictActionsFactory extends Disposable {
 				);
 			}
 			if (state.input2) {
-				result.push(command(localize('remove', "$(error) Remove {0}", model.input2.title), async () => {
+				result.push(command(localize('remove', "Remove {0}", model.input2.title), async () => {
 					transaction((tx) => {
 						model.setState(
 							modifiedBaseRange,
@@ -238,7 +238,7 @@ export class ConflictActionsFactory extends Disposable {
 
 			if (state.conflicting) {
 				result.push(
-					command(localize('resetToBase', "$(error) Reset to base"), async () => {
+					command(localize('resetToBase', "Reset to base"), async () => {
 						transaction((tx) => {
 							model.setState(
 								modifiedBaseRange,