Merge branch 'microsoft:main' into main

malik1u · Aug 9, 2023 · 4ff51d9 · 4ff51d9
2 parents f735065 + bf9c810
commit 4ff51d9
Show file tree

Hide file tree

Showing 116 changed files with 785 additions and 563 deletions.
diff --git a/extensions/markdown-language-features/src/extension.shared.ts b/extensions/markdown-language-features/src/extension.shared.ts
@@ -7,10 +7,10 @@ import * as vscode from 'vscode';
 import { MdLanguageClient } from './client/client';
 import { CommandManager } from './commandManager';
 import { registerMarkdownCommands } from './commands/index';
-import { registerPasteSupport } from './languageFeatures/copyFiles/copyPaste';
-import { registerLinkPasteSupport } from './languageFeatures/copyFiles/copyPasteLinks';
+import { registerPasteSupport } from './languageFeatures/copyFiles/pasteResourceProvider';
+import { registerLinkPasteSupport } from './languageFeatures/copyFiles/pasteUrlProvider';
 import { registerDiagnosticSupport } from './languageFeatures/diagnostics';
-import { registerDropIntoEditorSupport } from './languageFeatures/copyFiles/dropIntoEditor';
+import { registerDropIntoEditorSupport } from './languageFeatures/copyFiles/dropResourceProvider';
 import { registerFindFileReferenceSupport } from './languageFeatures/fileReferences';
 import { registerUpdateLinksOnRename } from './languageFeatures/linkUpdater';
 import { ILogger } from './logging';

diff --git a/...guageFeatures/copyFiles/dropIntoEditor.ts → ...eatures/copyFiles/dropResourceProvider.ts b/...guageFeatures/copyFiles/dropIntoEditor.ts → ...eatures/copyFiles/dropResourceProvider.ts
@@ -4,14 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { createEditForMediaFiles as createEditForMediaFiles, mediaMimes, tryGetUriListSnippet } from './shared';
+import { Mime, mediaMimes } from '../../util/mimes';
 import { Schemes } from '../../util/schemes';
+import { createEditForMediaFiles, tryGetUriListSnippet } from './shared';
 
