set COOP, COEP, and CORP headers for desktop

build/azure-pipelines/product-publish.ps1

@@ -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.yml

@@ -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/upload-nlsmetadata.js

@@ -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.ts

@@ -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/lib/i18n.resources.json

@@ -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"

extensions/git/package.json

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

extensions/git/package.nls.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/src/actionButton.ts

@@ -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) ||
@@ -189,10 +191,10 @@ export class ActionButtonCommand {
 		return {
 			command: {
 				command: 'git.publish',
-				title: localize('scm publish branch action button title', "{0} Publish Branch", '$(cloud-upload)'),
+				title: localize({ key: 'scm publish branch action button title', comment: ['{Locked="Branch"}', 'Do not translate "Branch" as it is a git term'] }, "{0} Publish Branch", '$(cloud-upload)'),
 				tooltip: this.state.isSyncInProgress ?
-					localize('scm button publish branch running', "Publishing Branch...") :
-					localize('scm button publish branch', "Publish Branch"),
+					localize({ key: 'scm button publish branch running', comment: ['{Locked="Branch"}', 'Do not translate "Branch" as it is a git term'] }, "Publishing Branch...") :
+					localize({ key: 'scm button publish branch', comment: ['{Locked="Branch"}', 'Do not translate "Branch" as it is a git term'] }, "Publish Branch"),
 				arguments: [this.repository.sourceControl],
 			},
 			enabled: !this.state.isSyncInProgress
@@ -202,9 +204,10 @@ 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)` : '';

extensions/git/src/commands.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

extensions/git/src/model.ts

@@ -108,6 +108,9 @@ export class Model implements IRemoteSourcePublisherRegistry, IPostCommitCommand
 
 	private postCommitCommandsProviders = new Set<PostCommitCommandsProvider>();
 
+	private _onDidChangePostCommitCommandsProviders = new EventEmitter<void>();
+	readonly onDidChangePostCommitCommandsProviders = this._onDidChangePostCommitCommandsProviders.event;
+
 	private showRepoOnHomeDriveRootWarning = true;
 	private pushErrorHandlers = new Set<PushErrorHandler>();
 
@@ -591,8 +594,12 @@ export class Model implements IRemoteSourcePublisherRegistry, IPostCommitCommand
 
 	registerPostCommitCommandsProvider(provider: PostCommitCommandsProvider): Disposable {
 		this.postCommitCommandsProviders.add(provider);
+		this._onDidChangePostCommitCommandsProviders.fire();
 
-		return toDisposable(() => this.postCommitCommandsProviders.delete(provider));
+		return toDisposable(() => {
+			this.postCommitCommandsProviders.delete(provider);
+			this._onDidChangePostCommitCommandsProviders.fire();
+		});
 	}
 
 	getPostCommitCommandsProviders(): PostCommitCommandsProvider[] {

extensions/git/src/postCommitCommands.ts

@@ -4,10 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as nls from 'vscode-nls';
-import { Command, Disposable } from 'vscode';
+import { Command, Disposable, Event } from 'vscode';
 import { PostCommitCommandsProvider } from './api/git';
 
 export interface IPostCommitCommandsProviderRegistry {
+	readonly onDidChangePostCommitCommandsProviders: Event<void>;
+
 	getPostCommitCommandsProviders(): PostCommitCommandsProvider[];
 	registerPostCommitCommandsProvider(provider: PostCommitCommandsProvider): Disposable;
 }

extensions/git/tsconfig.json

@@ -14,7 +14,7 @@
 		"../../src/vscode-dts/vscode.proposed.scmActionButton.d.ts",
 		"../../src/vscode-dts/vscode.proposed.scmSelectedProvider.d.ts",
 		"../../src/vscode-dts/vscode.proposed.scmValidation.d.ts",
-		"../../src/vscode-dts/vscode.proposed.tabs.d.ts",
+		"../../src/vscode-dts/vscode.proposed.tabInputTextMerge.d.ts",
 		"../../src/vscode-dts/vscode.proposed.timeline.d.ts",
 		"../types/lib.textEncoder.d.ts"
 	]

extensions/github/package.json

@@ -26,7 +26,8 @@
     }
   },
   "enabledApiProposals": [
-    "contribShareMenu"
+    "contribShareMenu",
+    "contribEditSessions"
   ],
   "contributes": {
     "commands": [
@@ -37,10 +38,20 @@
       {
         "command": "github.copyVscodeDevLink",
         "title": "Copy vscode.dev Link"
-	  },
-	  {
-		"command": "github.copyVscodeDevLinkFile",
-		"title": "Copy vscode.dev Link"
+      },
+      {
+        "command": "github.copyVscodeDevLinkFile",
+        "title": "Copy vscode.dev Link"
+      },
+      {
+        "command": "github.openOnVscodeDev",
+        "title": "Open on vscode.dev"
+      }
+    ],
+    "continueEditSession": [
+      {
+        "command": "github.openOnVscodeDev",
+        "when": "github.hasGitHubRepo"
       }
     ],
     "menus": {
@@ -56,6 +67,10 @@
         {
           "command": "github.copyVscodeDevLinkFile",
           "when": "false"
+        },
+        {
+          "command": "github.openOnVscodeDev",
+          "when": "false"
         }
       ],
       "file/share": [

extensions/github/src/commands.ts

@@ -20,6 +20,16 @@ async function copyVscodeDevLink(gitAPI: GitAPI, useSelection: boolean) {
 	}
 }
 
+async function openVscodeDevLink(gitAPI: GitAPI): Promise<vscode.Uri | undefined> {
+	try {
+		const permalink = getPermalink(gitAPI, true, 'https://vscode.dev/github');
+		return permalink ? vscode.Uri.parse(permalink) : undefined;
+	} catch (err) {
+		vscode.window.showErrorMessage(err.message);
+		return undefined;
+	}
+}
+
 export function registerCommands(gitAPI: GitAPI): vscode.Disposable {
 	const disposables = new DisposableStore();
 
@@ -39,5 +49,9 @@ export function registerCommands(gitAPI: GitAPI): vscode.Disposable {
 		return copyVscodeDevLink(gitAPI, false);
 	}));
 
+	disposables.add(vscode.commands.registerCommand('github.openOnVscodeDev', async () => {
+		return openVscodeDevLink(gitAPI);
+	}));
+
 	return disposables;
 }

extensions/ini/package.json

@@ -37,7 +37,8 @@
           ".editorconfig"
         ],
         "filenames": [
-          "gitconfig"
+          "gitconfig",
+          ".env"
         ],
         "filenamePatterns": [
           "**/.config/git/config",

extensions/markdown-language-features/package.json

@@ -16,7 +16,6 @@
     "Programming Languages"
   ],
   "enabledApiProposals": [
-    "textEditorDrop",
     "documentPaste"
   ],
   "activationEvents": [
@@ -563,7 +562,8 @@
     "@types/picomatch": "^2.3.0",
     "@types/vscode-notebook-renderer": "^1.60.0",
     "@types/vscode-webview": "^1.57.0",
-    "lodash.throttle": "^4.1.1"
+    "lodash.throttle": "^4.1.1",
+    "vscode-languageserver-types": "^3.17.2"
   },
   "repository": {
     "type": "git",

extensions/markdown-language-features/package.nls.json

@@ -28,7 +28,7 @@
 	"configuration.markdown.links.openLocation.currentGroup": "Open links in the active editor group.",
 	"configuration.markdown.links.openLocation.beside": "Open links beside the active editor.",
 	"configuration.markdown.suggest.paths.enabled.description": "Enable/disable path suggestions for markdown links",
-	"configuration.markdown.editor.drop.enabled": "Enable/disable dropping into the markdown editor to insert shift. Requires enabling `#workbench.experimental.editor.dropIntoEditor.enabled#`.",
+	"configuration.markdown.editor.drop.enabled": "Enable/disable dropping into the markdown editor to insert shift. Requires enabling `#workbench.editor.dropIntoEditor.enabled#`.",
 	"configuration.markdown.editor.pasteLinks.enabled": "Enable/disable pasting files into a Markdown editor inserts Markdown links. Requires enabling `#editor.experimental.pasteActions.enabled#`.",
 	"configuration.markdown.experimental.validate.enabled.description": "Enable/disable all error reporting in Markdown files.",
 	"configuration.markdown.experimental.validate.referenceLinks.enabled.description": "Validate reference links in Markdown files, e.g. `[link][ref]`.  Requires enabling `#markdown.experimental.validate.enabled#`.",

extensions/markdown-language-features/server/.vscode/launch.json

@@ -6,7 +6,7 @@
 			"name": "Attach",
 			"type": "node",
 			"request": "attach",
-			"port": 7675,
+			"port": 7692,
 			"sourceMaps": true,
 			"outFiles": ["${workspaceFolder}/out/**/*.js"]
 		}

extensions/markdown-language-features/server/package.json

@@ -10,17 +10,16 @@
   "main": "./out/node/main",
   "browser": "./dist/browser/main",
   "dependencies": {
-    "vscode-languageserver": "^8.0.2-next.4",
-    "vscode-uri": "^3.0.3",
+    "vscode-languageserver": "^8.0.2-next.5`",
     "vscode-languageserver-textdocument": "^1.0.5",
     "vscode-languageserver-types": "^3.17.1",
-    "vscode-markdown-languageservice": "microsoft/vscode-markdown-languageservice"
+    "vscode-markdown-languageservice": "^0.0.0-alpha.8",
+    "vscode-uri": "^3.0.3"
   },
   "devDependencies": {
     "@types/node": "16.x"
   },
   "scripts": {
-    "postinstall": "cd node_modules/vscode-markdown-languageservice && yarn run compile-ext",
     "compile": "gulp compile-extension:markdown-language-features-server",
     "watch": "gulp watch-extension:markdown-language-features-server"
   }