Merge pull request #10753 from som-snytt/test/fixup

SethTisue · web-flow · commit fcf69c456d22 · 2024-04-15T07:39:44.000-07:00
Move terminal test to properties
diff --git a/project/MimaFilters.scala b/project/MimaFilters.scala
@@ -39,6 +39,9 @@ object MimaFilters extends AutoPlugin {
     ProblemFilters.exclude[DirectMissingMethodProblem]("scala.concurrent.impl.FutureConvertersImpl#P.accept"),
     ProblemFilters.exclude[IncompatibleMethTypeProblem]("scala.concurrent.impl.FutureConvertersImpl#P.andThen"),
 
+    // private[scala] member used by Properties and by REPL
+    ProblemFilters.exclude[DirectMissingMethodProblem]("scala.util.Properties.consoleIsTerminal"),
+
   )
 
   override val buildSettings = Seq(
diff --git a/src/library/scala/util/Properties.scala b/src/library/scala/util/Properties.scala
@@ -142,8 +142,17 @@ private[scala] trait PropertiesTrait {
   private[scala] lazy val isAvian = javaVmName.contains("Avian")
 
   private[scala] def coloredOutputEnabled: Boolean = propOrElse("scala.color", "auto") match {
-    case "auto" => System.console() != null && !isWin
-    case s      => s == "" || "true".equalsIgnoreCase(s)
+    case "auto" => !isWin && consoleIsTerminal
+    case s      => "" == s || "true".equalsIgnoreCase(s)
+  }
+
+  /** System.console.isTerminal, or just check for null console on JDK < 22 */
+  private[scala] lazy val consoleIsTerminal: Boolean = {
+    val console = System.console
+    def isTerminal: Boolean =
+      try classOf[java.io.Console].getMethod("isTerminal", null).invoke(console).asInstanceOf[Boolean]
+      catch { case _: NoSuchMethodException => false }
+    console != null && (!isJavaAtLeast("22") || isTerminal)
   }
 
   // This is looking for javac, tools.jar, etc.
diff --git a/src/repl-frontend/scala/tools/nsc/interpreter/shell/ShellConfig.scala b/src/repl-frontend/scala/tools/nsc/interpreter/shell/ShellConfig.scala
@@ -21,11 +21,10 @@ import scala.sys.Prop._
 
 import scala.tools.nsc.{GenericRunnerSettings, Settings}
 import scala.tools.nsc.Properties.{
-  coloredOutputEnabled, envOrNone, javaVersion, javaVmName,
+  coloredOutputEnabled, consoleIsTerminal, envOrNone, javaVersion, javaVmName,
   shellBannerString, shellInterruptedString, shellPromptString, shellWelcomeString,
   userHome, versionString, versionNumberString,
 }
-import scala.util.Properties.isJavaAtLeast
 
 object ShellConfig {
   val EDITOR = envOrNone("EDITOR")
@@ -60,15 +59,7 @@ trait ShellConfig {
   def batchText: String
   def batchMode: Boolean
   def doCompletion: Boolean
-  def haveInteractiveConsole: Boolean = System.console != null && consoleIsTerminal
-
-  // false if JDK 22 and the system console says !isTerminal
-  def consoleIsTerminal: Boolean = {
-    def isTerminal: Boolean =
-      try classOf[java.io.Console].getMethod("isTerminal", null).invoke(System.console).asInstanceOf[Boolean]
-      catch { case _: NoSuchMethodException => false }
-    !isJavaAtLeast(22) || isTerminal
-  }
+  def haveInteractiveConsole: Boolean = consoleIsTerminal
 
   // source compatibility, i.e., -Xsource
   def xsource: String
@@ -77,7 +68,7 @@ trait ShellConfig {
   private def int(name: String)  = Prop[Int](name)
 
   // This property is used in TypeDebugging. Let's recycle it.
-  val colorOk = coloredOutputEnabled && haveInteractiveConsole
+  val colorOk = coloredOutputEnabled
 
   val historyFile = s"$userHome/.scala_history_jline3"
 
diff --git a/test/files/neg/t6323a.scala b/test/files/neg/t6323a.scala
@@ -1,4 +1,4 @@
-// scalac: -Vimplicits
+//> using options -Vimplicits
 //
 import scala.reflect.runtime.universe._
 import scala.reflect.runtime.{currentMirror => m}

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,9 @@ object MimaFilters extends AutoPlugin {`
`39`	`39`	`ProblemFilters.exclude[DirectMissingMethodProblem]("scala.concurrent.impl.FutureConvertersImpl#P.accept"),`
`40`	`40`	`ProblemFilters.exclude[IncompatibleMethTypeProblem]("scala.concurrent.impl.FutureConvertersImpl#P.andThen"),`
`41`	`41`
	`42`	`+ // private[scala] member used by Properties and by REPL`
	`43`	`+ ProblemFilters.exclude[DirectMissingMethodProblem]("scala.util.Properties.consoleIsTerminal"),`
	`44`	`+`
`42`	`45`	`)`
`43`	`46`
`44`	`47`	`override val buildSettings = Seq(`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// scalac: -Vimplicits`
	`1`	`+//> using options -Vimplicits`
`2`	`2`	`//`
`3`	`3`	`import scala.reflect.runtime.universe._`
`4`	`4`	`import scala.reflect.runtime.{currentMirror => m}`