Source locators are incorrect in error messages

[jackkoenig]

Consider the following:

$ mill --version
Mill Build Tool version 0.11.1
Java version: 11.0.13, vendor: GraalVM Community, runtime: /Library/Java/JavaVirtualMachines/openjdk11-graalvm/Contents/Home
Default locale: en_US, platform encoding: UTF-8
OS name: "Mac OS X", version: 12.6.2, arch: x86_64

$ cat build.sc
// A comment
import mill._, scalalib._, publish._

object proj extends JavaModule {
  def foo = T { os.pwd / 3 }
}

$ mill show proj.foo
[build.sc] [41/49] compile 
[info] compiling 1 Scala source to /Users/jackk/work/foo/out/mill-build/compile.dest/classes ...
[error] /Users/jackk/work/foo/build.sc:4:26: type mismatch;
[error]  found   : Int(3)
[error]  required: os.PathChunk
[error]   def foo = T { os.pwd / 3 }
[error]                          ^
[error] one error found
1 targets failed
compile Compilation failed

The line number given is 4, but it should be 5. I am pretty sure this offset is due to the comment above the imports because if I add more lines before the imports, the offset increases proportionally to the number of lines I've added.

[lihaoyi]

Seems like the same issue as com-lihaoyi/Ammonite#1361, which was fixed upstream in Ammonite after we vendored the code in Mill. We should pull in the latest fixed code from Ammonite (including that PR and some follow ups)

[jackkoenig]

Thanks for the fix!