Fix scala#7673: Fix failing tests

- Fix failing tests in dotty.tools.languageserver.WorksheetTest
- Fix failing tests in dotty.tools.languageserver.DocumentSymbolTest
- Add tests for top-level decls, enums, type params in DocumentSymbolTest
- Remove erroneous trees and empty owner from document symbols

Author: andreamocci

language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala

@@ -489,9 +489,12 @@ class DottyLanguageServer extends LanguageServer
 
     val uriTrees = driver.openedTrees(uri)
 
+    // Excludes locals from synthetic symbols (with the exception of enums members)
+    // and erroroneous trees.
     val excludeLocalsFromSyntheticSymbols = (n: NameTree) => {
       val owner = n.symbol.owner
       n.symbol.is(Case) || {
+        n.name != StdNames.nme.ERROR &&
         !owner.is(Synthetic) &&
         !owner.isPrimaryConstructor
       }
@@ -918,11 +921,9 @@ object DottyLanguageServer {
         SK.Field
     }
     def containerName(sym: Symbol): String = {
-      if (sym.owner.exists && !sym.owner.isEmptyPackage) {
-        if (sym.owner.isPackageObject && sym.owner.owner.exists) {
-          sym.owner.owner.name.stripModuleClassSuffix.show
-        } else
-          sym.owner.name.stripModuleClassSuffix.show
+      val owner = if (sym.owner.exists && sym.owner.isPackageObject) sym.owner.owner else sym.owner
+      if (owner.exists && !owner.isEmptyPackage) {
+          owner.name.stripModuleClassSuffix.show
       } else
         null
     }

language-server/test/dotty/tools/languageserver/DocumentSymbolTest.scala

@@ -9,39 +9,86 @@ import dotty.tools.languageserver.util.Code._
 class DocumentSymbolTest {
 
   @Test def withErroneousTree: Unit =
-    code"class ${m1}Foo$m2 { def }"
+    code"${m1}class Foo { def }$m2"
       .withSource.documentSymbol(m1, (m1 to m2).symInfo("Foo", SymbolKind.Class))
 
   @Test def documentSymbol0: Unit =
-    code"class ${m1}Foo$m2".withSource.documentSymbol(m1, (m1 to m2).symInfo("Foo", SymbolKind.Class))
+    code"${m1}class Foo$m2".withSource.documentSymbol(m1, (m1 to m2).symInfo("Foo", SymbolKind.Class))
 
   @Test def documentSymbol1: Unit =
-    code"class ${m1}Foo$m2; class ${m3}Bar$m4".withSource
+    code"${m1}class Foo$m2; ${m3}class Bar$m4".withSource
       .documentSymbol(m1, (m1 to m2).symInfo("Foo", SymbolKind.Class), (m3 to m4).symInfo("Bar", SymbolKind.Class))
 
   @Test def documentSymbol3: Unit = {
     withSources(
-      code"class ${m1}Foo$m2",
-      code"class ${m3}Bar$m4"
+      code"${m1}class Foo$m2",
+      code"${m3}class Bar$m4"
     ) .documentSymbol(m1, (m1 to m2).symInfo("Foo", SymbolKind.Class))
       .documentSymbol(m3, (m3 to m4).symInfo("Bar", SymbolKind.Class))
   }
 
   @Test def documentSymbolShowModule: Unit = {
-    code"""object ${m1}Foo${m2}""".withSource
+    code"""${m1}object Foo${m2}""".withSource
       .documentSymbol(m1, (m1 to m2).symInfo("Foo", SymbolKind.Module))
   }
 
   @Test def documentSymbolShowClassAndCompanion: Unit = {
-    code"""object ${m1}Foo${m2}
-          |class ${m3}Foo${m4}""".withSource
+    code"""${m1}object Foo${m2}
+          |${m3}class Foo${m4}""".withSource
       .documentSymbol(m1, (m1 to m2).symInfo("Foo", SymbolKind.Module),
                           (m3 to m4).symInfo("Foo", SymbolKind.Class))
   }
 
   @Test def documentSymbolSynthetic: Unit = {
-    code"""case class ${m1}Foo${m2}(${m3}x${m4}: Int)""".withSource
+    code"""${m1}case class Foo(${m3}x: Int${m4})${m2}""".withSource
       .documentSymbol(m1, (m1 to m2).symInfo("Foo", SymbolKind.Class),
                           (m3 to m4).symInfo("x", SymbolKind.Field, "Foo"))
   }
+
+  @Test def documentSymbolEnumADT: Unit = {
+    code"""${m1}enum Option[${m3}+T${m4}] {
+      ${m5}case Some(${m7}x: T${m8})${m6}
+      ${m9}case None${m10}
+    }${m2}""".withSource
+      .documentSymbol(m1, (m1 to m2).symInfo("Option", SymbolKind.Enum),
+                          (m3 to m4).symInfo("T", SymbolKind.TypeParameter, "Option"),
+                          (m5 to m6).symInfo("Some", SymbolKind.EnumMember, "Option"),
+                          (m7 to m8).symInfo("x", SymbolKind.Field, "Some"),
+                          (m9 to m10).symInfo("None", SymbolKind.EnumMember, "Option"))
+  }
+
+  @Test def documentSymbolEnum: Unit = {
+    code"""${m1}enum Color(${m3}val rgb: Int${m4}) {
+      ${m5}case Red   extends Color(0xFF0000)${m6}
+      ${m7}case Green extends Color(0x00FF00)${m8}
+      ${m9}case Blue  extends Color(0x0000FF)${m10}
+    }${m2}""".withSource
+      .documentSymbol(m1, (m1 to m2).symInfo("Color", SymbolKind.Enum),
+                          (m3 to m4).symInfo("rgb", SymbolKind.Field, "Color"),
+                          (m5 to m6).symInfo("Red", SymbolKind.EnumMember, "Color"),
+                          (m7 to m8).symInfo("Green", SymbolKind.EnumMember, "Color"),
+                          (m9 to m10).symInfo("Blue", SymbolKind.EnumMember, "Color"))
+  }
+
+  @Test def documentSymbolTopLevelDef: Unit =
+    code"${m1}def foo(): Unit = { }${m2}".withSource.documentSymbol(m1, (m1 to m2).symInfo("foo", SymbolKind.Method))
+
+  @Test def documentSymbolTrait: Unit =
+    code"${m1}trait Foo(${m3}val x: Int${m4})${m2}".withSource.documentSymbol(m1, (m1 to m2).symInfo("Foo", SymbolKind.Interface),
+                                                                                  (m3 to m4).symInfo("x", SymbolKind.Field, "Foo"))
+
+  @Test def documentSymbolLocalDef: Unit =
+    code"""${m1}def foo(): Unit = {
+      ${m3}def bar(): Unit = { }${m4}
+      ${m5}val x: Int = 0${m6}
+    }${m2}""".withSource.documentSymbol(m1, (m1 to m2).symInfo("foo", SymbolKind.Method),
+                                            (m3 to m4).symInfo("bar", SymbolKind.Method, "foo"),
+                                            (m5 to m6).symInfo("x", SymbolKind.Field, "foo") )
+
+  @Test def documentSymbolTypeFields: Unit =
+    code"""${m1}class Foo {
+      ${m3}type T${m4}
+    }${m2}""".withSource.documentSymbol(m1, (m1 to m2).symInfo("Foo", SymbolKind.Class),
+                                            (m3 to m4).symInfo("T", SymbolKind.TypeParameter, "Foo"))
+
 }

language-server/test/dotty/tools/languageserver/WorksheetTest.scala

@@ -189,10 +189,10 @@ class WorksheetTest {
   }
 
   @Test def worksheetDocumentSymbol(): Unit = {
-    ws"""class ${m1}Foo${m2} {
-           def ${m3}bar${m4} = 123
-         }""".withSource
-      .documentSymbol(m1, (m1 to m2).symInfo("Foo", SymbolKind.Class, WorksheetWrapper.moduleClassName.toString),
+    ws"""${m1}class Foo {
+      ${m3}def bar = 123${m4}
+         }${m2}""".withSource
+      .documentSymbol(m1, (m1 to m2).symInfo("Foo", SymbolKind.Class, WorksheetWrapper.moduleClassName.stripModuleClassSuffix.toString),
                           (m3 to m4).symInfo("bar", SymbolKind.Method, "Foo"))
   }
 
@@ -202,7 +202,7 @@ class WorksheetTest {
              def ${m3}bar${m4} = 123
            }""",
       code"""class ${m5}Baz${m6}"""
-    ).symbol("Foo", (m1 to m2).symInfo("Foo", SymbolKind.Class, WorksheetWrapper.moduleClassName.toString))
+    ).symbol("Foo", (m1 to m2).symInfo("Foo", SymbolKind.Class, WorksheetWrapper.moduleClassName.stripModuleClassSuffix.toString))
      .symbol("bar", (m3 to m4).symInfo("bar", SymbolKind.Method, "Foo"))
      .symbol("Baz", (m5 to m6).symInfo("Baz", SymbolKind.Class))
   }