Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-10-06 01:27:12 +02:00
Code Issues Releases Wiki Activity

Fix various quirks with "My filters" trust-related checkbox

Browse Source 
Simplify code to force syntax highlighter and linter to reprocess
the content when toggling trust-related checkbox.

Fix issue with using `mousedown` on searchbar widgets, related
feedback:
https://github.com/uBlockOrigin/uBlock-issues/issues/3161#issuecomment-2002112770

Fix issues reported by eslint.
This commit is contained in:
Raymond Hill 2024-03-19 10:59:15 -04:00
parent 58c935aa9e
commit 0cb6170584
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
3 changed files with 185 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/js/1p-filters.js
View File

@ -21,12 +21,10 @@
/* global CodeMirror, uBlockDashboard */ /* global CodeMirror, uBlockDashboard */
'use strict'; import './codemirror/ubo-static-filtering.js';
import { onBroadcast } from './broadcast.js';
import { dom, qs$ } from './dom.js'; import { dom, qs$ } from './dom.js';
import { i18n$ } from './i18n.js'; import { i18n$ } from './i18n.js';
import './codemirror/ubo-static-filtering.js'; import { onBroadcast } from './broadcast.js';
/******************************************************************************/ /******************************************************************************/
@ -123,10 +121,6 @@ function setEditorText(text) {
/******************************************************************************/ /******************************************************************************/
// https://github.com/codemirror/codemirror5/issues/3318
// "How could I force to redraw the highlight of all the lines?"
// "Resetting the mode option with setOption will trigger a full re-parse."
function userFiltersChanged(details = {}) { function userFiltersChanged(details = {}) {
const changed = typeof details.changed === 'boolean' const changed = typeof details.changed === 'boolean'
? details.changed ? details.changed
@ -138,8 +132,19 @@ function userFiltersChanged(details = {}) {
const trustedbefore = cmEditor.getOption('trustedSource'); const trustedbefore = cmEditor.getOption('trustedSource');
const trustedAfter = enabled && qs$('#trustMyFilters input').checked; const trustedAfter = enabled && qs$('#trustMyFilters input').checked;
if ( trustedAfter === trustedbefore ) { return; } if ( trustedAfter === trustedbefore ) { return; }
cmEditor.setOption('mode', 'ubo-static-filtering'); cmEditor.startOperation();
cmEditor.setOption('trustedSource', trustedAfter); cmEditor.setOption('trustedSource', trustedAfter);
const doc = cmEditor.getDoc();
const history = doc.getHistory();
const selections = doc.listSelections();
doc.replaceRange(doc.getValue(),
{ line: 0, ch: 0 },
{ line: doc.lineCount(), ch: 0 }
);
doc.setSelections(selections);
doc.setHistory(history);
cmEditor.endOperation();
cmEditor.focus();
} }
/******************************************************************************/ /******************************************************************************/

22
src/js/codemirror/search.js
View File

@ -25,8 +25,6 @@
// Ctrl-G. // Ctrl-G.
// ===== // =====
'use strict';
import { dom, qs$ } from '../dom.js'; import { dom, qs$ } from '../dom.js';
import { i18n$ } from '../i18n.js'; import { i18n$ } from '../i18n.js';
@ -45,7 +43,7 @@ import { i18n$ } from '../i18n.js';
const searchOverlay = function(query, caseInsensitive) { const searchOverlay = function(query, caseInsensitive) {
if ( typeof query === 'string' ) if ( typeof query === 'string' )
query = new RegExp( query = new RegExp(
query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&'), query.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&'),
caseInsensitive ? 'gi' : 'g' caseInsensitive ? 'gi' : 'g'
); );
else if ( !query.global ) else if ( !query.global )
@ -98,7 +96,7 @@ import { i18n$ } from '../i18n.js';
state.queryTimer.offon(350); state.queryTimer.offon(350);
}; };
const searchWidgetClickHandler = function(cm, ev) { const searchWidgetClickHandler = (ev, cm) => {
if ( ev.button !== 0 ) { return; } if ( ev.button !== 0 ) { return; }
const target = ev.target; const target = ev.target;
const tcl = target.classList; const tcl = target.classList;
@ -117,9 +115,7 @@ import { i18n$ } from '../i18n.js';
} }
} }
if ( target.localName !== 'input' ) { if ( target.localName !== 'input' ) {
ev.preventDefault(); cm.focus();
} else {
ev.stopImmediatePropagation();
} }
}; };
@ -143,7 +139,9 @@ import { i18n$ } from '../i18n.js';
this.widget = widgetParent.children[0]; this.widget = widgetParent.children[0];
this.widget.addEventListener('keydown', searchWidgetKeydownHandler.bind(null, cm)); this.widget.addEventListener('keydown', searchWidgetKeydownHandler.bind(null, cm));
this.widget.addEventListener('input', searchWidgetInputHandler.bind(null, cm)); this.widget.addEventListener('input', searchWidgetInputHandler.bind(null, cm));
this.widget.addEventListener('mousedown', searchWidgetClickHandler.bind(null, cm)); this.widget.addEventListener('click', ev => {
searchWidgetClickHandler(ev, cm);
});
if ( typeof cm.addPanel === 'function' ) { if ( typeof cm.addPanel === 'function' ) {
this.panel = cm.addPanel(this.widget); this.panel = cm.addPanel(this.widget);
} }
@ -252,10 +250,7 @@ import { i18n$ } from '../i18n.js';
notation: 'compact', notation: 'compact',
maximumSignificantDigits: 3 maximumSignificantDigits: 3
}); });
if ( if ( intl.resolvedOptions().notation ) {
intl.resolvedOptions instanceof Function &&
intl.resolvedOptions().hasOwnProperty('notation')
) {
intlNumberFormat = intl; intlNumberFormat = intl;
} }
} }
@ -346,9 +341,6 @@ import { i18n$ } from '../i18n.js';
state.annotate.update(annotations); state.annotate.update(annotations);
}); });
state.widget.setAttribute('data-query', state.queryText); state.widget.setAttribute('data-query', state.queryText);
// Ensure the caret is visible
const input = state.widget.querySelector('.cm-search-widget-input input');
input.selectionStart = input.selectionStart;
}; };
const findNext = function(cm, dir, callback) { const findNext = function(cm, dir, callback) {

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

@ -21,8 +21,6 @@
/* global CodeMirror */ /* global CodeMirror */
'use strict';
/******************************************************************************/ /******************************************************************************/
import * as sfp from '../static-filtering-parser.js'; import * as sfp from '../static-filtering-parser.js';
@ -74,142 +72,142 @@ const uBOStaticFilteringMode = (( ) => {
if ( nodeHasError(mode) ) { return 'error'; } if ( nodeHasError(mode) ) { return 'error'; }
const nodeType = mode.astParser.getNodeType(mode.currentWalkerNode); const nodeType = mode.astParser.getNodeType(mode.currentWalkerNode);
switch ( nodeType ) { switch ( nodeType ) {
case sfp.NODE_TYPE_WHITESPACE: case sfp.NODE_TYPE_WHITESPACE:
return ''; return '';
case sfp.NODE_TYPE_COMMENT: case sfp.NODE_TYPE_COMMENT:
if ( mode.astWalker.canGoDown() ) { break; } if ( mode.astWalker.canGoDown() ) { break; }
return 'comment'; return 'comment';
case sfp.NODE_TYPE_COMMENT_URL: case sfp.NODE_TYPE_COMMENT_URL:
return 'comment link'; return 'comment link';
case sfp.NODE_TYPE_IGNORE: case sfp.NODE_TYPE_IGNORE:
return 'comment'; return 'comment';
case sfp.NODE_TYPE_PREPARSE_DIRECTIVE: case sfp.NODE_TYPE_PREPARSE_DIRECTIVE:
case sfp.NODE_TYPE_PREPARSE_DIRECTIVE_VALUE: case sfp.NODE_TYPE_PREPARSE_DIRECTIVE_VALUE:
return 'directive'; return 'directive';
case sfp.NODE_TYPE_PREPARSE_DIRECTIVE_IF_VALUE: { case sfp.NODE_TYPE_PREPARSE_DIRECTIVE_IF_VALUE: {
const raw = mode.astParser.getNodeString(mode.currentWalkerNode); const raw = mode.astParser.getNodeString(mode.currentWalkerNode);
const state = sfp.utils.preparser.evaluateExpr(raw, preparseDirectiveEnv); const state = sfp.utils.preparser.evaluateExpr(raw, preparseDirectiveEnv);
return state ? 'positive strong' : 'negative strong'; return state ? 'positive strong' : 'negative strong';
}
case sfp.NODE_TYPE_EXT_OPTIONS_ANCHOR:
return mode.astParser.getFlags(sfp.AST_FLAG_IS_EXCEPTION)
? 'tag strong'
: 'def strong';
case sfp.NODE_TYPE_EXT_DECORATION:
return 'def';
case sfp.NODE_TYPE_EXT_PATTERN_RAW:
if ( mode.astWalker.canGoDown() ) { break; }
return 'variable';
case sfp.NODE_TYPE_EXT_PATTERN_COSMETIC:
case sfp.NODE_TYPE_EXT_PATTERN_HTML:
return 'variable';
case sfp.NODE_TYPE_EXT_PATTERN_RESPONSEHEADER:
case sfp.NODE_TYPE_EXT_PATTERN_SCRIPTLET:
if ( mode.astWalker.canGoDown() ) { break; }
return 'variable';
case sfp.NODE_TYPE_EXT_PATTERN_SCRIPTLET_TOKEN: {
const token = mode.astParser.getNodeString(mode.currentWalkerNode);
if ( scriptletNames.has(token) === false ) {
return 'warning';
} }
case sfp.NODE_TYPE_EXT_OPTIONS_ANCHOR: return 'variable';
return mode.astParser.getFlags(sfp.AST_FLAG_IS_EXCEPTION) }
? 'tag strong' case sfp.NODE_TYPE_EXT_PATTERN_SCRIPTLET_ARG:
: 'def strong'; return 'variable';
case sfp.NODE_TYPE_EXT_DECORATION: case sfp.NODE_TYPE_NET_EXCEPTION:
return 'def'; return 'tag strong';
case sfp.NODE_TYPE_EXT_PATTERN_RAW: case sfp.NODE_TYPE_NET_PATTERN:
if ( mode.astWalker.canGoDown() ) { break; } if ( mode.astWalker.canGoDown() ) { break; }
return 'variable'; if ( mode.astParser.isRegexPattern() ) {
case sfp.NODE_TYPE_EXT_PATTERN_COSMETIC: if ( mode.astParser.getNodeFlags(mode.currentWalkerNode, sfp.NODE_FLAG_PATTERN_UNTOKENIZABLE) !== 0 ) {
case sfp.NODE_TYPE_EXT_PATTERN_HTML: return 'variable warning';
return 'variable';
case sfp.NODE_TYPE_EXT_PATTERN_RESPONSEHEADER:
case sfp.NODE_TYPE_EXT_PATTERN_SCRIPTLET:
if ( mode.astWalker.canGoDown() ) { break; }
return 'variable';
case sfp.NODE_TYPE_EXT_PATTERN_SCRIPTLET_TOKEN: {
const token = mode.astParser.getNodeString(mode.currentWalkerNode);
if ( scriptletNames.has(token) === false ) {
return 'warning';
} }
return 'variable'; return 'variable notice';
} }
case sfp.NODE_TYPE_EXT_PATTERN_SCRIPTLET_ARG: return 'variable';
return 'variable'; case sfp.NODE_TYPE_NET_PATTERN_PART:
case sfp.NODE_TYPE_NET_EXCEPTION: return 'variable';
return 'tag strong'; case sfp.NODE_TYPE_NET_PATTERN_PART_SPECIAL:
case sfp.NODE_TYPE_NET_PATTERN: return 'keyword strong';
if ( mode.astWalker.canGoDown() ) { break; } case sfp.NODE_TYPE_NET_PATTERN_PART_UNICODE:
if ( mode.astParser.isRegexPattern() ) { return 'variable unicode';
if ( mode.astParser.getNodeFlags(mode.currentWalkerNode, sfp.NODE_FLAG_PATTERN_UNTOKENIZABLE) !== 0 ) { case sfp.NODE_TYPE_NET_PATTERN_LEFT_HNANCHOR:
return 'variable warning'; case sfp.NODE_TYPE_NET_PATTERN_LEFT_ANCHOR:
} case sfp.NODE_TYPE_NET_PATTERN_RIGHT_ANCHOR:
return 'variable notice'; case sfp.NODE_TYPE_NET_OPTION_NAME_NOT:
} return 'keyword strong';
return 'variable'; case sfp.NODE_TYPE_NET_OPTIONS_ANCHOR:
case sfp.NODE_TYPE_NET_PATTERN_PART: case sfp.NODE_TYPE_NET_OPTION_SEPARATOR:
return 'variable'; mode.lastNetOptionType = 0;
case sfp.NODE_TYPE_NET_PATTERN_PART_SPECIAL: return 'def strong';
return 'keyword strong'; case sfp.NODE_TYPE_NET_OPTION_NAME_UNKNOWN:
case sfp.NODE_TYPE_NET_PATTERN_PART_UNICODE: mode.lastNetOptionType = 0;
return 'variable unicode'; return 'error';
case sfp.NODE_TYPE_NET_PATTERN_LEFT_HNANCHOR: case sfp.NODE_TYPE_NET_OPTION_NAME_1P:
case sfp.NODE_TYPE_NET_PATTERN_LEFT_ANCHOR: case sfp.NODE_TYPE_NET_OPTION_NAME_STRICT1P:
case sfp.NODE_TYPE_NET_PATTERN_RIGHT_ANCHOR: case sfp.NODE_TYPE_NET_OPTION_NAME_3P:
case sfp.NODE_TYPE_NET_OPTION_NAME_NOT: case sfp.NODE_TYPE_NET_OPTION_NAME_STRICT3P:
return 'keyword strong'; case sfp.NODE_TYPE_NET_OPTION_NAME_ALL:
case sfp.NODE_TYPE_NET_OPTIONS_ANCHOR: case sfp.NODE_TYPE_NET_OPTION_NAME_BADFILTER:
case sfp.NODE_TYPE_NET_OPTION_SEPARATOR: case sfp.NODE_TYPE_NET_OPTION_NAME_CNAME:
mode.lastNetOptionType = 0; case sfp.NODE_TYPE_NET_OPTION_NAME_CSP:
return 'def strong'; case sfp.NODE_TYPE_NET_OPTION_NAME_CSS:
case sfp.NODE_TYPE_NET_OPTION_NAME_UNKNOWN: case sfp.NODE_TYPE_NET_OPTION_NAME_DENYALLOW:
mode.lastNetOptionType = 0; case sfp.NODE_TYPE_NET_OPTION_NAME_DOC:
return 'error'; case sfp.NODE_TYPE_NET_OPTION_NAME_EHIDE:
case sfp.NODE_TYPE_NET_OPTION_NAME_1P: case sfp.NODE_TYPE_NET_OPTION_NAME_EMPTY:
case sfp.NODE_TYPE_NET_OPTION_NAME_STRICT1P: case sfp.NODE_TYPE_NET_OPTION_NAME_FONT:
case sfp.NODE_TYPE_NET_OPTION_NAME_3P: case sfp.NODE_TYPE_NET_OPTION_NAME_FRAME:
case sfp.NODE_TYPE_NET_OPTION_NAME_STRICT3P: case sfp.NODE_TYPE_NET_OPTION_NAME_FROM:
case sfp.NODE_TYPE_NET_OPTION_NAME_ALL: case sfp.NODE_TYPE_NET_OPTION_NAME_GENERICBLOCK:
case sfp.NODE_TYPE_NET_OPTION_NAME_BADFILTER: case sfp.NODE_TYPE_NET_OPTION_NAME_GHIDE:
case sfp.NODE_TYPE_NET_OPTION_NAME_CNAME: case sfp.NODE_TYPE_NET_OPTION_NAME_HEADER:
case sfp.NODE_TYPE_NET_OPTION_NAME_CSP: case sfp.NODE_TYPE_NET_OPTION_NAME_IMAGE:
case sfp.NODE_TYPE_NET_OPTION_NAME_CSS: case sfp.NODE_TYPE_NET_OPTION_NAME_IMPORTANT:
case sfp.NODE_TYPE_NET_OPTION_NAME_DENYALLOW: case sfp.NODE_TYPE_NET_OPTION_NAME_INLINEFONT:
case sfp.NODE_TYPE_NET_OPTION_NAME_DOC: case sfp.NODE_TYPE_NET_OPTION_NAME_INLINESCRIPT:
case sfp.NODE_TYPE_NET_OPTION_NAME_EHIDE: case sfp.NODE_TYPE_NET_OPTION_NAME_MATCHCASE:
case sfp.NODE_TYPE_NET_OPTION_NAME_EMPTY: case sfp.NODE_TYPE_NET_OPTION_NAME_MEDIA:
case sfp.NODE_TYPE_NET_OPTION_NAME_FONT: case sfp.NODE_TYPE_NET_OPTION_NAME_METHOD:
case sfp.NODE_TYPE_NET_OPTION_NAME_FRAME: case sfp.NODE_TYPE_NET_OPTION_NAME_MP4:
case sfp.NODE_TYPE_NET_OPTION_NAME_FROM: case sfp.NODE_TYPE_NET_OPTION_NAME_NOOP:
case sfp.NODE_TYPE_NET_OPTION_NAME_GENERICBLOCK: case sfp.NODE_TYPE_NET_OPTION_NAME_OBJECT:
case sfp.NODE_TYPE_NET_OPTION_NAME_GHIDE: case sfp.NODE_TYPE_NET_OPTION_NAME_OTHER:
case sfp.NODE_TYPE_NET_OPTION_NAME_HEADER: case sfp.NODE_TYPE_NET_OPTION_NAME_PING:
case sfp.NODE_TYPE_NET_OPTION_NAME_IMAGE: case sfp.NODE_TYPE_NET_OPTION_NAME_POPUNDER:
case sfp.NODE_TYPE_NET_OPTION_NAME_IMPORTANT: case sfp.NODE_TYPE_NET_OPTION_NAME_POPUP:
case sfp.NODE_TYPE_NET_OPTION_NAME_INLINEFONT: case sfp.NODE_TYPE_NET_OPTION_NAME_REDIRECT:
case sfp.NODE_TYPE_NET_OPTION_NAME_INLINESCRIPT: case sfp.NODE_TYPE_NET_OPTION_NAME_REDIRECTRULE:
case sfp.NODE_TYPE_NET_OPTION_NAME_MATCHCASE: case sfp.NODE_TYPE_NET_OPTION_NAME_REMOVEPARAM:
case sfp.NODE_TYPE_NET_OPTION_NAME_MEDIA: case sfp.NODE_TYPE_NET_OPTION_NAME_SCRIPT:
case sfp.NODE_TYPE_NET_OPTION_NAME_METHOD: case sfp.NODE_TYPE_NET_OPTION_NAME_SHIDE:
case sfp.NODE_TYPE_NET_OPTION_NAME_MP4: case sfp.NODE_TYPE_NET_OPTION_NAME_TO:
case sfp.NODE_TYPE_NET_OPTION_NAME_NOOP: case sfp.NODE_TYPE_NET_OPTION_NAME_URLTRANSFORM:
case sfp.NODE_TYPE_NET_OPTION_NAME_OBJECT: case sfp.NODE_TYPE_NET_OPTION_NAME_XHR:
case sfp.NODE_TYPE_NET_OPTION_NAME_OTHER: case sfp.NODE_TYPE_NET_OPTION_NAME_WEBRTC:
case sfp.NODE_TYPE_NET_OPTION_NAME_PING: case sfp.NODE_TYPE_NET_OPTION_NAME_WEBSOCKET:
case sfp.NODE_TYPE_NET_OPTION_NAME_POPUNDER: mode.lastNetOptionType = nodeType;
case sfp.NODE_TYPE_NET_OPTION_NAME_POPUP: return 'def';
case sfp.NODE_TYPE_NET_OPTION_ASSIGN:
return 'def';
case sfp.NODE_TYPE_NET_OPTION_VALUE:
if ( mode.astWalker.canGoDown() ) { break; }
switch ( mode.lastNetOptionType ) {
case sfp.NODE_TYPE_NET_OPTION_NAME_REDIRECT: case sfp.NODE_TYPE_NET_OPTION_NAME_REDIRECT:
case sfp.NODE_TYPE_NET_OPTION_NAME_REDIRECTRULE: case sfp.NODE_TYPE_NET_OPTION_NAME_REDIRECTRULE:
case sfp.NODE_TYPE_NET_OPTION_NAME_REMOVEPARAM: return redirectTokenStyle(mode);
case sfp.NODE_TYPE_NET_OPTION_NAME_SCRIPT:
case sfp.NODE_TYPE_NET_OPTION_NAME_SHIDE:
case sfp.NODE_TYPE_NET_OPTION_NAME_TO:
case sfp.NODE_TYPE_NET_OPTION_NAME_URLTRANSFORM:
case sfp.NODE_TYPE_NET_OPTION_NAME_XHR:
case sfp.NODE_TYPE_NET_OPTION_NAME_WEBRTC:
case sfp.NODE_TYPE_NET_OPTION_NAME_WEBSOCKET:
mode.lastNetOptionType = nodeType;
return 'def';
case sfp.NODE_TYPE_NET_OPTION_ASSIGN:
return 'def';
case sfp.NODE_TYPE_NET_OPTION_VALUE:
if ( mode.astWalker.canGoDown() ) { break; }
switch ( mode.lastNetOptionType ) {
case sfp.NODE_TYPE_NET_OPTION_NAME_REDIRECT:
case sfp.NODE_TYPE_NET_OPTION_NAME_REDIRECTRULE:
return redirectTokenStyle(mode);
default:
break;
}
return 'value';
case sfp.NODE_TYPE_OPTION_VALUE_NOT:
return 'keyword strong';
case sfp.NODE_TYPE_OPTION_VALUE_DOMAIN:
return 'value';
case sfp.NODE_TYPE_OPTION_VALUE_SEPARATOR:
return 'def';
default: default:
break; break;
}
return 'value';
case sfp.NODE_TYPE_OPTION_VALUE_NOT:
return 'keyword strong';
case sfp.NODE_TYPE_OPTION_VALUE_DOMAIN:
return 'value';
case sfp.NODE_TYPE_OPTION_VALUE_SEPARATOR:
return 'def';
default:
break;
} }
return '+'; return '+';
}; };
@ -342,7 +340,7 @@ function initHints() {
}); });
const proceduralOperatorNames = new Map( const proceduralOperatorNames = new Map(
Array.from(sfp.proceduralOperatorTokens) Array.from(sfp.proceduralOperatorTokens)
.filter(item => (item[1] & 0b01) !== 0) .filter(item => (item[1] & 0b01) !== 0)
); );
const excludedHints = new Set([ const excludedHints = new Set([
'genericblock', 'genericblock',
@ -577,7 +575,7 @@ function initHints() {
const getExtScriptletHints = function(cursor, line) { const getExtScriptletHints = function(cursor, line) {
const beg = cursor.ch; const beg = cursor.ch;
const matchLeft = /#\+\js\(([^,]*)$/.exec(line.slice(0, beg)); const matchLeft = /#\+js\(([^,]*)$/.exec(line.slice(0, beg));
const matchRight = /^([^,)]*)/.exec(line.slice(beg)); const matchRight = /^([^,)]*)/.exec(line.slice(beg));
if ( matchLeft === null || matchRight === null ) { return; } if ( matchLeft === null || matchRight === null ) { return; }
const hints = []; const hints = [];
@ -724,38 +722,38 @@ CodeMirror.registerHelper('fold', 'ubo-static-filtering', (( ) => {
if ( astParser.hasError() ) { if ( astParser.hasError() ) {
let msg = 'Invalid filter'; let msg = 'Invalid filter';
switch ( astParser.astError ) { switch ( astParser.astError ) {
case sfp.AST_ERROR_UNSUPPORTED: case sfp.AST_ERROR_UNSUPPORTED:
msg = `${msg}: Unsupported filter syntax`; msg = `${msg}: Unsupported filter syntax`;
break; break;
case sfp.AST_ERROR_REGEX: case sfp.AST_ERROR_REGEX:
msg = `${msg}: Bad regular expression`; msg = `${msg}: Bad regular expression`;
break; break;
case sfp.AST_ERROR_PATTERN: case sfp.AST_ERROR_PATTERN:
msg = `${msg}: Bad pattern`; msg = `${msg}: Bad pattern`;
break; break;
case sfp.AST_ERROR_DOMAIN_NAME: case sfp.AST_ERROR_DOMAIN_NAME:
msg = `${msg}: Bad domain name`; msg = `${msg}: Bad domain name`;
break; break;
case sfp.AST_ERROR_OPTION_BADVALUE: case sfp.AST_ERROR_OPTION_BADVALUE:
msg = `${msg}: Bad value assigned to a valid option`; msg = `${msg}: Bad value assigned to a valid option`;
break; break;
case sfp.AST_ERROR_OPTION_DUPLICATE: case sfp.AST_ERROR_OPTION_DUPLICATE:
msg = `${msg}: Duplicate filter option`; msg = `${msg}: Duplicate filter option`;
break; break;
case sfp.AST_ERROR_OPTION_UNKNOWN: case sfp.AST_ERROR_OPTION_UNKNOWN:
msg = `${msg}: Unsupported filter option`; msg = `${msg}: Unsupported filter option`;
break; break;
case sfp.AST_ERROR_IF_TOKEN_UNKNOWN: case sfp.AST_ERROR_IF_TOKEN_UNKNOWN:
msg = `${msg}: Unknown preparsing token`; msg = `${msg}: Unknown preparsing token`;
break; break;
case sfp.AST_ERROR_UNTRUSTED_SOURCE: case sfp.AST_ERROR_UNTRUSTED_SOURCE:
msg = `${msg}: Filter requires trusted source`; msg = `${msg}: Filter requires trusted source`;
break; break;
default: default:
if ( astParser.isCosmeticFilter() && astParser.result.error ) { if ( astParser.isCosmeticFilter() && astParser.result.error ) {
msg = `${msg}: ${astParser.result.error}`; msg = `${msg}: ${astParser.result.error}`;
} }
break; break;
} }
return { lint: 'error', msg }; return { lint: 'error', msg };
} }
@ -1103,16 +1101,8 @@ CodeMirror.registerHelper('fold', 'ubo-static-filtering', (( ) => {
}; };
self.addEventListener('trustedSource', ev => { self.addEventListener('trustedSource', ev => {
const { cm, trusted } = ev.detail; const { trusted } = ev.detail;
astParser.options.trustedSource = trusted; astParser.options.trustedSource = trusted;
const doc = cm.getDoc();
const lineCount = doc.lineCount();
onBeforeChanges(cm, {
from: { line: 0, ch: 0 },
to: { line: lineCount, ch: 0 },
});
changeset.push({ from: 0, to: lineCount });
processChangesetAsync(doc);
}); });
self.addEventListener('trustedScriptletTokens', ev => { self.addEventListener('trustedScriptletTokens', ev => {