Allow conditional replacements in rereplace

Search: (hello)|(world)
Replace: (?1hi)(?2steve)

Replaces hello world with hi steve, and world hello with steve hi.
Test added to UTF8 Test case

Author: bruderstein

PythonScript/python_tests/tests/ReplaceUTF8TestCase.py

@@ -3,24 +3,27 @@
 from Npp import *
 
 class ReplaceUTF8TestCase(unittest.TestCase):
-	def setUp(self):
-		notepad.new()
-		notepad.runMenuCommand("Encoding", "Encode in UTF-8")
-		editor.write('Here is some text\r\nWith some umlauts XäXüXö\r\n');
-		
-	def tearDown(self):
-		editor.setSavePoint()
-		notepad.close()
-		
-	def test_simple_replace(self):
-		editor.rereplace(r'some\s([a-z]+)', 'TEST');
-		text = editor.getText()
-		self.assertEqual(text, 'Here is TEST\r\nWith TEST XäXüXö\r\n');
-		
-	def test_utf8_replace(self):
-		editor.rereplace(r'X[äö]', 'YY');
-		text = editor.getText()
-		self.assertEqual(text, 'Here is some text\r\nWith some umlauts YYXüYY\r\n');
-		
-
+    def setUp(self):
+        notepad.new()
+        notepad.runMenuCommand("Encoding", "Encode in UTF-8")
+        editor.write('Here is some text\r\nWith some umlauts XäXüXö\r\n');
+        
+    def tearDown(self):
+        editor.setSavePoint()
+        notepad.close()
+        
+    def test_simple_replace(self):
+        editor.rereplace(r'some\s([a-z]+)', 'TEST');
+        text = editor.getText()
+        self.assertEqual(text, 'Here is TEST\r\nWith TEST XäXüXö\r\n');
+        
+    def test_utf8_replace(self):
+        editor.rereplace(r'X[äö]', 'YY');
+        text = editor.getText()
+        self.assertEqual(text, 'Here is some text\r\nWith some umlauts YYXüYY\r\n');
+        
+    def test_replace_condition(self):
+        editor.rereplace('(Here)|(Xä)', '(?1Cheese)(?2Y)')
+        text = editor.getText()
+        self.assertEqual(text, 'Cheese is some text\r\nWith some umlauts YXüXö\r\n')
 suite = unittest.TestLoader().loadTestsFromTestCase(ReplaceUTF8TestCase)

PythonScript/src/Replacer.h

@@ -138,7 +138,7 @@ int BoostRegexMatch<CharTraitsT>::groupIndexFromName(const char *groupName)
 template <class CharTraitsT>
 void BoostRegexMatch<CharTraitsT>::expand(const char *format, char **result, int *resultLength)
 {
-    CharTraitsT::string_type resultString = m_match->format(format);
+    CharTraitsT::string_type resultString = m_match->format(format, boost::regex_constants::format_all);
 
     std::string charResult(CharTraitsT::toCharString(resultString));