Skip to content

Commit 6c634e5

Browse files
committed
Revert "Remove isParsed"
This reverts commit 2f9e2ba.
1 parent 46e8aa9 commit 6c634e5

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

scaladoc/src/dotty/tools/scaladoc/Inkuire.scala

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ object Inkuire {
4141
typeAliases: Map[ITID, TypeLike]
4242
)
4343

44-
case class ITID(uuid: String)
44+
case class ITID(uuid: String, isParsed: Boolean)
4545

4646
case class Signature(
4747
receiver: Option[Contravariance],
@@ -87,7 +87,7 @@ object Inkuire {
8787
val uuid = s"external-type-lambda-arg-$name"
8888
Inkuire.Type(
8989
name = Inkuire.TypeName(name),
90-
itid = Some(Inkuire.ITID(uuid)),
90+
itid = Some(Inkuire.ITID(uuid, isParsed = false)),
9191
isVariable = true
9292
)
9393
}
@@ -98,15 +98,16 @@ object Inkuire {
9898
name = TypeName("<unresolved>"),
9999
itid = Some(
100100
ITID(
101-
uuid = "<unresolved>"
101+
uuid = "<unresolved>",
102+
isParsed = false
102103
)
103104
)
104105
)
105106

106107
def StarProjection: Type =
107108
Type(
108109
name = TypeName("_"),
109-
itid = Some(ITID("_")),
110+
itid = Some(ITID("_", isParsed = false)),
110111
isStarProjection = true
111112
)
112113
}
@@ -191,7 +192,7 @@ object Inkuire {
191192
}
192193

193194
private def serializeAsKey(itid: ITID): String = {
194-
s"${itid.uuid}"
195+
s"""${itid.isParsed}=${itid.uuid}"""
195196
}
196197

197198
private def serialize(v: (Type, Seq[Type])): JSON = {
@@ -241,7 +242,8 @@ object Inkuire {
241242

242243
private def serialize(itid: ITID): JSON = {
243244
jsonObject(
244-
("uuid", serialize(itid.uuid))
245+
("uuid", serialize(itid.uuid)),
246+
("isParsed", serialize(itid.isParsed))
245247
)
246248
}
247249

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ trait InkuireSupport:
230230

231231
given SymbolSyntaxInkuire: AnyRef with
232232
extension (symbol: Symbol)
233-
def itid(using dctx: DocContext): Option[Inkuire.ITID] = Some(Inkuire.ITID(symbol.dri.symbolUUID))
233+
def itid(using dctx: DocContext): Option[Inkuire.ITID] = Some(Inkuire.ITID(symbol.dri.symbolUUID, isParsed = false))
234234

235235
given TypeSyntaxInkuire: AnyRef with
236236
extension (tpe: TypeRepr)
@@ -242,7 +242,7 @@ trait InkuireSupport:
242242
val name = s"X$i"
243243
Inkuire.Type(
244244
name = Inkuire.TypeName(name),
245-
itid = Some(Inkuire.ITID(uuid)),
245+
itid = Some(Inkuire.ITID(uuid, isParsed = false)),
246246
isVariable = true
247247
)
248248
}
@@ -294,7 +294,7 @@ trait InkuireSupport:
294294
Inkuire.Type(
295295
name = Inkuire.TypeName(constant.toString),
296296
params = Seq.empty,
297-
itid = Some(Inkuire.ITID(constant.toString))
297+
itid = Some(Inkuire.ITID(constant.toString, isParsed = false))
298298
)
299299
case ThisType(tpe) => inner(tpe, vars)
300300
case AnnotatedType(AppliedType(_, Seq(tpe)), annotation) if isRepeatedAnnotation(annotation) =>
@@ -314,14 +314,14 @@ trait InkuireSupport:
314314
Inkuire.Type(
315315
name = Inkuire.TypeName(name),
316316
params = typeList.init.map(p => Inkuire.Contravariance(inner(p, vars))) :+ Inkuire.Covariance(inner(typeList.last, vars)),
317-
itid = Some(Inkuire.ITID(s"${name}scala.${name}//[]"))
317+
itid = Some(Inkuire.ITID(s"${name}scala.${name}//[]", isParsed = false))
318318
)
319319
else if t.isTupleN then
320320
val name = s"Tuple${typeList.size}"
321321
Inkuire.Type(
322322
name = Inkuire.TypeName(name),
323323
params = typeList.map(p => Inkuire.Covariance(inner(p, vars))),
324-
itid = Some(Inkuire.ITID(s"${name}scala.${name}//[]"))
324+
itid = Some(Inkuire.ITID(s"${name}scala.${name}//[]", isParsed = false))
325325
)
326326
else
327327
inner(tpe, vars).asInstanceOf[Inkuire.Type].copy(
@@ -353,5 +353,5 @@ trait InkuireSupport:
353353
Inkuire.Type(
354354
name = Inkuire.TypeName(name),
355355
params = typeList.map(p => Inkuire.Contravariance(inner(p, vars))) :+ Inkuire.Covariance(inner(resType, vars)),
356-
itid = Some(Inkuire.ITID(s"${name}scala.${name}//[]"))
356+
itid = Some(Inkuire.ITID(s"${name}scala.${name}//[]", isParsed = false))
357357
)

0 commit comments

Comments
 (0)