Skip to content

Commit

Permalink
Update expect files
Browse files Browse the repository at this point in the history
  • Loading branch information
odersky committed Jun 29, 2021
1 parent fe3d73f commit ef024cf
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 7 deletions.
1 change: 1 addition & 0 deletions compiler/test-resources/repl/i1374
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
scala> implicit class Padder(val sb: StringBuilder) extends AnyVal { def pad2(width: Int) = { 1 to width - sb.length foreach { sb append '*' }; sb } }
// defined class Padder
def Padder(sb: StringBuilder): Padder
scala> val greeting = new StringBuilder("Hello, kitteh!")
val greeting: StringBuilder = Hello, kitteh!
scala> val a = greeting pad2 20
Expand Down
2 changes: 1 addition & 1 deletion tests/semanticdb/expect/Classes.expect.scala
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ case class C4/*<-classes::C4#*/(x/*<-classes::C4#x.*/: Int/*->scala::Int#*/)
object C4/*<-classes::C4.*/

object M/*<-classes::M.*/ {
implicit class C5/*<-classes::M.C5#*/(x/*<-classes::M.C5#x.*/: Int/*->scala::Int#*/)
/*->classes::M.C5().(x)*/implicit class C5/*<-classes::M.C5#*//*<-classes::M.C5().*/(x/*<-classes::M.C5#x.*//*<-classes::M.C5().(x)*/: Int/*->scala::Int#*/)
}

case class C6/*<-classes::C6#*/(private val x/*<-classes::C6#x.*/: Int/*->scala::Int#*/)
Expand Down
2 changes: 1 addition & 1 deletion tests/semanticdb/expect/ImplicitConversion.expect.scala
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class ImplicitConversion/*<-example::ImplicitConversion#*/ {
}

