Fix completion test

Author: odersky

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

@@ -42,15 +42,15 @@ class CompletionTest {
 
   @Test def completionFromSyntheticPackageObject: Unit = {
     code"class Foo { val foo: IArr${m1} }".withSource
-      .completion(m1, Set(("IArray", Module, "IArray$"),
+      .completion(m1, Set(("IArray", Module, "IArray"),
                           ("IArray", Field, "scala.IArray")))
   }
 
   @Test def completionFromJavaDefaults: Unit = {
     code"class Foo { val foo: Runn${m1} }".withSource
       .completion(m1, Set(
         ("Runnable", Class, "java.lang.Runnable"),
-        ("Runnable", Module, "Runnable$")
+        ("Runnable", Module, "Runnable")
       ))
   }
 
@@ -121,7 +121,7 @@ class CompletionTest {
     withSources(
       code"""object O { object MyObject }""",
       code"""import O.My${m1}"""
-    ).completion(m1, Set(("MyObject", Module, "O.MyObject$")))
+    ).completion(m1, Set(("MyObject", Module, "O.MyObject")))
   }
 
   @Test def importCompleteWithClassAndCompanion: Unit = {
@@ -132,7 +132,7 @@ class CompletionTest {
       code"""package pgk1
              import pkg0.F${m1}"""
     ).completion(m1, Set(("Foo", Class, "pkg0.Foo"),
-                         ("Foo", Module, "pkg0.Foo$")))
+                         ("Foo", Module, "pkg0.Foo")))
   }
 
   @Test def importCompleteIncludePackage: Unit = {
@@ -157,15 +157,15 @@ class CompletionTest {
     ).completion(m1, Set(("myVal", Field, "Int"),
                          ("myDef", Method, "=> Int"),
                          ("myVar", Variable, "Int"),
-                         ("myObject", Module, "MyObject.myObject$"),
+                         ("myObject", Module, "MyObject.myObject"),
                          ("myClass", Class, "MyObject.myClass"),
                          ("myTrait", Class, "MyObject.myTrait")))
   }
 
   @Test def importJavaClass: Unit = {
     code"""import java.io.FileDesc${m1}""".withSource
       .completion(m1, Set(("FileDescriptor", Class, "java.io.FileDescriptor"),
-                          ("FileDescriptor", Module, "java.io.FileDescriptor$")))
+                          ("FileDescriptor", Module, "java.io.FileDescriptor")))
   }
 
   @Test def importJavaStaticMethod: Unit = {
@@ -190,13 +190,13 @@ class CompletionTest {
     code"""object O {
              val out = java.io.FileDesc${m1}
            }""".withSource
-      .completion(m1, Set(("FileDescriptor", Module, "java.io.FileDescriptor$")))
+      .completion(m1, Set(("FileDescriptor", Module, "java.io.FileDescriptor")))
   }
 
   @Test def importRename: Unit = {
     code"""import java.io.{FileDesc${m1} => Foo}""".withSource
       .completion(m1, Set(("FileDescriptor", Class, "java.io.FileDescriptor"),
-                          ("FileDescriptor", Module, "java.io.FileDescriptor$")))
+                          ("FileDescriptor", Module, "java.io.FileDescriptor")))
   }
 
   @Test def importGivenByType: Unit = {
@@ -257,14 +257,14 @@ class CompletionTest {
           |  object bat
           |  val bizz: ba${m1}
           |}""".withSource
-      .completion(m1, Set(("bar", Field, "Bar"), ("bat", Module, "Foo.bat$")))
+      .completion(m1, Set(("bar", Field, "Bar"), ("bat", Module, "Foo.bat")))
   }
 
   @Test def completionOnRenamedImport: Unit = {
     code"""import java.io.{FileDescriptor => AwesomeStuff}
            trait Foo { val x: Awesom$m1 }""".withSource
       .completion(m1, Set(("AwesomeStuff", Class, "java.io.FileDescriptor"),
-                          ("AwesomeStuff", Module, "java.io.FileDescriptor$")))
+                          ("AwesomeStuff", Module, "java.io.FileDescriptor")))
   }
 
   @Test def completionOnRenamedImport2: Unit = {
@@ -274,7 +274,7 @@ class CompletionTest {
              val x: MyImp$m1
            }""".withSource
       .completion(m1, Set(("MyImportedSymbol", Class, "java.io.FileDescriptor"),
-                          ("MyImportedSymbol", Module, "java.io.FileDescriptor$")))
+                          ("MyImportedSymbol", Module, "java.io.FileDescriptor")))
   }
 
   @Test def completionRenamedAndOriginalNames: Unit = {
@@ -284,9 +284,9 @@ class CompletionTest {
           |  val x: Hash$m1
           |}""".withSource
       .completion(m1, Set(("HashMap", Class, "java.util.HashMap"),
-                          ("HashMap", Module, "java.util.HashMap$"),
+                          ("HashMap", Module, "java.util.HashMap"),
                           ("HashMap2", Class, "java.util.HashMap"),
-                          ("HashMap2", Module, "java.util.HashMap$")))
+                          ("HashMap2", Module, "java.util.HashMap")))
   }
 
   @Test def completionRenamedThrice: Unit = {
@@ -297,11 +297,11 @@ class CompletionTest {
           |  val x: MyHash$m1
           |}""".withSource
       .completion(m1, Set(("MyHashMap", Class, "java.util.HashMap"),
-                          ("MyHashMap", Module, "java.util.HashMap$"),
+                          ("MyHashMap", Module, "java.util.HashMap"),
                           ("MyHashMap2", Class, "java.util.HashMap"),
-                          ("MyHashMap2", Module, "java.util.HashMap$"),
+                          ("MyHashMap2", Module, "java.util.HashMap"),
                           ("MyHashMap3", Class, "java.util.HashMap"),
-                          ("MyHashMap3", Module, "java.util.HashMap$")))
+                          ("MyHashMap3", Module, "java.util.HashMap")))
   }
 
   @Test def completeFromWildcardImports: Unit = {
@@ -372,7 +372,7 @@ class CompletionTest {
     code"""object Test {
           |  def x = Tes$m1
           |}""".withSource
-      .completion(m1, Set(("Test", Module, "Test$")))
+      .completion(m1, Set(("Test", Module, "Test")))
   }
 
   @Test def completeBothDefinitionsForEqualNestingLevels: Unit = {
@@ -524,9 +524,9 @@ class CompletionTest {
           |  val ZZZZ = YY$m1
           |  type ZZZZ = YY$m2
           |}""".withSource
-      .completion(m1, Set(("YYYY", Field, "Int$")))
+      .completion(m1, Set(("YYYY", Field, "Int")))
       .completion(m2, Set(("YYYY", Field, "XXXX.YYYY"),
-                          ("YYYY", Field, "Int$")))
+                          ("YYYY", Field, "Int")))
   }
 
   @Test def completeRespectingAccessModifiers: Unit = {