fix for 3789 - updated (#3794)

* fix for 3789 - script if .sc, or (if no extension) has shebang

* verify-non-directory in shebang-test

* reorder isDir case ahead of isShebangScript

* added integration test for enabled case

* restore line endings

* adjust new test

* quote msg

* fix quoted msg

* Apply suggestions from code review

suggested changes

Co-authored-by: Piotr Chabelski <[email protected]>

* remove isScript extra paren

---------

Co-authored-by: Piotr Chabelski <[email protected]>

Author: philwalk

modules/build/src/main/scala/scala/build/CrossSources.scala

@@ -436,7 +436,7 @@ object CrossSources {
       else if (sourcePath == os.sub / Constants.projectFileName)
         Right(Seq(ProjectScalaFile(dir, subPath)))
       else if (sourcePath.ext == "scala") Right(Seq(SourceScalaFile(dir, subPath)))
-      else if (sourcePath.ext == "sc") Right(Seq(Script(dir, subPath, None)))
+      else if (sourcePath.isScript) Right(Seq(Script(dir, subPath, None)))
       else if (sourcePath.ext == "java") Right(Seq(JavaFile(dir, subPath)))
       else if (sourcePath.ext == "jar") Right(Seq(JarFile(dir, subPath)))
       else if (sourcePath.ext == "md") Right(Seq(MarkdownFile(dir, subPath)))

modules/build/src/main/scala/scala/build/input/ElementsUtils.scala

@@ -8,6 +8,11 @@ import scala.build.Directories
 import scala.build.internal.Constants
 
 object ElementsUtils {
+  extension (p: os.Path) {
+    def hasShebang: Boolean = os.read.bytes(p, offset = 0, count = 2) == Array('#', '!')
+    def isScript: Boolean   = p.ext == "sc" || (p.hasShebang && p.ext != "scala")
+  }
+
   extension (d: Directory) {
     def singleFilesFromDirectory(enableMarkdown: Boolean): Seq[SingleFile] = {
       import Ordering.Implicits.seqOrdering
@@ -20,7 +25,7 @@ object ElementsUtils {
             ProjectScalaFile(d.path, p.subRelativeTo(d.path))
           case p if p.last.endsWith(".scala") =>
             SourceScalaFile(d.path, p.subRelativeTo(d.path))
-          case p if p.last.endsWith(".sc") =>
+          case p if p.last.endsWith(".sc") || p.hasShebang =>
             Script(d.path, p.subRelativeTo(d.path), None)
           case p if p.last.endsWith(".c") || p.last.endsWith(".h") =>
             CFile(d.path, p.subRelativeTo(d.path))

modules/build/src/main/scala/scala/build/input/Inputs.scala

@@ -275,13 +275,14 @@ object Inputs {
         }
         else if path.last == Constants.projectFileName then
           Right(Seq(ProjectScalaFile(dir, subPath)))
-        else if arg.endsWith(".sc") then Right(Seq(Script(dir, subPath, Some(arg))))
+        else if os.isDir(path) then Right(Seq(Directory(path)))
+        else if arg.endsWith(".sc") || (os.exists(path) && isShebangScript(String(content))) then
+          Right(Seq(Script(dir, subPath, Some(arg))))
         else if arg.endsWith(".scala") then Right(Seq(SourceScalaFile(dir, subPath)))
         else if arg.endsWith(".java") then Right(Seq(JavaFile(dir, subPath)))
         else if arg.endsWith(".jar") then Right(Seq(JarFile(dir, subPath)))
         else if arg.endsWith(".c") || arg.endsWith(".h") then Right(Seq(CFile(dir, subPath)))
         else if arg.endsWith(".md") then Right(Seq(MarkdownFile(dir, subPath)))
-        else if os.isDir(path) then Right(Seq(Directory(path)))
         else if acceptFds && arg.startsWith("/dev/fd/") then
           Right(Seq(VirtualScript(content, arg, os.sub / s"input-${idx + 1}.sc")))
         else if programInvokeData.subCommand == SubCommand.Shebang && os.exists(path) then

modules/integration/src/test/scala/scala/cli/integration/RunScriptTestDefinitions.scala

@@ -573,6 +573,21 @@ trait RunScriptTestDefinitions { _: RunTestDefinitions =>
       }
     }
 
+  test("script file with shebang header and no extension run with scala-cli") {
+    val msg    = "compiled and ran"
+    val inputs = TestInputs(
+      os.rel / "scriptWithShebang" ->
+        s"""|#!/usr/bin/env -S ${TestUtil.cli.mkString(" ")} shebang
+            |//> using scala $actualScalaVersion
+            |println(s"$msg")""".stripMargin
+    )
+    inputs.fromRoot { root =>
+      val output = os.proc(TestUtil.cli, "scriptWithShebang")
+        .call(cwd = root).out.trim()
+      expect(output == msg)
+    }
+  }
+
   test("script file with shebang header and no extension run with scala-cli shebang") {
     val inputs = TestInputs(
       os.rel / "script-with-shebang" ->
@@ -591,7 +606,6 @@ trait RunScriptTestDefinitions { _: RunTestDefinitions =>
       expect(output == "List(1, 2, 3, -v)")
     }
   }
-
   test("script file with NO shebang header and no extension run with scala-cli shebang") {
     val inputs = TestInputs(
       os.rel / "script-no-shebang" ->