handle last comment on last table field, fix boolangery#15

Author: boolangery

luaparser/builder.py

@@ -4,7 +4,7 @@
 from enum import Enum
 import ast
 import re
-from typing import List
+from typing import List, Tuple
 from antlr4.Token import Token
 
 
@@ -1251,7 +1251,7 @@ def parse_table_constructor(self, render_last_hidden=True) -> Table or bool:
     def parse_field_list(self) -> List[Field] or bool:
         field_list = []
         self.save()
-        field = self.parse_field()
+        field, _ = self.parse_field()
         if field:
             field_list.append(field)
             while True:
@@ -1260,16 +1260,17 @@ def parse_field_list(self) -> List[Field] or bool:
                     inline_com = self.get_inline_comment()
                     if inline_com:
                         field.comments.append(inline_com)
-                    field = self.parse_field()
+                    prev_field = field
+                    field, remaining_comments = self.parse_field()
                     if field:
                         field_list.append(field)
                         self.success()
                     else:
+                        prev_field.comments.extend(remaining_comments)
                         self.success()
                         self.success()
                         return field_list
                 else:
-
                     field.comments.extend(self.get_comments())
                     self.failure()
                     break
@@ -1278,7 +1279,7 @@ def parse_field_list(self) -> List[Field] or bool:
             return field_list
         return self.failure()
 
-    def parse_field(self) -> Field or bool:
+    def parse_field(self) -> Tuple[Field or bool, Comments]:
         self.save()
 
         if self.next_is_rc(Tokens.OBRACK):
@@ -1289,7 +1290,7 @@ def parse_field(self) -> Field or bool:
                     value = self.parse_expr()
                     if value:
                         self.success()
-                        return Field(key, value, comments, between_brackets=True)
+                        return Field(key, value, comments, between_brackets=True), comments
 
         self.failure_save()
         if self.next_is_rc(Tokens.NAME):
@@ -1299,17 +1300,17 @@ def parse_field(self) -> Field or bool:
                 value = self.parse_expr()
                 if value:
                     self.success()
-                    return Field(key, value, comments)
+                    return Field(key, value, comments), comments
 
         self.failure_save()
         comments = self.get_comments()
         value = self.parse_expr()
         if value:
             self.success()
             # noinspection PyTypeChecker
-            return Field(None, value, comments)  # Key will be set in parse_table_constructor
+            return Field(None, value, comments), []  # Key will be set in parse_table_constructor
 
-        return self.failure()
+        return self.failure(), comments
 
     def parse_field_sep(self) -> bool:
         self.save()

luaparser/tests/test_integration.py

@@ -1,7 +1,8 @@
-from luaparser.utils import tests
+import textwrap
+
 from luaparser import ast
 from luaparser.astnodes import *
-import textwrap
+from luaparser.utils import tests
 
 
 class IntegrationTestCase(tests.TestCase):
@@ -159,3 +160,22 @@ def test_cont_int_5(self):
         ]
         for node, exp in zip(nodes, expected_cls):
             self.assertIsInstance(node, exp)
+
+    # Comments are ignored if they are written after the last line of a table ending with a comma #15
+    def test_cont_int_6(self):
+        tree = ast.parse(textwrap.dedent("""
+            foo = {
+                mykey = "myvalue",
+                -- this comment is ignored if previous line ends with a comma
+            }
+            """))
+        exp = Chunk(Block([
+            Assign(
+                [Name('foo')],
+                [Table([
+                    Field(Name('mykey'), String("myvalue", delimiter=StringDelimiter.DOUBLE_QUOTE),
+                          [Comment('-- this comment is ignored if previous line ends with a comma')]),
+                ])],
+            )
+        ]))
+        self.assertEqual(exp, tree)