protoprint: fix superfluous trailing space (#494)

jhump · Feb 13, 2022 · 3240deb · 3240deb
1 parent e5b6528
commit 3240deb
Show file tree

Hide file tree

Showing 23 changed files with 29 additions and 29 deletions.
diff --git a/desc/protoprint/print.go b/desc/protoprint/print.go
@@ -1676,7 +1676,7 @@ func (p *Printer) printOption(name string, optVal interface{}, w *writer, indent
 			Compact:   true,
 			ExpandAny: true,
 		}
-		str := m.Text(optVal)
+		str := strings.TrimSuffix(m.Text(optVal), " ")
 		fieldCount := strings.Count(str, ":")
 		nestedCount := strings.Count(str, "{") + strings.Count(str, "<")
 		if fieldCount <= 1 && nestedCount == 0 {

diff --git a/desc/protoprint/testfiles/desc_test_comments-compact.proto b/desc/protoprint/testfiles/desc_test_comments-compact.proto
@@ -87,7 +87,7 @@ service RpcService {
   // service trailer
   // that spans multiple lines
   // option that sets field
-  option (testprotos.sfubar) = { id:100 name:"bob"  };
+  option (testprotos.sfubar) = { id:100 name:"bob" };
   option deprecated = false; // DEPRECATED!
   option (testprotos.sfubare) = VALUE;
   // Method comment

diff --git a/desc/protoprint/testfiles/desc_test_comments-custom-sort.proto b/desc/protoprint/testfiles/desc_test_comments-custom-sort.proto
@@ -41,7 +41,7 @@ service RpcService {
   option (testprotos.sfubare) = VALUE;
 
   // option that sets field
-  option (testprotos.sfubar) = { id:100 name:"bob"  };
+  option (testprotos.sfubar) = { id:100 name:"bob" };
 
   option deprecated = false; // DEPRECATED!
 }

diff --git a/desc/protoprint/testfiles/desc_test_comments-default.proto b/desc/protoprint/testfiles/desc_test_comments-default.proto
@@ -155,7 +155,7 @@ service RpcService {
   // that spans multiple lines
 
   // option that sets field
-  option (testprotos.sfubar) = { id:100 name:"bob"  };
+  option (testprotos.sfubar) = { id:100 name:"bob" };
 
   option deprecated = false; // DEPRECATED!
 

diff --git a/desc/protoprint/testfiles/desc_test_comments-multiline-style-comments.proto b/desc/protoprint/testfiles/desc_test_comments-multiline-style-comments.proto
@@ -159,7 +159,7 @@ service RpcService {
 	 */
 
 	/* option that sets field */
-	option (testprotos.sfubar) = { id:100 name:"bob"  };
+	option (testprotos.sfubar) = { id:100 name:"bob" };
 
 	option deprecated = false; /* DEPRECATED! */
 

diff --git a/desc/protoprint/testfiles/desc_test_comments-no-trailing-comments.proto b/desc/protoprint/testfiles/desc_test_comments-no-trailing-comments.proto
@@ -144,7 +144,7 @@ message AnEmptyMessage {
 // Service comment
 service RpcService {
   // option that sets field
-  option (testprotos.sfubar) = { id:100 name:"bob"  };
+  option (testprotos.sfubar) = { id:100 name:"bob" };
 
   option deprecated = false;
 

diff --git a/desc/protoprint/testfiles/desc_test_comments-only-doc-comments.proto b/desc/protoprint/testfiles/desc_test_comments-only-doc-comments.proto
@@ -119,7 +119,7 @@ message AnEmptyMessage {
 
 // Service comment
 service RpcService {
-  option (testprotos.sfubar) = { id:100 name:"bob"  };
+  option (testprotos.sfubar) = { id:100 name:"bob" };
 
   option deprecated = false;
 

diff --git a/desc/protoprint/testfiles/desc_test_comments-sorted-AND-multiline-style-comments.proto b/desc/protoprint/testfiles/desc_test_comments-sorted-AND-multiline-style-comments.proto
@@ -149,7 +149,7 @@ service RpcService {
   option deprecated = false; /* DEPRECATED! */
 
   /* option that sets field */
-  option (testprotos.sfubar) = { id:100 name:"bob"  };
+  option (testprotos.sfubar) = { id:100 name:"bob" };
 
   option (testprotos.sfubare) = VALUE;
 

diff --git a/desc/protoprint/testfiles/desc_test_comments-sorted.proto b/desc/protoprint/testfiles/desc_test_comments-sorted.proto
@@ -130,7 +130,7 @@ service RpcService {
    option deprecated = false; // DEPRECATED!
 
    // option that sets field
-   option (testprotos.sfubar) = { id:100 name:"bob"  };
+   option (testprotos.sfubar) = { id:100 name:"bob" };
 
    option (testprotos.sfubare) = VALUE;
 

diff --git a/desc/protoprint/testfiles/desc_test_comments-trailing-on-next-line.proto b/desc/protoprint/testfiles/desc_test_comments-trailing-on-next-line.proto
@@ -160,7 +160,7 @@ service RpcService {
   // that spans multiple lines
 
   // option that sets field
-  option (testprotos.sfubar) = { id:100 name:"bob"  };
+  option (testprotos.sfubar) = { id:100 name:"bob" };
 
   option deprecated = false;
   // DEPRECATED!

diff --git a/desc/protoprint/testfiles/desc_test_complex-compact.proto b/desc/protoprint/testfiles/desc_test_complex-compact.proto
@@ -36,9 +36,9 @@ message Test {
       extend Test {
         optional string _garblez = 100;
       }
-      option (rept) = { foo:"goo" [foo.bar.Test.Nested._NestedNested._garblez]:"boo"  };
+      option (rept) = { foo:"goo" [foo.bar.Test.Nested._NestedNested._garblez]:"boo" };
       message NestedNestedNested {
-        option (rept) = { foo:"hoo" [foo.bar.Test.Nested._NestedNested._garblez]:"spoo"  };
+        option (rept) = { foo:"hoo" [foo.bar.Test.Nested._NestedNested._garblez]:"spoo" };
         optional Test Test = 1;
       }
     }
@@ -100,7 +100,7 @@ message Another {
       name: "s"
     >
   };
-  option (rept) = { foo:"def"  };
+  option (rept) = { foo:"def" };
   option (eee) = V1;
   option (a) = {
     test: <
@@ -162,10 +162,10 @@ extend google.protobuf.MethodOptions {
 }
 service TestTestService {
   rpc UserAuth ( Test ) returns ( Test ) {
-    option (validator) = { authenticated:true permission:<action:LOGIN entity:"client" >  };
+    option (validator) = { authenticated:true permission:<action:LOGIN entity:"client" > };
   }
   rpc Get ( Test ) returns ( Test ) {
-    option (validator) = { authenticated:true permission:<action:READ entity:"user" >  };
+    option (validator) = { authenticated:true permission:<action:READ entity:"user" > };
   }
 }
 message Rule {

diff --git a/desc/protoprint/testfiles/desc_test_complex-custom-sort.proto b/desc/protoprint/testfiles/desc_test_complex-custom-sort.proto
@@ -480,7 +480,7 @@ message Another {
       name: "s"
     >
   };
-  option (rept) = { foo:"def"  };
+  option (rept) = { foo:"def" };
 
   option (map_vals) = {
     vals: <

diff --git a/desc/protoprint/testfiles/desc_test_complex-default.proto b/desc/protoprint/testfiles/desc_test_complex-default.proto
@@ -146,7 +146,7 @@ message Another {
       name: "s"
     >
   };
-  option (rept) = { foo:"def"  };
+  option (rept) = { foo:"def" };
 
   option (eee) = V1;
 

diff --git a/desc/protoprint/testfiles/desc_test_complex-multiline-style-comments.proto b/desc/protoprint/testfiles/desc_test_complex-multiline-style-comments.proto
@@ -146,7 +146,7 @@ message Another {
 			name: "s"
 		>
 	};
-	option (rept) = { foo:"def"  };
+	option (rept) = { foo:"def" };
 
 	option (eee) = V1;
 

diff --git a/desc/protoprint/testfiles/desc_test_complex-no-trailing-comments.proto b/desc/protoprint/testfiles/desc_test_complex-no-trailing-comments.proto
@@ -146,7 +146,7 @@ message Another {
       name: "s"
     >
   };
-  option (rept) = { foo:"def"  };
+  option (rept) = { foo:"def" };
 
   option (eee) = V1;
 

diff --git a/desc/protoprint/testfiles/desc_test_complex-only-doc-comments.proto b/desc/protoprint/testfiles/desc_test_complex-only-doc-comments.proto
@@ -146,7 +146,7 @@ message Another {
       name: "s"
     >
   };
-  option (rept) = { foo:"def"  };
+  option (rept) = { foo:"def" };
 
   option (eee) = V1;
 

diff --git a/desc/protoprint/testfiles/desc_test_complex-sorted-AND-multiline-style-comments.proto b/desc/protoprint/testfiles/desc_test_complex-sorted-AND-multiline-style-comments.proto
@@ -85,7 +85,7 @@ message Another {
       name: "s"
     >
   };
-  option (rept) = { foo:"def"  };
+  option (rept) = { foo:"def" };
 
   optional Test test = 1;
 

diff --git a/desc/protoprint/testfiles/desc_test_complex-sorted.proto b/desc/protoprint/testfiles/desc_test_complex-sorted.proto
@@ -85,7 +85,7 @@ message Another {
          name: "s"
       >
    };
-   option (rept) = { foo:"def"  };
+   option (rept) = { foo:"def" };
 
    optional Test test = 1;
 

diff --git a/desc/protoprint/testfiles/desc_test_complex-trailing-on-next-line.proto b/desc/protoprint/testfiles/desc_test_complex-trailing-on-next-line.proto
@@ -146,7 +146,7 @@ message Another {
       name: "s"
     >
   };
-  option (rept) = { foo:"def"  };
+  option (rept) = { foo:"def" };
 
   option (eee) = V1;
 

diff --git a/desc/protoprint/testfiles/test-non-files-compact.txt b/desc/protoprint/testfiles/test-non-files-compact.txt
@@ -74,7 +74,7 @@ message Request {
 // Service comment
 service RpcService {
   option deprecated = false;
-  option (.testprotos.sfubar) = { id:100 name:"bob"  };
+  option (.testprotos.sfubar) = { id:100 name:"bob" };
   option (.testprotos.sfubare) = VALUE;
   // Method comment
   rpc StreamingRpc ( stream .foo.bar.Request ) returns ( .foo.bar.Request );
@@ -294,7 +294,7 @@ extend .foo.bar.Request {
 // Service comment
 service RpcService {
   option deprecated = false;
-  option (.testprotos.sfubar) = { id:100 name:"bob"  };
+  option (.testprotos.sfubar) = { id:100 name:"bob" };
   option (.testprotos.sfubare) = VALUE;
   // Method comment
   rpc StreamingRpc ( stream .foo.bar.Request ) returns ( .foo.bar.Request );

diff --git a/desc/protoprint/testfiles/test-non-files-full.txt b/desc/protoprint/testfiles/test-non-files-full.txt
@@ -167,7 +167,7 @@ service /* service name */ RpcService {
   // that spans multiple lines
 
   // option that sets field
-  option (testprotos.sfubar) = { id:100 name:"bob"  };
+  option (testprotos.sfubar) = { id:100 name:"bob" };
 
   option deprecated = false; // DEPRECATED!
 
@@ -506,7 +506,7 @@ service /* service name */ RpcService {
   // that spans multiple lines
 
   // option that sets field
-  option (testprotos.sfubar) = { id:100 name:"bob"  };
+  option (testprotos.sfubar) = { id:100 name:"bob" };
 
   option deprecated = false; // DEPRECATED!
 

diff --git a/desc/protoprint/testfiles/test-preserve-comments.proto b/desc/protoprint/testfiles/test-preserve-comments.proto
@@ -166,7 +166,7 @@ service /* service name */ RpcService {
   // that spans multiple lines
 
   // option that sets field
-  option (testprotos.sfubar) = { id:100 name:"bob"  };
+  option (testprotos.sfubar) = { id:100 name:"bob" };
 
   option deprecated = false; // DEPRECATED!
 

diff --git a/desc/protoprint/testfiles/test-preserve-doc-comments.proto b/desc/protoprint/testfiles/test-preserve-doc-comments.proto
@@ -119,7 +119,7 @@ message AnEmptyMessage {
 
 // Service comment
 service RpcService {
-  option (testprotos.sfubar) = { id:100 name:"bob"  };
+  option (testprotos.sfubar) = { id:100 name:"bob" };
 
   option deprecated = false;