Implement the legalizer

experimental/parser/testdata/parser/def/bare_bodies.proto

@@ -0,0 +1,30 @@
+// Copyright 2020-2024 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto2";
+
+package test;
+
+message M {
+    int32 x = 1;
+    {
+        int32 y = 2;
+    }
+}
+
+{
+    message N {
+        int32 y = 2;
+    }
+}

experimental/parser/testdata/parser/def/bare_bodies.proto.yaml

@@ -0,0 +1,28 @@
+decls:
+  - syntax: { kind: KIND_SYNTAX, value.literal.string_value: "proto2" }
+  - package.path.components: [{ ident: "test" }]
+  - def:
+      kind: KIND_MESSAGE
+      name.components: [{ ident: "M" }]
+      body.decls:
+        - def:
+            kind: KIND_FIELD
+            name.components: [{ ident: "x" }]
+            type.path.components: [{ ident: "int32" }]
+            value.literal.int_value: 1
+        - body.decls:
+            - def:
+                kind: KIND_FIELD
+                name.components: [{ ident: "y" }]
+                type.path.components: [{ ident: "int32" }]
+                value.literal.int_value: 2
+  - body.decls:
+      - def:
+          kind: KIND_MESSAGE
+          name.components: [{ ident: "N" }]
+          body.decls:
+            - def:
+                kind: KIND_FIELD
+                name.components: [{ ident: "y" }]
+                type.path.components: [{ ident: "int32" }]
+                value.literal.int_value: 2

experimental/parser/testdata/parser/import/in_message.proto

@@ -0,0 +1,25 @@
+// Copyright 2020-2024 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto2";
+
+package test;
+
+message M {
+    import "foo.proto";
+    import public "foo.proto";
+    import weak "foo.proto";
+
+    import foo.proto;
+}

experimental/parser/testdata/parser/import/in_message.proto.yaml

@@ -0,0 +1,15 @@
+decls:
+  - syntax: { kind: KIND_SYNTAX, value.literal.string_value: "proto2" }
+  - package.path.components: [{ ident: "test" }]
+  - def:
+      kind: KIND_MESSAGE
+      name.components: [{ ident: "M" }]
+      body.decls:
+        - import.import_path.literal.string_value: "foo.proto"
+        - import:
+            modifier: MODIFIER_PUBLIC
+            import_path.literal.string_value: "foo.proto"
+        - import:
+            modifier: MODIFIER_WEAK
+            import_path.literal.string_value: "foo.proto"
+        - import.import_path.path.components: [{ ident: "foo" }, { ident: "proto", separator: SEPARATOR_DOT }]

experimental/parser/testdata/parser/import/repeated.proto

@@ -17,6 +17,6 @@ syntax = "proto2";
 package test;
 
 import "foo.proto";
-import "foo.proto"; // Second
+import "foo\x2eproto";
 
-import "foo\x2eproto";
+import "foo.proto"; // This should not trip the diagnostic again.

experimental/parser/testdata/parser/method/bad_type.proto

@@ -0,0 +1,28 @@
+// Copyright 2020-2024 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto2";
+
+package test;
+
+service Foo {
+    rpc Bar1(optional foo.Bar) returns (foo.Bar);
+    rpc Bar2(foo.Bar) returns (repeated foo.Bar);
+    rpc Bar2(foo.Bar) returns repeated foo.Bar;
+    rpc Bar3(map<string, foo.Bar>) returns (foo.Bar);
+    rpc Bar4(string, foo.Bar) returns (foo.Bar);
+    rpc Bar5(foo.Bar) returns (foo.Bar, stream string);
+    rpc Bar6(stream repeated foo.Bar) returns (foo.Bar);
+    rpc Bar7(stream map<string, foo.Bar>) returns (foo.Bar);
+}

experimental/parser/testdata/parser/method/bad_type.proto.stderr.txt

@@ -0,0 +1,7 @@
+error: missing `(...)` around method return type
+  --> testdata/parser/method/bad_type.proto:22:31
+   | 
+22 |     rpc Bar2(foo.Bar) returns repeated foo.Bar;
+   |                               ^^^^^^^^^^^^^^^^ help: replace this with `(repeated foo.Bar)`
+
+encountered 1 error

experimental/parser/testdata/parser/method/bad_type.proto.yaml

