Made replace behaviour more standard: when pressing replace (next or previous) button:

-) if a selection exists, and it matches, then it is replaced;
-) next match is searched for and, if found, it is selected.
After a replace, next match is searched for only beyond the replaced text
(and not inside the replaced text).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33267 a592a061-630c-0410-9148-cb99ea01b6c8

src/lyxfind.cpp

@@ -1139,62 +1139,45 @@ static void changeFirstCase(Buffer & buffer, TextCase first_case, TextCase other
 }
 
 
-/// Perform a FindAdv operation.
+///
-bool findAdv(BufferView * bv, FindAndReplaceOptions const & opt)
+static void findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, MatchStringAdv & matchAdv)
 {
-	DocIterator cur = bv->cursor();
+	Cursor & cur = bv->cursor();
-	int match_len = 0;
+	if (opt.replace == docstring(from_utf8(LYX_FR_NULL_STRING)))
+		return;
+	DocIterator sel_beg = cur.selectionBegin();
+	DocIterator sel_end = cur.selectionEnd();
+	LASSERT(&sel_beg.inset() == &sel_end.inset(), /**/);
+	int sel_len = sel_end.pos() - sel_beg.pos();
+	LYXERR(Debug::FIND, "sel_beg: " << sel_beg << ", sel_end: " << sel_end << ", sel_len: " << sel_len << endl);
+	if (sel_len == 0)
+		return;
+	LASSERT(sel_len > 0, /**/);
 
-	if (opt.search.empty()) {
+	if (!matchAdv(sel_beg, sel_len))
-			bv->message(_("Search text is empty!"));
+		return;
-			return false;
-	}
 
-	MatchStringAdv matchAdv(bv->buffer(), opt);
-	try {
-		if (opt.forward)
-				match_len = findForwardAdv(cur, matchAdv);
-		else
-				match_len = findBackwardsAdv(cur, matchAdv);
-	} catch (...) {
-		// This may only be raised by boost::regex()
-		bv->message(_("Invalid regular expression!"));
-		return false;
-	}
-
-	if (match_len == 0) {
-		bv->message(_("Match not found!"));
-		return false;
-	}
-
-	LYXERR(Debug::FIND, "Putting selection at buf=" << matchAdv.p_buf
-		<< "cur=" << cur << " with len: " << match_len);
-
-	bv->putSelectionAt(cur, match_len, ! opt.forward);
-	if (opt.replace == docstring(from_utf8(LYX_FR_NULL_STRING))) {
-		bv->message(_("Match found!"));
-	} else {
 	string lyx = to_utf8(opt.replace);
 	// FIXME: Seems so stupid to me to rebuild a buffer here,
 	// when we already have one (replace_work_area_.buffer())
 	Buffer repl_buffer("", false);
 	repl_buffer.setUnnamed(true);
-		if (repl_buffer.readString(lyx)) {
+	LASSERT(repl_buffer.readString(lyx), /**/);
 	repl_buffer.changeLanguage(
 		repl_buffer.language(),
-				bv->cursor().getFont().language());
+		cur.getFont().language());
-			if (opt.keep_case && match_len >= 2) {
+	if (opt.keep_case && sel_len >= 2) {
 		if (cur.inTexted()) {
 			if (firstUppercase(cur))
 				changeFirstCase(repl_buffer, text_uppercase, text_lowercase);
-					else if (allNonLowercase(cur, match_len))
+			else if (allNonLowercase(cur, sel_len))
 				changeFirstCase(repl_buffer, text_uppercase, text_uppercase);
 		}
 	}
-			cap::cutSelection(bv->cursor(), false, false);
+	cap::cutSelection(cur, false, false);
-			if (! cur.inMathed()) {
+	if (!cur.inMathed()) {
 		LYXERR(Debug::FIND, "Replacing by pasteParagraphList()ing repl_buffer");
-				cap::pasteParagraphList(bv->cursor(), repl_buffer.paragraphs(),
+		cap::pasteParagraphList(cur, repl_buffer.paragraphs(),
 					repl_buffer.params().documentClassPtr(),
 					bv->buffer().errorList("Paste"));
 	} else {
@@ -1215,14 +1198,49 @@ bool findAdv(BufferView * bv, FindAndReplaceOptions const & opt)
 		regex_replace(s, s, "\\\\\\[(.*)\\\\\\]", "$1");
 		repl_latex = from_utf8(s);
 		LYXERR(Debug::FIND, "Replacing by niceInsert()ing latex: '" << repl_latex << "'");
-				bv->cursor().niceInsert(repl_latex);
+		cur.niceInsert(repl_latex);
 	}
-			bv->putSelectionAt(cur, repl_buffer.paragraphs().begin()->size(), ! opt.forward);
+	bv->buffer().markDirty();
-			bv->message(_("Match found and replaced !"));
+	cur.pos() -= repl_buffer.paragraphs().begin()->size();
-		} else
+	bv->putSelectionAt(DocIterator(cur), repl_buffer.paragraphs().begin()->size(), !opt.forward);
-			LASSERT(false, /**/);
+}
+
+
+/// Perform a FindAdv operation.
+bool findAdv(BufferView * bv, FindAndReplaceOptions const & opt)
+{
+	DocIterator cur;
+	int match_len;
+
+	if (opt.search.empty()) {
+		bv->message(_("Search text is empty!"));
+		return false;
 	}
 
+	try {
+		MatchStringAdv matchAdv(bv->buffer(), opt);
+		findAdvReplace(bv, opt, matchAdv);
+		cur = bv->cursor();
+		if (opt.forward)
+				match_len = findForwardAdv(cur, matchAdv);
+		else
+				match_len = findBackwardsAdv(cur, matchAdv);
+	} catch (...) {
+		// This may only be raised by boost::regex()
+		bv->message(_("Invalid regular expression!"));
+		return false;
+	}
+
+	if (match_len == 0) {
+		bv->message(_("Match not found!"));
+		return false;
+	}
+
+	bv->message(_("Match found!"));
+
+	LYXERR(Debug::FIND, "Putting selection at cur=" << cur << " with len: " << match_len);
+	bv->putSelectionAt(cur, match_len, !opt.forward);
+
 	return true;
 }