From f7726f47da075f66dbbd9d7207ced83e940f2f5e Mon Sep 17 00:00:00 2001 From: Krasimir Georgiev Date: Mon, 23 Apr 2018 08:50:36 +0000 Subject: Revert "[clang-format] Improve Incomplete detection for (text) protos" This reverts commit r330016. The incomplete detection has too many false positives, picking up typos for hard failures and refusing to format anything in that case. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@330569 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/Format/FormatTestProto.cpp | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) (limited to 'unittests/Format/FormatTestProto.cpp') diff --git a/unittests/Format/FormatTestProto.cpp b/unittests/Format/FormatTestProto.cpp index 8634a36b9d..4b1480b074 100644 --- a/unittests/Format/FormatTestProto.cpp +++ b/unittests/Format/FormatTestProto.cpp @@ -18,21 +18,13 @@ namespace clang { namespace format { class FormatTestProto : public ::testing::Test { - enum StatusCheck { SC_ExpectComplete, SC_ExpectIncomplete }; - protected: static std::string format(llvm::StringRef Code, unsigned Offset, - unsigned Length, const FormatStyle &Style, - StatusCheck CheckComplete = SC_ExpectComplete) { + unsigned Length, const FormatStyle &Style) { DEBUG(llvm::errs() << "---\n"); DEBUG(llvm::errs() << Code << "\n\n"); std::vector Ranges(1, tooling::Range(Offset, Length)); - FormattingAttemptStatus Status; - tooling::Replacements Replaces = - reformat(Style, Code, Ranges, "", &Status); - bool ExpectedCompleteFormat = CheckComplete == SC_ExpectComplete; - EXPECT_EQ(ExpectedCompleteFormat, Status.FormatComplete) - << Code << "\n\n"; + tooling::Replacements Replaces = reformat(Style, Code, Ranges); auto Result = applyAllReplacements(Code, Replaces); EXPECT_TRUE(static_cast(Result)); DEBUG(llvm::errs() << "\n" << *Result << "\n\n"); @@ -49,12 +41,6 @@ protected: EXPECT_EQ(Code.str(), format(Code)) << "Expected code is not stable"; EXPECT_EQ(Code.str(), format(test::messUp(Code))); } - - static void verifyIncompleteFormat(llvm::StringRef Code) { - FormatStyle Style = getGoogleStyle(FormatStyle::LK_Proto); - EXPECT_EQ(Code.str(), - format(Code, 0, Code.size(), Style, SC_ExpectIncomplete)); - } }; TEST_F(FormatTestProto, FormatsMessages) { @@ -506,12 +492,5 @@ TEST_F(FormatTestProto, AcceptsOperatorAsKeyInOptions) { "};"); } -TEST_F(FormatTestProto, IncompleteFormat) { - verifyIncompleteFormat("option ("); - verifyIncompleteFormat("option (MyProto.options) = { bbbbbbbbb:"); - verifyIncompleteFormat("option (MyProto.options) = { bbbbbbbbb: <\n"); - verifyIncompleteFormat("option (MyProto.options) = { bbbbbbbbb: [\n"); -} - } // end namespace tooling } // end namespace clang -- cgit v1.2.1