@@ -0,0 +1,101 @@
+decls:
+  - syntax: { kind: KIND_SYNTAX, value.literal.string_value: "proto2" }
+  - package.path.components: [{ ident: "test" }]
+  - def:
+      kind: KIND_SERVICE
+      name.components: [{ ident: "Foo" }]
+      body.decls:
+        - def:
+            kind: KIND_METHOD
+            name.components: [{ ident: "Bar1" }]
+            signature:
+              inputs:
+                - prefixed:
+                    prefix: PREFIX_OPTIONAL
+                    type.path.components: [{ ident: "foo" }, { ident: "Bar", separator: SEPARATOR_DOT }]
+              outputs:
+                - path.components: [{ ident: "foo" }, { ident: "Bar", separator: SEPARATOR_DOT }]
+        - def:
+            kind: KIND_METHOD
+            name.components: [{ ident: "Bar2" }]
+            signature:
+              inputs:
+                - path.components: [{ ident: "foo" }, { ident: "Bar", separator: SEPARATOR_DOT }]
+              outputs:
+                - prefixed:
+                    prefix: PREFIX_REPEATED
+                    type.path.components: [{ ident: "foo" }, { ident: "Bar", separator: SEPARATOR_DOT }]
+        - def:
+            kind: KIND_METHOD
+            name.components: [{ ident: "Bar2" }]
+            signature:
+              inputs:
+                - path.components: [{ ident: "foo" }, { ident: "Bar", separator: SEPARATOR_DOT }]
+              outputs:
+                - prefixed:
+                    prefix: PREFIX_REPEATED
+                    type.path.components: [{ ident: "foo" }, { ident: "Bar", separator: SEPARATOR_DOT }]
+        - def:
+            kind: KIND_METHOD
+            name.components: [{ ident: "Bar3" }]
+            signature:
+              inputs:
+                - generic:
+                    path.components: [{ ident: "map" }]
+                    args:
+                      - path.components: [{ ident: "string" }]
+                      - path.components:
+                          - ident: "foo"
+                          - { ident: "Bar", separator: SEPARATOR_DOT }
+              outputs:
+                - path.components: [{ ident: "foo" }, { ident: "Bar", separator: SEPARATOR_DOT }]
+        - def:
+            kind: KIND_METHOD
+            name.components: [{ ident: "Bar4" }]
+            signature:
+              inputs:
+                - path.components: [{ ident: "string" }]
+                - path.components: [{ ident: "foo" }, { ident: "Bar", separator: SEPARATOR_DOT }]
+              outputs:
+                - path.components: [{ ident: "foo" }, { ident: "Bar", separator: SEPARATOR_DOT }]
+        - def:
+            kind: KIND_METHOD
+            name.components: [{ ident: "Bar5" }]
+            signature:
+              inputs:
+                - path.components: [{ ident: "foo" }, { ident: "Bar", separator: SEPARATOR_DOT }]
+              outputs:
+                - path.components: [{ ident: "foo" }, { ident: "Bar", separator: SEPARATOR_DOT }]
+                - prefixed:
+                    prefix: PREFIX_STREAM
+                    type.path.components: [{ ident: "string" }]
+        - def:
+            kind: KIND_METHOD
+            name.components: [{ ident: "Bar6" }]
+            signature:
+              inputs:
+                - prefixed:
+                    prefix: PREFIX_STREAM
+                    type.prefixed:
+                      prefix: PREFIX_REPEATED
+                      type.path.components:
+                        - ident: "foo"
+                        - { ident: "Bar", separator: SEPARATOR_DOT }
+              outputs:
+                - path.components: [{ ident: "foo" }, { ident: "Bar", separator: SEPARATOR_DOT }]
+        - def:
+            kind: KIND_METHOD
+            name.components: [{ ident: "Bar7" }]
+            signature:
+              inputs:
+                - prefixed:
+                    prefix: PREFIX_STREAM
+                    type.generic:
+                      path.components: [{ ident: "map" }]
+                      args:
+                        - path.components: [{ ident: "string" }]
+                        - path.components:
+                            - ident: "foo"
+                            - { ident: "Bar", separator: SEPARATOR_DOT }
+              outputs:
+                - path.components: [{ ident: "foo" }, { ident: "Bar", separator: SEPARATOR_DOT }]

