Merge pull request #877 from kitbellew/877

Formatting: adjust scalafmt configuration

.git-blame-ignore-revs

@@ -1,2 +1,5 @@
 # Scala Steward: Reformat with sbt-java-formatter 0.8.0
 9e5e7610a81938d804d8edf533844b03ef125b5a
+
+# adjust scalafmt config
+2087aa17546b6526511b5848faa0aa9819432181

.scalafmt.conf

@@ -2,17 +2,62 @@ version = "3.8.5"
 
 assumeStandardLibraryStripMargin = true
 
+align {
+  preset = none
+  stripMargin = true
+}
+
 // Docstring wrapping breaks doctests
-docstrings.wrap = false
-docstrings.style = Asterisk
+docstrings {
+  wrap = false
+  style = Asterisk
+}
 
-project.git=true
-project.excludeFilters = [
-  "LinesSuite.scala"
-]
+project {
+  git = true
+   excludeFilters = [
+    "LinesSuite.scala"
+  ]
+  layout = StandardConvention
+}
 runner.dialect = scala212
-fileOverride {
-  "glob:**/src/{main,test}/scala-3/**" {
-    runner.dialect = scala3
+
+newlines {
+  avoidForSimpleOverflow = all
+  inInterpolation = avoid
+  source = fold
+}
+
+rewrite {
+  rules = [
+    AvoidInfix,
+    Imports,
+    RedundantBraces,
+    RedundantParens,
+    SortModifiers,
+  ]
+  imports {
+    expand = true
+    sort = ascii
+    groups = [
+      ["munit\\..*"],
+      ["sbt\\..*"],
+      ["java.?\\..*"],
+      ["scala\\..*"],
+      ["org\\..*"],
+      ["com\\..*"],
+    ]
+  }
+  redundantBraces {
+    preset = all
+    oneStatApply {
+      parensMaxSpan = 300
+      bracesMinSpan = 300
+    }
+  }
+  redundantParens {
+    preset = all
   }
+  sortModifiers.preset = styleGuide
+  trailingCommas.style = multiple
 }