From 5da9e0e7f463c7d7c15629f6c94d42988bd9738e Mon Sep 17 00:00:00 2001 From: jspenguin2017 Date: Mon, 11 Dec 2017 10:23:02 -0700 Subject: [PATCH] add search and extract highlighting logic to another file #23 #15 --- src/1p-filters.html | 2 + src/js/1p-filters.js | 292 ----------------- src/js/ace-ext-searchbox-1.2.9.js | 508 ++++++++++++++++++++++++++++++ src/js/nano-highlight.js | 303 ++++++++++++++++++ 4 files changed, 813 insertions(+), 292 deletions(-) create mode 100644 src/js/ace-ext-searchbox-1.2.9.js create mode 100644 src/js/nano-highlight.js diff --git a/src/1p-filters.html b/src/1p-filters.html index 301c9ce77729e..49a8b20896084 100644 --- a/src/1p-filters.html +++ b/src/1p-filters.html @@ -44,6 +44,8 @@ + + diff --git a/src/js/1p-filters.js b/src/js/1p-filters.js index d4fc6453a8a57..250657b9d809f 100644 --- a/src/js/1p-filters.js +++ b/src/js/1p-filters.js @@ -29,298 +29,6 @@ /******************************************************************************/ -// Patch 2017-12-06: Add syntax highlighting -ace.define('ace/mode/nano_filters', function(require, exports, module) { - var oop = ace.require('ace/lib/oop'); - var TextMode = ace.require('ace/mode/text').Mode; - var HighlightRules = ace.require('ace/mode/nano_filters_hr').HighlightRules; - exports.Mode = function() { - this.HighlightRules = HighlightRules; - this.lineCommentStart = "!"; - }; - oop.inherits(exports.Mode, TextMode); -}); -ace.define('ace/mode/nano_filters_hr', function(require, exports, module) { - const oop = ace.require('ace/lib/oop'); - const TextHighlightRules = ace.require('ace/mode/text_highlight_rules') - .TextHighlightRules; - exports.HighlightRules = function() { - this.$rules = { - start: [ - //Comments - { - token: 'comment', - regex: /^! === /, - next: 'header' - }, - { - // TODO 2017-12-06: Inline comments are only allowed for - // network filter - token: 'comment.line', - regex: /^(?:!|# |\[).*/ - }, - //CSS - { - token: 'keyword.control', - regex: /#@?\$?#/, - next: 'double_hash' - }, - //Operators - { - token: 'keyword.operator', - regex: /^@@|\||,|\^|\*/ - }, - //Options - { - token: 'invalid.illegal', - regex: /\$,/, - next: 'options' - }, - { - token: 'keyword.control', - regex: /\$/, - next: 'options' - }, - //Domains (default) - { - defaultToken: 'string.unquoted' - } - ], - header: [ - //Exit - { - token: 'text', - regex: /$/, - next: 'start' - }, - //Operators - { - token: 'keyword.operator', - regex: /,/ - }, - //NSFW flag - { - token: 'keyword.other', - regex: /NSFW!/ - }, - //Header text (default) - { - defaultToken: 'text' - } - ], - double_hash: [ - //Exit - { - token: 'text', - regex: /$/, - next: 'start' - }, - //Script inject - { - token: 'keyword.control', - regex: /script:inject\(/, - next: 'script_inject_part1' - }, - //CSS (default) - { - defaultToken: 'constant.character' - } - ], - script_inject_part1: [ - //Exit - { - // TODO 2017-12-07: Is this right? Need to investigate how - // uBlock Origin process commas - token: 'invalid.illegal', - regex: /,\)?$/, - next: 'start' - }, - { - token: 'keyword.control', - regex: /\)$/, - next: 'start' - }, - { - //Unexpected line break - token: 'invalid.illegal', - regex: /.?$/, - next: 'start' - }, - //Parameters - { - token: 'keyword.operator', - regex: /,/, - next: 'script_inject_part2' - }, - //Scriplet name (default) - { - defaultToken: 'variable.other' - } - ], - script_inject_part2: [ - //Exit - { - //Missing parentheses - token: 'invalid.illegal', - regex: /[^\)]?$/, - next: 'start' - }, - { - token: 'keyword.control', - regex: /\)$/, - next: 'start' - }, - //Parameters (default) - { - defaultToken: 'constant.character' - } - ], - options: [ - //Exit - { - token: 'invalid.illegal', - regex: /,$/, - next: 'start' - }, - { - token: 'text', - regex: /$/, - next: 'start' - }, - //Operators - { - token: 'keyword.operator', - regex: /,/ - }, - //Modifiers - { - token: 'keyword.control', - regex: /document|~?first-party|~?third-party|important|badfilter/ - }, - //Actions - { - token: 'variable.other', - regex: /popup|popunder|generichide|inline-script/ - }, - //Types - { - //Compatible layer - token: 'variable.parameter', - regex: /beacon|ping|elemhide|object-subrequest/ - }, - { - //Resource type - token: 'variable.parameter', - regex: /~?(?:font|image|media|object|script|stylesheet|subdocument|xmlhttprequest)/ - }, - { - //Special types - token: 'variable.parameter', - regex: /websocket|webrtc|data|other/ - }, - //Redirect - { - token: 'keyword.language', - regex: /redirect=/, - next: 'options_redirect' - }, - //Domains restriction - { - token: 'keyword.language', - regex: /domain=/, - next: 'options_domain' - }, - //CSP - { - token: 'keyword.language', - regex: /csp=/, - next: 'options_csp' - }, - { - token: 'keyword.language', - regex: /csp/ - }, - //Invalid (default) - { - defaultToken: 'invalid.illegal' - } - ], - options_redirect: [ - //Exit - { - token: 'invalid.illegal', - regex: /,$/, - next: 'start' - }, - { - token: 'text', - regex: /$/, - next: 'start' - }, - //Operators - { - token: 'keyword.operator', - regex: /,/, - next: 'options' - }, - //Redirect resource name (default) - { - defaultToken: 'variable.language', - } - ], - options_domain: [ - //Exit - { - token: 'invalid.illegal', - regex: /,$/, - next: 'start' - }, - { - token: 'text', - regex: /$/, - next: 'start' - }, - //Operators - { - token: 'keyword.operator', - regex: /,/, - next: 'options' - }, - //Domains (default) - { - defaultToken: 'string.unquoted' - } - ], - options_csp: [ - //Exit - { - token: 'invalid.illegal', - regex: /,$/, - next: 'start' - }, - { - token: 'text', - regex: /$/, - next: 'start' - }, - //Operators - { - token: 'keyword.operator', - regex: /,/, - next: 'options' - }, - //CSP text (default) - { - defaultToken: 'constant.character' - } - ] - }; - }; - oop.inherits(exports.HighlightRules, TextHighlightRules); -}); - -/******************************************************************************/ - var editor = ace.edit('userFilters'); editor.getSession().setMode('ace/mode/nano_filters'); editor.$blockScrolling = Infinity; diff --git a/src/js/ace-ext-searchbox-1.2.9.js b/src/js/ace-ext-searchbox-1.2.9.js new file mode 100644 index 0000000000000..70cadc3551ddd --- /dev/null +++ b/src/js/ace-ext-searchbox-1.2.9.js @@ -0,0 +1,508 @@ +ace.define("ace/ext/searchbox",["require","exports","module","ace/lib/dom","ace/lib/lang","ace/lib/event","ace/keyboard/hash_handler","ace/lib/keys"], function(require, exports, module) { +"use strict"; + +var dom = require("../lib/dom"); +var lang = require("../lib/lang"); +var event = require("../lib/event"); +var searchboxCss = "\ +.ace_search {\ +background-color: #ddd;\ +color: #666;\ +border: 1px solid #cbcbcb;\ +border-top: 0 none;\ +overflow: hidden;\ +margin: 0;\ +padding: 4px 6px 0 4px;\ +position: absolute;\ +top: 0;\ +z-index: 99;\ +white-space: normal;\ +}\ +.ace_search.left {\ +border-left: 0 none;\ +border-radius: 0px 0px 5px 0px;\ +left: 0;\ +}\ +.ace_search.right {\ +border-radius: 0px 0px 0px 5px;\ +border-right: 0 none;\ +right: 0;\ +}\ +.ace_search_form, .ace_replace_form {\ +margin: 0 20px 4px 0;\ +overflow: hidden;\ +line-height: 1.9;\ +}\ +.ace_replace_form {\ +margin-right: 0;\ +}\ +.ace_search_form.ace_nomatch {\ +outline: 1px solid red;\ +}\ +.ace_search_field {\ +border-radius: 3px 0 0 3px;\ +background-color: white;\ +color: black;\ +border: 1px solid #cbcbcb;\ +border-right: 0 none;\ +box-sizing: border-box!important;\ +outline: 0;\ +padding: 0;\ +font-size: inherit;\ +margin: 0;\ +line-height: inherit;\ +padding: 0 6px;\ +min-width: 17em;\ +vertical-align: top;\ +}\ +.ace_searchbtn {\ +border: 1px solid #cbcbcb;\ +line-height: inherit;\ +display: inline-block;\ +padding: 0 6px;\ +background: #fff;\ +border-right: 0 none;\ +border-left: 1px solid #dcdcdc;\ +cursor: pointer;\ +margin: 0;\ +position: relative;\ +box-sizing: content-box!important;\ +color: #666;\ +}\ +.ace_searchbtn:last-child {\ +border-radius: 0 3px 3px 0;\ +border-right: 1px solid #cbcbcb;\ +}\ +.ace_searchbtn:disabled {\ +background: none;\ +cursor: default;\ +}\ +.ace_searchbtn:hover {\ +background-color: #eef1f6;\ +}\ +.ace_searchbtn.prev, .ace_searchbtn.next {\ +padding: 0px 0.7em\ +}\ +.ace_searchbtn.prev:after, .ace_searchbtn.next:after {\ +content: \"\";\ +border: solid 2px #888;\ +width: 0.5em;\ +height: 0.5em;\ +border-width: 2px 0 0 2px;\ +display:inline-block;\ +transform: rotate(-45deg);\ +}\ +.ace_searchbtn.next:after {\ +border-width: 0 2px 2px 0 ;\ +}\ +.ace_searchbtn_close {\ +background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAcCAYAAABRVo5BAAAAZ0lEQVR42u2SUQrAMAhDvazn8OjZBilCkYVVxiis8H4CT0VrAJb4WHT3C5xU2a2IQZXJjiQIRMdkEoJ5Q2yMqpfDIo+XY4k6h+YXOyKqTIj5REaxloNAd0xiKmAtsTHqW8sR2W5f7gCu5nWFUpVjZwAAAABJRU5ErkJggg==) no-repeat 50% 0;\ +border-radius: 50%;\ +border: 0 none;\ +color: #656565;\ +cursor: pointer;\ +font: 16px/16px Arial;\ +padding: 0;\ +height: 14px;\ +width: 14px;\ +top: 9px;\ +right: 7px;\ +position: absolute;\ +}\ +.ace_searchbtn_close:hover {\ +background-color: #656565;\ +background-position: 50% 100%;\ +color: white;\ +}\ +.ace_button {\ +margin-left: 2px;\ +cursor: pointer;\ +-webkit-user-select: none;\ +-moz-user-select: none;\ +-o-user-select: none;\ +-ms-user-select: none;\ +user-select: none;\ +overflow: hidden;\ +opacity: 0.7;\ +border: 1px solid rgba(100,100,100,0.23);\ +padding: 1px;\ +box-sizing: border-box!important;\ +color: black;\ +}\ +.ace_button:hover {\ +background-color: #eee;\ +opacity:1;\ +}\ +.ace_button:active {\ +background-color: #ddd;\ +}\ +.ace_button.checked {\ +border-color: #3399ff;\ +opacity:1;\ +}\ +.ace_search_options{\ +margin-bottom: 3px;\ +text-align: right;\ +-webkit-user-select: none;\ +-moz-user-select: none;\ +-o-user-select: none;\ +-ms-user-select: none;\ +user-select: none;\ +clear: both;\ +}\ +.ace_search_counter {\ +float: left;\ +font-family: arial;\ +padding: 0 8px;\ +}"; +var HashHandler = require("../keyboard/hash_handler").HashHandler; +var keyUtil = require("../lib/keys"); + +var MAX_COUNT = 999; + +dom.importCssString(searchboxCss, "ace_searchbox"); + +var html = '
\ + \ +
\ + \ + \ + \ + All\ +
\ +
\ + \ + Replace\ + All\ +
\ +
\ + +\ + \ + .*\ + Aa\ + \\b\ + S\ +
\ +
'.replace(/> +/g, ">"); + +var SearchBox = function(editor, range, showReplaceForm) { + var div = dom.createElement("div"); + div.innerHTML = html; + this.element = div.firstChild; + + this.setSession = this.setSession.bind(this); + + this.$init(); + this.setEditor(editor); +}; + +(function() { + this.setEditor = function(editor) { + editor.searchBox = this; + editor.renderer.scroller.appendChild(this.element); + this.editor = editor; + }; + + this.setSession = function(e) { + this.searchRange = null; + this.$syncOptions(true); + }; + + this.$initElements = function(sb) { + this.searchBox = sb.querySelector(".ace_search_form"); + this.replaceBox = sb.querySelector(".ace_replace_form"); + this.searchOption = sb.querySelector("[action=searchInSelection]"); + this.replaceOption = sb.querySelector("[action=toggleReplace]"); + this.regExpOption = sb.querySelector("[action=toggleRegexpMode]"); + this.caseSensitiveOption = sb.querySelector("[action=toggleCaseSensitive]"); + this.wholeWordOption = sb.querySelector("[action=toggleWholeWords]"); + this.searchInput = this.searchBox.querySelector(".ace_search_field"); + this.replaceInput = this.replaceBox.querySelector(".ace_search_field"); + this.searchCounter = sb.querySelector(".ace_search_counter"); + }; + + this.$init = function() { + var sb = this.element; + + this.$initElements(sb); + + var _this = this; + event.addListener(sb, "mousedown", function(e) { + setTimeout(function(){ + _this.activeInput.focus(); + }, 0); + event.stopPropagation(e); + }); + event.addListener(sb, "click", function(e) { + var t = e.target || e.srcElement; + var action = t.getAttribute("action"); + if (action && _this[action]) + _this[action](); + else if (_this.$searchBarKb.commands[action]) + _this.$searchBarKb.commands[action].exec(_this); + event.stopPropagation(e); + }); + + event.addCommandKeyListener(sb, function(e, hashId, keyCode) { + var keyString = keyUtil.keyCodeToString(keyCode); + var command = _this.$searchBarKb.findKeyCommand(hashId, keyString); + if (command && command.exec) { + command.exec(_this); + event.stopEvent(e); + } + }); + + this.$onChange = lang.delayedCall(function() { + _this.find(false, false); + }); + + event.addListener(this.searchInput, "input", function() { + _this.$onChange.schedule(20); + }); + event.addListener(this.searchInput, "focus", function() { + _this.activeInput = _this.searchInput; + _this.searchInput.value && _this.highlight(); + }); + event.addListener(this.replaceInput, "focus", function() { + _this.activeInput = _this.replaceInput; + _this.searchInput.value && _this.highlight(); + }); + }; + this.$closeSearchBarKb = new HashHandler([{ + bindKey: "Esc", + name: "closeSearchBar", + exec: function(editor) { + editor.searchBox.hide(); + } + }]); + this.$searchBarKb = new HashHandler(); + this.$searchBarKb.bindKeys({ + "Ctrl-f|Command-f": function(sb) { + var isReplace = sb.isReplace = !sb.isReplace; + sb.replaceBox.style.display = isReplace ? "" : "none"; + sb.replaceOption.checked = false; + sb.$syncOptions(); + sb.searchInput.focus(); + }, + "Ctrl-H|Command-Option-F": function(sb) { + sb.replaceOption.checked = true; + sb.$syncOptions(); + sb.replaceInput.focus(); + }, + "Ctrl-G|Command-G": function(sb) { + sb.findNext(); + }, + "Ctrl-Shift-G|Command-Shift-G": function(sb) { + sb.findPrev(); + }, + "esc": function(sb) { + setTimeout(function() { sb.hide();}); + }, + "Return": function(sb) { + if (sb.activeInput == sb.replaceInput) + sb.replace(); + sb.findNext(); + }, + "Shift-Return": function(sb) { + if (sb.activeInput == sb.replaceInput) + sb.replace(); + sb.findPrev(); + }, + "Alt-Return": function(sb) { + if (sb.activeInput == sb.replaceInput) + sb.replaceAll(); + sb.findAll(); + }, + "Tab": function(sb) { + (sb.activeInput == sb.replaceInput ? sb.searchInput : sb.replaceInput).focus(); + } + }); + + this.$searchBarKb.addCommands([{ + name: "toggleRegexpMode", + bindKey: {win: "Alt-R|Alt-/", mac: "Ctrl-Alt-R|Ctrl-Alt-/"}, + exec: function(sb) { + sb.regExpOption.checked = !sb.regExpOption.checked; + sb.$syncOptions(); + } + }, { + name: "toggleCaseSensitive", + bindKey: {win: "Alt-C|Alt-I", mac: "Ctrl-Alt-R|Ctrl-Alt-I"}, + exec: function(sb) { + sb.caseSensitiveOption.checked = !sb.caseSensitiveOption.checked; + sb.$syncOptions(); + } + }, { + name: "toggleWholeWords", + bindKey: {win: "Alt-B|Alt-W", mac: "Ctrl-Alt-B|Ctrl-Alt-W"}, + exec: function(sb) { + sb.wholeWordOption.checked = !sb.wholeWordOption.checked; + sb.$syncOptions(); + } + }, { + name: "toggleReplace", + exec: function(sb) { + sb.replaceOption.checked = !sb.replaceOption.checked; + sb.$syncOptions(); + } + }, { + name: "searchInSelection", + exec: function(sb) { + sb.searchOption.checked = !sb.searchRange; + sb.setSearchRange(sb.searchOption.checked && sb.editor.getSelectionRange()); + sb.$syncOptions(); + } + }]); + + this.setSearchRange = function(range) { + this.searchRange = range; + if (range) { + this.searchRangeMarker = this.editor.session.addMarker(range, "ace_active-line"); + } else if (this.searchRangeMarker) { + this.editor.session.removeMarker(this.searchRangeMarker); + this.searchRangeMarker = null; + } + }; + + this.$syncOptions = function(preventScroll) { + dom.setCssClass(this.replaceOption, "checked", this.searchRange); + dom.setCssClass(this.searchOption, "checked", this.searchOption.checked); + this.replaceOption.textContent = this.replaceOption.checked ? "-" : "+"; + dom.setCssClass(this.regExpOption, "checked", this.regExpOption.checked); + dom.setCssClass(this.wholeWordOption, "checked", this.wholeWordOption.checked); + dom.setCssClass(this.caseSensitiveOption, "checked", this.caseSensitiveOption.checked); + this.replaceBox.style.display = this.replaceOption.checked ? "" : "none"; + this.find(false, false, preventScroll); + }; + + this.highlight = function(re) { + this.editor.session.highlight(re || this.editor.$search.$options.re); + this.editor.renderer.updateBackMarkers(); + }; + this.find = function(skipCurrent, backwards, preventScroll) { + var range = this.editor.find(this.searchInput.value, { + skipCurrent: skipCurrent, + backwards: backwards, + wrap: true, + regExp: this.regExpOption.checked, + caseSensitive: this.caseSensitiveOption.checked, + wholeWord: this.wholeWordOption.checked, + preventScroll: preventScroll, + range: this.searchRange + }); + var noMatch = !range && this.searchInput.value; + dom.setCssClass(this.searchBox, "ace_nomatch", noMatch); + this.editor._emit("findSearchBox", { match: !noMatch }); + this.highlight(); + this.updateCounter(); + }; + this.updateCounter = function() { + var editor = this.editor; + var regex = editor.$search.$options.re; + var all = 0; + var before = 0; + if (regex) { + var value = this.searchRange + ? editor.session.getTextRange(this.searchRange) + : editor.getValue(); + + var offset = editor.session.doc.positionToIndex(editor.selection.anchor); + if (this.searchRange) + offset -= editor.session.doc.positionToIndex(this.searchRange.start); + + var last = regex.lastIndex = 0; + var m; + while ((m = regex.exec(value))) { + all++; + last = m.index; + if (last <= offset) + before++; + if (all > MAX_COUNT) + break; + if (!m[0]) { + regex.lastIndex = last += 1; + if (last >= value.length) + break; + } + } + } + this.searchCounter.textContent = before + " of " + (all > MAX_COUNT ? MAX_COUNT + "+" : all); + }; + this.findNext = function() { + this.find(true, false); + }; + this.findPrev = function() { + this.find(true, true); + }; + this.findAll = function(){ + var range = this.editor.findAll(this.searchInput.value, { + regExp: this.regExpOption.checked, + caseSensitive: this.caseSensitiveOption.checked, + wholeWord: this.wholeWordOption.checked + }); + var noMatch = !range && this.searchInput.value; + dom.setCssClass(this.searchBox, "ace_nomatch", noMatch); + this.editor._emit("findSearchBox", { match: !noMatch }); + this.highlight(); + this.hide(); + }; + this.replace = function() { + if (!this.editor.getReadOnly()) + this.editor.replace(this.replaceInput.value); + }; + this.replaceAndFindNext = function() { + if (!this.editor.getReadOnly()) { + this.editor.replace(this.replaceInput.value); + this.findNext(); + } + }; + this.replaceAll = function() { + if (!this.editor.getReadOnly()) + this.editor.replaceAll(this.replaceInput.value); + }; + + this.hide = function() { + this.active = false; + this.setSearchRange(null); + this.editor.off("changeSession", this.setSession); + + this.element.style.display = "none"; + this.editor.keyBinding.removeKeyboardHandler(this.$closeSearchBarKb); + this.editor.focus(); + }; + this.show = function(value, isReplace) { + this.active = true; + this.editor.on("changeSession", this.setSession); + this.element.style.display = ""; + this.replaceOption.checked = isReplace; + + if (value) + this.searchInput.value = value; + + this.searchInput.focus(); + this.searchInput.select(); + + this.editor.keyBinding.addKeyboardHandler(this.$closeSearchBarKb); + + this.$syncOptions(true); + }; + + this.isFocused = function() { + var el = document.activeElement; + return el == this.searchInput || el == this.replaceInput; + }; +}).call(SearchBox.prototype); + +exports.SearchBox = SearchBox; + +exports.Search = function(editor, isReplace) { + var sb = editor.searchBox || new SearchBox(editor); + sb.show(editor.session.getTextRange(), isReplace); +}; + +}); + (function() { + ace.require(["ace/ext/searchbox"], function() {}); + })(); + \ No newline at end of file diff --git a/src/js/nano-highlight.js b/src/js/nano-highlight.js new file mode 100644 index 0000000000000..4a958799f0e6e --- /dev/null +++ b/src/js/nano-highlight.js @@ -0,0 +1,303 @@ +// For background page + +'use strict'; + +/******************************************************************************/ + +(function() { + +/******************************************************************************/ + +// Patch 2017-12-06: Add syntax highlighting +ace.define('ace/mode/nano_filters', function(require, exports, module) { + var oop = ace.require('ace/lib/oop'); + var TextMode = ace.require('ace/mode/text').Mode; + var HighlightRules = ace.require('ace/mode/nano_filters_hr').HighlightRules; + exports.Mode = function() { + this.HighlightRules = HighlightRules; + this.lineCommentStart = "!"; + }; + oop.inherits(exports.Mode, TextMode); +}); +ace.define('ace/mode/nano_filters_hr', function(require, exports, module) { + const oop = ace.require('ace/lib/oop'); + const TextHighlightRules = ace.require('ace/mode/text_highlight_rules') + .TextHighlightRules; + exports.HighlightRules = function() { + this.$rules = { + start: [ + //Comments + { + token: 'comment', + regex: /^! === /, + next: 'header' + }, + { + // TODO 2017-12-06: Inline comments are only allowed for + // network filter + token: 'comment.line', + regex: /^(?:!|# |\[).*/ + }, + //CSS + { + token: 'keyword.control', + regex: /#@?\$?#/, + next: 'double_hash' + }, + //Operators + { + token: 'keyword.operator', + regex: /^@@|\||,|\^|\*/ + }, + //Options + { + token: 'invalid.illegal', + regex: /\$,/, + next: 'options' + }, + { + token: 'keyword.control', + regex: /\$/, + next: 'options' + }, + //Domains (default) + { + defaultToken: 'string.unquoted' + } + ], + header: [ + //Exit + { + token: 'text', + regex: /$/, + next: 'start' + }, + //Operators + { + token: 'keyword.operator', + regex: /,/ + }, + //NSFW flag + { + token: 'keyword.other', + regex: /NSFW!/ + }, + //Header text (default) + { + defaultToken: 'text' + } + ], + double_hash: [ + //Exit + { + token: 'text', + regex: /$/, + next: 'start' + }, + //Script inject + { + token: 'keyword.control', + regex: /script:inject\(/, + next: 'script_inject_part1' + }, + //CSS (default) + { + defaultToken: 'constant.character' + } + ], + script_inject_part1: [ + //Exit + { + // TODO 2017-12-07: Is this right? Need to investigate how + // uBlock Origin process commas + token: 'invalid.illegal', + regex: /,\)?$/, + next: 'start' + }, + { + token: 'keyword.control', + regex: /\)$/, + next: 'start' + }, + { + //Unexpected line break + token: 'invalid.illegal', + regex: /.?$/, + next: 'start' + }, + //Parameters + { + token: 'keyword.operator', + regex: /,/, + next: 'script_inject_part2' + }, + //Scriplet name (default) + { + defaultToken: 'variable.other' + } + ], + script_inject_part2: [ + //Exit + { + //Missing parentheses + token: 'invalid.illegal', + regex: /[^\)]?$/, + next: 'start' + }, + { + token: 'keyword.control', + regex: /\)$/, + next: 'start' + }, + //Parameters (default) + { + defaultToken: 'constant.character' + } + ], + options: [ + //Exit + { + token: 'invalid.illegal', + regex: /,$/, + next: 'start' + }, + { + token: 'text', + regex: /$/, + next: 'start' + }, + //Operators + { + token: 'keyword.operator', + regex: /,/ + }, + //Modifiers + { + token: 'keyword.control', + regex: /document|~?first-party|~?third-party|important|badfilter/ + }, + //Actions + { + token: 'variable.other', + regex: /popup|popunder|generichide|inline-script/ + }, + //Types + { + //Compatible layer + token: 'variable.parameter', + regex: /beacon|ping|elemhide|object-subrequest/ + }, + { + //Resource type + token: 'variable.parameter', + regex: /~?(?:font|image|media|object|script|stylesheet|subdocument|xmlhttprequest)/ + }, + { + //Special types + token: 'variable.parameter', + regex: /websocket|webrtc|data|other/ + }, + //Redirect + { + token: 'keyword.language', + regex: /redirect=/, + next: 'options_redirect' + }, + //Domains restriction + { + token: 'keyword.language', + regex: /domain=/, + next: 'options_domain' + }, + //CSP + { + token: 'keyword.language', + regex: /csp=/, + next: 'options_csp' + }, + { + token: 'keyword.language', + regex: /csp/ + }, + //Invalid (default) + { + defaultToken: 'invalid.illegal' + } + ], + options_redirect: [ + //Exit + { + token: 'invalid.illegal', + regex: /,$/, + next: 'start' + }, + { + token: 'text', + regex: /$/, + next: 'start' + }, + //Operators + { + token: 'keyword.operator', + regex: /,/, + next: 'options' + }, + //Redirect resource name (default) + { + defaultToken: 'variable.language', + } + ], + options_domain: [ + //Exit + { + token: 'invalid.illegal', + regex: /,$/, + next: 'start' + }, + { + token: 'text', + regex: /$/, + next: 'start' + }, + //Operators + { + token: 'keyword.operator', + regex: /,/, + next: 'options' + }, + //Domains (default) + { + defaultToken: 'string.unquoted' + } + ], + options_csp: [ + //Exit + { + token: 'invalid.illegal', + regex: /,$/, + next: 'start' + }, + { + token: 'text', + regex: /$/, + next: 'start' + }, + //Operators + { + token: 'keyword.operator', + regex: /,/, + next: 'options' + }, + //CSP text (default) + { + defaultToken: 'constant.character' + } + ] + }; + }; + oop.inherits(exports.HighlightRules, TextHighlightRules); +}); + +/******************************************************************************/ + +})();