Author: Jonathan Coe Date: 2020-04-28T17:41:17+01:00 New Revision: 85ee97fd894b2d0432dfaf20347e73f3e154ae97
URL: https://github.com/llvm/llvm-project/commit/85ee97fd894b2d0432dfaf20347e73f3e154ae97 DIFF: https://github.com/llvm/llvm-project/commit/85ee97fd894b2d0432dfaf20347e73f3e154ae97.diff LOG: Revert "[clang-format] C# property formatting can be controlled by config options" Committed in error without approval https://reviews.llvm.org/D79000 This reverts commit 015bca3e67cbb88f74f01fb5ae4e46392bec6416. Added: Modified: clang/lib/Format/UnwrappedLineParser.cpp clang/unittests/Format/FormatTestCSharp.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp index e9e56e80814c..4734ff16921b 100644 --- a/clang/lib/Format/UnwrappedLineParser.cpp +++ b/clang/lib/Format/UnwrappedLineParser.cpp @@ -1531,8 +1531,6 @@ bool UnwrappedLineParser::tryToParsePropertyAccessor() { // Try to parse the property accessor: // https://docs.microsoft.com/en-us/dotnet/csharp/programming-guide/classes-and-structs/properties Tokens->setPosition(StoredPosition); - if (Style.BraceWrapping.AfterFunction == true) - addUnwrappedLine(); nextToken(); do { switch (FormatTok->Tok.getKind()) { diff --git a/clang/unittests/Format/FormatTestCSharp.cpp b/clang/unittests/Format/FormatTestCSharp.cpp index 550f5b493992..91962ef12631 100644 --- a/clang/unittests/Format/FormatTestCSharp.cpp +++ b/clang/unittests/Format/FormatTestCSharp.cpp @@ -245,13 +245,11 @@ TEST_F(FormatTestCSharp, Attributes) { "}"); verifyFormat("[TestMethod]\n" - "public string Host\n" - "{ set; get; }"); + "public string Host { set; get; }"); verifyFormat("[TestMethod(\"start\", HelpText = \"Starts the server " "listening on provided host\")]\n" - "public string Host\n" - "{ set; get; }"); + "public string Host { set; get; }"); verifyFormat( "[DllImport(\"Hello\", EntryPoint = \"hello_world\")]\n" @@ -671,32 +669,6 @@ class MyClass { set => veryLongNamedField = value; } = VeryLongNamedTypeIndeed.Create(DefaultFirstArgument, DefaultSecondArgument, DefaultThirdArgument); -})", - Style); - - // Brace wrapping and single-lining of accessor can be controlled by config. - Style.AllowShortBlocksOnASingleLine = FormatStyle::SBS_Never; - Style.BreakBeforeBraces = FormatStyle::BS_Custom; - Style.BraceWrapping.AfterFunction = true; - - verifyFormat(R"(// -public class SaleItem { - public decimal Price - { get; set; } -})", - Style); - - verifyFormat(R"(// -class TimePeriod { - public double Hours - { - get { - return _seconds / 3600; - } - set { - _seconds = value * 3600; - } - } })", Style); } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
