Merge branch 'main' into aamunger/saveAllScratchpad

Author: amunger

.vscode/launch.json

@@ -1,11 +1,6 @@
 {
 	"version": "0.1.0",
 	"configurations": [
-		{
-			"request": "attach",
-			"type": "node",
-			""
-		},
 		{
 			"type": "node",
 			"request": "launch",
@@ -247,6 +242,7 @@
 				"--crash-reporter-directory=${workspaceFolder}/.profile-oss/crashes",
 				// for general runtime freezes: https://github.com/microsoft/vscode/issues/127861#issuecomment-904144910
 				"--disable-features=CalculateNativeWinOcclusion",
+				"--disable-extension=vscode.vscode-api-tests"
 			],
 			"webRoot": "${workspaceFolder}",
 			"cascadeTerminateToConfigurations": [

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

@@ -231,15 +231,3 @@ steps:
           Write-Host "##vso[task.setvariable variable=AZURE_TENANT_ID]$env:tenantId"
           Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_ID]$env:servicePrincipalId"
           Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_SECRET;issecret=true]$env:servicePrincipalKey"
-
-    - script: |
-        set -e
-        AZURE_STORAGE_ACCOUNT="ticino" \
-        AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \
-        AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \
-        AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \
-        VSCODE_ARCH="$(VSCODE_ARCH)" \
-          node build/azure-pipelines/upload-configuration
-      displayName: Upload configuration (for Bing settings search)
-      condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
-      continueOnError: true

build/azure-pipelines/upload-configuration.ts

@@ -33,7 +33,6 @@ const createAsar = require('./lib/asar').createAsar;
 const minimist = require('minimist');
 const { compileBuildTask } = require('./gulpfile.compile');
 const { compileExtensionsBuildTask, compileExtensionMediaBuildTask } = require('./gulpfile.extensions');
-const { getSettingsSearchBuildId, shouldSetupSettingsSearch } = require('./azure-pipelines/upload-configuration');
 const { promisify } = require('util');
 const glob = promisify(require('glob'));
 const rcedit = promisify(require('rcedit'));
@@ -254,10 +253,6 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 		const date = new Date().toISOString();
 		const productJsonUpdate = { commit, date, checksums, version };
 
-		if (shouldSetupSettingsSearch()) {
-			productJsonUpdate.settingsSearchBuildId = getSettingsSearchBuildId(packageJson);
-		}
-
 		const productJsonStream = gulp.src(['product.json'], { base: '.' })
 			.pipe(json(productJsonUpdate));
 

build/gulpfile.vscode.js

@@ -36,7 +36,7 @@ declare namespace monaco {
 		/**
 		 * Create a trusted types policy (same API as window.trustedTypes.createPolicy)
 		 */
-		createTrustedTypesPolicy(
+		createTrustedTypesPolicy?(
 			policyName: string,
 			policyOptions?: ITrustedTypePolicyOptions,
 		): undefined | ITrustedTypePolicy;

build/monaco/monaco.d.ts.recipe

@@ -11,21 +11,25 @@ import { LinkContext, getLink, getVscodeDevHost } from './links';
 
 async function copyVscodeDevLink(gitAPI: GitAPI, useSelection: boolean, context: LinkContext, includeRange = true) {
 	try {
-		const permalink = getLink(gitAPI, useSelection, getVscodeDevHost(), 'headlink', context, includeRange);
+		const permalink = await getLink(gitAPI, useSelection, getVscodeDevHost(), 'headlink', context, includeRange);
 		if (permalink) {
 			return vscode.env.clipboard.writeText(permalink);
 		}
 	} catch (err) {
-		vscode.window.showErrorMessage(err.message);
+		if (!(err instanceof vscode.CancellationError)) {
+			vscode.window.showErrorMessage(err.message);
+		}
 	}
 }
 
 async function openVscodeDevLink(gitAPI: GitAPI): Promise<vscode.Uri | undefined> {
 	try {
-		const headlink = getLink(gitAPI, true, getVscodeDevHost(), 'headlink');
+		const headlink = await getLink(gitAPI, true, getVscodeDevHost(), 'headlink');
 		return headlink ? vscode.Uri.parse(headlink) : undefined;
 	} catch (err) {
-		vscode.window.showErrorMessage(err.message);
+		if (!(err instanceof vscode.CancellationError)) {
+			vscode.window.showErrorMessage(err.message);
+		}
 		return undefined;
 	}
 }

extensions/github/src/commands.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { API as GitAPI, Repository } from './typings/git';
+import { API as GitAPI, RefType, Repository } from './typings/git';
 import { getRepositoryFromUrl } from './util';
 
 export function isFileInRepo(repository: Repository, file: vscode.Uri): boolean {
@@ -129,7 +129,7 @@ export function encodeURIComponentExceptSlashes(path: string) {
 	return path.split('/').map((segment) => encodeURIComponent(segment)).join('/');
 }
 
-export function getLink(gitAPI: GitAPI, useSelection: boolean, hostPrefix?: string, linkType: 'permalink' | 'headlink' = 'permalink', context?: LinkContext, useRange?: boolean): string | undefined {
+export async function getLink(gitAPI: GitAPI, useSelection: boolean, hostPrefix?: string, linkType: 'permalink' | 'headlink' = 'permalink', context?: LinkContext, useRange?: boolean): Promise<string | undefined> {
 	hostPrefix = hostPrefix ?? 'https://github.com';
 	const fileAndPosition = getFileAndPosition(context);
 	if (!fileAndPosition) {
@@ -142,6 +142,9 @@ export function getLink(gitAPI: GitAPI, useSelection: boolean, hostPrefix?: stri
 	if (!gitRepo) {
 		return;
 	}
+
+	await ensurePublished(gitRepo, uri);
+
 	let repo: { owner: string; repo: string } | undefined;
 	gitRepo.state.remotes.find(remote => {
 		if (remote.fetchUrl) {
@@ -182,3 +185,54 @@ export function getBranchLink(url: string, branch: string, hostPrefix: string =
 export function getVscodeDevHost(): string {
 	return `https://${vscode.env.appName.toLowerCase().includes('insiders') ? 'insiders.' : ''}vscode.dev/github`;
 }
+
+export async function ensurePublished(repository: Repository, file: vscode.Uri) {
+	if ((repository.state.HEAD?.type === RefType.Head || repository.state.HEAD?.type === RefType.Tag)
+		// If HEAD is not published, make sure it is
+		&& !repository?.state.HEAD?.upstream
+	) {
+		const publishBranch = vscode.l10n.t('Publish Branch');
+		const selection = await vscode.window.showInformationMessage(
+			vscode.l10n.t('The current branch is not published to the remote. Would you like to publish your branch before copying a link?'),
+			{ modal: true },
+			publishBranch
+		);
+		if (selection !== publishBranch) {
+			throw new vscode.CancellationError();
+		}
+
+		await vscode.commands.executeCommand('git.publish');
+	}
+
+	const uncommittedChanges = [...repository.state.workingTreeChanges, ...repository.state.indexChanges];
+	if (uncommittedChanges.find((c) => c.uri.toString() === file.toString())) {
+		const commitChanges = vscode.l10n.t('Commit Changes');
+		const copyAnyway = vscode.l10n.t('Copy Anyway');
+		const selection = await vscode.window.showWarningMessage(
+			vscode.l10n.t('The current file has uncommitted changes. Please commit your changes before copying a link.'),
+			{ modal: true },
+			commitChanges,
+			copyAnyway
+		);
+
+		if (selection !== copyAnyway) {
+			// Focus the SCM view
+			vscode.commands.executeCommand('workbench.view.scm');
+			throw new vscode.CancellationError();
+		}
+	} else if (repository.state.HEAD?.ahead) {
+		const pushCommits = vscode.l10n.t('Push Commits');
+		const selection = await vscode.window.showInformationMessage(
+			vscode.l10n.t('The current branch has unpublished commits. Would you like to push your commits before copying a link?'),
+			{ modal: true },
+			pushCommits
+		);
+		if (selection !== pushCommits) {
+			throw new vscode.CancellationError();
+		}
+
+		await repository.push();
+	}
+
+	await repository.status();
+}

extensions/github/src/links.ts

@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import { API } from './typings/git';
 import { getRepositoryFromUrl, repositoryHasGitHubRemote } from './util';
-import { encodeURIComponentExceptSlashes, getRepositoryForFile, notebookCellRangeString, rangeString } from './links';
+import { encodeURIComponentExceptSlashes, ensurePublished, getRepositoryForFile, notebookCellRangeString, rangeString } from './links';
 
 export class VscodeDevShareProvider implements vscode.ShareProvider, vscode.Disposable {
 	readonly id: string = 'copyVscodeDevLink';
@@ -63,12 +63,14 @@ export class VscodeDevShareProvider implements vscode.ShareProvider, vscode.Disp
 		}
 	}
 
-	provideShare(item: vscode.ShareableItem, _token: vscode.CancellationToken): vscode.ProviderResult<vscode.Uri> {
+	async provideShare(item: vscode.ShareableItem, _token: vscode.CancellationToken): Promise<vscode.Uri | undefined> {
 		const repository = getRepositoryForFile(this.gitAPI, item.resourceUri);
 		if (!repository) {
 			return;
 		}
 
+		await ensurePublished(repository, item.resourceUri);
+
 		let repo: { owner: string; repo: string } | undefined;
 		repository.state.remotes.find(remote => {
 			if (remote.fetchUrl) {