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

Minor cleanup.

merge-requests/365/head
eidheim 10 years ago
parent
aeb8751ee8
commit
7549a497ad
2 changed files with 3 additions and 3 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. 4
      src/source.cc
  2. 2
      src/window.cc

4
src/source.cc
Unescape View File

@ -1825,7 +1825,7 @@ Source::ClangViewAutocomplete(file_path, project_path, language) {
tag_similar_tokens=[this](const std::pair<std::string, int> &token){ tag_similar_tokens=[this](const std::pair<std::string, int> &token){
if(source_readable) { if(source_readable) {
if(token.second!=0 && token.first.size()>0 && last_similar_tokens_tagged!=token.first) { if(token.second>=0 && token.first.size()>0 && last_similar_tokens_tagged!=token.first) {
get_buffer()->remove_tag(similar_tokens_tag, get_buffer()->begin(), get_buffer()->end()); get_buffer()->remove_tag(similar_tokens_tag, get_buffer()->begin(), get_buffer()->end());
auto offsets=clang_tokens->get_similar_token_offsets(token.first, static_cast<clang::CursorKind>(token.second)); auto offsets=clang_tokens->get_similar_token_offsets(token.first, static_cast<clang::CursorKind>(token.second));
for(auto &offset: offsets) { for(auto &offset: offsets) {
@ -1834,7 +1834,7 @@ Source::ClangViewAutocomplete(file_path, project_path, language) {
last_similar_tokens_tagged=token.first; last_similar_tokens_tagged=token.first;
} }
} }
if(token.second!=0 && token.first.size()==0 && last_similar_tokens_tagged!="") { if(token.second>=0 && token.first.size()==0 && last_similar_tokens_tagged!="") {
get_buffer()->remove_tag(similar_tokens_tag, get_buffer()->begin(), get_buffer()->end()); get_buffer()->remove_tag(similar_tokens_tag, get_buffer()->begin(), get_buffer()->end());
last_similar_tokens_tagged=""; last_similar_tokens_tagged="";
} }

2
src/window.cc
Unescape View File

@ -676,7 +676,7 @@ void Window::rename_token_entry() {
if(notebook.get_current_page()!=-1) { if(notebook.get_current_page()!=-1) {
if(notebook.get_current_view()->get_token && notebook.get_current_view()->get_token_name) { if(notebook.get_current_view()->get_token && notebook.get_current_view()->get_token_name) {
auto token=std::make_shared<std::pair<std::string, int> >(notebook.get_current_view()->get_token()); auto token=std::make_shared<std::pair<std::string, int> >(notebook.get_current_view()->get_token());
if(token->second!=0 && token->first.size()>0 && notebook.get_current_view()->get_token_name) { if(token->second>=0 && token->first.size()>0 && notebook.get_current_view()->get_token_name) {
auto token_name=std::make_shared<std::string>(notebook.get_current_view()->get_token_name()); auto token_name=std::make_shared<std::string>(notebook.get_current_view()->get_token_name());
for(int c=0;c<notebook.size();c++) { for(int c=0;c<notebook.size();c++) {
if(notebook.get_view(c)->tag_similar_tokens) { if(notebook.get_view(c)->tag_similar_tokens) {

Write Preview
Loading…
Cancel
Save