Merge pull request #7398 from adobe/dangoor/7374-path-subfolder

Fix for #7374 project prefs path breaking project open.

Author: ingorichter

.brackets.json

@@ -11,6 +11,10 @@
         "src/thirdparty/CodeMirror2/**/*.js": {
             "spaceUnits": 2,
             "linting.enabled": false
+        },
+        "src/thirdparty/globmatch.js": {
+            "spaceUnits": 2,
+            "linting.enabled": false
         }
     },
     "spaceUnits": 4,

src/project/ProjectManager.js

@@ -1075,6 +1075,20 @@ define(function (require, exports, module) {
         return result.promise();
     }
 
+    /**
+     * @private
+     * Reloads the project preferences.
+     */
+    function _reloadProjectPreferencesScope() {
+        var root = getProjectRoot();
+        if (root) {
+            // Alias the "project" Scope to the path Scope for the project-level settings file
+            PreferencesManager._setProjectSettingsFile(root.fullPath + SETTINGS_FILENAME);
+        } else {
+            PreferencesManager._setProjectSettingsFile();
+        }
+    }
+    
     /**
      * Loads the given folder as a project. Normally, you would call openProject() instead to let the
      * user choose a folder.
@@ -1154,15 +1168,16 @@ define(function (require, exports, module) {
                             _projectRoot.fullPath !== rootEntry.fullPath;
                         var i;
 
-                        if (projectRootChanged) {
-                            PreferencesManager._setCurrentEditingFile(rootPath);
-                        }
-
-
                         // Success!
                         var perfTimerName = PerfUtils.markStart("Load Project: " + rootPath);
 
                         _projectRoot = rootEntry;
+                        
+                        if (projectRootChanged) {
+                            _reloadProjectPreferencesScope();
+                            PreferencesManager._setCurrentEditingFile(rootPath);
+                        }
+
                         _projectBaseUrl = PreferencesManager.getViewState("project.baseUrl", context) || "";
                         _allFilesCachePromise = null;  // invalidate getAllFiles() cache as soon as _projectRoot changes
 
@@ -2267,18 +2282,6 @@ define(function (require, exports, module) {
         "projectBaseUrl_": "user"
     }, true, _checkPreferencePrefix);
 
-    function _reloadProjectPreferencesScope() {
-        var root = getProjectRoot();
-        if (root) {
-            // Alias the "project" Scope to the path Scope for the project-level settings file
-            PreferencesManager._setProjectSettingsFile(root.fullPath + SETTINGS_FILENAME);
-        } else {
-            PreferencesManager._setProjectSettingsFile();
-        }
-    }
-    
-    $(exports).on("projectOpen", _reloadProjectPreferencesScope);
-    
     // Initialize the sort prefixes and make sure to change them when the sort pref changes
     _generateSortPrefixes();
     PreferencesManager.on("change", "sortDirectoriesFirst", function () {

src/thirdparty/globmatch.js

@@ -14,7 +14,13 @@ module.exports = fnmatch;
 minimatch.Minimatch = Minimatch;
 
 function fnmatch(filepath, glob) {
-  var matchOptions = {matchBase: true, dot: true, noext: true};
+  var matchOptions = {dot: true, noext: true};
+  
+  // brackets #7374: don't try to match base if a directory name is passed in
+  if (filepath[filepath.length - 1] !== "/") {
+    matchOptions.matchBase = true;
+  }
+  
   glob = glob.replace(/\*\*/g, '{*,**/**/**}');
   return minimatch(filepath, glob, matchOptions);
 };