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

Offset cleanup

merge-requests/365/head
eidheim 10 years ago
parent
0298881c4c
commit
29fc893a10
4 changed files with 34 additions and 35 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. 8
      src/project.cc
  2. 14
      src/source.cc
  3. 21
      src/source_clang.cc
  4. 26
      src/window.cc

8
src/project.cc
Unescape View File

@ -96,8 +96,8 @@ void Project::debug_update_stop() {
for(size_t c=0;c<Notebook::get().size();c++) { for(size_t c=0;c<Notebook::get().size();c++) {
auto view=Notebook::get().get_view(c); auto view=Notebook::get().get_view(c);
if(view->file_path==debug_stop.first) { if(view->file_path==debug_stop.first) {
if(debug_stop.second.first-1<view->get_buffer()->get_line_count()) { if(debug_stop.second.first<view->get_buffer()->get_line_count()) {
view->get_source_buffer()->create_source_mark("debug_stop", view->get_buffer()->get_iter_at_line(debug_stop.second.first-1)); view->get_source_buffer()->create_source_mark("debug_stop", view->get_buffer()->get_iter_at_line(debug_stop.second.first));
debug_last_stop_file_path=debug_stop.first; debug_last_stop_file_path=debug_stop.first;
} }
break; break;
@ -323,8 +323,8 @@ void Project::Clang::debug_start() {
}, [this](const boost::filesystem::path &file_path, int line_nr, int line_index) { }, [this](const boost::filesystem::path &file_path, int line_nr, int line_index) {
dispatcher.post([this, file_path, line_nr, line_index] { dispatcher.post([this, file_path, line_nr, line_index] {
Project::debug_stop.first=file_path; Project::debug_stop.first=file_path;
Project::debug_stop.second.first=line_nr; Project::debug_stop.second.first=line_nr-1;
Project::debug_stop.second.second=line_index; Project::debug_stop.second.second=line_index-1;
debug_update_stop(); debug_update_stop();
if(auto view=Notebook::get().get_current_view()) if(auto view=Notebook::get().get_current_view())

14
src/source.cc
Unescape View File

@ -56,26 +56,26 @@ Source::FixIt::FixIt(const std::string &source, const std::pair<Offset, Offset>
} }
std::string Source::FixIt::string(Glib::RefPtr<Gtk::TextBuffer> buffer) { std::string Source::FixIt::string(Glib::RefPtr<Gtk::TextBuffer> buffer) {
auto iter=buffer->get_iter_at_line_index(offsets.first.line-1, offsets.first.index-1); auto iter=buffer->get_iter_at_line_index(offsets.first.line, offsets.first.index);
unsigned first_line_offset=iter.get_line_offset()+1; unsigned first_line_offset=iter.get_line_offset()+1;
iter=buffer->get_iter_at_line_index(offsets.second.line-1, offsets.second.index-1); iter=buffer->get_iter_at_line_index(offsets.second.line, offsets.second.index);
unsigned second_line_offset=iter.get_line_offset()+1; unsigned second_line_offset=iter.get_line_offset()+1;
std::string text; std::string text;
if(type==Type::INSERT) { if(type==Type::INSERT) {
text+="Insert "+source+" at "; text+="Insert "+source+" at ";
text+=std::to_string(offsets.first.line)+":"+std::to_string(first_line_offset); text+=std::to_string(offsets.first.line+1)+":"+std::to_string(first_line_offset);
} }
else if(type==Type::REPLACE) { else if(type==Type::REPLACE) {
text+="Replace "; text+="Replace ";
text+=std::to_string(offsets.first.line)+":"+std::to_string(first_line_offset)+" - "; text+=std::to_string(offsets.first.line+1)+":"+std::to_string(first_line_offset)+" - ";
text+=std::to_string(offsets.second.line)+":"+std::to_string(second_line_offset); text+=std::to_string(offsets.second.line+1)+":"+std::to_string(second_line_offset);
text+=" with "+source; text+=" with "+source;
} }
else { else {
text+="Erase "; text+="Erase ";
text+=std::to_string(offsets.first.line)+":"+std::to_string(first_line_offset)+" - "; text+=std::to_string(offsets.first.line+1)+":"+std::to_string(first_line_offset)+" - ";
text+=std::to_string(offsets.second.line)+":"+std::to_string(second_line_offset); text+=std::to_string(offsets.second.line+1)+":"+std::to_string(second_line_offset);
} }
return text; return text;

21
src/source_clang.cc
Unescape View File

@ -313,13 +313,12 @@ void Source::ClangViewParse::update_diagnostics() {
std::string fix_its_string; std::string fix_its_string;
unsigned fix_its_count=0; unsigned fix_its_count=0;
for(auto &fix_it: diagnostic.fix_its) { for(auto &fix_it: diagnostic.fix_its) {
//Convert line index to line offset for correct output:
auto clang_offsets=fix_it.offsets; auto clang_offsets=fix_it.offsets;
std::pair<Offset, Offset> offsets; std::pair<Offset, Offset> offsets;
offsets.first.line=clang_offsets.first.line; offsets.first.line=clang_offsets.first.line-1;
offsets.first.index=clang_offsets.first.index; offsets.first.index=clang_offsets.first.index-1;
offsets.second.line=clang_offsets.second.line; offsets.second.line=clang_offsets.second.line-1;
offsets.second.index=clang_offsets.second.index; offsets.second.index=clang_offsets.second.index-1;
fix_its.emplace_back(fix_it.source, offsets); fix_its.emplace_back(fix_it.source, offsets);
@ -999,7 +998,7 @@ Source::ClangViewAutocomplete(file_path, language) {
if(referenced && identifier.kind==referenced.get_kind() && if(referenced && identifier.kind==referenced.get_kind() &&
identifier.spelling==token.get_spelling() && identifier.usr==referenced.get_usr()) { identifier.spelling==token.get_spelling() && identifier.usr==referenced.get_usr()) {
auto offset=referenced.get_source_location().get_offset(); auto offset=referenced.get_source_location().get_offset();
return Offset(offset.line, offset.index, referenced.get_source_location().get_path()); return Offset(offset.line-1, offset.index-1, referenced.get_source_location().get_path());
} }
} }
} }
@ -1008,7 +1007,7 @@ Source::ClangViewAutocomplete(file_path, language) {
} }
auto offset=referenced.get_source_location().get_offset(); auto offset=referenced.get_source_location().get_offset();
return Offset(offset.line, offset.index, file_path); return Offset(offset.line-1, offset.index-1, file_path);
} }
} }
} }
@ -1039,8 +1038,8 @@ Source::ClangViewAutocomplete(file_path, language) {
identifier.spelling==token_it->get_spelling() && identifier.usr==referenced.get_usr()) { identifier.spelling==token_it->get_spelling() && identifier.usr==referenced.get_usr()) {
location.file_path=cursor.get_source_location().get_path(); location.file_path=cursor.get_source_location().get_path();
auto clang_offset=cursor.get_source_location().get_offset(); auto clang_offset=cursor.get_source_location().get_offset();
location.line=clang_offset.line; location.line=clang_offset.line-1;
location.index=clang_offset.index; location.index=clang_offset.index-1;
return location; return location;
} }
} }
@ -1101,7 +1100,7 @@ Source::ClangViewAutocomplete(file_path, language) {
} }
line.insert(token_end_pos, "</b>"); line.insert(token_end_pos, "</b>");
line.insert(token_start_pos, "<b>"); line.insert(token_start_pos, "<b>");
usages.emplace_back(Offset(offset.first.line, offset.first.index, clang_view->file_path), line); usages.emplace_back(Offset(offset.first.line-1, offset.first.index-1, clang_view->file_path), line);
} }
} }
} }
@ -1147,7 +1146,7 @@ Source::ClangViewAutocomplete(file_path, language) {
(row[pos]>='0' && row[pos]<='9') || row[pos]=='_' || row[pos]=='~') && pos>0); (row[pos]>='0' && row[pos]<='9') || row[pos]=='_' || row[pos]=='~') && pos>0);
row.insert(token_end_pos, "</b>"); row.insert(token_end_pos, "</b>");
row.insert(pos+1, "<b>"); row.insert(pos+1, "<b>");
methods.emplace_back(Offset(method.second.line, method.second.index), row); methods.emplace_back(Offset(method.second.line-1, method.second.index-1), row);
} }
return methods; return methods;
}; };

