Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Unified Diff: third_party/protobuf/js/test2.proto

Issue 1842653006: Update //third_party/protobuf to version 3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/protobuf/js/test.proto ('k') | third_party/protobuf/js/test3.proto » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/protobuf/js/test2.proto
diff --git a/third_party/protobuf/python/google/protobuf/internal/test_bad_identifiers.proto b/third_party/protobuf/js/test2.proto
similarity index 73%
copy from third_party/protobuf/python/google/protobuf/internal/test_bad_identifiers.proto
copy to third_party/protobuf/js/test2.proto
index 6a82299a52b7ada13f12f03de89ba68b2d0ceca7..44e55effcb47e983729f41a0b95f3e0f20497c05 100644
--- a/third_party/protobuf/python/google/protobuf/internal/test_bad_identifiers.proto
+++ b/third_party/protobuf/js/test2.proto
@@ -1,6 +1,6 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
-// http://code.google.com/p/protobuf/
+// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
@@ -28,25 +28,27 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// Author: kenton@google.com (Kenton Varda)
+syntax = "proto2";
+option java_package = "com.google.apps.jspb.proto";
+option java_multiple_files = true;
-package protobuf_unittest;
+package jspb.test;
-option py_generic_services = true;
-
-message TestBadIdentifiers {
+message TestExtensionsMessage {
+ optional int32 intfield = 1;
extensions 100 to max;
}
-// Make sure these reasonable extension names don't conflict with internal
-// variables.
-extend TestBadIdentifiers {
- optional string message = 100 [default="foo"];
- optional string descriptor = 101 [default="bar"];
- optional string reflection = 102 [default="baz"];
- optional string service = 103 [default="qux"];
+message ExtensionMessage {
+ extend TestExtensionsMessage {
+ optional ExtensionMessage ext_field = 100;
+ }
+ optional string ext1 = 1;
}
-message AnotherMessage {}
-service AnotherService {}
+// Floating extensions are only supported when generating a _lib.js library.
+extend TestExtensionsMessage {
+ optional ExtensionMessage floating_msg_field = 101;
+ optional string floating_str_field = 102;
+}
« no previous file with comments | « third_party/protobuf/js/test.proto ('k') | third_party/protobuf/js/test3.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698