Skip to content

Commit a19f5dc

Browse files
authored
Merge pull request #13671 from philwalk/fix-13670-relax-scala-hashbang-recognizer
relax requirements for recognizing valid scala hashbang lines - fix for #13670
2 parents 6e68045 + b69d3d2 commit a19f5dc

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

compiler/src/dotty/tools/MainGenericRunner.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,8 @@ object MainGenericRunner {
146146
process(tail, settings.withScalaArgs(o))
147147
case arg :: tail =>
148148
val line = Try(Source.fromFile(arg).getLines.toList).toOption.flatMap(_.headOption)
149-
if arg.endsWith(".scala") || arg.endsWith(".sc") || (line.nonEmpty && raw"#!.*scala".r.matches(line.get)) then
149+
lazy val hasScalaHashbang = { val s = line.getOrElse("") ; s.startsWith("#!") && s.contains("scala") }
150+
if arg.endsWith(".scala") || arg.endsWith(".sc") || hasScalaHashbang then
150151
settings
151152
.withExecuteMode(ExecuteMode.Script)
152153
.withTargetScript(arg)

0 commit comments

Comments
 (0)