Skip to content

Commit 5c7a83d

Browse files
committed
Review CRs 3
1 parent 01dacd4 commit 5c7a83d

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompiler.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import scala.util.{ Try, Success, Failure }
2121

2222
class SnippetCompiler(
2323
val snippetCompilerSettings: Seq[SnippetCompilerSetting[_]],
24-
val scalacOptions: String = "",
2524
target: AbstractFile = new VirtualDirectory("(memory)")
2625
):
2726
object SnippetDriver extends Driver:
@@ -30,11 +29,10 @@ class SnippetCompiler(
3029
rootCtx.setSetting(rootCtx.settings.YretainTrees, true)
3130
rootCtx.setSetting(rootCtx.settings.YcookComments, true)
3231
rootCtx.setSetting(rootCtx.settings.YreadComments, true)
33-
val defaultFlags =
34-
List("-color:never", "-unchecked", "-deprecation", "-Ximport-suggestion-timeout", "0")
35-
val options = scalacOptions.split("\\s+").toList
36-
val settings = options ::: defaultFlags ::: Nil
37-
val ctx = setup(settings.toArray, rootCtx) match
32+
rootCtx.setSetting(rootCtx.settings.color, "never")
33+
rootCtx.setSetting(rootCtx.settings.XimportSuggestionTimeout, 0)
34+
35+
val ctx = setup(Array(""), rootCtx) match
3836
case Some((_, ctx)) =>
3937
ctx
4038
case None => rootCtx

scaladoc/test/dotty/tools/scaladoc/snippets/SnippetCompilerTest.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ import org.junit.Assert._
66
import dotty.tools.io.{AbstractFile, VirtualDirectory}
77

88
class SnippetCompilerTest {
9-
val compiler = SnippetCompiler(Seq(), " -usejavacp")
9+
val compiler = SnippetCompiler(
10+
Seq(SnippetCompilerSetting(testContext.settings.usejavacp, true))
11+
)
1012
def wrapFn: String => WrappedSnippet = (str: String) => WrappedSnippet(
1113
str,
1214
Some("test"),

0 commit comments

Comments
 (0)