Skip to content

Commit c34bf34

Browse files
committed
revert changes and NoPosition fix
1 parent 53a411a commit c34bf34

File tree

6 files changed

+17
-13
lines changed

6 files changed

+17
-13
lines changed

compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2514,10 +2514,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
25142514
def fullName: String = self.denot.fullName.toString
25152515

25162516
def pos: Option[Position] =
2517-
if self.exists && !self.lexicallyEnclosingClass.isOneOf(dotc.core.Flags.JavaDefined | dotc.core.Flags.Permanent) then
2518-
Some(self.sourcePos)
2519-
else
2520-
None
2517+
if self.exists then Some(self.sourcePos) else None
25212518

25222519
def docstring: Option[String] =
25232520
import dotc.core.Comments.CommentsContext

scaladoc/src/dotty/tools/scaladoc/api.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ enum Modifier(val name: String, val prefix: Boolean):
4444
case Transparent extends Modifier("transparent", true)
4545
case Infix extends Modifier("infix", true)
4646

47-
case class ExtensionTarget(name: String, typeParams: Seq[TypeParameter], argsLists: Seq[ParametersList], dri: DRI, position: Long)
47+
case class ExtensionTarget(name: String, typeParams: Seq[TypeParameter], argsLists: Seq[ParametersList], signature: Signature, dri: DRI, position: Long)
4848
case class ImplicitConversion(from: DRI, to: DRI)
4949
trait ImplicitConversionProvider { def conversion: Option[ImplicitConversion] }
5050
trait Classlike:

scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,13 @@ trait Resources(using ctx: DocContext) extends Locations, Writer:
167167
def extensionTarget(member: Member): String =
168168
member.kind match
169169
case Kind.Extension(on, _) =>
170-
val typeSig = InlineSignatureBuilder()
170+
val typeSig = SignatureBuilder()
171+
.keyword("extension ")
171172
.generics(on.typeParams)
172-
.asInstanceOf[InlineSignatureBuilder].names.reverse
173-
val argsSig = InlineSignatureBuilder()
173+
.content
174+
val argsSig = SignatureBuilder()
174175
.functionParameters(on.argsLists)
175-
.asInstanceOf[InlineSignatureBuilder].names.reverse
176+
.content
176177
flattenToText(typeSig ++ argsSig)
177178
case _ => ""
178179

scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ trait ClassLikeSupport:
151151
extSym.symbol.normalizedName,
152152
typeParams,
153153
termParams,
154+
extSym.tpt.asSignature,
154155
extSym.tpt.symbol.dri,
155156
extSym.symbol.pos.get.start
156157
)

scaladoc/src/dotty/tools/scaladoc/tasty/SymOps.scala

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,16 @@ object SymOps:
154154
def splitExtensionParamList: (List[reflect.ParamClause], List[reflect.ParamClause]) =
155155
import reflect.*
156156

157+
def getPositionStartOption(pos: Option[Position]): Option[Int] = pos.flatMap {
158+
case dotty.tools.dotc.util.NoSourcePosition => None
159+
case pos: Position => Some(pos.start)
160+
}
161+
157162
def comparePositionStarts(posA: Option[Position], posB: Option[Position]): Option[Boolean] =
158163
for {
159-
a <- posA
160-
b <- posB
161-
} yield a.start < b.start
164+
startA <- getPositionStartOption(posA)
165+
startB <- getPositionStartOption(posB)
166+
} yield startA < startB
162167

163168
sym.tree match
164169
case tree: DefDef =>

scaladoc/src/dotty/tools/scaladoc/transformers/ImplicitMembersExtensionTransformer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class ImplicitMembersExtensionTransformer(using DocContext) extends(Module => Mo
2626

2727
val MyDri = c.dri
2828
def collectApplicableMembers(source: Member): Seq[Member] = source.members.flatMap {
29-
case m @ Member(_, _, _, Kind.Extension(ExtensionTarget(_, _, _, MyDri, _), _), Origin.RegularlyDefined) =>
29+
case m @ Member(_, _, _, Kind.Extension(ExtensionTarget(_, _, _, _, MyDri, _), _), Origin.RegularlyDefined) =>
3030
val kind = m.kind match
3131
case Kind.Extension(_, d) => d
3232
case _ => Kind.Def(Nil, Nil)

0 commit comments

Comments
 (0)