X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfind.cpp;h=441cbf18b3c0cf0396ce56d60b3944e9345e1748;hb=5c03cb340c2214a3142f254622b0efaaa654ec44;hp=aedbc53bff0dd5d0bf52859e164b472b4752a40e;hpb=afed7d06fa6c932a1a1578b76371189a7e17825e;p=lyx.git

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index aedbc53bff..441cbf18b3 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -39,6 +39,7 @@
 #include "mathed/InsetMath.h"
 #include "mathed/InsetMathGrid.h"
 #include "mathed/InsetMathHull.h"
+#include "mathed/MathData.h"
 #include "mathed/MathStream.h"
 #include "mathed/MathSupport.h"
 
@@ -132,7 +133,8 @@ bool searchAllowed(docstring const & str)
 
 
 bool findOne(BufferView * bv, docstring const & searchstr,
-	     bool case_sens, bool whole, bool forward, bool find_del = true)
+	     bool case_sens, bool whole, bool forward,
+	     bool find_del = true, bool check_wrap = false)
 {
 	if (!searchAllowed(searchstr))
 		return false;
@@ -149,6 +151,32 @@ bool findOne(BufferView * bv, docstring const & searchstr,
 
 	if (match_len > 0)
 		bv->putSelectionAt(cur, match_len, !forward);
+	else if (check_wrap) {
+		DocIterator cur_orig(bv->cursor());
+		docstring q;
+		if (forward)
+			q = _("End of file reached while searching forward.\n"
+			  "Continue searching from the beginning?");
+		else
+			q = _("Beginning of file reached while searching backward.\n"
+			  "Continue searching from the end?");
+		int wrap_answer = frontend::Alert::prompt(_("Wrap search?"),
+			q, 0, 1, _("&Yes"), _("&No"));
+		if (wrap_answer == 0) {
+			if (forward) {
+				bv->cursor().clear();
+				bv->cursor().push_back(CursorSlice(bv->buffer().inset()));
+			} else {
+				bv->cursor().setCursor(doc_iterator_end(&bv->buffer()));
+				bv->cursor().backwardPos();
+			}
+			bv->clearSelection();
+			if (findOne(bv, searchstr, case_sens, whole, forward, find_del, false))
+				return true;
+		}
+		bv->cursor().setCursor(cur_orig);
+		return false;
+	}
 
 	return match_len > 0;
 }
@@ -221,11 +249,12 @@ pair<bool, int> replaceOne(BufferView * bv, docstring searchstr,
 			   bool whole, bool forward, bool findnext)
 {
 	Cursor & cur = bv->cursor();
+	bool found = false;
 	if (!cur.selection()) {
 		// no selection, non-empty search string: find it
 		if (!searchstr.empty()) {
-			findOne(bv, searchstr, case_sens, whole, forward);
-			return make_pair(true, 0);
+			found = findOne(bv, searchstr, case_sens, whole, forward, true, findnext);
+			return make_pair(found, 0);
 		}
 		// empty search string
 		if (!cur.inTexted())
@@ -253,8 +282,8 @@ pair<bool, int> replaceOne(BufferView * bv, docstring searchstr,
 	// no selection or current selection is not search word:
 	// just find the search word
 	if (!have_selection || !match) {
-		findOne(bv, searchstr, case_sens, whole, forward);
-		return make_pair(true, 0);
+		found = findOne(bv, searchstr, case_sens, whole, forward, true, findnext);
+		return make_pair(found, 0);
 	}
 
 	// we're now actually ready to replace. if the buffer is
@@ -269,7 +298,7 @@ pair<bool, int> replaceOne(BufferView * bv, docstring searchstr,
 		        cur.pos() = cur.lastpos());
 	}
 	if (findnext)
-		findOne(bv, searchstr, case_sens, whole, forward, false);
+		findOne(bv, searchstr, case_sens, whole, forward, false, findnext);
 
 	return make_pair(true, 1);
 }
@@ -323,7 +352,7 @@ bool lyxfind(BufferView * bv, FuncRequest const & ev)
 	bool matchword     = parse_bool(howto);
 	bool forward       = parse_bool(howto);
 
-	return findOne(bv, search, casesensitive, matchword, forward);
+	return findOne(bv, search, casesensitive, matchword, forward, true, true);
 }
 
 
@@ -380,31 +409,66 @@ bool lyxreplace(BufferView * bv,
 	} else if (findnext) {
 		// if we have deleted characters, we do not replace at all, but
 		// rather search for the next occurence
-		if (findOne(bv, search, casesensitive, matchword, forward))
+		if (findOne(bv, search, casesensitive, matchword, forward, true, findnext))
 			update = true;
 		else
 			bv->message(_("String not found."));
 	}
-	bv->buffer().updatePreviews();
 	return update;
 }
 
 