26
src/window.cc
Unescape View File

@ -459,8 +459,8 @@ void Window::set_menu_actions() {
return; return;
Notebook::get().open(declaration_file); Notebook::get().open(declaration_file);
auto view=Notebook::get().get_current_view(); auto view=Notebook::get().get_current_view();
auto line=static_cast<int>(location.line)-1; auto line=static_cast<int>(location.line);
auto index=static_cast<int>(location.index)-1; auto index=static_cast<int>(location.index);
view->place_cursor_at_line_index(line, index); view->place_cursor_at_line_index(line, index);
view->scroll_to_cursor_delayed(view, true, false); view->scroll_to_cursor_delayed(view, true, false);
} }
@ -479,8 +479,8 @@ void Window::set_menu_actions() {
return; return;
Notebook::get().open(implementation_path); Notebook::get().open(implementation_path);
auto view=Notebook::get().get_current_view(); auto view=Notebook::get().get_current_view();
auto line=static_cast<int>(location.line)-1; auto line=static_cast<int>(location.line);
auto index=static_cast<int>(location.index)-1; auto index=static_cast<int>(location.index);
view->place_cursor_at_line_index(line, index); view->place_cursor_at_line_index(line, index);
view->scroll_to_cursor_delayed(view, true, false); view->scroll_to_cursor_delayed(view, true, false);
return; return;
@ -507,13 +507,13 @@ void Window::set_menu_actions() {
row=usage.first.file_path.filename().string()+":"; row=usage.first.file_path.filename().string()+":";
current_page=false; current_page=false;
} }
row+=std::to_string(usage.first.line)+": "+usage.second; row+=std::to_string(usage.first.line+1)+": "+usage.second;
(*rows)[row]=usage.first; (*rows)[row]=usage.first;
view->selection_dialog->add_row(row); view->selection_dialog->add_row(row);
//Set dialog cursor to the last row if the textview cursor is at the same line //Set dialog cursor to the last row if the textview cursor is at the same line
if(current_page && if(current_page &&
iter.get_line()==static_cast<int>(usage.first.line-1) && iter.get_line_index()>=static_cast<int>(usage.first.index-1)) { iter.get_line()==static_cast<int>(usage.first.line) && iter.get_line_index()>=static_cast<int>(usage.first.index)) {
view->selection_dialog->set_cursor_at_last_row(); view->selection_dialog->set_cursor_at_last_row();
} }
} }
@ -529,7 +529,7 @@ void Window::set_menu_actions() {
return; return;
Notebook::get().open(declaration_file); Notebook::get().open(declaration_file);
auto view=Notebook::get().get_current_view(); auto view=Notebook::get().get_current_view();
view->place_cursor_at_line_index(offset.line-1, offset.index-1); view->place_cursor_at_line_index(offset.line, offset.index);
view->scroll_to(view->get_buffer()->get_insert(), 0.0, 1.0, 0.5); view->scroll_to(view->get_buffer()->get_insert(), 0.0, 1.0, 0.5);
view->hide_tooltips(); view->hide_tooltips();
}; };
@ -551,12 +551,12 @@ void Window::set_menu_actions() {
for(auto &method: methods) { for(auto &method: methods) {
(*rows)[method.second]=method.first; (*rows)[method.second]=method.first;
view->selection_dialog->add_row(method.second); view->selection_dialog->add_row(method.second);
if(iter.get_line()>=static_cast<int>(method.first.line-1)) if(iter.get_line()>=static_cast<int>(method.first.line))
view->selection_dialog->set_cursor_at_last_row(); view->selection_dialog->set_cursor_at_last_row();
} }
view->selection_dialog->on_select=[view, rows](const std::string& selected, bool hide_window) { view->selection_dialog->on_select=[view, rows](const std::string& selected, bool hide_window) {
auto offset=rows->at(selected); auto offset=rows->at(selected);
view->get_buffer()->place_cursor(view->get_buffer()->get_iter_at_line_index(offset.line-1, offset.index-1)); view->get_buffer()->place_cursor(view->get_buffer()->get_iter_at_line_index(offset.line, offset.index));
view->scroll_to(view->get_buffer()->get_insert(), 0.0, 1.0, 0.5); view->scroll_to(view->get_buffer()->get_insert(), 0.0, 1.0, 0.5);
view->hide_tooltips(); view->hide_tooltips();
}; };
@ -584,8 +584,8 @@ void Window::set_menu_actions() {
auto fix_its=view->get_fix_its(); auto fix_its=view->get_fix_its();
std::vector<std::pair<Glib::RefPtr<Gtk::TextMark>, Glib::RefPtr<Gtk::TextMark> > > fix_it_marks; std::vector<std::pair<Glib::RefPtr<Gtk::TextMark>, Glib::RefPtr<Gtk::TextMark> > > fix_it_marks;
for(auto &fix_it: fix_its) { for(auto &fix_it: fix_its) {
auto start_iter=buffer->get_iter_at_line_index(fix_it.offsets.first.line-1, fix_it.offsets.first.index-1); auto start_iter=buffer->get_iter_at_line_index(fix_it.offsets.first.line, fix_it.offsets.first.index);
auto end_iter=buffer->get_iter_at_line_index(fix_it.offsets.second.line-1, fix_it.offsets.second.index-1); auto end_iter=buffer->get_iter_at_line_index(fix_it.offsets.second.line, fix_it.offsets.second.index);
fix_it_marks.emplace_back(buffer->create_mark(start_iter), buffer->create_mark(end_iter)); fix_it_marks.emplace_back(buffer->create_mark(start_iter), buffer->create_mark(end_iter));
} }
size_t c=0; size_t c=0;
@ -809,8 +809,8 @@ void Window::set_menu_actions() {
if(!Project::debug_stop.first.empty()) { if(!Project::debug_stop.first.empty()) {
Notebook::get().open(Project::debug_stop.first); Notebook::get().open(Project::debug_stop.first);
if(auto view=Notebook::get().get_current_view()) { if(auto view=Notebook::get().get_current_view()) {
int line=Project::debug_stop.second.first-1; int line=Project::debug_stop.second.first;
int index=Project::debug_stop.second.second-1; int index=Project::debug_stop.second.second;
view->place_cursor_at_line_index(line, index); view->place_cursor_at_line_index(line, index);
view->scroll_to_cursor_delayed(view, true, true); view->scroll_to_cursor_delayed(view, true, true);
} }

Write Preview
Loading…
Cancel
Save