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

Overhauled Highlighting to work with new editor and support multiple selections

Browse source
This commit is contained in:
n1474335 2022-07-10 22:01:22 +01:00
parent 2785459257
commit 890f645eeb
8 changed files with 104 additions and 393 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/web/waiters/InputWaiter.mjs
View file

@ -87,6 +87,7 @@ class InputWaiter {
const initialState = EditorState.create({
doc: null,
extensions: [
// Editor extensions
history(),
highlightSpecialChars({render: renderSpecialChar}),
drawSelection(),
@ -95,13 +96,19 @@ class InputWaiter {
bracketMatching(),
highlightSelectionMatches(),
search({top: true}),
EditorState.allowMultipleSelections.of(true),
// Custom extensions
statusBar({
label: "Input",
eolHandler: this.eolChange.bind(this)
}),
// Mutable state
this.inputEditorConf.lineWrapping.of(EditorView.lineWrapping),
this.inputEditorConf.eol.of(EditorState.lineSeparator.of("\n")),
EditorState.allowMultipleSelections.of(true),
// Keymap
keymap.of([
// Explicitly insert a tab rather than indenting the line
{ key: "Tab", run: insertTab },
@ -112,6 +119,12 @@ class InputWaiter {
...defaultKeymap,
...searchKeymap
]),
// Event listeners
EditorView.updateListener.of(e => {
if (e.selectionSet)
this.manager.highlighter.selectionChange("input", e);
})
]
});
@ -771,9 +784,6 @@ class InputWaiter {
const fileOverlay = document.getElementById("input-file");
if (fileOverlay.style.display === "block") return;
// Remove highlighting from input and output panes as the offsets might be different now
this.manager.highlighter.removeHighlights();
const value = this.getInput();
const activeTab = this.manager.tabs.getActiveInputTab();
@ -1033,9 +1043,6 @@ class InputWaiter {
this.manager.output.removeAllOutputs();
this.manager.output.terminateZipWorker();
this.manager.highlighter.removeHighlights();
getSelection().removeAllRanges();
const tabsList = document.getElementById("input-tabs");
const tabsListChildren = tabsList.children;
@ -1073,9 +1080,6 @@ class InputWaiter {
const inputNum = this.manager.tabs.getActiveInputTab();
if (inputNum === -1) return;
this.manager.highlighter.removeHighlights();
getSelection().removeAllRanges();
this.updateInputValue(inputNum, "", true);
this.set({