Browse Source

Now reparses after for instance #include <...>.

merge-requests/365/head
eidheim 10 years ago
parent
commit
b12a049513
  1. 6
      src/juci.cc
  2. 2
      src/logging.h
  3. 4
      src/menu.cc
  4. 8
      src/source.cc

6
src/juci.cc

@ -6,9 +6,9 @@
using namespace std; //TODO: remove
void init_logging() {
add_common_attributes();
add_file_log(keywords::file_name = Singleton::log_dir() + "juci.log",
keywords::auto_flush = true);
boost::log::add_common_attributes();
boost::log::add_file_log(boost::log::keywords::file_name = Singleton::log_dir() + "juci.log",
boost::log::keywords::auto_flush = true);
INFO("Logging initalized");
}

2
src/logging.h

@ -10,8 +10,6 @@
#include <boost/log/sources/severity_logger.hpp>
#include <boost/log/sources/record_ostream.hpp>
using namespace boost::log;
#define TRACE_VAR(x) BOOST_LOG_TRIVIAL(trace) << "** Trace: " << __FILE__ << "@" << __func__ << "(" << __LINE__ << "): " << #x << "=<" << x << ">";
#define DEBUG_VAR(x) BOOST_LOG_TRIVIAL(debug) << "** Debug: " << __FILE__ << "@" << __func__ << "(" << __LINE__ << "): " << #x << "=<" << x << ">";
#define INFO_VAR(x) BOOST_LOG_TRIVIAL(info) << "** Info: " << __FILE__ << "@" << __func__ << "(" << __LINE__ << "): " << #x << "=<" << x << ">";

4
src/menu.cc

@ -1,8 +1,7 @@
#include "menu.h"
#include "logging.h"
#include <iostream>
Menu::Menu() : box(Gtk::ORIENTATION_VERTICAL) {
INFO("Creating menu");
action_group = Gtk::ActionGroup::create();
ui_manager = Gtk::UIManager::create();
@ -15,7 +14,6 @@ Menu::Menu() : box(Gtk::ORIENTATION_VERTICAL) {
action_group->add(Gtk::Action::create("SourceMenu", "_Source"));
action_group->add(Gtk::Action::create("PluginMenu", "_Plugins"));
action_group->add(Gtk::Action::create("HelpMenu", "Help"));
INFO("Menu created");
}
Gtk::Widget& Menu::get_widget() {

8
src/source.cc

@ -1229,7 +1229,12 @@ Source::ClangViewParse(file_path, project_path), autocomplete_cancel_starting(fa
}
bool Source::ClangViewAutocomplete::on_key_press_event(GdkEventKey *key) {
if(key->keyval>=32 && key->keyval<=126) {
if(key->keyval=='>' && last_keyval=='-')
last_keyval=127;
else
last_keyval=key->keyval;
}
if(completion_dialog_shown) {
if(completion_dialog->on_key_press(key))
return true;
@ -1240,9 +1245,10 @@ bool Source::ClangViewAutocomplete::on_key_press_event(GdkEventKey *key) {
void Source::ClangViewAutocomplete::start_autocomplete() {
if(!has_focus())
return;
cout << (int)last_keyval << endl;
if(!((last_keyval>='0' && last_keyval<='9') ||
(last_keyval>='a' && last_keyval<='z') || (last_keyval>='A' && last_keyval<='Z') ||
last_keyval=='_' || last_keyval=='>' || last_keyval=='.' || last_keyval==':')) {
last_keyval=='_' || last_keyval==127 || last_keyval=='.' || last_keyval==':')) {
autocomplete_cancel_starting=true;
return;
}

Loading…
Cancel
Save