Merge from vscode 731f9c25632dbbf01ee3a7892ad9d2791fe0260c

src/vs/platform/actions/browser/menuEntryActionViewItem.ts

@@ -5,8 +5,7 @@
 
 import { addClasses, createCSSRule, removeClasses, asCSSUrl } from 'vs/base/browser/dom';
 import { domEvent } from 'vs/base/browser/event';
-import { ActionViewItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
-import { IAction } from 'vs/base/common/actions';
+import { IAction, Separator } from 'vs/base/common/actions';
 import { Emitter } from 'vs/base/common/event';
 import { IdGenerator } from 'vs/base/common/idGenerator';
 import { IDisposable, toDisposable, MutableDisposable, DisposableStore, dispose } from 'vs/base/common/lifecycle';
@@ -17,6 +16,8 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
+import { DropdownMenuActionViewItem } from 'vs/base/browser/ui/dropdown/dropdownActionViewItem';
 
 // The alternative key on all platforms is alt. On windows we also support shift as an alternative key #44136
 class AlternativeKeyEmitter extends Emitter<boolean> {
@@ -125,19 +126,11 @@ export function fillInActions(groups: ReadonlyArray<[string, ReadonlyArray<MenuI
 	}
 }
 
-
-export function createActionViewItem(action: IAction, keybindingService: IKeybindingService, notificationService: INotificationService, contextMenuService: IContextMenuService): ActionViewItem | undefined {
-	if (action instanceof MenuItemAction) {
-		return new MenuEntryActionViewItem(action, keybindingService, notificationService, contextMenuService);
-	}
-	return undefined;
-}
-
 const ids = new IdGenerator('menu-item-action-item-icon-');
 
-export class MenuEntryActionViewItem extends ActionViewItem {
+const ICON_PATH_TO_CSS_RULES = new Map<string /* path*/, string /* CSS rule */>();
 
-	static readonly ICON_PATH_TO_CSS_RULES: Map<string /* path*/, string /* CSS rule */> = new Map<string, string>();
+export class MenuEntryActionViewItem extends ActionViewItem {
 
 	private _wantsAltCommand: boolean = false;
 	private readonly _itemClassDispose = this._register(new MutableDisposable());
@@ -165,7 +158,7 @@ export class MenuEntryActionViewItem extends ActionViewItem {
 			this._altKey.suppressAltKeyUp();
 		}
 
-		this.actionRunner.run(this._commandAction)
+		this.actionRunner.run(this._commandAction, this._context)
 			.then(undefined, err => this._notificationService.error(err));
 	}
 
@@ -236,7 +229,7 @@ export class MenuEntryActionViewItem extends ActionViewItem {
 		}
 	}
 
-	_updateItemClass(item: ICommandAction): void {
+	protected _updateItemClass(item: ICommandAction): void { // {{SQL CARBON EDIT}} make it overwritable
 		this._itemClassDispose.value = undefined;
 
 		const icon = this._commandAction.checked && (item.toggled as { icon?: Icon })?.icon ? (item.toggled as { icon: Icon }).icon : item.icon;
@@ -257,17 +250,17 @@ export class MenuEntryActionViewItem extends ActionViewItem {
 			// icon path
 			let iconClass: string;
 
-			if (icon?.dark?.scheme) {
+			if (icon.dark?.scheme) {
 
 				const iconPathMapKey = icon.dark.toString();
 
-				if (MenuEntryActionViewItem.ICON_PATH_TO_CSS_RULES.has(iconPathMapKey)) {
-					iconClass = MenuEntryActionViewItem.ICON_PATH_TO_CSS_RULES.get(iconPathMapKey)!;
+				if (ICON_PATH_TO_CSS_RULES.has(iconPathMapKey)) {
+					iconClass = ICON_PATH_TO_CSS_RULES.get(iconPathMapKey)!;
 				} else {
 					iconClass = ids.nextId();
 					createCSSRule(`.icon.${iconClass}`, `background-image: ${asCSSUrl(icon.light || icon.dark)}`);
 					createCSSRule(`.vs-dark .icon.${iconClass}, .hc-black .icon.${iconClass}`, `background-image: ${asCSSUrl(icon.dark)}`);
-					MenuEntryActionViewItem.ICON_PATH_TO_CSS_RULES.set(iconPathMapKey, iconClass);
+					ICON_PATH_TO_CSS_RULES.set(iconPathMapKey, iconClass);
 				}
 
 				if (this.label) {
@@ -284,17 +277,34 @@ export class MenuEntryActionViewItem extends ActionViewItem {
 	}
 }
 
-// Need to subclass MenuEntryActionViewItem in order to respect
-// the action context coming from any action bar, without breaking
-// existing users
-export class ContextAwareMenuEntryActionViewItem extends MenuEntryActionViewItem {
+export class SubmenuEntryActionViewItem extends DropdownMenuActionViewItem {
 
-	onClick(event: MouseEvent): void {
-		event.preventDefault();
-		event.stopPropagation();
+	constructor(
+		action: SubmenuItemAction,
+		@INotificationService _notificationService: INotificationService,
+		@IContextMenuService _contextMenuService: IContextMenuService
+	) {
+		const classNames: string[] = [];
 
-		this.actionRunner.run(this._commandAction, this._context)
-			.then(undefined, err => this._notificationService.error(err));
+		if (action.item.icon) {
+			if (ThemeIcon.isThemeIcon(action.item.icon)) {
+				classNames.push(ThemeIcon.asClassName(action.item.icon)!);
+			} else if (action.item.icon.dark?.scheme) {
+				const iconPathMapKey = action.item.icon.dark.toString();
+
+				if (ICON_PATH_TO_CSS_RULES.has(iconPathMapKey)) {
+					classNames.push('icon', ICON_PATH_TO_CSS_RULES.get(iconPathMapKey)!);
+				} else {
+					const className = ids.nextId();
+					classNames.push('icon', className);
+					createCSSRule(`.icon.${className}`, `background-image: ${asCSSUrl(action.item.icon.light || action.item.icon.dark)}`);
+					createCSSRule(`.vs-dark .icon.${className}, .hc-black .icon.${className}`, `background-image: ${asCSSUrl(action.item.icon.dark)}`);
+					ICON_PATH_TO_CSS_RULES.set(iconPathMapKey, className);
+				}
+			}
+		}
+
+		super(action, Array.isArray(action.actions) ? action.actions : action.actions(), _contextMenuService, { classNames });
 	}
 }
 
@@ -323,7 +333,7 @@ export class LabeledMenuItemActionItem extends MenuEntryActionViewItem {
 
 	// Overwrite item class to ensure that we can pass in a CSS class that other items use
 	// Leverages the _defaultCSSClassToAdd property that's passed into the constructor
-	_updateItemClass(item: ICommandAction): void {
+	protected _updateItemClass(item: ICommandAction): void {
 		dispose(this._labeledItemClassDispose);
 		this._labeledItemClassDispose = undefined;
 
@@ -336,13 +346,13 @@ export class LabeledMenuItemActionItem extends MenuEntryActionViewItem {
 			if (item.icon?.dark?.scheme) {
 				const iconPathMapKey = item.icon.dark.toString();
 
-				if (MenuEntryActionViewItem.ICON_PATH_TO_CSS_RULES.has(iconPathMapKey)) {
-					iconClass = MenuEntryActionViewItem.ICON_PATH_TO_CSS_RULES.get(iconPathMapKey)!;
+				if (ICON_PATH_TO_CSS_RULES.has(iconPathMapKey)) {
+					iconClass = ICON_PATH_TO_CSS_RULES.get(iconPathMapKey)!;
 				} else {
 					iconClass = ids.nextId();
 					createCSSRule(`.codicon.${iconClass}`, `background-image: ${asCSSUrl(item.icon.light || item.icon.dark)}`);
 					createCSSRule(`.vs-dark .codicon.${iconClass}, .hc-black .codicon.${iconClass}`, `background-image: ${asCSSUrl(item.icon.dark)}`);
-					MenuEntryActionViewItem.ICON_PATH_TO_CSS_RULES.set(iconPathMapKey, iconClass);
+					ICON_PATH_TO_CSS_RULES.set(iconPathMapKey, iconClass);
 				}
 
 				if (this.label) {

src/vs/platform/actions/common/actions.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Action } from 'vs/base/common/actions';
+import { Action, IAction, Separator, SubmenuAction } from 'vs/base/common/actions';
 import { SyncDescriptor0, createSyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { IConstructorSignature2, createDecorator, BrandedService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { IKeybindings, KeybindingsRegistry, IKeybindingRule } from 'vs/platform/keybinding/common/keybindingsRegistry';
@@ -47,6 +47,7 @@ export interface IMenuItem {
 export interface ISubmenuItem {
 	title: string | ILocalizedString;
 	submenu: MenuId;
+	icon?: Icon;
 	when?: ContextKeyExpression;
 	group?: 'navigation' | string;
 	order?: number;
@@ -302,12 +303,35 @@ export class ExecuteCommandAction extends Action {
 	}
 }
 
-export class SubmenuItemAction extends Action {
+export class SubmenuItemAction extends SubmenuAction {
 
-	readonly item: ISubmenuItem;
-	constructor(item: ISubmenuItem) {
-		typeof item.title === 'string' ? super('', item.title, 'submenu') : super('', item.title.value, 'submenu');
-		this.item = item;
+	constructor(
+		readonly item: ISubmenuItem,
+		menuService: IMenuService,
+		contextKeyService: IContextKeyService,
+		options?: IMenuActionOptions
+	) {
+		super(`submenuitem.${item.submenu.id}`, typeof item.title === 'string' ? item.title : item.title.value, () => {
+			const result: IAction[] = [];
+			const menu = menuService.createMenu(item.submenu, contextKeyService);
+			const groups = menu.getActions(options);
+			menu.dispose();
+
+			for (let group of groups) {
+				const [, actions] = group;
+
+				if (actions.length > 0) {
+					result.push(...actions);
+					result.push(new Separator());
+				}
+			}
+
+			if (result.length) {
+				result.pop(); // remove last separator
+			}
+
+			return result;
+		}, 'submenu');
 	}
 }
 

src/vs/platform/actions/common/menuService.ts

@@ -20,7 +20,7 @@ export class MenuService implements IMenuService {
 	}
 
 	createMenu(id: MenuId, contextKeyService: IContextKeyService): IMenu {
-		return new Menu(id, this._commandService, contextKeyService);
+		return new Menu(id, this._commandService, contextKeyService, this);
 	}
 }
 
@@ -38,7 +38,8 @@ class Menu implements IMenu {
 	constructor(
 		private readonly _id: MenuId,
 		@ICommandService private readonly _commandService: ICommandService,
-		@IContextKeyService private readonly _contextKeyService: IContextKeyService
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
+		@IMenuService private readonly _menuService: IMenuService
 	) {
 		this._build();
 
@@ -114,7 +115,7 @@ class Menu implements IMenu {
 				if (this._contextKeyService.contextMatchesRules(item.when)) {
 					const action = isIMenuItem(item)
 						? new MenuItemAction(item.command, item.alt, options, this._contextKeyService, this._commandService)
-						: new SubmenuItemAction(item);
+						: new SubmenuItemAction(item, this._menuService, this._contextKeyService, options);
 
 					activeActions.push(action);
 				}

src/vs/platform/browser/checkbox.ts

@@ -3,11 +3,11 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IBaseActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionbar';
 import { CheckboxActionViewItem } from 'vs/base/browser/ui/checkbox/checkbox';
 import { IAction } from 'vs/base/common/actions';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { attachCheckboxStyler } from 'vs/platform/theme/common/styler';
+import { IBaseActionViewItemOptions } from 'vs/base/browser/ui/actionbar/actionViewItems';
 
 export class ThemableCheckboxActionViewItem extends CheckboxActionViewItem {
 

src/vs/platform/extensionManagement/common/extensionGalleryService.ts

@@ -170,7 +170,7 @@ class Query {
 	withFilter(filterType: FilterType, ...values: string[]): Query {
 		const criteria = [
 			...this.state.criteria,
-			...values.map(value => ({ filterType, value }))
+			...values.length ? values.map(value => ({ filterType, value })) : [{ filterType }]
 		];
 
 		return new Query(assign({}, this.state, { criteria }));
@@ -494,6 +494,12 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 				return '';
 			});
 
+			// Use featured filter
+			text = text.replace(/\bfeatured(\s+|\b|$)/g, () => {
+				query = query.withFilter(FilterType.Featured);
+				return '';
+			});
+
 			text = text.trim();
 
 			if (text) {

src/vs/platform/issue/electron-main/issueMainService.ts

@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { localize } from 'vs/nls';
+import * as os from 'os';
+import product from 'vs/platform/product/common/product';
 import * as objects from 'vs/base/common/objects';
 import { parseArgs, OPTIONS } from 'vs/platform/environment/node/argv';
 import { ICommonIssueService, IssueReporterData, IssueReporterFeatures, ProcessExplorerData } from 'vs/platform/issue/common/issue';
@@ -196,12 +198,23 @@ export class IssueMainService implements ICommonIssueService {
 						backgroundColor: data.styles.backgroundColor || DEFAULT_BACKGROUND_COLOR,
 						webPreferences: {
 							preload: URI.parse(require.toUrl('vs/base/parts/sandbox/electron-browser/preload.js')).fsPath,
-							nodeIntegration: true,
 							enableWebSQL: false,
 							enableRemoteModule: false,
 							spellcheck: false,
 							nativeWindowOpen: true,
-							zoomFactor: zoomLevelToZoomFactor(data.zoomLevel)
+							zoomFactor: zoomLevelToZoomFactor(data.zoomLevel),
+							...this.environmentService.sandbox ?
+
+								// Sandbox
+								{
+									sandbox: true,
+									contextIsolation: true
+								} :
+
+								// No Sandbox
+								{
+									nodeIntegration: true
+								}
 						}
 					});
 
@@ -408,10 +421,23 @@ export class IssueMainService implements ICommonIssueService {
 			machineId: this.machineId,
 			userEnv: this.userEnv,
 			data,
-			features
+			features,
+			disableExtensions: this.environmentService.disableExtensions,
+			os: {
+				type: os.type(),
+				arch: os.arch(),
+				release: os.release(),
+			},
+			product: {
+				nameShort: product.nameShort,
+				version: product.version,
+				commit: product.commit,
+				date: product.date,
+				reportIssueUrl: product.reportIssueUrl
+			}
 		};
 
-		return toLauchUrl('vs/code/electron-browser/issue/issueReporter.html', windowConfiguration);
+		return toLauchUrl('vs/code/electron-sandbox/issue/issueReporter.html', windowConfiguration);
 	}
 }
 

src/vs/platform/product/common/productService.ts

@@ -49,6 +49,13 @@ export interface IProductConfiguration {
 	readonly settingsSearchBuildId?: number;
 	readonly settingsSearchUrl?: string;
 
+	readonly tasConfig?: {
+		endpoint: string;
+		telemetryEventName: string;
+		featuresTelemetryPropertyName: string;
+		assignmentContextTelemetryPropertyName: string;
+	};
+
 	readonly experimentsUrl?: string;
 
 	readonly extensionsGallery?: {

src/vs/platform/telemetry/common/telemetry.ts

@@ -46,6 +46,8 @@ export interface ITelemetryService {
 
 	getTelemetryInfo(): Promise<ITelemetryInfo>;
 
+	setExperimentProperty(name: string, value: string): void;
+
 	isOptedIn: boolean;
 }
 

src/vs/platform/telemetry/common/telemetryService.ts

@@ -31,6 +31,7 @@ export class TelemetryService implements ITelemetryService {
 
 	private _appender: ITelemetryAppender;
 	private _commonProperties: Promise<{ [name: string]: any; }>;
+	private _experimentProperties: { [name: string]: string } = {};
 	private _piiPaths: string[];
 	private _userOptIn: boolean;
 	private _enabled: boolean;
@@ -79,6 +80,10 @@ export class TelemetryService implements ITelemetryService {
 		}
 	}
 
+	setExperimentProperty(name: string, value: string): void {
+		this._experimentProperties[name] = value;
+	}
+
 	setEnabled(value: boolean): void {
 		this._enabled = value;
 	}
@@ -119,6 +124,9 @@ export class TelemetryService implements ITelemetryService {
 			// (first) add common properties
 			data = mixin(data, values);
 
+			// (next) add experiment properties
+			data = mixin(data, this._experimentProperties);
+
 			// (last) remove all PII from data
 			data = cloneAndChange(data, value => {
 				if (typeof value === 'string') {

src/vs/platform/telemetry/common/telemetryUtils.ts

@@ -28,6 +28,7 @@ export const NullTelemetryService = new class implements ITelemetryService {
 		return this.publicLogError(eventName, data as ITelemetryData);
 	}
 
+	setExperimentProperty() { }
 	setEnabled() { }
 	isOptedIn = true;
 	getTelemetryInfo(): Promise<ITelemetryInfo> {

src/vs/platform/theme/common/colorRegistry.ts

@@ -392,7 +392,7 @@ export const menuSeparatorBackground = registerColor('menu.separatorBackground',
 export const snippetTabstopHighlightBackground = registerColor('editor.snippetTabstopHighlightBackground', { dark: new Color(new RGBA(124, 124, 124, 0.3)), light: new Color(new RGBA(10, 50, 100, 0.2)), hc: new Color(new RGBA(124, 124, 124, 0.3)) }, nls.localize('snippetTabstopHighlightBackground', "Highlight background color of a snippet tabstop."));
 export const snippetTabstopHighlightBorder = registerColor('editor.snippetTabstopHighlightBorder', { dark: null, light: null, hc: null }, nls.localize('snippetTabstopHighlightBorder', "Highlight border color of a snippet tabstop."));
 export const snippetFinalTabstopHighlightBackground = registerColor('editor.snippetFinalTabstopHighlightBackground', { dark: null, light: null, hc: null }, nls.localize('snippetFinalTabstopHighlightBackground', "Highlight background color of the final tabstop of a snippet."));
-export const snippetFinalTabstopHighlightBorder = registerColor('editor.snippetFinalTabstopHighlightBorder', { dark: '#525252', light: new Color(new RGBA(10, 50, 100, 0.5)), hc: '#525252' }, nls.localize('snippetFinalTabstopHighlightBorder', "Highlight border color of the final stabstop of a snippet."));
+export const snippetFinalTabstopHighlightBorder = registerColor('editor.snippetFinalTabstopHighlightBorder', { dark: '#525252', light: new Color(new RGBA(10, 50, 100, 0.5)), hc: '#525252' }, nls.localize('snippetFinalTabstopHighlightBorder', "Highlight border color of the final tabstop of a snippet."));
 
 /**
  * Breadcrumb colors