Merge pull request scala#8786 from szeiger/wip/merge-to-2.13.x

Merge from 2.12.x to 2.13.x

Author: dwijnand

.travis.yml

@@ -32,6 +32,11 @@ jobs:
           - sbt -Dscala.build.compileWithDotty=true library/compile
 
       # pull request validation (w/ mini-bootstrap)
+      # "mini" in these senses:
+      # - it doesn't use the complicated legacy scripts.
+      # - it doesn't publish to scala-pr-validation-snapshots
+      #   (because we need secrets for that and Travis-CI doesn't give PR jobs access to secrets)
+      # it is still a true bootstrap.
       - stage: build
         name: "JDK 8 pr validation"
         if: type = pull_request

src/reflect/scala/reflect/internal/Symbols.scala

@@ -2777,30 +2777,29 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
 
     /** String representation of symbol's definition following its name */
     final def infoString(tp: Type): String = {
-      def parents = (
-        if (settings.debug.value) parentsString(tp.parents)
-        else briefParentsString(tp.parents)
-      )
-      def isStructuralThisType = (
-        // prevents disasters like scala/bug#8158
-        owner.isInitialized && owner.isStructuralRefinement && tp == owner.tpe
-      )
-      if (isType) typeParamsString(tp) + (
-        if (isClass) " extends " + parents
-        else if (isAliasType) " = " + tp.resultType
-        else tp.resultType match {
-          case rt @ TypeBounds(_, _) => "" + rt
-          case rt                    => " <: " + rt
+      def loop(tp: Type, followsParens: Boolean): String = {
+        def isStructuralThisType = owner.isInitialized && owner.isStructuralRefinement && tp == owner.tpe // scala/bug#8158
+        // colon+space, preceded by an extra space if needed to prevent the colon glomming onto a symbolic name
+        def postnominalColon: String = if (!followsParens && name.isOperatorName) " : " else ": "
+        def parents = if (settings.debug) parentsString(tp.parents) else briefParentsString(tp.parents)
+        def typeRest =
+          if (isClass) " extends " + parents
+          else if (isAliasType) " = " + tp.resultType
+          else tp.resultType match {
+            case rt@TypeBounds(_, _) => "" + rt
+            case rt => " <: " + rt
+          }
+        tp match {
+          case _ if isType               => typeParamsString(tp) + typeRest
+          case _ if isModule             => "" //  avoid "object X of type X.type"
+          case PolyType(tparams, res)    => typeParamsString(tp) + loop(res, followsParens = true)
+          case NullaryMethodType(res)    => loop(res, followsParens = false)
+          case MethodType(params, res)   => valueParamsString(tp) + loop(res, followsParens = true)
+          case _ if isStructuralThisType => postnominalColon + owner.name
+          case _                         => postnominalColon + tp
         }
-      )
-      else if (isModule) "" //  avoid "object X of type X.type"
-      else tp match {
-        case PolyType(tparams, res)    => typeParamsString(tp) + infoString(res)
-        case NullaryMethodType(res)    => infoString(res)
-        case MethodType(params, res)   => valueParamsString(tp) + infoString(res)
-        case _ if isStructuralThisType => ": " + owner.name
-        case _                         => ": " + tp
       }
+      loop(tp, followsParens = false)
     }
 
     def infosString = infos.toString

test/files/neg/abstract-report2.check

@@ -52,7 +52,7 @@ Missing implementations for 13 members. Stub implementations follow:
 
 class Baz[T] extends Collection[T]
       ^
-abstract-report2.scala:15: error: class Dingus needs to be abstract.
+abstract-report2.scala:21: error: class Dingus needs to be abstract.
 Missing implementations for 7 members. Stub implementations follow:
   // Members declared in scala.collection.IterableOnce
   def iterator: Iterator[(Set[Int], String)] = ???

test/files/neg/abstract-report2.scala

@@ -10,6 +10,12 @@ trait Xyz[T] {
   def foo(x: T): Boolean
 }
 
+trait Symbolic {
+  def --? : Int
+  def --!(i: Int): Unit
+  def unary_~ : Long
+}
+
 trait Bippy[T1, T2, T3] extends collection.IterableOps[(T2, String), List, List[(T2, String)]] with Xyz[T3]
 
 class Dingus extends Bippy[String, Set[Int], List[Int]]

test/files/neg/logImplicits.check

@@ -7,10 +7,10 @@ logImplicits.scala:9: applied implicit conversion from String("abc") to ?{def ma
 logImplicits.scala:17: inferred view from String("abc") to Int via C.this.convert: (p: "abc"): Int
   math.max(122, x: Int)
                 ^
-logImplicits.scala:21: applied implicit conversion from Int(1) to ?{def ->: ?} = final implicit def ArrowAssoc[A](self: A): ArrowAssoc[A]
+logImplicits.scala:21: applied implicit conversion from Int(1) to ?{def -> : ?} = final implicit def ArrowAssoc[A](self: A): ArrowAssoc[A]
   def f = (1 -> 2) + "c"
            ^
-logImplicits.scala:21: applied implicit conversion from (Int, Int) to ?{def +: ?} = final implicit def any2stringadd[A](self: A): any2stringadd[A]
+logImplicits.scala:21: applied implicit conversion from (Int, Int) to ?{def + : ?} = final implicit def any2stringadd[A](self: A): any2stringadd[A]
   def f = (1 -> 2) + "c"
              ^
 logImplicits.scala:24: error: class Un needs to be abstract. Missing implementation for:

test/files/presentation/infix-completion.check

@@ -158,9 +158,9 @@ def toOctalString: String
 def toRadians: Double
 def toShort: Short
 def toString(): String
-def unary_+: Int
-def unary_-: Int
-def unary_~: Int
+def unary_+ : Int
+def unary_- : Int
+def unary_~ : Int
 def until(end: Int): scala.collection.immutable.Range
 def until(end: Int, step: Int): scala.collection.immutable.Range
 def until(end: Long): scala.collection.immutable.NumericRange.Exclusive[Long]

test/files/presentation/infix-completion2.check

@@ -158,9 +158,9 @@ def toOctalString: String
 def toRadians: Double
 def toShort: Short
 def toString(): String
-def unary_+: Int
-def unary_-: Int
-def unary_~: Int
+def unary_+ : Int
+def unary_- : Int
+def unary_~ : Int
 def until(end: Int): scala.collection.immutable.Range
 def until(end: Int, step: Int): scala.collection.immutable.Range
 def until(end: Long): scala.collection.immutable.NumericRange.Exclusive[Long]