Skip to content

Fix #6371: Make error message rendering resilient to missing sources #6412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ trait MessageRendering {
* @return (lines before error, lines after error, line numbers offset)
*/
def sourceLines(pos: SourcePosition, diagnosticLevel: String)(implicit ctx: Context): (List[String], List[String], Int) = {
assert(pos.exists && pos.source.file.exists)
var maxLen = Int.MinValue
def render(offsetAndLine: (Int, String)): String = {
val (offset, line) = offsetAndLine
Expand Down Expand Up @@ -113,7 +114,9 @@ trait MessageRendering {
*/
def posStr(pos: SourcePosition, diagnosticLevel: String, message: Message)(implicit ctx: Context): String =
if (pos.exists) hl(diagnosticLevel)({
val file = s"${pos.source.file.toString}:${pos.line + 1}:${pos.column}"
val file =
if (pos.source.file.exists) s"${pos.source.file.toString}:${pos.line + 1}:${pos.column}"
else s"${pos.source.file.toString}: offset ${pos.start} (missing source file)"
val errId =
if (message.errorId ne ErrorMessageID.NoExplanationID) {
val errorNumber = message.errorId.errorNumber()
Expand Down Expand Up @@ -145,7 +148,7 @@ trait MessageRendering {
val sb = mutable.StringBuilder.newBuilder
val posString = posStr(pos, diagnosticLevel, msg)
if (posString.nonEmpty) sb.append(posString).append(EOL)
if (pos.exists) {
if (pos.exists && pos.source.file.exists) {
val (srcBefore, srcAfter, offset) = sourceLines(pos, diagnosticLevel)
val marker = columnMarker(pos, offset, diagnosticLevel)
val err = errorMsg(pos, msg.msg, offset)
Expand Down
12 changes: 12 additions & 0 deletions project/scripts/cmdTests
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,18 @@ clear_out "$OUT"
"$SBT" ";dotc -d $OUT/out.jar $SOURCE; dotc -decompile -classpath $OUT/out.jar -color:never $MAIN" > "$tmp"
grep -qe "def main(args: scala.Array\[scala.Predef.String\]): scala.Unit =" "$tmp"

# check that missing source file does not crash message rendering
echo "testing that missing source file does not crash message rendering"
clear_out "$OUT"
clear_out "$OUT1"
cp tests/neg/i6371/A_1.scala $OUT/A.scala
cp tests/neg/i6371/B_2.scala $OUT/B.scala
"$SBT" "dotc $OUT/A.scala -d $OUT1"
rm $OUT/A.scala
"$SBT" "dotc -classpath $OUT1 -d $OUT1 $OUT/B.scala" > "$tmp" 2>&1 || echo "ok"
grep -qe "A.scala: offset 63 (missing source file)" "$tmp"


## Disabled because of flakeyness, should be changed to not depend on sbt
# echo "running Vulpix meta test"
# tmp=$(mktemp)
Expand Down
6 changes: 6 additions & 0 deletions tests/neg/i6371/A_1.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
object A {
inline def foo(a: Any): Unit = a match {
case _: Int => // error
case _ =>
}
}
3 changes: 3 additions & 0 deletions tests/neg/i6371/B_2.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
object B {
A.foo("aa")
}