Fix picking default syntax for comments

scala · Mar 21, 2022 · e3f81bc · e3f81bc
1 parent c9d33a8
commit e3f81bc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/project/Build.scala b/project/Build.scala
@@ -1839,7 +1839,8 @@ object ScaladocConfigs {
       .add(DocRootContent(docRootFile.toString))
       .add(CommentSyntax(List(
         s"${dottyLibRoot}=markdown",
-        s"${stdLibRoot}=wiki"
+        s"${stdLibRoot}=wiki",
+        "wiki"
       )))
       .add(VersionsDictionaryUrl("https://scala-lang.org/api/versions.json"))
       .add(DocumentSyntheticTypes(true))

diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/comments/CommentSyntaxArgs.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/comments/CommentSyntaxArgs.scala
@@ -17,10 +17,14 @@ object CommentSyntax:
   val default = CommentSyntax.Markdown
 
 case class CommentSyntaxArgs(csFormats: PathBased[CommentSyntax]):
+  val defaultSyntax = csFormats.get(csFormats.projectRoot)
+    .map(_.elem)
+    .getOrElse(CommentSyntax.default)
+
   def get(path: Option[Path]): CommentSyntax =
     path
       .flatMap(p => csFormats.get(p).map(_.elem))
-      .getOrElse(CommentSyntax.default)
+      .getOrElse(defaultSyntax)
 
 object CommentSyntaxArgs:
   val usage =
@@ -52,4 +56,4 @@ object CommentSyntaxArgs:
         )
         CommentSyntaxArgs(res)
     }
-  }
+  }