Index: lib/Format/TokenAnnotator.cpp
===================================================================
--- lib/Format/TokenAnnotator.cpp
+++ lib/Format/TokenAnnotator.cpp
@@ -2513,9 +2513,11 @@
     return true;
   if ((Left.isBinaryOperator() || Left.is(TT_BinaryOperator)) &&
       !Left.isOneOf(tok::arrowstar, tok::lessless) &&
-      Style.BreakBeforeBinaryOperators != FormatStyle::BOS_All &&
-      (Style.BreakBeforeBinaryOperators == FormatStyle::BOS_None ||
-       Left.getPrecedence() == prec::Assignment))
+      ((Style.AlignAfterOpenBracket == FormatStyle::BAS_AlwaysBreak &&
+        Left.isOneOf(tok::l_paren, TT_TemplateOpener, tok::l_square)) ||
+       (Style.BreakBeforeBinaryOperators != FormatStyle::BOS_All &&
+        (Style.BreakBeforeBinaryOperators == FormatStyle::BOS_None ||
+         Left.getPrecedence() == prec::Assignment))))
     return true;
   return Left.isOneOf(tok::comma, tok::coloncolon, tok::semi, tok::l_brace,
                       tok::kw_class, tok::kw_struct, tok::comment) ||