Clang: Do not show diagnostic category in inline annotations and issues pane

For build system diagnostics they are not displayed either.

Also, the error/warning is already encoded in the icon and the color.

However, the category is still shown in the tooltip.

Change-Id: I190ab17691c32786cefc20d058010c65cda5ace9
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Nikolai Kosjar
2018-05-09 15:12:01 +02:00
parent 851d56cda2
commit 6b70c27e3b
5 changed files with 35 additions and 27 deletions

View File

@@ -26,6 +26,7 @@
#include "clangfixitoperationsextractor.h"
#include "clangfixitoperation.h"
#include "clangutils.h"
#include <utils/algorithm.h>
@@ -40,27 +41,6 @@ void capitalizeText(QString &text)
text[0] = text[0].toUpper();
}
void removeDiagnosticCategoryPrefix(QString &text)
{
// Prefixes are taken from $LLVM_SOURCE_DIR/tools/clang/lib/Frontend/TextDiagnostic.cpp,
// function TextDiagnostic::printDiagnosticLevel (llvm-3.6.2).
static const QStringList categoryPrefixes = {
QStringLiteral("note"),
QStringLiteral("remark"),
QStringLiteral("warning"),
QStringLiteral("error"),
QStringLiteral("fatal error")
};
foreach (const QString &prefix, categoryPrefixes) {
const QString fullPrefix = prefix + QStringLiteral(": ");
if (text.startsWith(fullPrefix)) {
text.remove(0, fullPrefix.length());
break;
}
}
}
QString tweakedDiagnosticText(const QString &diagnosticText)
{
// Examples:
@@ -70,7 +50,7 @@ QString tweakedDiagnosticText(const QString &diagnosticText)
QString tweakedText = diagnosticText;
if (!tweakedText.isEmpty()) {
removeDiagnosticCategoryPrefix(tweakedText);
tweakedText = ClangCodeModel::Utils::diagnosticCategoryPrefixRemoved(tweakedText);
capitalizeText(tweakedText);
}