Merge pull request #12027 from ficristo/parseQuery-cleanup

Reuse parseQueryInfo defined in FindUtils for the FindReplace feature.
adobe · Aug 18, 2016 · b1a24ba · b1a24ba
2 parents d68a4a5 + 24d4564
commit b1a24ba
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/src/search/FindReplace.js b/src/search/FindReplace.js
@@ -91,24 +91,19 @@ define(function (require, exports, module) {
             findBar.showError(null);
         }
 
-        if (!queryInfo || !queryInfo.query) {
+        var parsed = FindUtils.parseQueryInfo(queryInfo);
+        if (parsed.empty === true) {
             return "";
         }
 
-        // Is it a (non-blank) regex?
-        if (queryInfo.isRegexp) {
-            try {
-                return new RegExp(queryInfo.query, queryInfo.isCaseSensitive ? "" : "i");
-            } catch (e) {
-                if (findBar) {
-                    findBar.showError(e.message);
-                }
-                return "";
+        if (!parsed.valid) {
+            if (findBar) {
+                findBar.showError(parsed.error);
             }
-
-        } else {
-            return queryInfo.query;
+            return "";
         }
+
+        return parsed.queryExpr;
     }
 
     /**

diff --git a/src/search/FindUtils.js b/src/search/FindUtils.js
@@ -308,8 +308,6 @@ define(function (require, exports, module) {
     function parseQueryInfo(queryInfo) {
         var queryExpr;
 
-        // TODO: only major difference between this one and the one in FindReplace is that
-        // this always returns a regexp even for simple strings. Reconcile.
         if (!queryInfo || !queryInfo.query) {
             return {empty: true};
         }