-bool findNextChange(DocIterator & cur)
+bool findNextChange(BufferView * bv, Cursor & cur, bool const check_wrap)
 {
 	for (; cur; cur.forwardPos())
 		if (cur.inTexted() && cur.paragraph().isChanged(cur.pos()))
 			return true;
+
+	if (check_wrap) {
+		DocIterator cur_orig(bv->cursor());
+		docstring q = _("End of file reached while searching forward.\n"
+			  "Continue searching from the beginning?");
+		int wrap_answer = frontend::Alert::prompt(_("Wrap search?"),
+			q, 0, 1, _("&Yes"), _("&No"));
+		if (wrap_answer == 0) {
+			bv->cursor().clear();
+			bv->cursor().push_back(CursorSlice(bv->buffer().inset()));
+			bv->clearSelection();
+			cur.setCursor(bv->cursor().selectionBegin());
+			if (findNextChange(bv, cur, false))
+				return true;
+		}
+		bv->cursor().setCursor(cur_orig);
+	}
+
 	return false;
 }
 
 
-bool findPreviousChange(DocIterator & cur)
+bool findPreviousChange(BufferView * bv, Cursor & cur, bool const check_wrap)
 {
 	for (cur.backwardPos(); cur; cur.backwardPos()) {
 		if (cur.inTexted() && cur.paragraph().isChanged(cur.pos()))
 			return true;
 	}
+
+	if (check_wrap) {
+		DocIterator cur_orig(bv->cursor());
+		docstring q = _("Beginning of file reached while searching backward.\n"
+			  "Continue searching from the end?");
+		int wrap_answer = frontend::Alert::prompt(_("Wrap search?"),
+			q, 0, 1, _("&Yes"), _("&No"));
+		if (wrap_answer == 0) {
+			bv->cursor().setCursor(doc_iterator_end(&bv->buffer()));
+			bv->cursor().backwardPos();
+			bv->clearSelection();
+			cur.setCursor(bv->cursor().selectionBegin());
+			if (findPreviousChange(bv, cur, false))
+				return true;
+		}
+		bv->cursor().setCursor(cur_orig);
+	}
+
 	return false;
 }
 
@@ -449,7 +513,7 @@ bool findChange(BufferView * bv, bool forward)
 	Cursor cur(*bv);
 	cur.setCursor(forward ? bv->cursor().selectionEnd()
 		      : bv->cursor().selectionBegin());
-	forward ? findNextChange(cur) : findPreviousChange(cur);
+	forward ? findNextChange(bv, cur, true) : findPreviousChange(bv, cur, true);
 	return selectChange(cur, forward);
 }
 
@@ -592,7 +656,6 @@ string escape_for_regex(string s, bool match_latex)
 		}
 		if (end_pos == s.size()) {
 			s.replace(new_pos, end_pos - new_pos, t);
-			pos = s.size();
 			LYXERR(Debug::FIND, "Regexp after \\regexp{} removal: " << s);
 			break;
 		}
