fix: allow for #include header

scalameta · Jun 4, 2024 · be9ad2e · be9ad2e
1 parent 06b75bb
commit be9ad2e
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/mtags/src/main/scala/scala/meta/internal/mtags/JavaToplevelMtags.scala b/mtags/src/main/scala/scala/meta/internal/mtags/JavaToplevelMtags.scala
@@ -188,9 +188,7 @@ class JavaToplevelMtags(
         reader.nextChar()
         kwOrIdent(start, builder.append(ch.toChar))
       } else if (builder.isEmpty) {
-        throw new Exception(
-          s"Unexpected symbol at word pos: '$ch'. Line: '$readCurrentLine'"
-        )
+        unexpectedCharacter(ch.toChar, reader.endCharOffset)
       } else {
 
         val pos = Position.Range(input, start, reader.endCharOffset)
@@ -247,6 +245,12 @@ class JavaToplevelMtags(
               )
               (token, true)
           }
+        case '#' =>
+          reader.nextChar()
+          kwOrIdent(reader.endCharOffset, new StringBuilder(first + 1)) match {
+            case Token.Word("include", _) => (Token.IncludeHeader, true)
+            case _ => unexpectedCharacter('#', first)
+          }
         case _ =>
           val token = kwOrIdent(reader.endCharOffset, new StringBuilder(first))
           (token, true)
@@ -342,6 +346,11 @@ class JavaToplevelMtags(
     loop(new StringBuilder().append(existing))
   }
 
+  private def unexpectedCharacter(c: Char, pos: Int): Nothing =
+    throw new Exception(
+      s"Unexpected symbol '$c' at word pos: '$pos' Line: '$readCurrentLine'"
+    )
+
 }
 
 object JavaToplevelMtags {
@@ -380,6 +389,7 @@ object JavaToplevelMtags {
     // any allowed symbol like `=` , `-` and others
     case object SpecialSym extends Token
     case object Literal extends Token
+    case object IncludeHeader extends Token
 
     case class Word(value: String, pos: Position) extends WithPos {
       override def toString: String =

diff --git a/tests/unit/src/test/scala/tests/JavaToplevelSuite.scala b/tests/unit/src/test/scala/tests/JavaToplevelSuite.scala
@@ -173,4 +173,24 @@ class JavaToplevelSuite extends BaseToplevelSuite {
     mode = ToplevelWithInner,
   )
 
+  check(
+    "i6390",
+    """|
+       |<#include "/@includes/license.ftl" />
+       |
+       |package org.apache;
+       |
+       |<#include "/@includes/vv_imports.ftl" />
+       |
+       |@SuppressWarnings("unused")
+       |public interface BaseReader extends Positionable{
+       |}
+       |""".stripMargin,
+    List("""|org/
+            |org/apache/
+            |org/apache/BaseReader# -> Positionable
+            |""".stripMargin),
+    mode = ToplevelWithInner,
+  )
+
 }