Skip to content

Commit 7f074d6

Browse files
thesametthesamet
committed
Make refrences to descriptors fully qualified.
Fixes #1724
1 parent b8bcac2 commit 7f074d6

File tree

126 files changed

+254
-254
lines changed

Some content is hidden

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

126 files changed

+254
-254
lines changed

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

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

739739
def javaDescriptorSource: String =
740740
if (message.isTopLevel)
741-
s"${message.getFile.fileDescriptorObject.name}.javaDescriptor.getMessageTypes().get(${message.getIndex})"
741+
s"${message.getFile.fileDescriptorObject.fullName}.javaDescriptor.getMessageTypes().get(${message.getIndex})"
742742
else
743743
s"${message.getContainingType.scalaType.fullName}.javaDescriptor.getNestedTypes().get(${message.getIndex})"
744744

745745
def scalaDescriptorSource: String =
746746
if (message.isTopLevel)
747-
s"${message.getFile.fileDescriptorObject.name}.scalaDescriptor.messages(${message.getIndex})"
747+
s"${message.getFile.fileDescriptorObject.fullName}.scalaDescriptor.messages(${message.getIndex})"
748748
else
749749
s"${message.getContainingType.scalaType.fullName}.scalaDescriptor.nestedMessages(${message.getIndex})"
750750