@@ -729,9 +792,8 @@ private:
 static docstring buffer_to_latex(Buffer & buffer)
 {
 	OutputParams runparams(&buffer.params().encoding());
-	TexRow texrow(false);
 	odocstringstream ods;
-	otexstream os(ods, texrow);
+	otexstream os(ods);
 	runparams.nice = true;
 	runparams.flavor = OutputParams::LATEX;
 	runparams.linelen = 80; //lyxrc.plaintext_linelen;
@@ -889,47 +951,53 @@ int MatchStringAdv::findAux(DocIterator const & cur, int len, bool at_begin) con
 	if (at_begin &&
 		(opt.restr == FindAndReplaceOptions::R_ONLY_MATHS && !cur.inMathed()) )
 		return 0;
+
 	docstring docstr = stringifyFromForSearch(opt, cur, len);
-	LYXERR(Debug::FIND, "Matching against     '" << lyx::to_utf8(docstr) << "'");
 	string str = normalize(docstr, true);
+	LYXERR(Debug::FIND, "Matching against     '" << lyx::to_utf8(docstr) << "'");
 	LYXERR(Debug::FIND, "After normalization: '" << str << "'");
-	if (! use_regexp) {
-		LYXERR(Debug::FIND, "Searching in normal mode: par_as_string='" << par_as_string << "', str='" << str << "'");
-		LYXERR(Debug::FIND, "Searching in normal mode: lead_as_string='" << lead_as_string << "', par_as_string_nolead='" << par_as_string_nolead << "'");
-		if (at_begin) {
-			LYXERR(Debug::FIND, "size=" << par_as_string.size() << ", substr='" << str.substr(0, par_as_string.size()) << "'");
-			if (str.substr(0, par_as_string.size()) == par_as_string)
-				return par_as_string.size();
-		} else {
-			size_t pos = str.find(par_as_string_nolead);
-			if (pos != string::npos)
-				return par_as_string.size();
-		}
-	} else {
+
+	if (use_regexp) {
 		LYXERR(Debug::FIND, "Searching in regexp mode: at_begin=" << at_begin);
-		// Try all possible regexp matches,
-		//until one that verifies the braces match test is found
-		regex const *p_regexp = at_begin ? &regexp : &regexp2;
-		sregex_iterator re_it(str.begin(), str.end(), *p_regexp);
-		sregex_iterator re_it_end;
-		for (; re_it != re_it_end; ++re_it) {
-			match_results<string::const_iterator> const & m = *re_it;
-			// Check braces on the segment that matched the entire regexp expression,
-			// plus the last subexpression, if a (.*?) was inserted in the constructor.
-			if (!braces_match(m[0].first, m[0].second, open_braces))
-				return 0;
-			// Check braces on segments that matched all (.*?) subexpressions,
-			// except the last "padding" one inserted by lyx.
-			for (size_t i = 1; i < m.size() - 1; ++i)
-				if (!braces_match(m[i].first, m[i].second))
-					return false;
-			// Exclude from the returned match length any length
-			// due to close wildcards added at end of regexp
-			if (close_wildcards == 0)
-				return m[0].second - m[0].first;
-			else
-				return m[m.size() - close_wildcards].first - m[0].first;
-		}
+		regex const & p_regexp = at_begin ? regexp : regexp2;
+		sregex_iterator re_it(str.begin(), str.end(), p_regexp);
+		match_results<string::const_iterator> const & m = *re_it;
+
+		// Check braces on the segment that matched the entire regexp expression,
+		// plus the last subexpression, if a (.*?) was inserted in the constructor.
+		if (!braces_match(m[0].first, m[0].second, open_braces))
+			return 0;
+	
+		// Check braces on segments that matched all (.*?) subexpressions,
+		// except the last "padding" one inserted by lyx.
+		for (size_t i = 1; i < m.size() - 1; ++i)
+			if (!braces_match(m[i].first, m[i].second))
+				return false;
+	
+		// Exclude from the returned match length any length
+		// due to close wildcards added at end of regexp
+		if (close_wildcards == 0)
+			return m[0].second - m[0].first;
+
+		return m[m.size() - close_wildcards].first - m[0].first;
+	}
+
+	// else !use_regexp: but all code paths above return
+	LYXERR(Debug::FIND, "Searching in normal mode: par_as_string='"
+				 << par_as_string << "', str='" << str << "'");
+	LYXERR(Debug::FIND, "Searching in normal mode: lead_as_string='"
+				 << lead_as_string << "', par_as_string_nolead='"
+				 << par_as_string_nolead << "'");
+
+	if (at_begin) {
+		LYXERR(Debug::FIND, "size=" << par_as_string.size()
+					 << ", substr='" << str.substr(0, par_as_string.size()) << "'");
+		if (str.substr(0, par_as_string.size()) == par_as_string)
+			return par_as_string.size();
+	} else {
+		size_t pos = str.find(par_as_string_nolead);
+		if (pos != string::npos)
+			return par_as_string.size();
 	}
 	return 0;
 }
@@ -1009,7 +1077,6 @@ docstring stringifyFromCursor(DocIterator const & cur, int len)
 		pos_type end = ( len == -1 || cur.pos() + len > int(par.size()) ) ?
 			int(par.size()) : cur.pos() + len;
 		OutputParams runparams(&cur.buffer()->params().encoding());
-		odocstringstream os;
 		runparams.nice = true;
 		runparams.flavor = OutputParams::LATEX;
 		runparams.linelen = 100000; //lyxrc.plaintext_linelen;
@@ -1049,11 +1116,9 @@ docstring latexifyFromCursor(DocIterator const & cur, int len)
 	LYXERR(Debug::FIND, "  with cur.lastpost=" << cur.lastpos() << ", cur.lastrow="
 	       << cur.lastrow() << ", cur.lastcol=" << cur.lastcol());
 	Buffer const & buf = *cur.buffer();
-	LBUFERR(buf.params().isLatex());
 
-	TexRow texrow(false);
 	odocstringstream ods;
-	otexstream os(ods, texrow);
+	otexstream os(ods);
 	OutputParams runparams(&buf.params().encoding());
 	runparams.nice = false;
 	runparams.flavor = OutputParams::LATEX;
@@ -1073,8 +1138,8 @@ docstring latexifyFromCursor(DocIterator const & cur, int len)
 		// Retrieve the math environment type, and add '$' or '$[' or others (\begin{equation}) accordingly
 		for (int s = cur.depth() - 1; s >= 0; --s) {
 			CursorSlice const & cs = cur[s];
-			if (cs.asInsetMath() && cs.asInsetMath() && cs.asInsetMath()->asHullInset()) {
-				WriteStream ws(ods);
+			if (cs.asInsetMath() && cs.asInsetMath()->asHullInset()) {
+				WriteStream ws(os);
 				cs.asInsetMath()->asHullInset()->header_write(ws);
 				break;
 			}
@@ -1096,7 +1161,7 @@ docstring latexifyFromCursor(DocIterator const & cur, int len)
 			CursorSlice const & cs = cur[s];
 			InsetMath * inset = cs.asInsetMath();
 			if (inset && inset->asHullInset()) {
-				WriteStream ws(ods);
+				WriteStream ws(os);
 				inset->asHullInset()->footer_write(ws);
 				break;
 			}
@@ -1224,12 +1289,10 @@ int findBackwardsAdv(DocIterator & cur, MatchStringAdv & match)
 		return 0;
 	cur.backwardPos();
 	DocIterator cur_orig(cur);
-	bool found_match;
 	bool pit_changed = false;
-	found_match = false;
 	do {
 		cur.pos() = 0;
-		found_match = match(cur, -1, false);
+		bool found_match = match(cur, -1, false);
 
 		if (found_match) {
 			if (pit_changed)
@@ -1302,6 +1365,7 @@ static bool allNonLowercase(Cursor const & cur, int len)
 	if (len > cur.lastpos() + 1 - beg_pos) {
 		LYXERR(Debug::FIND, "This should not happen, more debug needed");
 		len = cur.lastpos() + 1 - beg_pos;
+		end_pos = beg_pos + len;
 	}
 	for (pos_type pos = beg_pos; pos != end_pos; ++pos)
 		if (isLowerCase(cur.paragraph().getChar(pos)))
@@ -1399,9 +1463,8 @@ static void findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, M
 		LYXERR(Debug::FIND, "After pasteParagraphList() cur=" << cur << endl);
 		sel_len = repl_buffer.paragraphs().begin()->size();
 	} else if (cur.inMathed()) {
-		TexRow texrow(false);
 		odocstringstream ods;
-		otexstream os(ods, texrow);
+		otexstream os(ods);
 		OutputParams runparams(&repl_buffer.params().encoding());
 		runparams.nice = false;
 		runparams.flavor = OutputParams::LATEX;
@@ -1412,7 +1475,10 @@ static void findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, M
 		docstring repl_latex = ods.str();
 		LYXERR(Debug::FIND, "Latexified replace_buffer: '" << repl_latex << "'");
 		string s;
+		// false positive from coverity
+		// coverity[check_return]
 		regex_replace(to_utf8(repl_latex), s, "\\$(.*)\\$", "$1");
+		// coverity[check_return]
 		regex_replace(s, s, "\\\\\\[(.*)\\\\\\]", "$1");
 		repl_latex = from_utf8(s);
 		LYXERR(Debug::FIND, "Replacing by insert()ing latex: '" << repl_latex << "' cur=" << cur << " with depth=" << cur.depth());
@@ -1429,7 +1495,6 @@ static void findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, M
 	LYXERR(Debug::FIND, "After pos adj cur=" << cur << " with depth: " << cur.depth() << " and len: " << sel_len);
 	bv->putSelectionAt(DocIterator(cur), sel_len, !opt.forward);
 	bv->processUpdateFlags(Update::Force);
-	bv->buffer().updatePreviews();
 }