bugfix: Fix docstring regex in semantic highlighting

scalameta · Oct 10, 2023 · 8100b5c · 8100b5c
1 parent 2c75be6
commit 8100b5c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/metals/src/main/scala/scala/meta/internal/metals/SemanticTokensProvider.scala b/metals/src/main/scala/scala/meta/internal/metals/SemanticTokensProvider.scala
@@ -413,7 +413,7 @@ object SemanticTokensProvider {
   object DocstringToken {
 
     val paramOrThrows: String = "(@param|@tparam|@throws)\\s+([\\w.]+)"
-    val apiLink: String = "\\[\\[(.*)\\]\\]"
+    val apiLink: String = "\\[\\[(.*?)\\]\\]"
     val other: String = "(@[a-zA-Z]+)"
     val reg: Regex = s"$paramOrThrows|$apiLink|$other".r
 

diff --git a/tests/unit/src/test/scala/tests/SemanticTokensLspSuite.scala b/tests/unit/src/test/scala/tests/SemanticTokensLspSuite.scala
@@ -82,7 +82,7 @@ class SemanticTokensLspSuite extends BaseLspSuite("SemanticTokens") {
        |<<    * >>/*comment*/<<@param>>/*keyword*/<< >>/*comment*/<<xs>>/*variable,readonly*/<< is [[>>/*comment*/<<scala.collection.immutable.List>>/*string*/<<]]>>/*comment*/
        |<<    * >>/*comment*/<<@throws>>/*keyword*/<< >>/*comment*/<<java.util.Exception>>/*class*/<< is [[>>/*comment*/<<scala.collection.immutable.List>>/*string*/<<]]>>/*comment*/
        |<<    * >>/*comment*/<<@return>>/*keyword*/<< the same list>>/*comment*/
-       |<<    * >>/*comment*/<<@note>>/*keyword*/<< This is a note>>/*comment*/
+       |<<    * >>/*comment*/<<@note>>/*keyword*/<< This is a note [[>>/*comment*/<<java.lang.String>>/*string*/<<]] or [[>>/*comment*/<<scala.collection.Seq>>/*string*/<<]]>>/*comment*/
        |<<    */>>/*comment*/
        |  <<def>>/*keyword*/ <<m>>/*method,definition*/(<<xs>>/*parameter,declaration,readonly*/: <<List>>/*type*/[<<Int>>/*class,abstract*/]): <<List>>/*type*/[<<Int>>/*class,abstract*/] = <<xs>>/*parameter,readonly*/
        |}