mirror of https://github.com/TriliumNext/Notes
findwidget cleanup
zadam
parent
bb7ad496bf
commit
c51e6107a1
@ -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();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -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…
Reference in New Issue