OrganizeImports.targetDialect = Scala3

bjaglin · Jan 22, 2024 · b5d4f35 · b5d4f35
1 parent cb5c0f2
commit b5d4f35
Show file tree

Hide file tree

Showing 55 changed files with 66 additions and 63 deletions.
diff --git a/.scalafix.conf b/.scalafix.conf
@@ -1,2 +1,3 @@
 rules = [OrganizeImports]
-OrganizeImports.removeUnused = false
+OrganizeImports.removeUnused = false
+OrganizeImports.targetDialect = Scala3
diff --git a/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala b/compiler/src/dotty/tools/backend/jvm/BCodeBodyBuilder.scala
@@ -7,7 +7,7 @@ import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.core.Constants.*
 import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Decorators.em
-import dotty.tools.dotc.core.Flags.{Label => LabelFlag, _}
+import dotty.tools.dotc.core.Flags.{Label as LabelFlag, *}
 import dotty.tools.dotc.core.Phases.*
 import dotty.tools.dotc.core.StdNames.nme
 import dotty.tools.dotc.core.StdNames.str

diff --git a/compiler/src/dotty/tools/backend/jvm/BTypesFromSymbols.scala b/compiler/src/dotty/tools/backend/jvm/BTypesFromSymbols.scala
@@ -5,8 +5,8 @@ package jvm
 import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Flags.*
 import dotty.tools.dotc.core.Phases
-import dotty.tools.dotc.core.Phases.Phase
 import dotty.tools.dotc.core.Phases.*
+import dotty.tools.dotc.core.Phases.Phase
 import dotty.tools.dotc.core.StdNames
 import dotty.tools.dotc.core.Symbols.*
 

diff --git a/compiler/src/dotty/tools/backend/jvm/CodeGen.scala b/compiler/src/dotty/tools/backend/jvm/CodeGen.scala
@@ -4,8 +4,8 @@ import dotty.tools.dotc.CompilationUnit
 import dotty.tools.dotc.ast.Trees.PackageDef
 import dotty.tools.dotc.ast.Trees.ValDef
 import dotty.tools.dotc.ast.tpd
-import dotty.tools.dotc.core.Phases.Phase
 import dotty.tools.dotc.core.*
+import dotty.tools.dotc.core.Phases.Phase
 import dotty.tools.dotc.core.tasty.TastyUnpickler
 import dotty.tools.dotc.interfaces
 import dotty.tools.dotc.report

diff --git a/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala b/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
@@ -1,13 +1,13 @@
 package dotty.tools.backend.jvm
 
 import dotty.tools.dotc.ast.tpd
-import dotty.tools.dotc.core.Flags.*
 import dotty.tools.dotc.core.*
+import dotty.tools.dotc.core.Flags.*
 import dotty.tools.dotc.report
 import dotty.tools.dotc.util.ReadOnlyMap
 import dotty.tools.io.AbstractFile
 
-import java.io.{File => _}
+import java.io.File as _
 import scala.language.unsafeNulls
 import scala.reflect.ClassTag
 

diff --git a/compiler/src/dotty/tools/backend/jvm/GenBCode.scala b/compiler/src/dotty/tools/backend/jvm/GenBCode.scala
@@ -1,8 +1,8 @@
 package dotty.tools.backend.jvm
 
 import dotty.tools.dotc.CompilationUnit
-import dotty.tools.dotc.core.Phases.Phase
 import dotty.tools.dotc.core.*
+import dotty.tools.dotc.core.Phases.Phase
 import dotty.tools.dotc.interfaces.CompilerCallback
 import dotty.tools.dotc.report
 import dotty.tools.io.*

diff --git a/compiler/src/dotty/tools/backend/jvm/GeneratedClassHandler.scala b/compiler/src/dotty/tools/backend/jvm/GeneratedClassHandler.scala
@@ -7,8 +7,8 @@ import dotty.tools.dotc.profile.ThreadPoolFactory
 import dotty.tools.io.AbstractFile
 
 import java.nio.channels.ClosedByInterruptException
-import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy
 import java.util.concurrent.*
+import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy
 import scala.collection.mutable.ListBuffer
 import scala.compiletime.uninitialized
 import scala.concurrent.Await

