Merge pull request #9791 from MarcelGerber/max-code-hints

redmunds · redmunds · commit b2596ab491ca · 2014-11-21T13:55:46.000-08:00
Add new pref maxCodeHints
diff --git a/src/editor/CodeHintList.js b/src/editor/CodeHintList.js
@@ -28,12 +28,13 @@ define(function (require, exports, module) {
     "use strict";
     
     // Load dependent modules
-    var Menus             = require("command/Menus"),
+    var KeyBindingManager = require("command/KeyBindingManager"),
+        Menus             = require("command/Menus"),
+        KeyEvent          = require("utils/KeyEvent"),
         StringUtils       = require("utils/StringUtils"),
-        PopUpManager      = require("widgets/PopUpManager"),
+        ValidationUtils   = require("utils/ValidationUtils"),
         ViewUtils         = require("utils/ViewUtils"),
-        KeyBindingManager = require("command/KeyBindingManager"),
-        KeyEvent          = require("utils/KeyEvent");
+        PopUpManager      = require("widgets/PopUpManager");
     
     var CodeHintListHTML  = require("text!htmlContent/code-hint-list.html");
 
@@ -42,8 +43,10 @@ define(function (require, exports, module) {
      *
      * @constructor
      * @param {Editor} editor
+     * @param {boolean} insertHintOnTab Whether pressing tab inserts the selected hint
+     * @param {number} maxResults Maximum hints displayed at once. Defaults to 1000
      */
-    function CodeHintList(editor, insertHintOnTab) {
+    function CodeHintList(editor, insertHintOnTab, maxResults) {
 
         /**
          * The list of hints to display
@@ -60,11 +63,14 @@ define(function (require, exports, module) {
         this.selectedIndex = -1;
 
         /**
-         * The maximum number of hints to display
+         * The maximum number of hints to display. Can be overriden via maxCodeHints pref
          *
          * @type {number}
          */
-        this.maxResults = 999;
+        this.maxResults = Math.min(
+            (maxResults > 0 && ValidationUtils.isInteger(maxResults) && maxResults) || 1000,
+            1000
+        );
 
         /**
          * Is the list currently open?
@@ -215,7 +221,7 @@ define(function (require, exports, module) {
             }
         } else {
             this.hints.some(function (item, index) {
-                if (index > self.maxResults) {
+                if (index >= self.maxResults) {
                     return true;
                 }
                 
diff --git a/src/editor/CodeHintManager.js b/src/editor/CodeHintManager.js
@@ -254,6 +254,7 @@ define(function (require, exports, module) {
 
     PreferencesManager.definePreference("showCodeHints", "boolean", true);
     PreferencesManager.definePreference("insertHintOnTab", "boolean", false);
+    PreferencesManager.definePreference("maxCodeHints", "integer", 50);
 
     PreferencesManager.on("change", "showCodeHints", function () {
         codeHintsEnabled = PreferencesManager.get("showCodeHints");
@@ -484,7 +485,8 @@ define(function (require, exports, module) {
 
         // If a provider is found, initialize the hint list and update it
         if (sessionProvider) {
-            var insertHintOnTab;
+            var insertHintOnTab,
+                maxCodeHints = PreferencesManager.get("maxCodeHints");
             if (sessionProvider.insertHintOnTab !== undefined) {
                 insertHintOnTab = sessionProvider.insertHintOnTab;
             } else {
@@ -493,7 +495,7 @@ define(function (require, exports, module) {
 
             sessionEditor = editor;
 
-            hintList = new CodeHintList(sessionEditor, insertHintOnTab);
+            hintList = new CodeHintList(sessionEditor, insertHintOnTab, maxCodeHints);
             hintList.onSelect(function (hint) {
                 var restart = sessionProvider.insertHint(hint),
                     previousEditor = sessionEditor;
diff --git a/src/utils/ValidationUtils.js b/src/utils/ValidationUtils.js
@@ -33,7 +33,7 @@ define(function (require, exports, module) {
      * Used to validate whether type of unknown value is an integer.
      * 
      * @param {*} value Value for which to validate its type
-     * @return {boolean} true if value is an integer
+     * @return {boolean} true if value is a finite integer
      */
     function isInteger(value) {
         // Validate value is a number
@@ -42,9 +42,12 @@ define(function (require, exports, module) {
         }
 
         // Validate number is an integer
-        if (value > 0 && Math.floor(value) !== value) {
+        if (Math.floor(value) !== value) {
             return false;
-        } else if (value < 0 && Math.ceil(value) !== value) {
+        }
+
+        // Validate number is finite
+        if (!isFinite(value)) {
             return false;
         }
 
