Bug 514934 - CodeEdit: Support special characters in editor's regex s…

…earch.
eclipse · Apr 24, 2017 · 3d1a7d9 · 3d1a7d9
1 parent 7a3f43d
commit 3d1a7d9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/bundles/org.eclipse.orion.client.core/web/orion/regex.js b/bundles/org.eclipse.orion.client.core/web/orion/regex.js
@@ -26,6 +26,7 @@ define("orion/regex", [], function() { //$NON-NLS-0$
 	 */
 	function escape(str) {
 		return str.replace(/([\\$\^*\/+?\.\(\)|{}\[\]])/g, "\\$&"); //$NON-NLS-0$
+		//return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
 	}
 
 	/**

diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/find.js b/bundles/org.eclipse.orion.client.editor/web/orion/editor/find.js
@@ -492,6 +492,12 @@ define("orion/editor/find", [ //$NON-NLS-0$
 				}	
 				this._savedOptions.push(this.getOptions());
 				this.setOptions(tempOptions);
+				if(tempOptions.findString && this._regex) {
+					tempOptions.findString = mRegex.escape(tempOptions.findString);
+					tempOptions.findString = tempOptions.findString.split("\n").join("\\n");
+					tempOptions.findString = tempOptions.findString.split("\r").join("\\r");
+					tempOptions.findString = tempOptions.findString.split("\t").join("\\t");
+				}
 			}
 			this._startOffset = this._editor.getSelection().start;
 			this._editor.getTextView().addEventListener("Focus", this._listeners.onEditorFocus); //$NON-NLS-0$