diff --git a/compiler/src/dotty/tools/backend/jvm/PostProcessorFrontendAccess.scala b/compiler/src/dotty/tools/backend/jvm/PostProcessorFrontendAccess.scala
@@ -7,8 +7,8 @@ import dotty.tools.dotc.reporting.Message
 import dotty.tools.dotc.util.*
 import dotty.tools.io.AbstractFile
 
-import java.util.{Collection => JCollection}
-import java.util.{Map => JMap}
+import java.util.Collection as JCollection
+import java.util.Map as JMap
 import scala.collection.mutable.Clearable
 import scala.collection.mutable.HashSet
 import scala.compiletime.uninitialized

diff --git a/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala b/compiler/src/dotty/tools/backend/sjs/JSCodeGen.scala
@@ -11,16 +11,16 @@ import dotty.tools.dotc.transform.sjs.JSSymUtils.*
 import dotty.tools.dotc.util.SourcePosition
 import org.scalajs.ir
 import org.scalajs.ir.ClassKind
+import org.scalajs.ir.Names as jsNames
 import org.scalajs.ir.Names.ClassName
 import org.scalajs.ir.Names.MethodName
 import org.scalajs.ir.Names.SimpleMethodName
 import org.scalajs.ir.OriginalName
 import org.scalajs.ir.OriginalName.NoOriginalName
 import org.scalajs.ir.Position
+import org.scalajs.ir.Trees as js
 import org.scalajs.ir.Trees.OptimizerHints
-import org.scalajs.ir.{Names => jsNames}
-import org.scalajs.ir.{Trees => js}
-import org.scalajs.ir.{Types => jstpe}
+import org.scalajs.ir.Types as jstpe
 
 import scala.annotation.switch
 import scala.collection.mutable

diff --git a/compiler/src/dotty/tools/backend/sjs/JSEncoding.scala b/compiler/src/dotty/tools/backend/sjs/JSEncoding.scala
@@ -12,9 +12,9 @@ import org.scalajs.ir.Names.MethodName
 import org.scalajs.ir.Names.SimpleMethodName
 import org.scalajs.ir.OriginalName
 import org.scalajs.ir.OriginalName.NoOriginalName
+import org.scalajs.ir.Trees as js
+import org.scalajs.ir.Types as jstpe
 import org.scalajs.ir.UTF8String
-import org.scalajs.ir.{Trees => js}
-import org.scalajs.ir.{Types => jstpe}
 
 import scala.collection.mutable
 import scala.language.unsafeNulls

diff --git a/compiler/src/dotty/tools/backend/sjs/JSExportsGen.scala b/compiler/src/dotty/tools/backend/sjs/JSExportsGen.scala
@@ -6,14 +6,14 @@ import dotty.tools.dotc.transform.sjs.JSExportUtils.*
 import dotty.tools.dotc.transform.sjs.JSSymUtils.*
 import dotty.tools.dotc.util.SourcePosition
 import dotty.tools.dotc.util.SrcPos
+import org.scalajs.ir.Names as jsNames
 import org.scalajs.ir.Names.DefaultModuleID
 import org.scalajs.ir.OriginalName.NoOriginalName
 import org.scalajs.ir.Position
 import org.scalajs.ir.Position.NoPosition
+import org.scalajs.ir.Trees as js
 import org.scalajs.ir.Trees.OptimizerHints
-import org.scalajs.ir.{Names => jsNames}
-import org.scalajs.ir.{Trees => js}
-import org.scalajs.ir.{Types => jstpe}
+import org.scalajs.ir.Types as jstpe
 
 import scala.annotation.tailrec
 import scala.collection.mutable

diff --git a/compiler/src/dotty/tools/dotc/classpath/DirectoryClassPath.scala b/compiler/src/dotty/tools/dotc/classpath/DirectoryClassPath.scala
@@ -12,7 +12,7 @@ import dotty.tools.io.EfficientClassPath
 import dotty.tools.io.JDK9Reflectors
 import dotty.tools.io.PlainFile
 
-import java.io.{File => JFile}
+import java.io.File as JFile
 import java.net.URI
 import java.net.URL
 import java.nio.file.FileSystems

