mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-22 07:46:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved highlighting colours and selection ranges

Browse source
This commit is contained in:
n1474335 2022-07-11 11:43:48 +01:00
parent 890f645eeb
commit 157dacb3a5
4 changed files with 50 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/web/waiters/HighlighterWaiter.mjs
View file

@ -45,18 +45,10 @@ class HighlighterWaiter {
// from setting the selection in this class
if (!e.transactions[0].isUserEvent("select")) return false;
const view = io === "input" ?
this.manager.output.outputEditorView :
this.manager.input.inputEditorView;
this.currentSelectionRanges = [];
// Confirm some non-empty ranges are set
const selectionRanges = e.state.selection.ranges.filter(r => !r.empty);
if (!selectionRanges.length) {
this.resetSelections(view);
return;
}
const selectionRanges = e.state.selection.ranges;
// Loop through ranges and send request for output offsets for each one
const direction = io === "input" ? "forward" : "reverse";
@ -69,19 +61,6 @@ class HighlighterWaiter {
}
}
/**
* Resets the current set of selections in the given view
* @param {EditorView} view
*/
resetSelections(view) {
this.currentSelectionRanges = [];
// Clear current selection in output or input
view.dispatch({
selection: EditorSelection.create([EditorSelection.range(0, 0)])
});
}
/**
* Displays highlight offsets sent back from the Chef.
@ -120,18 +99,30 @@ class HighlighterWaiter {
// Add new SelectionRanges to existing ones
for (const range of ranges) {
if (!range.start || !range.end) continue;
this.currentSelectionRanges.push(
EditorSelection.range(range.start, range.end)
);
if (typeof range.start !== "number" ||
typeof range.end !== "number")
continue;
const selection = range.end <= range.start ?
EditorSelection.cursor(range.start) :
EditorSelection.range(range.start, range.end);
this.currentSelectionRanges.push(selection);
}
// Set selection
if (this.currentSelectionRanges.length) {
view.dispatch({
selection: EditorSelection.create(this.currentSelectionRanges),
scrollIntoView: true
});
try {
view.dispatch({
selection: EditorSelection.create(this.currentSelectionRanges),
scrollIntoView: true
});
} catch (err) {
// Ignore Range Errors
if (!err.toString().startsWith("RangeError")) {
console.error(err);
}
}
}
}