add test for new location of method in tasty

Author: bishabosha

compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala

@@ -1194,7 +1194,9 @@ class TreeUnpickler(reader: TastyReader,
                 && sym.owner == owner
                 && sym.targetName == target
                 && sym.signature == sig
-              makeSelect(qual, name, qualType.findMember(name, prefix).filterWithPredicate(matchOverload))
+              val denot = qualType.findMember(name, prefix).filterWithPredicate(matchOverload)
+              // TODO: if denot == NoDenotation then ???
+              makeSelect(qual, name, denot)
             case REPEATED =>
               val elemtpt = readTpt()
               SeqLiteral(until(end)(readTerm()), elemtpt)

compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala

@@ -149,10 +149,13 @@ trait MessageRendering {
     if (posString.nonEmpty) sb.append(posString).append(EOL)
     if (pos.exists) {
       val pos1 = pos.nonInlined
-      val (srcBefore, srcAfter, offset) = sourceLines(pos1, diagnosticLevel)
-      val marker = columnMarker(pos1, offset, diagnosticLevel)
-      val err = errorMsg(pos1, msg.message, offset)
-      sb.append((srcBefore ::: marker :: err :: outer(pos, " " * (offset - 1)) ::: srcAfter).mkString(EOL))
+      if (pos1.exists && pos1.source.file.exists) {
+        val (srcBefore, srcAfter, offset) = sourceLines(pos1, diagnosticLevel)
+        val marker = columnMarker(pos1, offset, diagnosticLevel)
+        val err = errorMsg(pos1, msg.message, offset)
+        sb.append((srcBefore ::: marker :: err :: outer(pos, " " * (offset - 1)) ::: srcAfter).mkString(EOL))
+      }
+      else sb.append(msg.message)
     }
     else sb.append(msg.message)
     sb.toString

compiler/src/dotty/tools/dotc/util/SourceFile.scala

@@ -196,7 +196,7 @@ class SourceFile(val file: AbstractFile, computeContent: => Array[Char]) extends
     var idx = startOfLine(offset)
     var col = 0
     while (idx != offset) {
-      col += (if (idx < length && content()(idx) == '\t') (tabInc - col) % tabInc else 1)
+      col += (if (idx < length && idx < content().length && content()(idx) == '\t') (tabInc - col) % tabInc else 1)
       idx += 1
     }
     col
@@ -285,4 +285,3 @@ object SourceFile {
   override def exists: Boolean = false
   override def atSpan(span: Span): SourcePosition = NoSourcePosition
 }
-

sbt-dotty/sbt-test/source-dependencies/tasty-add-overload/a-changes/A.scala

@@ -0,0 +1,16 @@
+package a
+
+object A {
+
+  trait Box0[A] {
+    def append(a: A): this.type = this
+    def append(a: String): Unit = ()
+  }
+
+  trait BoxInt extends Box0[Int] {
+    override def append(a: Int): this.type = this
+  }
+
+  val box: BoxInt = new BoxInt {}
+
+}

sbt-dotty/sbt-test/source-dependencies/tasty-add-overload/a/A.scala

@@ -0,0 +1,14 @@
+package a
+
+object A {
+
+  trait Box0[A] {
+    def append(a: A): this.type = this
+    def append(a: String): Unit = ()
+  }
+
+  trait BoxInt extends Box0[Int]
+
+  val box: BoxInt = new BoxInt {}
+
+}

sbt-dotty/sbt-test/source-dependencies/tasty-add-overload/b/B.scala

@@ -0,0 +1,5 @@
+import a.*
+
+object B extends App {
+  A.box.append(0)
+}

sbt-dotty/sbt-test/source-dependencies/tasty-add-overload/build.sbt

@@ -0,0 +1,23 @@
+lazy val a = project.in(file("a"))
+  .settings(
+    Compile / classDirectory := (ThisBuild / baseDirectory).value / "b-input"
+  )
+
+lazy val b = project.in(file("b"))
+  .settings(
+    Compile / unmanagedClasspath += (ThisBuild / baseDirectory).value / "b-input",
+    Compile / classDirectory := (ThisBuild / baseDirectory).value / "c-input"
+  )
+
+lazy val `a-changes` = project.in(file("a-changes"))
+  .settings(
+    Compile / classDirectory := (ThisBuild / baseDirectory).value / "c-input"
+  )
+
+lazy val c = project.in(file("c"))
+  .settings(
+    scalacOptions ++= Seq("-from-tasty"),
+    Compile / sources := Seq(new java.io.File("c-input/B.tasty")),
+    Compile / unmanagedClasspath += (ThisBuild / baseDirectory).value / "c-input",
+    Compile / classDirectory := (ThisBuild / baseDirectory).value / "c-output"
+  )

sbt-dotty/sbt-test/source-dependencies/tasty-add-overload/project/DottyInjectedPlugin.scala

@@ -0,0 +1,11 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := sys.props("plugin.scalaVersion")
+  )
+}

sbt-dotty/sbt-test/source-dependencies/tasty-add-overload/project/plugins.sbt

@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-dotty/sbt-test/source-dependencies/tasty-add-overload/test

@@ -0,0 +1,4 @@
+> a/compile
+> b/compile
+> a-changes/compile
+> c/compile