diff --git a/scalafmt-config/js/src/main/scala/org/scalafmt/config/PlatformConfig.scala b/scalafmt-config/js/src/main/scala/org/scalafmt/config/PlatformConfig.scala index ff1345d752..5a72a7daef 100644 --- a/scalafmt-config/js/src/main/scala/org/scalafmt/config/PlatformConfig.scala +++ b/scalafmt-config/js/src/main/scala/org/scalafmt/config/PlatformConfig.scala @@ -2,11 +2,10 @@ package org.scalafmt.config import java.nio.file.Path -import metaconfig.Input -import metaconfig.MetaconfigParser +import metaconfig._ object PlatformConfig { val isScalaNative = false - implicit val parser = metaconfig.hocon.hoconMetaconfigParser + implicit val parser = hocon.hoconMetaconfigParser def metaconfigInputFromFile(input: Path) = Input.File(input) } diff --git a/scalafmt-config/jvm/src/main/scala/org/scalafmt/config/PlatformConfig.scala b/scalafmt-config/jvm/src/main/scala/org/scalafmt/config/PlatformConfig.scala index 2d23590747..08324954ba 100644 --- a/scalafmt-config/jvm/src/main/scala/org/scalafmt/config/PlatformConfig.scala +++ b/scalafmt-config/jvm/src/main/scala/org/scalafmt/config/PlatformConfig.scala @@ -2,12 +2,11 @@ package org.scalafmt.config import java.nio.file.Path -import metaconfig.Input -import metaconfig.MetaconfigParser +import metaconfig._ object PlatformConfig { val isScalaNative = false implicit val parser: MetaconfigParser = - metaconfig.typesafeconfig.typesafeConfigMetaconfigParser + typesafeconfig.typesafeConfigMetaconfigParser def metaconfigInputFromFile(input: Path) = Input.File(input) } diff --git a/scalafmt-config/native/src/main/scala/org/scalafmt/config/PlatformConfig.scala b/scalafmt-config/native/src/main/scala/org/scalafmt/config/PlatformConfig.scala index 35ed597179..8f32c3a782 100644 --- a/scalafmt-config/native/src/main/scala/org/scalafmt/config/PlatformConfig.scala +++ b/scalafmt-config/native/src/main/scala/org/scalafmt/config/PlatformConfig.scala @@ -1,15 +1,12 @@ package org.scalafmt.config -import java.nio.file.Files -import java.nio.file.Path +import java.nio.file._ -import metaconfig.Input -import metaconfig.MetaconfigParser +import metaconfig._ object PlatformConfig { val isScalaNative = true - implicit val parser: MetaconfigParser = - metaconfig.sconfig.sConfigMetaconfigParser + implicit val parser: MetaconfigParser = sconfig.sConfigMetaconfigParser def metaconfigInputFromFile(input: Path) = Input .String(new String(Files.readAllBytes(input))) } diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/Scalafmt.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/Scalafmt.scala index fafc0f5726..1840ea6444 100644 --- a/scalafmt-core/shared/src/main/scala/org/scalafmt/Scalafmt.scala +++ b/scalafmt-core/shared/src/main/scala/org/scalafmt/Scalafmt.scala @@ -1,12 +1,8 @@ package org.scalafmt import org.scalafmt.Error.PreciseIncomplete -import org.scalafmt.config.FormatEvent.CreateFormatOps -import org.scalafmt.config.NamedDialect -import org.scalafmt.config.ScalafmtConfig -import org.scalafmt.internal.BestFirstSearch -import org.scalafmt.internal.FormatOps -import org.scalafmt.internal.FormatWriter +import org.scalafmt.config._ +import org.scalafmt.internal._ import org.scalafmt.rewrite.Rewrite import org.scalafmt.sysops.FileOps import org.scalafmt.util.MarkdownParser @@ -18,9 +14,7 @@ import scala.meta.tokenizers.TokenizerOptions import java.nio.file.Path -import scala.util.Failure -import scala.util.Success -import scala.util.Try +import scala.util._ import metaconfig.Configured @@ -121,7 +115,7 @@ object Scalafmt { }, tree => { implicit val formatOps = new FormatOps(tree, style, file) - runner.event(CreateFormatOps(formatOps)) + runner.event(FormatEvent.CreateFormatOps(formatOps)) implicit val formatWriter = new FormatWriter(formatOps) Try(BestFirstSearch(range)).flatMap { res => val formattedString = formatWriter.mkString(res.state) diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/Align.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/Align.scala index 803f8b1f06..eb5f74d623 100644 --- a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/Align.scala +++ b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/Align.scala @@ -3,8 +3,6 @@ package org.scalafmt.config import scala.meta._ import metaconfig._ -import metaconfig.annotation.ExtraName -import metaconfig.generic.Surface /** @param openParenCallSite * If true AND bin-packing is true, then call-site arguments won't be aligned @@ -78,7 +76,7 @@ case class Align( closeParenSite: Boolean = false, private val openBracketCallSite: Option[Boolean] = None, openParenCallSite: Boolean = false, - @ExtraName("ifWhileOpenParen") + @annotation.ExtraName("ifWhileOpenParen") openParenCtrlSite: Boolean = false, private val openBracketDefnSite: Option[Boolean] = None, openParenDefnSite: Boolean = false, @@ -134,7 +132,8 @@ object Align { val some = Align() val default = some val more: Align = some.copy(tokens = AlignToken.default) - implicit lazy val surface: Surface[Align] = generic.deriveSurface[Align] + implicit lazy val surface: generic.Surface[Align] = generic + .deriveSurface[Align] implicit lazy val encoder: ConfEncoder[Align] = generic.deriveEncoder implicit lazy val decoder: ConfDecoderEx[Align] = Presets .mapDecoder(generic.deriveDecoderEx(default).noTypos, "align") diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/AlignToken.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/AlignToken.scala index 71c7a25765..9f2925209a 100644 --- a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/AlignToken.scala +++ b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/AlignToken.scala @@ -4,10 +4,7 @@ import org.scalafmt.util.ParamClauseParent import java.util.regex.{Pattern => jurPattern} -import metaconfig.Configured.Ok import metaconfig._ -import metaconfig.annotation.DeprecatedName -import metaconfig.generic.Surface /** Configuration option for aligning tokens. * @@ -18,7 +15,7 @@ import metaconfig.generic.Surface */ case class AlignToken( code: String, - @DeprecatedName("owner", "use owners instead", "3.0.0") + @annotation.DeprecatedName("owner", "use owners instead", "3.0.0") owner: String = null, owners: Seq[AlignToken.Owner] = Seq.empty, ) { @@ -49,10 +46,11 @@ object AlignToken { def getMatcher: Matcher = new Matcher(regex.map(pattern), parents.map(pattern)) } - implicit val ownerSurface: Surface[Owner] = generic.deriveSurface[Owner] + implicit val ownerSurface: generic.Surface[Owner] = generic + .deriveSurface[Owner] implicit val ownerCodec: ConfCodecEx[Owner] = generic.deriveCodecEx(Owner()) - implicit lazy val surface: Surface[AlignToken] = generic + implicit lazy val surface: generic.Surface[AlignToken] = generic .deriveSurface[AlignToken] implicit lazy val encoder: ConfEncoder[AlignToken] = generic.deriveEncoder val applyInfix = "Term.ApplyInfix" @@ -61,9 +59,9 @@ object AlignToken { implicit val decoder: ConfDecoderEx[AlignToken] = { val base = generic.deriveDecoderEx[AlignToken](fallbackAlign).noTypos ConfDecoderEx.from { - case (_, Conf.Str("caseArrow")) => Ok(caseArrow) - case (_, Conf.Str(regex)) => - Ok(default.find(_.code == regex).getOrElse(AlignToken(regex))) + case (_, Conf.Str("caseArrow")) => Configured.Ok(caseArrow) + case (_, Conf.Str(regex)) => Configured + .Ok(default.find(_.code == regex).getOrElse(AlignToken(regex))) case (state, conf) => base.read(state, conf) } } diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/AvoidInfixSettings.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/AvoidInfixSettings.scala index 2c09f3359c..5cfc2647ea 100644 --- a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/AvoidInfixSettings.scala +++ b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/AvoidInfixSettings.scala @@ -1,10 +1,8 @@ package org.scalafmt.config -import java.util.regex.Matcher -import java.util.regex.Pattern +import java.util.regex._ import metaconfig._ -import metaconfig.generic.Surface case class AvoidInfixSettings( // partial match @@ -82,7 +80,7 @@ object AvoidInfixSettings { } private[config] object Filter { - implicit lazy val surface: Surface[Filter] = generic.deriveSurface + implicit lazy val surface: generic.Surface[Filter] = generic.deriveSurface implicit lazy val encoder: ConfEncoder[Filter] = ConfEncoder .instance(x => Conf.Str(x.pattern)) implicit lazy val decoder: ConfDecoderEx[Filter] = ConfDecoderEx @@ -101,7 +99,8 @@ object AvoidInfixSettings { def apply(value: String): Filter = parse(value).get } - implicit lazy val surface: Surface[AvoidInfixSettings] = generic.deriveSurface + implicit lazy val surface: generic.Surface[AvoidInfixSettings] = + generic.deriveSurface implicit lazy val codec: ConfCodecEx[AvoidInfixSettings] = generic .deriveCodecEx(default).noTypos diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/LineEndings.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/LineEndings.scala index a3cac4305d..b5cde244df 100644 --- a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/LineEndings.scala +++ b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/LineEndings.scala @@ -1,8 +1,6 @@ package org.scalafmt.config -import metaconfig.Conf -import metaconfig.ConfCodecEx -import metaconfig.Configured +import metaconfig._ sealed abstract class LineEndings diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/Newlines.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/Newlines.scala index 53503cc1e5..4bcb4e9db4 100644 --- a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/Newlines.scala +++ b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/Newlines.scala @@ -7,7 +7,6 @@ import org.scalafmt.util.TreeOps import scala.meta._ import metaconfig._ -import metaconfig.generic.Surface /** @param penalizeSingleSelectMultiArgList * - If true, adds a penalty to newlines before a dot starting a select chain @@ -343,7 +342,7 @@ case class Newlines( } object Newlines { - implicit lazy val surface: Surface[Newlines] = generic.deriveSurface + implicit lazy val surface: generic.Surface[Newlines] = generic.deriveSurface implicit lazy val codec: ConfCodecEx[Newlines] = generic .deriveCodecEx(Newlines()).noTypos @@ -500,7 +499,8 @@ object Newlines { def isEmpty: Boolean = before == 0 && after == 0 } object NumBlanks { - implicit val surface: Surface[NumBlanks] = generic.deriveSurface[NumBlanks] + implicit val surface: generic.Surface[NumBlanks] = generic + .deriveSurface[NumBlanks] implicit val encoder: ConfEncoder[NumBlanks] = generic .deriveEncoder[NumBlanks] implicit val decoder: ConfDecoderEx[NumBlanks] = { @@ -540,7 +540,7 @@ object Newlines { pattern.forall(_.matcher(prefix).find()) } object TopStatBlanks { - implicit val surface: Surface[TopStatBlanks] = generic + implicit val surface: generic.Surface[TopStatBlanks] = generic .deriveSurface[TopStatBlanks] implicit val codec: ConfCodecEx[TopStatBlanks] = generic .deriveCodecEx(TopStatBlanks()).noTypos @@ -577,7 +577,7 @@ object Newlines { } private[config] object ConfigStyleElement { private val default = ConfigStyleElement() - implicit val surface: Surface[ConfigStyleElement] = generic + implicit val surface: generic.Surface[ConfigStyleElement] = generic .deriveSurface[ConfigStyleElement] implicit val codec: ConfCodecEx[ConfigStyleElement] = generic .deriveCodecEx(default).noTypos diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/OptIn.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/OptIn.scala index 46ce3ffcb2..dda0899150 100644 --- a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/OptIn.scala +++ b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/OptIn.scala @@ -1,7 +1,6 @@ package org.scalafmt.config import metaconfig._ -import metaconfig.generic.Surface /** @param configStyleArguments * Call-sites where there is a newline after opening ( and newline before @@ -121,7 +120,7 @@ case class OptIn( ) object OptIn { - implicit lazy val surface: Surface[OptIn] = generic.deriveSurface + implicit lazy val surface: generic.Surface[OptIn] = generic.deriveSurface implicit lazy val codec: ConfCodecEx[OptIn] = generic.deriveCodecEx(OptIn()) .noTypos } diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ProjectFiles.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ProjectFiles.scala index 7975cc03bf..3119779e26 100644 --- a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ProjectFiles.scala +++ b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ProjectFiles.scala @@ -11,20 +11,19 @@ import java.nio.file import scala.annotation.tailrec import metaconfig._ -import metaconfig.annotation.DeprecatedName case class ProjectFiles( git: Boolean = false, layout: Option[ProjectFiles.Layout] = None, includePaths: Seq[String] = ProjectFiles.defaultIncludePaths, excludePaths: Seq[String] = Nil, - @DeprecatedName( + @annotation.DeprecatedName( "includeFilters", "use `includePaths` with `regex:` prefix", "v3.0.0", ) includeFilters: Seq[String] = Nil, - @DeprecatedName( + @annotation.DeprecatedName( "excludeFilters", "use `excludePaths` with `regex:` prefix", "v3.0.0", diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/RedundantBracesSettings.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/RedundantBracesSettings.scala index 3936f7985c..63463f7116 100644 --- a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/RedundantBracesSettings.scala +++ b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/RedundantBracesSettings.scala @@ -1,14 +1,13 @@ package org.scalafmt.config import metaconfig._ -import metaconfig.annotation.ExtraName case class RedundantBracesSettings( - @ExtraName("methodBodies") + @annotation.ExtraName("methodBodies") defnBodies: RedundantBracesSettings.DefnBodies = RedundantBracesSettings.DefnBodies.all, includeUnitMethods: Boolean = true, - @ExtraName("maxLines") + @annotation.ExtraName("maxLines") maxBreaks: Int = 100, stringInterpolation: Boolean = false, parensForOneLineApply: Boolean = true, diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtConfDecoders.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtConfDecoders.scala index e5f5b04513..ffc6c5bb41 100644 --- a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtConfDecoders.scala +++ b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtConfDecoders.scala @@ -4,10 +4,7 @@ import scala.meta.parsers.Parse._ import scala.io.Codec -import metaconfig.Conf -import metaconfig.ConfCodecEx -import metaconfig.ConfDecoderEx -import metaconfig.Configured +import metaconfig._ object ScalafmtConfDecoders extends ScalafmtConfDecoders diff --git a/scalafmt-docs/src/main/scala/docs/DefaultsModifier.scala b/scalafmt-docs/src/main/scala/docs/DefaultsModifier.scala index c856c4ba3e..63745cd305 100644 --- a/scalafmt-docs/src/main/scala/docs/DefaultsModifier.scala +++ b/scalafmt-docs/src/main/scala/docs/DefaultsModifier.scala @@ -5,11 +5,8 @@ import org.scalafmt.config.ScalafmtConfig import scala.meta.inputs.Input import scala.meta.inputs.Position -import mdoc.Reporter -import mdoc.StringModifier -import metaconfig.Conf -import metaconfig.ConfEncoder -import metaconfig.Configured +import mdoc._ +import metaconfig._ class DefaultsModifier extends StringModifier { override val name: String = "defaults" diff --git a/scalafmt-tests-community/common/src/main/scala/org/scalafmt/community/common/CommunityBuild.scala b/scalafmt-tests-community/common/src/main/scala/org/scalafmt/community/common/CommunityBuild.scala index c2be65458f..83133d2d19 100644 --- a/scalafmt-tests-community/common/src/main/scala/org/scalafmt/community/common/CommunityBuild.scala +++ b/scalafmt-tests-community/common/src/main/scala/org/scalafmt/community/common/CommunityBuild.scala @@ -4,8 +4,7 @@ import org.scalafmt.config.ConfParsed import scala.meta._ -import java.nio.file.FileSystems -import java.nio.file.Path +import java.nio.file._ import metaconfig.Conf diff --git a/scalafmt-tests/shared/src/test/scala/org/scalafmt/util/HasTests.scala b/scalafmt-tests/shared/src/test/scala/org/scalafmt/util/HasTests.scala index 08d9dfcc1a..463372e0e8 100644 --- a/scalafmt-tests/shared/src/test/scala/org/scalafmt/util/HasTests.scala +++ b/scalafmt-tests/shared/src/test/scala/org/scalafmt/util/HasTests.scala @@ -20,8 +20,7 @@ import java.util.regex.Pattern import scala.annotation.tailrec import scala.collection.mutable -import metaconfig.Conf -import metaconfig.Configured +import metaconfig._ import munit.Assertions._ import munit.Location