Merge from vscode 2a36b7d0d527bf408bae4f96b8386db9d9455113 (#10237)

src/vs/workbench/services/contextmenu/electron-browser/contextmenuService.ts

@@ -192,7 +192,7 @@ class NativeContextMenuService extends Disposable implements IContextMenuService
 	private async runAction(actionRunner: IActionRunner, actionToRun: IAction, delegate: IContextMenuDelegate, event: IContextMenuEvent): Promise<void> {
 		this.telemetryService.publicLog2<WorkbenchActionExecutedEvent, WorkbenchActionExecutedClassification>('workbenchActionExecuted', { id: actionToRun.id, from: 'contextMenu' });
 
-		const context = delegate.getActionsContext ? delegate.getActionsContext(event) : event;
+		const context = delegate.getActionsContext ? delegate.getActionsContext(event) : undefined;
 
 		const runnable = actionRunner.run(actionToRun, context);
 		if (runnable) {

src/vs/workbench/services/keybinding/browser/keybindingService.ts

@@ -709,10 +709,17 @@ let schema: IJSONSchema = {
 				'description': nls.localize('keybindings.json.key', "Key or key sequence (separated by space)"),
 			},
 			'command': {
-				'type': 'string',
-				'enum': commandsEnum,
-				'enumDescriptions': <any>commandsEnumDescriptions,
-				'description': nls.localize('keybindings.json.command', "Name of the command to execute"),
+				'anyOf': [
+					{
+						'type': 'string',
+						'enum': commandsEnum,
+						'enumDescriptions': <any>commandsEnumDescriptions,
+						'description': nls.localize('keybindings.json.command', "Name of the command to execute"),
+					},
+					{
+						'type': 'string'
+					}
+				]
 			},
 			'when': {
 				'type': 'string',

src/vs/workbench/services/layout/browser/layoutService.ts

@@ -224,4 +224,9 @@ export interface IWorkbenchLayoutService extends ILayoutService {
 	 * Returns the next visible view part in a given direction
 	 */
 	getVisibleNeighborPart(part: Parts, direction: Direction): Parts | undefined;
+
+	/**
+	 * True if a default layout with default editors was applied at startup
+	 */
+	readonly openedDefaultEditors: boolean;
 }