[PATCH] D47527: Revert "[clang-format] Fix putting ObjC message arguments in one line for multiline receiver"

[Jacek Olesiak via Phabricator via cfe-commits]

jolesiak created this revision.
Herald added subscribers: cfe-commits, klimek.

This reverts commit db9e5e9a616d7fdd4d1ba4c3b2cd89d8a0238533.


Repository:
  rC Clang

https://reviews.llvm.org/D47527

Files:
  lib/Format/ContinuationIndenter.cpp
  unittests/Format/FormatTestObjC.cpp


Index: unittests/Format/FormatTestObjC.cpp
===================================================================
--- unittests/Format/FormatTestObjC.cpp
+++ unittests/Format/FormatTestObjC.cpp
@@ -796,41 +796,6 @@
   verifyFormat("[((Foo *)foo) bar];");
   verifyFormat("[((Foo *)foo) bar:1 blech:2];");
 
-  // Message receiver taking multiple lines.
-  Style.ColumnLimit = 20;
-  // Non-corner case.
-  verifyFormat("[[object block:^{\n"
-               "  return 42;\n"
-               "}] a:42 b:42];");
-  // Arguments just fit into one line.
-  verifyFormat("[[object block:^{\n"
-               "  return 42;\n"
-               "}] aaaaaaa:42 b:42];");
-  // Arguments just over a column limit.
-  verifyFormat("[[object block:^{\n"
-               "  return 42;\n"
-               "}] aaaaaaa:42\n"
-               "        bb:42];");
-  // Arguments just fit into one line.
-  Style.ColumnLimit = 23;
-  verifyFormat("[[obj a:42\n"
-               "      b:42\n"
-               "      c:42\n"
-               "      d:42] e:42 f:42];");
-
-  // Arguments do not fit into one line with a receiver.
-  Style.ColumnLimit = 20;
-  verifyFormat("[[obj a:42] a:42\n"
-               "            b:42];");
-  verifyFormat("[[obj a:42] a:42\n"
-               "            b:42\n"
-               "            c:42];");
-  verifyFormat("[[obj aaaaaa:42\n"
-               "           b:42]\n"
-               "    cc:42\n"
-               "     d:42];");
-
-
   Style.ColumnLimit = 70;
   verifyFormat(
       "void f() {\n"
Index: lib/Format/ContinuationIndenter.cpp
===================================================================
--- lib/Format/ContinuationIndenter.cpp
+++ lib/Format/ContinuationIndenter.cpp
@@ -1387,29 +1387,6 @@
        (Current.is(tok::greater) && Current.is(TT_DictLiteral))))
     State.Stack.pop_back();
 
-  // Reevaluate whether ObjC message arguments fit into one line.
-  // If a receiver spans multiple lines, e.g.:
-  //   [[object block:^{
-  //     return 42;
-  //   }] a:42 b:42];
-  // BreakBeforeParameter is calculated based on an incorrect assumption
-  // (it is checked whether the whole expression fits into one line without
-  // considering a line break inside a message receiver).
-  // We check whether arguements fit after receiver scope closer (into the same
-  // line).
-  if (Current.MatchingParen && Current.MatchingParen->Previous) {
-    const FormatToken &CurrentScopeOpener = *Current.MatchingParen->Previous;
-    if (CurrentScopeOpener.is(TT_ObjCMethodExpr) &&
-        CurrentScopeOpener.MatchingParen) {
-      int NecessarySpaceInLine =
-          getLengthToMatchingParen(CurrentScopeOpener, State.Stack) +
-          CurrentScopeOpener.TotalLength - Current.TotalLength - 1;
-      if (State.Column + Current.ColumnWidth + NecessarySpaceInLine <=
-          Style.ColumnLimit)
-        State.Stack.back().BreakBeforeParameter = false;
-    }
-  }
-
   if (Current.is(tok::r_square)) {
     // If this ends the array subscript expr, reset the corresponding value.
     const FormatToken *NextNonComment = Current.getNextNonComment();


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D47527.149074.patch
Type: text/x-patch
Size: 3103 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20180530/72e84dd7/attachment.bin>