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

Added workaround for libclang crash when looking for definitions of completion items

pipelines/235045657
eidheim 5 years ago
parent
0102ba90c9
commit
e21dd3681d
1 changed files with 27 additions and 29 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. 56
      src/source_clang.cpp

56
src/source_clang.cpp
Unescape View File

@ -1335,39 +1335,37 @@ Source::ClangViewRefactor::ClangViewRefactor(const boost::filesystem::path &file
auto implementation_locations = [this](const Identifier &identifier) { auto implementation_locations = [this](const Identifier &identifier) {
std::vector<Offset> offsets; std::vector<Offset> offsets;
if(identifier) { if(identifier) {
wait_parsing(); if(parsed) {
wait_parsing(); // Wait for other views to finish parsing
//First, look for a definition cursor that is equal
auto identifier_usr = identifier.cursor.get_usr(); // First, look for a definition cursor that is equal
for(auto &view : views) { auto identifier_usr = identifier.cursor.get_usr();
if(auto clang_view = dynamic_cast<Source::ClangView *>(view)) { for(auto &view : views) {
for(auto &token : *clang_view->clang_tokens) { if(auto clang_view = dynamic_cast<Source::ClangView *>(view)) {
auto cursor = token.get_cursor(); for(auto &token : *clang_view->clang_tokens) {
auto cursor_kind = cursor.get_kind(); auto cursor = token.get_cursor();
if((cursor_kind == clangmm::Cursor::Kind::FunctionDecl || cursor_kind == clangmm::Cursor::Kind::CXXMethod || auto cursor_kind = cursor.get_kind();
cursor_kind == clangmm::Cursor::Kind::Constructor || cursor_kind == clangmm::Cursor::Kind::Destructor || if((cursor_kind == clangmm::Cursor::Kind::FunctionDecl || cursor_kind == clangmm::Cursor::Kind::CXXMethod ||
cursor_kind == clangmm::Cursor::Kind::FunctionTemplate || cursor_kind == clangmm::Cursor::Kind::ConversionFunction) && cursor_kind == clangmm::Cursor::Kind::Constructor || cursor_kind == clangmm::Cursor::Kind::Destructor ||
token.is_identifier()) { cursor_kind == clangmm::Cursor::Kind::FunctionTemplate || cursor_kind == clangmm::Cursor::Kind::ConversionFunction) &&
auto token_spelling = token.get_spelling(); identifier.kind == cursor_kind && token.is_identifier() && clang_isCursorDefinition(cursor.cx_cursor) &&
if(identifier.kind == cursor.get_kind() && identifier.spelling == token_spelling && identifier_usr == cursor.get_usr()) { identifier.spelling == token.get_spelling() && identifier_usr == cursor.get_usr()) {
if(clang_isCursorDefinition(cursor.cx_cursor)) { Offset offset;
Offset offset; auto location = cursor.get_source_location();
auto location = cursor.get_source_location(); auto clang_offset = location.get_offset();
auto clang_offset = location.get_offset(); offset.file_path = location.get_path();
offset.file_path = location.get_path(); offset.line = clang_offset.line - 1;
offset.line = clang_offset.line - 1; offset.index = clang_offset.index - 1;
offset.index = clang_offset.index - 1; offsets.emplace_back(offset);
offsets.emplace_back(offset);
}
} }
} }
} }
} }
if(!offsets.empty())
return offsets;
} }
if(!offsets.empty())
return offsets;
//If no implementation was found, try using clang_getCursorDefinition // If no implementation was found, try using clang_getCursorDefinition
auto definition = identifier.cursor.get_definition(); auto definition = identifier.cursor.get_definition();
if(definition) { if(definition) {
auto location = definition.get_source_location(); auto location = definition.get_source_location();
@ -1380,7 +1378,7 @@ Source::ClangViewRefactor::ClangViewRefactor(const boost::filesystem::path &file
return offsets; return offsets;
} }
//If no implementation was found, use declaration if it is a function template // If no implementation was found, use declaration if it is a function template
auto canonical = identifier.cursor.get_canonical(); auto canonical = identifier.cursor.get_canonical();
auto cursor = clang_tu->get_cursor(canonical.get_source_location()); auto cursor = clang_tu->get_cursor(canonical.get_source_location());
if(cursor && cursor.get_kind() == clangmm::Cursor::Kind::FunctionTemplate) { if(cursor && cursor.get_kind() == clangmm::Cursor::Kind::FunctionTemplate) {
@ -1394,7 +1392,7 @@ Source::ClangViewRefactor::ClangViewRefactor(const boost::filesystem::path &file
return offsets; return offsets;
} }
//If no implementation was found, try using Ctags // If no implementation was found, try using Ctags
auto name = identifier.cursor.get_spelling(); auto name = identifier.cursor.get_spelling();
auto parent = identifier.cursor.get_semantic_parent(); auto parent = identifier.cursor.get_semantic_parent();
while(parent && parent.get_kind() != clangmm::Cursor::Kind::TranslationUnit) { while(parent && parent.get_kind() != clangmm::Cursor::Kind::TranslationUnit) {

Write Preview
Loading…
Cancel
Save