Merge pull request #6382 from adobe/jasonsanjose/file-watchers

maintain selection in refreshFileTree
adobe · Jan 6, 2014 · 8de072b · 8de072b
2 parents e1a3614 + 1d608b2
commit 8de072b
Showing 1 changed file with 21 additions and 9 deletions.
diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js
@@ -1149,26 +1149,38 @@ define(function (require, exports, module) {
     }
 
     /**
-     * Reloads the project's file tree
+     * Reloads the project's file tree, maintaining the current selection.
      * @return {$.Promise} A promise object that will be resolved when the
      *  project tree is reloaded, or rejected if the project path
-     *  fails to reload.
+     *  fails to reload. If the previous selected entry is not found, 
+     *  the promise is still resolved.
      */
     function refreshFileTree() {
-        var selectedEntry;
+        var selectedEntry,
+            deferred = new $.Deferred();
+
         if (_lastSelected) {
             selectedEntry = _lastSelected.data("entry");
+        } else {
+            selectedEntry = getSelectedItem();
         }
         _lastSelected = null;
 
-        return _loadProject(getProjectRoot().fullPath, true)
-            .done(function () {
+        _loadProject(getProjectRoot().fullPath, true)
+            .then(function () {
                 if (selectedEntry) {
-                    _findTreeNode(selectedEntry).done(function ($node) {
-                        _forceSelection(null, $node);
-                    });
+                    // restore selection, always resolve
+                    _findTreeNode(selectedEntry)
+                        .done(function ($node) {
+                            _forceSelection(null, $node);
+                        })
+                        .always(deferred.resolve);
+                } else {
+                    deferred.resolve();
                 }
-            });
+            }, deferred.reject);
+
+        return deferred.promise();
     }
 
     /**