Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-05 21:05:55 +01:00
Code Issues Packages Projects Releases Activity

find widget refactoring to use note context

Browse Source
This commit is contained in:
zadam
2022-05-17 23:53:35 +02:00
parent 4978a3ff1a
commit cd622cbdd7
9 changed files with 62 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/public/app/widgets/find_in_code.js
View File

@@ -1,17 +1,22 @@
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 {
constructor(parent) {
this.parent = parent;
}
async getCodeEditor() {
return this.parent.noteContext.getCodeEditor();
}
async getInitialSearchTerm() {
const codeEditor = await getActiveContextCodeEditor();
const codeEditor = await this.getCodeEditor();
// highlightSelectionMatches is the overlay that highlights
// the words under the cursor. This occludes the search
@@ -33,7 +38,7 @@ export default class FindInCode {
let currentFound = -1;
// See https://codemirror.net/addon/search/searchcursor.js for tips
const codeEditor = await getActiveContextCodeEditor();
const codeEditor = await this.getCodeEditor();
const doc = codeEditor.doc;
const text = doc.getValue();
@@ -135,7 +140,7 @@ export default class FindInCode {
}
async findNext(direction, currentFound, nextFound) {
const codeEditor = await getActiveContextCodeEditor();
const codeEditor = await this.getCodeEditor();
const doc = codeEditor.doc;
//
@@ -164,7 +169,7 @@ export default class FindInCode {
}
async cleanup(totalFound, currentFound) {
const codeEditor = await getActiveContextCodeEditor();
const codeEditor = await this.getCodeEditor();
if (totalFound > 0) {
const doc = codeEditor.doc;
@@ -187,7 +192,7 @@ export default class FindInCode {
}
async close() {
const codeEditor = await getActiveContextCodeEditor();
const codeEditor = await this.getCodeEditor();
codeEditor.focus();
}
}