Fix DiagnosticsTests

Author: odersky

language-server/test/dotty/tools/languageserver/DiagnosticsTest.scala

@@ -12,7 +12,7 @@ class DiagnosticsTest {
           |  val x: Int = $m1"foo"$m2
           |}""".withSource
       .diagnostics(m1,
-        (m1 to m2, """Found:    String("foo")
+        (m1 to m2, """Found:    ("foo" : String)
                      |Required: Int""".stripMargin, Error, Some(TypeMismatchID))
       )
 

language-server/test/dotty/tools/languageserver/HoverTest.scala

@@ -46,24 +46,24 @@ class HoverTest {
           |  ${m1}val x = ${m2}8$m3; ${m4}x$m5
           |}""".withSource
       .hover(m1 to m2, hoverContent("Int"))
-      .hover(m2 to m3, hoverContent("Int(8)"))
+      .hover(m2 to m3, hoverContent("(8 : Int)"))
       .hover(m4 to m5, hoverContent("Int"))
   }
 
   @Test def hoverOnValDef1: Unit = {
     code"""class Foo {
           |  ${m1}final val x = 8$m2; ${m3}x$m4
           |}""".withSource
-      .hover(m1 to m2, hoverContent("Int(8)"))
-      .hover(m3 to m4, hoverContent("Int(8)"))
+      .hover(m1 to m2, hoverContent("(8 : Int)"))
+      .hover(m3 to m4, hoverContent("(8 : Int)"))
   }
 
   @Test def hoverOnDefDef0: Unit = {
     code"""class Foo {
           |  ${m1}def x = ${m2}8$m3; ${m4}x$m5
           |}""".withSource
       .hover(m1 to m2, hoverContent("Int"))
-      .hover(m2 to m3, hoverContent("Int(8)"))
+      .hover(m2 to m3, hoverContent("(8 : Int)"))
       .hover(m4 to m5, hoverContent("Int"))
   }
 
@@ -83,7 +83,7 @@ class HoverTest {
           |  ${m5}y($m6)$m7
           |}
         """.withSource
-      .hover(m1 to m2, hoverContent("String(\"abc\")" ))
+      .hover(m1 to m2, hoverContent("(\"abc\" : String)"))
       .hover(m3 to m4, hoverContent("String"))
       .hover(m5 to m6, hoverContent("(): Int"))
       .hover(m6 to m7, hoverContent("Int"))
@@ -185,8 +185,8 @@ class HoverTest {
           |class annot4 extends scala.annotation.Annotation
           |class annot5 extends scala.annotation.Annotation
           |""".withSource
-      .hover(m1 to m2, hoverContent("Int(1)"))
-      .hover(m3 to m4, hoverContent("Int(1) @annot1 @annot2 @annot3 @annot4 @annot5"))
+      .hover(m1 to m2, hoverContent("(1 : Int)"))
+      .hover(m3 to m4, hoverContent("(1 : Int) @annot1 @annot2 @annot3 @annot4 @annot5"))
   }
 
   @Test def unicodeChar: Unit = {
@@ -207,6 +207,6 @@ class HoverTest {
           |val y = ${m1}this${m2}.x""".withSource
       // The test framework will place the code above in a virtual file called Source0.scala,
       // sp the top-level definitions should be enclosed in an object called `Source0$package`.
-      .hover(m1 to m2, hoverContent("hello.Source0$package.type(hello.Source0$package)"))
+      .hover(m1 to m2, hoverContent("(hello.Source0$package : hello.Source0$package.type)"))
   }
 }