Fix support of multiline shebang

VirtusLab · May 14, 2024 · cdf3cdb · cdf3cdb
1 parent 82cd8c0
commit cdf3cdb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/modules/build/src/main/scala/scala/build/preprocessing/SheBang.scala b/modules/build/src/main/scala/scala/build/preprocessing/SheBang.scala
@@ -3,7 +3,7 @@ package scala.build.preprocessing
 import scala.util.matching.Regex
 
 object SheBang {
-  private val sheBangRegex: Regex = s"""(^(#!.*(\\r\\n?|\\n)?)+(\\s*!#.*)?)""".r
+  private val sheBangRegex: Regex = s"""(^(#!.*(\\X)?)+(\\X*!#.*)?)""".r
 
   def isShebangScript(content: String): Boolean = sheBangRegex.unanchored.matches(content)
 

diff --git a/modules/build/src/test/scala/scala/build/tests/SourcesTests.scala b/modules/build/src/test/scala/scala/build/tests/SourcesTests.scala
@@ -317,6 +317,13 @@ class SourcesTests extends TestUtil.ScalaCliBuildSuite {
           |println("Hello World")""".stripMargin,
       os.rel / "something5.scala" ->
         """#!/usr/bin/scala-cli
+          |
+          |println("Hello World #!")""".stripMargin,
+      os.rel / "multiline.scala" ->
+        """#!/usr/bin/scala-cli
+          |# comment
+          |VAL=1
+          |!#
           |
           |println("Hello World #!")""".stripMargin
     )
@@ -335,6 +342,12 @@ class SourcesTests extends TestUtil.ScalaCliBuildSuite {
         |
         |println("Hello World")""".stripMargin,
       """
+        |
+        |println("Hello World #!")""".stripMargin,
+      """
+        |
+        |
+        |
         |
         |println("Hello World #!")""".stripMargin
     )