-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix regression with Overloaded methods returning Functions
Before the regression, FunctionOf unapply would not try dealiasing, meaning that an aliased function type would be handled by a general case. To fix that, instead of handling Function types separately when filtering overloaded methods in `resolveOverloaded1`, we allow to fallback to the general case if the previous one returns nothing. Along with fixing the regression, this also improves other cases, one of which was added to the test. Readd a separate FunctionOf case, but with a fallback
- Loading branch information
Showing
2 changed files
with
48 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
import scala.reflect.ClassTag | ||
|
||
trait MockSettings | ||
|
||
object Mockito { | ||
def mock[T : ClassTag]: T = ??? | ||
def mock[T : ClassTag](settings: MockSettings): T = ??? | ||
} | ||
|
||
trait Channel | ||
type OnChannel = Channel => Any | ||
|
||
@main def Test = | ||
val case1: OnChannel = Mockito.mock[OnChannel] | ||
val case2: OnChannel = Mockito.mock | ||
val case3 = Mockito.mock[OnChannel] | ||
val case4: OnChannel = Mockito.mock[OnChannel](summon[ClassTag[OnChannel]]) | ||
|
||
// not a regressive case, but an added improvement with the fix for the above | ||
val case5: Channel => Any = Mockito.mock[Channel => Any] |