tweak download context keys

isidorn · isidorn · commit f04f6cdae6c5 · 2019-10-24T15:17:15.000+02:00
diff --git a/src/vs/platform/contextkey/common/contextkey.ts b/src/vs/platform/contextkey/common/contextkey.ts
@@ -613,7 +613,7 @@ export class ContextKeyAndExpr implements ContextKeyExpr {
 
 				if (e instanceof ContextKeyOrExpr) {
 					// Not allowed, because we don't have parens!
-					throw new Error(`It is not allowed to have an or expression here due to lack of parens!`);
+					throw new Error(`It is not allowed to have an or expression here due to lack of parens! For example "a && (b||c)" is not supported, use "(a&&b) || (a&&c)" instead.`);
 				}
 
 				expr.push(e);
diff --git a/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts b/src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
@@ -23,7 +23,7 @@ import { ResourceContextKey } from 'vs/workbench/common/resources';
 import { WorkbenchListDoubleSelection } from 'vs/platform/list/browser/listService';
 import { URI } from 'vs/base/common/uri';
 import { Schemas } from 'vs/base/common/network';
-import { WorkspaceFolderCountContext } from 'vs/workbench/browser/contextkeys';
+import { WorkspaceFolderCountContext, IsWebContext } from 'vs/workbench/browser/contextkeys';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { OpenFileFolderAction, OpenFileAction, OpenFolderAction, OpenWorkspaceAction } from 'vs/workbench/browser/actions/workspaceActions';
 import { ActiveEditorIsSaveableContext } from 'vs/workbench/common/editor';
@@ -464,24 +464,15 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
 	when: ExplorerFolderContext
 });
 
-MenuRegistry.appendMenuItem(MenuId.ExplorerContext, (() => {
-	const downloadMenuItem = {
-		group: '5_cutcopypaste',
-		order: 30,
-		command: {
-			id: DOWNLOAD_COMMAND_ID,
-			title: DOWNLOAD_LABEL,
-		},
-		when: ContextKeyExpr.and(ResourceContextKey.Scheme.notEqualsTo(Schemas.file))
-	};
-
-	// Web: currently not supporting download of folders
-	if (isWeb) {
-		downloadMenuItem.when = ContextKeyExpr.and(ResourceContextKey.Scheme.notEqualsTo(Schemas.file), ExplorerFolderContext.toNegated());
-	}
-
-	return downloadMenuItem;
-})());
+MenuRegistry.appendMenuItem(MenuId.ExplorerContext, ({
+	group: '5_cutcopypaste',
+	order: 30,
+	command: {
+		id: DOWNLOAD_COMMAND_ID,
+		title: DOWNLOAD_LABEL,
+	},
+	when: ContextKeyExpr.or(ContextKeyExpr.and(ResourceContextKey.Scheme.notEqualsTo(Schemas.file), IsWebContext.toNegated()), ContextKeyExpr.and(ResourceContextKey.Scheme.notEqualsTo(Schemas.file), ExplorerFolderContext.toNegated()))
+}));
 
 MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
 	group: '6_copypath',

Original file line number	Diff line number	Diff line change
`@@ -613,7 +613,7 @@ export class ContextKeyAndExpr implements ContextKeyExpr {`
`613`	`613`
`614`	`614`	`if (e instanceof ContextKeyOrExpr) {`
`615`	`615`	`// Not allowed, because we don't have parens!`
`616`		- throw new Error(`It is not allowed to have an or expression here due to lack of parens!`);
	`616`	+ throw new Error(`It is not allowed to have an or expression here due to lack of parens! For example "a && (b\|\|c)" is not supported, use "(a&&b) \|\| (a&&c)" instead.`);
`617`	`617`	`}`
`618`	`618`
`619`	`619`	`expr.push(e);`