chore: Rever sbt-scalafix upgrade to fix OOM

scalameta · Mar 18, 2024 · aea1900 · aea1900
1 parent b8e1fc1
commit aea1900
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 24 deletions.
diff --git a/.scalafix3.conf b/.scalafix3.conf
@@ -11,4 +11,3 @@ OrganizeImports.groups = [
   "scala.meta."
   "*"
 ]
-OrganizeImports.targetDialect = StandardLayout
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -21,8 +21,6 @@ project.excludeFilters = [
   "tests/unit/src/test/resources"
   "tests/input/src/main/scala"
   "mtags/src/main/scala-2.11/scala/tools/nsc/symtab/classfile/ClassfileParser.scala"
-  "mtags/src/main/scala-3-wrapper"
-  "mtags/src/main/scala-3."
 ]
 
 fileOverride {

diff --git a/build.sbt b/build.sbt
@@ -66,6 +66,7 @@ inThisBuild(
     resolvers ++= Resolver.sonatypeOssRepos("public"),
     resolvers ++= Resolver.sonatypeOssRepos("snapshot"),
     dependencyOverrides += V.guava,
+    semanticdbVersion := V.semanticdb(scalaVersion.value),
     // faster publishLocal:
     packageDoc / publishArtifact := sys.env.contains("CI"),
     packageSrc / publishArtifact := sys.env.contains("CI"),

diff --git a/mtags/src/main/scala-3-wrapper/ScalaPresentationCompiler.scala b/mtags/src/main/scala-3-wrapper/ScalaPresentationCompiler.scala
@@ -5,11 +5,11 @@ import java.nio.file.Path
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.ScheduledExecutorService
-import java.{util => ju}
+import java.{util as ju}
 
 import scala.concurrent.ExecutionContext
 import scala.concurrent.ExecutionContextExecutor
-import scala.jdk.CollectionConverters._
+import scala.jdk.CollectionConverters.*
 
 import scala.meta.internal.metals.ReportLevel
 import scala.meta.pc.AutoImportsResult
@@ -25,7 +25,7 @@ import scala.meta.pc.RangeParams
 import scala.meta.pc.SymbolSearch
 import scala.meta.pc.VirtualFileParams
 
-import dotty.tools.pc.{ScalaPresentationCompiler => DottyPresentationCompiler}
+import dotty.tools.pc.{ScalaPresentationCompiler as DottyPresentationCompiler}
 import org.eclipse.lsp4j.CompletionItem
 import org.eclipse.lsp4j.CompletionList
 import org.eclipse.lsp4j.Diagnostic

diff --git a/mtags/src/main/scala-3.3.3/scala/meta/internal/pc/printer/RefinedDotcPrinter.scala b/mtags/src/main/scala-3.3.3/scala/meta/internal/pc/printer/RefinedDotcPrinter.scala
@@ -1,9 +1,9 @@
 package scala.meta.internal.pc.printer
 
 import dotty.tools.dotc.core.Contexts.Context
-import dotty.tools.dotc.core.Flags._
-import dotty.tools.dotc.core.StdNames._
-import dotty.tools.dotc.core.Types._
+import dotty.tools.dotc.core.Flags.*
+import dotty.tools.dotc.core.StdNames.*
+import dotty.tools.dotc.core.Types.*
 import dotty.tools.dotc.printing.RefinedPrinter
 import dotty.tools.dotc.printing.Texts.Text
 

diff --git a/mtags/src/main/scala-3.3/scala/meta/internal/pc/MetalsSealedDesc.scala b/mtags/src/main/scala-3.3/scala/meta/internal/pc/MetalsSealedDesc.scala
@@ -1,8 +1,8 @@
 package scala.meta.internal.pc
 
 import dotty.tools.dotc.core.Contexts.Context
-import dotty.tools.dotc.core.Flags._
-import dotty.tools.dotc.core.StdNames._
+import dotty.tools.dotc.core.Flags.*
+import dotty.tools.dotc.core.StdNames.*
 import dotty.tools.dotc.core.Symbols.Symbol
 
 object MetalsSealedDesc:

diff --git a/mtags/src/main/scala-3.3/scala/meta/internal/pc/MetalsSignatures.scala b/mtags/src/main/scala-3.3/scala/meta/internal/pc/MetalsSignatures.scala
@@ -1,8 +1,8 @@
 package scala.meta.internal.pc
 
 import dotty.tools.dotc.ast.tpd
-import dotty.tools.dotc.core.Contexts._
-import dotty.tools.dotc.core.Denotations._
+import dotty.tools.dotc.core.Contexts.*
+import dotty.tools.dotc.core.Denotations.*
 import dotty.tools.dotc.util.Signatures
 import dotty.tools.dotc.util.Signatures.Signature
 import dotty.tools.dotc.util.SourcePosition

diff --git a/mtags/src/main/scala-3/scala/meta/internal/mtags/MtagsEnrichments.scala b/mtags/src/main/scala-3/scala/meta/internal/mtags/MtagsEnrichments.scala
@@ -53,7 +53,7 @@ object MtagsEnrichments extends ScalametaCommonEnrichments:
       new SourcePosition(source, span)
     end sourcePosition
 
-    def latestRun = 
+    def latestRun =
       if driver.currentCtx.run.units.nonEmpty then
         driver.currentCtx.run.units.head
       else

diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/ExtractMethodProvider.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/ExtractMethodProvider.scala
@@ -24,8 +24,8 @@ 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 org.eclipse.lsp4j as l
 import org.eclipse.lsp4j.TextEdit
+import org.eclipse.lsp4j as l
 
 final class ExtractMethodProvider(
     range: RangeParams,

diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/InferredTypeProvider.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/InferredTypeProvider.scala
@@ -26,8 +26,8 @@ import dotty.tools.dotc.util.SourceFile
 import dotty.tools.dotc.util.SourcePosition
 import dotty.tools.dotc.util.Spans
 import dotty.tools.dotc.util.Spans.Span
-import org.eclipse.lsp4j as l
 import org.eclipse.lsp4j.TextEdit
+import org.eclipse.lsp4j as l
 
 /**
  * Tries to calculate edits needed to insert the inferred type annotation

diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/PcInlayHintsProvider.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/PcInlayHintsProvider.scala
@@ -21,9 +21,9 @@ import dotty.tools.dotc.interactive.InteractiveDriver
 import dotty.tools.dotc.util.SourceFile
 import dotty.tools.dotc.util.SourcePosition
 import dotty.tools.dotc.util.Spans.Span
-import org.eclipse.lsp4j as l
 import org.eclipse.lsp4j.InlayHint
 import org.eclipse.lsp4j.InlayHintKind
+import org.eclipse.lsp4j as l
 
 class PcInlayHintsProvider(
     driver: InteractiveDriver,

diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/ScalaPresentationCompiler.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/ScalaPresentationCompiler.scala
@@ -3,11 +3,11 @@ package scala.meta.internal.pc
 import java.io.File
 import java.net.URI
 import java.nio.file.Path
-import java.util as ju
 import java.util.Optional
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.ScheduledExecutorService
+import java.util as ju
 
 import scala.collection.JavaConverters.*
 import scala.concurrent.ExecutionContext
@@ -27,9 +27,9 @@ import scala.meta.pc.*
 import scala.meta.pc.PcSymbolInformation as IPcSymbolInformation
 
 import dotty.tools.dotc.reporting.StoreReporter
-import org.eclipse.lsp4j as l
 import org.eclipse.lsp4j.DocumentHighlight
 import org.eclipse.lsp4j.TextEdit
+import org.eclipse.lsp4j as l
 
 case class ScalaPresentationCompiler(
     buildTargetIdentifier: String = "",

diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/completions/AmmoniteFileCompletions.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/completions/AmmoniteFileCompletions.scala
@@ -6,8 +6,8 @@ import java.nio.file.Path
 
 import scala.meta.internal.mtags.MtagsEnrichments.*
 
-import dotty.tools.dotc.ast.tpd.*
 import dotty.tools.dotc.ast.tpd.Tree
+import dotty.tools.dotc.ast.tpd.*
 import dotty.tools.dotc.ast.untpd.ImportSelector
 import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.StdNames.*

diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/completions/CompletionProvider.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/completions/CompletionProvider.scala
@@ -27,8 +27,8 @@ import org.eclipse.lsp4j.CompletionItemKind
 import org.eclipse.lsp4j.CompletionList
 import org.eclipse.lsp4j.InsertTextFormat
 import org.eclipse.lsp4j.InsertTextMode
-import org.eclipse.lsp4j.Range as LspRange
 import org.eclipse.lsp4j.TextEdit
+import org.eclipse.lsp4j.Range as LspRange
 
 class CompletionProvider(
     search: SymbolSearch,

diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/completions/OverrideCompletions.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/completions/OverrideCompletions.scala
@@ -15,8 +15,8 @@ import scala.meta.pc.PresentationCompilerConfig
 import scala.meta.pc.PresentationCompilerConfig.OverrideDefFormat
 import scala.meta.pc.SymbolSearch
 
-import dotty.tools.dotc.ast.tpd.*
 import dotty.tools.dotc.ast.tpd.Tree
+import dotty.tools.dotc.ast.tpd.*
 import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.core.Flags
 import dotty.tools.dotc.core.Flags.*

diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/printer/MetalsPrinter.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/printer/MetalsPrinter.scala
@@ -24,8 +24,8 @@ import dotty.tools.dotc.core.Names.Name
 import dotty.tools.dotc.core.StdNames
 import dotty.tools.dotc.core.Symbols.NoSymbol
 import dotty.tools.dotc.core.Symbols.Symbol
-import dotty.tools.dotc.core.Types.*
 import dotty.tools.dotc.core.Types.Type
+import dotty.tools.dotc.core.Types.*
 
 class MetalsPrinter(
     names: ShortenedNames,

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,5 +1,5 @@
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.0")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")