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

Commit 12983f6

Browse files
lkcampbelllkcampbell
committed
Merge branch 'fix-6084' of github.com:lkcampbell/brackets into fix-6084
2 parents e337d24 + 56ab3e9 commit 12983f6

9 files changed

Lines changed: 234 additions & 193 deletions

File tree

‎src/base-config/keyboard.json‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -80,58 +80,6 @@
8080
"displayKey": "Shift-Alt-↓"
8181
}
8282
],
83-
"edit.find": [
84-
"Ctrl-F"
85-
],
86-
"edit.findInFiles": [
87-
"Ctrl-Shift-F"
88-
],
89-
"edit.findNext": [
90-
{
91-
"key": "F3"
92-
},
93-
{
94-
"key": "Cmd-G",
95-
"platform": "mac"
96-
}
97-
],
98-
"edit.findPrevious": [
99-
{
100-
"key": "Shift-F3"
101-
},
102-
{
103-
"key": "Cmd-Shift-G",
104-
"platform": "mac"
105-
}
106-
],
107-
"edit.findAllAndSelect": [
108-
{
109-
"key": "Alt-F3"
110-
},
111-
{
112-
"key": "Cmd-Ctrl-G",
113-
"platform": "mac"
114-
}
115-
],
116-
"edit.addNextMatch": [
117-
{
118-
"key": "Ctrl-B"
119-
}
120-
],
121-
"edit.skipCurrentMatch": [
122-
{
123-
"key": "Ctrl-Shift-B"
124-
}
125-
],
126-
"edit.replace": [
127-
{
128-
"key": "Ctrl-H"
129-
},
130-
{
131-
"key": "Cmd-Alt-F",
132-
"platform": "mac"
133-
}
134-
],
13583
"edit.indent": [
13684
{
13785
"key": "Ctrl-]"
@@ -197,6 +145,58 @@
197145
"platform": "mac"
198146
}
199147
],
148+
"cmd.find": [
149+
"Ctrl-F"
150+
],
151+
"cmd.findInFiles": [
152+
"Ctrl-Shift-F"
153+
],
154+
"cmd.findNext": [
155+
{
156+
"key": "F3"
157+
},
158+
{
159+
"key": "Cmd-G",
160+
"platform": "mac"
161+
}
162+
],
163+
"cmd.findPrevious": [
164+
{
165+
"key": "Shift-F3"
166+
},
167+
{
168+
"key": "Cmd-Shift-G",
169+
"platform": "mac"
170+
}
171+
],
172+
"cmd.findAllAndSelect": [
173+
{
174+
"key": "Alt-F3"
175+
},
176+
{
177+
"key": "Cmd-Ctrl-G",
178+
"platform": "mac"
179+
}
180+
],
181+
"cmd.addNextMatch": [
182+
{
183+
"key": "Ctrl-B"
184+
}
185+
],
186+
"cmd.skipCurrentMatch": [
187+
{
188+
"key": "Ctrl-Shift-B"
189+
}
190+
],
191+
"cmd.replace": [
192+
{
193+
"key": "Ctrl-H"
194+
},
195+
{
196+
"key": "Cmd-Alt-F",
197+
"platform": "mac"
198+
}
199+
],
200200
"view.hideSidebar": [
201201
"Ctrl-Shift-H"
202202
],