diff --git a/compiler/src/dotty/tools/dotc/classpath/FileUtils.scala b/compiler/src/dotty/tools/dotc/classpath/FileUtils.scala
@@ -6,8 +6,8 @@ package dotc.classpath
 
 import dotty.tools.io.AbstractFile
 
+import java.io.File as JFile
 import java.io.FileFilter
-import java.io.{File => JFile}
 import java.net.URL
 import scala.language.unsafeNulls
 

diff --git a/compiler/src/dotty/tools/dotc/config/Properties.scala b/compiler/src/dotty/tools/dotc/config/Properties.scala
@@ -4,7 +4,7 @@ package config
 
 import java.io.IOException
 import java.nio.charset.StandardCharsets
-import java.util.jar.Attributes.{ Name => AttributeName }
+import java.util.jar.Attributes.Name as AttributeName
 import scala.annotation.internal.sharable
 import scala.language.unsafeNulls
 

diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala
@@ -3,7 +3,7 @@ package dotc
 package core
 
 import scala.annotation.tailrec
-import scala.annotation.{threadUnsafe => tu}
+import scala.annotation.threadUnsafe as tu
 import scala.collection.mutable
 import scala.compiletime.uninitialized
 

diff --git a/compiler/src/dotty/tools/dotc/core/Hashable.scala b/compiler/src/dotty/tools/dotc/core/Hashable.scala
@@ -1,7 +1,7 @@
 package dotty.tools.dotc
 package core
 
-import scala.util.hashing.{ MurmurHash3 => hashing }
+import scala.util.hashing.MurmurHash3 as hashing
 
 import Types.*
 import annotation.tailrec

diff --git a/compiler/src/dotty/tools/dotc/core/Phases.scala b/compiler/src/dotty/tools/dotc/core/Phases.scala
@@ -3,8 +3,8 @@ package dotc
 package core
 
 import dotty.tools.backend.jvm.GenBCode
-import dotty.tools.dotc.transform.MegaPhase.*
 import dotty.tools.dotc.transform.*
+import dotty.tools.dotc.transform.MegaPhase.*
 
 import scala.annotation.internal.sharable
 import scala.collection.mutable.ListBuffer

diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -5,7 +5,7 @@ package core
 import java.lang.ref.WeakReference
 import scala.annotation.internal.sharable
 import scala.annotation.threadUnsafe
-import scala.util.hashing.{ MurmurHash3 => hashing }
+import scala.util.hashing.MurmurHash3 as hashing
 
 import Symbols.*
 import Flags.*

diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala
@@ -4,8 +4,8 @@ package core
 package tasty
 
 import dotty.tools.tasty.TastyBuffer.*
-import dotty.tools.tasty.TastyFormat.ASTsSection
 import dotty.tools.tasty.TastyFormat.*
+import dotty.tools.tasty.TastyFormat.ASTsSection
 
 import scala.language.unsafeNulls
 

diff --git a/compiler/src/dotty/tools/dotc/decompiler/IDEDecompilerDriver.scala b/compiler/src/dotty/tools/dotc/decompiler/IDEDecompilerDriver.scala
@@ -2,8 +2,8 @@ package dotty.tools
 package dotc
 package decompiler
 
-import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.*
+import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.tasty.TastyHTMLPrinter
 import dotty.tools.dotc.reporting.*
 import dotty.tools.io.AbstractFile

diff --git a/compiler/src/dotty/tools/dotc/fromtasty/Debug.scala b/compiler/src/dotty/tools/dotc/fromtasty/Debug.scala
@@ -4,7 +4,7 @@ package fromtasty
 
 import dotty.tools.io.Directory
 
-import java.io.{File => JFile}
+import java.io.File as JFile
 import java.nio.file.Files
 import java.nio.file.Paths
 import scala.language.unsafeNulls

diff --git a/compiler/src/dotty/tools/dotc/plugins/Plugins.scala b/compiler/src/dotty/tools/dotc/plugins/Plugins.scala
@@ -11,7 +11,7 @@ import Contexts.*
 import Decorators.em
 import config.{ PathResolver, Feature }
 import Phases.*
