@@ -374,7 +374,7 @@ object Denotations {
374
374
* pick the associated denotation.
375
375
* 3. Otherwise, if the two infos can be combined with `infoMeet`, pick that as
376
376
* result info, and pick the symbol that scores higher as result symbol,
377
- * or pick `sym2 ` as a tie breaker. The picked info and symbol are combined
377
+ * or pick `sym1 ` as a tie breaker. The picked info and symbol are combined
378
378
* in a JointDenotation.
379
379
* 4. Otherwise, if one of the two symbols scores strongly higher than the
380
380
* other one, pick the associated denotation.
@@ -469,16 +469,14 @@ object Denotations {
469
469
470
470
val matchLoosely = sym1.matchNullaryLoosely || sym2.matchNullaryLoosely
471
471
472
- if info2.overrides(info1, matchLoosely, checkClassInfo = false )
473
- && symScore <= 0
474
- then denot2
475
- else if info1.overrides(info2, matchLoosely, checkClassInfo = false )
476
- && symScore >= 0
477
- then denot1
472
+ if symScore <= 0 && info2.overrides(info1, matchLoosely, checkClassInfo = false ) then
473
+ denot2
474
+ else if symScore >= 0 && info1.overrides(info2, matchLoosely, checkClassInfo = false ) then
475
+ denot1
478
476
else
479
477
val jointInfo = infoMeet(info1, info2, safeIntersection)
480
478
if jointInfo.exists then
481
- val sym = if symScore > 0 then sym1 else sym2
479
+ val sym = if symScore >= 0 then sym1 else sym2
482
480
JointRefDenotation (sym, jointInfo, denot1.validFor & denot2.validFor, pre)
483
481
else if symScore == 2 then denot1
484
482
else if symScore == - 2 then denot2
0 commit comments