diff --git a/.scalafmt.conf b/.scalafmt.conf index 29a8dab..fea59ff 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -21,12 +21,16 @@ rewrite { SortModifiers ] imports { + expand = true sort = ascii groups = [ - ["javax?\\..*"], + ["java.?\\..*"], ["sbt\\..*"], + ["scala\\.meta\\..*"], ["scala\\..*"], - ["org\\..*"] + ["org\\.scalafmt\\..*", "org\\.scalameta\\..*"], + ["org\\..*"], + ["com\\..*"], ] } redundantBraces { diff --git a/plugin/src/main/scala/org/scalafmt/sbt/ScalafmtPlugin.scala b/plugin/src/main/scala/org/scalafmt/sbt/ScalafmtPlugin.scala index 1c07199..3b64069 100644 --- a/plugin/src/main/scala/org/scalafmt/sbt/ScalafmtPlugin.scala +++ b/plugin/src/main/scala/org/scalafmt/sbt/ScalafmtPlugin.scala @@ -78,7 +78,9 @@ object ScalafmtPlugin extends AutoPlugin { case class ScalafmtAnalysis(failedScalafmtCheck: Set[File]) object ScalafmtAnalysis { - import sjsonnew.{:*:, LList, LNil} + import sjsonnew.:*: + import sjsonnew.LList + import sjsonnew.LNil implicit val analysisIso = LList.iso( { a: ScalafmtAnalysis => ("failedScalafmtCheck", a.failedScalafmtCheck) :*: LNil