Using symbol.fields now

Author: BryanAbate

tastydoc/TODO.md

@@ -11,7 +11,4 @@
 * Id for typeparams so we can link (Do not link)
 * Alias type
 * Rework type matching + Order in type matching symbol counts...
-* Remove artifacts in packages => Will fix linking as well
-
-# Output
-* Output inner class/object if not inherited
+* Remove artifacts in packages => Will fix linking as well

tastydoc/src/dotty/tastydoc/TastyExtractor.scala

@@ -77,10 +77,13 @@ trait TastyExtractor extends TastyTypeConverter with CommentParser with CommentC
 
     (body.flatMap{
         case IsDefDef(_) => None //No definitions, they are appended with symbol.methods below
+        case IsValDef(_) => None //No val/var, they are appended with symbol.fields below
         case IsInlined(_) => None //Inlined aren't desirable members
         case x => Some(x)
       }.filter(x => filterSymbol(x.symbol)).map(convertToRepresentation(reflect)(_, parentRepresentation)) ++
-    symbol.methods.filter(x => filterSymbol(x)).map{x => convertToRepresentation(reflect)(x.tree, parentRepresentation)})
+    symbol.methods.filter(x => filterSymbol(x)).map{x => convertToRepresentation(reflect)(x.tree, parentRepresentation)} ++
+    symbol.fields.filter(x => filterSymbol(x)).flatMap{case reflect.IsValDefSymbol(x) => Some(x) case _ => None}.map{x => convertToRepresentation(reflect)(x.tree, parentRepresentation)}
+    )
     .flatMap{
       case r: Representation with Modifiers => Some(r)
       case _ => None

tastydoc/src/dotty/tastydoc/comment/Comment.scala

@@ -58,7 +58,6 @@ private[comment] case class ParsedComment (
 
 trait MarkupConversion[T](packages: Map[String, EmulatedPackageRepresentation]) extends MemberLookup {
   def ent: Representation
-  // def span: Span
   def parsed: ParsedComment
 
   protected def linkedExceptions(m: Map[String, String]): Map[String, String]
@@ -71,10 +70,6 @@ trait MarkupConversion[T](packages: Map[String, EmulatedPackageRepresentation])
   private def single(annot: String, xs: List[String], filter: Boolean = true): Option[T] =
     (if (filter) filterEmpty(xs) else xs.map(stringToMarkup)) match {
       case x :: xs =>
-        // if (xs.nonEmpty) ctx.docbase.warn(
-        //   s"Only allowed to have a single annotation for $annot",
-        //   ent.symbol.sourcePosition(span)
-        // )
         Some(x)
       case _ => None
     }
@@ -103,7 +98,7 @@ trait MarkupConversion[T](packages: Map[String, EmulatedPackageRepresentation])
   )
 }
 
-case class MarkdownComment(ent: Representation, parsed: ParsedComment, packages: Map[String, EmulatedPackageRepresentation])//: Span)
+case class MarkdownComment(ent: Representation, parsed: ParsedComment, packages: Map[String, EmulatedPackageRepresentation])
 extends MarkupConversion[MarkdownNode](packages) {
 
   def stringToMarkup(str: String) =

tastydoc/test/dotty/tastydoc/Tests.scala

@@ -36,42 +36,42 @@ class Tests {
       "example.UserDocLinkingClass"
     ))
   }
-  // @Test def testDotty(): Unit = {
-  //   Main.main(Array(
-  //     "--classpath",
-  //     "tastydoc/dotty-0.15.0-RC1/lib",
-  //     "--syntax",
-  //     "wiki",
-  //     "--packagestolink",
-  //     "dotty.*",
-  //     "scala.annotation.*",
-  //     "scala.compiletime.*",
-  //     "scala.implicits.*",
-  //     "scala.internal.*",
-  //     "scala.quoted.*",
-  //     "scala.reflect.*",
-  //     "scala.runtime.*",
-  //     "scala.tasty.*",
-  //     "scala.testing.*",
-  //     "scalaShadowing.*",
-  //     //Individual files
-  //     "scala.\\$times\\$colon*",
-  //     "scala.Conversion*",
-  //     "scala.Enum*",
-  //     "scala.Eql*",
-  //     "scala.forceInline*",
-  //     "scala.FunctionXXL*",
-  //     "scala.IArray*",
-  //     "scala.NonEmptyTuple*",
-  //     "scala.Product0*",
-  //     "scala.Selectable*",
-  //     "scala.Tuple*",
-  //     "scala.TupleXXL*",
-  //     "scala.ValueOf*",
-  //     "-d",
-  //     "dotty",
-  //     "scala",
-  //     "scalaShadowing"
-  //   ))
-  // }
+  @Test def testDotty(): Unit = {
+    Main.main(Array(
+      "--classpath",
+      "tastydoc/dotty-0.15.0-RC1/lib",
+      "--syntax",
+      "wiki",
+      "--packagestolink",
+      "dotty.*",
+      "scala.annotation.*",
+      "scala.compiletime.*",
+      "scala.implicits.*",
+      "scala.internal.*",
+      "scala.quoted.*",
+      "scala.reflect.*",
+      "scala.runtime.*",
+      "scala.tasty.*",
+      "scala.testing.*",
+      "scalaShadowing.*",
+      //Individual files
+      "scala.\\$times\\$colon*",
+      "scala.Conversion*",
+      "scala.Enum*",
+      "scala.Eql*",
+      "scala.forceInline*",
+      "scala.FunctionXXL*",
+      "scala.IArray*",
+      "scala.NonEmptyTuple*",
+      "scala.Product0*",
+      "scala.Selectable*",
+      "scala.Tuple*",
+      "scala.TupleXXL*",
+      "scala.ValueOf*",
+      "-d",
+      "dotty",
+      "scala",
+      "scalaShadowing"
+    ))
+  }
 }