Print a space between a symbolic operator and a colon.

This affects both RefinedPrinter and ShowSougrceCode. Another example of the tax we pay
for maintaining both.

It required Chars to be moved to scala.tasty.

Author: odersky

compiler/src/dotty/tools/dotc/core/NameOps.scala

@@ -4,7 +4,7 @@ package core
 import java.security.MessageDigest
 import scala.io.Codec
 import Names._, StdNames._, Contexts._, Symbols._, Flags._, NameKinds._, Types._
-import util.Chars
+import scala.tasty.util.Chars
 import Chars.isOperatorPart
 import Definitions._
 

compiler/src/dotty/tools/dotc/core/Names.scala

@@ -7,7 +7,7 @@ import util.NameTransformer
 import printing.{Showable, Texts, Printer}
 import Texts.Text
 import StdNames.str
-import util.Chars.isIdentifierStart
+import scala.tasty.util.Chars.isIdentifierStart
 import collection.immutable
 import config.Config
 import java.util.HashMap

compiler/src/dotty/tools/dotc/parsing/CharArrayReader.scala

@@ -2,7 +2,7 @@ package dotty.tools
 package dotc
 package parsing
 
-import util.Chars._
+import scala.tasty.util.Chars._
 
 abstract class CharArrayReader { self =>
 

compiler/src/dotty/tools/dotc/parsing/JavaScanners.scala

@@ -7,7 +7,7 @@ import Scanners._
 import util.SourceFile
 import JavaTokens._
 import scala.annotation.{ switch, tailrec }
-import util.Chars._
+import scala.tasty.util.Chars._
 
 object JavaScanners {
 

compiler/src/dotty/tools/dotc/parsing/Scanners.scala

@@ -6,7 +6,7 @@ import core.Names._, core.Contexts._, core.Decorators._, util.Positions._
 import core.StdNames._, core.Comments._
 import util.SourceFile
 import java.lang.Character.isDigit
-import util.Chars._
+import scala.tasty.util.Chars._
 import util.NameTransformer.avoidIllegalChars
 import Tokens._
 import scala.annotation.{ switch, tailrec }

compiler/src/dotty/tools/dotc/parsing/package.scala

@@ -1,6 +1,6 @@
 package dotty.tools.dotc
 
-import util.Chars._
+import scala.tasty.util.Chars._
 import core.Names.Name
 import core.StdNames.nme
 import core.NameOps._

compiler/src/dotty/tools/dotc/parsing/xml/MarkupParserCommon.scala

@@ -10,7 +10,7 @@ package parsing
 package xml
 
 import Utility._
-import util.Chars.SU
+import scala.tasty.util.Chars.SU
 
 
 

compiler/src/dotty/tools/dotc/parsing/xml/MarkupParsers.scala

@@ -6,7 +6,7 @@ package xml
 import scala.collection.mutable
 import mutable.{ Buffer, ArrayBuffer, ListBuffer }
 import scala.util.control.ControlThrowable
-import util.Chars.SU
+import scala.tasty.util.Chars.SU
 import Parsers._
 import util.Positions._
 import core._

compiler/src/dotty/tools/dotc/parsing/xml/Utility.scala

@@ -12,7 +12,7 @@ import scala.collection.mutable
  * @author Burak Emir
  */
 object Utility {
-  import util.Chars.SU
+  import scala.tasty.util.Chars.SU
 
   private val unescMap = Map(
     "lt"    -> '<',

compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala

@@ -19,6 +19,7 @@ import typer.ProtoTypes._
 import Trees._
 import TypeApplications._
 import Decorators._
+import scala.tasty.util.Chars.isOperatorPart
 import transform.TypeUtils._
 
 import language.implicitConversions
@@ -345,7 +346,11 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
           }
         }
       case Typed(expr, tpt) =>
-        changePrec(InfixPrec) { toText(expr) ~ ": " ~ toText(tpt) }
+        changePrec(InfixPrec) {
+          val exprText = toText(expr)
+          val line = exprText.lastLine
+          val colon = if (!line.isEmpty && isOperatorPart(line.last)) " :" else ":"
+          exprText ~ colon ~ toText(tpt) }
       case NamedArg(name, arg) =>
         toText(name) ~ " = " ~ toText(arg)
       case Assign(lhs, rhs) =>

compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala

@@ -9,7 +9,7 @@ import printing.SyntaxHighlighting
 import diagnostic.{ErrorMessageID, Message, MessageContainer}
 import diagnostic.messages._
 import util.SourcePosition
-import util.Chars.{ LF, CR, FF, SU }
+import scala.tasty.util.Chars.{ LF, CR, FF, SU }
 import scala.annotation.switch
 
 import scala.collection.mutable

compiler/src/dotty/tools/dotc/transform/TreeChecker.scala

@@ -18,7 +18,7 @@ import typer.ErrorReporting._
 import reporting.ThrowingReporter
 import ast.Trees._
 import ast.{tpd, untpd}
-import util.Chars._
+import scala.tasty.util.Chars._
 import collection.mutable
 import ProtoTypes._
 

compiler/src/dotty/tools/dotc/util/CommentParsing.scala

@@ -13,7 +13,7 @@ package dotty.tools.dotc.util
   * handled by dottydoc.
   */
 object CommentParsing {
-  import Chars._
+  import scala.tasty.util.Chars._
 
   /** Returns index of string `str` following `start` skipping longest
    *  sequence of whitespace characters characters (but no newlines)

compiler/src/dotty/tools/dotc/util/NameTransformer.scala

@@ -4,7 +4,7 @@ package util
 
 import core.Names._
 import collection.mutable
-import util.Chars.isValidJVMMethodChar
+import scala.tasty.util.Chars
 
 import scala.annotation.internal.sharable
 
@@ -47,11 +47,11 @@ object NameTransformer {
    */
   def avoidIllegalChars(name: SimpleName): SimpleName = {
     var i = name.length - 1
-    while (i >= 0 && isValidJVMMethodChar(name(i))) i -= 1
+    while (i >= 0 && Chars.isValidJVMMethodChar(name(i))) i -= 1
     if (i >= 0)
       termName(
         name.toString.flatMap(ch =>
-          if (isValidJVMMethodChar(ch)) ch.toString else "$u%04X".format(ch.toInt)))
+          if (Chars.isValidJVMMethodChar(ch)) ch.toString else "$u%04X".format(ch.toInt)))
     else name
   }
 

compiler/src/dotty/tools/dotc/util/SourceFile.scala

@@ -6,7 +6,7 @@ import scala.collection.mutable.ArrayBuffer
 import dotty.tools.io._
 import java.util.regex.Pattern
 import java.io.IOException
-import Chars._
+import scala.tasty.util.Chars._
 import Positions._
 import scala.io.Codec
 import scala.annotation.internal.sharable

compiler/src/dotty/tools/dotc/util/Chars.scala renamed to library/src/scala/tasty/util/Chars.scala

@@ -1,9 +1,4 @@
-/* NSC -- new Scala compiler
- * Copyright 2006-2012 LAMP/EPFL
- * @author  Martin Odersky
- */
-package dotty.tools.dotc
-package util
+package scala.tasty.util
 
 import scala.annotation.switch
 import java.lang.{Character => JCharacter}

library/src/scala/tasty/util/ShowSourceCode.scala

@@ -354,7 +354,7 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
           case _ =>
             inParens {
               printTree(term)
-              this += ": "
+              this += (if (Chars.isOperatorPart(sb.last)) " : " else ": ")
               def printTypeOrAnnots(tpe: Type): Unit = tpe match {
                 case Type.AnnotatedType(tp, annot) if tp == term.tpe =>
                   printAnnotation(annot)

tests/pos/test.sc

@@ -0,0 +1,87 @@
+val x = 22
+
+val y = x * 2
+def square(x: Double) = x * x
+square(33)
+
+class Bar
+type L = scala.List
+
+def zip[T, U](xs: List[T], ys: List[U]) = {
+  val (ps, _) = xs.foldLeft((Nil: List[(T, U)], ys)) {
+    (acc, x) =>
+      val (ps, ys) = acc
+      ys match {
+        case Nil => acc
+        case y :: ys => ((x, y) :: ps, ys)
+      }
+    }
+    ps.reverse
+  }
+zip(List(1, 2, 3, 4), List("a", "b", "c"))
+
+def zips(xss: List[List[Int]]): List[List[Int]] = {
+  if (xss.forall(_.nonEmpty))
+    xss.map(_.head) :: zips(xss.map(_.tail))
+  else Nil
+}
+
+zips(
+  List(
+    List(1, 2, 3),
+    List(11, 22),
+    List(111, 222, 333, 444)
+    ))
+
+abstract class A {
+  def foo: Any
+}
+abstract class B extends A {
+  def foo: Int
+}
+abstract class C extends A {
+  def foo: Int
+}
+def f: A | B = ???
+def g = f.foo
+
+
+val xx = 22
+
+trait T {
+  def apply(x: Int): Unit = ()
+}
+class CC extends T {
+  override def apply(x: Int) = super.apply(1)
+}
+object o {
+  def apply(): String = ""
+}
+val s: String = o()
+
+Double.NaN.equals(Double.NaN)
+
+trait Status
+case object A extends Status
+case object B extends Status
+
+if (true) A else B
+
+case class Wrapper(i: Int)
+
+trait Functor[F[_]] {
+  def map[A, B](x: F[A], f: A => B): F[B]
+}
+
+class Deriver[F[_]] {
+  def foldLeft[A, B](result: A, value: B): A
+}
+
+trait Eq[A] {
+  def equals(x: A, y: A): Boolean
+}
+
+trait DC { type TT }
+
+def m(x: DC): x.TT = ???
+val meta = m