Merge branch 'main' into fix/member-symbol

Author: steinybot

core/src/main/scala/nz/co/bottech/scala2plantuml/AggregationProcessor.scala

@@ -89,6 +89,7 @@ private[scala2plantuml] object AggregationProcessor {
     aggregates.filterNot { symbol =>
       symbol == aggregator ||
       TerminalTypes.contains(symbol) ||
+      !symbolIndex.indexOf(symbol) ||
       nonClassSymbol(symbol, symbolIndex)
     }.map(Aggregation(aggregator, _))
 

core/src/main/scala/nz/co/bottech/scala2plantuml/SymbolProcessor.scala

@@ -116,7 +116,10 @@ private[scala2plantuml] object SymbolProcessor {
     import symbolInformation.{displayName, symbol}
     val parentSymbols =
       if (excludeParents) Seq.empty
-      else clazz.parents.flatMap(typeSymbols(_, includeArguments = false))
+      else
+        clazz.parents
+          .flatMap(typeSymbols(_, includeArguments = false))
+          .filter(symbolIndex.indexOf)
     val typeParameters = optionalScopeTypeParameters(clazz.typeParameters, symbolIndex)
     if (isTrait(symbolInformation))
       Interface(displayName, symbol, parentSymbols, typeParameters)

sbt/src/main/scala/nz/co/bottech/scala2plantuml/sbt/Scala2PlantUML.scala

@@ -18,7 +18,8 @@ object Scala2PlantUML {
       config.symbol,
       config.prefixes(projects, sourceRoots),
       config.ignore,
-      classLoader(config)
+      classLoader(config),
+      config.maxLevel
     )
     val file = config.outputFile
     Option(file.getParentFile).foreach(_.mkdirs())

sbt/src/main/scala/nz/co/bottech/scala2plantuml/sbt/Scala2PlantUMLParser.scala

@@ -7,7 +7,7 @@ import sbt.file
 
 private[sbt] object Scala2PlantUMLParser {
 
-  private val SymbolParser = token(StringBasic, "symbol")
+  private val SymbolParser = Space ~> token(StringBasic, "symbol")
 
   private val IncludeParser    = optionStringParser("-i", "--include", "pattern", _.addInclude(_))
   private val ExcludeParser    = optionStringParser("-e", "--exclude", "pattern", _.addExclude(_))
@@ -37,14 +37,14 @@ private[sbt] object Scala2PlantUMLParser {
       parser: Parser[A],
       f: (Config, A) => Config
     ) =
-    (token(literal(short) | long) ~> token(Space) ~> token(parser, label)).map(a => (c: Config) => f(c, a))
+    Space ~> (token(literal(short) | long) ~> token(Space) ~> token(parser, label)).map(a => (c: Config) => f(c, a))
 
   def apply(): Parser[Config] = {
     // TODO: Add .puml extension auto complete.
     val options = OutputFileParser | MaxLevelParser | IncludeParser | ExcludeParser
     // TODO: Get example symbols.
     // FIXME: OutputFileParser and MaxLevelParser should only be allowed at most once.
-    val parser = Space ~> options.* ~ SymbolParser ~ options.*
+    val parser = options.* ~ SymbolParser ~ options.*
     parser.map { case ((optionsBefore, symbol), optionsAfter) =>
       def configure(config: Config, f: Config => Config) = f(config)
       val outputFile                                     = file(s"${symbolToScalaIdentifier(symbol)}.puml")

sbt/src/sbt-test/class-diagram/options/build.sbt

@@ -0,0 +1 @@
+semanticdbEnabled := true

sbt/src/sbt-test/class-diagram/options/expected.puml

@@ -0,0 +1,7 @@
+@startuml
+interface A extends B {
+  + {abstract} {method} a
+}
+interface B extends C
+interface C
+@enduml

sbt/src/sbt-test/class-diagram/options/project/plugins.sbt

@@ -0,0 +1,7 @@
+sys.props.get("plugin.version") match {
+  case Some(version) => addSbtPlugin("nz.co.bottech" % "sbt-scala2plantuml" % version)
+  case _             => sys.error("""|The system property 'plugin.version' is not defined.
+                         |Specify this property using the scriptedLaunchOpts -D.""".stripMargin)
+}
+
+libraryDependencies += "com.lihaoyi" %% "utest" % "0.7.7"

sbt/src/sbt-test/class-diagram/options/src/main/scala/com/example/A.scala

@@ -0,0 +1,6 @@
+package com.example
+
+trait A extends B with internal.AInternal {
+
+  def a: internal.AInternal
+}

sbt/src/sbt-test/class-diagram/options/src/main/scala/com/example/B.scala

@@ -0,0 +1,3 @@
+package com.example
+
+trait B extends C

sbt/src/sbt-test/class-diagram/options/src/main/scala/com/example/C.scala

@@ -0,0 +1,3 @@
+package com.example
+
+trait C extends D