Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-09-15 15:32:28 +02:00
Code Issues Releases Wiki Activity

Better word selection for static network filters

Browse Source 
Related issue:
- https://github.com/uBlockOrigin/uBlock-issues/issues/1134

Double-clicking on...

... a filter option will cause the option to be
wholly selected, including `=[value]` if present;

... a value assigned to a filter option will cause
the value to be wholly selected, except when the
value is a hostname/entity, in which case all the
labels from the cursor position to the right-most
label will be selected.
This commit is contained in:
Raymond Hill 2020-10-16 10:06:00 -04:00
parent 3059db77c4
commit 38e1bbbe68
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/js/codemirror/ubo-static-filtering.js
View File

@ -633,7 +633,7 @@ CodeMirror.registerHelper('fold', 'ubo-static-filtering', (( ) => {
}
// Better word selection for cosmetic filters
if ( /\bext\b/.test(token) ) {
else if ( /\bext\b/.test(token) ) {
if ( /\bvalue\b/.test(token) ) {
const l = /[^,.]*$/i.exec(s.slice(0, ch));
const r = /^[^#,]*/i.exec(s.slice(ch));
@ -641,8 +641,7 @@ CodeMirror.registerHelper('fold', 'ubo-static-filtering', (( ) => {
beg = l.index;
end = ch + r[0].length;
}
}
if ( /\bvariable\b/.test(token) ) {
} else if ( /\bvariable\b/.test(token) ) {
const l = /[#.]?[a-z0-9_-]+$/i.exec(s.slice(0, ch));
const r = /^[a-z0-9_-]+/i.exec(s.slice(ch));
if ( l && r ) {
@ -655,7 +654,24 @@ CodeMirror.registerHelper('fold', 'ubo-static-filtering', (( ) => {
}
}
// TODO: add more convenient word-matching cases here
// Better word selection for network filters
else if ( /\bnet\b/.test(token) ) {
if ( /\bvalue\b/.test(token) ) {
const l = /[^,.=|]*$/i.exec(s.slice(0, ch));
const r = /^[^#,|]*/i.exec(s.slice(ch));
if ( l && r ) {
beg = l.index;
end = ch + r[0].length;
}
} else if ( /\bdef\b/.test(token) ) {
const l = /[a-z0-9-]+$/i.exec(s.slice(0, ch));
const r = /^[^,]*=[^,]+/i.exec(s.slice(ch));
if ( l && r ) {
beg = l.index;
end = ch + r[0].length;
}
}
}
if ( beg === undefined ) { return Pass; }
cm.setSelection(