Merge pull request #9385 from jacksonweekes/iss8557

RaymondLim · RaymondLim · commit 6ad683495baf · 2014-10-08T09:29:04.000-07:00
Issue #8557 ("Over 100000 matches" when there are exactly 100000 matches)
diff --git a/src/search/FindInFiles.js b/src/search/FindInFiles.js
@@ -127,7 +127,9 @@ define(function (require, exports, module) {
 
             // We have the max hits in just this 1 file. Stop searching this file.
             // This fixed issue #1829 where code hangs on too many hits.
-            if (matches.length >= SearchModel.MAX_TOTAL_RESULTS) {
+            // Adds one over MAX_TOTAL_RESULTS in order to know if the search has exceeded
+            // or is equal to MAX_TOTAL_RESULTS. Additional result removed in SearchModel
+            if (matches.length > SearchModel.MAX_TOTAL_RESULTS) {
                 queryExpr.lastIndex = 0;
                 break;
             }
diff --git a/src/search/SearchModel.js b/src/search/SearchModel.js
@@ -99,7 +99,13 @@ define(function (require, exports, module) {
      * @type {boolean}
      */
     SearchModel.prototype.foundMaximum = false;
-
+    
+    /**
+     * Whether or not we exceeded the maximum number of results in the search we did.
+     * @type {boolean}
+     */
+    SearchModel.prototype.exceedsMaximum = false;
+    
     /**
      * Clears out the model to an empty state.
      */
@@ -112,6 +118,7 @@ define(function (require, exports, module) {
         this.scope = null;
         this.numMatches = 0;
         this.foundMaximum = false;
+        this.exceedsMaximum = false;
         this.fireChanged();
     };
     
@@ -157,6 +164,13 @@ define(function (require, exports, module) {
         this.numMatches += resultInfo.matches.length;
         if (this.numMatches >= SearchModel.MAX_TOTAL_RESULTS) {
             this.foundMaximum = true;
+            
+            // Remove final result if there have been over MAX_TOTAL_RESULTS found
+            if (this.numMatches > SearchModel.MAX_TOTAL_RESULTS) {
+                this.results[fullpath].matches.pop();
+                this.numMatches--;
+                this.exceedsMaximum = true;
+            }
         }
     };
     
diff --git a/src/search/SearchResultsView.js b/src/search/SearchResultsView.js
@@ -28,7 +28,7 @@
  */
 define(function (require, exports, module) {
     "use strict";
-    
+
     var CommandManager        = require("command/CommandManager"),
         Commands              = require("command/Commands"),
         DocumentManager       = require("document/DocumentManager"),
@@ -41,12 +41,12 @@ define(function (require, exports, module) {
         StringUtils           = require("utils/StringUtils"),
         Strings               = require("strings"),
         _                     = require("thirdparty/lodash"),
-        
+
         searchPanelTemplate   = require("text!htmlContent/search-panel.html"),
         searchResultsTemplate = require("text!htmlContent/search-results.html"),
         searchSummaryTemplate = require("text!htmlContent/search-summary.html");
-    
-    
+
+
     /** 
      * @const 
      * The maximum results to show per page.
@@ -348,7 +348,7 @@ define(function (require, exports, module) {
         // This text contains some formatting, so all the strings are assumed to be already escaped
         summary = StringUtils.format(
             Strings.FIND_TITLE_SUMMARY,
-            this._model.foundMaximum ? Strings.FIND_IN_FILES_MORE_THAN : "",
+            this._model.exceedsMaximum ? Strings.FIND_IN_FILES_MORE_THAN : "",
             String(count.matches),
             (count.matches > 1) ? Strings.FIND_IN_FILES_MATCHES : Strings.FIND_IN_FILES_MATCH,
             filesStr