object ImplicitConversion/*<-example::ImplicitConversion.*/ {
implicit final class newAny2stringadd/*<-example::ImplicitConversion.newAny2stringadd#*/[A/*<-example::ImplicitConversion.newAny2stringadd#[A]*/](private val self/*<-example::ImplicitConversion.newAny2stringadd#self.*/: A/*->example::ImplicitConversion.newAny2stringadd#[A]*/) extends AnyVal/*->scala::AnyVal#*//*->scala::AnyVal#`<init>`().*/ {
/*->example::ImplicitConversion.newAny2stringadd().[A]*//*->example::ImplicitConversion.newAny2stringadd().(self)*/implicit final class newAny2stringadd/*<-example::ImplicitConversion.newAny2stringadd#*//*<-example::ImplicitConversion.newAny2stringadd().*/[A/*<-example::ImplicitConversion.newAny2stringadd#[A]*//*<-example::ImplicitConversion.newAny2stringadd().[A]*/](private val self/*<-example::ImplicitConversion.newAny2stringadd#self.*//*<-example::ImplicitConversion.newAny2stringadd().(self)*/: A/*->example::ImplicitConversion.newAny2stringadd#[A]*//*->example::ImplicitConversion.newAny2stringadd().[A]*/) extends AnyVal/*->scala::AnyVal#*//*->scala::AnyVal#`<init>`().*/ {
def +/*<-example::ImplicitConversion.newAny2stringadd#`+`().*/(other/*<-example::ImplicitConversion.newAny2stringadd#`+`().(other)*/: String/*->scala::Predef.String#*/): String/*->scala::Predef.String#*/ = String/*->java::lang::String#*/.valueOf/*->java::lang::String#valueOf().*/(self/*->example::ImplicitConversion.newAny2stringadd#self.*/) +/*->java::lang::String#`+`().*/ other/*->example::ImplicitConversion.newAny2stringadd#`+`().(other)*/
}
}
4 changes: 2 additions & 2 deletions tests/semanticdb/expect/InventedNames.expect.scala
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ given `* */*<-givens::InventedNames$package.`* *`.*/`: Long/*->scala::Long#*/ =
given X with
/*<-givens::InventedNames$package.given_X.*//*->givens::X#*/ def doX/*<-givens::InventedNames$package.given_X.doX().*/ = 7

given (using X/*->givens::X#*/): Y/*->givens::Y#*/ with
/*->givens::InventedNames$package.given_Y().(x$1)*/given /*<-givens::InventedNames$package.given_Y().*/(using X/*->givens::X#*//*<-givens::InventedNames$package.given_Y().(x$1)*/): Y/*->givens::Y#*/ with
def doY/*<-givens::InventedNames$package.given_Y#doY().*/ = "7"

given [T/*<-givens::InventedNames$package.given_Z_T#[T]*/]: Z/*->givens::Z#*/[T/*->givens::InventedNames$package.given_Z_T#[T]*/] with
/*->givens::InventedNames$package.given_Z_T().[T]*/given /*<-givens::InventedNames$package.given_Z_T().*/[T/*<-givens::InventedNames$package.given_Z_T#[T]*//*<-givens::InventedNames$package.given_Z_T().[T]*/]: Z/*->givens::Z#*/[T/*->givens::InventedNames$package.given_Z_T#[T]*/] with
def doZ/*<-givens::InventedNames$package.given_Z_T#doZ().*/: List/*->scala::package.List#*/[T/*->givens::InventedNames$package.given_Z_T#[T]*/] = Nil/*->scala::package.Nil.*/


Expand Down
25 changes: 22 additions & 3 deletions tests/semanticdb/metac.expect
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ Uri => Classes.scala
Text => empty
Language => Scala
Symbols => 109 entries
Occurrences => 130 entries
Occurrences => 134 entries

Symbols:
classes/C1# => final class C1
Expand Down Expand Up @@ -505,9 +505,13 @@ Occurrences:
[9:17..9:20): Int -> scala/Int#
[10:7..10:9): C4 <- classes/C4.
[12:7..12:8): M <- classes/M.
[13:2..13:2): -> classes/M.C5#`<init>`().
[13:2..13:2): -> classes/M.C5().(x)
[13:17..13:19): C5 <- classes/M.C5#
[13:17..13:19): C5 <- classes/M.C5().
[13:19..13:19): <- classes/M.C5#`<init>`().
[13:20..13:21): x <- classes/M.C5#x.
[13:20..13:21): x <- classes/M.C5().(x)
[13:23..13:26): Int -> scala/Int#
[16:11..16:13): C6 <- classes/C6#
[16:13..16:13): <- classes/C6#`<init>`().
Expand Down Expand Up @@ -1547,7 +1551,7 @@ Uri => ImplicitConversion.scala
Text => empty
Language => Scala
Symbols => 23 entries
Occurrences => 62 entries
Occurrences => 69 entries

Symbols:
example/ImplicitConversion# => class ImplicitConversion
Expand Down Expand Up @@ -1621,11 +1625,18 @@ Occurrences:
[29:16..29:16): -> scala/Char.char2long().
[29:16..29:20): char -> example/ImplicitConversion#char.
[32:7..32:25): ImplicitConversion <- example/ImplicitConversion.
[33:2..33:2): -> example/ImplicitConversion.newAny2stringadd().[A]
[33:2..33:2): -> example/ImplicitConversion.newAny2stringadd#`<init>`().
[33:2..33:2): -> example/ImplicitConversion.newAny2stringadd().(self)
[33:23..33:39): newAny2stringadd <- example/ImplicitConversion.newAny2stringadd#
[33:23..33:39): newAny2stringadd <- example/ImplicitConversion.newAny2stringadd().
[33:39..33:39): <- example/ImplicitConversion.newAny2stringadd#`<init>`().
[33:40..33:41): A <- example/ImplicitConversion.newAny2stringadd#[A]
[33:40..33:41): A <- example/ImplicitConversion.newAny2stringadd().[A]
[33:55..33:59): self <- example/ImplicitConversion.newAny2stringadd#self.
[33:55..33:59): self <- example/ImplicitConversion.newAny2stringadd().(self)
[33:61..33:62): A -> example/ImplicitConversion.newAny2stringadd#[A]
[33:61..33:62): A -> example/ImplicitConversion.newAny2stringadd().[A]
[33:72..33:78): AnyVal -> scala/AnyVal#
[33:78..33:78): -> scala/AnyVal#`<init>`().
[34:8..34:9): + <- example/ImplicitConversion.newAny2stringadd#`+`().
Expand Down Expand Up @@ -1744,7 +1755,7 @@ Uri => InventedNames.scala
Text => empty
Language => Scala
Symbols => 45 entries
Occurrences => 72 entries
Occurrences => 80 entries

Symbols:
givens/InventedNames$package. => final package object givens
Expand Down Expand Up @@ -1830,12 +1841,20 @@ Occurrences:
[21:6..22:0): <- givens/InventedNames$package.given_X.
[21:6..21:7): X -> givens/X#
[22:6..22:9): doX <- givens/InventedNames$package.given_X.doX().
[24:0..24:0): -> givens/InventedNames$package.given_Y#`<init>`().
[24:0..24:0): -> givens/InventedNames$package.given_Y().(x$1)
[24:6..24:6): <- givens/InventedNames$package.given_Y().
[24:13..24:13): <- givens/InventedNames$package.given_Y#`<init>`().
[24:13..24:14): X -> givens/X#
[24:13..24:13): <- givens/InventedNames$package.given_Y().(x$1)
[24:17..24:18): Y -> givens/Y#
[25:6..25:9): doY <- givens/InventedNames$package.given_Y#doY().
[27:0..27:0): -> givens/InventedNames$package.given_Z_T().[T]
[27:0..27:0): -> givens/InventedNames$package.given_Z_T#`<init>`().
[27:6..27:6): <- givens/InventedNames$package.given_Z_T().
[27:7..27:7): <- givens/InventedNames$package.given_Z_T#`<init>`().
[27:7..27:8): T <- givens/InventedNames$package.given_Z_T#[T]
[27:7..27:8): T <- givens/InventedNames$package.given_Z_T().[T]
[27:11..27:12): Z -> givens/Z#
[27:13..27:14): T -> givens/InventedNames$package.given_Z_T#[T]
[28:6..28:9): doZ <- givens/InventedNames$package.given_Z_T#doZ().
Expand Down

0 comments on commit ef024cf

Please sign in to comment.