third_party/protobuf/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs - Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)

Patch Set: Make chrome settings proto generated file a component Created 4 years 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/csharp/src/Google.Protobuf/Reflection/Descriptor.cs ('k') | third_party/protobuf/csharp/src/Google.Protobuf/Reflection/FileDescriptor.cs » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs

diff --git a/third_party/protobuf/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs b/third_party/protobuf/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs

index 6c6f6ee05ff0b3b6d3672b16f531c26cb592d599..ed15d0e191227bfb4fec0463fd0dff2e310a5d4e 100644

--- a/third_party/protobuf/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs

+++ b/third_party/protobuf/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs

@@ -97,7 +97,7 @@ namespace Google.Protobuf.Reflection

// We could trust the generated code and check whether the type of the property is

// a MapField, but that feels a tad nasty.

this.propertyName = propertyName;

- JsonName = Proto.JsonName == "" ? JsonFormatter.ToCamelCase(Proto.Name) : Proto.JsonName;

+ JsonName = Proto.JsonName == "" ? JsonFormatter.ToJsonName(Proto.Name) : Proto.JsonName;

}