Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,17 @@ namespace readability {
m(Member) \
m(ClassConstant) \
m(ClassMember) \
m(ConstexprGlobalVariable) \
m(GlobalConstant) \
m(GlobalConstantPointer) \
m(GlobalPointer) \
m(GlobalVariable) \
m(ConstexprLocalVariable) \
m(LocalConstant) \
m(LocalConstantPointer) \
m(LocalPointer) \
m(LocalVariable) \
m(ConstexprStaticVariable) \
m(StaticConstant) \
m(StaticVariable) \
m(Constant) \
Expand Down Expand Up @@ -1497,8 +1500,19 @@ StyleKind IdentifierNamingCheck::findStyleKindForField(
StyleKind IdentifierNamingCheck::findStyleKindForVar(
const VarDecl *Var, QualType Type,
ArrayRef<std::optional<NamingStyle>> NamingStyles) const {
if (Var->isConstexpr() && NamingStyles[SK_ConstexprVariable])
return SK_ConstexprVariable;
if (Var->isConstexpr()) {
if (Var->isFileVarDecl() && NamingStyles[SK_ConstexprGlobalVariable])
return SK_ConstexprGlobalVariable;

if (Var->isStaticLocal() && NamingStyles[SK_ConstexprStaticVariable])
return SK_ConstexprStaticVariable;

if (Var->isLocalVarDecl() && NamingStyles[SK_ConstexprLocalVariable])
return SK_ConstexprLocalVariable;

if (NamingStyles[SK_ConstexprVariable])
return SK_ConstexprVariable;
}

if (!Type.isNull() && Type.isConstQualified()) {
if (Var->isStaticDataMember() && NamingStyles[SK_ClassConstant])
Expand Down