diff options
| -rw-r--r-- | clang/lib/Format/Format.cpp | 11 | ||||
| -rw-r--r-- | clang/unittests/Format/FormatTest.cpp | 34 |
2 files changed, 13 insertions, 32 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index b82aab97113..9229e224ea8 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -2295,8 +2295,8 @@ static FormatStyle::LanguageKind getLanguageByFileName(StringRef FileName) { } FormatStyle::LanguageKind guessLanguage(StringRef FileName, StringRef Code) { - FormatStyle::LanguageKind result = getLanguageByFileName(FileName); - if (result == FormatStyle::LK_Cpp) { + const auto GuessedLanguage = getLanguageByFileName(FileName); + if (GuessedLanguage == FormatStyle::LK_Cpp) { auto Extension = llvm::sys::path::extension(FileName); // If there's no file extension (or it's .h), we need to check the contents // of the code to see if it contains Objective-C. @@ -2306,12 +2306,11 @@ FormatStyle::LanguageKind guessLanguage(StringRef FileName, StringRef Code) { Environment::CreateVirtualEnvironment(Code, NonEmptyFileName, /*Ranges=*/{}); ObjCHeaderStyleGuesser Guesser(*Env, getLLVMStyle()); Guesser.process(); - if (Guesser.isObjC()) { - result = FormatStyle::LK_ObjC; - } + if (Guesser.isObjC()) + return FormatStyle::LK_ObjC; } } - return result; + return GuessedLanguage; } llvm::Expected<FormatStyle> getStyle(StringRef StyleName, StringRef FileName, diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 082f6e4864d..1cda9827e19 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -11959,34 +11959,16 @@ TEST_F(FormatTest, StructuredBindings) { verifyFormat("auto const &[ a, b ] = f();", Spaces); } -struct GuessLanguageTestCase { - const char *const FileName; - const char *const Code; - const FormatStyle::LanguageKind ExpectedResult; -}; - -class GuessLanguageTest - : public FormatTest, - public ::testing::WithParamInterface<GuessLanguageTestCase> {}; - -TEST_P(GuessLanguageTest, FileAndCode) { - auto TestCase = GetParam(); - EXPECT_EQ(TestCase.ExpectedResult, - guessLanguage(TestCase.FileName, TestCase.Code)); +TEST_F(FormatTest, FileAndCode) { + EXPECT_EQ(FormatStyle::LK_Cpp, guessLanguage("foo.cc", "")); + EXPECT_EQ(FormatStyle::LK_ObjC, guessLanguage("foo.m", "")); + EXPECT_EQ(FormatStyle::LK_ObjC, guessLanguage("foo.mm", "")); + EXPECT_EQ(FormatStyle::LK_Cpp, guessLanguage("foo.h", "")); + EXPECT_EQ(FormatStyle::LK_ObjC, guessLanguage("foo.h", "@interface Foo\n@end\n")); + EXPECT_EQ(FormatStyle::LK_Cpp, guessLanguage("foo", "")); + EXPECT_EQ(FormatStyle::LK_ObjC, guessLanguage("foo", "@interface Foo\n@end\n")); } -static const GuessLanguageTestCase TestCases[] = { - {"foo.cc", "", FormatStyle::LK_Cpp}, - {"foo.m", "", FormatStyle::LK_ObjC}, - {"foo.mm", "", FormatStyle::LK_ObjC}, - {"foo.h", "", FormatStyle::LK_Cpp}, - {"foo.h", "@interface Foo\n@end\n", FormatStyle::LK_ObjC}, - {"foo", "", FormatStyle::LK_Cpp}, - {"foo", "@interface Foo\n@end\n", FormatStyle::LK_ObjC}, -}; -INSTANTIATE_TEST_CASE_P(ValidLanguages, GuessLanguageTest, - ::testing::ValuesIn(TestCases)); - } // end namespace } // end namespace format } // end namespace clang |
