aboutsummaryrefslogtreecommitdiffhomepage
path: root/js/test.proto
diff options
context:
space:
mode:
authorGravatar Josh Haberman <jhaberman@gmail.com>2016-02-04 16:11:07 -0800
committerGravatar Josh Haberman <jhaberman@gmail.com>2016-02-18 10:30:21 -0800
commit77af5d04b1897baeda2ebd753d138c99afe72c50 (patch)
tree60a26239352658db80b87262315659c5202e31f6 /js/test.proto
parentd6a186a8f18c1b14979e0244c0434b5b89c0f8a9 (diff)
Fixed nested message scopes for CommonJS.
Diffstat (limited to 'js/test.proto')
-rw-r--r--js/test.proto7
1 files changed, 7 insertions, 0 deletions
diff --git a/js/test.proto b/js/test.proto
index 5f9078ef..3cea5f37 100644
--- a/js/test.proto
+++ b/js/test.proto
@@ -100,6 +100,13 @@ message Complex {
repeated string a_repeated_string = 7;
}
+message OuterMessage {
+ // Make sure this doesn't conflict with the other Complex message.
+ message Complex {
+ optional int32 inner_complex_field = 1;
+ }
+}
+
message IsExtension {
extend HasExtensions {
optional IsExtension ext_field = 100;