experimental/parser/testdata/parser/method/incomplete.proto

@@ -0,0 +1,27 @@
+// Copyright 2020-2024 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto2";
+
+package test;
+
+service Foo {
+    rpc Bar1(foo.Bar) returns foo.Bar;
+    rpc Bar2(foo.Bar);
+    rpc Bar3 returns (foo.Bar);
+    rpc Bar4(foo.Bar) returns () {}
+    rpc Bar5() returns (stream foo.Bar);
+    rpc Bar6() returns;
+    rpc Bar7() returns stream foo.Bar;
+}

experimental/parser/testdata/parser/method/incomplete.proto.stderr.txt

@@ -0,0 +1,19 @@
+error: missing `(...)` around method return type
+  --> testdata/parser/method/incomplete.proto:20:31
+   | 
+20 |     rpc Bar1(foo.Bar) returns foo.Bar;
+   |                               ^^^^^^^ help: replace this with `(foo.Bar)`
+
+error: unexpected `;` after `returns`
+  --> testdata/parser/method/incomplete.proto:25:23
+   | 
+25 |     rpc Bar6() returns;
+   |                       ^ expected `(`
+
+error: missing `(...)` around method return type
+  --> testdata/parser/method/incomplete.proto:26:24
+   | 
+26 |     rpc Bar7() returns stream foo.Bar;
+   |                        ^^^^^^^^^^^^^^ help: replace this with `(stream foo.Bar)`
+
+encountered 3 errors

experimental/parser/testdata/parser/method/incomplete.proto.yaml

@@ -0,0 +1,49 @@
+decls:
+  - syntax: { kind: KIND_SYNTAX, value.literal.string_value: "proto2" }
+  - package.path.components: [{ ident: "test" }]
+  - def:
+      kind: KIND_SERVICE
+      name.components: [{ ident: "Foo" }]
+      body.decls:
+        - def:
+            kind: KIND_METHOD
+            name.components: [{ ident: "Bar1" }]
+            signature:
+              inputs:
+                - path.components: [{ ident: "foo" }, { ident: "Bar", separator: SEPARATOR_DOT }]
+              outputs:
+                - path.components: [{ ident: "foo" }, { ident: "Bar", separator: SEPARATOR_DOT }]
+        - def:
+            kind: KIND_METHOD
+            name.components: [{ ident: "Bar2" }]
+            signature.inputs:
+              - path.components: [{ ident: "foo" }, { ident: "Bar", separator: SEPARATOR_DOT }]
+        - def:
+            kind: KIND_METHOD
+            name.components: [{ ident: "Bar3" }]
+            signature.outputs:
+              - path.components: [{ ident: "foo" }, { ident: "Bar", separator: SEPARATOR_DOT }]
+        - def:
+            kind: KIND_METHOD
+            name.components: [{ ident: "Bar4" }]
+            signature.inputs:
+              - path.components: [{ ident: "foo" }, { ident: "Bar", separator: SEPARATOR_DOT }]
+            body: {}
+        - def:
+            kind: KIND_METHOD
+            name.components: [{ ident: "Bar5" }]
+            signature.outputs:
+              - prefixed:
+                  prefix: PREFIX_STREAM
+                  type.path.components: [{ ident: "foo" }, { ident: "Bar", separator: SEPARATOR_DOT }]
+        - def:
+            kind: KIND_METHOD
+            name.components: [{ ident: "Bar6" }]
+            signature: {}
+        - def:
+            kind: KIND_METHOD
+            name.components: [{ ident: "Bar7" }]
+            signature.outputs:
+              - prefixed:
+                  prefix: PREFIX_STREAM
+                  type.path.components: [{ ident: "foo" }, { ident: "Bar", separator: SEPARATOR_DOT }]

experimental/parser/testdata/parser/method/ok.proto

@@ -0,0 +1,25 @@
+// Copyright 2020-2024 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto2";
+
+package test;
+
+service Foo {
+    rpc Bar1(foo.Bar) returns (foo.Bar);
+    rpc Bar2(foo.Bar) returns (foo.Bar) {}
+    rpc Bar3(stream foo.Bar) returns (foo.Bar);
+    rpc Bar4(foo.Bar) returns (stream foo.Bar) {}
+    rpc Bar5(stream foo.Bar) returns (stream foo.Bar);
+}