Change preferences filename to brackets.prefs (.brackets.prefs in projects).

Also preferencifies linting enabled and collapsed.

.brackets.prefs

@@ -10,7 +10,8 @@
     "defaultExtension": "js",
     "path": {
         "src/thirdparty/CodeMirror2/**/*.js": {
-            "spaceUnits": 2
+            "spaceUnits": 2,
+            "linting.enabled": false
         }
     },
     "spaceUnits": 4

src/extensions/default/JSLint/main.js

@@ -39,7 +39,7 @@ define(function (require, exports, module) {
         Strings            = brackets.getModule("strings");
     
     
-    PreferencesManager.definePreference("jslintOptions", "object");
+    PreferencesManager.definePreference("jslint.options", "object");
     
     /**
      * Run JSLint on the current document. Reports results to the main UI. Displays
@@ -58,7 +58,7 @@ define(function (require, exports, module) {
         }
         text = arr.join("\n");
         
-        var options = PreferencesManager.get("jslintOptions");
+        var options = PreferencesManager.get("jslint.options");
         var jslintResult = JSLINT(text, options);
         
         if (!jslintResult) {

src/language/CodeInspection.js

@@ -57,12 +57,7 @@ define(function (require, exports, module) {
         PanelTemplate           = require("text!htmlContent/problems-panel.html"),
         ResultsTemplate         = require("text!htmlContent/problems-panel-table.html");
     
-    var INDICATOR_ID = "status-inspection",
-        defaultPrefs = {
-            enabled: brackets.config["linting.enabled_by_default"],
-            collapsed: false
-        };
-    
+    var INDICATOR_ID = "status-inspection";
     /** Values for problem's 'type' property */
     var Type = {
         /** Unambiguous error, such as a syntax error */
@@ -74,10 +69,13 @@ define(function (require, exports, module) {
     };
     
     /**
-     * @private
-     * @type {PreferenceStorage}
+     * Constants for the preferences defined in this file.
      */
-    var _prefs = null;
+    var PREF_ENABLED = "linting.enabled",
+        PREF_COLLAPSED = "linting.collapsed";
+    
+    PreferencesManager.definePreference(PREF_ENABLED, "boolean", brackets.config["linting.enabled_by_default"]);
+    PreferencesManager.definePreference(PREF_COLLAPSED, "boolean", false);
     
     /**
      * When disabled, the errors panel is closed and the status bar icon is grayed out.
@@ -317,8 +315,9 @@ define(function (require, exports, module) {
     /**
      * Enable or disable all inspection.
      * @param {?boolean} enabled Enabled state. If omitted, the state is toggled.
+     * @param {?boolean} doNotSave true if the preference should not be saved to user settings. This is generally for events triggered by project-level settings.
      */
-    function toggleEnabled(enabled) {
+    function toggleEnabled(enabled, doNotSave) {
         if (enabled === undefined) {
             enabled = !_enabled;
         }
@@ -326,7 +325,9 @@ define(function (require, exports, module) {
         
         CommandManager.get(Commands.VIEW_TOGGLE_INSPECTION).setChecked(_enabled);
         updateListeners();
-        _prefs.setValue("enabled", _enabled);
+        if (!doNotSave) {
+            PreferencesManager.set("user", PREF_ENABLED, _enabled);
+        }
     
         // run immediately
         run();
@@ -339,14 +340,17 @@ define(function (require, exports, module) {
      * collapsed, the panel will not reopen automatically on switch files or save.
      * 
      * @param {?boolean} collapsed Collapsed state. If omitted, the state is toggled.
+     * @param {?boolean} doNotSave true if the preference should not be saved to user settings. This is generally for events triggered by project-level settings.
      */
-    function toggleCollapsed(collapsed) {
+    function toggleCollapsed(collapsed, doNotSave) {
         if (collapsed === undefined) {
             collapsed = !_collapsed;
         }
         
         _collapsed = collapsed;
-        _prefs.setValue("collapsed", _collapsed);
+        if (doNotSave) {
+            PreferencesManager.setValue("user", PREF_COLLAPSED, _collapsed);
+        }
         
         if (_collapsed) {
             Resizer.hide($problemsPanel);
@@ -370,8 +374,13 @@ define(function (require, exports, module) {
     CommandManager.register(Strings.CMD_VIEW_TOGGLE_INSPECTION, Commands.VIEW_TOGGLE_INSPECTION,        toggleEnabled);
     CommandManager.register(Strings.CMD_GOTO_FIRST_PROBLEM,     Commands.NAVIGATE_GOTO_FIRST_PROBLEM,   handleGotoFirstProblem);
     
-    // Init PreferenceStorage
-    _prefs = PreferencesManager.getPreferenceStorage(module, defaultPrefs);
+    $(PreferencesManager.getPreference(PREF_ENABLED)).on("change", function (e, data) {
+        toggleEnabled(data.newValue, true);
+    });
+    
+    $(PreferencesManager.getPreference(PREF_COLLAPSED)).on("change", function (e, data) {
+        toggleCollapsed(data.newValue, true);
+    });
     
     // Initialize items dependent on HTML DOM
     AppInit.htmlReady(function () {
@@ -416,8 +425,8 @@ define(function (require, exports, module) {
         
         
         // Set initial UI state
-        toggleEnabled(_prefs.getValue("enabled"));
-        toggleCollapsed(_prefs.getValue("collapsed"));
+        toggleEnabled(PreferencesManager.get(PREF_ENABLED), true);
+        toggleCollapsed(PreferencesManager.get(PREF_COLLAPSED), true);
     });
     
     

src/preferences/PreferencesManager.js

@@ -203,7 +203,7 @@ define(function (require, exports, module) {
     // New code follows. The code above (with the exception of the imports) is
     // deprecated.
     
-    var SETTINGS_FILENAME = "brackets.settings.json",
+    var SETTINGS_FILENAME = "brackets.prefs",
         STATE_FILENAME    = "state.json";
     
     var preferencesManager = new PreferencesBase.PreferencesManager();
@@ -245,6 +245,7 @@ define(function (require, exports, module) {
     exports.get = preferencesManager.get.bind(preferencesManager);
     exports.set = preferencesManager.set.bind(preferencesManager);
     exports.save = preferencesManager.save.bind(preferencesManager);
+    exports.getPreference = preferencesManager.getPreference.bind(preferencesManager);
     exports.setValueAndSave = setValueAndSave;
     exports.addScope = preferencesManager.addScope.bind(preferencesManager);
     exports.stateManager = stateManager;

src/project/ProjectManager.js

@@ -98,6 +98,13 @@ define(function (require, exports, module) {
      * @type {RegExp}
      */
     var _binaryExclusionListRegEx = /\.svgz$|\.jsz$|\.zip$|\.gz$|\.htmz$|\.htmlz$|\.rar$|\.tar$|\.exe$|\.bin$/;
+    
+    /**
+     * @private
+     * Filename to use for project settings files.
+     * @type {string}
+     */
+    var SETTINGS_FILENAME = "." + PreferencesManager.SETTINGS_FILENAME;
 
     /**
      * @private
@@ -1728,14 +1735,14 @@ define(function (require, exports, module) {
     function _reloadProjectPreferencesScope() {
         var root = getProjectRoot();
         if (root) {
-            PreferencesManager._projectFileStorage.setPath(root.fullPath + PreferencesManager.SETTINGS_FILENAME);
+            PreferencesManager._projectFileStorage.setPath(root.fullPath + SETTINGS_FILENAME);
         }
     }
     
     $(exports).on("projectOpen", _reloadProjectPreferencesScope);
     
     $(DocumentManager).on("documentSaved", function (e, document) {
-        if (document.file && FileUtils.getDirectoryPath(document.file.fullPath) === _projectRoot.fullPath && document.file.name === PreferencesManager.SETTINGS_FILENAME) {
+        if (document.file && FileUtils.getDirectoryPath(document.file.fullPath) === _projectRoot.fullPath && document.file.name === SETTINGS_FILENAME) {
             _reloadProjectPreferencesScope();
         }
     });

test/spec/PreferencesBase-test.js

@@ -769,8 +769,8 @@ define(function (require, exports, module) {
         });
         
         describe("File Storage", function () {
-            var settingsFile = FileSystem.getFileForPath(testPath + "/brackets.settings.json"),
-                newSettingsFile = FileSystem.getFileForPath(testPath + "/new.settings.json"),
+            var settingsFile = FileSystem.getFileForPath(testPath + "/brackets.prefs"),
+                newSettingsFile = FileSystem.getFileForPath(testPath + "/new.prefs"),
                 filestorage,
                 originalText;
             
@@ -814,7 +814,7 @@ define(function (require, exports, module) {
             });
             
             it("can load preferences from disk", function () {
-                var filestorage = new PreferencesBase.FileStorage(testPath + "/brackets.settings.json");
+                var filestorage = new PreferencesBase.FileStorage(settingsFile.fullPath);
                 var pm = new PreferencesBase.PreferencesManager();
                 var projectScope = new PreferencesBase.Scope(filestorage);
                 waitsForDone(pm.addScope("project", projectScope));
@@ -829,7 +829,7 @@ define(function (require, exports, module) {
             });
             
             it("can save preferences", function () {
-                var filestorage = new PreferencesBase.FileStorage(testPath + "/brackets.settings.json");
+                var filestorage = new PreferencesBase.FileStorage(settingsFile.fullPath);
                 var pm = new PreferencesBase.PreferencesManager();
                 var projectScope = new PreferencesBase.Scope(filestorage);
                 waitsForDone(pm.addScope("project", projectScope));