Commit f5f2996

committed

Offset line numbers when reporting given a magic comment

1 parent b52e6b8 commit f5f2996Copy full SHA for f5f2996

File tree

+20

-3

lines changed

+20

-3

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import core.Decorators.*`
`11`	`11`	`import printing.Highlighting.{Blue, Red, Yellow}`
`12`	`12`	`import printing.SyntaxHighlighting`
`13`	`13`	`import Diagnostic.*`
`14`		`-import util.{ SourcePosition, NoSourcePosition }`
	`14`	`+import util.{ SourcePosition, NoSourcePosition, WrappedSourceFile }`
`15`	`15`	`import util.Chars.{ LF, CR, FF, SU }`
`16`	`16`	`import scala.annotation.switch`
`17`	`17`
`@@ -44,7 +44,9 @@ trait MessageRendering {`
`44`	`44`	`var maxLen = Int.MinValue`
`45`	`45`	`def render(offsetAndLine: (Int, String)): String = {`
`46`	`46`	`val (offset1, line) = offsetAndLine`
`47`		`- val lineNbr = (pos.source.offsetToLine(offset1) + 1).toString`
	`47`	`+ val magicOffset = WrappedSourceFile.locateMagicHeader(pos.source).getOrElse(0)`
	`48`	`+ println(i"magicOffset: $magicOffset")`
	`49`	`+ val lineNbr = (pos.source.offsetToLine(offset1) + 1 - magicOffset).toString`
`48`	`50`	`val prefix = String.format(s"%${offset - 2}s \|", lineNbr)`
`49`	`51`	`maxLen = math.max(maxLen, prefix.length)`
`50`	`52`	`val lnum = hl(" " * math.max(0, maxLen - prefix.length - 1) + prefix)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import core.Contexts.*`
`7`	`7`	`import collection.mutable`
`8`	`8`	`import scala.annotation.tailrec`
`9`	`9`	`import dotty.tools.dotc.reporting.Reporter`
`10`		`-import dotty.tools.dotc.util.SourcePosition;`
	`10`	`+import dotty.tools.dotc.util.SourcePosition`
`11`	`11`
`12`	`12`	`import java.io.OutputStreamWriter`
`13`	`13`	`import java.nio.charset.StandardCharsets.UTF_8`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,21 @@ object ScriptSourceFile {`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
	`64`	`+object WrappedSourceFile:`
	`65`	`+ private val cache: mutable.HashMap[SourceFile, Int] = mutable.HashMap.empty`
	`66`	`+ def locateMagicHeader(sourceFile: SourceFile)(using Context): Option[Int] =`
	`67`	`+ def findOffset: Int =`
	`68`	`+ val magicHeader = ctx.settings.XmagicOffsetHeader.value`
	`69`	`+ if magicHeader.isEmpty then`
	`70`	`+ -1`
	`71`	`+ else`
	`72`	`+ val s = new String(sourceFile.content)`
	`73`	`+ val regex = ("(?m)^" + java.util.regex.Pattern.quote(magicHeader) + "$").r`
	`74`	`+ val pos = regex.findFirstMatchIn(s).map(_.start).map(sourceFile.offsetToLine(_))`
	`75`	`+ pos.getOrElse(-1)`
	`76`	`+ val result = cache.getOrElseUpdate(sourceFile, findOffset)`
	`77`	`+ if result >= 0 then Some(result + 1) else None`
	`78`	`+`
`64`	`79`	`class SourceFile(val file: AbstractFile, computeContent: => Array[Char]) extends interfaces.SourceFile {`
`65`	`80`	`import SourceFile.*`
`66`	`81`

Comments

(0)