| commit | 7bc840f83874d9ff627f6a7d2879c0c6ab130a75 | [log] [tgz] |
|---|---|---|
| author | Alex Ruiz <alruiz@google.com> | Sun Jul 08 10:48:58 2012 -0700 |
| committer | Alex Ruiz <alruiz@google.com> | Sun Jul 08 10:48:58 2012 -0700 |
| tree | 8918161ae19b91b7101bf3f71b99210faf8644cc | |
| parent | 39451cf9c0c1178db798d9fceb1eae081d65f30d [diff] |
Fixed: [Issue 219] Auto-formatting problem with "extensions" keyword.
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/formatting/ProtobufFormatter_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/formatting/ProtobufFormatter_Test.java index a855547..f3bfc20 100644 --- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/formatting/ProtobufFormatter_Test.java +++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/formatting/ProtobufFormatter_Test.java
@@ -143,6 +143,15 @@ assertThatFormattingWorksCorrectly(); } + // message TestMessage { extensions 1 to 10; } + + // message TestMessage { + // extensions 1 to 10; + // } + @Test public void should_format_extensions() { + assertThatFormattingWorksCorrectly(); + } + // syntax = 'proto2';package com.google.protobuf.test;import 'google/protobuf/descriptor.proto';import // public 'address.proto';import weak 'salary.proto';option java_package = "com.foo.bar";option // optimize_for = CODE_SIZE;
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/formatting/ProtobufFormatter.java b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/formatting/ProtobufFormatter.java index 3e1509b..90336bc 100644 --- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/formatting/ProtobufFormatter.java +++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/formatting/ProtobufFormatter.java
@@ -39,6 +39,7 @@ c.setLinewrap(1).after(g.getGroupRule()); c.setLinewrap(2).after(g.getEnumRule()); c.setLinewrap(1).after(g.getEnumElementRule()); + c.setLinewrap(1).after(g.getExtensionsRule()); c.setLinewrap(1).after(g.getRpcRule()); c.setLinewrap(2).after(g.getServiceRule()); c.setLinewrap(1).after(g.getStreamRule());