refactor: change package from scala.meta to dotty.tools.pc

Author: rochala

.scalafmt.conf

@@ -0,0 +1,22 @@
+version = "3.7.3"
+runner.dialect = scala3
+
+maxColumn = 80
+align.preset = none
+docstrings.style = Asterisk
+docstrings.wrap = no
+assumeStandardLibraryStripMargin = true
+align.stripMargin = true
+newlines.inInterpolation = avoid
+trailingCommas = multiple
+
+rewrite.scala3.removeOptionalBraces = yes
+
+project.includePaths = [
+  "glob:**/presentation-compiler/**"
+]
+
+project.excludePaths = [
+  "glob:**/target/**"
+  "glob:**/out/**"
+]

presentation-compiler/src/main/scala/meta/internal/pc/AutoImports.scala renamed to presentation-compiler/src/main/dotty/tools/pc/AutoImports.scala

@@ -1,12 +1,13 @@
-package scala.meta.internal.pc
+package dotty.tools.pc
 
 import scala.annotation.tailrec
 import scala.jdk.CollectionConverters.*
 
 import scala.meta.internal.mtags.KeywordWrapper
-import scala.meta.internal.mtags.MtagsEnrichments.*
-import scala.meta.internal.pc.printer.ShortenedNames.ShortName
+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 dotty.tools.dotc.ast.tpd.*
 import dotty.tools.dotc.core.Contexts.*
@@ -68,7 +69,7 @@ object AutoImports extends AutoImportsBackticks:
   case class SymbolImport(
       sym: Symbol,
       ident: SymbolIdent,
-      importSel: Option[ImportSel],
+      importSel: Option[ImportSel]
   ):
 
     def name: String = ident.value
@@ -93,7 +94,7 @@ object AutoImports extends AutoImportsBackticks:
       tree: Tree,
       comments: List[Comment],
       indexedContext: IndexedContext,
-      config: PresentationCompilerConfig,
+      config: PresentationCompilerConfig
   ): AutoImportsGenerator =
 
     import indexedContext.ctx
@@ -111,13 +112,13 @@ object AutoImports extends AutoImportsBackticks:
       pos,
       importPos,
       indexedContext,
-      renames,
+      renames
     )
   end generator
 
   case class AutoImportEdits(
       nameEdit: Option[l.TextEdit],
-      importEdit: Option[l.TextEdit],
+      importEdit: Option[l.TextEdit]
   ):
 
     def edits: List[l.TextEdit] = List(nameEdit, importEdit).flatten
@@ -144,7 +145,7 @@ object AutoImports extends AutoImportsBackticks:
       val pos: SourcePosition,
       importPosition: AutoImportPosition,
       indexedContext: IndexedContext,
-      renames: Symbol => Option[String],
+      renames: Symbol => Option[String]
   ):
 
     import indexedContext.ctx
@@ -177,8 +178,7 @@ 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
 
@@ -198,7 +198,7 @@ object AutoImports extends AutoImportsBackticks:
               (
                 SymbolIdent.Select(
                   ownerImport.ident,
-                  symbol.nameBacktickedImport,
+                  symbol.nameBacktickedImport
                 ),
                 ownerImport.importSel,
               )
@@ -212,7 +212,7 @@ object AutoImports extends AutoImportsBackticks:
           SymbolImport(
             symbol,
             name,
-            sel,
+            sel
           )
         case IndexedContext.Result.Conflict =>
           val owner = symbol.owner
@@ -224,23 +224,21 @@ 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,
                 SymbolIdent.Select(
                   SymbolIdent.direct(rename),
-                  symbol.nameBacktickedImport,
+                  symbol.nameBacktickedImport
                 ),
-                importSel,
+                importSel
               )
             case None =>
               SymbolImport(
                 symbol,
                 SymbolIdent.direct(symbol.fullNameBackticked),
-                None,
+                None
               )
           end match
         case IndexedContext.Result.InScope =>
@@ -290,17 +288,16 @@ object AutoImports extends AutoImportsBackticks:
       pos: SourcePosition,
       text: String,
       tree: Tree,
-      comments: List[Comment],
+      comments: List[Comment]
   )(using Context): AutoImportPosition =
 
     @tailrec
     def lastPackageDef(
         prev: Option[PackageDef],
-        tree: Tree,
+        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
@@ -310,8 +307,7 @@ 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
@@ -320,8 +316,7 @@ 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)
@@ -355,10 +350,8 @@ 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)
@@ -373,7 +366,7 @@ object AutoImports extends AutoImportsBackticks:
       AutoImportPosition(
         skipUsingDirectivesOffset,
         0,
-        padTop = false,
+        padTop = false
       )
 
     val scriptPos =

presentation-compiler/src/main/scala/meta/internal/pc/AutoImportsProvider.scala renamed to presentation-compiler/src/main/dotty/tools/pc/AutoImportsProvider.scala

@@ -1,14 +1,15 @@
-package scala.meta.internal.pc
+package dotty.tools.pc
 
 import java.nio.file.Paths
 
 import scala.collection.mutable
 import scala.jdk.CollectionConverters.*
 
 import scala.meta.internal.metals.ReportContext
