summaryrefslogtreecommitdiff
path: root/test/files/jvm/interpreter.check
diff options
context:
space:
mode:
authorSom Snytt <som.snytt@gmail.com>2015-06-17 14:47:13 -0700
committerSom Snytt <som.snytt@gmail.com>2015-06-19 08:10:25 -0700
commitc3aca109e95e2259d9909f8457a1422c5c995940 (patch)
tree733e9869a7a3c064ab667a564fb7e63745b6e390 /test/files/jvm/interpreter.check
parentaa98d9a8c19ca27d85b62d1eccfc868440dc9ab2 (diff)
downloadscala-c3aca109e95e2259d9909f8457a1422c5c995940.tar.gz
scala-c3aca109e95e2259d9909f8457a1422c5c995940.tar.bz2
scala-c3aca109e95e2259d9909f8457a1422c5c995940.zip
SI-9206 Fix REPL code indentation
To make code in error messages line up with the original line of code, templated code is indented by the width of the prompt. Use the raw prompt (without ANSI escapes or newlines) to determine the indentation. Also, indent only once per line.
Diffstat (limited to 'test/files/jvm/interpreter.check')
-rw-r--r--test/files/jvm/interpreter.check18
1 files changed, 9 insertions, 9 deletions
diff --git a/test/files/jvm/interpreter.check b/test/files/jvm/interpreter.check
index d03edb638c..9e875235c7 100644
--- a/test/files/jvm/interpreter.check
+++ b/test/files/jvm/interpreter.check
@@ -32,7 +32,7 @@ scala> val four: anotherint = 4
four: anotherint = 4
scala> val bogus: anotherint = "hello"
-<console>:8: error: type mismatch;
+<console>:11: error: type mismatch;
found : String("hello")
required: anotherint
(which expands to) Int
@@ -280,13 +280,13 @@ scala> // both of the following should abort immediately:
scala> def x => y => z
<console>:1: error: '=' expected but '=>' found.
- def x => y => z
- ^
+def x => y => z
+ ^
scala> [1,2,3]
<console>:1: error: illegal start of definition
- [1,2,3]
- ^
+[1,2,3]
+^
scala>
@@ -355,7 +355,7 @@ defined class Term
scala> def f(e: Exp) = e match { // non-exhaustive warning here
case _:Fact => 3
}
-<console>:18: warning: match may not be exhaustive.
+<console>:21: warning: match may not be exhaustive.
It would fail on the following inputs: Exp(), Term()
def f(e: Exp) = e match { // non-exhaustive warning here
^
@@ -365,6 +365,6 @@ scala> :quit
plusOne: (x: Int)Int
res0: Int = 6
res0: String = after reset
-<console>:8: error: not found: value plusOne
- plusOne(5) // should be undefined now
- ^
+<console>:11: error: not found: value plusOne
+ plusOne(5) // should be undefined now
+ ^