Merge from vscode e5834d3280fcd04898efeac32b9cf1b893f9b127 (#9385)

* Merge from vscode e5834d3280fcd04898efeac32b9cf1b893f9b127

* distro

src/vs/base/browser/ui/codiconLabel/codicon/codicon.css

@@ -5,7 +5,7 @@
 
 @font-face {
 	font-family: "codicon";
-	src: url("./codicon.ttf?279add2ec8b3d516ca20a123230cbf9f") format("truetype");
+	src: url("./codicon.ttf?b5dd8f5aa953889dc1f4c9fa9b44d3dd") format("truetype");
 }
 
 .codicon[class*='codicon-'] {
@@ -415,5 +415,6 @@
 .codicon-group-by-ref-type:before { content: "\eb97" }
 .codicon-ungroup-by-ref-type:before { content: "\eb98" }
 .codicon-bell-dot:before { content: "\f101" }
-.codicon-debug-alt-2:before { content: "\f102" }
-.codicon-debug-alt:before { content: "\f103" }
+.codicon-bell-progress:before { content: "\f102" }
+.codicon-debug-alt-2:before { content: "\f103" }
+.codicon-debug-alt:before { content: "\f104" }

src/vs/base/browser/ui/list/listView.ts

@@ -554,7 +554,7 @@ export class ListView<T> implements ISpliceable<T>, IDisposable {
 
 		if (!item.row) {
 			item.row = this.cache.alloc(item.templateId);
-			const role = this.ariaProvider.getRole ? this.ariaProvider.getRole(item.element) : 'treeitem';
+			const role = this.ariaProvider.getRole ? this.ariaProvider.getRole(item.element) : 'listitem';
 			item.row!.domNode!.setAttribute('role', role);
 			const checked = this.ariaProvider.isChecked ? this.ariaProvider.isChecked(item.element) : undefined;
 			if (typeof checked !== 'undefined') {

src/vs/base/browser/ui/tree/abstractTree.ts

@@ -196,7 +196,7 @@ function asListOptions<T, TFilterData, TRef>(modelProvider: () => ITreeModel<T,
 			} : undefined,
 			getRole: options.ariaProvider && options.ariaProvider.getRole ? (node) => {
 				return options.ariaProvider!.getRole!(node.element);
-			} : undefined
+			} : () => 'treeitem'
 		}
 	};
 }

src/vs/base/browser/ui/tree/asyncDataTree.ts

@@ -267,7 +267,7 @@ function asObjectTreeOptions<TInput, T, TFilterData>(options?: IAsyncDataTreeOpt
 			},
 			getRole: options.ariaProvider!.getRole ? (el) => {
 				return options.ariaProvider!.getRole!(el.element as T);
-			} : undefined,
+			} : () => 'treeitem',
 			isChecked: options.ariaProvider!.isChecked ? (e) => {
 				return options.ariaProvider?.isChecked!(e.element as T);
 			} : undefined

src/vs/base/common/linkedText.ts

@@ -23,7 +23,7 @@ export class LinkedText {
 	}
 }
 
