review fixes

scalameta · Sep 15, 2023 · 7b716d1 · 7b716d1
1 parent d37abbf
commit 7b716d1
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 24 deletions.
diff --git a/metals/src/main/scala/scala/meta/internal/implementation/ImplementationProvider.scala b/metals/src/main/scala/scala/meta/internal/implementation/ImplementationProvider.scala
@@ -84,13 +84,11 @@ final class ImplementationProvider(
       overriddenInfo: List[
         (AbsolutePath, List[(String, List[OverriddenSymbol])])
       ]
-  ): Unit = {
-    overriddenInfo.foreach { case (path, list) =>
-      list.foreach { case (overridesSymbol, overridden) =>
-        overridden.foreach(addTypeHierarchyElement(path, overridesSymbol, _))
-      }
-    }
-  }
+  ): Unit = for {
+    (path, list) <- overriddenInfo
+    (overridesSymbol, overriddenSymbols) <- list
+    overridden <- overriddenSymbols
+  } addTypeHierarchyElement(path, overridesSymbol, overridden)
 
   def addTypeHierarchyElements(
       elements: List[(AbsolutePath, String, OverriddenSymbol)]

diff --git a/metals/src/main/scala/scala/meta/internal/implementation/InheritanceContext.scala b/metals/src/main/scala/scala/meta/internal/implementation/InheritanceContext.scala
@@ -62,6 +62,7 @@ class GlobalInheritanceContext(
       symbol: String
   )(implicit ec: ExecutionContext): Future[Set[ClassLocation]] = {
     val workspaceImplementations = getWorkspaceLocations(symbol)
+    // for enum class we resolve all cases as implementations while indexing
     val enumCasesImplementations =
       implementationsInDependencySources.getOrElse(symbol, Set.empty)
     val shortName = symbol.desc.name.value

diff --git a/mtags/src/main/scala/scala/meta/internal/mtags/ScalaToplevelMtags.scala b/mtags/src/main/scala/scala/meta/internal/mtags/ScalaToplevelMtags.scala
@@ -417,7 +417,7 @@ class ScalaToplevelMtags(
             nextExpectTemplate
           )
         case EXTENDS =>
-          val (overridden, maybeNewIdent) = findOverridden(List.empty)
+          val (overridden, maybeNewIndent) = findOverridden(List.empty)
           expectTemplate.map(tmpl =>
             withOwner(tmpl.owner) {
               addOverridden(
@@ -428,8 +428,8 @@ class ScalaToplevelMtags(
             }
           )
           loop(
-            maybeNewIdent.getOrElse(indent),
-            isAfterNewline = maybeNewIdent.isDefined,
+            maybeNewIndent.getOrElse(indent),
+            isAfterNewline = maybeNewIndent.isDefined,
             currRegion,
             expectTemplate
           )
@@ -515,15 +515,15 @@ class ScalaToplevelMtags(
 
   @tailrec
   private def acceptAllAfterOverriddenIdentifier(): Option[Int] = {
-    val maybeNewIdent = acceptTrivia()
+    val maybeNewIndent = acceptTrivia()
     scanner.curr.token match {
       case LPAREN =>
         acceptBalancedDelimeters(LPAREN, RPAREN)
         acceptAllAfterOverriddenIdentifier()
       case LBRACKET =>
         acceptBalancedDelimeters(LBRACKET, RBRACKET)
         acceptAllAfterOverriddenIdentifier()
-      case _ => maybeNewIdent
+      case _ => maybeNewIndent
     }
 
   }
@@ -532,34 +532,35 @@ class ScalaToplevelMtags(
   private def findOverridden(
       acc0: List[Identifier]
   ): (List[Identifier], Option[Int]) = {
-    val maybeNewIdent0 = acceptTrivia()
+    val maybeNewIndent0 = acceptTrivia()
     scanner.curr.token match {
       case IDENTIFIER =>
         @tailrec
         def getIdentifier(): (Option[Identifier], Option[Int]) = {
           val currentIdentifier = newIdentifier
-          val maybeNewIdent = acceptAllAfterOverriddenIdentifier()
+          val maybeNewIndent = acceptAllAfterOverriddenIdentifier()
           scanner.curr.token match {
             case DOT =>
               scanner.nextToken()
               getIdentifier()
-            case _ => (currentIdentifier, maybeNewIdent)
+            case _ => (currentIdentifier, maybeNewIndent)
           }
         }
-        val (identifier, maybeNewIdent) = getIdentifier()
+        val (identifier, maybeNewIndent) = getIdentifier()
         val acc = identifier.toList ++ acc0
         scanner.curr.token match {
           case WITH => findOverridden(acc)
-          case _ => (acc, maybeNewIdent)
+          case COMMA => findOverridden(acc)
+          case _ => (acc, maybeNewIndent)
         }
       case LBRACE =>
         acceptBalancedDelimeters(LBRACE, RBRACE)
-        val maybeNewIdent = acceptTrivia()
+        val maybeNewIndent = acceptTrivia()
         scanner.curr.token match {
           case WITH => findOverridden(acc0)
-          case _ => (acc0, maybeNewIdent)
+          case _ => (acc0, maybeNewIndent)
         }
-      case _ => (acc0, maybeNewIdent0)
+      case _ => (acc0, maybeNewIndent0)
     }
   }
 
@@ -754,7 +755,7 @@ class ScalaToplevelMtags(
 
   private def acceptTrivia(): Option[Int] = {
     var includedNewline = false
-    var ident = 0
+    var indent = 0
     scanner.nextToken()
     while (
       !isDone &&
@@ -765,13 +766,13 @@ class ScalaToplevelMtags(
     ) {
       if (isNewline) {
         includedNewline = true
-        ident = 0
+        indent = 0
       } else if (scanner.curr.token == WHITESPACE) {
-        ident += 1
+        indent += 1
       }
       scanner.nextToken()
     }
-    if (includedNewline) Some(ident) else None
+    if (includedNewline) Some(indent) else None
   }
 
   private def nextIsNL(): Boolean = {

diff --git a/tests/unit/src/test/scala/tests/ScalaToplevelSuite.scala b/tests/unit/src/test/scala/tests/ScalaToplevelSuite.scala
@@ -624,6 +624,15 @@ class ScalaToplevelSuite extends BaseSuite {
     mode = All,
   )
 
+  check(
+    "overridden3",
+    """|package a
+       |class A extends B, C
+       |""".stripMargin,
+    List("a/", "a/A# -> B, C"),
+    mode = All,
+  )
+
   def check(
       options: TestOptions,
       code: String,