refactor: organize imports, unify formatting with mtags in metals

Author: rochala

.scalafmt.conf

@@ -2,22 +2,22 @@ package dotty.tools.pc
 
 import scala.annotation.tailrec
 import scala.jdk.CollectionConverters.*
-
 import scala.meta.internal.mtags.KeywordWrapper
-import dotty.tools.pc.utils.MtagsEnrichments.*
-import dotty.tools.pc.printer.ShortenedNames.ShortName
-import scala.meta.pc.PresentationCompilerConfig
 import scala.meta.internal.pc.AutoImportPosition
+import scala.meta.pc.PresentationCompilerConfig
 
 import dotty.tools.dotc.ast.tpd.*
+import dotty.tools.dotc.core.Comments.Comment
 import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Flags.*
 import dotty.tools.dotc.core.Names.*
 import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.util.SourcePosition
 import dotty.tools.dotc.util.Spans
-import org.eclipse.{lsp4j as l}
-import dotty.tools.dotc.core.Comments.Comment
+import dotty.tools.pc.printer.ShortenedNames.ShortName
+import dotty.tools.pc.utils.MtagsEnrichments.*
+
+import org.eclipse.lsp4j as l
 
 object AutoImports extends AutoImportsBackticks:
 
@@ -178,7 +178,8 @@ object AutoImports extends AutoImportsBackticks:
 
       val importEdit =
         symbolImport.importSel.flatMap(sel => renderImports(List(sel)))
-      if nameEdit.isDefined || importEdit.isDefined then Some(AutoImportEdits(nameEdit, importEdit))
+      if nameEdit.isDefined || importEdit.isDefined then
+        Some(AutoImportEdits(nameEdit, importEdit))
       else None
     end editsForSymbol
 
@@ -224,7 +225,9 @@ object AutoImports extends AutoImportsBackticks:
                     !indexedContext.hasRename(owner, rename)
                   )
                 else
-                  Some(ImportSel.Direct(owner)).filter(_ => !indexedContext.lookupSym(owner).exists)
+                  Some(ImportSel.Direct(owner)).filter(_ =>
+                    !indexedContext.lookupSym(owner).exists
+                  )
 
               SymbolImport(
                 symbol,
@@ -297,7 +300,8 @@ object AutoImports extends AutoImportsBackticks:
         tree: Tree
     ): Option[PackageDef] =
       tree match
-        case curr @ PackageDef(_, (next: PackageDef) :: Nil) if !curr.symbol.isPackageObject =>
+        case curr @ PackageDef(_, (next: PackageDef) :: Nil)
+            if !curr.symbol.isPackageObject =>
           lastPackageDef(Some(curr), next)
         case pkg: PackageDef if !pkg.symbol.isPackageObject => Some(pkg)
         case _ => prev
@@ -307,7 +311,8 @@ object AutoImports extends AutoImportsBackticks:
         case PackageDef(_, stats) =>
           stats.flatMap {
             case s: PackageDef => firstObjectBody(s)
-            case TypeDef(_, t @ Template(defDef, _, _, _)) if defDef.symbol.showName == "<init>" =>
+            case TypeDef(_, t @ Template(defDef, _, _, _))
+                if defDef.symbol.showName == "<init>" =>
               Some(t)
             case _ => None
           }.headOption
@@ -316,7 +321,8 @@ object AutoImports extends AutoImportsBackticks:
     def skipUsingDirectivesOffset =
       comments
         .takeWhile(comment =>
-          !comment.isDocComment && comment.span.end < firstObjectBody(tree).fold(0)(_.span.start)
+          !comment.isDocComment && comment.span.end < firstObjectBody(tree)
+            .fold(0)(_.span.start)
         )
         .lastOption
         .fold(0)(_.span.end + 1)
@@ -350,8 +356,10 @@ object AutoImports extends AutoImportsBackticks:
             offset
           case None =>
             val scriptOffset =
