Skip to content

Commit 79df51c

Browse files
thesametthesamet
committed
Make refrences to descriptors fully qualified.
Fixes #1724
1 parent 687d0c5 commit 79df51c

File tree

133 files changed

+270
-266
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+270
-266
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
## [0.12.0] (Not released)
33
- Bump protobuf and protoc to 4.26.0. Currently files must specify proto2 and
44
proto3 syntax. Editions are not supported yet.
5+
- References to descriptors are fully qualified (#1724)
6+
7+
## [0.11.18] (Unreleased)
8+
- References to descriptors are fully qualified (#1724)
59

610
## [0.11.17] (Unreleased)
711
- Add `using` as a reserved keyword (#1666)

‎compiler-plugin/src/main/scala/scalapb/compiler/DescriptorImplicits.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -731,13 +731,13 @@ class DescriptorImplicits private[compiler] (
731731

732732
def javaDescriptorSource: String =
733733
if (message.isTopLevel)
734-
s"${message.getFile.fileDescriptorObject.name}.javaDescriptor.getMessageTypes().get(${message.getIndex})"
734+
s"${message.getFile.fileDescriptorObject.fullName}.javaDescriptor.getMessageTypes().get(${message.getIndex})"
735735
else
736736
s"${message.getContainingType.scalaType.fullName}.javaDescriptor.getNestedTypes().get(${message.getIndex})"
737737

738738
def scalaDescriptorSource: String =
739739
if (message.isTopLevel)
740-
s"${message.getFile.fileDescriptorObject.name}.scalaDescriptor.messages(${message.getIndex})"
740+
s"${message.getFile.fileDescriptorObject.fullName}.scalaDescriptor.messages(${message.getIndex})"
741741
else
742742
s"${message.getContainingType.scalaType.fullName}.scalaDescriptor.nestedMessages(${message.getIndex})"
743743

@@ -802,13 +802,13 @@ class DescriptorImplicits private[compiler] (
802802

803803
def javaDescriptorSource: String =
804804
if (enumDescriptor.isTopLevel)
805-
s"${enumDescriptor.getFile.fileDescriptorObject.name}.javaDescriptor.getEnumTypes().get(${enumDescriptor.getIndex})"
805+
s"${enumDescriptor.getFile.fileDescriptorObject.fullName}.javaDescriptor.getEnumTypes().get(${enumDescriptor.getIndex})"
806806
else
807807
s"${enumDescriptor.getContainingType.scalaType.fullName}.javaDescriptor.getEnumTypes().get(${enumDescriptor.getIndex})"
808808

809809
def scalaDescriptorSource: String =
810810
if (enumDescriptor.isTopLevel)
811-
s"${enumDescriptor.getFile.fileDescriptorObject.name}.scalaDescriptor.enums(${enumDescriptor.getIndex})"
811+
s"${enumDescriptor.getFile.fileDescriptorObject.fullName}.scalaDescriptor.enums(${enumDescriptor.getIndex})"
812812
else
813813
s"${enumDescriptor.getContainingType.scalaType.fullName}.scalaDescriptor.enums(${enumDescriptor.getIndex})"
814814

‎docs/src/main/scala/generated/com/thesamet/docs/json/MyContainer.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ object MyContainer extends scalapb.GeneratedMessageCompanion[com.thesamet.docs.j
9090
)
9191
case _ => throw new RuntimeException("Expected PMessage")
9292
}
93-
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = JsonProto.javaDescriptor.getMessageTypes().get(1)
94-
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = JsonProto.scalaDescriptor.messages(1)
93+
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = com.thesamet.docs.json.JsonProto.javaDescriptor.getMessageTypes().get(1)
94+
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = com.thesamet.docs.json.JsonProto.scalaDescriptor.messages(1)
9595
def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = {
9696
var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null
9797
(__number: @_root_.scala.unchecked) match {

‎docs/src/main/scala/generated/com/thesamet/docs/json/MyMessage.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ object MyMessage extends scalapb.GeneratedMessageCompanion[com.thesamet.docs.jso
9494
)
9595
case _ => throw new RuntimeException("Expected PMessage")
9696
}
97-
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = JsonProto.javaDescriptor.getMessageTypes().get(0)
98-
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = JsonProto.scalaDescriptor.messages(0)
97+
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = com.thesamet.docs.json.JsonProto.javaDescriptor.getMessageTypes().get(0)
98+
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = com.thesamet.docs.json.JsonProto.scalaDescriptor.messages(0)
9999
def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number)
100100
lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty
101101
def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber)

‎docs/src/main/scala/generated/mytypes/duration/Duration.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ object Duration extends scalapb.GeneratedMessageCompanion[mytypes.duration.Durat
9494
)
9595
case _ => throw new RuntimeException("Expected PMessage")
9696
}
97-
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = DurationProto.javaDescriptor.getMessageTypes().get(0)
98-
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = DurationProto.scalaDescriptor.messages(0)
97+
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = mytypes.duration.DurationProto.javaDescriptor.getMessageTypes().get(0)
98+
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = mytypes.duration.DurationProto.scalaDescriptor.messages(0)
9999
def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number)
100100
lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty
101101
def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber)

