From 23f0b1fa1a6b504c13656d7d59d8622882dee27b Mon Sep 17 00:00:00 2001
From: Oscar Boykin <oboykin@netflix.com>
Date: Thu, 5 Jan 2023 07:21:43 -1000
Subject: [PATCH] In IOLifts.fromOption, build the exception string at compile
 time, not runtime

---
 .../scala/afenton/bazel/bsp/IOLifts.scala     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/scala/afenton/bazel/bsp/IOLifts.scala b/src/main/scala/afenton/bazel/bsp/IOLifts.scala
index 28fce31..f0a4036 100644
--- a/src/main/scala/afenton/bazel/bsp/IOLifts.scala
+++ b/src/main/scala/afenton/bazel/bsp/IOLifts.scala
@@ -2,6 +2,8 @@ package afenton.bazel.bsp
 
 import cats.effect.IO
 import scala.quoted.*
+import java.nio.file.Paths
+import scala.util.control.NonFatal
 
 object IOLifts {
   /** Convert an Option to an IO or make a good error message
@@ -18,19 +20,17 @@ object IOLifts {
 
   def fromOptionImpl[A: Type, B: Type](expr: Expr[Option[A]], fn: Expr[A => IO[B]])(using ctx: Quotes): Expr[IO[B]] = {
     val rootPosition = ctx.reflect.Position.ofMacroExpansion
-    val file = Expr(rootPosition.sourceFile.path)
-    val line = Expr((rootPosition.startLine + 1).toString)
-    val show = Expr(expr.show)
+    val absFile: String = rootPosition.sourceFile.path
+    val file = try {
+      Paths.get("").toAbsolutePath.relativize(Paths.get(absFile)).toString
+    } catch {
+      case NonFatal(_) => absFile
+    }
+    val line = rootPosition.startLine + 1
+    val msg = Expr(s"expected ${expr.show} to be defined in file: $file at line: $line")
 
     val errorCase = '{
-      val str = new StringBuilder
-      str.append("expected ")
-      str.append(${show})
-      str.append(" to be defined in file: ")
-      str.append(${file})
-      str.append(" at line: ")
-      str.append(${line})
-      IO.raiseError[B](new java.util.NoSuchElementException(str.toString()))
+      IO.raiseError[B](new java.util.NoSuchElementException($msg))
     }
 
     expr match {