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

refactor(code/find): reimplement find next

Browse Source
This commit is contained in:
Elian Doran
2025-05-12 21:21:46 +03:00
parent 2fbff5328b
commit 22d9091315
3 changed files with 37 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/codemirror/src/index.ts
View File

@@ -1,5 +1,5 @@
import { defaultKeymap, history, historyKeymap } from "@codemirror/commands";
import { EditorView, highlightActiveLine, keymap, lineNumbers, placeholder, ViewUpdate, type EditorViewConfig } from "@codemirror/view";
import { EditorView, highlightActiveLine, keymap, lineNumbers, placeholder, ViewPlugin, ViewUpdate, type EditorViewConfig } from "@codemirror/view";
import { defaultHighlightStyle, StreamLanguage, syntaxHighlighting, indentUnit, bracketMatching, foldGutter } from "@codemirror/language";
import { Compartment, EditorSelection, EditorState, type Extension } from "@codemirror/state";
import { highlightSelectionMatches } from "@codemirror/search";
@@ -7,7 +7,7 @@ import { vim } from "@replit/codemirror-vim";
import byMimeType from "./syntax_highlighting.js";
import smartIndentWithTab from "./extensions/custom_tab.js";
import type { ThemeDefinition } from "./color_themes.js";
import { createSearchHighlighter, searchMatchHighlightTheme } from "./find_replace.js";
import { createSearchHighlighter, SearchHighlighter, searchMatchHighlightTheme } from "./find_replace.js";
export { default as ColorThemes, type ThemeDefinition, getThemeById } from "./color_themes.js";
@@ -31,6 +31,7 @@ export default class CodeMirror extends EditorView {
private themeCompartment: Compartment;
private lineWrappingCompartment: Compartment;
private searchHighlightCompartment: Compartment;
private searchPlugin?: SearchHighlighter | null;
constructor(config: EditorConfig) {
const languageCompartment = new Compartment();
@@ -181,6 +182,7 @@ export default class CodeMirror extends EditorView {
await new Promise(requestAnimationFrame);
const instance = this.plugin(plugin);
instance?.searchFor(searchTerm, matchCase, wholeWord);
this.searchPlugin = instance;
return {
totalFound: instance?.totalFound ?? 0,
@@ -188,6 +190,10 @@ export default class CodeMirror extends EditorView {
}
}
async findNext(direction: number, currentFound: number, nextFound: number) {
this.searchPlugin?.scrollToMatch(nextFound);
}
async setMimeType(mime: string) {
let newExtension: Extension[] = [];