-import config.Printers.plugins.{ println => debug }
+import config.Printers.plugins.println as debug
 import config.Properties
 
 /** Support for run-time loading of compiler plugins.

diff --git a/compiler/src/dotty/tools/dotc/printing/Printer.scala b/compiler/src/dotty/tools/dotc/printing/Printer.scala
@@ -12,7 +12,7 @@ import Symbols.Symbol
 import Scopes.Scope
 import Constants.Constant
 import Names.Name
-import Denotations._
+import Denotations.*
 import Annotations.Annotation
 import Contexts.Context
 import typer.Implicits.*

diff --git a/compiler/src/dotty/tools/dotc/profile/ThreadPoolFactory.scala b/compiler/src/dotty/tools/dotc/profile/ThreadPoolFactory.scala
@@ -3,8 +3,8 @@ package dotty.tools.dotc.profile
 import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Phases.Phase
 
-import java.util.concurrent.ThreadPoolExecutor.AbortPolicy
 import java.util.concurrent.*
+import java.util.concurrent.ThreadPoolExecutor.AbortPolicy
 import java.util.concurrent.atomic.AtomicInteger
 import scala.language.unsafeNulls
 

diff --git a/compiler/src/dotty/tools/dotc/quoted/Interpreter.scala b/compiler/src/dotty/tools/dotc/quoted/Interpreter.scala
@@ -25,7 +25,7 @@ import dotty.tools.repl.AbstractFileClassLoader
 import java.io.PrintWriter
 import java.io.StringWriter
 import java.lang.reflect.InvocationTargetException
-import java.lang.reflect.{Method => JLRMethod}
+import java.lang.reflect.Method as JLRMethod
 import scala.collection.mutable
 import scala.language.unsafeNulls
 import scala.reflect.ClassTag

diff --git a/compiler/src/dotty/tools/dotc/quoted/QuotePatterns.scala b/compiler/src/dotty/tools/dotc/quoted/QuotePatterns.scala
@@ -5,6 +5,7 @@ import dotty.tools.dotc.ast.TreeTypeMap
 import dotty.tools.dotc.ast.Trees.*
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.ast.untpd
+import dotty.tools.dotc.core.*
 import dotty.tools.dotc.core.Annotations.*
 import dotty.tools.dotc.core.Constants.*
 import dotty.tools.dotc.core.Contexts.*
@@ -16,7 +17,6 @@ import dotty.tools.dotc.core.StdNames.*
 import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.core.TypeOps.*
 import dotty.tools.dotc.core.Types.*
-import dotty.tools.dotc.core.*
 import dotty.tools.dotc.reporting.IllegalVariableInPatternAlternative
 
 import scala.collection.mutable

diff --git a/compiler/src/dotty/tools/dotc/reporting/Diagnostic.scala b/compiler/src/dotty/tools/dotc/reporting/Diagnostic.scala
@@ -10,8 +10,8 @@ import dotty.tools.dotc.interfaces.Diagnostic.WARNING
 import dotty.tools.dotc.util.SourcePosition
 
 import java.util.Collections
+import java.util.List as JList
 import java.util.Optional
-import java.util.{List => JList}
 import scala.language.unsafeNulls
 import scala.util.chaining.*
 

diff --git a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala
@@ -2,7 +2,7 @@ package dotty.tools
 package dotc
 package reporting
 
-import java.lang.System.{lineSeparator => EOL}
+import java.lang.System.lineSeparator as EOL
 import scala.annotation.switch
 import scala.collection.mutable
 import scala.language.unsafeNulls

diff --git a/compiler/src/dotty/tools/dotc/semanticdb/ConstantOps.scala b/compiler/src/dotty/tools/dotc/semanticdb/ConstantOps.scala
@@ -2,7 +2,7 @@ package dotty.tools
 package dotc
 package semanticdb
 
-import dotty.tools.dotc.{semanticdb => s}
+import dotty.tools.dotc.semanticdb as s
 
 import core.Contexts.Context
 import core.Constants.*

diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Descriptor.scala b/compiler/src/dotty/tools/dotc/semanticdb/Descriptor.scala
@@ -1,8 +1,8 @@
 package dotty.tools.dotc.semanticdb
 
-import dotty.tools.dotc.semanticdb.{Descriptor => d}
+import dotty.tools.dotc.semanticdb.Descriptor as d
 
-import java.lang.System.{lineSeparator => EOL}
+import java.lang.System.lineSeparator as EOL
 import scala.language.unsafeNulls
 
 class DescriptorParser(s: String) {

diff --git a/compiler/src/dotty/tools/dotc/semanticdb/DiagnosticOps.scala b/compiler/src/dotty/tools/dotc/semanticdb/DiagnosticOps.scala
@@ -5,7 +5,7 @@ import dotty.tools.dotc.interfaces.Diagnostic.ERROR
 import dotty.tools.dotc.interfaces.Diagnostic.INFO
 import dotty.tools.dotc.interfaces.Diagnostic.WARNING
 import dotty.tools.dotc.reporting.Diagnostic
-import dotty.tools.dotc.{semanticdb => s}
+import dotty.tools.dotc.semanticdb as s
 
 import scala.annotation.internal.sharable
 

diff --git a/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala b/compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala
@@ -3,15 +3,15 @@ package dotc
 package semanticdb
 
 import dotty.tools.dotc.reporting.Diagnostic.Warning
+import dotty.tools.dotc.semanticdb as s
 import dotty.tools.dotc.semanticdb.DiagnosticOps.*
-import dotty.tools.dotc.{semanticdb => s}
 import dotty.tools.io.AbstractFile
 import dotty.tools.io.JarArchive
 
 import java.nio.file.Path
 import scala.PartialFunction.condOpt
 import scala.annotation.tailrec
-import scala.annotation.{threadUnsafe => tu}
+import scala.annotation.threadUnsafe as tu
 import scala.collection.mutable
 import scala.jdk.CollectionConverters.*
 import scala.language.unsafeNulls

diff --git a/compiler/src/dotty/tools/dotc/semanticdb/PPrint.scala b/compiler/src/dotty/tools/dotc/semanticdb/PPrint.scala
@@ -1,8 +1,8 @@
 package dotty.tools.dotc.semanticdb
 
+import dotty.tools.dotc.semanticdb as s
 import dotty.tools.dotc.semanticdb.Scala3.given
 import dotty.tools.dotc.util.SourceFile
-import dotty.tools.dotc.{semanticdb => s}
 
 import scala.collection.mutable
 

diff --git a/compiler/src/dotty/tools/dotc/semanticdb/Scala3.scala b/compiler/src/dotty/tools/dotc/semanticdb/Scala3.scala
@@ -18,7 +18,7 @@ import core.Types.{Type, TypeBounds}
 import core.Flags.*
 import core.NameKinds
 import core.StdNames.nme
-import SymbolInformation.{Kind => k}
+import SymbolInformation.Kind as k
 
 object Scala3:
   import Symbols.*

diff --git a/compiler/src/dotty/tools/dotc/semanticdb/SyntheticsExtractor.scala b/compiler/src/dotty/tools/dotc/semanticdb/SyntheticsExtractor.scala
@@ -5,7 +5,7 @@ import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Flags.*
 import dotty.tools.dotc.core.NameKinds
 import dotty.tools.dotc.core.StdNames.nme
-import dotty.tools.dotc.{semanticdb => s}
+import dotty.tools.dotc.semanticdb as s
 
 
 class SyntheticsExtractor:

diff --git a/compiler/src/dotty/tools/dotc/semanticdb/TypeOps.scala b/compiler/src/dotty/tools/dotc/semanticdb/TypeOps.scala
@@ -3,7 +3,7 @@ package dotc
 package semanticdb
 
 import dotty.tools.dotc.core.Names.Designator
-import dotty.tools.dotc.{semanticdb => s}
+import dotty.tools.dotc.semanticdb as s
 
 import scala.util.chaining.scalaUtilChainingOps
 

diff --git a/compiler/src/dotty/tools/dotc/transform/CheckShadowing.scala b/compiler/src/dotty/tools/dotc/transform/CheckShadowing.scala
@@ -9,8 +9,8 @@ import dotty.tools.dotc.ast.untpd.ImportSelector
 import dotty.tools.dotc.cc.boxedCaptureSet
 import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Denotations.SingleDenotation
-import dotty.tools.dotc.core.Flags.EmptyFlags
 import dotty.tools.dotc.core.Flags.*
+import dotty.tools.dotc.core.Flags.EmptyFlags
 import dotty.tools.dotc.core.Mode.Type
 import dotty.tools.dotc.core.Names.Name
 import dotty.tools.dotc.core.Names.SimpleName