Merge remote-tracking branch 'origin/main' into pr/r3m0t/181949

Author: rebornix

.github/workflows/rich-navigation.yml

@@ -1,7 +1,6 @@
 name: "Rich Navigation Indexing"
 on:
   workflow_dispatch:
-  pull_request:
   push:
     branches:
       - main

.vscode/settings.json

@@ -17,7 +17,6 @@
 	},
 	"search.exclude": {
 		"**/node_modules": true,
-		"**/bower_components": true,
 		"cli/target/**": true,
 		".build/**": true,
 		"out/**": true,
@@ -34,6 +33,18 @@
 		"src/vs/workbench/api/test/browser/extHostDocumentData.test.perf-data.ts": true,
 		"src/vs/editor/test/node/diffing/fixtures/**": true,
 	},
+	"files.readonlyInclude": {
+		"**/node_modules/**": true,
+		"out/**": true,
+		"out-build/**": true,
+		"out-vscode/**": true,
+		"out-vscode-reh/**": true,
+		"extensions/**/dist/**": true,
+		"extensions/**/out/**": true,
+		"test/smoke/out/**": true,
+		"test/automation/out/**": true,
+		"test/integration/browser/out/**": true,
+	},
 	"lcov.path": [
 		"./.build/coverage/lcov.info",
 		"./.build/coverage-single/lcov.info"

build/lib/electron.js

@@ -91,7 +91,7 @@ function darwinBundleDocumentTypes(types: { [name: string]: string | string[] },
 }
 
 export const config = {
-	version: product.electronRepository ? '22.5.1' : util.getElectronVersion(),
+	version: product.electronRepository ? '22.5.2' : util.getElectronVersion(),
 	productAppName: product.nameLong,
 	companyName: 'Microsoft Corporation',
 	copyright: 'Copyright (C) 2023 Microsoft. All rights reserved',
@@ -212,7 +212,7 @@ function getElectron(arch: string): () => NodeJS.ReadWriteStream {
 }
 
 async function main(arch = process.arch): Promise<void> {
-	const version = product.electronRepository ? '22.5.1' : util.getElectronVersion();
+	const version = product.electronRepository ? '22.5.2' : util.getElectronVersion();
 	const electronPath = path.join(root, '.build', 'electron');
 	const versionFile = path.join(electronPath, 'version');
 	const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`;

build/lib/electron.ts

@@ -59,10 +59,10 @@ export function getOctokit(): Promise<Octokit> {
 
 let _octokitGraphql: Promise<graphql> | undefined;
 
-export async function getOctokitGraphql(): Promise<graphql> {
+export async function getOctokitGraphql(silent = false): Promise<graphql> {
 	if (!_octokitGraphql) {
 		try {
-			const session = await authentication.getSession('github', scopes, { createIfNone: false });
+			const session = await authentication.getSession('github', scopes, { silent });
 
 			if (!session) {
 				throw new AuthenticationError('No GitHub authentication session available.');

extensions/github/src/auth.ts

@@ -114,25 +114,32 @@ export class GithubBranchProtectionProvider implements BranchProtectionProvider
 		// Restore branch protection from global state
 		this.branchProtection = this.globalState.get<BranchProtection[]>(this.globalStateKey, []);
 
-		repository.status().then(() => this.updateRepositoryBranchProtection());
+		repository.status().then(() => {
+			authentication.onDidChangeSessions(e => {
+				if (e.provider.id === 'github') {
+					this.updateRepositoryBranchProtection(true);
+				}
+			});
+			this.updateRepositoryBranchProtection();
+		});
 	}
 
 	provideBranchProtection(): BranchProtection[] {
 		return this.branchProtection;
 	}
 
-	private async getRepositoryDetails(owner: string, repo: string): Promise<GitHubRepository> {
-		const graphql = await getOctokitGraphql();
+	private async getRepositoryDetails(owner: string, repo: string, silent: boolean): Promise<GitHubRepository> {
+		const graphql = await getOctokitGraphql(silent);
 		const { repository } = await graphql<{ repository: GitHubRepository }>(REPOSITORY_QUERY, { owner, repo });
 
 		return repository;
 	}
 
-	private async getRepositoryRulesets(owner: string, repo: string): Promise<RepositoryRuleset[]> {
+	private async getRepositoryRulesets(owner: string, repo: string, silent: boolean): Promise<RepositoryRuleset[]> {
 		const rulesets: RepositoryRuleset[] = [];
 
 		let cursor: string | undefined = undefined;
-		const graphql = await getOctokitGraphql();
+		const graphql = await getOctokitGraphql(silent);
 
 		while (true) {
 			const { repository } = await graphql<{ repository: GitHubRepository }>(REPOSITORY_RULESETS_QUERY, { owner, repo, cursor });
@@ -151,10 +158,10 @@ export class GithubBranchProtectionProvider implements BranchProtectionProvider
 		return rulesets;
 	}
 
-	private async updateRepositoryBranchProtection(): Promise<void> {
-		try {
-			const branchProtection: BranchProtection[] = [];
+	private async updateRepositoryBranchProtection(silent = false): Promise<void> {
+		const branchProtection: BranchProtection[] = [];
 
+		try {
 			for (const remote of this.repository.state.remotes) {
 				const repository = getRepositoryFromUrl(remote.pushUrl ?? remote.fetchUrl ?? '');
 
@@ -164,7 +171,7 @@ export class GithubBranchProtectionProvider implements BranchProtectionProvider
 
 				// Repository details
 				this.logger.trace(`Fetching repository details for "${repository.owner}/${repository.repo}".`);
-				const repositoryDetails = await this.getRepositoryDetails(repository.owner, repository.repo);
+				const repositoryDetails = await this.getRepositoryDetails(repository.owner, repository.repo, silent);
 
 				// Check repository write permission
 				if (repositoryDetails.viewerPermission !== 'ADMIN' && repositoryDetails.viewerPermission !== 'MAINTAIN' && repositoryDetails.viewerPermission !== 'WRITE') {
@@ -174,7 +181,7 @@ export class GithubBranchProtectionProvider implements BranchProtectionProvider
 
 				// Get repository rulesets
 				const branchProtectionRules: BranchProtectionRule[] = [];
-				const repositoryRulesets = await this.getRepositoryRulesets(repository.owner, repository.repo);
+				const repositoryRulesets = await this.getRepositoryRulesets(repository.owner, repository.repo, silent);
 
 				for (const ruleset of repositoryRulesets) {
 					branchProtectionRules.push({
@@ -193,19 +200,17 @@ export class GithubBranchProtectionProvider implements BranchProtectionProvider
 			await this.globalState.update(this.globalStateKey, branchProtection);
 			this.logger.trace(`Branch protection for "${this.repository.rootUri.toString()}": ${JSON.stringify(branchProtection)}.`);
 		} catch (err) {
+			this.logger.warn(`Failed to update repository branch protection: ${err.message}`);
+
 			if (err instanceof AuthenticationError) {
-				// Since there is no GitHub authentication session available we need to wait
-				// until the user signs in with their GitHub account so that we can query the
-				// repository rulesets
-				const disposable = authentication.onDidChangeSessions(e => {
-					if (e.provider.id === 'github') {
-						disposable.dispose();
-						this.updateRepositoryBranchProtection();
-					}
-				});
-			}
+				// A GitHub authentication session could be missing if the user has not yet
+				// signed in with their GitHub account or they have signed out. In this case
+				// we have to clear the branch protection information.
+				this.branchProtection = branchProtection;
+				this._onDidChangeBranchProtection.fire(this.repository.rootUri);
 
-			this.logger.warn(`Failed to update repository branch protection: ${err.message}`);
+				await this.globalState.update(this.globalStateKey, undefined);
+			}
 		}
 	}
 

extensions/github/src/branchProtection.ts

@@ -18,6 +18,16 @@ enum MimeType {
 	uriList = 'text/uri-list',
 }
 
+const imageMimeTypes: ReadonlySet<string> = new Set<string>([
+	MimeType.bmp,
+	MimeType.gif,
+	MimeType.ico,
+	MimeType.jpeg,
+	MimeType.png,
+	MimeType.tiff,
+	MimeType.webp,
+]);
+
 const imageExtToMime: ReadonlyMap<string, string> = new Map<string, string>([
 	['.bmp', MimeType.bmp],
 	['.gif', MimeType.gif],
@@ -35,6 +45,7 @@ function getImageMimeType(uri: vscode.Uri): string | undefined {
 	return imageExtToMime.get(extname(uri.fsPath).toLowerCase());
 }
 
+const id = 'insertAttachment';
 class CopyPasteEditProvider implements vscode.DocumentPasteEditProvider {
 
 	async provideDocumentPasteEdits(
@@ -43,7 +54,7 @@ class CopyPasteEditProvider implements vscode.DocumentPasteEditProvider {
 		dataTransfer: vscode.DataTransfer,
 		token: vscode.CancellationToken,
 	): Promise<vscode.DocumentPasteEdit | undefined> {
-		const enabled = vscode.workspace.getConfiguration('ipynb', document).get('pasteImagesAsAttachments.enabled', false);
+		const enabled = vscode.workspace.getConfiguration('ipynb', document).get('pasteImagesAsAttachments.enabled', true);
 		if (!enabled) {
 			return;
 		}
@@ -53,7 +64,7 @@ class CopyPasteEditProvider implements vscode.DocumentPasteEditProvider {
 			return;
 		}
 
-		const pasteEdit = new vscode.DocumentPasteEdit(insert.insertText, vscode.l10n.t('Insert Image as Attachment'));
+		const pasteEdit = new vscode.DocumentPasteEdit(insert.insertText, id, vscode.l10n.t('Insert Image as Attachment'));
 		pasteEdit.additionalEdit = insert.additionalEdit;
 		return pasteEdit;
 	}
@@ -73,6 +84,7 @@ class DropEditProvider implements vscode.DocumentDropEditProvider {
 		}
 
 		const dropEdit = new vscode.DocumentDropEdit(insert.insertText);
+		dropEdit.id = id;
 		dropEdit.additionalEdit = insert.additionalEdit;
 		dropEdit.label = vscode.l10n.t('Insert Image as Attachment');
 		return dropEdit;
@@ -126,16 +138,21 @@ async function getDroppedImageData(
 ): Promise<readonly ImageAttachmentData[]> {
 
 	// Prefer using image data in the clipboard
-	// TODO: dataTransfer.get() limits to one image pasted. Should we support multiple?
-	const pngDataItem = dataTransfer.get(MimeType.png);
-	if (pngDataItem) {
-		const fileItem = pngDataItem.asFile();
-		if (!fileItem) {
-			return [];
+	const files = coalesce(await Promise.all(Array.from(dataTransfer, async ([mimeType, item]): Promise<ImageAttachmentData | undefined> => {
+		if (!imageMimeTypes.has(mimeType)) {
+			return;
+		}
+
+		const file = item.asFile();
+		if (!file) {
+			return;
 		}
 
-		const data = await fileItem.data();
-		return [{ fileName: fileItem.name, mimeType: MimeType.png, data }];
+		const data = await file.data();
+		return { fileName: file.name, mimeType, data };
+	})));
+	if (files.length) {
+		return files;
 	}
 
 	// Then fallback to image files in the uri-list
@@ -287,7 +304,6 @@ export function notebookImagePasteSetup(): vscode.Disposable {
 			],
 		}),
 		vscode.languages.registerDocumentDropEditProvider(JUPYTER_NOTEBOOK_MARKDOWN_SELECTOR, new DropEditProvider(), {
-			id: 'imageAttachment',
 			dropMimeTypes: [
 				...Object.values(imageExtToMime),
 				MimeType.uriList,

extensions/ipynb/src/notebookImagePaste.ts

@@ -15,7 +15,7 @@
     "@vscode/l10n": "^0.0.13",
     "jsonc-parser": "^3.2.0",
     "request-light": "^0.7.0",
-    "vscode-json-languageservice": "^5.3.4",
+    "vscode-json-languageservice": "^5.3.5",
     "vscode-languageserver": "^8.2.0-next.0",
     "vscode-uri": "^3.0.7"
   },

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

@@ -27,10 +27,10 @@ request-light@^0.7.0:
   resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.7.0.tgz#885628bb2f8040c26401ebf258ec51c4ae98ac2a"
   integrity sha512-lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q==
 
-vscode-json-languageservice@^5.3.4:
-  version "5.3.4"
-  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-5.3.4.tgz#a37c8443ab458e0141d83bb080ce9c363b0fed8b"
-  integrity sha512-GSsHCrv1XBXJDI5DrCi8adEjv+yqZi21TsWs1pJo0cIEmiSVnf3V+v/kiVt0DHvSm9MuRYNjvMfDTW8m5Zpi8Q==
+vscode-json-languageservice@^5.3.5:
+  version "5.3.5"
+  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-5.3.5.tgz#20acd827e13ea4bdeb9976df84ec2bfbb2452c73"
+  integrity sha512-DasT+bKtpaS2rTPEB4VMROnvO1WES2KD8RZZxXbumnk9sk5wco10VdB6sJgTlsKQN14tHQLZDXuHnSoSAlE8LQ==
   dependencies:
     "@vscode/l10n" "^0.0.13"
     jsonc-parser "^3.2.0"

extensions/json-language-features/server/yarn.lock

@@ -8,23 +8,42 @@ import * as vscode from 'vscode';
 import { Utils } from 'vscode-uri';
 import { getParentDocumentUri } from './dropIntoEditor';
 
+export class NewFilePathGenerator {
 
-export async function getNewFileName(document: vscode.TextDocument, file: vscode.DataTransferFile): Promise<vscode.Uri> {
-	const desiredPath = getDesiredNewFilePath(document, file);
-
-	const root = Utils.dirname(desiredPath);
-	const ext = path.extname(file.name);
-	const baseName = path.basename(file.name, ext);
-	for (let i = 0; ; ++i) {
-		const name = i === 0 ? baseName : `${baseName}-${i}`;
-		const uri = vscode.Uri.joinPath(root, `${name}${ext}`);
-		try {
-			await vscode.workspace.fs.stat(uri);
-		} catch {
-			// Does not exist
-			return uri;
+	private readonly _usedPaths = new Set<string>();
+
+	async getNewFilePath(document: vscode.TextDocument, file: vscode.DataTransferFile, token: vscode.CancellationToken): Promise<vscode.Uri | undefined> {
+		const desiredPath = getDesiredNewFilePath(document, file);
+
+		const root = Utils.dirname(desiredPath);
+		const ext = path.extname(file.name);
+		const baseName = path.basename(file.name, ext);
+		for (let i = 0; ; ++i) {
+			if (token.isCancellationRequested) {
+				return undefined;
+			}
+
+			const name = i === 0 ? baseName : `${baseName}-${i}`;
+			const uri = vscode.Uri.joinPath(root, name + ext);
+			if (this._wasPathAlreadyUsed(uri)) {
+				continue;
+			}
+
+			try {
+				await vscode.workspace.fs.stat(uri);
+			} catch {
+				if (!this._wasPathAlreadyUsed(uri)) {
+					// Does not exist
+					this._usedPaths.add(uri.toString());
+					return uri;
+				}
+			}
 		}
 	}
+
+	private _wasPathAlreadyUsed(uri: vscode.Uri) {
+		return this._usedPaths.has(uri.toString());
+	}
 }
 
 function getDesiredNewFilePath(document: vscode.TextDocument, file: vscode.DataTransferFile): vscode.Uri {