Skip to content

Commit a7c8f22

Browse files
committed
Fix indent
1 parent bef9b6f commit a7c8f22

File tree

1 file changed

+73
-73
lines changed

1 file changed

+73
-73
lines changed

webextensions/background/uriMatcher.js

+73-73
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,28 @@ var URIMatcher = {
99
matchSingle: async function(params) {
1010
log('matchSingle: ', params);
1111
try{
12-
await this.initialized;
13-
this._updateURIRegExp();
14-
const match = this.matchMaybeURIs(params.text);
15-
if (match.length == 0)
16-
return null;
17-
18-
for (let maybeURI of match) {
19-
maybeURI = this.sanitizeURIString(maybeURI);
20-
const uriRange = await this.findTextRange({
21-
text: maybeURI,
22-
range: params.cursor,
23-
tabId: params.tabId
24-
});
25-
if (!uriRange)
26-
continue;
27-
return {
28-
text: maybeURI,
29-
range: uriRange,
30-
uri: this.fixupURI(maybeURI, params.baseURI)
31-
};
32-
}
33-
log(' => no match');
12+
await this.initialized;
13+
this._updateURIRegExp();
14+
const match = this.matchMaybeURIs(params.text);
15+
if (match.length == 0)
16+
return null;
17+
18+
for (let maybeURI of match) {
19+
maybeURI = this.sanitizeURIString(maybeURI);
20+
const uriRange = await this.findTextRange({
21+
text: maybeURI,
22+
range: params.cursor,
23+
tabId: params.tabId
24+
});
25+
if (!uriRange)
26+
continue;
27+
return {
28+
text: maybeURI,
29+
range: uriRange,
30+
uri: this.fixupURI(maybeURI, params.baseURI)
31+
};
32+
}
33+
log(' => no match');
3434
}
3535
catch(error){
3636
console.error(error);
@@ -41,64 +41,64 @@ var URIMatcher = {
4141
matchAll: async function(params) {
4242
log('matchAll: ', params);
4343
try{
44-
await this.initialized;
45-
params.onProgress && params.onProgress(0);
46-
this._updateURIRegExp();
47-
const results = [];
48-
const startAt = Date.now();
49-
50-
let maxCount = 0;
51-
const uniqueURIs = {};
52-
for (const range of params.ranges) {
53-
const match = this.matchMaybeURIs(range.text);
54-
if (match.length == 0) {
55-
range.maybeURIs = [];
56-
continue;
57-
}
58-
59-
const maybeURIs = Array.from(match).map(maybeURI => this.sanitizeURIString(maybeURI));
60-
range.maybeURIs = [];
61-
for (const maybeURI of maybeURIs) {
62-
const uri = this.fixupURI(maybeURI, params.baseURI);
63-
if (uri in uniqueURIs)
44+
await this.initialized;
45+
params.onProgress && params.onProgress(0);
46+
this._updateURIRegExp();
47+
const results = [];
48+
const startAt = Date.now();
49+
50+
let maxCount = 0;
51+
const uniqueURIs = {};
52+
for (const range of params.ranges) {
53+
const match = this.matchMaybeURIs(range.text);
54+
if (match.length == 0) {
55+
range.maybeURIs = [];
6456
continue;
65-
uniqueURIs[uri] = true;
66-
range.maybeURIs.push({
67-
original: maybeURI,
68-
uri: uri
69-
});
57+
}
58+
59+
const maybeURIs = Array.from(match).map(maybeURI => this.sanitizeURIString(maybeURI));
60+
range.maybeURIs = [];
61+
for (const maybeURI of maybeURIs) {
62+
const uri = this.fixupURI(maybeURI, params.baseURI);
63+
if (uri in uniqueURIs)
64+
continue;
65+
uniqueURIs[uri] = true;
66+
range.maybeURIs.push({
67+
original: maybeURI,
68+
uri: uri
69+
});
70+
}
71+
maxCount += range.maybeURIs.length;
7072
}
71-
maxCount += range.maybeURIs.length;
72-
}
7373

74-
let count = 0;
75-
for (const range of params.ranges) {
76-
for (const maybeURI of range.maybeURIs) {
77-
const uriRange = await this.findTextRange({
78-
text: maybeURI.original,
79-
range: range,
80-
tabId: params.tabId
81-
});
82-
if (uriRange) {
83-
results.push({
74+
let count = 0;
75+
for (const range of params.ranges) {
76+
for (const maybeURI of range.maybeURIs) {
77+
const uriRange = await this.findTextRange({
8478
text: maybeURI.original,
85-
range: uriRange,
86-
uri: maybeURI.uri
79+
range: range,
80+
tabId: params.tabId
8781
});
82+
if (uriRange) {
83+
results.push({
84+
text: maybeURI.original,
85+
range: uriRange,
86+
uri: maybeURI.uri
87+
});
88+
}
89+
count++;
90+
if (Date.now() - startAt > 250)
91+
params.onProgress && params.onProgress(count / maxCount);
92+
if (count % 100 == 0)
93+
await wait(0);
8894
}
89-
count++;
90-
if (Date.now() - startAt > 250)
91-
params.onProgress && params.onProgress(count / maxCount);
92-
if (count % 100 == 0)
93-
await wait(0);
9495
}
95-
}
96-
params.onProgress && params.onProgress(1);
97-
results.sort((aA, aB) =>
98-
aA.range.startTextNodePos - aB.range.startTextNodePos ||
99-
aA.range.startNodePos - aB.range.startNodePos ||
100-
aA.range.startOffset - aB.range.startOffset);
101-
log(' => ', results);
96+
params.onProgress && params.onProgress(1);
97+
results.sort((aA, aB) =>
98+
aA.range.startTextNodePos - aB.range.startTextNodePos ||
99+
aA.range.startNodePos - aB.range.startNodePos ||
100+
aA.range.startOffset - aB.range.startOffset);
101+
log(' => ', results);
102102
}
103103
catch(error){
104104
console.error(error);

0 commit comments

Comments
 (0)