@@ -9,28 +9,28 @@ var URIMatcher = {
9
9
matchSingle : async function ( params ) {
10
10
log ( 'matchSingle: ' , params ) ;
11
11
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' ) ;
34
34
}
35
35
catch ( error ) {
36
36
console . error ( error ) ;
@@ -41,64 +41,64 @@ var URIMatcher = {
41
41
matchAll : async function ( params ) {
42
42
log ( 'matchAll: ' , params ) ;
43
43
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 = [ ] ;
64
56
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 ;
70
72
}
71
- maxCount += range . maybeURIs . length ;
72
- }
73
73
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 ( {
84
78
text : maybeURI . original ,
85
- range : uriRange ,
86
- uri : maybeURI . uri
79
+ range : range ,
80
+ tabId : params . tabId
87
81
} ) ;
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 ) ;
88
94
}
89
- count ++ ;
90
- if ( Date . now ( ) - startAt > 250 )
91
- params . onProgress && params . onProgress ( count / maxCount ) ;
92
- if ( count % 100 == 0 )
93
- await wait ( 0 ) ;
94
95
}
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 ) ;
102
102
}
103
103
catch ( error ) {
104
104
console . error ( error ) ;
0 commit comments