celisej567/abaddon
1
0
Fork 0
mirror of https://github.com/celisej567/abaddon.git synced 2026-09-06 20:15:19 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

make completer work with terms after/before newlines

Browse Source
This commit is contained in:
ouwou
2021-01-08 22:40:00 -05:00
parent 3f31d74cd8
commit 117e5db564
1 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
components/completer.cpp
View File

@@ -264,14 +264,48 @@ void Completer::OnTextBufferChanged() {
}
}
bool MultiBackwardSearch(const Gtk::TextIter &iter, const Glib::ustring &chars, Gtk::TextSearchFlags flags, Gtk::TextBuffer::iterator &out) {
bool any = false;
for (const auto c : chars) {
Glib::ustring tmp(1, c);
Gtk::TextBuffer::iterator tstart, tend;
if (!iter.backward_search(tmp, flags, tstart, tend)) continue;
// if previous found, compare to see if closer to out iter
if (any) {
if (tstart > out)
out = tstart;
} else
out = tstart;
any = true;
}
return any;
}
bool MultiForwardSearch(const Gtk::TextIter &iter, const Glib::ustring &chars, Gtk::TextSearchFlags flags, Gtk::TextBuffer::iterator &out) {
bool any = false;
for (const auto c : chars) {
Glib::ustring tmp(1, c);
Gtk::TextBuffer::iterator tstart, tend;
if (!iter.forward_search(tmp, flags, tstart, tend)) continue;
// if previous found, compare to see if closer to out iter
if (any) {
if (tstart < out)
out = tstart;
} else
out = tstart;
any = true;
}
return any;
}
Glib::ustring Completer::GetTerm() {
const auto iter = m_buf->get_insert()->get_iter();
Gtk::TextBuffer::iterator dummy;
if (!iter.backward_search(" ", Gtk::TEXT_SEARCH_TEXT_ONLY, m_start, dummy))
if (!MultiBackwardSearch(iter, " \n", Gtk::TEXT_SEARCH_TEXT_ONLY, m_start))
m_buf->get_bounds(m_start, dummy);
else
m_start.forward_char(); // 1 behind
if (!iter.forward_search(" ", Gtk::TEXT_SEARCH_TEXT_ONLY, dummy, m_end))
if (!MultiForwardSearch(iter, " \n", Gtk::TEXT_SEARCH_TEXT_ONLY, m_end))
m_buf->get_bounds(dummy, m_end);
return m_start.get_text(m_end);
}