Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include the whole word when displaying search results

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2024-06-16 15:58:30 +02:00
parent ee46fdb5b1
commit 611a6bb80a
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/core/coretools.py
+3 -1
View File
@@ -348,7 +348,9 @@ class DocSearch:
rxMatch = rxItt.next() rxMatch = rxItt.next()
pos = rxMatch.capturedStart() pos = rxMatch.capturedStart()
num = rxMatch.capturedLength() num = rxMatch.capturedLength()
context = text[pos:pos+100].partition("\n")[0] lim = text[:pos].rfind("\n") + 1
cut = text[lim:pos].rfind(" ") + lim + 1
context = text[cut:cut+100].partition("\n")[0]
if context: if context:
results.append((pos, num, context)) results.append((pos, num, context))
count += 1 count += 1
tests/test_core/test_core_coretools.py
+4 -3
View File
@@ -439,6 +439,7 @@ def testCoreTools_DocSearch(monkeypatch, mockGUI, fncPath, mockRnd, ipsumText):
return [(s, n, c.split()[0]) for s, n, c in temp] return [(s, n, c.split()[0]) for s, n, c in temp]
# Defaults # Defaults
# assert list(search.iterSearch(project, "Lorem")) == []
assert pruneResult(search.iterSearch(project, "Lorem"), 2) == [ assert pruneResult(search.iterSearch(project, "Lorem"), 2) == [
(15, 5, "Lorem"), (754, 5, "lorem"), (2056, 5, "lorem,"), (2209, 5, "lorem"), (15, 5, "Lorem"), (754, 5, "lorem"), (2056, 5, "lorem,"), (2209, 5, "lorem"),
(2425, 5, "lorem"), (2840, 5, "lorem."), (3399, 5, "lorem"), (2425, 5, "lorem"), (2840, 5, "lorem."), (3399, 5, "lorem"),
@@ -449,8 +450,8 @@ def testCoreTools_DocSearch(monkeypatch, mockGUI, fncPath, mockRnd, ipsumText):
assert pruneResult(search.iterSearch(project, "Lor"), 2) == [] assert pruneResult(search.iterSearch(project, "Lor"), 2) == []
search.setWholeWords(False) search.setWholeWords(False)
assert pruneResult(search.iterSearch(project, "Lor"), 2) == [ assert pruneResult(search.iterSearch(project, "Lor"), 2) == [
(15, 3, "Lorem"), (29, 3, "lor"), (754, 3, "lorem"), (2056, 3, "lorem,"), (15, 3, "Lorem"), (29, 3, "dolor"), (754, 3, "lorem"), (2056, 3, "lorem,"),
(2209, 3, "lorem"), (2425, 3, "lorem"), (2840, 3, "lorem."), (3328, 3, "lor."), (2209, 3, "lorem"), (2425, 3, "lorem"), (2840, 3, "lorem."), (3328, 3, "dolor."),
(3399, 3, "lorem"), (3399, 3, "lorem"),
] ]
@@ -458,7 +459,7 @@ def testCoreTools_DocSearch(monkeypatch, mockGUI, fncPath, mockRnd, ipsumText):
search.setWholeWords(False) search.setWholeWords(False)
search.setUserRegEx(True) search.setUserRegEx(True)
assert pruneResult(search.iterSearch(project, r"Lor\b"), 2) == [ assert pruneResult(search.iterSearch(project, r"Lor\b"), 2) == [
(29, 3, "lor"), (3328, 3, "lor."), (29, 3, "dolor"), (3328, 3, "dolor."),
] ]
# Max Results # Max Results