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

Merge pull request #20 from eidheim/master 

Smaller fixes
merge-requests/365/head
Jørgen Lien Sellæg 11 years ago
parent
b86bc464f1 b9b7d2181f
commit
c697b6f88c
3 changed files with 48 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      juci/selectiondialog.cc
  2. 49
      juci/source.cc
  3. 6
      juci/source.h

2
juci/selectiondialog.cc
Unescape View File

@ -61,8 +61,8 @@ void SelectionDialog::show() {
}
void SelectionDialog::hide() {
window->hide();
shown=false;
window->hide();
if(tooltips)
tooltips->hide();
}

49
juci/source.cc
Unescape View File

@ -561,7 +561,7 @@ bool Source::ClangView::on_key_press_event(GdkEventKey* key) {
if(line.size()>=config->tab_size) {
for(auto c: line) {
if(c!=config->tab_char)
return false;
return Source::View::on_key_press_event(key);
}
Gtk::TextIter insert_it = get_source_buffer()->get_insert()->get_iter();
Gtk::TextIter line_it = get_source_buffer()->get_iter_at_line(insert_it.get_line());
@ -571,7 +571,7 @@ bool Source::ClangView::on_key_press_event(GdkEventKey* key) {
get_source_buffer()->erase(line_it, line_plus_it);
}
return false;
return Source::View::on_key_press_event(key);
}
return Source::View::on_key_press_event(key);
@ -580,19 +580,20 @@ bool Source::ClangView::on_key_press_event(GdkEventKey* key) {
//////////////////////////////
//// ClangViewAutocomplete ///
//////////////////////////////
Source::ClangViewAutocomplete::ClangViewAutocomplete(const std::string& file_path, const std::string& project_path, Terminal::Controller& terminal):
Source::ClangView(file_path, project_path, terminal), selection_dialog(*this) {
Source::ClangView(file_path, project_path, terminal), selection_dialog(*this), autocomplete_cancel_starting(false) {
get_buffer()->signal_changed().connect([this](){
if(last_keyval==GDK_KEY_BackSpace)
return;
std::string line=" "+get_line_before_insert();
if((std::count(line.begin(), line.end(), '\"')%2)!=1 && line.find("//")==std::string::npos) {
const std::regex in_specified_namespace("^(.*[a-zA-Z0-9_])(->|\\.|::)([a-zA-Z0-9_]*)$");
const std::regex in_specified_namespace("^(.*[a-zA-Z0-9_\\)])(->|\\.|::)([a-zA-Z0-9_]*)$");
const std::regex within_namespace("^(.*)([^a-zA-Z0-9_]+)([a-zA-Z0-9_]{3,})$");
std::smatch sm;
if(std::regex_match(line, sm, in_specified_namespace)) {
prefix_mutex.lock();
prefix=sm[3].str();
prefix_mutex.unlock();
if((prefix.size()==0 || prefix[0]<'0' || prefix[0]>'9') && !autocomplete_starting && !selection_dialog.shown) {
autocomplete();
}
@ -600,7 +601,9 @@ Source::ClangView(file_path, project_path, terminal), selection_dialog(*this) {
autocomplete_cancel_starting=true;
}
else if(std::regex_match(line, sm, within_namespace)) {
prefix_mutex.lock();
prefix=sm[3].str();
prefix_mutex.unlock();
if((prefix.size()==0 || prefix[0]<'0' || prefix[0]>'9') && !autocomplete_starting && !selection_dialog.shown) {
autocomplete();
}
@ -621,7 +624,7 @@ Source::ClangView(file_path, project_path, terminal), selection_dialog(*this) {
});
signal_scroll_event().connect([this](GdkEventScroll* event){
if(selection_dialog.shown)
selection_dialog.move();
selection_dialog.hide();
return false;
}, false);
signal_key_release_event().connect([this](GdkEventKey* key){
@ -643,6 +646,15 @@ bool Source::ClangViewAutocomplete::on_key_press_event(GdkEventKey *key) {
}
return ClangView::on_key_press_event(key);
}
bool Source::ClangViewAutocomplete::on_focus_out_event(GdkEventFocus* event) {
if(selection_dialog.shown) {
selection_dialog.hide();
}
return Source::ClangView::on_focus_out_event(event);
}
void Source::ClangViewAutocomplete::autocomplete() {
if(!autocomplete_starting) {
autocomplete_starting=true;
@ -672,13 +684,12 @@ void Source::ClangViewAutocomplete::autocomplete() {
default: ss << chunk.chunk; break;
}
}
if (ss.str().length() > 0) { // if length is 0 the result is empty
if(prefix.size()==0 || ss.str().find(prefix)==0) {
auto pair=std::pair<std::string, std::string>(ss.str(), data.brief_comments);
auto ss_str=ss.str();
if (ss_str.length() > 0) { // if length is 0 the result is empty
auto pair=std::pair<std::string, std::string>(ss_str, data.brief_comments);
rows[ss.str() + " --> " + return_value] = pair;
}
}
}
if (rows.empty()) {
rows["No suggestions found..."] = std::pair<std::string, std::string>();
}
@ -719,13 +730,29 @@ get_autocomplete_suggestions(int line_number, int column, std::map<std::string,
buffer_map,
line_number,
column);
if(!autocomplete_cancel_starting) {
prefix_mutex.lock();
auto prefix_copy=prefix;
prefix_mutex.unlock();
for (int i = 0; i < results.size(); i++) {
auto result=results.get(i);
if(result.available()) {
suggestions.emplace_back(result.get_chunks());
auto chunks=result.get_chunks();
bool match=false;
for(auto &chunk: chunks) {
if(chunk.kind!=clang::CompletionChunk_ResultType && chunk.kind!=clang::CompletionChunk_Informative) {
if(chunk.chunk.size()>=prefix_copy.size() && chunk.chunk.compare(0, prefix_copy.size(), prefix_copy)==0)
match=true;
break;
}
}
if(match) {
suggestions.emplace_back(std::move(chunks));
suggestions.back().brief_comments=result.get_brief_comments();
}
}
}
}
DEBUG("Number of suggestions");
DEBUG_VAR(suggestions.size());
return suggestions;

6
juci/source.h
Unescape View File

@ -83,6 +83,7 @@ namespace Source {
std::mutex parsing_mutex;
sigc::connection delayed_reparse_connection;
bool on_key_press_event(GdkEventKey* key);
bool on_focus_out_event(GdkEventFocus* event);
private:
// inits the syntax highligthing on file open
void init_syntax_highlighting(const std::map<std::string, std::string>
@ -99,7 +100,6 @@ namespace Source {
bool on_motion_notify_event(GdkEventMotion* event);
void on_mark_set(const Gtk::TextBuffer::iterator& iterator, const Glib::RefPtr<Gtk::TextBuffer::Mark>& mark);
sigc::connection delayed_tooltips_connection;
bool on_focus_out_event(GdkEventFocus* event);
bool on_scroll_event(GdkEventScroll* event);
static clang::Index clang_index;
std::unique_ptr<clang::Tokens> clang_tokens;
@ -128,6 +128,7 @@ namespace Source {
ClangViewAutocomplete(const std::string& file_path, const std::string& project_path, Terminal::Controller& terminal);
protected:
bool on_key_press_event(GdkEventKey* key);
bool on_focus_out_event(GdkEventFocus* event);
private:
void autocomplete();
SelectionDialog selection_dialog;
@ -135,9 +136,10 @@ namespace Source {
Glib::Dispatcher autocomplete_done;
sigc::connection autocomplete_done_connection;
bool autocomplete_starting=false;
bool autocomplete_cancel_starting=false;
std::atomic<bool> autocomplete_cancel_starting;
guint last_keyval=0;
std::string prefix;
std::mutex prefix_mutex;
};
class Controller {

Write Preview
Loading…
Cancel
Save