Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Fix for issue #6084: Move Find items to different menu #7488

Merged
merged 10 commits into from
Apr 24, 2014
Merged

Fix for issue #6084: Move Find items to different menu #7488

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
06e9b2a
Add new Search menu
lkcampbell Apr 11, 2014
7317a29
Add 'Find in Selected File/Folder' menu item
lkcampbell Apr 11, 2014
42cd989
Give 'Find in Selected' it's own Command
lkcampbell Apr 11, 2014
d298003
Change Search to Find. Replace SEARCH prefix with CMD prefix.
lkcampbell Apr 15, 2014
56ab3e9
Add deprecation code
lkcampbell Apr 16, 2014
e337d24
Merge pull request #7544 from adobe/alf_localization
pthiess Apr 16, 2014
12983f6
Merge branch 'fix-6084' of github.com:lkcampbell/brackets into fix-6084
lkcampbell Apr 16, 2014
427c8e9
Fix merge conflict
lkcampbell Apr 18, 2014
7ca5f89
Update Commands deprecation code
lkcampbell Apr 22, 2014
4c633af
Small Code clean up
lkcampbell Apr 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 52 additions & 52 deletions src/base-config/keyboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,58 +80,6 @@
"displayKey": "Shift-Alt-↓"
}
],
"edit.find": [
"Ctrl-F"
],
"edit.findInFiles": [
"Ctrl-Shift-F"
],
"edit.findNext": [
{
"key": "F3"
},
{
"key": "Cmd-G",
"platform": "mac"
}
],
"edit.findPrevious": [
{
"key": "Shift-F3"
},
{
"key": "Cmd-Shift-G",
"platform": "mac"
}
],
"edit.findAllAndSelect": [
{
"key": "Alt-F3"
},
{
"key": "Cmd-Ctrl-G",
"platform": "mac"
}
],
"edit.addNextMatch": [
{
"key": "Ctrl-B"
}
],
"edit.skipCurrentMatch": [
{
"key": "Ctrl-Shift-B"
}
],
"edit.replace": [
{
"key": "Ctrl-H"
},
{
"key": "Cmd-Alt-F",
"platform": "mac"
}
],
"edit.indent": [
{
"key": "Ctrl-]"
Expand Down Expand Up @@ -197,6 +145,58 @@
"platform": "mac"
}
],
"search.find": [
"Ctrl-F"
],
"search.findInFiles": [
"Ctrl-Shift-F"
],
"search.findNext": [
{
"key": "F3"
},
{
"key": "Cmd-G",
"platform": "mac"
}
],
"search.findPrevious": [
{
"key": "Shift-F3"
},
{
"key": "Cmd-Shift-G",
"platform": "mac"
}
],
"search.findAllAndSelect": [
{
"key": "Alt-F3"
},
{
"key": "Cmd-Ctrl-G",
"platform": "mac"
}
],
"search.addNextMatch": [
{
"key": "Ctrl-B"
}
],
"search.skipCurrentMatch": [
{
"key": "Ctrl-Shift-B"
}
],
"search.replace": [
{
"key": "Ctrl-H"
},
{
"key": "Cmd-Alt-F",
"platform": "mac"
}
],
"view.hideSidebar": [
"Ctrl-Shift-H"
],
Expand Down
29 changes: 16 additions & 13 deletions src/command/Commands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ define(function (require, exports, module) {
/**
* List of constants for global command IDs.
*/

// FILE
exports.FILE_NEW_UNTITLED = "file.newDoc"; // DocumentCommandHandlers.js handleFileNew()
exports.FILE_NEW = "file.newFile"; // DocumentCommandHandlers.js handleFileNewInProject()
Expand Down Expand Up @@ -72,15 +72,6 @@ define(function (require, exports, module) {
exports.EDIT_SPLIT_SEL_INTO_LINES = "edit.splitSelIntoLines"; // EditorCommandHandlers.js splitSelIntoLines()
exports.EDIT_ADD_CUR_TO_NEXT_LINE = "edit.addCursorToNextLine"; // EditorCommandHandlers.js addCursorToNextLine()
exports.EDIT_ADD_CUR_TO_PREV_LINE = "edit.addCursorToPrevLine"; // EditorCommandHandlers.js addCursorToPrevLine()
exports.EDIT_FIND = "edit.find"; // FindReplace.js _launchFind()
exports.EDIT_FIND_IN_FILES = "edit.findInFiles"; // FindInFiles.js _doFindInFiles()
exports.EDIT_FIND_IN_SUBTREE = "edit.findInSubtree"; // FindInFiles.js _doFindInSubtree()
exports.EDIT_FIND_NEXT = "edit.findNext"; // FindReplace.js _findNext()
exports.EDIT_FIND_PREVIOUS = "edit.findPrevious"; // FindReplace.js _findPrevious()
exports.EDIT_FIND_ALL_AND_SELECT = "edit.findAllAndSelect"; // FindReplace.js _findAllAndSelect()
exports.EDIT_ADD_NEXT_MATCH = "edit.addNextMatch"; // FindReplace.js _expandAndAddNextToSelection()
exports.EDIT_SKIP_CURRENT_MATCH = "edit.skipCurrentMatch"; // FindReplace.js _skipCurrentMatch()
exports.EDIT_REPLACE = "edit.replace"; // FindReplace.js _replace()
exports.EDIT_INDENT = "edit.indent"; // EditorCommandHandlers.js indentText()
exports.EDIT_UNINDENT = "edit.unindent"; // EditorCommandHandlers.js unindentText()
exports.EDIT_DUPLICATE = "edit.duplicate"; // EditorCommandHandlers.js duplicateText()
Expand All @@ -93,7 +84,19 @@ define(function (require, exports, module) {
exports.EDIT_OPEN_LINE_BELOW = "edit.openLineBelow"; // EditorCommandHandlers.js openLineBelow()
exports.TOGGLE_CLOSE_BRACKETS = "edit.autoCloseBrackets"; // EditorOptionHandlers.js _getToggler()
exports.SHOW_CODE_HINTS = "edit.showCodeHints"; // CodeHintManager.js _startNewSession()


// SEARCH
exports.SEARCH_FIND = "search.find"; // FindReplace.js _launchFind()
exports.SEARCH_FIND_IN_FILES = "search.findInFiles"; // FindInFiles.js _doFindInFiles()
exports.SEARCH_FIND_IN_SELECTED = "search.findInSelected"; // FindInFiles.js _doFindInSubtree()
exports.SEARCH_FIND_IN_SUBTREE = "search.findInSubtree"; // FindInFiles.js _doFindInSubtree()
exports.SEARCH_FIND_NEXT = "search.findNext"; // FindReplace.js _findNext()
exports.SEARCH_FIND_PREVIOUS = "search.findPrevious"; // FindReplace.js _findPrevious()
exports.SEARCH_FIND_ALL_AND_SELECT = "search.findAllAndSelect"; // FindReplace.js _findAllAndSelect()
exports.SEARCH_ADD_NEXT_MATCH = "search.addNextMatch"; // FindReplace.js _expandAndAddNextToSelection()
exports.SEARCH_SKIP_CURRENT_MATCH = "search.skipCurrentMatch"; // FindReplace.js _skipCurrentMatch()
exports.SEARCH_REPLACE = "search.replace"; // FindReplace.js _replace()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changing the command constants could break extensions. We should search to see if any are using the old ones -- might want to consider keeping them around as deprecated if so.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fwiw btw, I've never really liked the idea that we're prefixing everything with its menu parent's name. While we're renaming these, maybe we should just strip the prefix off altogether? (On the symbolic constants, not necessarily the underlying string values).

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, I'd agree with that - the command names/ids shouldn't really depend on the location of the command/id in the menus (especially since we refer to these from unit tests, etc. - you shouldn't have had to change all that code just to move stuff to a new menu :)). We should've thought of that way back at the beginning :), but c'est la vie.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, we should replace the prefixes of all the strings with COMMAND or similar just to know that these are command strings.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like we use CMD_ as the prefix for the Command Name strings. Would it be good to use that prefix on the command constants as well?

For example:
CommandManager.register(Strings.CMD_FIND, Commands.CMD_FIND, _launchFind);

Has a nice symmetry to it, what do you think?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The grabber keeps failing to unzip edge-inspect-extension and that causes the tool to fail. I am only able to get about 50 extensions before the failure. I can try to fix the error.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that's the kind of thing I was running into. I tried debugging it for awhile and wasn't able to find the cause of the problem. If you can figure it out that would be great, but I wouldn't rathole on it.

I just did a grep on the set of extensions I'd downloaded as of a few weeks ago, and I did find a couple that were referring to the EDIT_REPLACE_COMMANDS menu group in order to add their menu commands after it. So the issue is renaming that would throw an exception, but even if we kept the old const name around as well, it still would get added at the end of the menu anyway. That might be better behavior than just breaking, though.

I think we probably only need to worry about doing it for the menu groups, since those are probably the only cases where someone is referencing the existing IDs. It doesn't look like anyone is calling the commands themselves directly. We should add this to the release notes though.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@njx, it's okay, I just hacked around the few that failed and grabbed them manually. I will compare my grep check to yours and supply the deprecation code in my next PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@njx, I found the same two you found plus an additional one that uses Commands.EDIT_FIND. Overall, not too bad. I will create some deprecation code, load up the extensions to make sure it works, and post issues for the extension authors.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we are changing some of the Commands constant, we should just go and change all of them. Then we can use the same deprecation code for all.


// VIEW
exports.VIEW_HIDE_SIDEBAR = "view.hideSidebar"; // SidebarView.js toggle()
exports.VIEW_INCREASE_FONT_SIZE = "view.increaseFontSize"; // ViewCommandHandlers.js _handleIncreaseFontSize()
Expand Down Expand Up @@ -125,7 +128,7 @@ define(function (require, exports, module) {
exports.QUICK_EDIT_NEXT_MATCH = "navigate.nextMatch"; // MultiRangeInlineEditor.js _nextRange()
exports.QUICK_EDIT_PREV_MATCH = "navigate.previousMatch"; // MultiRangeInlineEditor.js _previousRange()
exports.CSS_QUICK_EDIT_NEW_RULE = "navigate.newRule"; // CSSInlineEditor.js _handleNewRule()

// HELP
exports.HELP_CHECK_FOR_UPDATE = "help.checkForUpdate"; // HelpCommandHandlers.js _handleCheckForUpdates()
exports.HELP_HOW_TO_USE_BRACKETS = "help.howToUseBrackets"; // HelpCommandHandlers.js _handleLinkMenuItem()
Expand All @@ -138,7 +141,7 @@ define(function (require, exports, module) {

// File shell callbacks - string must MATCH string in native code (appshell/command_callbacks.h)
exports.HELP_ABOUT = "help.about"; // HelpCommandHandlers.js _handleAboutDialog()

// APP
exports.APP_RELOAD = "app.reload"; // DocumentCommandHandlers.js handleReload()
exports.APP_RELOAD_WITHOUT_EXTS = "app.reload_without_exts"; // DocumentCommandHandlers.js handleReloadWithoutExts()
Expand Down
37 changes: 21 additions & 16 deletions src/command/DefaultMenus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ define(function (require, exports, module) {
menu.addMenuDivider();
menu.addMenuItem(Commands.FILE_QUIT);
}

/*
* Edit menu
*/
Expand All @@ -82,17 +82,6 @@ define(function (require, exports, module) {
menu.addMenuItem(Commands.EDIT_ADD_CUR_TO_PREV_LINE);
menu.addMenuItem(Commands.EDIT_ADD_CUR_TO_NEXT_LINE);
menu.addMenuDivider();
menu.addMenuItem(Commands.EDIT_FIND);
menu.addMenuItem(Commands.EDIT_FIND_IN_FILES);
menu.addMenuItem(Commands.EDIT_FIND_NEXT);
menu.addMenuItem(Commands.EDIT_FIND_PREVIOUS);
menu.addMenuItem(Commands.EDIT_FIND_ALL_AND_SELECT);
menu.addMenuItem(Commands.EDIT_ADD_NEXT_MATCH);
menu.addMenuItem(Commands.EDIT_SKIP_CURRENT_MATCH);

menu.addMenuDivider();
menu.addMenuItem(Commands.EDIT_REPLACE);
menu.addMenuDivider();
menu.addMenuItem(Commands.EDIT_INDENT);
menu.addMenuItem(Commands.EDIT_UNINDENT);
menu.addMenuItem(Commands.EDIT_DUPLICATE);
Expand All @@ -106,7 +95,23 @@ define(function (require, exports, module) {
menu.addMenuItem(Commands.SHOW_CODE_HINTS);
menu.addMenuDivider();
menu.addMenuItem(Commands.TOGGLE_CLOSE_BRACKETS);


/*
* Search menu
*/
menu = Menus.addMenu(Strings.SEARCH_MENU, Menus.AppMenuBar.SEARCH_MENU);
menu.addMenuItem(Commands.SEARCH_FIND);
menu.addMenuItem(Commands.SEARCH_FIND_NEXT);
menu.addMenuItem(Commands.SEARCH_FIND_PREVIOUS);
menu.addMenuItem(Commands.SEARCH_FIND_ALL_AND_SELECT);
menu.addMenuItem(Commands.SEARCH_ADD_NEXT_MATCH);
menu.addMenuItem(Commands.SEARCH_SKIP_CURRENT_MATCH);
menu.addMenuDivider();
menu.addMenuItem(Commands.SEARCH_FIND_IN_FILES);
menu.addMenuItem(Commands.SEARCH_FIND_IN_SELECTED);
menu.addMenuDivider();
menu.addMenuItem(Commands.SEARCH_REPLACE);

/*
* View menu
*/
Expand Down Expand Up @@ -146,7 +151,7 @@ define(function (require, exports, module) {
menu.addMenuItem(Commands.CSS_QUICK_EDIT_NEW_RULE);
menu.addMenuDivider();
menu.addMenuItem(Commands.TOGGLE_QUICK_DOCS);

/*
* Help menu
*/
Expand Down Expand Up @@ -199,7 +204,7 @@ define(function (require, exports, module) {
project_cmenu.addMenuItem(Commands.FILE_DELETE);
project_cmenu.addMenuItem(Commands.NAVIGATE_SHOW_IN_OS);
project_cmenu.addMenuDivider();
project_cmenu.addMenuItem(Commands.EDIT_FIND_IN_SUBTREE);
project_cmenu.addMenuItem(Commands.SEARCH_FIND_IN_SUBTREE);
project_cmenu.addMenuDivider();
project_cmenu.addMenuItem(Commands.FILE_REFRESH);

Expand All @@ -210,7 +215,7 @@ define(function (require, exports, module) {
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.addMenuItem(Commands.SEARCH_FIND_IN_SUBTREE);
working_set_cmenu.addMenuDivider();
working_set_cmenu.addMenuItem(Commands.FILE_CLOSE);

Expand Down
9 changes: 6 additions & 3 deletions src/command/Menus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ define(function (require, exports, module) {
var AppMenuBar = {
FILE_MENU : "file-menu",
EDIT_MENU : "edit-menu",
SEARCH_MENU : "search-menu",
VIEW_MENU : "view-menu",
NAVIGATE_MENU : "navigate-menu",
HELP_MENU : "help-menu"
Expand Down Expand Up @@ -85,13 +86,15 @@ define(function (require, exports, module) {
EDIT_UNDO_REDO_COMMANDS: {sectionMarker: Commands.EDIT_UNDO},
EDIT_TEXT_COMMANDS: {sectionMarker: Commands.EDIT_CUT},
EDIT_SELECTION_COMMANDS: {sectionMarker: Commands.EDIT_SELECT_ALL},
EDIT_FIND_COMMANDS: {sectionMarker: Commands.EDIT_FIND},
EDIT_REPLACE_COMMANDS: {sectionMarker: Commands.EDIT_REPLACE},
EDIT_MODIFY_SELECTION: {sectionMarker: Commands.EDIT_INDENT},
EDIT_COMMENT_SELECTION: {sectionMarker: Commands.EDIT_LINE_COMMENT},
EDIT_CODE_HINTS_COMMANDS: {sectionMarker: Commands.SHOW_CODE_HINTS},
EDIT_TOGGLE_OPTIONS: {sectionMarker: Commands.TOGGLE_CLOSE_BRACKETS},


SEARCH_FIND_COMMANDS: {sectionMarker: Commands.SEARCH_FIND},
SEARCH_FIND_IN_COMMANDS: {sectionMarker: Commands.SEARCH_FIND_IN_FILES},
SEARCH_REPLACE_COMMANDS: {sectionMarker: Commands.SEARCH_REPLACE},

VIEW_HIDESHOW_COMMANDS: {sectionMarker: Commands.VIEW_HIDE_SIDEBAR},
VIEW_FONTSIZE_COMMANDS: {sectionMarker: Commands.VIEW_INCREASE_FONT_SIZE},
VIEW_TOGGLE_OPTIONS: {sectionMarker: Commands.TOGGLE_ACTIVE_LINE},
Expand Down
24 changes: 14 additions & 10 deletions src/nls/root/strings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,16 +289,6 @@ define({
"CMD_SPLIT_SEL_INTO_LINES" : "Split Selection into Lines",
"CMD_ADD_CUR_TO_NEXT_LINE" : "Add Cursor to Next Line",
"CMD_ADD_CUR_TO_PREV_LINE" : "Add Cursor to Previous Line",
"CMD_FIND" : "Find",
"CMD_FIND_FIELD_PLACEHOLDER" : "Find\u2026",
"CMD_FIND_IN_FILES" : "Find in Files",
"CMD_FIND_IN_SUBTREE" : "Find in\u2026",
"CMD_FIND_NEXT" : "Find Next",
"CMD_FIND_PREVIOUS" : "Find Previous",
"CMD_FIND_ALL_AND_SELECT" : "Find All and Select",
"CMD_ADD_NEXT_MATCH" : "Add Next Match to Selection",
"CMD_SKIP_CURRENT_MATCH" : "Skip and Add Next Match",
"CMD_REPLACE" : "Replace",
"CMD_INDENT" : "Indent",
"CMD_UNINDENT" : "Unindent",
"CMD_DUPLICATE" : "Duplicate",
Expand All @@ -312,6 +302,20 @@ define({
"CMD_TOGGLE_CLOSE_BRACKETS" : "Auto Close Braces",
"CMD_SHOW_CODE_HINTS" : "Show Code Hints",

// Search menu commands
"SEARCH_MENU" : "Search",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, a few people on the team expressed a preference for "Find" as the name of the menu, which I think I agree with since most of the menu items start with "Find". /cc @larz0 to see if he agrees.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we remove the FIND_ prefix, we won't have commands constants starting with FIND_FIND_, so it will be ok to name it Find.

"CMD_FIND" : "Find",
"CMD_FIND_FIELD_PLACEHOLDER" : "Find\u2026",
"CMD_FIND_NEXT" : "Find Next",
"CMD_FIND_PREVIOUS" : "Find Previous",
"CMD_FIND_ALL_AND_SELECT" : "Find All and Select",
"CMD_ADD_NEXT_MATCH" : "Add Next Match to Selection",
"CMD_SKIP_CURRENT_MATCH" : "Skip and Add Next Match",
"CMD_FIND_IN_FILES" : "Find in Files",
"CMD_FIND_IN_SELECTED" : "Find in Selected File/Folder",
"CMD_FIND_IN_SUBTREE" : "Find in\u2026",
"CMD_REPLACE" : "Replace",

// View menu commands
"VIEW_MENU" : "View",
"CMD_HIDE_SIDEBAR" : "Hide Sidebar",
Expand Down
7 changes: 4 additions & 3 deletions src/search/FindInFiles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,7 +1042,7 @@ define(function (require, exports, module) {

if (scope instanceof InMemoryFile) {
CommandManager.execute(Commands.FILE_OPEN, { fullPath: scope.fullPath }).done(function () {
CommandManager.execute(Commands.EDIT_FIND);
CommandManager.execute(Commands.SEARCH_FIND);
});
return;
}
Expand Down Expand Up @@ -1237,8 +1237,9 @@ define(function (require, exports, module) {
});

// Initialize: command handlers
CommandManager.register(Strings.CMD_FIND_IN_FILES, Commands.EDIT_FIND_IN_FILES, _doFindInFiles);
CommandManager.register(Strings.CMD_FIND_IN_SUBTREE, Commands.EDIT_FIND_IN_SUBTREE, _doFindInSubtree);
CommandManager.register(Strings.CMD_FIND_IN_FILES, Commands.SEARCH_FIND_IN_FILES, _doFindInFiles);
CommandManager.register(Strings.CMD_FIND_IN_SELECTED, Commands.SEARCH_FIND_IN_SELECTED, _doFindInSubtree);
CommandManager.register(Strings.CMD_FIND_IN_SUBTREE, Commands.SEARCH_FIND_IN_SUBTREE, _doFindInSubtree);

// For unit testing - updated in _doSearch() when search complete
exports._searchResults = null;
Expand Down
20 changes: 10 additions & 10 deletions src/search/FindReplace.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,8 +602,8 @@ define(function (require, exports, module) {
// Create the search bar UI (closing any previous modalBar in the process)
var htmlContent = Mustache.render(searchBarTemplate, $.extend(templateVars, Strings));
createModalBar(htmlContent);
addShortcutToTooltip($("#find-next"), Commands.EDIT_FIND_NEXT);
addShortcutToTooltip($("#find-prev"), Commands.EDIT_FIND_PREVIOUS);
addShortcutToTooltip($("#find-next"), Commands.SEARCH_FIND_NEXT);
addShortcutToTooltip($("#find-prev"), Commands.SEARCH_FIND_PREVIOUS);

$(modalBar).on("close", function (e, query) {
// Clear highlights but leave search state in place so Find Next/Previous work after closing
Expand Down Expand Up @@ -813,7 +813,7 @@ define(function (require, exports, module) {
}

openSearchBar(editor, {replace: true});
addShortcutToTooltip($("#replace-yes"), Commands.EDIT_REPLACE);
addShortcutToTooltip($("#replace-yes"), Commands.SEARCH_REPLACE);

var cm = editor._codeMirror,
state = getSearchState(cm);
Expand Down Expand Up @@ -912,13 +912,13 @@ define(function (require, exports, module) {

$(DocumentManager).on("currentDocumentChange", _handleDocumentChange);

CommandManager.register(Strings.CMD_FIND, Commands.EDIT_FIND, _launchFind);
CommandManager.register(Strings.CMD_FIND_NEXT, Commands.EDIT_FIND_NEXT, _findNext);
CommandManager.register(Strings.CMD_REPLACE, Commands.EDIT_REPLACE, _replace);
CommandManager.register(Strings.CMD_FIND_PREVIOUS, Commands.EDIT_FIND_PREVIOUS, _findPrevious);
CommandManager.register(Strings.CMD_FIND_ALL_AND_SELECT, Commands.EDIT_FIND_ALL_AND_SELECT, _findAllAndSelect);
CommandManager.register(Strings.CMD_ADD_NEXT_MATCH, Commands.EDIT_ADD_NEXT_MATCH, _expandWordAndAddNextToSelection);
CommandManager.register(Strings.CMD_SKIP_CURRENT_MATCH, Commands.EDIT_SKIP_CURRENT_MATCH, _skipCurrentMatch);
CommandManager.register(Strings.CMD_FIND, Commands.SEARCH_FIND, _launchFind);
CommandManager.register(Strings.CMD_FIND_NEXT, Commands.SEARCH_FIND_NEXT, _findNext);
CommandManager.register(Strings.CMD_REPLACE, Commands.SEARCH_REPLACE, _replace);
CommandManager.register(Strings.CMD_FIND_PREVIOUS, Commands.SEARCH_FIND_PREVIOUS, _findPrevious);
CommandManager.register(Strings.CMD_FIND_ALL_AND_SELECT, Commands.SEARCH_FIND_ALL_AND_SELECT, _findAllAndSelect);
CommandManager.register(Strings.CMD_ADD_NEXT_MATCH, Commands.SEARCH_ADD_NEXT_MATCH, _expandWordAndAddNextToSelection);
CommandManager.register(Strings.CMD_SKIP_CURRENT_MATCH, Commands.SEARCH_SKIP_CURRENT_MATCH, _skipCurrentMatch);

// APIs shared with FindInFiles
exports._updatePrefsFromSearchBar = _updatePrefsFromSearchBar;
Expand Down
2 changes: 1 addition & 1 deletion test/spec/FileFilters-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ define(function (require, exports, module) {
}, "search bar close");
});
runs(function () {
waitsForDone(CommandManager.execute(Commands.EDIT_FIND_IN_FILES));
waitsForDone(CommandManager.execute(Commands.SEARCH_FIND_IN_FILES));
});
}

Expand Down
Loading