xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Word completion can optionally look for candidates in all buffers

Browse Source 
completers option accept word=buffer or word=all values
This commit is contained in:
Maxime Coste 2013-05-20 14:10:53 +02:00
parent f3ad51444d
commit 258637222f
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/input_handler.cc
View File

@ -6,6 +6,7 @@
#include "event_manager.hh" #include "event_manager.hh"
#include "normal.hh" #include "normal.hh"
#include "register_manager.hh" #include "register_manager.hh"
#include "buffer_manager.hh"
#include "user_interface.hh" #include "user_interface.hh"
#include "utf8.hh" #include "utf8.hh"
#include "window.hh" #include "window.hh"
@ -495,7 +496,7 @@ struct BufferCompletion
bool is_valid() const { return begin.is_valid() and not candidates.empty(); } bool is_valid() const { return begin.is_valid() and not candidates.empty(); }
}; };
static BufferCompletion complete_word(const BufferIterator& pos) static BufferCompletion complete_word(const BufferIterator& pos, bool other_buffers)
{ {
if (pos.is_begin() or not is_word(*utf8::previous(pos))) if (pos.is_begin() or not is_word(*utf8::previous(pos)))
return {}; return {};
@ -512,17 +513,31 @@ static BufferCompletion complete_word(const BufferIterator& pos)
Regex re(ex.begin(), ex.end()); Regex re(ex.begin(), ex.end());
using RegexIt = boost::regex_iterator<BufferIterator>; using RegexIt = boost::regex_iterator<BufferIterator>;
CandidateList result; std::unordered_set<String> matches;
for (RegexIt it(buffer.begin(), buffer.end(), re), re_end; it != re_end; ++it) for (RegexIt it(buffer.begin(), buffer.end(), re), re_end; it != re_end; ++it)
{ {
auto& match = (*it)[0]; auto& match = (*it)[0];
if (match.first <= pos and pos < match.second) if (match.first <= pos and pos < match.second)
continue; continue;
matches.insert(buffer.string(match.first, match.second));
String content = buffer.string(match.first, match.second);
if (not contains(result, content))
result.emplace_back(std::move(content));
} }
if (other_buffers)
{
for (const auto& buf : BufferManager::instance())
{
if (buf.get() == &buffer)
continue;
for (RegexIt it(buf->begin(), buf->end(), re), re_end; it != re_end; ++it)
{
auto& match = (*it)[0];
matches.insert(buf->string(match.first, match.second));
}
}
}
CandidateList result;
std::copy(make_move_iterator(matches.begin()),
make_move_iterator(matches.end()),
inserter(result, result.begin()));
std::sort(result.begin(), result.end()); std::sort(result.begin(), result.end());
return { begin, end, std::move(result), begin.buffer().timestamp() }; return { begin, end, std::move(result), begin.buffer().timestamp() };
} }
@ -670,8 +685,10 @@ private:
BufferIterator cursor = m_context.editor().main_selection().last(); BufferIterator cursor = m_context.editor().main_selection().last();
if (contains(completers, "option")) if (contains(completers, "option"))
m_completions = complete_opt(cursor, m_context.options()); m_completions = complete_opt(cursor, m_context.options());
if (not m_completions.is_valid() and contains(completers, "word")) if (not m_completions.is_valid() and
m_completions = complete_word(cursor); (contains(completers, "word=buffer") or
contains(completers, "word=all")))
m_completions = complete_word(cursor, contains(completers, "word=all"));
if (not m_completions.is_valid()) if (not m_completions.is_valid())
return false; return false;

4
src/option_manager.cc
View File

@ -121,11 +121,11 @@ GlobalOptions::GlobalOptions()
declare_option<String>("filetype", ""); declare_option<String>("filetype", "");
declare_option<std::vector<String>>("completions", {}); declare_option<std::vector<String>>("completions", {});
declare_option<std::vector<String>>("path", { "./", "/usr/include" }); declare_option<std::vector<String>>("path", { "./", "/usr/include" });
declare_option<std::unordered_set<String>>("completers", {"option", "word"}, declare_option<std::unordered_set<String>>("completers", {"option", "word=buffer"},
[](const std::unordered_set<String>& s) { [](const std::unordered_set<String>& s) {
for (auto& v : s) for (auto& v : s)
{ {
if (v != "option" and v != "word") if (v != "option" and v != "word=buffer" and v != "word=all")
throw runtime_error(v + " is not a recognised value for completers"); throw runtime_error(v + " is not a recognised value for completers");
} }
}); });