-
-class MarkdownImageDropProvider implements vscode.DocumentDropEditProvider {
+class ResourceDropProvider implements vscode.DocumentDropEditProvider {
 
 	public static readonly id = 'insertLink';
 
+	public static readonly dropMimeTypes = [
+		Mime.textUriList,
+		...mediaMimes,
+	];
+
 	private readonly _yieldTo = [
 		{ mimeType: 'text/plain' },
 		{ extensionId: 'vscode.ipynb', providerId: 'insertAttachment' },
@@ -36,10 +41,11 @@ class MarkdownImageDropProvider implements vscode.DocumentDropEditProvider {
 	}
 
 	private async _getUriListEdit(document: vscode.TextDocument, dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken): Promise<vscode.DocumentDropEdit | undefined> {
-		const urlList = await dataTransfer.get('text/uri-list')?.asString();
-		if (!urlList) {
+		const urlList = await dataTransfer.get(Mime.textUriList)?.asString();
+		if (!urlList || token.isCancellationRequested) {
 			return undefined;
 		}
+
 		const snippet = await tryGetUriListSnippet(document, urlList, token);
 		if (!snippet) {
 			return undefined;
@@ -61,25 +67,19 @@ class MarkdownImageDropProvider implements vscode.DocumentDropEditProvider {
 			return;
 		}
 
-		const filesEdit = await createEditForMediaFiles(document, dataTransfer, token);
-		if (!filesEdit) {
+		const edit = await createEditForMediaFiles(document, dataTransfer, token);
+		if (!edit) {
 			return;
 		}
 
-		const edit = new vscode.DocumentDropEdit(filesEdit.snippet);
-		edit.label = filesEdit.label;
-		edit.additionalEdit = filesEdit.additionalEdits;
-		edit.yieldTo = this._yieldTo;
-		return edit;
+		const dropEdit = new vscode.DocumentDropEdit(edit.snippet);
+		dropEdit.label = edit.label;
+		dropEdit.additionalEdit = edit.additionalEdits;
+		dropEdit.yieldTo = this._yieldTo;
+		return dropEdit;
 	}
 }
 
 export function registerDropIntoEditorSupport(selector: vscode.DocumentSelector) {
-	return vscode.languages.registerDocumentDropEditProvider(selector, new MarkdownImageDropProvider(), {
-		id: MarkdownImageDropProvider.id,
-		dropMimeTypes: [
-			'text/uri-list',
-			...mediaMimes,
-		]
-	});
+	return vscode.languages.registerDocumentDropEditProvider(selector, new ResourceDropProvider(), ResourceDropProvider);
 }
diff --git a/...c/languageFeatures/copyFiles/copyPaste.ts → ...atures/copyFiles/pasteResourceProvider.ts b/...c/languageFeatures/copyFiles/copyPaste.ts → ...atures/copyFiles/pasteResourceProvider.ts
@@ -4,13 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
+import { Mime, mediaMimes } from '../../util/mimes';
 import { Schemes } from '../../util/schemes';
-import { createEditForMediaFiles, createEditAddingLinksForUriList, mediaMimes, getPasteUrlAsFormattedLinkSetting, PasteUrlAsFormattedLink } from './shared';
+import { PasteUrlAsFormattedLink, createEditAddingLinksForUriList, createEditForMediaFiles, getPasteUrlAsFormattedLinkSetting } from './shared';
 
-class PasteEditProvider implements vscode.DocumentPasteEditProvider {
+class PasteResourceEditProvider implements vscode.DocumentPasteEditProvider {
 
 	public static readonly id = 'insertLink';
 
+	public static readonly pasteMimeTypes = [
+		Mime.textUriList,
+		...mediaMimes,
+	];
+
 	private readonly _yieldTo = [
 		{ mimeType: 'text/plain' },
 		{ extensionId: 'vscode.ipynb', providerId: 'insertAttachment' },
@@ -32,19 +38,26 @@ class PasteEditProvider implements vscode.DocumentPasteEditProvider {
 			return createEdit;
 		}
 
-		const uriEdit = new vscode.DocumentPasteEdit('', '');
-		const urlList = await dataTransfer.get('text/uri-list')?.asString();
-		if (!urlList) {
+		if (token.isCancellationRequested) {
+			return;
+		}
+
+		return this._getUriListEdit(document, ranges, dataTransfer, token);
+	}
+
+	private async _getUriListEdit(document: vscode.TextDocument, ranges: readonly vscode.Range[], dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken): Promise<vscode.DocumentPasteEdit | undefined> {
+		const uriList = await dataTransfer.get(Mime.textUriList)?.asString();
+		if (!uriList || token.isCancellationRequested) {
 			return;
 		}
 
 		const pasteUrlSetting = getPasteUrlAsFormattedLinkSetting(document);
-		const pasteEdit = await createEditAddingLinksForUriList(document, ranges, urlList, false, pasteUrlSetting === PasteUrlAsFormattedLink.Smart, token);
+		const pasteEdit = await createEditAddingLinksForUriList(document, ranges, uriList, false, pasteUrlSetting === PasteUrlAsFormattedLink.Smart, token);
 		if (!pasteEdit) {
 			return;
 		}
 
-		uriEdit.label = pasteEdit.label;
+		const uriEdit = new vscode.DocumentPasteEdit('', pasteEdit.label);
 		uriEdit.additionalEdit = pasteEdit.additionalEdits;
 		uriEdit.yieldTo = this._yieldTo;
 		return uriEdit;
@@ -73,11 +86,5 @@ class PasteEditProvider implements vscode.DocumentPasteEditProvider {
 }
 
 export function registerPasteSupport(selector: vscode.DocumentSelector,) {
-	return vscode.languages.registerDocumentPasteEditProvider(selector, new PasteEditProvider(), {
-		id: PasteEditProvider.id,
-		pasteMimeTypes: [
-			'text/uri-list',
-			...mediaMimes,
-		]
-	});
+	return vscode.languages.registerDocumentPasteEditProvider(selector, new PasteResourceEditProvider(), PasteResourceEditProvider);
 }
diff --git a/...guageFeatures/copyFiles/copyPasteLinks.ts → ...ageFeatures/copyFiles/pasteUrlProvider.ts b/...guageFeatures/copyFiles/copyPasteLinks.ts → ...ageFeatures/copyFiles/pasteUrlProvider.ts
@@ -4,14 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
+import { Mime } from '../../util/mimes';
 import { createEditAddingLinksForUriList, getPasteUrlAsFormattedLinkSetting, PasteUrlAsFormattedLink, validateLink } from './shared';
 
-const textPlainMime = 'text/plain';
-
-class PasteLinkEditProvider implements vscode.DocumentPasteEditProvider {
+class PasteUrlEditProvider implements vscode.DocumentPasteEditProvider {
 
 	public static readonly id = 'insertMarkdownLink';
 
+	public static readonly pasteMimeTypes = [
+		Mime.textPlain,
+	];
+
 	async provideDocumentPasteEdits(
 		document: vscode.TextDocument,
 		ranges: readonly vscode.Range[],
@@ -23,7 +26,7 @@ class PasteLinkEditProvider implements vscode.DocumentPasteEditProvider {
 			return;
 		}
 
-		const item = dataTransfer.get(textPlainMime);
+		const item = dataTransfer.get(Mime.textPlain);
 		const urlList = await item?.asString();
 		if (token.isCancellationRequested || !urlList || !validateLink(urlList).isValid) {
 			return;
@@ -36,14 +39,11 @@ class PasteLinkEditProvider implements vscode.DocumentPasteEditProvider {
 
 		const edit = new vscode.DocumentPasteEdit('', pasteEdit.label);
 		edit.additionalEdit = pasteEdit.additionalEdits;
-		edit.yieldTo = pasteEdit.markdownLink ? undefined : [{ mimeType: textPlainMime }];
+		edit.yieldTo = pasteEdit.markdownLink ? undefined : [{ mimeType: Mime.textPlain }];
 		return edit;
 	}
 }
 
 export function registerLinkPasteSupport(selector: vscode.DocumentSelector,) {
-	return vscode.languages.registerDocumentPasteEditProvider(selector, new PasteLinkEditProvider(), {
-		id: PasteLinkEditProvider.id,
-		pasteMimeTypes: [textPlainMime]
-	});
+	return vscode.languages.registerDocumentPasteEditProvider(selector, new PasteUrlEditProvider(), PasteUrlEditProvider);
 }
diff --git a/extensions/markdown-language-features/src/languageFeatures/copyFiles/shared.ts b/extensions/markdown-language-features/src/languageFeatures/copyFiles/shared.ts
@@ -6,10 +6,11 @@
 import * as path from 'path';
 import * as vscode from 'vscode';
 import * as URI from 'vscode-uri';
-import { Schemes } from '../../util/schemes';
-import { NewFilePathGenerator } from './copyFiles';
 import { coalesce } from '../../util/arrays';
 import { getDocumentDir } from '../../util/document';
+import { mediaMimes } from '../../util/mimes';
+import { Schemes } from '../../util/schemes';
+import { NewFilePathGenerator } from './copyFiles';
 
 enum MediaKind {
 	Image,
@@ -49,19 +50,6 @@ export const mediaFileExtensions = new Map<string, MediaKind>([
 	['wav', MediaKind.Audio],
 ]);
 
-export const mediaMimes = new Set([
-	'image/bmp',
-	'image/gif',
-	'image/jpeg',
-	'image/png',
-	'image/webp',
-	'video/mp4',
-	'video/ogg',
-	'audio/mpeg',
-	'audio/aac',
-	'audio/x-wav',
-]);
-
 const smartPasteRegexes = [
 	{ regex: /(\[[^\[\]]*](?:\([^\(\)]*\)|\[[^\[\]]*]))/g }, // In a Markdown link
 	{ regex: /^```[\s\S]*?```$/gm }, // In a backtick fenced code block

diff --git a/extensions/markdown-language-features/src/util/mimes.ts b/extensions/markdown-language-features/src/util/mimes.ts
@@ -0,0 +1,22 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export const Mime = {
+	textUriList: 'text/uri-list',
+	textPlain: 'text/plain',
+} as const;
+
+export const mediaMimes = new Set([
+	'image/bmp',
+	'image/gif',
+	'image/jpeg',
+	'image/png',
+	'image/webp',
+	'video/mp4',
+	'video/ogg',
+	'audio/mpeg',
+	'audio/aac',
+	'audio/x-wav',
+]);
diff --git a/extensions/theme-defaults/themes/dark_modern.json b/extensions/theme-defaults/themes/dark_modern.json
@@ -16,9 +16,9 @@
 		"button.border": "#FFFFFF12",
 		"button.foreground": "#FFFFFF",
 		"button.hoverBackground": "#026EC1",
-		"button.secondaryBackground": "#1F1F1F",
+		"button.secondaryBackground": "#313131",
 		"button.secondaryForeground": "#CCCCCC",
-		"button.secondaryHoverBackground": "#2B2B2B",
+		"button.secondaryHoverBackground": "#3C3C3C",
 		"chat.slashCommandBackground": "#3E4C56",
 		"chat.slashCommandForeground": "#7FC3FF",
 		"checkbox.background": "#313131",

diff --git a/extensions/theme-defaults/themes/light_modern.json b/extensions/theme-defaults/themes/light_modern.json
@@ -18,7 +18,7 @@
 		"button.hoverBackground": "#0258A8",
 		"button.secondaryBackground": "#E5E5E5",
 		"button.secondaryForeground": "#3B3B3B",
-		"button.secondaryHoverBackground": "#CBCBCB",
+		"button.secondaryHoverBackground": "#CCCCCC",
 		"chat.slashCommandBackground": "#D2ECFF",
 		"chat.slashCommandForeground": "#306CA2",
 		"checkbox.background": "#F8F8F8",

diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
@@ -15,7 +15,6 @@ import { KeyCode } from 'vs/base/common/keyCodes';
 import { Disposable, DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { FileAccess, RemoteAuthorities, Schemas } from 'vs/base/common/network';
 import * as platform from 'vs/base/common/platform';
-import { withNullAsUndefined } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
 
 export function clearNode(node: HTMLElement): void {
@@ -1284,7 +1283,7 @@ export function triggerUpload(): Promise<FileList | undefined> {
 
 		// Resolve once the input event has fired once
 		event.Event.once(event.Event.fromDOMEventEmitter(input, 'input'))(() => {
-			resolve(withNullAsUndefined(input.files));
+			resolve(input.files ?? undefined);
 		});
 
 		input.click();

diff --git a/src/vs/base/browser/ui/menu/menubar.ts b/src/vs/base/browser/ui/menu/menubar.ts
@@ -20,7 +20,6 @@ import { ResolvedKeybinding } from 'vs/base/common/keybindings';
 import { Disposable, dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { isMacintosh } from 'vs/base/common/platform';
 import * as strings from 'vs/base/common/strings';
-import { withNullAsUndefined } from 'vs/base/common/types';
 import 'vs/css!./menubar';
 import * as nls from 'vs/nls';
 
@@ -1020,7 +1019,7 @@ export class MenuBar extends Disposable {
 			getKeyBinding: this.options.getKeybinding,
 			actionRunner: this.actionRunner,
 			enableMnemonics: this.options.alwaysOnMnemonics || (this.mnemonicsInUse && this.options.enableMnemonics),
-			ariaLabel: withNullAsUndefined(customMenu.buttonElement.getAttribute('aria-label')),
+			ariaLabel: customMenu.buttonElement.getAttribute('aria-label') ?? undefined,
 			expandDirection: this.isCompact ? this.options.compactMode : Direction.Right,
 			useEventAsContext: true
 		};

diff --git a/src/vs/base/browser/ui/toolbar/toolbar.ts b/src/vs/base/browser/ui/toolbar/toolbar.ts
@@ -13,7 +13,6 @@ import { ThemeIcon } from 'vs/base/common/themables';
 import { EventMultiplexer } from 'vs/base/common/event';
 import { ResolvedKeybinding } from 'vs/base/common/keybindings';
 import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
-import { withNullAsUndefined } from 'vs/base/common/types';
 import 'vs/css!./toolbar';
 import * as nls from 'vs/nls';
 
@@ -196,7 +195,7 @@ export class ToolBar extends Disposable {
 	private getKeybindingLabel(action: IAction): string | undefined {
 		const key = this.lookupKeybindings ? this.options.getKeyBinding?.(action) : undefined;
 
-		return withNullAsUndefined(key?.getLabel());
+		return key?.getLabel() ?? undefined;
 	}
 
 	private clear(): void {

diff --git a/src/vs/base/common/types.ts b/src/vs/base/common/types.ts
@@ -190,14 +190,6 @@ export function validateConstraint(arg: unknown, constraint: TypeConstraint | un
 	}
 }
 
-/**
- * Converts null to undefined, passes all other values through.
- */
-export function withNullAsUndefined<T>(x: T | null): T | undefined {
-	return x === null ? undefined : x;
-}
-
-
 type AddFirstParameterToFunction<T, TargetFunctionsReturnType, FirstParameter> = T extends (...args: any[]) => TargetFunctionsReturnType ?
 	// Function: add param to function
 	(firstArg: FirstParameter, ...args: Parameters<T>) => ReturnType<T> :

diff --git a/src/vs/base/parts/contextmenu/electron-main/contextmenu.ts b/src/vs/base/parts/contextmenu/electron-main/contextmenu.ts
@@ -5,15 +5,14 @@
 
 import { BrowserWindow, IpcMainEvent, Menu, MenuItem } from 'electron';
 import { validatedIpcMain } from 'vs/base/parts/ipc/electron-main/ipcMain';
-import { withNullAsUndefined } from 'vs/base/common/types';
 import { CONTEXT_MENU_CHANNEL, CONTEXT_MENU_CLOSE_CHANNEL, IPopupOptions, ISerializableContextMenuItem } from 'vs/base/parts/contextmenu/common/contextmenu';
 
 export function registerContextMenuListener(): void {
 	validatedIpcMain.on(CONTEXT_MENU_CHANNEL, (event: IpcMainEvent, contextMenuId: number, items: ISerializableContextMenuItem[], onClickChannel: string, options?: IPopupOptions) => {
 		const menu = createMenu(event, onClickChannel, items);
 
 		menu.popup({
-			window: withNullAsUndefined(BrowserWindow.fromWebContents(event.sender)),
+			window: BrowserWindow.fromWebContents(event.sender) ?? undefined,
 			x: options ? options.x : undefined,
 			y: options ? options.y : undefined,
 			positioningItem: options ? options.positioningItem : undefined,

diff --git a/src/vs/code/electron-main/auth.ts b/src/vs/code/electron-main/auth.ts
@@ -8,7 +8,6 @@ import { CancellationToken } from 'vs/base/common/cancellation';
 import { Event } from 'vs/base/common/event';
 import { hash } from 'vs/base/common/hash';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { withNullAsUndefined } from 'vs/base/common/types';
 import { generateUuid } from 'vs/base/common/uuid';
 import { ICredentialsMainService } from 'vs/platform/credentials/common/credentials';
 import { IEncryptionMainService } from 'vs/platform/encryption/common/encryptionService';
@@ -153,7 +152,7 @@ export class ProxyAuthHandler extends Disposable {
 			let encryptedSerializedProxyCredentials = this.applicationStorageMainService.get(this.PROXY_CREDENTIALS_SERVICE_KEY + authInfoHash, StorageScope.APPLICATION);
 			let decryptedSerializedProxyCredentials: string | undefined;
 			if (!encryptedSerializedProxyCredentials) {
-				encryptedSerializedProxyCredentials = withNullAsUndefined(await this.credentialsService.getPassword(this.OLD_PROXY_CREDENTIALS_SERVICE_KEY, authInfoHash));
+				encryptedSerializedProxyCredentials = await this.credentialsService.getPassword(this.OLD_PROXY_CREDENTIALS_SERVICE_KEY, authInfoHash) ?? undefined;
 				if (encryptedSerializedProxyCredentials) {
 					// re-encrypt to force new encryption algorithm to apply
 					decryptedSerializedProxyCredentials = await this.encryptionMainService.decrypt(encryptedSerializedProxyCredentials);