‎src/command/Commands.js‎

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ define(function (require, exports, module) {
3131
/**
3232
* List of constants for global command IDs.
3333
*/
34-
34+
3535
// FILE
3636
exports.FILE_NEW_UNTITLED = "file.newDoc"; // DocumentCommandHandlers.js handleFileNew()
3737
exports.FILE_NEW = "file.newFile"; // DocumentCommandHandlers.js handleFileNewInProject()
@@ -72,15 +72,6 @@ define(function (require, exports, module) {
7272
exports.EDIT_SPLIT_SEL_INTO_LINES = "edit.splitSelIntoLines"; // EditorCommandHandlers.js splitSelIntoLines()
7373
exports.EDIT_ADD_CUR_TO_NEXT_LINE = "edit.addCursorToNextLine"; // EditorCommandHandlers.js addCursorToNextLine()
7474
exports.EDIT_ADD_CUR_TO_PREV_LINE = "edit.addCursorToPrevLine"; // EditorCommandHandlers.js addCursorToPrevLine()
75-
exports.EDIT_FIND = "edit.find"; // FindReplace.js _launchFind()
76-
exports.EDIT_FIND_IN_FILES = "edit.findInFiles"; // FindInFiles.js _doFindInFiles()
77-
exports.EDIT_FIND_IN_SUBTREE = "edit.findInSubtree"; // FindInFiles.js _doFindInSubtree()
78-
exports.EDIT_FIND_NEXT = "edit.findNext"; // FindReplace.js _findNext()
79-
exports.EDIT_FIND_PREVIOUS = "edit.findPrevious"; // FindReplace.js _findPrevious()
80-
exports.EDIT_FIND_ALL_AND_SELECT = "edit.findAllAndSelect"; // FindReplace.js _findAllAndSelect()
81-
exports.EDIT_ADD_NEXT_MATCH = "edit.addNextMatch"; // FindReplace.js _expandAndAddNextToSelection()
82-
exports.EDIT_SKIP_CURRENT_MATCH = "edit.skipCurrentMatch"; // FindReplace.js _skipCurrentMatch()
83-
exports.EDIT_REPLACE = "edit.replace"; // FindReplace.js _replace()
8475
exports.EDIT_INDENT = "edit.indent"; // EditorCommandHandlers.js indentText()
8576
exports.EDIT_UNINDENT = "edit.unindent"; // EditorCommandHandlers.js unindentText()
8677
exports.EDIT_DUPLICATE = "edit.duplicate"; // EditorCommandHandlers.js duplicateText()
@@ -93,7 +84,31 @@ define(function (require, exports, module) {
9384
exports.EDIT_OPEN_LINE_BELOW = "edit.openLineBelow"; // EditorCommandHandlers.js openLineBelow()
9485
exports.TOGGLE_CLOSE_BRACKETS = "edit.autoCloseBrackets"; // EditorOptionHandlers.js _getToggler()
9586
exports.SHOW_CODE_HINTS = "edit.showCodeHints"; // CodeHintManager.js _startNewSession()
96-
87+
88+
// DEPRECATED: Redirect Edit commands that were moved from the Edit Menu to the Find Menu
89+
exports.EDIT_FIND = "cmd.find"; // FindReplace.js _launchFind()
90+
exports.EDIT_FIND_IN_FILES = "cmd.findInFiles"; // FindInFiles.js _doFindInFiles()
91+
exports.EDIT_FIND_IN_SELECTED = "cmd.findInSelected"; // FindInFiles.js _doFindInSubtree()
92+
exports.EDIT_FIND_IN_SUBTREE = "cmd.findInSubtree"; // FindInFiles.js _doFindInSubtree()
93+
exports.EDIT_FIND_NEXT = "cmd.findNext"; // FindReplace.js _findNext()
94+
exports.EDIT_FIND_PREVIOUS = "cmd.findPrevious"; // FindReplace.js _findPrevious()
95+
exports.EDIT_FIND_ALL_AND_SELECT = "cmd.findAllAndSelect"; // FindReplace.js _findAllAndSelect()
96+
exports.EDIT_ADD_NEXT_MATCH = "cmd.addNextMatch"; // FindReplace.js _expandAndAddNextToSelection()
97+
exports.EDIT_SKIP_CURRENT_MATCH = "cmd.skipCurrentMatch"; // FindReplace.js _skipCurrentMatch()
98+
exports.EDIT_REPLACE = "cmd.replace"; // FindReplace.js _replace()
99+
100+
// FIND
101+
exports.CMD_FIND = "cmd.find"; // FindReplace.js _launchFind()
102+
exports.CMD_FIND_IN_FILES = "cmd.findInFiles"; // FindInFiles.js _doFindInFiles()
103+
exports.CMD_FIND_IN_SELECTED = "cmd.findInSelected"; // FindInFiles.js _doFindInSubtree()
104+
exports.CMD_FIND_IN_SUBTREE = "cmd.findInSubtree"; // FindInFiles.js _doFindInSubtree()
105+
exports.CMD_FIND_NEXT = "cmd.findNext"; // FindReplace.js _findNext()
106+
exports.CMD_FIND_PREVIOUS = "cmd.findPrevious"; // FindReplace.js _findPrevious()
107+
exports.CMD_FIND_ALL_AND_SELECT = "cmd.findAllAndSelect"; // FindReplace.js _findAllAndSelect()
108+
exports.CMD_ADD_NEXT_MATCH = "cmd.addNextMatch"; // FindReplace.js _expandAndAddNextToSelection()
109+
exports.CMD_SKIP_CURRENT_MATCH = "cmd.skipCurrentMatch"; // FindReplace.js _skipCurrentMatch()
110+
exports.CMD_REPLACE = "cmd.replace"; // FindReplace.js _replace()
111+
97112
// VIEW
98113
exports.VIEW_HIDE_SIDEBAR = "view.hideSidebar"; // SidebarView.js toggle()
99114
exports.VIEW_INCREASE_FONT_SIZE = "view.increaseFontSize"; // ViewCommandHandlers.js _handleIncreaseFontSize()
@@ -125,7 +140,7 @@ define(function (require, exports, module) {
125140
exports.QUICK_EDIT_NEXT_MATCH = "navigate.nextMatch"; // MultiRangeInlineEditor.js _nextRange()
126141
exports.QUICK_EDIT_PREV_MATCH = "navigate.previousMatch"; // MultiRangeInlineEditor.js _previousRange()
127142
exports.CSS_QUICK_EDIT_NEW_RULE = "navigate.newRule"; // CSSInlineEditor.js _handleNewRule()
128-
143+
129144
// HELP
130145
exports.HELP_CHECK_FOR_UPDATE = "help.checkForUpdate"; // HelpCommandHandlers.js _handleCheckForUpdates()
131146
exports.HELP_HOW_TO_USE_BRACKETS = "help.howToUseBrackets"; // HelpCommandHandlers.js _handleLinkMenuItem()
@@ -138,7 +153,7 @@ define(function (require, exports, module) {
138153

139154
// File shell callbacks - string must MATCH string in native code (appshell/command_callbacks.h)
140155
exports.HELP_ABOUT = "help.about"; // HelpCommandHandlers.js _handleAboutDialog()
141-
156+
142157
// APP
143158
exports.APP_RELOAD = "app.reload"; // DocumentCommandHandlers.js handleReload()
144159
exports.APP_RELOAD_WITHOUT_EXTS = "app.reload_without_exts"; // DocumentCommandHandlers.js handleReloadWithoutExts()

‎src/command/DefaultMenus.js‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ define(function (require, exports, module) {
6464
menu.addMenuDivider();
6565
menu.addMenuItem(Commands.FILE_QUIT);
6666
}
67-
67+
6868
/*
6969
* Edit menu
7070
*/
@@ -82,17 +82,6 @@ define(function (require, exports, module) {
8282
menu.addMenuItem(Commands.EDIT_ADD_CUR_TO_PREV_LINE);
8383
menu.addMenuItem(Commands.EDIT_ADD_CUR_TO_NEXT_LINE);
8484
menu.addMenuDivider();
85-
menu.addMenuItem(Commands.EDIT_FIND);
86-
menu.addMenuItem(Commands.EDIT_FIND_IN_FILES);
87-
menu.addMenuItem(Commands.EDIT_FIND_NEXT);
88-
menu.addMenuItem(Commands.EDIT_FIND_PREVIOUS);
89-
menu.addMenuItem(Commands.EDIT_FIND_ALL_AND_SELECT);
90-
menu.addMenuItem(Commands.EDIT_ADD_NEXT_MATCH);
91-
menu.addMenuItem(Commands.EDIT_SKIP_CURRENT_MATCH);
92-
93-
menu.addMenuDivider();
94-
menu.addMenuItem(Commands.EDIT_REPLACE);
95-
menu.addMenuDivider();
9685
menu.addMenuItem(Commands.EDIT_INDENT);
9786
menu.addMenuItem(Commands.EDIT_UNINDENT);
9887
menu.addMenuItem(Commands.EDIT_DUPLICATE);
@@ -106,7 +95,23 @@ define(function (require, exports, module) {
10695
menu.addMenuItem(Commands.SHOW_CODE_HINTS);
10796
menu.addMenuDivider();
10897
menu.addMenuItem(Commands.TOGGLE_CLOSE_BRACKETS);
109-
98+
99+
/*
100+
* Find menu
101+
*/
102+
menu = Menus.addMenu(Strings.FIND_MENU, Menus.AppMenuBar.FIND_MENU);
103+
menu.addMenuItem(Commands.CMD_FIND);
104+
menu.addMenuItem(Commands.CMD_FIND_NEXT);
105+
menu.addMenuItem(Commands.CMD_FIND_PREVIOUS);
106+
menu.addMenuItem(Commands.CMD_FIND_ALL_AND_SELECT);
107+
menu.addMenuItem(Commands.CMD_ADD_NEXT_MATCH);
108+
menu.addMenuItem(Commands.CMD_SKIP_CURRENT_MATCH);
109+
menu.addMenuDivider();
110+
menu.addMenuItem(Commands.CMD_FIND_IN_FILES);
111+
menu.addMenuItem(Commands.CMD_FIND_IN_SELECTED);
112+
menu.addMenuDivider();
113+
menu.addMenuItem(Commands.CMD_REPLACE);
114+
110115
/*
111116
* View menu
112117
*/
@@ -146,7 +151,7 @@ define(function (require, exports, module) {
146151
menu.addMenuItem(Commands.CSS_QUICK_EDIT_NEW_RULE);
147152
menu.addMenuDivider();
148153
menu.addMenuItem(Commands.TOGGLE_QUICK_DOCS);
149-
154+
150155
/*
151156
* Help menu
152157
*/
@@ -199,7 +204,7 @@ define(function (require, exports, module) {
199204
project_cmenu.addMenuItem(Commands.FILE_DELETE);
200205
project_cmenu.addMenuItem(Commands.NAVIGATE_SHOW_IN_OS);
201206
project_cmenu.addMenuDivider();
202-
project_cmenu.addMenuItem(Commands.EDIT_FIND_IN_SUBTREE);
207+
project_cmenu.addMenuItem(Commands.CMD_FIND_IN_SUBTREE);
203208
project_cmenu.addMenuDivider();
204209
project_cmenu.addMenuItem(Commands.FILE_REFRESH);
205210

@@ -210,7 +215,7 @@ define(function (require, exports, module) {
210215
working_set_cmenu.addMenuItem(Commands.NAVIGATE_SHOW_IN_FILE_TREE);
211216
working_set_cmenu.addMenuItem(Commands.NAVIGATE_SHOW_IN_OS);
212217
working_set_cmenu.addMenuDivider();
213-
working_set_cmenu.addMenuItem(Commands.EDIT_FIND_IN_SUBTREE);
218+
working_set_cmenu.addMenuItem(Commands.CMD_FIND_IN_SUBTREE);
214219
working_set_cmenu.addMenuDivider();
215220
working_set_cmenu.addMenuItem(Commands.FILE_CLOSE);
216221

‎src/command/Menus.js‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ define(function (require, exports, module) {
3737
StringUtils = require("utils/StringUtils"),
3838
CommandManager = require("command/CommandManager"),
3939
PopUpManager = require("widgets/PopUpManager"),
40-
ViewUtils = require("utils/ViewUtils");
40+
ViewUtils = require("utils/ViewUtils"),
41+
DeprecationWarning = require("utils/DeprecationWarning");
4142

4243
/**
4344
* Brackets Application Menu Constants
@@ -46,6 +47,7 @@ define(function (require, exports, module) {
4647
var AppMenuBar = {
4748
FILE_MENU : "file-menu",
4849
EDIT_MENU : "edit-menu",
50+
FIND_MENU : "find-menu",
4951
VIEW_MENU : "view-menu",
5052
NAVIGATE_MENU : "navigate-menu",
5153
HELP_MENU : "help-menu"
@@ -85,13 +87,19 @@ define(function (require, exports, module) {
8587
EDIT_UNDO_REDO_COMMANDS: {sectionMarker: Commands.EDIT_UNDO},
8688
EDIT_TEXT_COMMANDS: {sectionMarker: Commands.EDIT_CUT},
8789
EDIT_SELECTION_COMMANDS: {sectionMarker: Commands.EDIT_SELECT_ALL},
88-
EDIT_FIND_COMMANDS: {sectionMarker: Commands.EDIT_FIND},
89-
EDIT_REPLACE_COMMANDS: {sectionMarker: Commands.EDIT_REPLACE},
9090
EDIT_MODIFY_SELECTION: {sectionMarker: Commands.EDIT_INDENT},
9191
EDIT_COMMENT_SELECTION: {sectionMarker: Commands.EDIT_LINE_COMMENT},
9292
EDIT_CODE_HINTS_COMMANDS: {sectionMarker: Commands.SHOW_CODE_HINTS},
9393
EDIT_TOGGLE_OPTIONS: {sectionMarker: Commands.TOGGLE_CLOSE_BRACKETS},
94-
94+
95+
// DEPRECATED: Old Edit menu sections redirected to existing Edit menu section
96+
EDIT_FIND_COMMANDS: {sectionMarker: Commands.TOGGLE_CLOSE_BRACKETS},
97+
EDIT_REPLACE_COMMANDS: {sectionMarker: Commands.TOGGLE_CLOSE_BRACKETS},
98+
99+
FIND_FIND_COMMANDS: {sectionMarker: Commands.CMD_FIND},
100+
FIND_FIND_IN_COMMANDS: {sectionMarker: Commands.CMD_FIND_IN_FILES},
101+
FIND_REPLACE_COMMANDS: {sectionMarker: Commands.CMD_REPLACE},
102+
95103
VIEW_HIDESHOW_COMMANDS: {sectionMarker: Commands.VIEW_HIDE_SIDEBAR},
96104
VIEW_FONTSIZE_COMMANDS: {sectionMarker: Commands.VIEW_INCREASE_FONT_SIZE},
97105
VIEW_TOGGLE_OPTIONS: {sectionMarker: Commands.TOGGLE_ACTIVE_LINE},
@@ -359,7 +367,7 @@ define(function (require, exports, module) {
359367
*/
360368
Menu.prototype._getRelativeMenuItem = function (relativeID, position) {
361369
var $relativeElement;
362-
370+
363371
if (relativeID) {
364372
if (position === FIRST_IN_SECTION || position === LAST_IN_SECTION) {
365373
if (!relativeID.hasOwnProperty("sectionMarker")) {
@@ -547,7 +555,15 @@ define(function (require, exports, module) {
547555
menuItem,
548556
name,
549557
commandID;
550-
558+
559+
if (relativeID === MenuSection.EDIT_FIND_COMMANDS) {
560+
DeprecationWarning.deprecationWarning("Add " + command + " Command to the Find Menu instead of the Edit Menu.", true);
561+
DeprecationWarning.deprecationWarning("Use MenuSection.FIND_FIND_COMMANDS instead of MenuSection.EDIT_FIND_COMMANDS.", true);
562+
} else if (relativeID === MenuSection.EDIT_REPLACE_COMMANDS) {
563+
DeprecationWarning.deprecationWarning("Add " + command + "Command to the Find Menu instead of the Edit Menu.", true);
564+
DeprecationWarning.deprecationWarning("Use MenuSection.FIND_REPLACE_COMMANDS instead of MenuSection.EDIT_REPLACE_COMMANDS.", true);
565+
}
566+
551567
if (!command) {
552568
console.error("addMenuItem(): missing required parameters: command");
553569
return null;

‎src/nls/root/strings.js‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -289,16 +289,6 @@ define({
289289
"CMD_SPLIT_SEL_INTO_LINES" : "Split Selection into Lines",
290290
"CMD_ADD_CUR_TO_NEXT_LINE" : "Add Cursor to Next Line",
291291
"CMD_ADD_CUR_TO_PREV_LINE" : "Add Cursor to Previous Line",
292-
"CMD_FIND" : "Find",
293-
"CMD_FIND_FIELD_PLACEHOLDER" : "Find\u2026",
294-
"CMD_FIND_IN_FILES" : "Find in Files",
295-
"CMD_FIND_IN_SUBTREE" : "Find in\u2026",
296-
"CMD_FIND_NEXT" : "Find Next",
297-
"CMD_FIND_PREVIOUS" : "Find Previous",
298-
"CMD_FIND_ALL_AND_SELECT" : "Find All and Select",
299-
"CMD_ADD_NEXT_MATCH" : "Add Next Match to Selection",
300-
"CMD_SKIP_CURRENT_MATCH" : "Skip and Add Next Match",
301-
"CMD_REPLACE" : "Replace",
302292
"CMD_INDENT" : "Indent",
303293
"CMD_UNINDENT" : "Unindent",
304294
"CMD_DUPLICATE" : "Duplicate",
@@ -312,6 +302,20 @@ define({
312302
"CMD_TOGGLE_CLOSE_BRACKETS" : "Auto Close Braces",
313303
"CMD_SHOW_CODE_HINTS" : "Show Code Hints",
314304

305+
// Search menu commands
306+
"FIND_MENU" : "Find",
307+
"CMD_FIND" : "Find",
308+
"CMD_FIND_FIELD_PLACEHOLDER" : "Find\u2026",
309+
"CMD_FIND_NEXT" : "Find Next",
310+
"CMD_FIND_PREVIOUS" : "Find Previous",
311+
"CMD_FIND_ALL_AND_SELECT" : "Find All and Select",
312+
"CMD_ADD_NEXT_MATCH" : "Add Next Match to Selection",
313+
"CMD_SKIP_CURRENT_MATCH" : "Skip and Add Next Match",
314+
"CMD_FIND_IN_FILES" : "Find in Files",
315+
"CMD_FIND_IN_SELECTED" : "Find in Selected File/Folder",
316+
"CMD_FIND_IN_SUBTREE" : "Find in\u2026",
317+
"CMD_REPLACE" : "Replace",
318+
315319
// View menu commands
316320
"VIEW_MENU" : "View",
317321
"CMD_HIDE_SIDEBAR" : "Hide Sidebar",

‎src/search/FindInFiles.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,7 @@ define(function (require, exports, module) {
10421042

10431043
if (scope instanceof InMemoryFile) {
10441044
CommandManager.execute(Commands.FILE_OPEN, { fullPath: scope.fullPath }).done(function () {
1045-
CommandManager.execute(Commands.EDIT_FIND);
1045+
CommandManager.execute(Commands.CMD_FIND);
10461046
});
10471047
return;
10481048
}
@@ -1237,8 +1237,9 @@ define(function (require, exports, module) {
12371237
});
12381238

12391239
// Initialize: command handlers
1240-
CommandManager.register(Strings.CMD_FIND_IN_FILES, Commands.EDIT_FIND_IN_FILES, _doFindInFiles);
1241-
CommandManager.register(Strings.CMD_FIND_IN_SUBTREE, Commands.EDIT_FIND_IN_SUBTREE, _doFindInSubtree);
1240+
CommandManager.register(Strings.CMD_FIND_IN_FILES, Commands.CMD_FIND_IN_FILES, _doFindInFiles);
1241+
CommandManager.register(Strings.CMD_FIND_IN_SELECTED, Commands.CMD_FIND_IN_SELECTED, _doFindInSubtree);
1242+
CommandManager.register(Strings.CMD_FIND_IN_SUBTREE, Commands.CMD_FIND_IN_SUBTREE, _doFindInSubtree);
12421243

12431244
// For unit testing - updated in _doSearch() when search complete
12441245
exports._searchResults = null;

0 commit comments

Comments
 (0)
⚡