From a33b0853452a625ac93eada7d5f265ed09f8e362 Mon Sep 17 00:00:00 2001 From: Jens Date: Fri, 13 May 2016 12:56:52 +0200 Subject: Add check to scala REPL package to improve feedback about implicits (#5159) When the repl is started with additional compiler flags that prevent implicits being in scope (like -Yno-predef) the default message of implicits in scope using :implicits stays the same. This additional check will return the same message if predef is indeed in scope and an adjusted message if Predef is not in scope. --- test/files/run/repl-implicits-nopredef.check | 5 +++++ test/files/run/repl-implicits-nopredef.scala | 10 ++++++++++ test/files/run/repl-implicits.check | 5 +++++ test/files/run/repl-implicits.scala | 5 +++++ 4 files changed, 25 insertions(+) create mode 100644 test/files/run/repl-implicits-nopredef.check create mode 100644 test/files/run/repl-implicits-nopredef.scala create mode 100644 test/files/run/repl-implicits.check create mode 100644 test/files/run/repl-implicits.scala (limited to 'test') diff --git a/test/files/run/repl-implicits-nopredef.check b/test/files/run/repl-implicits-nopredef.check new file mode 100644 index 0000000000..a849801bb4 --- /dev/null +++ b/test/files/run/repl-implicits-nopredef.check @@ -0,0 +1,5 @@ + +scala> :implicits +No implicits have been imported. + +scala> :quit \ No newline at end of file diff --git a/test/files/run/repl-implicits-nopredef.scala b/test/files/run/repl-implicits-nopredef.scala new file mode 100644 index 0000000000..8a451b0c52 --- /dev/null +++ b/test/files/run/repl-implicits-nopredef.scala @@ -0,0 +1,10 @@ +import scala.tools.partest.ReplTest +import scala.tools.nsc.Settings + +object Test extends ReplTest { + override def transformSettings(settings: Settings): Settings = { + settings.nopredef.value = true + settings + } + def code = ":implicits" +} diff --git a/test/files/run/repl-implicits.check b/test/files/run/repl-implicits.check new file mode 100644 index 0000000000..6e80cc8799 --- /dev/null +++ b/test/files/run/repl-implicits.check @@ -0,0 +1,5 @@ + +scala> :implicits +No implicits have been imported other than those in Predef. + +scala> :quit \ No newline at end of file diff --git a/test/files/run/repl-implicits.scala b/test/files/run/repl-implicits.scala new file mode 100644 index 0000000000..ca8e16e683 --- /dev/null +++ b/test/files/run/repl-implicits.scala @@ -0,0 +1,5 @@ +import scala.tools.partest.ReplTest + +object Test extends ReplTest { + def code = ":implicits" +} -- cgit v1.2.3