‎docs/src/main/scala/generated/scalapb/docs/person/Person.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ object Person extends scalapb.GeneratedMessageCompanion[scalapb.docs.person.Pers
141141
)
142142
case _ => throw new RuntimeException("Expected PMessage")
143143
}
144-
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = PersonProto.javaDescriptor.getMessageTypes().get(0)
145-
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = PersonProto.scalaDescriptor.messages(0)
144+
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = scalapb.docs.person.PersonProto.javaDescriptor.getMessageTypes().get(0)
145+
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = scalapb.docs.person.PersonProto.scalaDescriptor.messages(0)
146146
def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = {
147147
var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null
148148
(__number: @_root_.scala.unchecked) match {

‎docs/src/main/scala/generated/scalapb/perf/protos/Color.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ object Color extends _root_.scalapb.GeneratedEnumCompanion[Color] {
5656
case 3 => BLUE
5757
case __other => Unrecognized(__other)
5858
}
59-
def javaDescriptor: _root_.com.google.protobuf.Descriptors.EnumDescriptor = ProtosProto.javaDescriptor.getEnumTypes().get(0)
60-
def scalaDescriptor: _root_.scalapb.descriptors.EnumDescriptor = ProtosProto.scalaDescriptor.enums(0)
59+
def javaDescriptor: _root_.com.google.protobuf.Descriptors.EnumDescriptor = scalapb.perf.protos.ProtosProto.javaDescriptor.getEnumTypes().get(0)
60+
def scalaDescriptor: _root_.scalapb.descriptors.EnumDescriptor = scalapb.perf.protos.ProtosProto.scalaDescriptor.enums(0)
6161
}

‎docs/src/main/scala/generated/scalapb/perf/protos/Enum.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ object Enum extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos.Enum]
9494
)
9595
case _ => throw new RuntimeException("Expected PMessage")
9696
}
97-
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProtosProto.javaDescriptor.getMessageTypes().get(2)
98-
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProtosProto.scalaDescriptor.messages(2)
97+
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = scalapb.perf.protos.ProtosProto.javaDescriptor.getMessageTypes().get(2)
98+
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = scalapb.perf.protos.ProtosProto.scalaDescriptor.messages(2)
9999
def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number)
100100
lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty
101101
def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = {

‎docs/src/main/scala/generated/scalapb/perf/protos/EnumVector.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ object EnumVector extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos.
107107
)
108108
case _ => throw new RuntimeException("Expected PMessage")
109109
}
110-
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProtosProto.javaDescriptor.getMessageTypes().get(3)
111-
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProtosProto.scalaDescriptor.messages(3)
110+
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = scalapb.perf.protos.ProtosProto.javaDescriptor.getMessageTypes().get(3)
111+
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = scalapb.perf.protos.ProtosProto.scalaDescriptor.messages(3)
112112
def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number)
113113
lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty
114114
def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = {

‎docs/src/main/scala/generated/scalapb/perf/protos/IntVector.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ object IntVector extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos.I
107107
)
108108
case _ => throw new RuntimeException("Expected PMessage")
109109
}
110-
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProtosProto.javaDescriptor.getMessageTypes().get(4)
111-
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProtosProto.scalaDescriptor.messages(4)
110+
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = scalapb.perf.protos.ProtosProto.javaDescriptor.getMessageTypes().get(4)
111+
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = scalapb.perf.protos.ProtosProto.scalaDescriptor.messages(4)
112112
def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number)
113113
lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty
114114
def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber)

0 commit comments

Comments
 (0)