MyDeveloperDay created this revision.
MyDeveloperDay added reviewers: curdeius, krasimir, JakeMerdichAMD.
MyDeveloperDay added projects: clang, clang-format.
MyDeveloperDay requested review of this revision.
clang-format see the `disable:` in __pragma(waring(disable:)) as ObjectiveC
method call
Remove any line starting with `#` or __pragma line from being part of the
ObjectiveC guess
https://bugs.llvm.org/show_bug.cgi?id=42434
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D92922
Files:
clang/lib/Format/Format.cpp
clang/unittests/Format/FormatTest.cpp
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -16713,6 +16713,13 @@
guessLanguage("foo.h", "int(^foo[(kNumEntries + 10)])(char, float);"));
}
+TEST_F(FormatTest, GuessLanguageWithPragmas) {
+ EXPECT_EQ(FormatStyle::LK_Cpp,
+ guessLanguage("foo.h", "__pragma(warning(disable:))"));
+ EXPECT_EQ(FormatStyle::LK_Cpp,
+ guessLanguage("foo.h", "#pragma(warning(disable:))"));
+}
+
TEST_F(FormatTest, FormatsInlineAsmSymbolicNames) {
// ASM symbolic names are identifiers that must be surrounded by [] without
// space in between:
Index: clang/lib/Format/Format.cpp
===================================================================
--- clang/lib/Format/Format.cpp
+++ clang/lib/Format/Format.cpp
@@ -2032,6 +2032,12 @@
};
for (auto Line : AnnotatedLines) {
+ if (Line->First) {
+ if (Line->First->TokenText.startswith("#") ||
+ Line->First->TokenText == "__pragma") {
+ continue;
+ }
+ }
for (const FormatToken *FormatTok = Line->First; FormatTok;
FormatTok = FormatTok->Next) {
if ((FormatTok->Previous && FormatTok->Previous->is(tok::at) &&
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -16713,6 +16713,13 @@
guessLanguage("foo.h", "int(^foo[(kNumEntries + 10)])(char, float);"));
}
+TEST_F(FormatTest, GuessLanguageWithPragmas) {
+ EXPECT_EQ(FormatStyle::LK_Cpp,
+ guessLanguage("foo.h", "__pragma(warning(disable:))"));
+ EXPECT_EQ(FormatStyle::LK_Cpp,
+ guessLanguage("foo.h", "#pragma(warning(disable:))"));
+}
+
TEST_F(FormatTest, FormatsInlineAsmSymbolicNames) {
// ASM symbolic names are identifiers that must be surrounded by [] without
// space in between:
Index: clang/lib/Format/Format.cpp
===================================================================
--- clang/lib/Format/Format.cpp
+++ clang/lib/Format/Format.cpp
@@ -2032,6 +2032,12 @@
};
for (auto Line : AnnotatedLines) {
+ if (Line->First) {
+ if (Line->First->TokenText.startswith("#") ||
+ Line->First->TokenText == "__pragma") {
+ continue;
+ }
+ }
for (const FormatToken *FormatTok = Line->First; FormatTok;
FormatTok = FormatTok->Next) {
if ((FormatTok->Previous && FormatTok->Previous->is(tok::at) &&
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
