Fix conditional for overrideCommandForWebview

mjbvz · mjbvz · commit 2b5ac23284a6 · 2020-07-13T10:56:21.000-07:00
This command should be active if:

- we are on mac
- or we are not using custom title bars

The previous code was incorrectly disabling these commands entirely on mac
diff --git a/src/vs/workbench/contrib/webview/electron-browser/webview.contribution.ts b/src/vs/workbench/contrib/webview/electron-browser/webview.contribution.ts
@@ -47,15 +47,14 @@ const PRIORITY = 100;
 
 function overrideCommandForWebview(command: MultiCommand | undefined, f: (webview: ElectronWebviewBasedWebview) => void) {
 	command?.addImplementation(PRIORITY, accessor => {
-		if (!isMacintosh || accessor.get(IConfigurationService).getValue<string>('window.titleBarStyle') !== 'native') {
-			return false;
+		if (isMacintosh || accessor.get(IConfigurationService).getValue<string>('window.titleBarStyle') === 'native') {
+			const webview = getActiveElectronBasedWebview(accessor);
+			if (webview) {
+				f(webview);
+				return true;
+			}
 		}
 
-		const webview = getActiveElectronBasedWebview(accessor);
-		if (webview) {
-			f(webview);
-			return true;
-		}
 		return false;
 	});
 }
