From 21fb8476aed4477392dfd087ded4271590a5745a Mon Sep 17 00:00:00 2001 From: malte_langkabel Date: Wed, 15 Feb 2017 10:45:29 +0100 Subject: [PATCH] logic: fixed context node name of reference when context is a file --- src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp | 4 ++-- src/test/CxxParserTestSuite.h | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp index 819889b7..d687c715 100644 --- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp @@ -381,7 +381,7 @@ void CxxAstVisitorComponentIndexer::visitUsingDirectiveDecl(clang::UsingDirectiv m_client->recordReference( REFERENCE_USAGE, nameHierarchy, - getAstVisitor()->getComponent()->getContextName(NameHierarchy(loc.filePath.fileName())), + getAstVisitor()->getComponent()->getContextName(NameHierarchy(loc.filePath.str())), loc ); } @@ -395,7 +395,7 @@ void CxxAstVisitorComponentIndexer::visitUsingDecl(clang::UsingDecl* d) m_client->recordReference( REFERENCE_USAGE, getAstVisitor()->getDeclNameCache()->getValue(d), - getAstVisitor()->getComponent()->getContextName(NameHierarchy(loc.filePath.fileName())), + getAstVisitor()->getComponent()->getContextName(NameHierarchy(loc.filePath.str())), loc ); } diff --git a/src/test/CxxParserTestSuite.h b/src/test/CxxParserTestSuite.h index a9ef37a5..3050191e 100644 --- a/src/test/CxxParserTestSuite.h +++ b/src/test/CxxParserTestSuite.h @@ -1274,7 +1274,6 @@ public: /////////////////////////////////////////////////////////////////////////////// // test finding usages of symbols - void test_cxx_parser_finds_enum_usage_in_template_class() { std::shared_ptr client = parseCode( @@ -1598,9 +1597,6 @@ public: { std::shared_ptr client = parseCode( "using namespace std;\n" - "void foo()\n" - "{\n" - "}\n" ); TS_ASSERT(utility::containsElement(