Browse Source

add vector as parameter

merge-requests/365/head
Jørgen Lien Sellæg 11 years ago
parent
commit
63d69c6ca3
  1. 7
      juci/notebook.cc
  2. 24
      juci/source.cc
  3. 12
      juci/source.h

7
juci/notebook.cc

@ -393,9 +393,10 @@ void Notebook::Controller::OnBufferChange() {
std::cout << start.get_line_offset() << std::endl;
if (word == ".") {
// TODO(Forgie) Zalox,Forgie) Remove TEST
std::vector<std::string> TEST
= text_vec_[page]->GetAutoCompleteSuggestions(start.get_line()+1,
start.get_line_offset()+2);
std::vector<std::string> TEST;
text_vec_[page]->GetAutoCompleteSuggestions(start.get_line()+1,
start.get_line_offset()+2,
&TEST);
GeneratePopup(TEST);
}
}

24
juci/source.cc

@ -132,22 +132,24 @@ ReParse(const std::string &buffer) {
// fired when a line in the buffer is edited
void Source::Controller::OnLineEdit() { }
std::vector<std::string> Source::Controller::
void Source::Controller::
GetAutoCompleteSuggestions(int line_number,
int column) {
return model().GetAutoCompleteSuggestions(view().get_buffer()
int column,
std::vector<std::string> *suggestions) {
parsing.lock();
model().GetAutoCompleteSuggestions(view().get_buffer()
->get_text().raw(),
line_number,
column);
column,
suggestions);
parsing.unlock();
}
std::vector<std::string> Source::Model::
void Source::Model::
GetAutoCompleteSuggestions(const std::string& buffer,
int line_number,
int column) {
std::vector<std::string> res;
parsing.lock();
int column,
std::vector<std::string> *suggestions) {
clang::CodeCompleteResults results(&tu_,
file_path(),
buffer,
@ -159,10 +161,8 @@ GetAutoCompleteSuggestions(const std::string& buffer,
for (auto &stringchunk : c) {
ss << stringchunk.chunk();
}
res.emplace_back(ss.str());
suggestions->emplace_back(ss.str());
}
parsing.unlock();
return res;
}
// sets the filepath for this mvc

12
juci/source.h

@ -95,10 +95,10 @@ namespace Source {
const string& project_path() const;
// gets the config member
const Config& config() const;
std::vector<std::string>
GetAutoCompleteSuggestions(const std::string& buffer,
void GetAutoCompleteSuggestions(const std::string& buffer,
int line_number,
int column);
int column,
std::vector<std::string> *suggestions);
~Model() { }
int ReParse(const std::string &buffer);
std::vector<Range> ExtractTokens(int, int);
@ -125,9 +125,9 @@ namespace Source {
Model& model();
void OnNewEmptyFile();
void OnOpenFile(const string &filename);
std::vector<std::string>
GetAutoCompleteSuggestions(int line_number,
int column);
void GetAutoCompleteSuggestions(int line_number,
int column,
std::vector<std::string> *suggestions);
Glib::RefPtr<Gtk::TextBuffer> buffer();
private:

Loading…
Cancel
Save