Bug 1250366 - fix whitespace issues with URL highlight code, r=jaws

MozReview-Commit-ID: 1i0IiZ7EDWi

--HG--
extra : rebase_source : 20b36e17d188fb3b85b22c3add674bf1dc739499

browser/base/content/test/general/browser_urlHighlight.js

@@ -60,6 +60,9 @@ function test() {
   testVal("<user:pass@sub1.sub2.sub3.>mozilla.org");
   testVal("<user:pass@>mozilla.org");
 
+  testVal("<https://>mozilla.org<   >");
+  testVal("mozilla.org<   >");
+
   testVal("<https://>mozilla.org</file.ext>");
   testVal("<https://>mozilla.org</sub/file.ext>");
   testVal("<https://>mozilla.org</sub/file.ext?foo>");

browser/base/content/urlbarBindings.xml

@@ -261,7 +261,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
             trimmedLength = "http://".length;
           }
 
-          let matchedURL = value.match(/^((?:[a-z]+:\/\/)(?:[^\/#?]+@)?)(.+?)(?::\d+)?(?:[\/#?]|$)/);
+          let matchedURL = value.match(/^((?:[a-z]+:\/\/)(?:[^\/#?]+@)?)(\S+?)(?::\d+)?\s*(?:[\/#?]|$)/);
           if (!matchedURL)
             return;