Merge pull request #6984 from adobe/tom/codehints-on-tab

RaymondLim · RaymondLim · commit 93f22d8cb5b5 · 2014-03-03T23:15:25.000-08:00
New Insert Code Hints with Tab Preference
diff --git a/src/editor/CodeHintManager.js b/src/editor/CodeHintManager.js
@@ -225,7 +225,7 @@
  * or if instead a tab character should be inserted into the editor. If omitted,
  * the fallback behavior is determined by the CodeHintManager. The default
  * behavior is to insert a tab character, but this can be changed with the
- * CodeHintManager.setInsertHintOnTab() method.
+ * insertHintOnTab Preference.
  */
 
 
@@ -236,12 +236,13 @@ define(function (require, exports, module) {
     "use strict";
     
     // Load dependent modules
-    var Commands        = require("command/Commands"),
-        CommandManager  = require("command/CommandManager"),
-        EditorManager   = require("editor/EditorManager"),
-        Strings         = require("strings"),
-        KeyEvent        = require("utils/KeyEvent"),
-        CodeHintList    = require("editor/CodeHintList").CodeHintList;
+    var Commands            = require("command/Commands"),
+        CommandManager      = require("command/CommandManager"),
+        EditorManager       = require("editor/EditorManager"),
+        Strings             = require("strings"),
+        KeyEvent            = require("utils/KeyEvent"),
+        CodeHintList        = require("editor/CodeHintList").CodeHintList,
+        PreferencesManager  = require("preferences/PreferencesManager");
 
     var hintProviders   = { "all" : [] },
         lastChar        = null,
@@ -250,24 +251,11 @@ define(function (require, exports, module) {
         hintList        = null,
         deferredHints   = null,
         keyDownEditor   = null;
-
     
-    var _insertHintOnTabDefault = false;
-
-    /**
-     * Determines the default behavior of the CodeHintManager on tab key events.
-     * setInsertHintOnTab(true) indicates that the currently selected code hint
-     * should be inserted on tab key events. setInsertHintOnTab(false) indicates
-     * that a tab character should be inserted into the editor on tab key events.
-     * The default behavior can be overridden by individual providers.
-     *
-     * @param {boolean} Indicates whether providers should insert the currently
-     *      selected hint on tab key events.
-     */
-    function setInsertHintOnTab(insertHintOnTab) {
-        _insertHintOnTabDefault = insertHintOnTab;
-    }
     
+    PreferencesManager.definePreference("insertHintOnTab", "boolean", false);
+    
+
     /**
      * Comparator to sort providers from high to low priority
      */
@@ -474,7 +462,7 @@ define(function (require, exports, module) {
             if (sessionProvider.insertHintOnTab !== undefined) {
                 insertHintOnTab = sessionProvider.insertHintOnTab;
             } else {
-                insertHintOnTab = _insertHintOnTabDefault;
+                insertHintOnTab = PreferencesManager.get("insertHintOnTab");
             }
             
             sessionEditor = editor;
@@ -665,5 +653,4 @@ define(function (require, exports, module) {
     exports.isOpen                  = isOpen;
     exports.registerHintProvider    = registerHintProvider;
     exports.hasValidExclusion       = hasValidExclusion;
-    exports.setInsertHintOnTab      = setInsertHintOnTab;
 });
diff --git a/src/language/CodeInspection.js b/src/language/CodeInspection.js
@@ -446,7 +446,6 @@ define(function (require, exports, module) {
         updateListeners();
         if (!doNotSave) {
             prefs.set(PREF_ENABLED, _enabled);
-            prefs.save();
         }
     
         // run immediately

Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,6 @@ define(function (require, exports, module) {`
`446`	`446`	`updateListeners();`
`447`	`447`	`if (!doNotSave) {`
`448`	`448`	`prefs.set(PREF_ENABLED, _enabled);`
`449`		`- prefs.save();`
`450`	`449`	`}`
`451`	`450`
`452`	`451`	`// run immediately`