Merge branch 'main' into joh/swc

Author: jrieken

build/azure-pipelines/product-build.yml

@@ -46,6 +46,7 @@ $stages = @(
 	if ($env:VSCODE_BUILD_STAGE_WINDOWS -eq 'True') { 'Windows' }
 	if ($env:VSCODE_BUILD_STAGE_LINUX -eq 'True') { 'Linux' }
 	if ($env:VSCODE_BUILD_STAGE_MACOS -eq 'True') { 'macOS' }
+	if ($env:VSCODE_BUILD_STAGE_WEB -eq 'True') { 'Web' }
 )
 
 do {

build/azure-pipelines/product-publish.ps1

@@ -109,6 +109,7 @@ steps:
         if ($env:VSCODE_BUILD_STAGE_WINDOWS -eq 'True') { 'Windows' }
         if ($env:VSCODE_BUILD_STAGE_LINUX -eq 'True') { 'Linux' }
         if ($env:VSCODE_BUILD_STAGE_MACOS -eq 'True') { 'macOS' }
+        if ($env:VSCODE_BUILD_STAGE_WEB -eq 'True') { 'Web' }
       )
       Write-Host "Stages to check: $stages"
 

build/azure-pipelines/product-publish.yml

@@ -20,6 +20,7 @@ function main() {
             .pipe(merge({
             fileName: 'combined.nls.metadata.json',
             jsonSpace: '',
+            concatArrays: true,
             edit: (parsedJson, file) => {
                 if (file.base === 'out-vscode-web-min') {
                     return { vscode: parsedJson };

build/azure-pipelines/upload-nlsmetadata.js

@@ -33,6 +33,7 @@ function main(): Promise<void> {
 			.pipe(merge({
 				fileName: 'combined.nls.metadata.json',
 				jsonSpace: '',
+				concatArrays: true,
 				edit: (parsedJson, file) => {
 					if (file.base === 'out-vscode-web-min') {
 						return { vscode: parsedJson };

build/azure-pipelines/upload-nlsmetadata.ts

@@ -294,6 +294,10 @@
 			"name": "vs/workbench/contrib/audioCues",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/contrib/deprecatedExtensionMigrator",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/contrib/offline",
 			"project": "vscode-workbench"

build/lib/i18n.resources.json

@@ -16,6 +16,7 @@
     "scmActionButton",
     "scmSelectedProvider",
     "scmValidation",
+    "tabInputTextMerge",
     "timeline"
   ],
   "categories": [

extensions/git/package.json

@@ -221,10 +221,10 @@
 	"config.timeline.date.committed": "Use the committed date",
 	"config.timeline.date.authored": "Use the authored date",
 	"config.useCommitInputAsStashMessage": "Controls whether to use the message from the commit input box as the default stash message.",
-	"config.showActionButton": "Controls whether an action button can be shown in the Source Control view.",
-	"config.showActionButton.commit": "Show an action button to commit changes.",
-	"config.showActionButton.publish": "Show an action button to publish a local branch.",
-	"config.showActionButton.sync": "Show an action button to sync changes.",
+	"config.showActionButton": "Controls whether an action button is shown in the Source Control view.",
+	"config.showActionButton.commit": "Show an action button to commit changes when the local branch has modified files ready to be committed.",
+	"config.showActionButton.publish": "Show an action button to publish the local branch when it does not have a tracking remote branch.",
+	"config.showActionButton.sync": "Show an action button to synchronize changes when the local branch is either ahead or behind the remote branch.",
 	"config.statusLimit": "Controls how to limit the number of changes that can be parsed from Git status command. Can be set to 0 for no limit.",
 	"config.experimental.installGuide": "Experimental improvements for the git setup flow.",
 	"config.repositoryScanIgnoredFolders": "List of folders that are ignored while scanning for Git repositories when `#git.autoRepositoryDetection#` is set to `true` or `subFolders`.",

extensions/git/package.nls.json

@@ -50,6 +50,8 @@ export class ActionButtonCommand {
 		repository.onDidRunGitStatus(this.onDidRunGitStatus, this, this.disposables);
 		repository.onDidChangeOperations(this.onDidChangeOperations, this, this.disposables);
 
+		this.disposables.push(postCommitCommandsProviderRegistry.onDidChangePostCommitCommandsProviders(() => this._onDidChange.fire()));
+
 		const root = Uri.file(repository.root);
 		this.disposables.push(workspace.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('git.enableSmartCommit', root) ||
@@ -202,19 +204,18 @@ export class ActionButtonCommand {
 	private getSyncChangesActionButton(): SourceControlActionButton | undefined {
 		const config = workspace.getConfiguration('git', Uri.file(this.repository.root));
 		const showActionButton = config.get<{ sync: boolean }>('showActionButton', { sync: true });
+		const branchIsAheadOrBehind = (this.state.HEAD?.behind ?? 0) > 0 || (this.state.HEAD?.ahead ?? 0) > 0;
 
-		// Branch does not have an upstream, commit/merge is in progress, or the button is disabled
-		if (!this.state.HEAD?.upstream || this.state.isCommitInProgress || this.state.isMergeInProgress || !showActionButton.sync) { return undefined; }
+		// Branch does not have an upstream, branch is not ahead/behind the remote branch, commit/merge is in progress, or the button is disabled
+		if (!this.state.HEAD?.upstream || !branchIsAheadOrBehind || this.state.isCommitInProgress || this.state.isMergeInProgress || !showActionButton.sync) { return undefined; }
 
 		const ahead = this.state.HEAD.ahead ? ` ${this.state.HEAD.ahead}$(arrow-up)` : '';
 		const behind = this.state.HEAD.behind ? ` ${this.state.HEAD.behind}$(arrow-down)` : '';
 		const icon = this.state.isSyncInProgress ? '$(sync~spin)' : '$(sync)';
 
-		const rebaseWhenSync = config.get<string>('rebaseWhenSync');
-
 		return {
 			command: {
-				command: rebaseWhenSync ? 'git.syncRebase' : 'git.sync',
+				command: 'git.sync',
 				title: `${icon}${behind}${ahead}`,
 				tooltip: this.state.isSyncInProgress ?
 					localize('syncing changes', "Synchronizing Changes...")

extensions/git/src/actionButton.ts

@@ -5,7 +5,7 @@
 
 import * as os from 'os';
 import * as path from 'path';
-import { Command, commands, Disposable, LineChange, MessageOptions, Position, ProgressLocation, QuickPickItem, Range, SourceControlResourceState, TextDocumentShowOptions, TextEditor, Uri, ViewColumn, window, workspace, WorkspaceEdit, WorkspaceFolder, TimelineItem, env, Selection, TextDocumentContentProvider, InputBoxValidationSeverity, TabInputText } from 'vscode';
+import { Command, commands, Disposable, LineChange, MessageOptions, Position, ProgressLocation, QuickPickItem, Range, SourceControlResourceState, TextDocumentShowOptions, TextEditor, Uri, ViewColumn, window, workspace, WorkspaceEdit, WorkspaceFolder, TimelineItem, env, Selection, TextDocumentContentProvider, InputBoxValidationSeverity, TabInputText, TabInputTextMerge } from 'vscode';
 import TelemetryReporter from '@vscode/extension-telemetry';
 import * as nls from 'vscode-nls';
 import { uniqueNamesGenerator, adjectives, animals, colors, NumberDictionary } from '@joaomoreno/unique-names-generator';
@@ -53,7 +53,7 @@ class CheckoutTagItem extends CheckoutItem {
 
 class CheckoutRemoteHeadItem extends CheckoutItem {
 
-	override get label(): string { return `$(git-branch) ${this.ref.name || this.shortCommit}`; }
+	override get label(): string { return `$(cloud) ${this.ref.name || this.shortCommit}`; }
 	override get description(): string {
 		return localize('remote branch at', "Remote branch at {0}", this.shortCommit);
 	}
@@ -418,21 +418,25 @@ export class CommandCenter {
 			return;
 		}
 
+		const isRebasing = Boolean(repo.rebaseCommit);
 
 		type InputData = { uri: Uri; title?: string; detail?: string; description?: string };
 		const mergeUris = toMergeUris(uri);
 		const ours: InputData = { uri: mergeUris.ours, title: localize('Yours', 'Yours') };
 		const theirs: InputData = { uri: mergeUris.theirs, title: localize('Theirs', 'Theirs') };
 
 		try {
-			const [head, mergeHead] = await Promise.all([repo.getCommit('HEAD'), repo.getCommit('MERGE_HEAD')]);
+			const [head, rebaseOrMergeHead] = await Promise.all([
+				repo.getCommit('HEAD'),
+				isRebasing ? repo.getCommit('REBASE_HEAD') : repo.getCommit('MERGE_HEAD')
+			]);
 			// ours (current branch and commit)
 			ours.detail = head.refNames.map(s => s.replace(/^HEAD ->/, '')).join(', ');
 			ours.description = head.hash.substring(0, 7);
 
 			// theirs
-			theirs.detail = mergeHead.refNames.join(', ');
-			theirs.description = mergeHead.hash.substring(0, 7);
+			theirs.detail = rebaseOrMergeHead.refNames.join(', ');
+			theirs.description = rebaseOrMergeHead.hash.substring(0, 7);
 
 		} catch (error) {
 			// not so bad, can continue with just uris
@@ -442,8 +446,8 @@ export class CommandCenter {
 
 		const options = {
 			base: mergeUris.base,
-			input1: theirs,
-			input2: ours,
+			input1: isRebasing ? ours : theirs,
+			input2: isRebasing ? theirs : ours,
 			output: uri
 		};
 
@@ -1099,21 +1103,26 @@ export class CommandCenter {
 			return;
 		}
 
+		const { activeTab } = window.tabGroups.activeTabGroup;
+		if (!activeTab) {
+			return;
+		}
+
+		// make sure to save the merged document
 		const doc = workspace.textDocuments.find(doc => doc.uri.toString() === uri.toString());
 		if (!doc) {
 			console.log(`FAILED to accept merge because uri ${uri.toString()} doesn't match a document`);
 			return;
 		}
+		if (doc.isDirty) {
+			await doc.save();
+		}
 
-		await doc.save();
-
-		// TODO@jrieken there isn't a `TabInputTextMerge` instance yet, till now the merge editor
-		// uses the `TabInputText` for the out-resource and we use that to identify and CLOSE the tab
-		// see https://github.com/microsoft/vscode/issues/153213
-		const { activeTab } = window.tabGroups.activeTabGroup;
+		// find the merge editor tabs for the resource in question and close them all
 		let didCloseTab = false;
-		if (activeTab && activeTab?.input instanceof TabInputText && activeTab.input.uri.toString() === uri.toString()) {
-			didCloseTab = await window.tabGroups.close(activeTab, true);
+		const mergeEditorTabs = window.tabGroups.all.map(group => group.tabs.filter(tab => tab.input instanceof TabInputTextMerge && tab.input.result.toString() === uri.toString())).flat();
+		if (mergeEditorTabs.includes(activeTab)) {
+			didCloseTab = await window.tabGroups.close(mergeEditorTabs, true);
 		}
 
 		// Only stage if the merge editor has been successfully closed. That means all conflicts have been
@@ -1443,7 +1452,7 @@ export class CommandCenter {
 	private async smartCommit(
 		repository: Repository,
 		getCommitMessage: () => Promise<string | undefined>,
-		opts?: CommitOptions
+		opts: CommitOptions
 	): Promise<boolean> {
 		const config = workspace.getConfiguration('git', Uri.file(repository.root));
 		let promptToSaveFilesBeforeCommit = config.get<'always' | 'staged' | 'never'>('promptToSaveFilesBeforeCommit');
@@ -1489,14 +1498,8 @@ export class CommandCenter {
 			}
 		}
 
-		if (!opts) {
-			opts = { all: noStagedChanges };
-		} else if (!opts.all && noStagedChanges && !opts.empty) {
-			opts = { ...opts, all: true };
-		}
-
 		// no changes, and the user has not configured to commit all in this case
-		if (!noUnstagedChanges && noStagedChanges && !enableSmartCommit && !opts.empty) {
+		if (!noUnstagedChanges && noStagedChanges && !enableSmartCommit && !opts.empty && !opts.all) {
 			const suggestSmartCommit = config.get<boolean>('suggestSmartCommit') === true;
 
 			if (!suggestSmartCommit) {
@@ -1520,6 +1523,12 @@ export class CommandCenter {
 			}
 		}
 
+		if (opts.all === undefined) {
+			opts = { all: noStagedChanges };
+		} else if (!opts.all && noStagedChanges && !opts.empty) {
+			opts = { ...opts, all: true };
+		}
+
 		// enable signing of commits if configured
 		opts.signCommit = enableCommitSigning;
 
@@ -1633,7 +1642,7 @@ export class CommandCenter {
 		return true;
 	}
 
-	private async commitWithAnyInput(repository: Repository, opts?: CommitOptions): Promise<void> {
+	private async commitWithAnyInput(repository: Repository, opts: CommitOptions): Promise<void> {
 		const message = repository.inputBox.value;
 		const root = Uri.file(repository.root);
 		const config = workspace.getConfiguration('git', root);
@@ -2566,17 +2575,16 @@ export class CommandCenter {
 			}
 		}
 
-		if (rebase) {
-			await repository.syncRebase(HEAD);
-		} else {
-			await repository.sync(HEAD);
-		}
+		await repository.sync(HEAD, rebase);
 	}
 
 	@command('git.sync', { repository: true })
 	async sync(repository: Repository): Promise<void> {
+		const config = workspace.getConfiguration('git', Uri.file(repository.root));
+		const rebase = config.get<boolean>('rebaseWhenSync', false) === true;
+
 		try {
-			await this._sync(repository, false);
+			await this._sync(repository, rebase);
 		} catch (err) {
 			if (/Cancelled/i.test(err && (err.message || err.stderr || ''))) {
 				return;
@@ -2589,13 +2597,16 @@ export class CommandCenter {
 	@command('git._syncAll')
 	async syncAll(): Promise<void> {
 		await Promise.all(this.model.repositories.map(async repository => {
+			const config = workspace.getConfiguration('git', Uri.file(repository.root));
+			const rebase = config.get<boolean>('rebaseWhenSync', false) === true;
+
 			const HEAD = repository.HEAD;
 
 			if (!HEAD || !HEAD.upstream) {
 				return;
 			}
 
-			await repository.sync(HEAD);
+			await repository.sync(HEAD, rebase);
 		}));
 	}