mirror of
https://github.com/zadam/trilium.git
synced 2025-03-01 14:22:32 +01:00
findwidget cleanup
This commit is contained in:
parent
bb7ad496bf
commit
c51e6107a1
@ -5,6 +5,8 @@
|
||||
|
||||
import NoteContextAwareWidget from "./note_context_aware_widget.js";
|
||||
import appContext from "../services/app_context.js";
|
||||
import FindInText from "./find_in_text.js";
|
||||
import FindInCode from "./find_in_code.js";
|
||||
|
||||
const findWidgetDelayMillis = 200;
|
||||
const waitForEnter = (findWidgetDelayMillis < 0);
|
||||
@ -59,20 +61,14 @@ const TPL = `
|
||||
</div>
|
||||
</div>`;
|
||||
|
||||
function escapeRegExp(string) {
|
||||
return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
||||
}
|
||||
|
||||
const getActiveContextCodeEditor = async () => await appContext.tabManager.getActiveContextCodeEditor();
|
||||
const getActiveContextTextEditor = async () => await appContext.tabManager.getActiveContextTextEditor();
|
||||
|
||||
// ck-find-result and ck-find-result_selected are the styles ck-editor
|
||||
// uses for highlighting matches, use the same one on CodeMirror
|
||||
// for consistency
|
||||
const FIND_RESULT_SELECTED_CSS_CLASSNAME = "ck-find-result_selected";
|
||||
const FIND_RESULT_CSS_CLASSNAME = "ck-find-result";
|
||||
|
||||
export default class FindWidget extends NoteContextAwareWidget {
|
||||
constructor() {
|
||||
super();
|
||||
|
||||
this.textHandler = new FindInText();
|
||||
this.codeHandler = new FindInCode();
|
||||
}
|
||||
|
||||
doRender() {
|
||||
this.$widget = $(TPL);
|
||||
this.$findBox = this.$widget.find('.find-widget-box');
|
||||
@ -81,7 +77,9 @@ export default class FindWidget extends NoteContextAwareWidget {
|
||||
this.$currentFound = this.$widget.find('.find-widget-current-found');
|
||||
this.$totalFound = this.$widget.find('.find-widget-total-found');
|
||||
this.$caseSensitiveCheckbox = this.$widget.find(".find-widget-case-sensitive-checkbox");
|
||||
this.$caseSensitiveCheckbox.change(() => this.performFind());
|
||||
this.$matchWordsCheckbox = this.$widget.find(".find-widget-match-words-checkbox");
|
||||
this.$matchWordsCheckbox.change(() => this.performFind());
|
||||
this.findResult = null;
|
||||
this.searchTerm = null;
|
||||
|
||||
@ -91,415 +89,142 @@ export default class FindWidget extends NoteContextAwareWidget {
|
||||
// whole input to find
|
||||
this.$input.select();
|
||||
} else if (e.key === 'Enter' || e.key === 'F3') {
|
||||
const searchTerm = this.$input.val();
|
||||
if (waitForEnter && this.searchTerm !== searchTerm) {
|
||||
await this.performFind(searchTerm);
|
||||
}
|
||||
const totalFound = parseInt(this.$totalFound.text());
|
||||
const currentFound = parseInt(this.$currentFound.text()) - 1;
|
||||
|
||||
if (totalFound > 0) {
|
||||
const delta = e.shiftKey ? -1 : 1;
|
||||
let nextFound = currentFound + delta;
|
||||
// Wrap around
|
||||
if (nextFound > totalFound - 1) {
|
||||
nextFound = 0;
|
||||
} else if (nextFound < 0) {
|
||||
nextFound = totalFound - 1;
|
||||
}
|
||||
|
||||
this.$currentFound.text(nextFound + 1);
|
||||
|
||||
const note = appContext.tabManager.getActiveContextNote();
|
||||
if (note.type === "code") {
|
||||
const codeEditor = await getActiveContextCodeEditor();
|
||||
const doc = codeEditor.doc;
|
||||
|
||||
//
|
||||
// Dehighlight current, highlight & scrollIntoView next
|
||||
//
|
||||
|
||||
let marker = this.findResult[currentFound];
|
||||
let pos = marker.find();
|
||||
marker.clear();
|
||||
marker = doc.markText(
|
||||
pos.from, pos.to,
|
||||
{ "className" : FIND_RESULT_CSS_CLASSNAME }
|
||||
);
|
||||
this.findResult[currentFound] = marker;
|
||||
|
||||
marker = this.findResult[nextFound];
|
||||
pos = marker.find();
|
||||
marker.clear();
|
||||
marker = doc.markText(
|
||||
pos.from, pos.to,
|
||||
{ "className" : FIND_RESULT_SELECTED_CSS_CLASSNAME }
|
||||
);
|
||||
this.findResult[nextFound] = marker;
|
||||
|
||||
codeEditor.scrollIntoView(pos.from);
|
||||
} else {
|
||||
const textEditor = await getActiveContextTextEditor();
|
||||
|
||||
// There are no parameters for findNext/findPrev
|
||||
// See https://github.com/ckeditor/ckeditor5/blob/b95e2faf817262ac0e1e21993d9c0bde3f1be594/packages/ckeditor5-find-and-replace/src/findnextcommand.js#L57
|
||||
// curFound wrap around above assumes findNext and
|
||||
// findPrevious wraparound, which is what they do
|
||||
if (delta > 0) {
|
||||
textEditor.execute('findNext');
|
||||
} else {
|
||||
textEditor.execute('findPrevious');
|
||||
}
|
||||
}
|
||||
}
|
||||
await this.findNext(e);
|
||||
e.preventDefault();
|
||||
return false;
|
||||
} else if (e.key === 'Escape') {
|
||||
const note = appContext.tabManager.getActiveContextNote();
|
||||
if (note.type === "code") {
|
||||
const codeEditor = await getActiveContextCodeEditor();
|
||||
codeEditor.focus();
|
||||
} else {
|
||||
const textEditor = await getActiveContextTextEditor();
|
||||
textEditor.focus();
|
||||
}
|
||||
await this.getHandler().close();
|
||||
}
|
||||
});
|
||||
|
||||
this.$input.on('input', () => {
|
||||
// XXX This should clear the previous search immediately in all cases
|
||||
// (the search is stale when waitforenter but also while the
|
||||
// delay is running for non waitforenter case)
|
||||
if (!waitForEnter) {
|
||||
// Clear the previous timeout if any, it's ok if timeoutId is
|
||||
// null or undefined
|
||||
clearTimeout(this.timeoutId);
|
||||
|
||||
// Defer the search a few millis so the search doesn't start
|
||||
// immediately, as this can cause search word typing lag with
|
||||
// one or two-char searchwords and long notes
|
||||
// See https://github.com/antoniotejada/Trilium-FindWidget/issues/1
|
||||
const searchTerm = this.$input.val();
|
||||
const matchCase = this.$caseSensitiveCheckbox.prop("checked");
|
||||
const wholeWord = this.$matchWordsCheckbox.prop("checked");
|
||||
this.timeoutId = setTimeout(async () => {
|
||||
this.timeoutId = null;
|
||||
await this.performFind(searchTerm, matchCase, wholeWord);
|
||||
}, findWidgetDelayMillis);
|
||||
}
|
||||
});
|
||||
|
||||
this.$caseSensitiveCheckbox.change(() => this.performFind());
|
||||
this.$matchWordsCheckbox.change(() => this.performFind());
|
||||
this.$input.on('input', () => this.startSearch());
|
||||
|
||||
// Note blur doesn't bubble to parent div, but the parent div needs to
|
||||
// detect when any of the children are not focused and hide. Use
|
||||
// focusout instead which does bubble to the parent div.
|
||||
this.$findBox.on('focusout', async (e) => {
|
||||
this.$findBox.on('focusout', async e => {
|
||||
// e.relatedTarget is the new focused element, note it can be null
|
||||
// if nothing is being focused
|
||||
if (this.$findBox[0].contains(e.relatedTarget)) {
|
||||
// The focused element is inside this div, ignore
|
||||
return;
|
||||
}
|
||||
this.$findBox.hide();
|
||||
|
||||
// Restore any state, if there's a current occurrence clear markers
|
||||
// and scroll to and select the last occurrence
|
||||
|
||||
// XXX Switching to a different tab with crl+tab doesn't invoke
|
||||
// blur and leaves a stale search which then breaks when
|
||||
// navigating it
|
||||
const totalFound = parseInt(this.$totalFound.text());
|
||||
const currentFound = parseInt(this.$currentFound.text()) - 1;
|
||||
const note = appContext.tabManager.getActiveContextNote();
|
||||
if (note.type === "code") {
|
||||
const codeEditor = await getActiveContextCodeEditor();
|
||||
if (totalFound > 0) {
|
||||
const doc = codeEditor.doc;
|
||||
const pos = this.findResult[currentFound].find();
|
||||
// Note setting the selection sets the cursor to
|
||||
// the end of the selection and scrolls it into
|
||||
// view
|
||||
doc.setSelection(pos.from, pos.to);
|
||||
// Clear all markers
|
||||
codeEditor.operation(() => {
|
||||
for (let i = 0; i < this.findResult.length; ++i) {
|
||||
let marker = this.findResult[i];
|
||||
marker.clear();
|
||||
}
|
||||
});
|
||||
}
|
||||
// Restore the highlightSelectionMatches setting
|
||||
codeEditor.setOption("highlightSelectionMatches", this.oldHighlightSelectionMatches);
|
||||
this.findResult = null;
|
||||
this.searchTerm = null;
|
||||
} else {
|
||||
if (totalFound > 0) {
|
||||
const textEditor = await getActiveContextTextEditor();
|
||||
// Clear the markers and set the caret to the
|
||||
// current occurrence
|
||||
const model = textEditor.model;
|
||||
const range = this.findResult.results.get(currentFound).marker.getRange();
|
||||
// From
|
||||
// https://github.com/ckeditor/ckeditor5/blob/b95e2faf817262ac0e1e21993d9c0bde3f1be594/packages/ckeditor5-find-and-replace/src/findandreplace.js#L92
|
||||
// XXX Roll our own since already done for codeEditor and
|
||||
// will probably allow more refactoring?
|
||||
let findAndReplaceEditing = textEditor.plugins.get('FindAndReplaceEditing');
|
||||
findAndReplaceEditing.state.clear(model);
|
||||
findAndReplaceEditing.stop();
|
||||
model.change(writer => {
|
||||
writer.setSelection(range, 0);
|
||||
});
|
||||
textEditor.editing.view.scrollToTheSelection();
|
||||
this.findResult = null;
|
||||
this.searchTerm = null;
|
||||
} else {
|
||||
this.findResult = null;
|
||||
this.searchTerm = null;
|
||||
}
|
||||
}
|
||||
await this.closeSearch();
|
||||
});
|
||||
|
||||
return this.$widget;
|
||||
}
|
||||
|
||||
startSearch() {
|
||||
// XXX This should clear the previous search immediately in all cases
|
||||
// (the search is stale when waitforenter but also while the
|
||||
// delay is running for non waitforenter case)
|
||||
if (!waitForEnter) {
|
||||
// Clear the previous timeout if any, it's ok if timeoutId is
|
||||
// null or undefined
|
||||
clearTimeout(this.timeoutId);
|
||||
|
||||
// Defer the search a few millis so the search doesn't start
|
||||
// immediately, as this can cause search word typing lag with
|
||||
// one or two-char searchwords and long notes
|
||||
// See https://github.com/antoniotejada/Trilium-FindWidget/issues/1
|
||||
const searchTerm = this.$input.val();
|
||||
const matchCase = this.$caseSensitiveCheckbox.prop("checked");
|
||||
const wholeWord = this.$matchWordsCheckbox.prop("checked");
|
||||
this.timeoutId = setTimeout(async () => {
|
||||
this.timeoutId = null;
|
||||
await this.performFind(searchTerm, matchCase, wholeWord);
|
||||
}, findWidgetDelayMillis);
|
||||
}
|
||||
}
|
||||
|
||||
async findNext(e) {
|
||||
const searchTerm = this.$input.val();
|
||||
if (waitForEnter && this.searchTerm !== searchTerm) {
|
||||
await this.performFind(searchTerm);
|
||||
}
|
||||
const totalFound = parseInt(this.$totalFound.text());
|
||||
const currentFound = parseInt(this.$currentFound.text()) - 1;
|
||||
|
||||
if (totalFound > 0) {
|
||||
const direction = e.shiftKey ? -1 : 1;
|
||||
let nextFound = currentFound + direction;
|
||||
// Wrap around
|
||||
if (nextFound > totalFound - 1) {
|
||||
nextFound = 0;
|
||||
} else if (nextFound < 0) {
|
||||
nextFound = totalFound - 1;
|
||||
}
|
||||
|
||||
this.$currentFound.text(nextFound + 1);
|
||||
|
||||
await this.getHandler().findNext(direction, currentFound, nextFound);
|
||||
}
|
||||
}
|
||||
|
||||
async findInTextEvent() {
|
||||
const note = appContext.tabManager.getActiveContextNote();
|
||||
// Only writeable text and code supported
|
||||
const readOnly = note.getAttribute("label", "readOnly");
|
||||
if (!readOnly && (note.type === "code" || note.type === "text")) {
|
||||
if (this.$findBox.is(":hidden")) {
|
||||
|
||||
this.$findBox.show();
|
||||
this.$input.focus();
|
||||
this.$totalFound.text(0);
|
||||
this.$currentFound.text(0);
|
||||
|
||||
// Initialize the input field to the text selection, if any
|
||||
if (note.type === "code") {
|
||||
const codeEditor = await getActiveContextCodeEditor();
|
||||
const searchTerm = await this.getHandler().getInitialSearchTerm();
|
||||
|
||||
// highlightSelectionMatches is the overlay that highlights
|
||||
// the words under the cursor. This occludes the search
|
||||
// markers style, save it, disable it. Will be restored when
|
||||
// the focus is back into the note
|
||||
this.oldHighlightSelectionMatches = codeEditor.getOption("highlightSelectionMatches");
|
||||
codeEditor.setOption("highlightSelectionMatches", false);
|
||||
this.$input.val(searchTerm || "");
|
||||
|
||||
// Fill in the findbox with the current selection if any
|
||||
const selectedText = codeEditor.getSelection()
|
||||
if (selectedText !== "") {
|
||||
this.$input.val(selectedText);
|
||||
}
|
||||
// Directly perform the search if there's some text to find,
|
||||
// without delaying or waiting for enter
|
||||
const searchTerm = this.$input.val();
|
||||
if (searchTerm !== "") {
|
||||
this.$input.select();
|
||||
await this.performFind(searchTerm);
|
||||
}
|
||||
} else {
|
||||
const textEditor = await getActiveContextTextEditor();
|
||||
|
||||
const selection = textEditor.model.document.selection;
|
||||
const range = selection.getFirstRange();
|
||||
|
||||
for (const item of range.getItems()) {
|
||||
// Fill in the findbox with the current selection if
|
||||
// any
|
||||
this.$input.val(item.data);
|
||||
break;
|
||||
}
|
||||
// Directly perform the search if there's some text to
|
||||
// find, without delaying or waiting for enter
|
||||
const searchTerm = this.$input.val();
|
||||
if (searchTerm !== "") {
|
||||
this.$input.select();
|
||||
await this.performFind(searchTerm);
|
||||
}
|
||||
// Directly perform the search if there's some text to
|
||||
// find, without delaying or waiting for enter
|
||||
if (searchTerm !== "") {
|
||||
this.$input.select();
|
||||
await this.performFind(searchTerm);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async performTextNoteFind(searchTerm, matchCase, wholeWord) {
|
||||
// Do this even if the searchTerm is empty so the markers are cleared and
|
||||
// the counters updated
|
||||
const textEditor = await getActiveContextTextEditor();
|
||||
const model = textEditor.model;
|
||||
let findResult = null;
|
||||
let totalFound = 0;
|
||||
let currentFound = -1;
|
||||
|
||||
// Clear
|
||||
const findAndReplaceEditing = textEditor.plugins.get('FindAndReplaceEditing');
|
||||
findAndReplaceEditing.state.clear(model);
|
||||
findAndReplaceEditing.stop();
|
||||
if (searchTerm !== "") {
|
||||
// Parameters are callback/text, options.matchCase=false, options.wholeWords=false
|
||||
// See https://github.com/ckeditor/ckeditor5/blob/b95e2faf817262ac0e1e21993d9c0bde3f1be594/packages/ckeditor5-find-and-replace/src/findcommand.js#L44
|
||||
// XXX Need to use the callback version for regexp
|
||||
// searchTerm = escapeRegExp(searchTerm);
|
||||
// let re = new RegExp(searchTerm, 'gi');
|
||||
// let m = text.match(re);
|
||||
// totalFound = m ? m.length : 0;
|
||||
const options = { "matchCase" : matchCase, "wholeWords" : wholeWord };
|
||||
findResult = textEditor.execute('find', searchTerm, options);
|
||||
totalFound = findResult.results.length;
|
||||
// Find the result beyond the cursor
|
||||
const cursorPos = model.document.selection.getLastPosition();
|
||||
for (let i = 0; i < findResult.results.length; ++i) {
|
||||
const marker = findResult.results.get(i).marker;
|
||||
const fromPos = marker.getStart();
|
||||
if (fromPos.compareWith(cursorPos) !== "before") {
|
||||
currentFound = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this.findResult = findResult;
|
||||
this.$totalFound.text(totalFound);
|
||||
// Calculate curfound if not already, highlight it as
|
||||
// selected
|
||||
if (totalFound > 0) {
|
||||
currentFound = Math.max(0, currentFound);
|
||||
// XXX Do this accessing the private data?
|
||||
// See
|
||||
// https://github.com/ckeditor/ckeditor5/blob/b95e2faf817262ac0e1e21993d9c0bde3f1be594/packages/ckeditor5-find-and-replace/src/findnextcommand.js
|
||||
for (let i = 0 ; i < currentFound; ++i) {
|
||||
textEditor.execute('findNext', searchTerm);
|
||||
}
|
||||
}
|
||||
this.$currentFound.text(currentFound + 1);
|
||||
this.searchTerm = searchTerm;
|
||||
}
|
||||
|
||||
async performCodeNoteFind(searchTerm, matchCase, wholeWord) {
|
||||
let findResult = null;
|
||||
let totalFound = 0;
|
||||
let currentFound = -1;
|
||||
|
||||
// See https://codemirror.net/addon/search/searchcursor.js for tips
|
||||
const codeEditor = await getActiveContextCodeEditor();
|
||||
const doc = codeEditor.doc;
|
||||
const text = doc.getValue();
|
||||
|
||||
// Clear all markers
|
||||
if (this.findResult != null) {
|
||||
codeEditor.operation(() => {
|
||||
for (let i = 0; i < this.findResult.length; ++i) {
|
||||
const marker = this.findResult[i];
|
||||
marker.clear();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
if (searchTerm !== "") {
|
||||
searchTerm = escapeRegExp(searchTerm);
|
||||
|
||||
// Find and highlight matches
|
||||
// Find and highlight matches
|
||||
// XXX Using \\b and not using the unicode flag probably doesn't
|
||||
// work with non ascii alphabets, findAndReplace uses a more
|
||||
// complicated regexp, see
|
||||
// https://github.com/ckeditor/ckeditor5/blob/b95e2faf817262ac0e1e21993d9c0bde3f1be594/packages/ckeditor5-find-and-replace/src/utils.js#L145
|
||||
const wholeWordChar = wholeWord ? "\\b" : "";
|
||||
const re = new RegExp(wholeWordChar + searchTerm + wholeWordChar,
|
||||
'g' + (matchCase ? '' : 'i'));
|
||||
let curLine = 0;
|
||||
let curChar = 0;
|
||||
let curMatch = null;
|
||||
findResult = [];
|
||||
// All those markText take several seconds on eg this ~500-line
|
||||
// script, batch them inside an operation so they become
|
||||
// unnoticeable. Alternatively, an overlay could be used, see
|
||||
// https://codemirror.net/addon/search/match-highlighter.js ?
|
||||
codeEditor.operation(() => {
|
||||
for (let i = 0; i < text.length; ++i) {
|
||||
// Fetch next match if it's the first time or
|
||||
// if past the current match start
|
||||
if ((curMatch == null) || (curMatch.index < i)) {
|
||||
curMatch = re.exec(text);
|
||||
if (curMatch == null) {
|
||||
// No more matches
|
||||
break;
|
||||
}
|
||||
}
|
||||
// Create a non-selected highlight marker for the match, the
|
||||
// selected marker highlight will be done later
|
||||
if (i === curMatch.index) {
|
||||
let fromPos = { "line" : curLine, "ch" : curChar };
|
||||
// XXX If multiline is supported, this needs to
|
||||
// recalculate curLine since the match may span
|
||||
// lines
|
||||
let toPos = { "line" : curLine, "ch" : curChar + curMatch[0].length};
|
||||
// XXX or css = "color: #f3"
|
||||
let marker = doc.markText( fromPos, toPos, { "className" : FIND_RESULT_CSS_CLASSNAME });
|
||||
findResult.push(marker);
|
||||
|
||||
// Set the first match beyond the cursor as current
|
||||
// match
|
||||
if (currentFound === -1) {
|
||||
const cursorPos = codeEditor.getCursor();
|
||||
if ((fromPos.line > cursorPos.line) ||
|
||||
((fromPos.line === cursorPos.line) &&
|
||||
(fromPos.ch >= cursorPos.ch))){
|
||||
currentFound = totalFound;
|
||||
}
|
||||
}
|
||||
|
||||
totalFound++;
|
||||
}
|
||||
// Do line and char position tracking
|
||||
if (text[i] === "\n") {
|
||||
curLine++;
|
||||
curChar = 0;
|
||||
} else {
|
||||
curChar++;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
this.findResult = findResult;
|
||||
this.$totalFound.text(totalFound);
|
||||
// Calculate curfound if not already, highlight it as selected
|
||||
if (totalFound > 0) {
|
||||
currentFound = Math.max(0, currentFound)
|
||||
let marker = findResult[currentFound];
|
||||
let pos = marker.find();
|
||||
codeEditor.scrollIntoView(pos.to);
|
||||
marker.clear();
|
||||
findResult[currentFound] = doc.markText( pos.from, pos.to,
|
||||
{ "className" : FIND_RESULT_SELECTED_CSS_CLASSNAME }
|
||||
);
|
||||
}
|
||||
this.$currentFound.text(currentFound + 1);
|
||||
this.searchTerm = searchTerm;
|
||||
}
|
||||
|
||||
/**
|
||||
* Perform the find and highlight the find results.
|
||||
*
|
||||
* @param [searchTerm] {string} optional parameter, taken from the input box if
|
||||
* missing.
|
||||
* @param [matchCase] {boolean} optional parameter, taken from the checkbox
|
||||
* state if missing.
|
||||
* @param [wholeWord] {boolean} optional parameter, taken from the checkbox
|
||||
* state if missing.
|
||||
* @param [searchTerm] {string} taken from the input box if missing.
|
||||
* @param [matchCase] {boolean} taken from the checkbox state if missing.
|
||||
* @param [wholeWord] {boolean} taken from the checkbox state if missing.
|
||||
*/
|
||||
async performFind(searchTerm, matchCase, wholeWord) {
|
||||
searchTerm = (searchTerm === undefined) ? this.$input.val() : searchTerm;
|
||||
matchCase = (matchCase === undefined) ? this.$caseSensitiveCheckbox.prop("checked") : matchCase;
|
||||
wholeWord = (wholeWord === undefined) ? this.$matchWordsCheckbox.prop("checked") : wholeWord;
|
||||
const note = appContext.tabManager.getActiveContextNote();
|
||||
if (note.type === "code") {
|
||||
await this.performCodeNoteFind(searchTerm, matchCase, wholeWord);
|
||||
} else {
|
||||
await this.performTextNoteFind(searchTerm, matchCase, wholeWord);
|
||||
|
||||
const {totalFound, currentFound} = await this.getHandler().performFind(searchTerm, matchCase, wholeWord);
|
||||
|
||||
this.$totalFound.text(totalFound);
|
||||
this.$currentFound.text(currentFound);
|
||||
|
||||
this.searchTerm = searchTerm;
|
||||
}
|
||||
|
||||
async closeSearch() {
|
||||
this.$findBox.hide();
|
||||
|
||||
// Restore any state, if there's a current occurrence clear markers
|
||||
// and scroll to and select the last occurrence
|
||||
|
||||
// XXX Switching to a different tab with crl+tab doesn't invoke
|
||||
// blur and leaves a stale search which then breaks when
|
||||
// navigating it
|
||||
const totalFound = parseInt(this.$totalFound.text());
|
||||
const currentFound = parseInt(this.$currentFound.text()) - 1;
|
||||
|
||||
if (totalFound > 0) {
|
||||
await this.getHandler().cleanup(totalFound, currentFound);
|
||||
}
|
||||
|
||||
this.searchTerm = null;
|
||||
}
|
||||
|
||||
isEnabled() {
|
||||
@ -511,4 +236,14 @@ export default class FindWidget extends NoteContextAwareWidget {
|
||||
this.refresh();
|
||||
}
|
||||
}
|
||||
|
||||
getHandler() {
|
||||
const note = appContext.tabManager.getActiveContextNote();
|
||||
|
||||
if (note.type === "code") {
|
||||
return this.codeHandler;
|
||||
} else {
|
||||
return this.textHandler;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
193
src/public/app/widgets/find_in_code.js
Normal file
193
src/public/app/widgets/find_in_code.js
Normal file
@ -0,0 +1,193 @@
|
||||
import appContext from "../services/app_context.js";
|
||||
|
||||
// ck-find-result and ck-find-result_selected are the styles ck-editor
|
||||
// uses for highlighting matches, use the same one on CodeMirror
|
||||
// for consistency
|
||||
const FIND_RESULT_SELECTED_CSS_CLASSNAME = "ck-find-result_selected";
|
||||
const FIND_RESULT_CSS_CLASSNAME = "ck-find-result";
|
||||
|
||||
const getActiveContextCodeEditor = async () => await appContext.tabManager.getActiveContextCodeEditor();
|
||||
const escapeRegExp = str => str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
||||
|
||||
export default class FindInCode {
|
||||
async getInitialSearchTerm() {
|
||||
const codeEditor = await getActiveContextCodeEditor();
|
||||
|
||||
// highlightSelectionMatches is the overlay that highlights
|
||||
// the words under the cursor. This occludes the search
|
||||
// markers style, save it, disable it. Will be restored when
|
||||
// the focus is back into the note
|
||||
this.oldHighlightSelectionMatches = codeEditor.getOption("highlightSelectionMatches");
|
||||
codeEditor.setOption("highlightSelectionMatches", false);
|
||||
|
||||
// Fill in the findbox with the current selection if any
|
||||
const selectedText = codeEditor.getSelection()
|
||||
if (selectedText !== "") {
|
||||
return selectedText;
|
||||
}
|
||||
}
|
||||
|
||||
async performFind(searchTerm, matchCase, wholeWord) {
|
||||
let findResult = null;
|
||||
let totalFound = 0;
|
||||
let currentFound = -1;
|
||||
|
||||
// See https://codemirror.net/addon/search/searchcursor.js for tips
|
||||
const codeEditor = await getActiveContextCodeEditor();
|
||||
const doc = codeEditor.doc;
|
||||
const text = doc.getValue();
|
||||
|
||||
// Clear all markers
|
||||
if (this.findResult != null) {
|
||||
codeEditor.operation(() => {
|
||||
for (let i = 0; i < this.findResult.length; ++i) {
|
||||
const marker = this.findResult[i];
|
||||
marker.clear();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
if (searchTerm !== "") {
|
||||
searchTerm = escapeRegExp(searchTerm);
|
||||
|
||||
// Find and highlight matches
|
||||
// Find and highlight matches
|
||||
// XXX Using \\b and not using the unicode flag probably doesn't
|
||||
// work with non ascii alphabets, findAndReplace uses a more
|
||||
// complicated regexp, see
|
||||
// https://github.com/ckeditor/ckeditor5/blob/b95e2faf817262ac0e1e21993d9c0bde3f1be594/packages/ckeditor5-find-and-replace/src/utils.js#L145
|
||||
const wholeWordChar = wholeWord ? "\\b" : "";
|
||||
const re = new RegExp(wholeWordChar + searchTerm + wholeWordChar,
|
||||
'g' + (matchCase ? '' : 'i'));
|
||||
let curLine = 0;
|
||||
let curChar = 0;
|
||||
let curMatch = null;
|
||||
findResult = [];
|
||||
// All those markText take several seconds on eg this ~500-line
|
||||
// script, batch them inside an operation so they become
|
||||
// unnoticeable. Alternatively, an overlay could be used, see
|
||||
// https://codemirror.net/addon/search/match-highlighter.js ?
|
||||
codeEditor.operation(() => {
|
||||
for (let i = 0; i < text.length; ++i) {
|
||||
// Fetch next match if it's the first time or
|
||||
// if past the current match start
|
||||
if ((curMatch == null) || (curMatch.index < i)) {
|
||||
curMatch = re.exec(text);
|
||||
if (curMatch == null) {
|
||||
// No more matches
|
||||
break;
|
||||
}
|
||||
}
|
||||
// Create a non-selected highlight marker for the match, the
|
||||
// selected marker highlight will be done later
|
||||
if (i === curMatch.index) {
|
||||
let fromPos = { "line" : curLine, "ch" : curChar };
|
||||
// XXX If multiline is supported, this needs to
|
||||
// recalculate curLine since the match may span
|
||||
// lines
|
||||
let toPos = { "line" : curLine, "ch" : curChar + curMatch[0].length};
|
||||
// XXX or css = "color: #f3"
|
||||
let marker = doc.markText( fromPos, toPos, { "className" : FIND_RESULT_CSS_CLASSNAME });
|
||||
findResult.push(marker);
|
||||
|
||||
// Set the first match beyond the cursor as current
|
||||
// match
|
||||
if (currentFound === -1) {
|
||||
const cursorPos = codeEditor.getCursor();
|
||||
if ((fromPos.line > cursorPos.line) ||
|
||||
((fromPos.line === cursorPos.line) &&
|
||||
(fromPos.ch >= cursorPos.ch))){
|
||||
currentFound = totalFound;
|
||||
}
|
||||
}
|
||||
|
||||
totalFound++;
|
||||
}
|
||||
// Do line and char position tracking
|
||||
if (text[i] === "\n") {
|
||||
curLine++;
|
||||
curChar = 0;
|
||||
} else {
|
||||
curChar++;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
this.findResult = findResult;
|
||||
|
||||
// Calculate curfound if not already, highlight it as selected
|
||||
if (totalFound > 0) {
|
||||
currentFound = Math.max(0, currentFound)
|
||||
let marker = findResult[currentFound];
|
||||
let pos = marker.find();
|
||||
codeEditor.scrollIntoView(pos.to);
|
||||
marker.clear();
|
||||
findResult[currentFound] = doc.markText( pos.from, pos.to,
|
||||
{ "className" : FIND_RESULT_SELECTED_CSS_CLASSNAME }
|
||||
);
|
||||
}
|
||||
|
||||
return {
|
||||
totalFound,
|
||||
currentFound: currentFound + 1
|
||||
};
|
||||
}
|
||||
|
||||
async findNext(direction, currentFound, nextFound) {
|
||||
const codeEditor = await getActiveContextCodeEditor();
|
||||
const doc = codeEditor.doc;
|
||||
|
||||
//
|
||||
// Dehighlight current, highlight & scrollIntoView next
|
||||
//
|
||||
|
||||
let marker = this.findResult[currentFound];
|
||||
let pos = marker.find();
|
||||
marker.clear();
|
||||
marker = doc.markText(
|
||||
pos.from, pos.to,
|
||||
{ "className" : FIND_RESULT_CSS_CLASSNAME }
|
||||
);
|
||||
this.findResult[currentFound] = marker;
|
||||
|
||||
marker = this.findResult[nextFound];
|
||||
pos = marker.find();
|
||||
marker.clear();
|
||||
marker = doc.markText(
|
||||
pos.from, pos.to,
|
||||
{ "className" : FIND_RESULT_SELECTED_CSS_CLASSNAME }
|
||||
);
|
||||
this.findResult[nextFound] = marker;
|
||||
|
||||
codeEditor.scrollIntoView(pos.from);
|
||||
}
|
||||
|
||||
async cleanup(totalFound, currentFound) {
|
||||
const codeEditor = await getActiveContextCodeEditor();
|
||||
|
||||
if (totalFound > 0) {
|
||||
const doc = codeEditor.doc;
|
||||
const pos = this.findResult[currentFound].find();
|
||||
// Note setting the selection sets the cursor to
|
||||
// the end of the selection and scrolls it into
|
||||
// view
|
||||
doc.setSelection(pos.from, pos.to);
|
||||
// Clear all markers
|
||||
codeEditor.operation(() => {
|
||||
for (let i = 0; i < this.findResult.length; ++i) {
|
||||
let marker = this.findResult[i];
|
||||
marker.clear();
|
||||
}
|
||||
});
|
||||
}
|
||||
// Restore the highlightSelectionMatches setting
|
||||
codeEditor.setOption("highlightSelectionMatches", this.oldHighlightSelectionMatches);
|
||||
this.findResult = null;
|
||||
}
|
||||
|
||||
async close() {
|
||||
const codeEditor = await getActiveContextCodeEditor();
|
||||
codeEditor.focus();
|
||||
}
|
||||
}
|
116
src/public/app/widgets/find_in_text.js
Normal file
116
src/public/app/widgets/find_in_text.js
Normal file
@ -0,0 +1,116 @@
|
||||
import appContext from "../services/app_context.js";
|
||||
|
||||
const getActiveContextTextEditor = async () => await appContext.tabManager.getActiveContextTextEditor();
|
||||
|
||||
export default class FindInText {
|
||||
async getInitialSearchTerm() {
|
||||
const textEditor = await getActiveContextTextEditor();
|
||||
|
||||
const selection = textEditor.model.document.selection;
|
||||
const range = selection.getFirstRange();
|
||||
|
||||
for (const item of range.getItems()) {
|
||||
// Fill in the findbox with the current selection if
|
||||
// any
|
||||
return item.data;
|
||||
}
|
||||
}
|
||||
|
||||
async performFind(searchTerm, matchCase, wholeWord) {
|
||||
// Do this even if the searchTerm is empty so the markers are cleared and
|
||||
// the counters updated
|
||||
const textEditor = await getActiveContextTextEditor();
|
||||
const model = textEditor.model;
|
||||
let findResult = null;
|
||||
let totalFound = 0;
|
||||
let currentFound = -1;
|
||||
|
||||
// Clear
|
||||
const findAndReplaceEditing = textEditor.plugins.get('FindAndReplaceEditing');
|
||||
findAndReplaceEditing.state.clear(model);
|
||||
findAndReplaceEditing.stop();
|
||||
if (searchTerm !== "") {
|
||||
// Parameters are callback/text, options.matchCase=false, options.wholeWords=false
|
||||
// See https://github.com/ckeditor/ckeditor5/blob/b95e2faf817262ac0e1e21993d9c0bde3f1be594/packages/ckeditor5-find-and-replace/src/findcommand.js#L44
|
||||
// XXX Need to use the callback version for regexp
|
||||
// searchTerm = escapeRegExp(searchTerm);
|
||||
// let re = new RegExp(searchTerm, 'gi');
|
||||
// let m = text.match(re);
|
||||
// totalFound = m ? m.length : 0;
|
||||
const options = { "matchCase" : matchCase, "wholeWords" : wholeWord };
|
||||
findResult = textEditor.execute('find', searchTerm, options);
|
||||
totalFound = findResult.results.length;
|
||||
// Find the result beyond the cursor
|
||||
const cursorPos = model.document.selection.getLastPosition();
|
||||
for (let i = 0; i < findResult.results.length; ++i) {
|
||||
const marker = findResult.results.get(i).marker;
|
||||
const fromPos = marker.getStart();
|
||||
if (fromPos.compareWith(cursorPos) !== "before") {
|
||||
currentFound = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this.findResult = findResult;
|
||||
|
||||
// Calculate curfound if not already, highlight it as
|
||||
// selected
|
||||
if (totalFound > 0) {
|
||||
currentFound = Math.max(0, currentFound);
|
||||
// XXX Do this accessing the private data?
|
||||
// See
|
||||
// https://github.com/ckeditor/ckeditor5/blob/b95e2faf817262ac0e1e21993d9c0bde3f1be594/packages/ckeditor5-find-and-replace/src/findnextcommand.js
|
||||
for (let i = 0 ; i < currentFound; ++i) {
|
||||
textEditor.execute('findNext', searchTerm);
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
totalFound,
|
||||
currentFound: currentFound + 1
|
||||
};
|
||||
}
|
||||
|
||||
async findNext(direction, currentFound, nextFound) {
|
||||
const textEditor = await getActiveContextTextEditor();
|
||||
|
||||
// There are no parameters for findNext/findPrev
|
||||
// See https://github.com/ckeditor/ckeditor5/blob/b95e2faf817262ac0e1e21993d9c0bde3f1be594/packages/ckeditor5-find-and-replace/src/findnextcommand.js#L57
|
||||
// curFound wrap around above assumes findNext and
|
||||
// findPrevious wraparound, which is what they do
|
||||
if (direction > 0) {
|
||||
textEditor.execute('findNext');
|
||||
} else {
|
||||
textEditor.execute('findPrevious');
|
||||
}
|
||||
}
|
||||
|
||||
async cleanup(totalFound, currentFound) {
|
||||
if (totalFound > 0) {
|
||||
const textEditor = await getActiveContextTextEditor();
|
||||
// Clear the markers and set the caret to the
|
||||
// current occurrence
|
||||
const model = textEditor.model;
|
||||
const range = this.findResult.results.get(currentFound).marker.getRange();
|
||||
// From
|
||||
// https://github.com/ckeditor/ckeditor5/blob/b95e2faf817262ac0e1e21993d9c0bde3f1be594/packages/ckeditor5-find-and-replace/src/findandreplace.js#L92
|
||||
// XXX Roll our own since already done for codeEditor and
|
||||
// will probably allow more refactoring?
|
||||
let findAndReplaceEditing = textEditor.plugins.get('FindAndReplaceEditing');
|
||||
findAndReplaceEditing.state.clear(model);
|
||||
findAndReplaceEditing.stop();
|
||||
model.change(writer => {
|
||||
writer.setSelection(range, 0);
|
||||
});
|
||||
textEditor.editing.view.scrollToTheSelection();
|
||||
}
|
||||
|
||||
this.findResult = null;
|
||||
}
|
||||
|
||||
async close() {
|
||||
const textEditor = await getActiveContextTextEditor();
|
||||
textEditor.focus();
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user