Relative paths during macro capture

modules/codecs/src/weaver/codecs/package.scala

@@ -37,16 +37,26 @@ package object codecs {
   }
 
   implicit val sourceLocationEncoder: Encoder[SourceLocation] =
-    Encoder.forProduct3[SourceLocation, Option[String], Option[String], Int](
+    Encoder.forProduct4[SourceLocation,
+                        Option[String],
+                        Option[String],
+                        Option[String],
+                        Int](
       "fileName",
       "filePath",
+      "fileRelativePath",
       "line"
-    )(sl => (sl.fileName, sl.filePath, sl.line))
+    )(sl => (sl.fileName, sl.filePath, sl.fileRelativePath, sl.line))
 
   implicit val sourceLocationDecoder: Decoder[SourceLocation] =
-    Decoder.forProduct3[SourceLocation, Option[String], Option[String], Int](
+    Decoder.forProduct4[SourceLocation,
+                        Option[String],
+                        Option[String],
+                        Option[String],
+                        Int](
       "fileName",
       "filePath",
+      "fileRelativePath",
       "line"
     )(SourceLocation.apply)
 

modules/core/src/weaver/Result.scala

@@ -160,7 +160,7 @@ object Result {
         if (index == 0)
           color + prefix + line +
             location.fold("")(l =>
-              s" (${l.bestEffortPath.getOrElse("none")}:${l.line})")
+              s" (${l.fileRelativePath.getOrElse("none")}:${l.line})")
         else
           color + prefix + line
     }
@@ -180,7 +180,7 @@ object Result {
         if (index == 0)
           color + prefix + line +
             location.fold("")(l =>
-              s" (${l.bestEffortPath.getOrElse("none")}:${l.line})")
+              s" (${l.fileRelativePath.getOrElse("none")}:${l.line})")
         else
           color + prefix + line
     }

modules/core/src/weaver/SourceLocation.scala

@@ -8,11 +8,9 @@ import scala.util.{Try => STry}
 final case class SourceLocation(
   fileName: Option[String],
   filePath: Option[String],
+  fileRelativePath: Option[String],
   line: Int
-) {
-  def bestEffortPath : Option[String] =
-    FSCompat.bestEffortPath(fileName, filePath)
-}
+)
 
 object SourceLocation {
   implicit def fromContext: SourceLocation =
@@ -22,15 +20,21 @@ object SourceLocation {
     import c.universe._
 
     def fromContext: Tree = {
-      val (fileNameExpr, pathExpr, lineExpr) = getSourceLocation
+      val (fileNameExpr, pathExpr, relPathExpr, lineExpr) = getSourceLocation
       val SourceLocationSym = symbolOf[SourceLocation].companion
-      q"""$SourceLocationSym($fileNameExpr, $pathExpr, $lineExpr)"""
+      q"""$SourceLocationSym($fileNameExpr, $pathExpr, $relPathExpr, $lineExpr)"""
     }
 
     private def getSourceLocation = {
-      val line = c.Expr[Int](Literal(Constant(c.enclosingPosition.line)))
+      val pwd  = java.nio.file.Paths.get("").toAbsolutePath
       val file = STry(Option(c.enclosingPosition.source.file.file)).toOption.flatten
-      (wrapOption(file.map(_.getName)), wrapOption(file.map(_.getPath)), line)
+      val path = file.map(_.getPath)
+      val relativePath = file.map { f =>
+        pwd.relativize(f.toPath()).toString()
+      }
+
+      val line = c.Expr[Int](Literal(Constant(c.enclosingPosition.line)))
+      (wrapOption(file.map(_.getName)), wrapOption(path), wrapOption(relativePath), line)
     }
 
     private def wrapOption[A](opt: Option[A]): c.Expr[Option[A]] =

modules/framework/test/src/Meta.scala

@@ -137,6 +137,7 @@ object Meta {
 
     implicit val sourceLocation: SourceLocation = SourceLocation(
       Some("DogFoodTests.scala"),
+      None,
       Some("src/main/DogFoodTests.scala"),
       5)
   }

modules/framework/test/src/SourceLocationTest.scala

@@ -0,0 +1,21 @@
+package weaver
+package framework
+package test
+
+object SourceLocationTest extends SimpleIOSuite {
+
+  // DO NOT MOVE THIS
+  val sourceLocation = implicitly[SourceLocation]
+
+  test("implicit capture of source location is relativised") {
+    val name    = sourceLocation.fileName
+    val relPath = sourceLocation.fileRelativePath
+    val line    = sourceLocation.line
+
+    expect(name.contains("SourceLocationTest.scala")) &&
+    expect(relPath.contains(
+      "modules/framework/test/src/SourceLocationTest.scala")) &&
+    expect(line == 8)
+  }
+
+}