Skip to content

Commit 4e4552e

Browse files
authored
Fix: Correction of the siteRoot path (#17297)
- For the first issue, when a user set ./docs to the default value of ScalaSettings, the code only took a value that was not the default `siteRoot.nonDefault`. To fix this, I put a getOrElse to try and get the default value. - For the second problem, I noticed when I cloned the code that the user was calling layouts that did not exist. Be careful with this as it can indeed produce an error. Solving this problem was enough to remove the non-existent layout calls. Fixes: #15306
1 parent b29740d commit 4e4552e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ object Scaladoc:
202202
classpath.get,
203203
bootclasspath.get,
204204
destFile,
205-
siteRoot.nonDefault,
205+
Option(siteRoot.withDefault(siteRoot.default)),
206206
projectVersion.nonDefault,
207207
projectLogo.nonDefault,
208208
projectFooter.nonDefault,

0 commit comments

Comments
 (0)