manual adjustments before scalafmt

* fix formatting error

* reversePrepend instead of reverse_:::
  * because it is causing trouble for AvoidInfix formatting

* prepare for AvoidInfix

* fix try-catch

akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala

@@ -272,11 +272,12 @@ private[akka] final class TestProbeImpl[M](name: String, system: ActorSystem[_])
       val maybeMsg = receiveOne_internal(timeout)
       maybeMsg match {
         case Some(message) =>
-          val outcome = try fisher(message) catch {
+          val outcome =
-            case ex: MatchError => throw new AssertionError(
+            try fisher(message) catch {
-              s"Unexpected message $message while fishing for messages, " +
+              case ex: MatchError => throw new AssertionError(
-                s"seen messages ${seen.reverse}, hint: $hint", ex)
+                s"Unexpected message $message while fishing for messages, " +
-          }
+                  s"seen messages ${seen.reverse}, hint: $hint", ex)
+            }
           outcome match {
             case FishingOutcome.Complete    => (message :: seen).reverse
             case FishingOutcome.Fail(error) => assertFail(s"$error, hint: $hint")

akka-actor-tests/src/test/scala/akka/dispatch/sysmsg/SystemMessageListSpec.scala

@@ -101,7 +101,7 @@ class SystemMessageListSpec extends AkkaSpec {
       val fwdList = create3 :: create4 :: create5 :: ENil
       val revList = create2 :: create1 :: create0 :: LNil
 
-      val list = revList reverse_::: fwdList
+      val list =  fwdList.reversePrepend(revList)
 
       (list.head eq create0) should ===(true)
       (list.tail.head eq create1) should ===(true)
@@ -111,9 +111,9 @@ class SystemMessageListSpec extends AkkaSpec {
       (list.tail.tail.tail.tail.tail.head eq create5) should ===(true)
       (list.tail.tail.tail.tail.tail.tail.head eq null) should ===(true)
 
-      (LNil reverse_::: ENil) == ENil should ===(true)
+      ENil.reversePrepend(LNil) == ENil should ===(true)
-      ((create0 :: LNil reverse_::: ENil).head eq create0) should ===(true)
+      (ENil.reversePrepend(create0 :: LNil).head eq create0) should ===(true)
-      ((LNil reverse_::: create0 :: ENil).head eq create0) should ===(true)
+      ((create0 :: ENil).reversePrepend(LNil).head eq create0) should ===(true)
     }
 
   }

akka-actor-typed/src/main/scala/akka/actor/typed/internal/SystemMessage.scala

@@ -157,7 +157,7 @@ private[typed] class EarliestFirstSystemMessageList(val head: SystemMessage) ext
    *
    * The cost of this operation is linear in the size of the list that is to be prepended.
    */
-  final def reverse_:::(other: LatestFirstSystemMessageList): EarliestFirstSystemMessageList = {
+  final def reversePrepend(other: LatestFirstSystemMessageList): EarliestFirstSystemMessageList = {
     var remaining = other
     var result = this
     while (remaining.nonEmpty) {

akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/LoggerAdapterImpl.scala

@@ -323,7 +323,7 @@ private[akka] abstract class AbstractLogger extends Logger {
    */
   private def format(t: String, arg1: Any): String = arg1 match {
     case a: Array[_] if !a.getClass.getComponentType.isPrimitive => formatArray(t, a: _*)
-    case a: Array[_] => formatArray(t, (a map (_.asInstanceOf[AnyRef]): _*))
+    case a: Array[_] => formatArray(t, a.map(_.asInstanceOf[AnyRef]): _*)
     case x => formatArray(t, x)
   }
   private def format(t: String, arg1: Any, arg2: Any): String = formatArray(t, arg1, arg2)

akka-actor/src/main/scala/akka/actor/ActorCell.scala

@@ -540,7 +540,7 @@ private[akka] class ActorCell(
       val newState = calculateState
       // As each state accepts a strict subset of another state, it is enough to unstash if we "walk up" the state
       // chain
-      val todo = if (newState < currentState) unstashAll() reverse_::: rest else rest
+      val todo = if (newState < currentState) rest.reversePrepend(unstashAll()) else rest
 
       if (isTerminated) sendAllToDeadLetters(todo)
       else if (todo.nonEmpty) invokeAll(todo, newState)

akka-actor/src/main/scala/akka/dispatch/sysmsg/SystemMessage.scala

@@ -158,7 +158,7 @@ private[akka] class EarliestFirstSystemMessageList(val head: SystemMessage) exte
    *
    * The cost of this operation is linear in the size of the list that is to be prepended.
    */
-  final def reverse_:::(other: LatestFirstSystemMessageList): EarliestFirstSystemMessageList = {
+  final def reversePrepend(other: LatestFirstSystemMessageList): EarliestFirstSystemMessageList = {
     var remaining = other
     var result = this
     while (remaining.nonEmpty) {
@@ -169,6 +169,9 @@ private[akka] class EarliestFirstSystemMessageList(val head: SystemMessage) exte
     result
   }
 
+  final def reverse_:::(other: LatestFirstSystemMessageList): EarliestFirstSystemMessageList =
+    reversePrepend(other)
+
 }
 
 /**

akka-actor/src/main/scala/akka/event/Logging.scala

@@ -1301,7 +1301,7 @@ trait LoggingAdapter {
    */
   private def format1(t: String, arg: Any): String = arg match {
     case a: Array[_] if !a.getClass.getComponentType.isPrimitive => format(t, a: _*)
-    case a: Array[_] => format(t, (a map (_.asInstanceOf[AnyRef]): _*))
+    case a: Array[_] => format(t, a.map(_.asInstanceOf[AnyRef]): _*)
     case x => format(t, x)
   }
 
@@ -1714,7 +1714,7 @@ class MarkerLoggingAdapter(
   // Copy of LoggingAdapter.format1 due to binary compatibility restrictions
   private def format1(t: String, arg: Any): String = arg match {
     case a: Array[_] if !a.getClass.getComponentType.isPrimitive => format(t, a: _*)
-    case a: Array[_] => format(t, (a map (_.asInstanceOf[AnyRef]): _*))
+    case a: Array[_] => format(t, a.map(_.asInstanceOf[AnyRef]): _*)
     case x => format(t, x)
   }
 }

akka-persistence/src/test/scala/akka/persistence/PersistentActorBoundedStashingSpec.scala

@@ -122,7 +122,7 @@ class DiscardStrategyPersistentActorBoundedStashingSpec
       //internal stash overflow after 10
       1 to (2 * capacity) foreach (persistentActor ! Cmd(_))
       //so, 11 to 20 discard to deadletter
-      (1 + capacity) to (2 * capacity) foreach (i => expectMsg(DeadLetter(Cmd(i), testActor, persistentActor)))
+      ((1 + capacity) to (2 * capacity)).foreach (i => expectMsg(DeadLetter(Cmd(i), testActor, persistentActor)))
       //allow "a" and 1 to 10 write complete
       1 to (1 + capacity) foreach (i => SteppingInmemJournal.step(journal))
 
@@ -150,7 +150,7 @@ class ReplyToStrategyPersistentActorBoundedStashingSpec
       //internal stash overflow after 10
       1 to (2 * capacity) foreach (persistentActor ! Cmd(_))
       //so, 11 to 20 reply to with "Reject" String
-      (1 + capacity) to (2 * capacity) foreach (i => expectMsg("RejectToStash"))
+      ((1 + capacity) to (2 * capacity)).foreach (i => expectMsg("RejectToStash"))
       //allow "a" and 1 to 10 write complete
       1 to (1 + capacity) foreach (i => SteppingInmemJournal.step(journal))
 

akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala

@@ -514,7 +514,7 @@ private[transport] class ProtocolStateActor(
       stop()
 
     case Event(HandleListenerRegistered(listener), AssociatedWaitHandler(_, wrappedHandle, queue)) =>
-      queue.foreach { listener notify InboundPayload(_) }
+      queue.foreach {p => listener notify InboundPayload(p) }
       stay() using ListenerReady(listener, wrappedHandle)
   }
 

akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala

@@ -258,7 +258,7 @@ private[netty] abstract class ServerHandler(
         val remoteAddress = NettyTransport.addressFromSocketAddress(remoteSocketAddress, transport.schemeIdentifier,
           transport.system.name, hostName = None, port = None).getOrElse(
             throw new NettyTransportException(s"Unknown inbound remote address type [${remoteSocketAddress.getClass.getName}]"))
-        init(channel, remoteSocketAddress, remoteAddress, msg) { listener notify InboundAssociation(_) }
+        init(channel, remoteSocketAddress, remoteAddress, msg) {a => listener notify InboundAssociation(a) }
     }
   }
 

akka-remote/src/test/scala/akka/remote/artery/BindCanonicalAddressSpec.scala

@@ -97,7 +97,7 @@ trait BindCanonicalAddressBehaviors {
       implicit val sys = ActorSystem("sys", config.withFallback(commonConfig))
 
       getInternal.flatMap(_.port) should contain(getExternal.port.get)
-      getInternal.map(_.host.get should include regex "0.0.0.0".r) // regexp dot is intentional to match IPv4 and 6 addresses
+      getInternal.map(x => x.host.get should include regex "0.0.0.0".r) // regexp dot is intentional to match IPv4 and 6 addresses
 
       Await.result(sys.terminate(), Duration.Inf)
     }

akka-remote/src/test/scala/akka/remote/transport/netty/NettyTransportSpec.scala

@@ -136,7 +136,7 @@ class NettyTransportSpec extends WordSpec with Matchers with BindBehavior {
       implicit val sys = ActorSystem("sys", bindConfig.withFallback(commonConfig))
 
       getInternal.flatMap(_.port) should contain(getExternal.port.get)
-      getInternal.map(_.host.get should include regex "0.0.0.0".r) // regexp dot is intentional to match IPv4 and 6 addresses
+      getInternal.map(x => x.host.get should include regex "0.0.0.0".r) // regexp dot is intentional to match IPv4 and 6 addresses
 
       Await.result(sys.terminate(), Duration.Inf)
     }

akka-stream-tests/src/test/scala/akka/stream/DslConsistencySpec.scala

@@ -68,13 +68,13 @@ class DslConsistencySpec extends WordSpec with Matchers {
 
   "Java and Scala DSLs" must {
 
-    ("Source" -> List[Class[_]](sSourceClass, jSourceClass)) ::
+    (("Source" -> List[Class[_]](sSourceClass, jSourceClass)) ::
       ("SubSource" -> List[Class[_]](sSubSourceClass, jSubSourceClass)) ::
       ("Flow" -> List[Class[_]](sFlowClass, jFlowClass)) ::
       ("SubFlow" -> List[Class[_]](sSubFlowClass, jSubFlowClass)) ::
       ("Sink" -> List[Class[_]](sSinkClass, jSinkClass)) ::
       ("RunnableFlow" -> List[Class[_]](sRunnableGraphClass, jRunnableGraphClass)) ::
-      Nil foreach {
+      Nil).foreach {
         case (element, classes) =>
 
           s"provide same $element transforming operators" in {

akka-stream-tests/src/test/scala/akka/stream/scaladsl/SourceSpec.scala

@@ -240,7 +240,7 @@ class SourceSpec extends StreamSpec with DefaultTimeout {
             case (a, _) if a > 10000000 => throw t
             case (a, b)                 => Some((b, a + b) -> a)
           }.runFold(List.empty[Int]) { case (xs, x) => x :: xs }.failed) {
-            _ should be theSameInstanceAs (t)
+            x => (x should be).theSameInstanceAs(t)
           }
     }
 

akka-stream/src/main/scala/akka/stream/impl/SubscriberManagement.scala

@@ -250,7 +250,7 @@ private[akka] trait SubscriberManagement[T] extends ResizableMultiReaderRingBuff
   private def unregisterSubscriptionInternal(subscription: S): Unit = {
     @tailrec def removeFrom(remaining: Subscriptions, result: Subscriptions = Nil): Subscriptions =
       remaining match {
-        case head :: tail => if (head eq subscription) tail reverse_::: result else removeFrom(tail, head :: result)
+        case head :: tail => if (head eq subscription) result.reverse_:::(tail) else removeFrom(tail, head :: result)
         case _            => throw new IllegalStateException("Subscription to unregister not found")
       }
     if (subscription.active) {