From 1c416caf5028cbf7d20207adacfe950020eda3aa Mon Sep 17 00:00:00 2001 From: Jakub Ciesluk <323892@uwr.edu.pl> Date: Fri, 8 Mar 2024 13:22:02 +0100 Subject: [PATCH] chore: Run scalafix 0.12.0, fix ScalametaCompat for Scala 3.4.x --- build.sbt | 5 ++++- .../scala/meta/internal/mtags/MtagsEnrichments.scala | 2 +- .../main/scala-3/scala/meta/internal/pc/AutoImports.scala | 2 +- .../scala/meta/internal/pc/AutoImportsProvider.scala | 2 +- .../meta/internal/pc/ConvertToNamedArgumentsProvider.scala | 2 +- .../scala/meta/internal/pc/ExtractMethodProvider.scala | 2 +- .../main/scala-3/scala/meta/internal/pc/HoverProvider.scala | 2 +- .../scala/meta/internal/pc/InferredTypeProvider.scala | 2 +- .../main/scala-3/scala/meta/internal/pc/MetalsDriver.scala | 2 +- .../scala/meta/internal/pc/PcInlayHintsProvider.scala | 2 +- .../scala/meta/internal/pc/PcInlineValueProviderImpl.scala | 2 +- .../scala-3/scala/meta/internal/pc/PcRenameProvider.scala | 2 +- .../scala/meta/internal/pc/SelectionRangeProvider.scala | 2 +- .../scala/meta/internal/pc/SignatureHelpProvider.scala | 2 +- .../internal/pc/completions/AmmoniteFileCompletions.scala | 4 ++-- .../scala/meta/internal/pc/completions/CompletionPos.scala | 2 +- .../meta/internal/pc/completions/CompletionProvider.scala | 2 +- .../internal/pc/completions/InterpolatorCompletions.scala | 2 +- .../meta/internal/pc/completions/MatchCaseCompletions.scala | 2 +- .../meta/internal/pc/completions/OverrideCompletions.scala | 6 +++--- .../scala/meta/internal/pc/printer/MetalsPrinter.scala | 2 +- 21 files changed, 27 insertions(+), 24 deletions(-) diff --git a/build.sbt b/build.sbt index 79a8d4a76f5..cf1fe570358 100644 --- a/build.sbt +++ b/build.sbt @@ -722,7 +722,10 @@ lazy val mtest = project Compile / unmanagedSourceDirectories ++= { val base = (mtags / Compile / sourceDirectory).value if (isScala3WithPresentationCompiler(scalaVersion.value)) { - List(base / "scala") + List( + base / "scala", + base / "scala-3" / "scala" / "meta" / "internal" / "metals", + ) } else { Nil } 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 index c4023c1717d..740e67b10a1 100644 --- a/mtags/src/main/scala-3/scala/meta/internal/mtags/MtagsEnrichments.scala +++ b/mtags/src/main/scala-3/scala/meta/internal/mtags/MtagsEnrichments.scala @@ -27,7 +27,7 @@ import dotty.tools.dotc.interactive.InteractiveDriver 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 as l object MtagsEnrichments extends ScalametaCommonEnrichments: diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/AutoImports.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/AutoImports.scala index 086f8b7900c..df40056d22d 100644 --- a/mtags/src/main/scala-3/scala/meta/internal/pc/AutoImports.scala +++ b/mtags/src/main/scala-3/scala/meta/internal/pc/AutoImports.scala @@ -14,7 +14,7 @@ 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 org.eclipse.lsp4j as l object AutoImports: diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/AutoImportsProvider.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/AutoImportsProvider.scala index 96b8ee7cd15..5aafdfa524a 100644 --- a/mtags/src/main/scala-3/scala/meta/internal/pc/AutoImportsProvider.scala +++ b/mtags/src/main/scala-3/scala/meta/internal/pc/AutoImportsProvider.scala @@ -16,7 +16,7 @@ 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 org.eclipse.lsp4j as l final class AutoImportsProvider( search: SymbolSearch, diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/ConvertToNamedArgumentsProvider.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/ConvertToNamedArgumentsProvider.scala index 96ac7bba6aa..ebb43daf1f9 100644 --- a/mtags/src/main/scala-3/scala/meta/internal/pc/ConvertToNamedArgumentsProvider.scala +++ b/mtags/src/main/scala-3/scala/meta/internal/pc/ConvertToNamedArgumentsProvider.scala @@ -12,7 +12,7 @@ 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 org.eclipse.lsp4j as l final class ConvertToNamedArgumentsProvider( driver: InteractiveDriver, 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 index 67ae10abaa7..04ea0bdfaf0 100644 --- 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/HoverProvider.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/HoverProvider.scala index 603cc338988..2b9e1a2de57 100644 --- a/mtags/src/main/scala-3/scala/meta/internal/pc/HoverProvider.scala +++ b/mtags/src/main/scala-3/scala/meta/internal/pc/HoverProvider.scala @@ -1,6 +1,6 @@ package scala.meta.internal.pc -import java.{util as ju} +import java.util as ju import scala.meta.internal.metals.Report import scala.meta.internal.metals.ReportContext 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 index d6afe899129..9ee85b9a0e6 100644 --- 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.TextEdit import org.eclipse.lsp4j as l +import org.eclipse.lsp4j.TextEdit /** * Tries to calculate edits needed to insert the inferred type annotation diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/MetalsDriver.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/MetalsDriver.scala index b3328cfe6d9..c6d5ed8e7cd 100644 --- a/mtags/src/main/scala-3/scala/meta/internal/pc/MetalsDriver.scala +++ b/mtags/src/main/scala-3/scala/meta/internal/pc/MetalsDriver.scala @@ -1,7 +1,7 @@ package scala.meta.internal.pc import java.net.URI -import java.{util as ju} +import java.util as ju import dotty.tools.dotc.interactive.InteractiveDriver import dotty.tools.dotc.reporting.Diagnostic 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 index 818745746cf..a05b5245ab0 100644 --- 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/PcInlineValueProviderImpl.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/PcInlineValueProviderImpl.scala index e5f4bf5fa08..90ec8f921cd 100644 --- a/mtags/src/main/scala-3/scala/meta/internal/pc/PcInlineValueProviderImpl.scala +++ b/mtags/src/main/scala-3/scala/meta/internal/pc/PcInlineValueProviderImpl.scala @@ -14,7 +14,7 @@ import dotty.tools.dotc.core.Symbols.Symbol import dotty.tools.dotc.interactive.Interactive import dotty.tools.dotc.interactive.InteractiveDriver import dotty.tools.dotc.util.SourcePosition -import org.eclipse.{lsp4j as l} +import org.eclipse.lsp4j as l final class PcInlineValueProviderImpl( val driver: InteractiveDriver, diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/PcRenameProvider.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/PcRenameProvider.scala index 61041c68080..e918a0aa9a5 100644 --- a/mtags/src/main/scala-3/scala/meta/internal/pc/PcRenameProvider.scala +++ b/mtags/src/main/scala-3/scala/meta/internal/pc/PcRenameProvider.scala @@ -9,7 +9,7 @@ import dotty.tools.dotc.core.Flags.* import dotty.tools.dotc.core.Symbols.Symbol import dotty.tools.dotc.interactive.InteractiveDriver import dotty.tools.dotc.util.SourcePosition -import org.eclipse.{lsp4j as l} +import org.eclipse.lsp4j as l final class PcRenameProvider( driver: InteractiveDriver, diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/SelectionRangeProvider.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/SelectionRangeProvider.scala index 17af13ceb6d..8593087cab5 100644 --- a/mtags/src/main/scala-3/scala/meta/internal/pc/SelectionRangeProvider.scala +++ b/mtags/src/main/scala-3/scala/meta/internal/pc/SelectionRangeProvider.scala @@ -1,7 +1,7 @@ package scala.meta.internal.pc import java.nio.file.Paths -import java.{util as ju} +import java.util as ju import scala.jdk.CollectionConverters.* diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/SignatureHelpProvider.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/SignatureHelpProvider.scala index 5f552c1bd95..2259565c8af 100644 --- a/mtags/src/main/scala-3/scala/meta/internal/pc/SignatureHelpProvider.scala +++ b/mtags/src/main/scala-3/scala/meta/internal/pc/SignatureHelpProvider.scala @@ -20,7 +20,7 @@ import dotty.tools.dotc.interactive.InteractiveDriver import dotty.tools.dotc.util.Signatures import dotty.tools.dotc.util.Signatures.Signature import dotty.tools.dotc.util.SourcePosition -import org.eclipse.{lsp4j as l} +import org.eclipse.lsp4j as l object SignatureHelpProvider: 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 index 1fa8c6adba3..9f42ce7de22 100644 --- 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,12 +6,12 @@ import java.nio.file.Path import scala.meta.internal.mtags.MtagsEnrichments.* -import dotty.tools.dotc.ast.tpd.Tree import dotty.tools.dotc.ast.tpd.* +import dotty.tools.dotc.ast.tpd.Tree import dotty.tools.dotc.ast.untpd.ImportSelector import dotty.tools.dotc.core.Contexts.Context import dotty.tools.dotc.core.StdNames.* -import org.eclipse.{lsp4j as l} +import org.eclipse.lsp4j as l object AmmoniteFileCompletions: diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/completions/CompletionPos.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/completions/CompletionPos.scala index 147351e5636..6cd6d88122f 100644 --- a/mtags/src/main/scala-3/scala/meta/internal/pc/completions/CompletionPos.scala +++ b/mtags/src/main/scala-3/scala/meta/internal/pc/completions/CompletionPos.scala @@ -15,7 +15,7 @@ import dotty.tools.dotc.core.Contexts.* import dotty.tools.dotc.core.StdNames.* import dotty.tools.dotc.util.SourcePosition import dotty.tools.dotc.util.Spans -import org.eclipse.{lsp4j as l} +import org.eclipse.lsp4j as l enum CompletionKind: case Empty, Scope, Members 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 index fccef018d92..6da5f175824 100644 --- 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.TextEdit import org.eclipse.lsp4j.Range as LspRange +import org.eclipse.lsp4j.TextEdit class CompletionProvider( search: SymbolSearch, diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/completions/InterpolatorCompletions.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/completions/InterpolatorCompletions.scala index 25a606de501..a77bfefc35a 100644 --- a/mtags/src/main/scala-3/scala/meta/internal/pc/completions/InterpolatorCompletions.scala +++ b/mtags/src/main/scala-3/scala/meta/internal/pc/completions/InterpolatorCompletions.scala @@ -18,7 +18,7 @@ import dotty.tools.dotc.core.Flags.* import dotty.tools.dotc.core.Symbols.Symbol import dotty.tools.dotc.core.Types.Type import dotty.tools.dotc.util.SourcePosition -import org.eclipse.{lsp4j as l} +import org.eclipse.lsp4j as l object InterpolatorCompletions: diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/completions/MatchCaseCompletions.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/completions/MatchCaseCompletions.scala index 81953013a23..4a8e5b916cd 100644 --- a/mtags/src/main/scala-3/scala/meta/internal/pc/completions/MatchCaseCompletions.scala +++ b/mtags/src/main/scala-3/scala/meta/internal/pc/completions/MatchCaseCompletions.scala @@ -30,7 +30,7 @@ import dotty.tools.dotc.core.Types.OrType import dotty.tools.dotc.core.Types.Type import dotty.tools.dotc.core.Types.TypeRef import dotty.tools.dotc.util.SourcePosition -import org.eclipse.{lsp4j as l} +import org.eclipse.lsp4j as l object CaseKeywordCompletion: 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 index 3d1ec98e555..cfb29cf9ce6 100644 --- 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 @@ -1,7 +1,7 @@ package scala.meta.internal.pc package completions -import java.{util as ju} +import java.util as ju import scala.collection.JavaConverters.* @@ -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.Tree import dotty.tools.dotc.ast.tpd.* +import dotty.tools.dotc.ast.tpd.Tree import dotty.tools.dotc.core.Contexts.Context import dotty.tools.dotc.core.Flags import dotty.tools.dotc.core.Flags.* @@ -30,7 +30,7 @@ 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 as l object OverrideCompletions: private type TargetDef = TypeDef | DefDef 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 index dcced6bc88b..633899cba5f 100644 --- 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.Type import dotty.tools.dotc.core.Types.* +import dotty.tools.dotc.core.Types.Type class MetalsPrinter( names: ShortenedNames,