[clang] 5a101f3 - Revert "[clang-format] Correct indentation for `[key] = value,` entries in C++ object initialisers"

[Jonathan Coe via cfe-commits]

Author: Jonathan Coe
Date: 2020-03-10T09:30:34Z
New Revision: 5a101f377315c0c0c58e8df842fe5eb5d8c7611d

URL: https://github.com/llvm/llvm-project/commit/5a101f377315c0c0c58e8df842fe5eb5d8c7611d
DIFF: https://github.com/llvm/llvm-project/commit/5a101f377315c0c0c58e8df842fe5eb5d8c7611d.diff

LOG: Revert "[clang-format] Correct indentation for `[key] = value,` entries in C++ object initialisers"

Commit message says "C++" where it should say "C#".

This reverts commit cb3f20d27c9e91cb9f997f0401f388e62c4ba993.

Added: 
    

Modified: 
    clang/lib/Format/ContinuationIndenter.cpp
    clang/unittests/Format/FormatTestCSharp.cpp

Removed: 
    


################################################################################
diff  --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp
index 9a6d7877efaa..a08f5a3df864 100644
--- a/clang/lib/Format/ContinuationIndenter.cpp
+++ b/clang/lib/Format/ContinuationIndenter.cpp
@@ -1047,9 +1047,6 @@ unsigned ContinuationIndenter::getNewLineColumn(const LineState &State) {
   if (NextNonComment->is(TT_ArraySubscriptLSquare)) {
     if (State.Stack.back().StartOfArraySubscripts != 0)
       return State.Stack.back().StartOfArraySubscripts;
-    else if (Style.isCSharp()) // C# allows `["key"] = value` inside object
-                               // initializers.
-      return State.Stack.back().Indent;
     return ContinuationIndent;
   }
 

diff  --git a/clang/unittests/Format/FormatTestCSharp.cpp b/clang/unittests/Format/FormatTestCSharp.cpp
index 7f819a61c70e..a22f48676065 100644
--- a/clang/unittests/Format/FormatTestCSharp.cpp
+++ b/clang/unittests/Format/FormatTestCSharp.cpp
@@ -549,15 +549,6 @@ Shape[] shapes = new[] { new Circle { Radius = 2.7281, Colour = Colours.Red },
 private Transformer _transformer = new X.Y {
   Filler = (Shape shape) => { return new Transform.Fill(shape, RED); },
   Scaler = (Shape shape) => { return new Transform.Resize(shape, 0.1); },
-};)",
-               Style);
-
-  // Dictionary initialisation.
-  verifyFormat(R"(//
-var myDict = new Dictionary<string, string> {
-  ["name"] = _donald,
-  ["age"] = Convert.ToString(DateTime.Today.Year - 1934),
-  ["type"] = _duck,
 };)",
                Style);
 }