Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: lib/matcher.js

Issue 30009560: Noissue - Rename lib/domain.js to lib/url.js (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Created Feb. 16, 2019, 12:42 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « lib/filterClasses.js ('k') | lib/url.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-present eyeo GmbH 3 * Copyright (C) 2006-present eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 "use strict"; 18 "use strict";
19 19
20 /** 20 /**
21 * @fileOverview Matcher class implementing matching addresses against 21 * @fileOverview Matcher class implementing matching addresses against
22 * a list of filters. 22 * a list of filters.
23 */ 23 */
24 24
25 const {RegExpFilter, WhitelistFilter} = require("./filterClasses"); 25 const {RegExpFilter, WhitelistFilter} = require("./filterClasses");
26 const {normalizeHostname, suffixes} = require("./domain"); 26 const {normalizeHostname, domainSuffixes} = require("./url");
27 27
28 /** 28 /**
29 * Regular expression for matching a keyword in a filter. 29 * Regular expression for matching a keyword in a filter.
30 * @type {RegExp} 30 * @type {RegExp}
31 */ 31 */
32 const keywordRegExp = /[^a-z0-9%*][a-z0-9%]{3,}(?=[^a-z0-9%*])/; 32 const keywordRegExp = /[^a-z0-9%*][a-z0-9%]{3,}(?=[^a-z0-9%*])/;
33 33
34 /** 34 /**
35 * Regular expression for matching all keywords in a filter. 35 * Regular expression for matching all keywords in a filter.
36 * @type {RegExp} 36 * @type {RegExp}
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 return filtersByDomain; 494 return filtersByDomain;
495 495
496 collection.push(filtersByDomain); 496 collection.push(filtersByDomain);
497 } 497 }
498 498
499 return null; 499 return null;
500 } 500 }
501 501
502 let excluded = new Set(); 502 let excluded = new Set();
503 503
504 for (let suffix of suffixes(docDomain ? normalizeHostname(docDomain) : "", 504 for (let suffix of domainSuffixes(docDomain ?
505 !specificOnly)) 505 normalizeHostname(docDomain) : "",
506 !specificOnly))
506 { 507 {
507 let filters = filtersByDomain.get(suffix); 508 let filters = filtersByDomain.get(suffix);
508 if (filters) 509 if (filters)
509 { 510 {
510 for (let [filter, include] of filters.entries()) 511 for (let [filter, include] of filters.entries())
511 { 512 {
512 if (!include) 513 if (!include)
513 { 514 {
514 excluded.add(filter); 515 excluded.add(filter);
515 } 516 }
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
886 887
887 exports.CombinedMatcher = CombinedMatcher; 888 exports.CombinedMatcher = CombinedMatcher;
888 889
889 /** 890 /**
890 * Shared {@link CombinedMatcher} instance that should usually be used. 891 * Shared {@link CombinedMatcher} instance that should usually be used.
891 * @type {CombinedMatcher} 892 * @type {CombinedMatcher}
892 */ 893 */
893 let defaultMatcher = new CombinedMatcher(); 894 let defaultMatcher = new CombinedMatcher();
894 895
895 exports.defaultMatcher = defaultMatcher; 896 exports.defaultMatcher = defaultMatcher;
OLDNEW
« no previous file with comments | « lib/filterClasses.js ('k') | lib/url.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld