Skip to content

Commit 297c812

Browse files
authored
fix: rename -Xrepl-disable-display to -Xrepl-disable-evaluation (#26961)
Fixes #24443 Doesn't bring back E to REPL, but instead renames the flag so the name corresponds to the behaviour. ## Have you relied on LLM-based tools in this contribution? No ## How was the solution tested? Covered by existing tests (this is a refactoring)
1 parent 3632977 commit 297c812

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ private sealed trait XSettings:
431431
val XprintInline: Setting[Boolean] = BooleanSetting(AdvancedSetting, "Xprint-inline", "Show where inlined code comes from.")
432432
val XprintSuspension: Setting[Boolean] = BooleanSetting(AdvancedSetting, "Xprint-suspension", "Show when code is suspended until macros are compiled.")
433433
val Xprompt: Setting[Boolean] = BooleanSetting(AdvancedSetting, "Xprompt", "Display a prompt after each error (debugging option).")
434-
val XreplDisableDisplay: Setting[Boolean] = BooleanSetting(AdvancedSetting, "Xrepl-disable-display", "Do not display definitions in REPL.")
434+
val XreplDisableEvaluation: Setting[Boolean] = BooleanSetting(AdvancedSetting, "Xrepl-disable-evaluation", "Do not evaluate or display definitions in the REPL.", aliases = SettingAlias("-Xrepl-disable-display", Deprecation("Use -Xrepl-disable-evaluation instead.")) :: Nil)
435435
val XreplPrintHeight: Setting[Int] = IntSetting(AdvancedSetting, "Xrepl-print-height", "Set the row height for pretty-printing in the REPL.", 50)
436436
val XreplInterruptInstrumentation: Setting[String] = StringSetting(
437437
AdvancedSetting,

repl/src/dotty/tools/repl/ReplDriver.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ class ReplDriver(settings: Array[String],
494494

495495
inContext(newState.context):
496496
val (updatedState, definitions) =
497-
if (!ctx.settings.XreplDisableDisplay.value)
497+
if (!ctx.settings.XreplDisableEvaluation.value)
498498
renderDefinitions(unit.tpdTree, newestWrapper)(using newStateWithImports)
499499
else
500500
(newStateWithImports, Seq.empty)

repl/src/dotty/tools/repl/ScriptEngine.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ScriptEngine extends AbstractScriptEngine {
2222
"-classpath", "", // Avoid the default "."
2323
"-usejavacp",
2424
"-color:never",
25-
"-Xrepl-disable-display",
25+
"-Xrepl-disable-evaluation",
2626
"-Xrepl-interrupt-instrumentation",
2727
"false"
2828
))

repl/test-resources/repl/settings-repl-disable-display renamed to repl/test-resources/repl/settings-repl-disable-evaluation

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
scala> 1
22
val res0: Int = 1
33

4-
scala> :settings -Xrepl-disable-display
4+
scala> :settings -Xrepl-disable-evaluation
55

66
scala> 2
77

0 commit comments

Comments
 (0)