anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FindAdv: If searching for whole words, handle also the case that we are starting in the mid of a word.

Browse Source 
In this case we skip the undesired word-characters before starting the search.

There are still some inconsistencies between LyX and Qt of 'what counts as a word-character',
but too hard to resolve.
This commit is contained in:
Kornel Benko 2022-05-26 13:32:25 +02:00
parent bf60c61066
commit 652ffc9c84
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/lyxfind.cpp
View File

@ -3774,7 +3774,7 @@ MatchStringAdv::MatchStringAdv(lyx::Buffer & buf, FindAndReplaceOptions & opt)
} }
if (opt.matchword) { if (opt.matchword) {
modifyRegexForMatchWord(par_as_string); modifyRegexForMatchWord(par_as_string);
opt.matchword = false; // opt.matchword = false;
} }
regexp_str = "(" + lead_as_regexp + ")()" + par_as_string; regexp_str = "(" + lead_as_regexp + ")()" + par_as_string;
regexp2_str = "(" + lead_as_regexp + ")(.*?)" + par_as_string; regexp2_str = "(" + lead_as_regexp + ")(.*?)" + par_as_string;
@ -3949,20 +3949,17 @@ MatchResult MatchStringAdv::findAux(DocIterator const & cur, int len, MatchStrin
MatchResult MatchStringAdv::operator()(DocIterator const & cur, int len, MatchStringAdv::matchType at_begin) const MatchResult MatchStringAdv::operator()(DocIterator const & cur, int len, MatchStringAdv::matchType at_begin) const
{ {
MatchResult mres = findAux(cur, len, at_begin); MatchResult mres = findAux(cur, len, at_begin);
int res = mres.match_len;
LYXERR(Debug::FINDVERBOSE, LYXERR(Debug::FINDVERBOSE,
"res=" << res << ", at_begin=" << matchTypeAsString(at_begin) "res=" << mres.match_len << ", at_begin=" << matchTypeAsString(at_begin)
<< ", matchAtStart=" << opt.matchAtStart << ", matchAtStart=" << opt.matchAtStart
<< ", inTexted=" << cur.inTexted()); << ", inTexted=" << cur.inTexted());
if (opt.matchAtStart) { if (mres.match_len > 0) {
if (cur.pos() != 0) if (opt.matchAtStart) {
mres.match_len = 0; if (cur.pos() > 0 || mres.match_prefix > 0)
else if (mres.match_prefix > 0) mres.match_len = 0;
mres.match_len = 0; }
return mres;
} }
else return mres;
return mres;
} }
#if 0 #if 0
@ -4513,7 +4510,7 @@ int findForwardAdv(DocIterator & cur, MatchStringAdv & match)
default: default:
// Todo@ // Todo@
// Handle not like MatchResult::newIsTooFar // Handle not like MatchResult::newIsTooFar
LYXERR0( "Probably too far: Increment = " << increment << " match_prefix = " << mres.match_prefix); LYXERR(Debug::FINDVERBOSE, "Probably too far: Increment = " << increment << " match_prefix = " << mres.match_prefix);
firstInvalid--; firstInvalid--;
increment = increment*3/4; increment = increment*3/4;
cur = old_cur; cur = old_cur;
@ -4858,8 +4855,21 @@ bool findAdv(BufferView * bv, FindAndReplaceOptions & opt)
bv->putSelectionAt(bv->cursor().selectionBegin(), length, !opt.forward); bv->putSelectionAt(bv->cursor().selectionBegin(), length, !opt.forward);
num_replaced += findAdvReplace(bv, opt, matchAdv); num_replaced += findAdvReplace(bv, opt, matchAdv);
cur = bv->cursor(); cur = bv->cursor();
if (opt.forward) if (opt.forward) {
if (opt.matchword) { // Skip word-characters if we are in the mid of a word
Paragraph const & par = cur.paragraph();
if ((cur.pos() > 0) && !par.isWordSeparator(cur.pos() -1, true)) {
while (cur.pos() < par.size()) {
if (par.isWordSeparator(cur.pos(), true))
break;
else
cur.forwardPos();
}
}
opt.matchword = false;
}
pos_len = findForwardAdv(cur, matchAdv); pos_len = findForwardAdv(cur, matchAdv);
}
else else
pos_len = findBackwardsAdv(cur, matchAdv); pos_len = findBackwardsAdv(cur, matchAdv);
} catch (exception & ex) { } catch (exception & ex) {