ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: record and display cxx indexer configuration issues (issue #618)

Browse Source
This commit is contained in:
mlangkabel
2018-09-14 15:31:27 +02:00
parent eb0bf063b8
commit 5b7938eda6
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_cxx/data/parser/cxx/CxxDiagnosticConsumer.cpp
+8 -10
View File
@@ -21,7 +21,6 @@ CxxDiagnosticConsumer::CxxDiagnosticConsumer(
, m_client(client) , m_client(client)
, m_canonicalFilePathCache(canonicalFilePathCache) , m_canonicalFilePathCache(canonicalFilePathCache)
, m_sourceFilePath(sourceFilePath) , m_sourceFilePath(sourceFilePath)
, m_isParsingFile(false)
, m_useLogging(useLogging) , m_useLogging(useLogging)
{ {
} }
@@ -32,8 +31,6 @@ void CxxDiagnosticConsumer::BeginSourceFile(const clang::LangOptions& langOption
{ {
clang::TextDiagnosticPrinter::BeginSourceFile(langOptions, preProcessor); clang::TextDiagnosticPrinter::BeginSourceFile(langOptions, preProcessor);
} }
m_isParsingFile = true;
} }
void CxxDiagnosticConsumer::EndSourceFile() void CxxDiagnosticConsumer::EndSourceFile()
@@ -42,8 +39,6 @@ void CxxDiagnosticConsumer::EndSourceFile()
{ {
clang::TextDiagnosticPrinter::EndSourceFile(); clang::TextDiagnosticPrinter::EndSourceFile();
} }
m_isParsingFile = false;
} }
void CxxDiagnosticConsumer::HandleDiagnostic(clang::DiagnosticsEngine::Level level, const clang::Diagnostic& info) void CxxDiagnosticConsumer::HandleDiagnostic(clang::DiagnosticsEngine::Level level, const clang::Diagnostic& info)
@@ -53,11 +48,6 @@ void CxxDiagnosticConsumer::HandleDiagnostic(clang::DiagnosticsEngine::Level lev
clang::TextDiagnosticPrinter::HandleDiagnostic(level, info); clang::TextDiagnosticPrinter::HandleDiagnostic(level, info);
} }
if (!m_isParsingFile)
{
return;
}
if (level >= clang::DiagnosticsEngine::Error) if (level >= clang::DiagnosticsEngine::Error)
{ {
llvm::SmallString<100> messageStr; llvm::SmallString<100> messageStr;
@@ -68,6 +58,10 @@ void CxxDiagnosticConsumer::HandleDiagnostic(clang::DiagnosticsEngine::Level lev
{ {
return; return;
} }
if (utility::isPrefix<std::string>("unknown argument:", message))
{
return;
}
ParseLocation location(FilePath(), 0, 0); ParseLocation location(FilePath(), 0, 0);
if (info.getLocation().isValid() && info.hasSourceManager()) if (info.getLocation().isValid() && info.hasSourceManager())
@@ -96,6 +90,10 @@ void CxxDiagnosticConsumer::HandleDiagnostic(clang::DiagnosticsEngine::Level lev
} }
} }
} }
else
{
location = ParseLocation(m_canonicalFilePathCache->getCanonicalFilePath(m_sourceFilePath.wstr()), 1, 1);
}
if (location.isValid()) if (location.isValid())
{ {
m_client->recordError( m_client->recordError(
src/lib_cxx/data/parser/cxx/CxxDiagnosticConsumer.h
-1
View File
@@ -30,7 +30,6 @@ private:
std::shared_ptr<CanonicalFilePathCache> m_canonicalFilePathCache; std::shared_ptr<CanonicalFilePathCache> m_canonicalFilePathCache;
const FilePath m_sourceFilePath; const FilePath m_sourceFilePath;
bool m_isParsingFile;
bool m_useLogging; bool m_useLogging;
}; };