Issue 6940 - Use underscore prefixes lib/matcher.js

lib/matcher.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 161 matching lines @@
    * @param {string} location
    * @param {number} typeMask
    * @param {string} [docDomain]
    * @param {boolean} [thirdParty]
    * @param {string} [sitekey]
    * @param {boolean} [specificOnly]
    * @returns {?Filter}
    * @protected
    */
   checkEntryMatch(keyword, location, typeMask, docDomain, thirdParty, sitekey,
-                   specificOnly)
+                  specificOnly)
   {
     let set = this._filterByKeyword.get(keyword);
     if (typeof set == "undefined")
       return null;
 
     for (let filter of set)
     {
       if (specificOnly && filter.isGeneric() &&
           !(filter instanceof WhitelistFilter))
         continue;
@@ skipping 23 matching lines @@
    */
   matchesAny(location, typeMask, docDomain, thirdParty, sitekey, specificOnly)
   {
     let candidates = location.toLowerCase().match(/[a-z0-9%]{3,}/g);
     if (candidates === null)
       candidates = [];
     candidates.push("");
     for (let i = 0, l = candidates.length; i < l; i++)
     {
       let result = this.checkEntryMatch(candidates[i], location, typeMask,
-                                         docDomain, thirdParty, sitekey,

[Manish Jethani, 2018/10/23 10:38:27]

The following lines are not properly aligned now.

[Jon Sonesen, 2018/10/23 17:39:47]

Done.

-                                         specificOnly);
+                                        docDomain, thirdParty, sitekey,
+                                        specificOnly);
       if (result)
         return result;
     }
 
     return null;
   }
 }
 
 exports.Matcher = Matcher;
 
@@ skipping 86 matching lines @@
 
   /**
    * Optimized filter matching testing both whitelist and blacklist matchers
    * simultaneously. For parameters see
      {@link Matcher#matchesAny Matcher.matchesAny()}.
    * @see Matcher#matchesAny
    * @inheritdoc
    * @private
    */
   _matchesAnyInternal(location, typeMask, docDomain, thirdParty, sitekey,
-                     specificOnly)

[Manish Jethani, 2018/10/23 10:38:27]

Not properly aligned.

[Jon Sonesen, 2018/10/23 17:39:47]

Done.

+                      specificOnly)
   {
     let candidates = location.toLowerCase().match(/[a-z0-9%]{3,}/g);
     if (candidates === null)
       candidates = [];
     candidates.push("");
 
     let whitelistHit = null;
     let blacklistHit = null;
 
     // If the type mask includes no types other than whitelist-only types, we
@@ skipping 31 matching lines @@
   matchesAny(location, typeMask, docDomain, thirdParty, sitekey, specificOnly)
   {
     let key = location + " " + typeMask + " " + docDomain + " " + thirdParty +
       " " + sitekey + " " + specificOnly;
 
     let result = this._resultCache.get(key);
     if (typeof result != "undefined")
       return result;
 
     result = this._matchesAnyInternal(location, typeMask, docDomain,
-                                     thirdParty, sitekey, specificOnly);

[Manish Jethani, 2018/10/23 10:38:27]

Not properly aligned.

[Jon Sonesen, 2018/10/23 17:39:47]

Done.

+                                      thirdParty, sitekey, specificOnly);
 
     if (this._resultCache.size >= this.maxCacheEntries)
       this._resultCache.clear();
 
     this._resultCache.set(key, result);
 
     return result;
   }
 }
 
 exports.CombinedMatcher = CombinedMatcher;
 
 /**
  * Shared {@link CombinedMatcher} instance that should usually be used.
  * @type {CombinedMatcher}
  */
 let defaultMatcher = new CombinedMatcher();
 
 exports.defaultMatcher = defaultMatcher;