Port the comment and section span handling

Author: Zibi Braniecki

fluent/syntax/ftlstream.py

@@ -88,6 +88,21 @@ def is_number_start(self):
 
         return (cc >= 48 and cc <= 57) or cc == 45
 
+    def is_peek_next_line_comment(self):
+        if not self.current_peek_is('\n'):
+            return False
+
+        self.peek()
+
+        if self.current_peek_is('/'):
+            self.peek()
+            if self.current_peek_is('/'):
+                self.reset_peek()
+                return True
+
+        self.reset_peek()
+        return False
+
     def is_peek_next_line_variant_start(self):
         if not self.current_peek_is('\n'):
             return False

fluent/syntax/parser.py

@@ -50,6 +50,7 @@ def parse(self, source):
             else:
                 entries.append(entry)
 
+            ps.skip_inline_ws()
             ps.skip_blank_lines()
 
         res = ast.Resource(entries, comment)
@@ -90,6 +91,11 @@ def get_entry(self, ps):
         if ps.current_is('/'):
             comment = self.get_comment(ps)
 
+            # The Comment content doesn't include the trailing newline. Consume
+            # this newline here to be ready for the next entry.  undefined stands
+            # for EOF.
+            ps.expect_char('\n' if ps.current() else None)
+
         if ps.current_is('['):
             return self.get_section(ps, comment)
 
@@ -118,12 +124,11 @@ def until_eol(x):
                 content += ch
                 ch = ps.take_char(until_eol)
 
-            ps.next()
-
-            if ps.current_is('/'):
+            if ps.is_peek_next_line_comment():
                 content += '\n'
                 ps.next()
                 ps.expect_char('/')
+                ps.expect_char('/')
                 ps.take_char_if(' ')
             else:
                 break
@@ -144,10 +149,6 @@ def get_section(self, ps, comment):
         ps.expect_char(']')
         ps.expect_char(']')
 
-        ps.skip_inline_ws()
-
-        ps.expect_char('\n')
-
         return ast.Section(symb, comment)
 
     @with_span