-const LINK_REGEX = /\[([^\]]+)\]\(((?:https?:\/\/|command:)[^\)\s]+)(?: "([^"]+)")?\)/gi;
+const LINK_REGEX = /\[([^\]]+)\]\(((?:https?:\/\/|command:)[^\)\s]+)(?: ("|')([^\3]+)(\3))?\)/gi;
 
 export function parseLinkedText(text: string): LinkedText {
 	const result: LinkedTextNode[] = [];
@@ -36,7 +36,7 @@ export function parseLinkedText(text: string): LinkedText {
 			result.push(text.substring(index, match.index));
 		}
 
-		const [, label, href, title] = match;
+		const [, label, href, , title] = match;
 
 		if (title) {
 			result.push({ label, href, title });

src/vs/base/parts/composite/browser/compositeDnd.ts

@@ -21,4 +21,5 @@ export class CompositeDragAndDropData implements IDragAndDropData {
 export interface ICompositeDragAndDrop {
 	drop(data: IDragAndDropData, target: string | undefined, originalEvent: DragEvent): void;
 	onDragOver(data: IDragAndDropData, target: string | undefined, originalEvent: DragEvent): boolean;
+	onDragEnter(data: IDragAndDropData, target: string | undefined, originalEvent: DragEvent): boolean;
 }

src/vs/base/parts/quickinput/browser/quickInput.ts

@@ -397,7 +397,7 @@ class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPi
 	private _valueSelection: Readonly<[number, number]> | undefined;
 	private valueSelectionUpdated = true;
 	private _validationMessage: string | undefined;
-	private _ok = false;
+	private _ok: boolean | 'default' = 'default';
 	private _customButton = false;
 	private _customButtonLabel: string | undefined;
 	private _customButtonHover: string | undefined;
@@ -566,7 +566,7 @@ class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPi
 		return this._ok;
 	}
 
-	set ok(showOkButton: boolean) {
+	set ok(showOkButton: boolean | 'default') {
 		this._ok = showOkButton;
 		this.update();
 	}
@@ -575,6 +575,10 @@ class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPi
 		return this.visible ? this.ui.inputBox.hasFocus() : false;
 	}
 
+	public focusOnInput() {
+		this.ui.inputBox.setFocus();
+	}
+
 	onDidChangeSelection = this.onDidChangeSelectionEmitter.event;
 
 	onDidTriggerItemButton = this.onDidTriggerItemButtonEmitter.event;
@@ -753,7 +757,8 @@ class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPi
 		if (!this.visible) {
 			return;
 		}
-		this.ui.setVisibilities(this.canSelectMany ? { title: !!this.title || !!this.step, description: !!this.description, checkAll: true, inputBox: true, visibleCount: true, count: true, ok: this.ok, list: true, message: !!this.validationMessage, customButton: this.customButton } : { title: !!this.title || !!this.step, description: !!this.description, inputBox: true, visibleCount: true, list: true, message: !!this.validationMessage, customButton: this.customButton, ok: this.ok });
+		const ok = this.ok === 'default' ? this.canSelectMany : this.ok;
+		this.ui.setVisibilities(this.canSelectMany ? { title: !!this.title || !!this.step, description: !!this.description, checkAll: true, inputBox: true, visibleCount: true, count: true, ok, list: true, message: !!this.validationMessage, customButton: this.customButton } : { title: !!this.title || !!this.step, description: !!this.description, inputBox: true, visibleCount: true, list: true, message: !!this.validationMessage, customButton: this.customButton, ok });
 		super.update();
 		if (this.ui.inputBox.value !== this.value) {
 			this.ui.inputBox.value = this.value;

src/vs/base/parts/quickinput/common/quickInput.ts

@@ -113,7 +113,7 @@ export interface IInputOptions {
 	placeHolder?: string;
 
 	/**
-	 * set to true to show a password prompt that will not show the typed value
+	 * Controls if a password input is shown. Password input hides the typed text.
 	 */
 	password?: boolean;
 
@@ -162,7 +162,7 @@ export interface IQuickPick<T extends IQuickPickItem> extends IQuickInput {
 
 	readonly onDidAccept: Event<void>;
 
-	ok: boolean;
+	ok: boolean | 'default';
 
 	readonly onDidCustom: Event<void>;
 
@@ -209,6 +209,8 @@ export interface IQuickPick<T extends IQuickPickItem> extends IQuickInput {
 	validationMessage: string | undefined;
 
 	inputHasFocus(): boolean;
+
+	focusOnInput(): void;
 }
 
 export interface IInputBox extends IQuickInput {

src/vs/base/parts/storage/common/storage.ts

@@ -27,7 +27,8 @@ export interface IUpdateRequest {
 }
 
 export interface IStorageItemsChangeEvent {
-	items: Map<string, string>;
+	changed?: Map<string, string>;
+	deleted?: Set<string>;
 }
 
 export interface IStorageDatabase {
@@ -104,10 +105,11 @@ export class Storage extends Disposable implements IStorage {
 		// items that change external require us to update our
 		// caches with the values. we just accept the value and
 		// emit an event if there is a change.
-		e.items.forEach((value, key) => this.accept(key, value));
+		e.changed?.forEach((value, key) => this.accept(key, value));
+		e.deleted?.forEach(key => this.accept(key, undefined));
 	}
 
-	private accept(key: string, value: string): void {
+	private accept(key: string, value: string | undefined): void {
 		if (this.state === StorageState.Closed) {
 			return; // Return early if we are already closed
 		}
@@ -315,4 +317,4 @@ export class InMemoryStorageDatabase implements IStorageDatabase {
 	close(): Promise<void> {
 		return Promise.resolve();
 	}
-}
+}

src/vs/base/parts/storage/test/node/storage.test.ts

@@ -124,28 +124,27 @@ suite('Storage Library', () => {
 		changes.clear();
 
 		// Nothing happens if changing to same value
-		const change = new Map<string, string>();
-		change.set('foo', 'bar');
-		database.fireDidChangeItemsExternal({ items: change });
+		const changed = new Map<string, string>();
+		changed.set('foo', 'bar');
+		database.fireDidChangeItemsExternal({ changed });
 		equal(changes.size, 0);
 
 		// Change is accepted if valid
-		change.set('foo', 'bar1');
-		database.fireDidChangeItemsExternal({ items: change });
+		changed.set('foo', 'bar1');
+		database.fireDidChangeItemsExternal({ changed });
 		ok(changes.has('foo'));
 		equal(storage.get('foo'), 'bar1');
 		changes.clear();
 
 		// Delete is accepted
-		change.set('foo', undefined!);
-		database.fireDidChangeItemsExternal({ items: change });
+		const deleted = new Set<string>(['foo']);
+		database.fireDidChangeItemsExternal({ deleted });
 		ok(changes.has('foo'));
-		equal(storage.get('foo', null!), null);
+		equal(storage.get('foo', undefined), undefined);
 		changes.clear();
 
 		// Nothing happens if changing to same value
-		change.set('foo', undefined!);
-		database.fireDidChangeItemsExternal({ items: change });
+		database.fireDidChangeItemsExternal({ deleted });
 		equal(changes.size, 0);
 
 		await storage.close();

src/vs/base/test/common/linkedText.test.ts

@@ -21,6 +21,21 @@ suite('LinkedText', () => {
 			{ label: 'link text', href: 'http://link.href', title: 'and a title' },
 			'.'
 		]);
+		assert.deepEqual(parseLinkedText('Some message with [link text](http://link.href \'and a title\').').nodes, [
+			'Some message with ',
+			{ label: 'link text', href: 'http://link.href', title: 'and a title' },
+			'.'
+		]);
+		assert.deepEqual(parseLinkedText('Some message with [link text](http://link.href "and a \'title\'").').nodes, [
+			'Some message with ',
+			{ label: 'link text', href: 'http://link.href', title: 'and a \'title\'' },
+			'.'
+		]);
+		assert.deepEqual(parseLinkedText('Some message with [link text](http://link.href \'and a "title"\').').nodes, [
+			'Some message with ',
+			{ label: 'link text', href: 'http://link.href', title: 'and a "title"' },
+			'.'
+		]);
 		assert.deepEqual(parseLinkedText('Some message with [link text](random stuff).').nodes, [
 			'Some message with [link text](random stuff).'
 		]);