Update bundles/org.eclipse.orion.client.core/web/orion/searchAndReplace/textSearcher.js

Perform replacement text symbol substitutions when regular expression option is enabled.

Tested with
Find:
localStorage\["(\w+)"\]
Replace:
localStorage.$1

1 files changed, 10 insertions, 2 deletions

diff --git a/bundles/org.eclipse.orion.client.core/web/orion/searchAndReplace/textSearcher.js b/bundles/org.eclipse.orion.client.core/web/orion/searchAndReplace/textSearcher.js
index c0c62d3..1d37424 100644
--- a/bundles/org.eclipse.orion.client.core/web/orion/searchAndReplace/textSearcher.js
+++ b/bundles/org.eclipse.orion.client.core/web/orion/searchAndReplace/textSearcher.js
@@ -371,8 +371,16 @@ orion.TextSearcher = (function() {
 					end = result.end;
 				}
 			}
-			editor.setText(newStr, start, end);
-			editor.setSelection(start , start + newStr.length, true);
+			if (this._useRegExp) {
+				var newStrWithSubstitutions = editor.getText().substring(start, end).replace(new RegExp(searchStr), newStr);
+				if (newStrWithSubstitutions) {
+					editor.setText(newStrWithSubstitutions, start, end)
+					editor.setSelection(start, start + newStrWithSubstitutions.length, true);
+				}
+			} else {
+				editor.setText(newStr, start, end);
+				editor.setSelection(start, start + newStr.length, true);
+			}
 			this.endUndo();
 			if (this._findAfterReplace && searchStr){
 				this._doFind(searchStr, this.getSearchStartIndex(false), false, this._wrapSearch);