feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Don't show template type parameters in Class View and Current Document filter

Browse Source 
They do not bring any value.

Task-number: QTCREATORBUG-20716
Change-Id: I2876f0e1e3918cb33d133b4a65ccaefd9bd30ac8
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-07-06 11:38:55 +02:00
parent 42754374b0
commit 91cbbd39ac
5 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/clangsupport/clangsupport_global.h
View File

@@ -104,7 +104,9 @@ enum class HighlightingType : quint8
ObjectiveCInterface,
ObjectiveCImplementation,
ObjectiveCProperty,
ObjectiveCMethod
ObjectiveCMethod,
TemplateTypeParameter,
TemplateTemplateParameter
};
enum class StorageClass : quint8

2
src/libs/clangsupport/tokeninfocontainer.cpp
View File

@@ -70,6 +70,8 @@ static const char *highlightingTypeToCStringLiteral(HighlightingType type)
RETURN_TEXT_FOR_CASE(ObjectiveCMethod);
RETURN_TEXT_FOR_CASE(PrimitiveType);
RETURN_TEXT_FOR_CASE(Declaration);
RETURN_TEXT_FOR_CASE(TemplateTypeParameter);
RETURN_TEXT_FOR_CASE(TemplateTemplateParameter);
default: return "UnhandledHighlightingType";
}
}

7
src/libs/clangsupport/tokeninfocontainer.h
View File

@@ -129,6 +129,13 @@ public:
bool isGlobalDeclaration() const
{
if (types.mixinHighlightingTypes.contains(
ClangBackEnd::HighlightingType::TemplateTypeParameter)
|| types.mixinHighlightingTypes.contains(
ClangBackEnd::HighlightingType::TemplateTemplateParameter)) {
return false;
}
return extraInfo.declaration
&& types.mainHighlightingType != HighlightingType::LocalVariable
&& ((types.mainHighlightingType == HighlightingType::Operator)

2
src/plugins/clangcodemodel/clanghighlightingresultreporter.cpp
View File

@@ -108,6 +108,8 @@ bool ignore(ClangBackEnd::HighlightingType type)
case HighlightingType::ObjectiveCImplementation:
case HighlightingType::ObjectiveCProperty:
case HighlightingType::ObjectiveCMethod:
case HighlightingType::TemplateTypeParameter:
case HighlightingType::TemplateTemplateParameter:
return true;
}

6
src/tools/clangbackend/source/tokeninfo.cpp
View File

@@ -341,9 +341,13 @@ void TokenInfo::typeKind(const Cursor &cursor)
case CXCursor_ObjCCategoryImplDecl:
m_types.mixinHighlightingTypes.push_back(HighlightingType::ObjectiveCCategory);
return;
case CXCursor_ObjCSuperClassRef:
case CXCursor_TemplateTypeParameter:
m_types.mixinHighlightingTypes.push_back(HighlightingType::TemplateTypeParameter);
return;
case CXCursor_TemplateTemplateParameter:
m_types.mixinHighlightingTypes.push_back(HighlightingType::TemplateTemplateParameter);
return;
case CXCursor_ObjCSuperClassRef:
case CXCursor_CXXStaticCastExpr:
case CXCursor_CXXReinterpretCastExpr:
break;