Merge pull request #11869 from adobe/abose/instantAfterPaste

Remember last searched phrase & instant search paste fix.

Author: rroshan1

src/search/FindBar.js

@@ -53,7 +53,9 @@ define(function (require, exports, module) {
     var lastTypedTime = 0,
         currentTime = 0,
         intervalId = 0,
-        lastQueriedText = "";
+        lastQueriedText = "",
+        lastTypedText = "",
+        lastKeyCode;
 
     /**
      * @constructor
@@ -92,6 +94,7 @@ define(function (require, exports, module) {
         this._closed = false;
         this._enabled = true;
         this.lastQueriedText = "";
+        this.lastTypedText = "";
     }
     EventDispatcher.makeEventDispatcher(FindBar.prototype);
 
@@ -267,6 +270,7 @@ define(function (require, exports, module) {
         $root
             .on("input", "#find-what", function () {
                 self.trigger("queryChange");
+                lastTypedText = self.getQueryInfo().query;
             })
             .on("click", "#find-case-sensitive, #find-regexp", function (e) {
                 $(e.currentTarget).toggleClass("active");
@@ -278,6 +282,7 @@ define(function (require, exports, module) {
             })
             .on("keydown", "#find-what, #replace-with", function (e) {
                 lastTypedTime = new Date().getTime();
+                lastKeyCode = e.keyCode;
                 var executeSearchIfNeeded = function () {
                     // We only do instant search via node.
                     if (FindUtils.isNodeSearchDisabled() || FindUtils.isInstantSearchDisabled()) {
@@ -289,7 +294,7 @@ define(function (require, exports, module) {
                     }
                     currentTime = new Date().getTime();
                     if (lastTypedTime && (currentTime - lastTypedTime >= 100) && self.getQueryInfo().query !==  lastQueriedText &&
-                            !FindUtils.isNodeSearchInProgress() && e.keyCode !== KeyEvent.DOM_VK_CONTROL) {
+                            !FindUtils.isNodeSearchInProgress()) {
                         // init Search
                         if (self._options.multifile) {
                             if ($(e.target).is("#find-what")) {
@@ -308,6 +313,7 @@ define(function (require, exports, module) {
                 if (e.keyCode === KeyEvent.DOM_VK_RETURN) {
                     e.preventDefault();
                     e.stopPropagation();
+                    lastQueriedText = self.getQueryInfo().query;
                     if (self._options.multifile) {
                         if ($(e.target).is("#find-what")) {
                             if (self._options.replace) {
@@ -566,7 +572,7 @@ define(function (require, exports, module) {
      * @return {query: string, replaceText: string} Query and Replace text to prepopulate the Find Bar with
      */
     FindBar.getInitialQuery = function (currentFindBar, editor) {
-        var query = "",
+        var query = lastTypedText,
             replaceText = "";
 
         /*
@@ -598,7 +604,7 @@ define(function (require, exports, module) {
                 query = openedFindBar.getQueryInfo().query;
                 replaceText = openedFindBar.getReplaceText();
             } else if (editor) {
-                query = getInitialQueryFromSelection(editor);
+                query = getInitialQueryFromSelection(editor) || lastTypedText;
             }
         }
 

src/search/SearchResultsView.js

@@ -361,7 +361,7 @@ define(function (require, exports, module) {
         );
 
         this._$summary.html(Mustache.render(searchSummaryTemplate, {
-            query:       (this._model.queryInfo.query && this._model.queryInfo.query.toString()) || "",
+            query:       (this._model.queryInfo && this._model.queryInfo.query && this._model.queryInfo.query.toString()) || "",
             replaceWith: this._model.replaceText,
             titleLabel:  this._model.isReplace ? Strings.FIND_REPLACE_TITLE_LABEL : Strings.FIND_TITLE_LABEL,
             scope:       this._model.scope ? " " + FindUtils.labelForScope(this._model.scope) + " " : "",