| Index: lib/matcher.js |
| =================================================================== |
| --- a/lib/matcher.js |
| +++ b/lib/matcher.js |
| @@ -18,17 +18,17 @@ |
| "use strict"; |
| /** |
| * @fileOverview Matcher class implementing matching addresses against |
| * a list of filters. |
| */ |
| const {RegExpFilter, WhitelistFilter} = require("./filterClasses"); |
| -const {normalizeHostname, suffixes} = require("./domain"); |
| +const {normalizeHostname, domainSuffixes} = require("./url"); |
| /** |
| * Regular expression for matching a keyword in a filter. |
| * @type {RegExp} |
| */ |
| const keywordRegExp = /[^a-z0-9%*][a-z0-9%]{3,}(?=[^a-z0-9%*])/; |
| /** |
| @@ -496,18 +496,19 @@ |
| collection.push(filtersByDomain); |
| } |
| return null; |
| } |
| let excluded = new Set(); |
| - for (let suffix of suffixes(docDomain ? normalizeHostname(docDomain) : "", |
| - !specificOnly)) |
| + for (let suffix of domainSuffixes(docDomain ? |
| + normalizeHostname(docDomain) : "", |
| + !specificOnly)) |
| { |
| let filters = filtersByDomain.get(suffix); |
| if (filters) |
| { |
| for (let [filter, include] of filters.entries()) |
| { |
| if (!include) |
| { |