Router: skip shebang line, allow top-level if used

scalameta · Oct 28, 2022 · 753e3b0 · 753e3b0
1 parent b12c9fb
commit 753e3b0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/Scalafmt.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/Scalafmt.scala
@@ -67,7 +67,7 @@ object Scalafmt {
   ): Formatted.Result = {
     def getStyleByFile(style: ScalafmtConfig) = {
       val isSbt = FileOps.isAmmonite(filename) || FileOps.isSbt(filename) ||
-        FileOps.isMarkdown(filename)
+        FileOps.isMarkdown(filename) || code.startsWith("#!")
       if (isSbt) style.forSbt else style
     }
     val styleTry =

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala
@@ -89,8 +89,7 @@ class Router(formatOps: FormatOps) {
         Seq(Split(NoSplit.orNL(next(ft).right.is[T.EOF]), 0))
       case FormatToken(_: T.BOF, right, _) =>
         val policy = right match {
-          case T.Ident(name) // shebang in .sc files
-              if FileOps.isAmmonite(filename) && name.startsWith("#!") =>
+          case T.Ident(name) if name.startsWith("#!") =>
             val nl = findFirst(next(formatToken), Int.MaxValue) { x =>
               x.hasBreak || x.right.is[T.EOF]
             }