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

Clang: Use the same format for the current document filter and the symbol outline

Browse Source 
Global variables and fields had different style of
the return value. Make it look the same.

Change-Id: Ie031a994b65991289103028234227950861e05d0
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-08-07 10:09:39 +02:00
parent d2b951565a
commit 86b8164a93
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp
View File

@@ -69,11 +69,6 @@ static QString addType(const QString &signature, const ClangBackEnd::ExtraInfo &
return signature + QLatin1String(" -> ", 4) + extraInfo.typeSpelling.toString(); return signature + QLatin1String(" -> ", 4) + extraInfo.typeSpelling.toString();
} }
static QString addTypeToVariableName(const QString &name, const ClangBackEnd::ExtraInfo &extraInfo)
{
return extraInfo.typeSpelling.toString() + QLatin1String(" ") + name;
}
static Core::LocatorFilterEntry makeEntry(Core::ILocatorFilter *filter, static Core::LocatorFilterEntry makeEntry(Core::ILocatorFilter *filter,
const ClangBackEnd::TokenInfoContainer &info) const ClangBackEnd::TokenInfoContainer &info)
{ {
@@ -84,13 +79,11 @@ static Core::LocatorFilterEntry makeEntry(Core::ILocatorFilter *filter,
QString extra; QString extra;
ClangBackEnd::HighlightingType mainType = info.types.mainHighlightingType; ClangBackEnd::HighlightingType mainType = info.types.mainHighlightingType;
if (mainType == ClangBackEnd::HighlightingType::VirtualFunction if (mainType == ClangBackEnd::HighlightingType::VirtualFunction
|| mainType == ClangBackEnd::HighlightingType::Function) { || mainType == ClangBackEnd::HighlightingType::Function
displayName = addType(displayName, extraInfo); || mainType == ClangBackEnd::HighlightingType::GlobalVariable
extra = extraInfo.semanticParentTypeSpelling.toString();
} else if (mainType == ClangBackEnd::HighlightingType::GlobalVariable
|| mainType == ClangBackEnd::HighlightingType::Field || mainType == ClangBackEnd::HighlightingType::Field
|| mainType == ClangBackEnd::HighlightingType::QtProperty) { || mainType == ClangBackEnd::HighlightingType::QtProperty) {
displayName = addTypeToVariableName(displayName, extraInfo); displayName = addType(displayName, extraInfo);
extra = extraInfo.semanticParentTypeSpelling.toString(); extra = extraInfo.semanticParentTypeSpelling.toString();
} else { } else {
extra = extraInfo.typeSpelling.toString(); extra = extraInfo.typeSpelling.toString();