Parse Sections as empty Group Comments

Author: stasm

fluent/syntax/parser.py

@@ -101,13 +101,12 @@ def get_entry(self, ps):
             ps.expect_char('\n' if ps.current() else None)
 
         if ps.current_is('['):
-            self.skip_section(ps)
-            if comment:
-                group_comment = ast.GroupComment(comment.content)
-                if self.with_spans:
-                    group_comment.span = comment.span
-                return group_comment
-            return None
+            group_comment = self.get_group_comment_from_section(ps, comment)
+            if comment and self.with_spans:
+                # The Group Comment should start where the section comment
+                # starts.
+                group_comment.span.start = comment.span.start
+            return group_comment
 
         if ps.is_entry_id_start() \
            and (comment is None or isinstance(comment, ast.Comment)):
@@ -185,7 +184,8 @@ def get_comment(self, ps):
         elif level == 2:
             return ast.ResourceComment(content)
 
-    def skip_section(self, ps):
+    @with_span
+    def get_group_comment_from_section(self, ps, comment):
         ps.expect_char('[')
         ps.expect_char('[')
 
@@ -198,8 +198,12 @@ def skip_section(self, ps):
         ps.expect_char(']')
         ps.expect_char(']')
 
-        ps.skip_inline_ws()
-        ps.next()
+        if comment:
+            return ast.GroupComment(comment.content)
+
+        # A Section without a comment is like an empty Group Comment.
+        # Semantically it ends the previous group and starts a new one.
+        return ast.GroupComment('')
 
     @with_span
     def get_message(self, ps, comment):

tests/syntax/fixtures_structure/section.json

@@ -1,6 +1,17 @@
 {
   "type": "Resource",
-  "body": [],
+  "body": [
+    {
+      "type": "GroupComment",
+      "annotations": [],
+      "content": "",
+      "span": {
+        "type": "Span",
+        "start": 1,
+        "end": 24
+      }
+    }
+  ],
   "span": {
     "type": "Span",
     "start": 0,

tests/syntax/fixtures_structure/section_with_comment.ftl

@@ -0,0 +1,2 @@
+// Comment
+[[ Section ]]

tests/syntax/fixtures_structure/section_with_comment.json

@@ -0,0 +1,20 @@
+{
+  "type": "Resource",
+  "body": [
+    {
+      "type": "GroupComment",
+      "annotations": [],
+      "content": "Comment",
+      "span": {
+        "type": "Span",
+        "start": 0,
+        "end": 24
+      }
+    }
+  ],
+  "span": {
+    "type": "Span",
+    "start": 0,
+    "end": 25
+  }
+}