diff options
| author | Paul Phillips <paulp@improving.org> | 2011-12-01 15:10:29 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-12-01 15:10:29 -0800 |
| commit | 947797ea23d711e501605c0cc218fec88e3b97ef (patch) | |
| tree | 4c965977bbad2b0f95a9a4b165d836e5814bf9e6 /src/compiler | |
| parent | 9f39cf8d12a1dbf362ef334bc878ff1c11daac1a (diff) | |
| parent | 5ebad784e0714ac50c1f91f7943cdc6dcb51e277 (diff) | |
| download | scala-947797ea23d711e501605c0cc218fec88e3b97ef.tar.gz scala-947797ea23d711e501605c0cc218fec88e3b97ef.tar.bz2 scala-947797ea23d711e501605c0cc218fec88e3b97ef.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/util/SourceFile.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/util/SourceFile.scala b/src/compiler/scala/tools/nsc/util/SourceFile.scala index 22820806be..4405b3457b 100644 --- a/src/compiler/scala/tools/nsc/util/SourceFile.scala +++ b/src/compiler/scala/tools/nsc/util/SourceFile.scala @@ -72,7 +72,7 @@ object ScriptSourceFile { * with "!#" or "::!#". */ def headerLength(cs: Array[Char]): Int = { - val headerPattern = Pattern.compile("""^(::)?!#.*(\r|\n|\r\n)""", Pattern.MULTILINE) + val headerPattern = Pattern.compile("""((?m)^(::)?!#.*|^.*/env .*)(\r|\n|\r\n)""") val headerStarts = List("#!", "::#!") if (headerStarts exists (cs startsWith _)) { |