Skip to content

Commit

Permalink
Fix: Correction of the siteRoot path (#17297)
Browse files Browse the repository at this point in the history
- 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
[Cherry-picked 4e4552e]
  • Loading branch information
Dedelweiss authored and Kordyjan committed Nov 17, 2023
1 parent d22f8db commit 746ae98
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ object Scaladoc:
classpath.get,
bootclasspath.get,
destFile,
siteRoot.nonDefault,
Option(siteRoot.withDefault(siteRoot.default)),
projectVersion.nonDefault,
projectLogo.nonDefault,
projectFooter.nonDefault,
Expand Down

0 comments on commit 746ae98

Please sign in to comment.