From 787a2ceec02fe07fbb9efee673d3abb7cac2969e Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Fri, 16 Sep 2016 22:28:27 +0200 Subject: Add modifiers to highlighting --- tests/repl/errmsgs.check | 48 ++++++++++++++++++++++++------------------------ tests/repl/imports.check | 12 ++++++------ 2 files changed, 30 insertions(+), 30 deletions(-) (limited to 'tests') diff --git a/tests/repl/errmsgs.check b/tests/repl/errmsgs.check index d8e863a28..e32e72d1f 100644 --- a/tests/repl/errmsgs.check +++ b/tests/repl/errmsgs.check @@ -1,41 +1,41 @@ scala> class Inv[T](x: T) defined class Inv scala> val x: List[String] = List(1) -:4: error: type mismatch: - found : Int(1) - required: String +:4: Error: type mismatch: +found: Int(1) +required: String val x: List[String] = List(1) ^ scala> val y: List[List[String]] = List(List(1)) -:4: error: type mismatch: - found : Int(1) - required: String +:4: Error: type mismatch: +found: Int(1) +required: String val y: List[List[String]] = List(List(1)) ^ scala> val z: (List[String], List[Int]) = (List(1), List("a")) -:4: error: type mismatch: - found : Int(1) - required: String +:4: Error: type mismatch: +found: Int(1) +required: String val z: (List[String], List[Int]) = (List(1), List("a")) ^ -:4: error: type mismatch: - found : String("a") - required: Int +:4: Error: type mismatch: +found: String("a") +required: Int val z: (List[String], List[Int]) = (List(1), List("a")) ^ scala> val a: Inv[String] = new Inv(new Inv(1)) -:5: error: type mismatch: - found : Inv[T] - required: String +:5: Error: type mismatch: +found: Inv[T] +required: String where T is a type variable with constraint >: Int(1) val a: Inv[String] = new Inv(new Inv(1)) ^ scala> val b: Inv[String] = new Inv(1) -:5: error: type mismatch: - found : Int(1) - required: String +:5: Error: type mismatch: +found: Int(1) +required: String val b: Inv[String] = new Inv(1) ^ scala> abstract class C { @@ -53,18 +53,18 @@ scala> abstract class C { } } } -:9: error: type mismatch: - found : C.this.T(C.this.x) - required: T' +:9: Error: type mismatch: +found: C.this.T(C.this.x) +required: T' where T is a type in class C T' is a type in the initalizer of value s which is an alias of String var y: T = x ^ -:13: error: type mismatch: - found : T(y) - required: T' +:13: Error: type mismatch: +found: T(y) +required: T' where T is a type in the initalizer of value s which is an alias of String T' is a type in method f which is an alias of Int diff --git a/tests/repl/imports.check b/tests/repl/imports.check index 3a7e9341e..50b7a93d7 100644 --- a/tests/repl/imports.check +++ b/tests/repl/imports.check @@ -7,14 +7,14 @@ defined module o scala> import o._ import o._ scala> buf += xs -:11: error: type mismatch: - found : scala.collection.immutable.List[Int](o.xs) - required: String +:11: Error: type mismatch: +found: scala.collection.immutable.List[Int](o.xs) +required: String buf += xs ^ -:11: error: type mismatch: - found : String - required: scala.collection.mutable.ListBuffer[Int] +:11: Error: type mismatch: +found: String +required: scala.collection.mutable.ListBuffer[Int] buf += xs ^ scala> buf ++= xs -- cgit v1.2.3