From 9db2a0454815979bc8e0f65e830ab9051b4ff5d2 Mon Sep 17 00:00:00 2001 From: Jorge Pinto Sousa Date: Sun, 16 Apr 2023 03:17:40 -0700 Subject: [PATCH] [clang-format] Dont interpret variable named interface as keyword for C++ Fixes #53173. Differential Revision: https://reviews.llvm.org/D148437 --- clang/lib/Format/UnwrappedLineParser.cpp | 2 +- clang/unittests/Format/FormatTest.cpp | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp index e47d634..9158333 100644 --- a/clang/lib/Format/UnwrappedLineParser.cpp +++ b/clang/lib/Format/UnwrappedLineParser.cpp @@ -1881,7 +1881,7 @@ void UnwrappedLineParser::parseStructuralElement( } } - if (FormatTok->is(Keywords.kw_interface)) { + if (!Style.isCpp() && FormatTok->is(Keywords.kw_interface)) { if (parseStructLike()) return; break; diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 4b7fddd..c5c1f21 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -25429,6 +25429,13 @@ TEST_F(FormatTest, SpaceAfterUDL) { verifyFormat("auto x = 5s .count() == 5;"); } +TEST_F(FormatTest, InterfaceAsClassMemberName) { + verifyFormat("class Foo {\n" + " int interface;\n" + " Foo::Foo(int iface) : interface{iface} {}\n" + "}"); +} + } // namespace } // namespace test } // namespace format -- 2.7.4