Browse Source

Now using same colors for #include ... as in cpp-gtksourceview-style.

merge-requests/365/head
eidheim 10 years ago
parent
commit
24c2ca4db8
  1. 1
      src/files.h
  2. 17
      src/source.cc

1
src/files.h

@ -29,7 +29,6 @@ const std::string configjson =
" \"45\": \"def:type\",\n" " \"45\": \"def:type\",\n"
" \"46\": \"def:identifier\",\n" " \"46\": \"def:identifier\",\n"
" \"109\": \"def:string\",\n" " \"109\": \"def:string\",\n"
" \"500\": \"def:preprocessor\",\n"
" \"702\": \"def:statement\",\n" " \"702\": \"def:statement\",\n"
" \"705\": \"def:comment\"\n" " \"705\": \"def:comment\"\n"
" },\n" " },\n"

17
src/source.cc

@ -963,22 +963,11 @@ void Source::ClangViewParse::update_syntax() {
auto kind=(int)token.get_cursor().get_kind(); auto kind=(int)token.get_cursor().get_kind();
if(kind==101 || kind==102) if(kind==101 || kind==102)
kind=(int)token.get_cursor().get_referenced().get_kind(); kind=(int)token.get_cursor().get_referenced().get_kind();
else if(kind==500) { if(kind!=500)
auto iter=get_buffer()->get_iter_at_line_index(token.offsets.first.line-1, token.offsets.first.index-1); ranges.emplace_back(token.offsets, kind);
if(iter.backward_char() && *iter=='<')
token.offsets.first.index--;
iter=get_buffer()->get_iter_at_line_index(token.offsets.second.line-1, token.offsets.second.index-1);
if(*iter=='>' || *iter=='.' || *iter=='/')
token.offsets.second.index++;
}
ranges.emplace_back(token.offsets, kind);
} }
else if(token.get_kind()==3) { // LiteralToken else if(token.get_kind()==3) { // LiteralToken
int kind=109; ranges.emplace_back(token.offsets, 109);
if(*get_buffer()->get_iter_at_line(token.offsets.first.line-1)=='#') {
kind=500;
}
ranges.emplace_back(token.offsets, kind);
} }
else if(token.get_kind()==4) // CommentToken else if(token.get_kind()==4) // CommentToken
ranges.emplace_back(token.offsets, 705); ranges.emplace_back(token.offsets, 705);

Loading…
Cancel
Save