From 2784e8a75143efbe43879cceddc21d9aa94aba69 Mon Sep 17 00:00:00 2001
From: "Ilya Ig. Petrov" <ilyaigpetrov@gmail.com>
Date: Wed, 1 Aug 2018 17:31:05 +0500
Subject: [PATCH] Don't keep ';' inside variables, use it externally

---
 .../extension-common/35-pac-kitchen-api.js    | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js
index e760cfb..59efacc 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/35-pac-kitchen-api.js
@@ -359,12 +359,12 @@
         }
         res += `
 /******/
-/******/    const directIfAllowed = ${pacMods.ifProxyOrDie ? '""/* Not allowed. */' : '"; DIRECT"'};
+/******/    const directIfAllowed = ${pacMods.ifProxyOrDie ? '""/* Not allowed. */' : '"DIRECT"'};
 /******/`;
         if (pacMods.filteredCustomsString) {
           res += `
 /******/
-/******/    const filteredCustomProxies = "${pacMods.filteredCustomsString}; ";
+/******/    const filteredCustomProxies = "${pacMods.filteredCustomsString}";
 /******/`;
         }
 
@@ -412,7 +412,7 @@
 /******/      }
 /******/      // Always proxy it!
 ${        pacMods.filteredCustomsString
-            ? `/******/      return filteredCustomProxies + directIfAllowed;`
+            ? `/******/      return filteredCustomProxies + "; " + directIfAllowed;`
             : '/******/      /* No custom proxies -- continue. */'
 }
 /******/    }
@@ -421,7 +421,9 @@ ${        pacMods.filteredCustomsString
         }
         res += `
 /******/    const pacScriptProxies = originalFindProxyForURL(url, host)${
-/******/          pacMods.ifProxyOrDie ? '.replace(/DIRECT/g, "")' : ' + directIfAllowed'
+/******/          pacMods.ifProxyOrDie
+                    ? '.replace(/DIRECT/g, "")'
+                    : ' + "; " + directIfAllowed'
         };`;
         if(
           !pacMods.ifUseSecureProxiesOnly &&
@@ -429,7 +431,8 @@ ${        pacMods.filteredCustomsString
            pacMods.ifUsePacScriptProxies
         ) {
           return res + `
-/******/    return (pacScriptProxies + directIfAllowed) || "DIRECT";`;
+/******/    return [pacScriptProxies, directIfAllowed]
+              .filter((p) => p).join("; ") || "DIRECT";`;
         }
 
         return res + `
@@ -440,7 +443,10 @@ ${        pacMods.filteredCustomsString
 /******/      return "DIRECT";
 /******/    }
 /******/    return ` +
-        (pacMods.filteredCustomsString ? 'filteredCustomProxies + ' : '') +
+        (pacMods.filteredCustomsString
+          ? 'filteredCustomProxies + "; " + '
+          : ''
+        ) +
         function() {
 
           if (!pacMods.ifUsePacScriptProxies) {
@@ -451,9 +457,9 @@ ${        pacMods.filteredCustomsString
             filteredPacExp =
               'pacProxyArray.filter( (pStr) => /^HTTPS\\s/.test(pStr) ).join("; ")';
           }
-          return filteredPacExp + ' + ';
+          return filteredPacExp + ' + "; " + ';
 
-        }() + `directIfAllowed;`; // Without DIRECT you will get 'PROXY CONN FAILED' pac-error.
+        }() + 'directIfAllowed;'; // Without DIRECT you will get 'PROXY CONN FAILED' pac-error.
 
       }()
     }