-import scala.meta.internal.mtags.MtagsEnrichments.*
-import scala.meta.internal.pc.AutoImports.*
-import scala.meta.internal.pc.completions.CompletionPos
+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.*
@@ -24,15 +25,15 @@ final class AutoImportsProvider(
     name: String,
     params: OffsetParams,
     config: PresentationCompilerConfig,
-    buildTargetIdentifier: String,
+    buildTargetIdentifier: String
 )(using ReportContext):
 
   def autoImports(isExtension: Boolean): List[AutoImportsResult] =
     val uri = params.uri
     val filePath = Paths.get(uri)
     driver.run(
       uri,
-      SourceFile.virtual(filePath.toString, params.text),
+      SourceFile.virtual(filePath.toString, params.text)
     )
     val unit = driver.currentCtx.run.units.head
     val tree = unit.tpdTree
@@ -61,8 +62,7 @@ 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))
 
@@ -84,7 +84,7 @@ final class AutoImportsProvider(
                 tree,
                 unit.comments,
                 indexedContext.importContext,
-                config,
+                config
               )
             (sym: Symbol) => generator.forSymbol(sym)
         end match
@@ -95,7 +95,7 @@ final class AutoImportsProvider(
         edits <- mkEdit(sym)
       yield AutoImportsResultImpl(
         sym.owner.showFullName,
-        edits.asJava,
+        edits.asJava
       )
     else List.empty
     end if

presentation-compiler/src/main/scala/meta/internal/pc/CompilerInterfaces.scala renamed to presentation-compiler/src/main/dotty/tools/pc/CompilerInterfaces.scala

@@ -1,4 +1,4 @@
-package scala.meta.internal.pc
+package dotty.tools.pc
 
 import java.net.URI
 import java.nio.file.Paths

presentation-compiler/src/main/scala/meta/internal/pc/CompilerSearchVisitor.scala renamed to presentation-compiler/src/main/dotty/tools/pc/CompilerSearchVisitor.scala

@@ -1,4 +1,4 @@
-package scala.meta.internal.pc
+package dotty.tools.pc
 
 import java.util.logging.Level
 import java.util.logging.Logger
@@ -20,23 +20,22 @@ 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(
         Report(
           "is_public",
           s"""Symbol: $sym""".stripMargin,
-          e,
+          e
         )
       )
       logger.log(Level.SEVERE, e.getMessage(), e)
       false
 
   private def toSymbols(
       pkg: String,
-      parts: List[String],
+      parts: List[String]
   ): List[Symbol] =
     def loop(owners: List[Symbol], parts: List[String]): List[Symbol] =
       parts match
@@ -72,7 +71,7 @@ class CompilerSearchVisitor(
       path: java.nio.file.Path,
       symbol: String,
       kind: org.eclipse.lsp4j.SymbolKind,
-      range: org.eclipse.lsp4j.Range,
+      range: org.eclipse.lsp4j.Range
   ): Int =
     val gsym = SemanticdbSymbols.inverseSemanticdbSymbol(symbol).headOption
     gsym

presentation-compiler/src/main/scala/meta/internal/pc/CompletionItemResolver.scala renamed to presentation-compiler/src/main/dotty/tools/pc/CompletionItemResolver.scala

@@ -1,9 +1,10 @@
-package scala.meta.internal.pc
+package dotty.tools.pc
 
-import scala.meta.internal.mtags.MtagsEnrichments.*
+import dotty.tools.pc.utils.MtagsEnrichments.*
 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.*
@@ -19,7 +20,7 @@ object CompletionItemResolver extends ItemResolver:
       item: CompletionItem,
       msym: String,
       search: SymbolSearch,
-      metalsConfig: PresentationCompilerConfig,
+      metalsConfig: PresentationCompilerConfig
   )(using Context): CompletionItem =
     SemanticdbSymbols.inverseSemanticdbSymbol(msym) match
       case gsym :: _ if gsym != NoSymbol =>
@@ -34,7 +35,7 @@ object CompletionItemResolver extends ItemResolver:
               info,
               metalsConfig,
               fullDocstring(gsym, search),
-              gsym.is(JavaDefined),
+              gsym.is(JavaDefined)
             )
           case _ =>
             item
@@ -59,8 +60,7 @@ 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) =>
@@ -80,7 +80,7 @@ object CompletionItemResolver extends ItemResolver:
               |""".stripMargin,
           s"""|### ${keyword(gsym)} ${gsym.name}
               |${gsymDoc}
-              |""".stripMargin,
+              |""".stripMargin
         ).sorted.mkString("\n")
     end if
   end fullDocstring

presentation-compiler/src/main/scala/meta/internal/pc/ConvertToNamedArgumentsProvider.scala renamed to presentation-compiler/src/main/dotty/tools/pc/ConvertToNamedArgumentsProvider.scala

@@ -1,9 +1,10 @@
-package scala.meta.internal.pc
+package dotty.tools.pc
 
 import java.nio.file.Paths
 
-import scala.meta.internal.mtags.MtagsEnrichments.*
+import dotty.tools.pc.utils.MtagsEnrichments.*
 import scala.meta.pc.OffsetParams
+import scala.meta.internal.pc.CodeActionErrorMessages
 
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.core.Contexts.Context
@@ -17,15 +18,15 @@ import org.eclipse.{lsp4j as l}
 final class ConvertToNamedArgumentsProvider(
     driver: InteractiveDriver,
     params: OffsetParams,
-    argIndices: Set[Int],
+    argIndices: Set[Int]
 ):
 
   def convertToNamedArguments: Either[String, List[l.TextEdit]] =
     val uri = params.uri
     val filePath = Paths.get(uri)
     driver.run(
       uri,
-      SourceFile.virtual(filePath.toString, params.text),
+      SourceFile.virtual(filePath.toString, params.text)
     )
     val unit = driver.currentCtx.run.units.head
     val newctx = driver.currentCtx.fresh.setCompilationUnit(unit)