Merge pull request #2869 from WebsiteDeveloper/Issue-2761

Fixed: Issue: #2761 Project tree selection is incorrect after opening a file by means other than sidebar

Author: redmunds

src/project/ProjectManager.js

@@ -915,8 +915,11 @@ define(function (require, exports, module) {
     function showInTree(entry) {
         return _findTreeNode(entry)
             .done(function ($node) {
-                // jsTree will automatically expand parent nodes to ensure visible
-                _projectTree.jstree("select_node", $node, false);
+                _projectTree.jstree("deselect_node", _lastSelected);
+                _lastSelected = null;
+                _projectTree.jstree("select_node", $node);
+                _lastSelected = $node;
+                _redraw(true, true);
             });
     }
 

src/search/FindInFiles.js

@@ -306,6 +306,7 @@ define(function (require, exports, module) {
                                     .done(function (doc) {
                                         // Opened document is now the current main editor
                                         EditorManager.getCurrentFullEditor().setSelection(match.start, match.end, true);
+                                        ProjectManager.showInTree(doc.file);
                                     });
                             });
                             resultsDisplayed++;