github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-01-15 01:38:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Let editor_t remember (regexp) captures from editor_t::find

Browse Source
This commit is contained in:
Allan Odgaard
2014-02-20 22:04:31 +07:00
parent 73755bf744
commit 17dca05dba
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Frameworks/editor/src/editor.cc
View File

@@ -1471,6 +1471,8 @@ namespace ng
void editor_t::find (std::string const& searchFor, find::options_t options, bool searchOnlySelection)
{
set_match_captures(std::map<std::string, std::string>());
ranges_t res;
if(options & find::all_matches)
{
@@ -1486,8 +1488,12 @@ namespace ng
}
else
{
citerate(pair, ng::find(_buffer, _selections, searchFor, options))
res.push_back(pair->first);
auto matches = ng::find(_buffer, _selections, searchFor, options);
for(auto const& pair : matches)
res.push_back(pair.first);
if(matches.size() == 1)
set_match_captures(matches.begin()->second);
}
if(!res.empty())

3
Frameworks/editor/src/editor.h
View File

@@ -183,6 +183,7 @@ namespace ng
scope::context_t scope (std::string const& scopeAttributes) const;
std::map<std::string, std::string> editor_variables (std::string const& scopeAttributes) const;
std::map<std::string, std::string> const& match_captures () const { return _match_captures; }
std::vector<std::string> const& choices () const;
std::string placeholder_content (ng::range_t* placeholderSelection = NULL) const;
@@ -271,6 +272,7 @@ namespace ng
ranges_t snippet (size_t from, size_t to, std::string const& str, std::map<std::string, std::string> const& variables, bool disableIndent);
void find (std::string const& searchFor, find::options_t options = find::none, bool searchOnlySelection = false);
void set_match_captures (std::map<std::string, std::string> const& match_captures) { _match_captures = match_captures; }
ranges_t replace (std::multimap<range_t, std::string> const& replacements, bool selectInsertions = false);
void move_selection (int deltaX, int deltaY);
@@ -283,6 +285,7 @@ namespace ng
snippet_controller_t _snippets;
completion_info_t _completion_info;
std::map<std::string, std::string> _match_captures;
clipboard_ptr _clipboard;
clipboard_ptr _find_clipboard;