Update tests to new syntax

Author: odersky

bench/tests/Vector.scala

@@ -12,7 +12,7 @@ package immutable
 
 import scala.annotation.unchecked.uncheckedVariance
 import scala.compat.Platform
-import scala.collection.generic._
+import scala.collection.generic.*
 import scala.collection.mutable.Builder
 
 /** Companion object to the Vector class

bench/tests/power-macro/PowerInlined-1.scala

@@ -1,5 +1,5 @@
 object PowerInlined {
-  import PowerMacro._
+  import PowerMacro.*
 
   power(1, 5.0) // 1 quotes to unpickle
 }

bench/tests/power-macro/PowerInlined.scala

@@ -1,5 +1,5 @@
 object PowerInlined {
-  import PowerMacro._
+  import PowerMacro.*
 
   power(1, 5.0) // 1 quotes to unpickle
 }

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

@@ -3141,9 +3141,10 @@ object Parsers {
             case USCORE => wildcardSelector()
             case GIVEN => givenSelector()
             case _ =>
-              if !idOK then syntaxError(i"named imports cannot follow wildcard imports")
               if isIdent(nme.raw.STAR) then wildcardSelector()
-              else namedSelector(termIdent())
+              else
+                if !idOK then syntaxError(i"named imports cannot follow wildcard imports")
+                namedSelector(termIdent())
         }
         val rest =
           if in.token == COMMA then

scala3doc-testcases/src/tests/annotations.scala

@@ -3,7 +3,7 @@ package annotations
 
 import scala.annotation.StaticAnnotation
 
-import java.lang.{Enum => _}
+import java.lang.Enum as _
 import scala.reflect.Enum
 
 class SomeObject(val s: String)

scala3doc-testcases/src/tests/classSignatureTestSource.scala

@@ -1,8 +1,8 @@
 package tests.classSignatureTestSource
 
-import scala.collection._
+import scala.collection.*
 import scala.deprecated
-import scala.annotation._
+import scala.annotation.*
 import scala.math.{Pi, max}
 import example.level2.Documentation
 

scala3doc-testcases/src/tests/externalLocations/javadoc.scala

@@ -1,6 +1,6 @@
 package tests.externalJavadoc
 
-import java.util._
+import java.util.*
 
 class Test {
   def a: Map.Entry[String, String] = ???

scala3doc-testcases/src/tests/externalLocations/scala3doc.scala

@@ -1,6 +1,6 @@
 package tests.externalScala3doc
 
-import scala.util.matching._
+import scala.util.matching.*
 
 class Test {
   def a: String = ???

scala3doc-testcases/src/tests/externalLocations/scaladoc.scala

@@ -1,6 +1,6 @@
 package tests.externalScaladoc
 
-import scala.util.matching._
+import scala.util.matching.*
 
 class Test {
   def a: String = ???

scala3doc-testcases/src/tests/typesSignatures.scala

@@ -46,6 +46,6 @@ class Operators
   // infix type op[A, B] = Int
   // type Binary2 = String op Int
 
-  import scala.compiletime.ops.boolean._
+  import scala.compiletime.ops.boolean.*
   type Unary = ![true]
 }

tests/bench/inductive-implicits.scala

@@ -58,7 +58,7 @@ package shapeless {
   }
 }
 
-import shapeless._
+import shapeless.*
 
 object Test extends App {
   val sel = Selector[L, Boolean]

tests/bench/power-macro/PowerInlined-1.scala

@@ -1,6 +1,6 @@
 
 object PowerInlined {
-  import PowerMacro._
+  import PowerMacro.*
 
   power(1, 5.0) // 1 quotes to unpickle
 }

tests/bench/power-macro/PowerInlined-1k.scala

@@ -1,6 +1,6 @@
 
 object PowerInlined1K {
-  import PowerMacro._
+  import PowerMacro.*
 
   power(Int.MaxValue, 5.0)
   power(Int.MaxValue, 5.0)

tests/bench/power-macro/PowerMacro.scala

@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.*
 
 object PowerMacro {
 

tests/bench/string-interpolation-macro/Macro.scala

@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.*
 
 object Macro {
 

tests/bench/string-interpolation-macro/Test.scala

@@ -1,4 +1,4 @@
-import Macro._
+import Macro.*
 
 class Test:
   def test: String = x"a${1}b${2}c${3}d${4}e${5}f"

tests/explicit-nulls/pos/java-varargs.scala

@@ -1,5 +1,5 @@
 
-import java.nio.file._
+import java.nio.file.*
 import java.nio.file.Paths
 
 

tests/fuzzy/015ea9cf2d07b27200a33c4451bfc4c93afe213e.scala

@@ -2,7 +2,7 @@ class i0 {
 type Int;
 val i1 = 2
 private val i2 = (List(): List[Int])
-import i1.{ () => Double(_)).asInstanceOf[i2]) } else new i0(1)
+import i1.{ () as Double(_)).asInstanceOf[i2]) } else new i0(1)
 List(List(1), None)
 println(i1(17))
 new _

tests/fuzzy/14b960e57195554a6a085eae8e039a949e8b106d.scala

@@ -2,6 +2,6 @@ class i0 {
 val i1: (Any => String) = ???
 }
 object i0 {
-import Ordering.{ implicitly => } (true: Boolean) match { case _: i1 => true }
+import Ordering.{ implicitly as } (true: Boolean) match { case _: i1 as true }
 def i1(erased i2: Int): Int = { i1: Set[Int] => }
 }

tests/fuzzy/1d1f57703bbd37dd850480cb5d99130930be08c9.scala

@@ -1,5 +1,5 @@
 object App {
-import i0.{ i1 => false }
+import i0.{ i1 as false }
 def Array(i0: Int => Boolean): Any = ???
 }
 object i2 {

tests/fuzzy/471d33abf565d5dd3691679237f148638f4ff115.scala

@@ -45,7 +45,7 @@ private def i3 = 1000 * 60 * 24 * i2 = 5 + i4 + i2; case 5 => 0
 }
 }
 }
-import i0.{ toInt, i2 => this }
+import i0.{ toInt, i2 as this }
 val i7 = new i4
 val i5 = new i0
 val i6 = new i0

tests/fuzzy/628b3c175445b95d9155223a2651ad97c6091657.scala

@@ -11,7 +11,7 @@ type i6
 type i79 <: i7{type i9, i10 <: i5.i2] }
 val i9: i8 { type i4 = i13.i9 }
 val i16 = new i1 {} }
-import i9.{ Set, i8 => }i9 {
+import i9.{ Set, i8 as }i9 {
 object i10 extends i6 with i4 {
 val i5 = new i9
 var i9: i3.i2

tests/fuzzy/670b1276fc9546345aa3a1f1cd07439d77fbb913.scala

@@ -13,7 +13,7 @@ def i4(i5: Any) = ()
 object i6 {
 def i7(i8: String): Int = i11
 val i11 = new i1 {
-import i2.{ i7 => } class i10 {
+import i2.{ i7 as } class i10 {
 val i10 = new Array(10)
 val i11: i0 = i13 case i10 => i13.i10
 case _ => case _ => case _ => throw new i17

tests/fuzzy/827a8c670660b1c8bbe210e7a9dffea632ee39ea.scala

@@ -19,7 +19,7 @@ def i16() = 55
 }
 object i11 extends i12 {
 override def i16: i1 = ???
-import i8._
+import i8.*
 i15.size = ???
 }
 }

tests/fuzzy/87b1e375168a7888470eefc1fb867d0c9f550865.scala

@@ -25,7 +25,7 @@ type i11 <: i10
 type i19 = i10
 val i11: i5[i12] = ???
 }
-import i12._
+import i12.*
 val i20: i12 = ???
 i16 i14 {
 type i18[i3[i1, i2]] = i15[i5[i10]#i14,

tests/fuzzy/87e911d4a30f9df0be954fcb2cd693c86d4ea19d.scala

@@ -7,7 +7,7 @@ trait i6 extends i3 {
 var i1: Int
 }
 class i4 {
-import i0._
+import i0.*
 val i7 = new i3 {}
 }
 object i8 {

tests/fuzzy/95bbe2ee00e10cbb3890bcbfe5da2b584a8388e1.scala

@@ -4,7 +4,7 @@ def i1(i2: String)(i3: String): String = ???
 }
 class i4() {
 def apply(i1: Int): Int = i2 match { case _: Throwable
-import scala.annotation.i1._
+import scala.annotation.i1.*
 type i2 = i0 { type i1 }
 trait i3 {
 type i1 <: i0

tests/fuzzy/c091e02ebdd6f7de5e190325fdbb80c8aca00c62.scala

@@ -1,4 +1,4 @@
-import scala.i0.{ i1 => }
+import scala.i0.{ i1 as }
 object i2 {
 private[this] { object i3 extends i0 { new i0 { case i1 => type i2 = Int } }
 implicit object i4 extends Object {

tests/fuzzy/comment7.scala

@@ -8,6 +8,6 @@ case i0(i1, i1) => case _ => i2
 }
 }
 object i5 {
-import collection.mutable._
+import collection.mutable.*
 try { ??? mutable { case i1(i5, i3, i4) => i5 })
 }

tests/fuzzy/d9366dfb4c3f01352f197fec820c771a96500a98.scala

@@ -6,6 +6,6 @@ val i5 = i1(i4, )
 def i6(i5: String)(i6: => i3.asInstanceOf[String]) = i4.length
 }
 object i7 {
-import i6._
+import i6.*
 val i7: Int = 1
 val i1 = new i2() }

tests/fuzzy/dc731deada78bc82a0367866d3b7be065344d6f3.scala

@@ -6,4 +6,4 @@ new i0 {
 implicit def i4: Any = super[String]
 }
 trait i3
-class i4 extends import +({ classTag) => i5 }(Tuple2.i6) }
+class i4 extends import +({ classTag) as i5 }(Tuple2.i6) }

tests/idempotency/IdempotencyCheck.scala

@@ -1,9 +1,9 @@
 
-import java.io.{File => JFile}
-import java.nio.file.{ Files => JFiles, Path => JPath, Paths => JPaths }
-import java.util.stream.{ Stream => JStream }
+import java.io.File as JFile
+import java.nio.file.{ Files as JFiles, Path as JPath, Paths as JPaths }
+import java.util.stream.Stream as JStream
 
-import scala.collection.JavaConverters._
+import scala.collection.JavaConverters.*
 
 object IdempotencyCheck {
   val blacklisted = Set(

tests/init/crash/tuples.scala

@@ -1,4 +1,4 @@
-import Function._
+import Function.*
 
 object Test extends App {
   var xyz: (Int, String, Boolean) = _  // error

tests/init/neg/inner-pat_iuli.scala

@@ -7,7 +7,7 @@ trait Ops { self: MyCodes =>
 }
 
 trait Blox { self: MyCodes =>
-  import opcodes._
+  import opcodes.*
   class Basick {
     var foo: Instru = null
 

tests/init/neg/lazylist1.scala

@@ -9,7 +9,7 @@ object LazyList {
   }
 }
 
-import LazyList._
+import LazyList.*
 
 final class Test {
   lazy val a: LazyList[Int] = 5 #:: b

tests/init/neg/lazylist2.scala

@@ -17,7 +17,7 @@ object LazyList {
   }
 }
 
-import LazyList._
+import LazyList.*
 
 final class Test1 {
   lazy val a: LazyList[Int] = 5 #:: b

tests/init/pos/Properties.scala

@@ -11,7 +11,7 @@ package scala
 package util
 
 import java.io.{ IOException, PrintWriter }
-import java.util.jar.Attributes.{ Name => AttributeName }
+import java.util.jar.Attributes.Name as AttributeName
 
 private[scala] trait PropertiesTrait {
   protected def propCategory: String      // specializes the remainder of the values

tests/init/pos/assignments.scala

@@ -20,7 +20,7 @@ object assignments {
   c.x = c.x * 2
 
   val cc = c
-  import cc._
+  import cc.*
   x = x + 1
   x *= 2
 }

tests/invalid/pos/specializes-sym-crash.scala

@@ -1,5 +1,5 @@
 // This relies on the naming of the transformed classes which will have to change in the new stdlib.
-import scala.collection._
+import scala.collection.*
 
 trait Foo[+A,
                      +Coll,

tests/invalid/pos/t2782.scala

@@ -1,4 +1,4 @@
-import scala.{collection => sc}
+import scala.collection as sc
 
 object Test {
   trait Foo[T]

tests/invalid/pos/t4365/a_1.scala

@@ -1,5 +1,5 @@
 // Invalid because it relies on internal traits of views that will change their names.
-import scala.collection._
+import scala.collection.*
 
 trait SeqViewLike[+A,
                   +Coll,

tests/invalid/pos/t4365/b_1.scala

@@ -1,4 +1,4 @@
-import scala.collection._
+import scala.collection.*
 
 trait GenSeqView0[+A, +Coll]
 

tests/invalid/pos/t533.scala

@@ -1,4 +1,4 @@
-import scala.actors._
+import scala.actors.*
 
 object test extends Actor {
   def act(): Unit = {

tests/invalid/pos/t8023.scala

@@ -1,5 +1,5 @@
 // Invalid because nested hk type parameters are no longer allowed
-import language._
+import language.*
 
 
 object Test {

tests/invalid/run/Tuple.scala

@@ -13,7 +13,7 @@ object Empty extends Tuple
 final case class *: [H, T <: Tuple](hd: H, tl: T) extends Tuple
 
 object Tuple {
-  import typelevel._
+  import typelevel.*
   type Empty = Empty.type
 
   class TupleOps(val xs: Tuple) extends AnyVal {

tests/invalid/run/typelevel-patmat.scala

@@ -17,7 +17,7 @@ case object HNil extends HList
 case class HCons [H, T <: HList](hd: H, tl: T) extends HList
 
 object Test extends App {
-  import typelevel._
+  import typelevel.*
   type HNil = HNil.type
   type Z = Z.type
 

tests/link/on-custom-lib/builder2.scala

@@ -1,5 +1,5 @@
 
-import strawman.collection.mutable._
+import strawman.collection.mutable.*
 
 object Test {
   def main(args: Array[String]): Unit = {

tests/link/on-custom-lib/map2.scala

@@ -1,4 +1,4 @@
-import strawman.collection._
+import strawman.collection.*
 
 object Test {
   def main(args: Array[String]): Unit = {