From 7ca6e8bfb36858b52b0af6c9731ad4cd521810aa Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Thu, 12 Apr 2018 07:29:14 -0400
Subject: [PATCH] code review: not a fan of deep indentation; detect Edge,
 Safari

---
 platform/chromium/vapi-common.js | 55 +++++++++++++++-----------------
 1 file changed, 26 insertions(+), 29 deletions(-)

diff --git a/platform/chromium/vapi-common.js b/platform/chromium/vapi-common.js
index c3f7c0748..21a8fa3de 100644
--- a/platform/chromium/vapi-common.js
+++ b/platform/chromium/vapi-common.js
@@ -70,38 +70,35 @@ vAPI.webextFlavor = {
         });
     }
 
-    // Synchronous
-    var match = /Firefox\/([\d.]+)/.exec(ua);
-    if ( match !== null ) {
+    // Synchronous -- order of tests is important
+    var match;
+    if ( (match = /\bFirefox\/(\d+)/.exec(ua)) !== null ) {
         flavor.major = parseInt(match[1], 10) || 0;
-        soup.add('mozilla')
-            .add('firefox');
+        soup.add('mozilla').add('firefox');
         if ( flavor.major >= 53 ) { soup.add('user_stylesheet'); }
         if ( flavor.major >= 57 ) { soup.add('html_filtering'); }
-    } else {
-        match = /OPR\/([\d.]+)/.exec(ua);
-        if ( match !== null ) {
-            var reEx = /Chrom(?:e|ium)\/([\d.]+)/;
-            if ( reEx.test(ua) ) { match = reEx.exec(ua); }
-            flavor.major = parseInt(match[1], 10) || 0;
-            soup.add('opera').add('chromium');
-        } else {
-            match = /Chromium\/([\d.]+)/.exec(ua);
-            if ( match !== null ) {
-                flavor.major = parseInt(match[1], 10) || 0;
-                soup.add('chromium');
-            } else {
-                match = /Chrome\/([\d.]+)/.exec(ua);
-                if ( match !== null ) {
-                    flavor.major = parseInt(match[1], 10) || 0;
-                    soup.add('google').add('chromium');
-                }
-            }
-        }
-        // https://github.com/gorhill/uBlock/issues/3588
-        if ( soup.has('chromium') && flavor.major >= 67 ) {
-            soup.add('user_stylesheet');
-        }
+    } else if ( (match = /\bEdge\/(\d+)/.exec(ua)) !== null ) {
+        flavor.major = parseInt(match[1], 10) || 0;
+        soup.add('microsoft').add('edge');
+    } else if ( (match = /\bOPR\/(\d+)/.exec(ua)) !== null ) {
+        var reEx = /\bChrom(?:e|ium)\/([\d.]+)/;
+        if ( reEx.test(ua) ) { match = reEx.exec(ua); }
+        flavor.major = parseInt(match[1], 10) || 0;
+        soup.add('opera').add('chromium');
+    } else if ( (match = /\bChromium\/(\d+)/.exec(ua)) !== null ) {
+        flavor.major = parseInt(match[1], 10) || 0;
+        soup.add('chromium');
+    } else if ( (match = /\bChrome\/(\d+)/.exec(ua)) !== null ) {
+        flavor.major = parseInt(match[1], 10) || 0;
+        soup.add('google').add('chromium');
+    } else if ( (match = /\bSafari\/(\d+)/.exec(ua)) !== null ) {
+        flavor.major = parseInt(match[1], 10) || 0;
+        soup.add('apple').add('safari');
+    }
+
+    // https://github.com/gorhill/uBlock/issues/3588
+    if ( soup.has('chromium') && flavor.major >= 66 ) {
+        soup.add('user_stylesheet');
     }
 
     // Don't starve potential listeners