@@ -809,13 +809,13 @@ class DescriptorImplicits private[compiler] (
809809

810810
def javaDescriptorSource: String =
811811
if (enumDescriptor.isTopLevel)
812-
s"${enumDescriptor.getFile.fileDescriptorObject.name}.javaDescriptor.getEnumTypes().get(${enumDescriptor.getIndex})"
812+
s"${enumDescriptor.getFile.fileDescriptorObject.fullName}.javaDescriptor.getEnumTypes().get(${enumDescriptor.getIndex})"
813813
else
814814
s"${enumDescriptor.getContainingType.scalaType.fullName}.javaDescriptor.getEnumTypes().get(${enumDescriptor.getIndex})"
815815

816816
def scalaDescriptorSource: String =
817817
if (enumDescriptor.isTopLevel)
818-
s"${enumDescriptor.getFile.fileDescriptorObject.name}.scalaDescriptor.enums(${enumDescriptor.getIndex})"
818+
s"${enumDescriptor.getFile.fileDescriptorObject.fullName}.scalaDescriptor.enums(${enumDescriptor.getIndex})"
819819
else
820820
s"${enumDescriptor.getContainingType.scalaType.fullName}.scalaDescriptor.enums(${enumDescriptor.getIndex})"
821821

‎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
@@ -92,8 +92,8 @@ object MyContainer extends scalapb.GeneratedMessageCompanion[com.thesamet.docs.j
9292
)
9393
case _ => throw new RuntimeException("Expected PMessage")
9494
}
95-
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = JsonProto.javaDescriptor.getMessageTypes().get(1)
96-
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = JsonProto.scalaDescriptor.messages(1)
95+
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = com.thesamet.docs.json.JsonProto.javaDescriptor.getMessageTypes().get(1)
96+
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = com.thesamet.docs.json.JsonProto.scalaDescriptor.messages(1)
9797
def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = {
9898
var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null
9999
(__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
@@ -96,8 +96,8 @@ object MyMessage extends scalapb.GeneratedMessageCompanion[com.thesamet.docs.jso
9696
)
9797
case _ => throw new RuntimeException("Expected PMessage")
9898
}
99-
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = JsonProto.javaDescriptor.getMessageTypes().get(0)
100-
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = JsonProto.scalaDescriptor.messages(0)
99+
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = com.thesamet.docs.json.JsonProto.javaDescriptor.getMessageTypes().get(0)
100+
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = com.thesamet.docs.json.JsonProto.scalaDescriptor.messages(0)
101101
def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number)
102102
lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty
103103
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
@@ -96,8 +96,8 @@ object Duration extends scalapb.GeneratedMessageCompanion[mytypes.duration.Durat
9696
)
9797
case _ => throw new RuntimeException("Expected PMessage")
9898
}
99-
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = DurationProto.javaDescriptor.getMessageTypes().get(0)
100-
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = DurationProto.scalaDescriptor.messages(0)
99+
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = mytypes.duration.DurationProto.javaDescriptor.getMessageTypes().get(0)
100+
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = mytypes.duration.DurationProto.scalaDescriptor.messages(0)
101101
def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number)
102102
lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty
103103
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
@@ -143,8 +143,8 @@ object Person extends scalapb.GeneratedMessageCompanion[scalapb.docs.person.Pers
143143
)
144144
case _ => throw new RuntimeException("Expected PMessage")
145145
}
146-
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = PersonProto.javaDescriptor.getMessageTypes().get(0)
147-
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = PersonProto.scalaDescriptor.messages(0)
146+
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = scalapb.docs.person.PersonProto.javaDescriptor.getMessageTypes().get(0)
147+
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = scalapb.docs.person.PersonProto.scalaDescriptor.messages(0)
148148
def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = {
149149
var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null
150150
(__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
@@ -58,6 +58,6 @@ object Color extends _root_.scalapb.GeneratedEnumCompanion[Color] {
5858
case 3 => BLUE
5959
case __other => Unrecognized(__other)
6060
}
61-
def javaDescriptor: _root_.com.google.protobuf.Descriptors.EnumDescriptor = ProtosProto.javaDescriptor.getEnumTypes().get(0)
62-
def scalaDescriptor: _root_.scalapb.descriptors.EnumDescriptor = ProtosProto.scalaDescriptor.enums(0)
61+
def javaDescriptor: _root_.com.google.protobuf.Descriptors.EnumDescriptor = scalapb.perf.protos.ProtosProto.javaDescriptor.getEnumTypes().get(0)
62+
def scalaDescriptor: _root_.scalapb.descriptors.EnumDescriptor = scalapb.perf.protos.ProtosProto.scalaDescriptor.enums(0)
6363
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ object Enum extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos.Enum]
9696
)
9797
case _ => throw new RuntimeException("Expected PMessage")
9898
}
99-
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProtosProto.javaDescriptor.getMessageTypes().get(2)
100-
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProtosProto.scalaDescriptor.messages(2)
99+
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = scalapb.perf.protos.ProtosProto.javaDescriptor.getMessageTypes().get(2)
100+
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = scalapb.perf.protos.ProtosProto.scalaDescriptor.messages(2)
101101
def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number)
102102
lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty
103103
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
@@ -109,8 +109,8 @@ object EnumVector extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos.
109109
)
110110
case _ => throw new RuntimeException("Expected PMessage")
111111
}
112-
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProtosProto.javaDescriptor.getMessageTypes().get(3)
113-
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProtosProto.scalaDescriptor.messages(3)
112+
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = scalapb.perf.protos.ProtosProto.javaDescriptor.getMessageTypes().get(3)
113+
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = scalapb.perf.protos.ProtosProto.scalaDescriptor.messages(3)
114114
def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number)
115115
lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty
116116
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
@@ -109,8 +109,8 @@ object IntVector extends scalapb.GeneratedMessageCompanion[scalapb.perf.protos.I
109109
)
110110
case _ => throw new RuntimeException("Expected PMessage")
111111
}
112-
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProtosProto.javaDescriptor.getMessageTypes().get(4)
113-
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProtosProto.scalaDescriptor.messages(4)
112+
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = scalapb.perf.protos.ProtosProto.javaDescriptor.getMessageTypes().get(4)
113+
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = scalapb.perf.protos.ProtosProto.scalaDescriptor.messages(4)
114114
def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number)
115115
lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty
116116
def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ object MessageContainer extends scalapb.GeneratedMessageCompanion[scalapb.perf.p
117117
)
118118
case _ => throw new RuntimeException("Expected PMessage")
119119
}
120-
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = ProtosProto.javaDescriptor.getMessageTypes().get(1)
121-
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = ProtosProto.scalaDescriptor.messages(1)
120+
def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = scalapb.perf.protos.ProtosProto.javaDescriptor.getMessageTypes().get(1)
121+
def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = scalapb.perf.protos.ProtosProto.scalaDescriptor.messages(1)
122122
def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = {
123123
var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null
124124
(__number: @_root_.scala.unchecked) match {

0 commit comments

Comments
 (0)