Code review: support "Find in..." from working set context menu also.

Use CSS class instead of raw <b> tags where filenames are displayed.

Author: peterflynn

src/command/Menus.js

@@ -993,6 +993,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.addMenuDivider();
         project_cmenu.addMenuItem(Commands.EDIT_FIND_IN_SUBTREE);
 
         var working_set_cmenu = registerContextMenu(ContextMenuIds.WORKING_SET_MENU);
@@ -1001,6 +1002,8 @@ define(function (require, exports, module) {
         working_set_cmenu.addMenuItem(Commands.FILE_RENAME);
         working_set_cmenu.addMenuItem(Commands.NAVIGATE_SHOW_IN_FILE_TREE);
         working_set_cmenu.addMenuDivider();
+        working_set_cmenu.addMenuItem(Commands.EDIT_FIND_IN_SUBTREE);
+        working_set_cmenu.addMenuDivider();
         working_set_cmenu.addMenuItem(Commands.SORT_WORKINGSET_BY_ADDED);
         working_set_cmenu.addMenuItem(Commands.SORT_WORKINGSET_BY_NAME);
         working_set_cmenu.addMenuItem(Commands.SORT_WORKINGSET_BY_TYPE);

src/nls/root/strings.js

@@ -108,15 +108,15 @@ define({
     "NO_UPDATE_MESSAGE"                 : "You are running the latest version of {APP_NAME}.",
 
     "FIND_IN_FILES_TITLE"               : "for \"{4}\" {5} - {0} {1} in {2} {3}",
-    "FIND_IN_FILES_SCOPED"              : "in <b>{0}</b>",
+    "FIND_IN_FILES_SCOPED"              : "in <span class='dialog-filename'>{0}</span>",
     "FIND_IN_FILES_NO_SCOPE"            : "in project",
     "FIND_IN_FILES_FILE"                : "file",
     "FIND_IN_FILES_FILES"               : "files",
     "FIND_IN_FILES_MATCH"               : "match",
     "FIND_IN_FILES_MATCHES"             : "matches",
     "FIND_IN_FILES_MORE_THAN"           : "More than ",
     "FIND_IN_FILES_MAX"                 : " (showing the first {0} matches)",
-    "FIND_IN_FILES_FILE_PATH"           : "File: <b>{0}</b>",
+    "FIND_IN_FILES_FILE_PATH"           : "File: <span class='dialog-filename'>{0}</span>",
     "FIND_IN_FILES_LINE"                : "line:&nbsp;{0}",
 
     "ERROR_FETCHING_UPDATE_INFO_TITLE"  : "Error getting update info",

src/search/FindInFiles.js

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