Skip to content

Workaround for SI-2034 scala compiler bug #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cvogt merged 1 commit into from
Oct 4, 2016
Merged

Workaround for SI-2034 scala compiler bug #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions diff.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,22 @@ object `package` {
def arrow( l: String, r: String ) = l + " -> " + r
def showChangeRaw( l: String, r: String ): String = red( l ) + " -> " + green( r )
def showChange[L:DiffShow,R:DiffShow]( l: L, r: R ): String = showChangeRaw( DiffShow.show(l), DiffShow.show(r) )
}

/**
* Hack to avoid scala compiler bug with getSimpleName
* @see https://issues.scala-lang.org/browse/SI-2034
*/
private[diff] def getClassSimpleName(klass: Class[_]): String = {
try {
klass.getSimpleName
} catch {
case _: InternalError ⇒
val fullName = klass.getName.stripSuffix("$")
val fullClassName = fullName.substring(fullName.lastIndexOf(".") + 1)
fullClassName.substring(fullClassName.lastIndexOf("$") + 1)
}
}
}

object conversions{
implicit def seqAsSet[E:DiffShow]: DiffShow[Seq[E]] = new DiffShow[Seq[E]]{
Expand Down Expand Up @@ -127,9 +141,9 @@ abstract class DiffShowInstances extends DiffShowInstances2 {
def show( s: Some[T] ) = constructor("Some", List("" -> ds.show(s.get)))
def diff( l: Some[T], r: Some[T] ) = ds.diff(l.get, r.get).map( s => constructor("Some", List("" -> s)) )
}

implicit def singletonObjectDiffShow[T: SingletonObject]: DiffShow[T] = new DiffShow[T]{
def show( t: T ) = t.getClass.getSimpleName.stripSuffix("$")
def show( t: T ) = getClassSimpleName(t.getClass)
def diff( l: T, r: T ) = Identical( l )
}

Expand All @@ -152,13 +166,13 @@ abstract class DiffShowInstances extends DiffShowInstances2 {
implicit def stringDiffShow: DiffShow[String] = primitive( s => "\"" ++ s ++ "\"" )

// instances for some common types

implicit val uuidDiffShow: DiffShow[UUID] = primitive[UUID]( _.toString )

implicit def eitherDiffShow[L: DiffShow, R: DiffShow]: DiffShow[Either[L, R]] = {
new DiffShow[Either[L,R]]{
def show( e: Either[L,R] ) = constructor(
e.getClass.getSimpleName,
getClassSimpleName(e.getClass),
List( "" -> ( e.fold(DiffShow.show(_),DiffShow.show(_)) ) )
)
def diff(l: Either[L,R], r: Either[L,R]) = {
Expand Down Expand Up @@ -195,7 +209,7 @@ abstract class DiffShowInstances extends DiffShowInstances2 {

def show( t: T ) = {
val fields = hlistShow.value.show( labelled to t ).toList.sortBy( _._1 )
constructor( t.getClass.getSimpleName, fields )
constructor( getClassSimpleName(t.getClass), fields )
}
def diff( left: T, right: T ) = {
val fields = hlistShow.value.diff( labelled to left, labelled to right ).toList.sortBy( _._1 ).map {
Expand All @@ -204,7 +218,7 @@ abstract class DiffShowInstances extends DiffShowInstances2 {
case ( name, Identical( _ ) ) => None
}
if ( fields.flatten.nonEmpty ) Different(
constructorOption( left.getClass.getSimpleName, fields )
constructorOption( getClassSimpleName(left.getClass), fields )
)
else Identical( left )
}
Expand Down
11 changes: 11 additions & 0 deletions test/Main.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ import ai.x.diff.conversions._
import scala.collection.immutable.SortedMap
import java.util.UUID

object Foo1 {
object Foo2 {
case object Foo3
}
}

sealed trait Parent
case class Bar( s: String, i: Int ) extends Parent
case class Foo( bar: Bar, b: List[Int], parent: Option[Parent] ) extends Parent
Expand Down Expand Up @@ -165,6 +171,11 @@ object Main extends App {
)
}

{
// testing hack for https://issues.scala-lang.org/browse/SI-2034
assertIdentical( Foo1.Foo2.Foo3, Foo1.Foo2.Foo3 )
}

/*

//import pprint.Config.Defaults._
Expand Down