Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-05-09 04:26:45 +02:00
Code Issues Packages Projects Releases Activity

fix(spellcheck): don't remove local words every time

Browse Source
This commit is contained in:
Elian Doran
2026-04-06 20:46:38 +03:00
parent 03136611a1
commit 5d0c91d91d
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
apps/server/src/services/custom_dictionary.spec.ts
View File

@@ -56,19 +56,18 @@ describe("custom_dictionary", () => {
await customDictionary.loadForSession(session);
expect(session.addWordToSpellCheckerDictionary).toHaveBeenCalledTimes(2);
expect(session.addWordToSpellCheckerDictionary).toHaveBeenCalledWith("hello");
expect(session.addWordToSpellCheckerDictionary).toHaveBeenCalledWith("world");
// Words are saved to the note; they're already in the local dictionary so no re-add needed.
expect(session.addWordToSpellCheckerDictionary).not.toHaveBeenCalled();
});
it("clears local dictionary after one-time import", async () => {
it("does not remove or re-add local words after one-time import", async () => {
const session = mockSession(["hello", "world"]);
await customDictionary.loadForSession(session);
expect(session.removeWordFromSpellCheckerDictionary).toHaveBeenCalledTimes(2);
expect(session.removeWordFromSpellCheckerDictionary).toHaveBeenCalledWith("hello");
expect(session.removeWordFromSpellCheckerDictionary).toHaveBeenCalledWith("world");
// Words were imported from local, so they already exist — no remove, no re-add.
expect(session.removeWordFromSpellCheckerDictionary).not.toHaveBeenCalled();
expect(session.addWordToSpellCheckerDictionary).not.toHaveBeenCalled();
});
it("loads note words into session when no local words exist", async () => {
@@ -88,7 +87,7 @@ describe("custom_dictionary", () => {
expect(session.addWordToSpellCheckerDictionary).toHaveBeenCalledWith("banana");
});
it("only loads note words when both note and local have content", async () => {
it("only adds note words not already in local dictionary", async () => {
becca.reset();
buildNote({
id: "_customDictionary",
@@ -96,16 +95,16 @@ describe("custom_dictionary", () => {
type: "code",
content: "apple\nbanana"
});
// "banana" is already local, so only "apple" needs adding.
const session = mockSession(["banana", "cherry"]);
await customDictionary.loadForSession(session);
expect(session.addWordToSpellCheckerDictionary).toHaveBeenCalledTimes(2);
expect(session.addWordToSpellCheckerDictionary).toHaveBeenCalledTimes(1);
expect(session.addWordToSpellCheckerDictionary).toHaveBeenCalledWith("apple");
expect(session.addWordToSpellCheckerDictionary).toHaveBeenCalledWith("banana");
});
it("clears local dictionary when note has content", async () => {
it("only removes local words not in the note", async () => {
becca.reset();
buildNote({
id: "_customDictionary",
@@ -113,12 +112,12 @@ describe("custom_dictionary", () => {
type: "code",
content: "apple\nbanana"
});
// "cherry" is not in the note, so it should be removed. "banana" should stay.
const session = mockSession(["banana", "cherry"]);
await customDictionary.loadForSession(session);
expect(session.removeWordFromSpellCheckerDictionary).toHaveBeenCalledTimes(2);
expect(session.removeWordFromSpellCheckerDictionary).toHaveBeenCalledWith("banana");
expect(session.removeWordFromSpellCheckerDictionary).toHaveBeenCalledTimes(1);
expect(session.removeWordFromSpellCheckerDictionary).toHaveBeenCalledWith("cherry");
});
@@ -153,10 +152,11 @@ describe("custom_dictionary", () => {
await customDictionary.loadForSession(session);
// Only note words should be loaded, not "cherry".
expect(session.addWordToSpellCheckerDictionary).toHaveBeenCalledWith("apple");
expect(session.addWordToSpellCheckerDictionary).toHaveBeenCalledWith("banana");
expect(session.addWordToSpellCheckerDictionary).not.toHaveBeenCalledWith("cherry");
// "apple" and "banana" are already local — no re-add needed.
expect(session.addWordToSpellCheckerDictionary).not.toHaveBeenCalled();
// "cherry" should be removed from local dictionary.
expect(session.removeWordFromSpellCheckerDictionary).toHaveBeenCalledTimes(1);
expect(session.removeWordFromSpellCheckerDictionary).toHaveBeenCalledWith("cherry");
});
it("handles missing dictionary note gracefully", async () => {

14
apps/server/src/services/custom_dictionary.ts
View File

@@ -86,14 +86,18 @@ async function loadForSession(session: Session) {
saveWords(merged);
}
// Clear local dictionary so the note remains the single source of truth.
if (localWords.length > 0) {
clearFromLocalDictionary(session, localWords);
// Remove local words that are not in the note (e.g. user removed them manually).
const staleWords = localWords.filter((w) => !merged.has(w));
if (staleWords.length > 0) {
clearFromLocalDictionary(session, staleWords);
}
// Load all words into Electron's spellchecker.
// Add note words that aren't already in the local dictionary.
const localWordsSet = new Set(localWords);
for (const word of merged) {
session.addWordToSpellCheckerDictionary(word);
if (!localWordsSet.has(word)) {
session.addWordToSpellCheckerDictionary(word);
}
}
if (merged.size > 0) {