Support comments at the end of a proto file (#907)

anz-bank · Jan 8, 2024 · 54b376c · 54b376c
1 parent 0a0ae64
commit 54b376c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/internal/bundles/assets/import_proto_cli.arraiz b/internal/bundles/assets/import_proto_cli.arraiz
diff --git a/pkg/importer/proto/proto_parser.arrai b/pkg/importer/proto/proto_parser.arrai
@@ -7,7 +7,7 @@ let (:includeImport, :primitiveTypes, ...) = //{./util};
 # https://developers.google.com/protocol-buffers/docs/reference/proto2-spec
 let grammar = {://grammar.lang.wbnf:
 
-file            -> c* syntax stmt=(import | package | option | topLevelDef | emptyStatement)* \n*;
+file            -> c* syntax stmt=(import | package | option | topLevelDef | emptyStatement)* c* \n*;
 
 syntax          -> "syntax" "=" quote proto quote ";" ($ | c)?;
 

diff --git a/pkg/importer/proto/proto_parser_test.arrai b/pkg/importer/proto/proto_parser_test.arrai
@@ -87,7 +87,9 @@ let (:evalConstant, :parseFile, ...) = //{./proto_parser};
                             // Comment
                         ]
                         // Comment
-                    };`);
+                    };
+                    // Comment
+                `);
                 let expected = {'(foo.java_package).bar': (fields: {'foo': [(s: 'bar')]})};
                 let actual = file.options;
                 //test.assert.equal(expected, actual),