From 4aed0e9a0a502e29e54f8a5d091159f5db906cfc Mon Sep 17 00:00:00 2001
From: Georgii Kovalev <134854076+goshacodes@users.noreply.github.com>
Date: Thu, 14 Nov 2024 23:36:43 +0500
Subject: [PATCH] Remove scala.reflect.Selectable from generated mock type
 (#544)

---
 shared/src/main/scala-3/org/scalamock/clazz/Mock.scala | 10 ++++------
 .../main/scala-3/org/scalamock/clazz/MockImpl.scala    |  9 ++++-----
 .../main/scala-3/org/scalamock/clazz/MockMaker.scala   |  2 +-
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/shared/src/main/scala-3/org/scalamock/clazz/Mock.scala b/shared/src/main/scala-3/org/scalamock/clazz/Mock.scala
index c8806cf3..0bb82e02 100644
--- a/shared/src/main/scala-3/org/scalamock/clazz/Mock.scala
+++ b/shared/src/main/scala-3/org/scalamock/clazz/Mock.scala
@@ -24,16 +24,14 @@ import org.scalamock.context.MockContext
 import org.scalamock.function.*
 import org.scalamock.util.Defaultable
 
-import scala.reflect.Selectable
-
 trait Mock:
   import scala.language.implicitConversions
 
-  inline def mock[T](implicit mockContext: MockContext): T & Selectable = ${MockImpl.mock[T]('{mockContext})}
-  inline def stub[T](implicit mockContext: MockContext): T & Selectable = ${MockImpl.stub[T]('{mockContext})}
+  inline def mock[T](implicit mockContext: MockContext): T = ${MockImpl.mock[T]('{mockContext})}
+  inline def stub[T](implicit mockContext: MockContext): T = ${MockImpl.stub[T]('{mockContext})}
 
-  inline def mock[T](mockName: String)(implicit mockContext: MockContext) : T & Selectable = ${MockImpl.mockWithName[T]('{mockName})('{mockContext})}
-  inline def stub[T](mockName: String)(implicit mockContext: MockContext): T & Selectable = ${MockImpl.stubWithName[T]('{mockName})('{mockContext})}
+  inline def mock[T](mockName: String)(implicit mockContext: MockContext) : T = ${MockImpl.mockWithName[T]('{mockName})('{mockContext})}
+  inline def stub[T](mockName: String)(implicit mockContext: MockContext): T = ${MockImpl.stubWithName[T]('{mockName})('{mockContext})}
 
   inline implicit def toMockFunction0[R: Defaultable](inline f: () => R): MockFunction0[R] = ${MockImpl.toMockFunction0[R]('{f})('{summon[Defaultable[R]]})}
   inline implicit def toMockFunction1[T1, R: Defaultable](inline f: T1 => R): MockFunction1[T1, R] = ${MockImpl.toMockFunction1[T1, R]('{f})('{summon[Defaultable[R]]})}
diff --git a/shared/src/main/scala-3/org/scalamock/clazz/MockImpl.scala b/shared/src/main/scala-3/org/scalamock/clazz/MockImpl.scala
index 8daba8bc..e893504c 100644
--- a/shared/src/main/scala-3/org/scalamock/clazz/MockImpl.scala
+++ b/shared/src/main/scala-3/org/scalamock/clazz/MockImpl.scala
@@ -27,20 +27,19 @@ import scala.quoted.*
 import org.scalamock.util.Defaultable
 import MockFunctionFinder.findMockFunction
 
-import scala.reflect.Selectable
 
 @scala.annotation.experimental
 private[clazz] object MockImpl:
-  def mock[T: Type](mockContext: Expr[MockContext])(using quotes: Quotes): Expr[T & Selectable] =
+  def mock[T: Type](mockContext: Expr[MockContext])(using quotes: Quotes): Expr[T] =
     MockMaker.instance[T](MockType.Mock, mockContext, name = None)
 
-  def stub[T: Type](mockContext: Expr[MockContext])(using quotes: Quotes): Expr[T & Selectable] =
+  def stub[T: Type](mockContext: Expr[MockContext])(using quotes: Quotes): Expr[T] =
     MockMaker.instance[T](MockType.Stub, mockContext, name = None)
 
-  def mockWithName[T: Type](mockName: Expr[String])(mockContext: Expr[MockContext])(using quotes: Quotes): Expr[T & Selectable] =
+  def mockWithName[T: Type](mockName: Expr[String])(mockContext: Expr[MockContext])(using quotes: Quotes): Expr[T] =
     MockMaker.instance[T](MockType.Mock, mockContext, Some(mockName))
 
-  def stubWithName[T: Type](mockName: Expr[String])(mockContext: Expr[MockContext])(using quotes: Quotes): Expr[T & Selectable] =
+  def stubWithName[T: Type](mockName: Expr[String])(mockContext: Expr[MockContext])(using quotes: Quotes): Expr[T] =
     MockMaker.instance[T](MockType.Stub, mockContext, Some(mockName))
 
 
diff --git a/shared/src/main/scala-3/org/scalamock/clazz/MockMaker.scala b/shared/src/main/scala-3/org/scalamock/clazz/MockMaker.scala
index c9ddc8d5..13f1dd11 100644
--- a/shared/src/main/scala-3/org/scalamock/clazz/MockMaker.scala
+++ b/shared/src/main/scala-3/org/scalamock/clazz/MockMaker.scala
@@ -28,7 +28,7 @@ import scala.reflect.Selectable
 private[clazz] object MockMaker:
   val MockDefaultNameValName = "mock$special$mockName"
 
-  def instance[T: Type](mockType: MockType, ctx: Expr[MockContext], name: Option[Expr[String]])(using quotes: Quotes): Expr[T & Selectable] =
+  def instance[T: Type](mockType: MockType, ctx: Expr[MockContext], name: Option[Expr[String]])(using quotes: Quotes): Expr[T] =
     val utils = Utils(using quotes)
     import utils.quotes.reflect.*
     val tpe = TypeRepr.of[T]