-              if isAmmonite then ScriptFirstImportPosition.ammoniteScStartOffset(text, comments)
-              else ScriptFirstImportPosition.scalaCliScStartOffset(text, comments)
+              if isAmmonite then
+                ScriptFirstImportPosition.ammoniteScStartOffset(text, comments)
+              else
+                ScriptFirstImportPosition.scalaCliScStartOffset(text, comments)
 
             scriptOffset.getOrElse(
               pos.source.lineToOffset(tmpl.self.srcPos.line)

presentation-compiler/src/main/dotty/tools/pc/AutoImports.scala

@@ -4,20 +4,20 @@ import java.nio.file.Paths
 
 import scala.collection.mutable
 import scala.jdk.CollectionConverters.*
-
 import scala.meta.internal.metals.ReportContext
 import scala.meta.internal.pc.AutoImportsResultImpl
-import dotty.tools.pc.utils.MtagsEnrichments.*
-import dotty.tools.pc.AutoImports.*
-import dotty.tools.pc.completions.CompletionPos
 import scala.meta.pc.*
 
 import dotty.tools.dotc.ast.tpd.*
 import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.interactive.Interactive
 import dotty.tools.dotc.interactive.InteractiveDriver
 import dotty.tools.dotc.util.SourceFile
-import org.eclipse.{lsp4j as l}
+import dotty.tools.pc.AutoImports.*
+import dotty.tools.pc.completions.CompletionPos
+import dotty.tools.pc.utils.MtagsEnrichments.*
+
+import org.eclipse.lsp4j as l
 
 final class AutoImportsProvider(
     search: SymbolSearch,
@@ -62,7 +62,8 @@ final class AutoImportsProvider(
       sym.name.show == query
 
     val visitor = new CompilerSearchVisitor(visit)
-    if isExtension then search.searchMethods(name, buildTargetIdentifier, visitor)
+    if isExtension then
+      search.searchMethods(name, buildTargetIdentifier, visitor)
     else search.search(name, buildTargetIdentifier, visitor)
     val results = symbols.result.filter(isExactMatch(_, name))
 

presentation-compiler/src/main/dotty/tools/pc/AutoImportsProvider.scala

@@ -3,11 +3,10 @@ package dotty.tools.pc
 import java.util.logging.Level
 import java.util.logging.Logger
 
-import scala.util.control.NonFatal
-
 import scala.meta.internal.metals.Report
 import scala.meta.internal.metals.ReportContext
 import scala.meta.pc.*
+import scala.util.control.NonFatal
 
 import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Names.*
@@ -20,7 +19,8 @@ class CompilerSearchVisitor(
 
   val logger: Logger = Logger.getLogger(classOf[CompilerSearchVisitor].getName)
 
-  private def isAccessible(sym: Symbol): Boolean = try sym != NoSymbol && sym.isPublic
+  private def isAccessible(sym: Symbol): Boolean = try
+    sym != NoSymbol && sym.isPublic
   catch
     case NonFatal(e) =>
       reports.incognito.create(

presentation-compiler/src/main/dotty/tools/pc/CompilerSearchVisitor.scala

@@ -1,15 +1,16 @@
 package dotty.tools.pc
 
-import dotty.tools.pc.utils.MtagsEnrichments.*
+import scala.meta.internal.pc.ItemResolver
 import scala.meta.pc.PresentationCompilerConfig
 import scala.meta.pc.SymbolDocumentation
 import scala.meta.pc.SymbolSearch
-import scala.meta.internal.pc.ItemResolver
 
 import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.Flags.*
 import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.core.Types.TermRef
+import dotty.tools.pc.utils.MtagsEnrichments.*
+
 import org.eclipse.lsp4j.CompletionItem
 
 object CompletionItemResolver extends ItemResolver:
@@ -60,7 +61,8 @@ object CompletionItemResolver extends ItemResolver:
     val companion = gsym.companion
     if companion == NoSymbol || gsym.is(JavaDefined) then
       if gsymDoc.isEmpty then
-        if gsym.isAliasType then fullDocstring(gsym.info.metalsDealias.typeSymbol, search)
+        if gsym.isAliasType then
+          fullDocstring(gsym.info.metalsDealias.typeSymbol, search)
         else if gsym.is(Method) then
           gsym.info.finalResultType match
             case tr @ TermRef(_, sym) =>

presentation-compiler/src/main/dotty/tools/pc/CompletionItemResolver.scala

@@ -2,9 +2,8 @@ package dotty.tools.pc
 
 import java.nio.file.Paths
 
-import dotty.tools.pc.utils.MtagsEnrichments.*
-import scala.meta.pc.OffsetParams
 import scala.meta.internal.pc.CodeActionErrorMessages
+import scala.meta.pc.OffsetParams
 
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.core.Contexts.Context
@@ -13,7 +12,9 @@ import dotty.tools.dotc.core.Types.MethodType
 import dotty.tools.dotc.interactive.Interactive
 import dotty.tools.dotc.interactive.InteractiveDriver
 import dotty.tools.dotc.util.SourceFile
-import org.eclipse.{lsp4j as l}
+import dotty.tools.pc.utils.MtagsEnrichments.*
+
+import org.eclipse.lsp4j as l
 
 final class ConvertToNamedArgumentsProvider(
     driver: InteractiveDriver,

presentation-compiler/src/main/dotty/tools/pc/ConvertToNamedArgumentsProvider.scala

@@ -2,16 +2,11 @@ package dotty.tools.pc
 
 import java.nio.file.Paths
 
-import scala.meta as m
-
-import dotty.tools.pc.utils.MtagsEnrichments.*
-import dotty.tools.pc.MetalsInteractive.*
-import dotty.tools.pc.printer.MetalsPrinter
-import dotty.tools.pc.printer.MetalsPrinter.IncludeDefaultParam
+import scala.meta.internal.pc.ExtractMethodUtils
 import scala.meta.pc.OffsetParams
 import scala.meta.pc.RangeParams
 import scala.meta.pc.SymbolSearch
-import scala.meta.internal.pc.ExtractMethodUtils
+import scala.meta as m
 
 import dotty.tools.dotc.ast.Trees.*
 import dotty.tools.dotc.ast.tpd
@@ -25,8 +20,13 @@ import dotty.tools.dotc.interactive.Interactive
 import dotty.tools.dotc.interactive.InteractiveDriver
 import dotty.tools.dotc.util.SourceFile
 import dotty.tools.dotc.util.SourcePosition
+import dotty.tools.pc.MetalsInteractive.*
+import dotty.tools.pc.printer.MetalsPrinter
+import dotty.tools.pc.printer.MetalsPrinter.IncludeDefaultParam
+import dotty.tools.pc.utils.MtagsEnrichments.*
+
 import org.eclipse.lsp4j.TextEdit
-import org.eclipse.{lsp4j as l}
+import org.eclipse.lsp4j as l
 
 final class ExtractMethodProvider(
     range: RangeParams,

presentation-compiler/src/main/dotty/tools/pc/ExtractMethodProvider.scala

@@ -1,15 +1,13 @@
 package dotty.tools.pc
 
-import java.{util as ju}
+import java.util as ju
 
 import scala.meta.internal.metals.Report
 import scala.meta.internal.metals.ReportContext
-import dotty.tools.pc.utils.MtagsEnrichments.*
-import dotty.tools.pc.printer.MetalsPrinter
+import scala.meta.internal.pc.ScalaHover
 import scala.meta.pc.HoverSignature
 import scala.meta.pc.OffsetParams
 import scala.meta.pc.SymbolSearch
-import scala.meta.internal.pc.ScalaHover
 
 import dotty.tools.dotc.ast.tpd.*
 import dotty.tools.dotc.core.Constants.*
@@ -22,6 +20,8 @@ import dotty.tools.dotc.core.Types.*
 import dotty.tools.dotc.interactive.Interactive
 import dotty.tools.dotc.interactive.InteractiveDriver
 import dotty.tools.dotc.util.SourcePosition
+import dotty.tools.pc.printer.MetalsPrinter
+import dotty.tools.pc.utils.MtagsEnrichments.*
 
 object HoverProvider:
 
@@ -151,7 +151,8 @@ object HoverProvider:
     end if
   end hover
 
-  extension (pos: SourcePosition) private def isPoint: Boolean = pos.start == pos.end
+  extension (pos: SourcePosition)
+    private def isPoint: Boolean = pos.start == pos.end
 
   private def fallbackToDynamics(
       path: List[Tree],

presentation-compiler/src/main/dotty/tools/pc/HoverProvider.scala

@@ -3,15 +3,14 @@ package dotty.tools.pc
 import scala.annotation.tailrec
 import scala.util.control.NonFatal
 
-import dotty.tools.pc.utils.MtagsEnrichments.*
-import dotty.tools.pc.IndexedContext.Result
-
 import dotty.tools.dotc.core.Contexts.*
 import dotty.tools.dotc.core.Flags.*
 import dotty.tools.dotc.core.Names.*
 import dotty.tools.dotc.core.Symbols.*
 import dotty.tools.dotc.core.Types.*
 import dotty.tools.dotc.typer.ImportInfo
+import dotty.tools.pc.IndexedContext.Result
+import dotty.tools.pc.utils.MtagsEnrichments.*
 
 sealed trait IndexedContext:
   given ctx: Context
@@ -141,7 +140,9 @@ object IndexedContext:
     def accessibleSymbols(site: Type, tpe: Type)(using
         Context
     ): List[Symbol] =
-      tpe.decls.toList.filter(sym => sym.isAccessibleFrom(site, superAccess = false))
+      tpe.decls.toList.filter(sym =>
+        sym.isAccessibleFrom(site, superAccess = false)
+      )
 
     def accesibleMembers(site: Type)(using Context): List[Symbol] =
       site.allMembers
@@ -185,7 +186,8 @@ object IndexedContext:
           val isRename = name != rename
           if !isRename && !excludedNames.contains(name.decoded) then
             fromImport(imp.site, name).map((_, None))
-          else if isRename then fromImport(imp.site, name).map((_, Some(rename)))
+          else if isRename then
+            fromImport(imp.site, name).map((_, Some(rename)))
           else Nil
         }
       end if