Skip to content

Commit

Permalink
Fix layout
Browse files Browse the repository at this point in the history
  • Loading branch information
odersky committed Dec 15, 2015
1 parent fd9d3f3 commit 570cf0f
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions src/dotty/tools/dotc/core/Types.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1550,23 +1550,23 @@ object Types {
else {
if (Config.splitProjections && isType)
prefix match {
case prefix: AndType =>
def isMissing(tp: Type) = tp match {
case tp: TypeRef => !tp.info.exists
case _ => false
}
val derived1 = derivedSelect(prefix.tp1)
val derived2 = derivedSelect(prefix.tp2)
return (
if (isMissing(derived1)) derived2
else if (isMissing(derived2)) derived1
else prefix.derivedAndType(derived1, derived2))
case prefix: OrType =>
val derived1 = derivedSelect(prefix.tp1)
val derived2 = derivedSelect(prefix.tp2)
return prefix.derivedOrType(derived1, derived2)
case _ =>
}
case prefix: AndType =>
def isMissing(tp: Type) = tp match {
case tp: TypeRef => !tp.info.exists
case _ => false
}
val derived1 = derivedSelect(prefix.tp1)
val derived2 = derivedSelect(prefix.tp2)
return (
if (isMissing(derived1)) derived2
else if (isMissing(derived2)) derived1
else prefix.derivedAndType(derived1, derived2))
case prefix: OrType =>
val derived1 = derivedSelect(prefix.tp1)
val derived2 = derivedSelect(prefix.tp2)
return prefix.derivedOrType(derived1, derived2)
case _ =>
}
val res = prefix.lookupRefined(name)
if (res.exists) res
else if (name == tpnme.hkApply && prefix.classNotLambda) {
Expand Down

0 comments on commit 570cf0f

Please sign in to comment.