mirror of
https://github.com/gorhill/uBlock.git
synced 2024-11-17 16:02:33 +01:00
e44a568278
Related issue: - https://github.com/uBlockOrigin/uBlock-issues/issues/1134 CodeMirror's code folding reference: - https://codemirror.net/doc/manual.html#addon_foldcode This commit adds support for code-folding to the filter list editor/viewer. The following blocks of code are foldable by clicking the corresponding marker in the gutter: - !#if/#endif blocks - !#include blocks Addtionally, the following changes: - The `!#include` line is now preserved when importing a sublist - The `!#if` directives will be syntax-colored according to whether they evaluate to true or false on the current platform - Double-clicking on a foldable line in the gutter will select the content of the foldable block - Minor visual improvement to matching brackets
216 lines
6.9 KiB
JavaScript
216 lines
6.9 KiB
JavaScript
/*******************************************************************************
|
|
|
|
uBlock Origin - a browser extension to block requests.
|
|
Copyright (C) 2014-present Raymond Hill
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see {http://www.gnu.org/licenses/}.
|
|
|
|
Home: https://github.com/gorhill/uBlock
|
|
*/
|
|
|
|
/* global uDom */
|
|
|
|
'use strict';
|
|
|
|
/******************************************************************************/
|
|
|
|
self.uBlockDashboard = self.uBlockDashboard || {};
|
|
|
|
/******************************************************************************/
|
|
|
|
// Helper for client panes:
|
|
// Remove literal duplicate lines from a set based on another set.
|
|
|
|
self.uBlockDashboard.mergeNewLines = function(text, newText) {
|
|
// Step 1: build dictionary for existing lines.
|
|
const fromDict = new Map();
|
|
let lineBeg = 0;
|
|
let textEnd = text.length;
|
|
while ( lineBeg < textEnd ) {
|
|
let lineEnd = text.indexOf('\n', lineBeg);
|
|
if ( lineEnd === -1 ) {
|
|
lineEnd = text.indexOf('\r', lineBeg);
|
|
if ( lineEnd === -1 ) {
|
|
lineEnd = textEnd;
|
|
}
|
|
}
|
|
const line = text.slice(lineBeg, lineEnd).trim();
|
|
lineBeg = lineEnd + 1;
|
|
if ( line.length === 0 ) { continue; }
|
|
const hash = line.slice(0, 8);
|
|
const bucket = fromDict.get(hash);
|
|
if ( bucket === undefined ) {
|
|
fromDict.set(hash, line);
|
|
} else if ( typeof bucket === 'string' ) {
|
|
fromDict.set(hash, [ bucket, line ]);
|
|
} else /* if ( Array.isArray(bucket) ) */ {
|
|
bucket.push(line);
|
|
}
|
|
}
|
|
|
|
// Step 2: use above dictionary to filter out duplicate lines.
|
|
const out = [ '' ];
|
|
lineBeg = 0;
|
|
textEnd = newText.length;
|
|
while ( lineBeg < textEnd ) {
|
|
let lineEnd = newText.indexOf('\n', lineBeg);
|
|
if ( lineEnd === -1 ) {
|
|
lineEnd = newText.indexOf('\r', lineBeg);
|
|
if ( lineEnd === -1 ) {
|
|
lineEnd = textEnd;
|
|
}
|
|
}
|
|
const line = newText.slice(lineBeg, lineEnd).trim();
|
|
lineBeg = lineEnd + 1;
|
|
if ( line.length === 0 ) {
|
|
if ( out[out.length - 1] !== '' ) {
|
|
out.push('');
|
|
}
|
|
continue;
|
|
}
|
|
const bucket = fromDict.get(line.slice(0, 8));
|
|
if ( bucket === undefined ) {
|
|
out.push(line);
|
|
continue;
|
|
}
|
|
if ( typeof bucket === 'string' && line !== bucket ) {
|
|
out.push(line);
|
|
continue;
|
|
}
|
|
if ( bucket.indexOf(line) === -1 ) {
|
|
out.push(line);
|
|
/* continue; */
|
|
}
|
|
}
|
|
|
|
const append = out.join('\n').trim();
|
|
if ( text !== '' && append !== '' ) {
|
|
text += '\n\n';
|
|
}
|
|
return text + append;
|
|
};
|
|
|
|
/******************************************************************************/
|
|
|
|
self.uBlockDashboard.dateNowToSensibleString = function() {
|
|
const now = new Date(Date.now() - (new Date()).getTimezoneOffset() * 60000);
|
|
return now.toISOString().replace(/\.\d+Z$/, '')
|
|
.replace(/:/g, '.')
|
|
.replace('T', '_');
|
|
};
|
|
|
|
/******************************************************************************/
|
|
|
|
self.uBlockDashboard.patchCodeMirrorEditor = (function() {
|
|
let grabFocusTimer;
|
|
let grabFocusTarget;
|
|
|
|
const grabFocus = function() {
|
|
grabFocusTarget.focus();
|
|
grabFocusTimer = grabFocusTarget = undefined;
|
|
};
|
|
const grabFocusAsync = function(cm) {
|
|
grabFocusTarget = cm;
|
|
if ( grabFocusTimer === undefined ) {
|
|
grabFocusTimer = vAPI.setTimeout(grabFocus, 1);
|
|
}
|
|
};
|
|
|
|
// https://github.com/gorhill/uBlock/issues/3646
|
|
const patchSelectAll = function(cm, details) {
|
|
var vp = cm.getViewport();
|
|
if ( details.ranges.length !== 1 ) { return; }
|
|
var range = details.ranges[0],
|
|
lineFrom = range.anchor.line,
|
|
lineTo = range.head.line;
|
|
if ( lineTo === lineFrom ) { return; }
|
|
if ( range.head.ch !== 0 ) { lineTo += 1; }
|
|
if ( lineFrom !== vp.from || lineTo !== vp.to ) { return; }
|
|
details.update([
|
|
{
|
|
anchor: { line: 0, ch: 0 },
|
|
head: { line: cm.lineCount(), ch: 0 }
|
|
}
|
|
]);
|
|
grabFocusAsync(cm);
|
|
};
|
|
|
|
let lastGutterClick = 0;
|
|
let lastGutterLine = 0;
|
|
|
|
const onGutterClicked = function(cm, line, gutter) {
|
|
if ( gutter !== 'CodeMirror-linenumbers' ) { return; }
|
|
grabFocusAsync(cm);
|
|
const delta = Date.now() - lastGutterClick;
|
|
// Single click
|
|
if ( delta >= 500 || line !== lastGutterLine ) {
|
|
cm.setSelection(
|
|
{ line, ch: 0 },
|
|
{ line: line + 1, ch: 0 }
|
|
);
|
|
lastGutterClick = Date.now();
|
|
lastGutterLine = line;
|
|
return;
|
|
}
|
|
// Double click: select fold-able block or all
|
|
let lineFrom = 0;
|
|
let lineTo = cm.lineCount();
|
|
const foldFn = cm.getHelper({ line, ch: 0 }, 'fold');
|
|
if ( foldFn instanceof Function ) {
|
|
const range = foldFn(cm, { line, ch: 0 });
|
|
if ( range !== undefined ) {
|
|
lineFrom = range.from.line;
|
|
lineTo = range.to.line + 1;
|
|
}
|
|
}
|
|
cm.setSelection(
|
|
{ line: lineFrom, ch: 0 },
|
|
{ line: lineTo, ch: 0 },
|
|
{ scroll: false }
|
|
);
|
|
lastGutterClick = 0;
|
|
};
|
|
|
|
return function(cm) {
|
|
if ( cm.options.inputStyle === 'contenteditable' ) {
|
|
cm.on('beforeSelectionChange', patchSelectAll);
|
|
}
|
|
cm.on('gutterClick', onGutterClicked);
|
|
};
|
|
})();
|
|
|
|
/******************************************************************************/
|
|
|
|
self.uBlockDashboard.openOrSelectPage = function(url, options = {}) {
|
|
let ev;
|
|
if ( url instanceof MouseEvent ) {
|
|
ev = url;
|
|
url = ev.target.getAttribute('href');
|
|
}
|
|
const details = Object.assign({ url, select: true, index: -1 }, options);
|
|
vAPI.messaging.send('default', {
|
|
what: 'gotoURL',
|
|
details,
|
|
});
|
|
if ( ev ) {
|
|
ev.preventDefault();
|
|
}
|
|
};
|
|
|
|
/******************************************************************************/
|
|
|
|
// Open links in the proper window
|
|
uDom('a').attr('target', '_blank');
|
|
uDom('a[href*="dashboard.html"]').attr('target', '_parent');
|