github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Record current replace string as part of macro find action

Browse Source 
Previously we would only record it if the user invoked a replace action from the find dialog, but the user may invoke “find” from the dialog and then subsequently “replace” via keyboard/menu (where we would not record the string).
This commit is contained in:
Allan Odgaard
2014-02-20 17:06:01 +07:00
parent b0bfaffc17
commit 362c18c3e0
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Frameworks/OakTextView/src/OakTextView.mm
View File

@@ -2210,11 +2210,9 @@ static void update_menu_key_equivalents (NSMenu* menu, action_to_key_t const& ac
{
NSMutableDictionary* dict = [NSMutableDictionary dictionary];
dict[@"findString"] = aFindServer.findString;
dict[@"findString"] = aFindServer.findString;
dict[@"replaceString"] = aFindServer.replaceString;
static find_operation_t const replaceActions[] = { kFindOperationReplaceAll, kFindOperationReplaceAllInSelection, kFindOperationReplace, kFindOperationReplaceAndFind };
if(oak::contains(std::begin(replaceActions), std::end(replaceActions), aFindServer.findOperation))
dict[@"replaceString"] = aFindServer.replaceString;
static find_operation_t const inSelectionActions[] = { kFindOperationFindInSelection, kFindOperationReplaceAllInSelection };
if(oak::contains(std::begin(inSelectionActions), std::end(inSelectionActions), aFindServer.findOperation))
dict[@"replaceAllScope"] = @"selection";