bugfix: Add additional check for InterpolatorSplice substring

scalameta · Mar 22, 2024 · 50f95ae · 50f95ae
1 parent 33618c1
commit 50f95ae
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/mtags-shared/src/main/scala/scala/meta/internal/pc/InterpolationSplice.scala b/mtags-shared/src/main/scala/scala/meta/internal/pc/InterpolationSplice.scala
@@ -35,11 +35,13 @@ object InterpolationSplice {
         }
       }
     if (isCandidate) {
-      val name = chars(i + 1) match {
-        case '{' => originalText.substring(i + 2, offset)
-        case _ => originalText.substring(i + 1, offset)
+      val nameOpt = chars(i + 1) match {
+        case '{' if i + 2 <= offset =>
+          Some(originalText.substring(i + 2, offset))
+        case _ if i + 1 <= offset => Some(originalText.substring(i + 1, offset))
+        case _ => None
       }
-      Some(
+      nameOpt.map(name =>
         InterpolationSplice(
           i,
           name,