Add "Show in OS" context menu item to open a folder in Finder/Explorer.

src/command/Commands.js

@@ -86,6 +86,7 @@ define(function (require, exports, module) {
     exports.NAVIGATE_NEXT_DOC           = "navigate.nextDoc";
     exports.NAVIGATE_PREV_DOC           = "navigate.prevDoc";
     exports.NAVIGATE_SHOW_IN_FILE_TREE  = "navigate.showInFileTree";
+    exports.NAVIGATE_SHOW_IN_OS         = "navigate.showInOS";
     exports.NAVIGATE_QUICK_OPEN         = "navigate.quickOpen";
     exports.NAVIGATE_GOTO_DEFINITION    = "navigate.gotoDefinition";
     exports.NAVIGATE_GOTO_LINE          = "navigate.gotoLine";

src/command/Menus.js

@@ -994,6 +994,7 @@ define(function (require, exports, module) {
         project_cmenu.addMenuItem(Commands.FILE_NEW);
         project_cmenu.addMenuItem(Commands.FILE_NEW_FOLDER);
         project_cmenu.addMenuItem(Commands.FILE_RENAME, "F2");
+        project_cmenu.addMenuItem(Commands.NAVIGATE_SHOW_IN_OS);
         project_cmenu.addMenuDivider();
         project_cmenu.addMenuItem(Commands.EDIT_FIND_IN_SUBTREE);
 
@@ -1002,6 +1003,7 @@ define(function (require, exports, module) {
         working_set_cmenu.addMenuItem(Commands.FILE_SAVE);
         working_set_cmenu.addMenuItem(Commands.FILE_RENAME);
         working_set_cmenu.addMenuItem(Commands.NAVIGATE_SHOW_IN_FILE_TREE);
+        working_set_cmenu.addMenuItem(Commands.NAVIGATE_SHOW_IN_OS);
         working_set_cmenu.addMenuDivider();
         working_set_cmenu.addMenuItem(Commands.EDIT_FIND_IN_SUBTREE);
         working_set_cmenu.addMenuDivider();

src/document/DocumentCommandHandlers.js

@@ -330,7 +330,7 @@ define(function (require, exports, module) {
         // If a directory is currently selected, put it in it.
         // If nothing is selected, put it at the root of the project
         var baseDir,
-            selected = ProjectManager.getSelectedItem() || ProjectManager.getProjectRoot();
+            selected = ProjectManager.getTreeSelectedItem() || ProjectManager.getProjectRoot();
 
         baseDir = selected.fullPath;
         if (selected.isFile) {
@@ -745,7 +745,7 @@ define(function (require, exports, module) {
     /** Show a textfield to rename whatever is currently selected in the sidebar (working set OR tree) */
     function handleFileRename() {
         // Prefer selected tree item (which could be a folder); else use current file
-        var entry = ProjectManager.getSelectedItem();
+        var entry = ProjectManager.getTreeSelectedItem();
         if (!entry) {
             var doc = DocumentManager.getCurrentDocument();
             entry = doc && doc.file;
@@ -823,7 +823,21 @@ define(function (require, exports, module) {
         ProjectManager.showInTree(DocumentManager.getCurrentDocument().file);
     }
 
-
+    function handleShowInOS() {
+        var entry = ProjectManager.getSidebarSelectedItem();
+        if (entry) {
+            var path = entry.fullPath;
+            if (entry.isFile) {  // if file, we want its containing folder
+                var lastSlash = entry.fullPath.lastIndexOf("/");
+                path = path.substring(0, lastSlash + 1);
+            }
+            brackets.app.showOSFolder(path, function errback(err) {
+                console.error(err);
+            });
+        }
+    }
+
+
     function init($titleContainerToolbar) {
         _$titleContainerToolbar = $titleContainerToolbar;
         _$titleWrapper = $(".title-wrapper", _$titleContainerToolbar);
@@ -852,6 +866,7 @@ define(function (require, exports, module) {
         CommandManager.register(Strings.CMD_NEXT_DOC,           Commands.NAVIGATE_NEXT_DOC, handleGoNextDoc);
         CommandManager.register(Strings.CMD_PREV_DOC,           Commands.NAVIGATE_PREV_DOC, handleGoPrevDoc);
         CommandManager.register(Strings.CMD_SHOW_IN_TREE,       Commands.NAVIGATE_SHOW_IN_FILE_TREE, handleShowInTree);
+        CommandManager.register(Strings.CMD_SHOW_IN_OS,         Commands.NAVIGATE_SHOW_IN_OS, handleShowInOS);
 
         // Listen for changes that require updating the editor titlebar
         $(DocumentManager).on("dirtyFlagChange", handleDirtyChange);

src/nls/root/strings.js

@@ -216,6 +216,7 @@ define({
     "CMD_NEXT_DOC"                        : "Next Document",
     "CMD_PREV_DOC"                        : "Previous Document",
     "CMD_SHOW_IN_TREE"                    : "Show in File Tree",
+    "CMD_SHOW_IN_OS"                      : "Show in OS",
 
     // Debug menu commands
     "DEBUG_MENU"                          : "Debug",

src/project/ProjectManager.js

@@ -178,18 +178,33 @@ define(function (require, exports, module) {
     }
 
     /**
-     * Returns the FileEntry or DirectoryEntry corresponding to the selected item, or null
-     * if no item is selected.
-     *
+     * Returns the FileEntry or DirectoryEntry corresponding to the item selected in the file tree, or null
+     * if no item is selected in the tree (though the working set may still have a selection; use
+     * getSidebarSelectedItem() to get the selection regardless of whether it's in the tree or working set).
      * @return {?Entry}
      */
-    function getSelectedItem() {
+    function getTreeSelectedItem() {
         var selected = _projectTree.jstree("get_selected");
         if (selected) {
             return selected.data("entry");
         }
         return null;
     }
+
+    /**
+     * Returns the FileEntry or DirectoryEntry corresponding to the item selected in the sidebar panel, whether in
+     * the file tree OR in the working set; or null if no item is selected anywhere in the sidebar.
+     * @return {?Entry}
+     */
+    function getSidebarSelectedItem() {
+        // Prefer file tree selection, else use working set selection
+        var selectedEntry = getTreeSelectedItem();
+        if (!selectedEntry) {
+            var doc = DocumentManager.getCurrentDocument();
+            selectedEntry = (doc && doc.file);
+        }
+        return selectedEntry;
+    }
 
     function _fileViewFocusChange() {
         _redraw(true);
@@ -1321,7 +1336,8 @@ define(function (require, exports, module) {
     exports.makeProjectRelativeIfPossible = makeProjectRelativeIfPossible;
     exports.shouldShow               = shouldShow;
     exports.openProject              = openProject;
-    exports.getSelectedItem          = getSelectedItem;
+    exports.getTreeSelectedItem      = getTreeSelectedItem;
+    exports.getSidebarSelectedItem   = getSidebarSelectedItem;
     exports.getInitialProjectPath    = getInitialProjectPath;
     exports.isWelcomeProjectPath     = isWelcomeProjectPath;
     exports.updateWelcomeProjectPath = updateWelcomeProjectPath;

src/search/FindInFiles.js

@@ -419,13 +419,7 @@ define(function (require, exports, module) {
 
     /** Search within the file/subtree defined by the sidebar selection */
     function doFindInSubtree() {
-        // Prefer project tree selection, else use working set selection
-        var selectedEntry = ProjectManager.getSelectedItem();
-        if (!selectedEntry) {
-            var doc = DocumentManager.getCurrentDocument();
-            selectedEntry = (doc && doc.file);
-        }
-
+        var selectedEntry = ProjectManager.getSidebarSelectedItem();
         doFindInFiles(selectedEntry);
     }