zalox
/
jucipp
mirror of https://gitlab.com/cppit/jucipp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Autocomplete cleanup

merge-requests/365/head
eidheim 10 years ago
parent
c20f284403
commit
5fcd3c4889
2 changed files with 10 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      src/source_clang.cc
  2. 2
      src/source_clang.h

24
src/source_clang.cc
Unescape View File

@ -610,7 +610,7 @@ bool Source::ClangViewParse::on_key_press_event(GdkEventKey* key) {
Source::ClangViewAutocomplete::ClangViewAutocomplete(const boost::filesystem::path &file_path, const boost::filesystem::path& project_path, Glib::RefPtr<Gsv::Language> language): Source::ClangViewAutocomplete::ClangViewAutocomplete(const boost::filesystem::path &file_path, const boost::filesystem::path& project_path, Glib::RefPtr<Gsv::Language> language):
Source::ClangViewParse(file_path, project_path, language), autocomplete_state(AutocompleteState::IDLE) { Source::ClangViewParse(file_path, project_path, language), autocomplete_state(AutocompleteState::IDLE) {
get_buffer()->signal_changed().connect([this](){ get_buffer()->signal_changed().connect([this](){
if(autocomplete_state==AutocompleteState::SHOWN) if(autocomplete_dialog && autocomplete_dialog->shown)
delayed_reparse_connection.disconnect(); delayed_reparse_connection.disconnect();
else { else {
if(!has_focus()) if(!has_focus())
@ -621,7 +621,7 @@ Source::ClangViewParse(file_path, project_path, language), autocomplete_state(Au
autocomplete_check(); autocomplete_check();
} }
else { else {
if(autocomplete_state==AutocompleteState::STARTING) if(autocomplete_state==AutocompleteState::STARTING || autocomplete_state==AutocompleteState::RESTARTING)
autocomplete_state=AutocompleteState::CANCELED; autocomplete_state=AutocompleteState::CANCELED;
else { else {
auto iter=get_buffer()->get_insert()->get_iter(); auto iter=get_buffer()->get_insert()->get_iter();
@ -633,12 +633,12 @@ Source::ClangViewParse(file_path, project_path, language), autocomplete_state(Au
}); });
get_buffer()->signal_mark_set().connect([this](const Gtk::TextBuffer::iterator& iterator, const Glib::RefPtr<Gtk::TextBuffer::Mark>& mark){ get_buffer()->signal_mark_set().connect([this](const Gtk::TextBuffer::iterator& iterator, const Glib::RefPtr<Gtk::TextBuffer::Mark>& mark){
if(mark->get_name()=="insert") { if(mark->get_name()=="insert") {
if(autocomplete_state==AutocompleteState::STARTING) if(autocomplete_state==AutocompleteState::STARTING || autocomplete_state==AutocompleteState::RESTARTING)
autocomplete_state=AutocompleteState::CANCELED; autocomplete_state=AutocompleteState::CANCELED;
} }
}); });
signal_key_release_event().connect([this](GdkEventKey* key){ signal_key_release_event().connect([this](GdkEventKey* key){
if(autocomplete_state==AutocompleteState::SHOWN) { if(autocomplete_dialog && autocomplete_dialog->shown) {
if(autocomplete_dialog->on_key_release(key)) if(autocomplete_dialog->on_key_release(key))
return true; return true;
} }
@ -647,7 +647,7 @@ Source::ClangViewParse(file_path, project_path, language), autocomplete_state(Au
}, false); }, false);
signal_focus_out_event().connect([this](GdkEventFocus* event) { signal_focus_out_event().connect([this](GdkEventFocus* event) {
if(autocomplete_state==AutocompleteState::STARTING) if(autocomplete_state==AutocompleteState::STARTING || autocomplete_state==AutocompleteState::RESTARTING)
autocomplete_state=AutocompleteState::CANCELED; autocomplete_state=AutocompleteState::CANCELED;
return false; return false;
}); });
@ -689,16 +689,14 @@ Source::ClangViewParse(file_path, project_path, language), autocomplete_state(Au
} }
} }
set_status(""); set_status("");
autocomplete_state=AutocompleteState::IDLE;
if (!autocomplete_dialog_rows.empty()) { if (!autocomplete_dialog_rows.empty()) {
autocomplete_state=AutocompleteState::SHOWN;
get_source_buffer()->begin_user_action(); get_source_buffer()->begin_user_action();
autocomplete_dialog->show(); autocomplete_dialog->show();
} }
else { else
autocomplete_state=AutocompleteState::IDLE;
soft_reparse(); soft_reparse();
} }
}
}); });
autocomplete_restart_connection=autocomplete_restart.connect([this]() { autocomplete_restart_connection=autocomplete_restart.connect([this]() {
@ -724,7 +722,7 @@ Source::ClangViewParse(file_path, project_path, language), autocomplete_state(Au
bool Source::ClangViewAutocomplete::on_key_press_event(GdkEventKey *key) { bool Source::ClangViewAutocomplete::on_key_press_event(GdkEventKey *key) {
last_keyval=key->keyval; last_keyval=key->keyval;
if(autocomplete_state==AutocompleteState::SHOWN) { if(autocomplete_dialog && autocomplete_dialog->shown) {
if(autocomplete_dialog->on_key_press(key)) if(autocomplete_dialog->on_key_press(key))
return true; return true;
} }
@ -739,7 +737,6 @@ void Source::ClangViewAutocomplete::autocomplete_dialog_setup() {
autocomplete_dialog_rows.clear(); autocomplete_dialog_rows.clear();
autocomplete_dialog->on_hide=[this](){ autocomplete_dialog->on_hide=[this](){
get_source_buffer()->end_user_action(); get_source_buffer()->end_user_action();
autocomplete_state=AutocompleteState::IDLE;
parsed=false; parsed=false;
soft_reparse(); soft_reparse();
}; };
@ -755,7 +752,6 @@ void Source::ClangViewAutocomplete::autocomplete_dialog_setup() {
} }
get_buffer()->insert(autocomplete_dialog->start_mark->get_iter(), row); get_buffer()->insert(autocomplete_dialog->start_mark->get_iter(), row);
if(hide_window) { if(hide_window) {
autocomplete_state=AutocompleteState::IDLE;
auto para_pos=row.find('('); auto para_pos=row.find('(');
auto angle_pos=row.find('<'); auto angle_pos=row.find('<');
size_t start_pos=std::string::npos; size_t start_pos=std::string::npos;
@ -789,12 +785,10 @@ void Source::ClangViewAutocomplete::autocomplete_dialog_setup() {
else { else {
//new autocomplete after for instance when selecting "std::" //new autocomplete after for instance when selecting "std::"
auto iter=get_buffer()->get_insert()->get_iter(); auto iter=get_buffer()->get_insert()->get_iter();
if(iter.backward_char() && *iter==':') { if(iter.backward_char() && *iter==':')
autocomplete_state=AutocompleteState::IDLE;
autocomplete_restart(); autocomplete_restart();
} }
} }
}
}; };
} }

2
src/source_clang.h
Unescape View File

@ -72,7 +72,7 @@ namespace Source {
class ClangViewAutocomplete : public ClangViewParse { class ClangViewAutocomplete : public ClangViewParse {
protected: protected:
enum class AutocompleteState {IDLE, STARTING, RESTARTING, CANCELED, SHOWN}; enum class AutocompleteState {IDLE, STARTING, RESTARTING, CANCELED};
public: public:
class AutoCompleteData { class AutoCompleteData {
public: public:

Write Preview
Loading…
Cancel
Save