From 8ded89e8d4d2bc821f57a4925ea72b28e10e4f83 Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Fri, 26 Jul 2019 17:24:27 -0500
Subject: [PATCH] Firefox fixes

---
 scripts/vscode.patch  | 25 +++++++++++++++++++++++++
 src/media/firefox.css | 23 ++++++++---------------
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/scripts/vscode.patch b/scripts/vscode.patch
index 421c1578..7795f02d 100644
--- a/scripts/vscode.patch
+++ b/scripts/vscode.patch
@@ -11,6 +11,31 @@ index 618861a5be..9d4fdea14e 100644
 +	withBase(path: string ): string;
 +	withBase(resource: { path: string }): { toString: (skipEncoding?: boolean) => string };
  }
+diff --git a/src/vs/base/browser/ui/menu/menu.ts b/src/vs/base/browser/ui/menu/menu.ts
+index 7913bb42fd..80d5970970 100644
+--- a/src/vs/base/browser/ui/menu/menu.ts
++++ b/src/vs/base/browser/ui/menu/menu.ts
+@@ -22,7 +22,7 @@ import { isLinux, isMacintosh } from 'vs/base/common/platform';
+ 
+ function createMenuMnemonicRegExp() {
+ 	try {
+-		return new RegExp('\\(&([^\\s&])\\)|(?<!&)&([^\\s&])');
++		return new RegExp('\\(&([^\\s&])\\)|([^&]|^)&([^\\s&])');
+ 	} catch (err) {
+ 		return new RegExp('\uFFFF'); // never match please
+ 	}
+@@ -799,7 +799,7 @@ export function cleanMnemonic(label: string): string {
+ 		return label;
+ 	}
+ 
+-	const mnemonicInText = matches[0].charAt(0) === '&';
++	const mnemonicInText = matches[3]; // matches[0].charAt(0) === '&';
+ 
+-	return label.replace(regex, mnemonicInText ? '$2' : '').trim();
+-}
+\ No newline at end of file
++	return label.replace(regex, mnemonicInText ? '$2$3' : '').trim();
++}
 diff --git a/src/vs/base/common/buffer.ts b/src/vs/base/common/buffer.ts
 index 7b4e9cc8d6..7722cb12c6 100644
 --- a/src/vs/base/common/buffer.ts
diff --git a/src/media/firefox.css b/src/media/firefox.css
index 6ad0811b..f696f621 100644
--- a/src/media/firefox.css
+++ b/src/media/firefox.css
@@ -1,21 +1,14 @@
 @supports (-moz-appearance:none) {
-	/*
-	.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-buttons-container .monaco-button.monaco-text-button {
-		max-width: 100%;
-		width: auto;
+	/* Firefox doesn't support -webkit-margin-{before/after} so use margin. */
+	/* These are the collapsible section headings in a sidebar panel. */
+	.monaco-panel-view .panel > .panel-header h3.title {
+		margin-bottom: 0;
+		margin-top: 0;
 	}
 
-	.monaco-shell .screen-reader-detected-explanation .buttons a,
-	.monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink,
-	.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-buttons-container .monaco-button {
-		max-width: -moz-fit-content;
-	}
-
-	.monaco-workbench > .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-fit,
-	.explorer-viewlet .panel-header .count,
-	.extensions-viewlet > .extensions .extension > .details > .header-container > .header > .version,
-	.debug-viewlet .debug-call-stack .stack-frame .label {
+	/* Firefox doesn't seem to support fit-content. */
+	/* These are the file tabs. */
+	.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-fit {
 		min-width: -moz-fit-content;
 	}
-	*/
 }