Trim trailing newline from Comment spans

Author: stasm

fluent/syntax/ftlstream.py

@@ -70,6 +70,20 @@ 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

@@ -90,6 +90,10 @@ 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 to be ready for the next entry. None stands for EOF.
+            ps.expect_char('\n' if ps.current() else None)
+
         if ps.current_is('['):
             return self.get_section(ps, comment)
 
@@ -118,12 +122,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

tests/syntax/fixtures_structure/resource_comment.json

@@ -8,7 +8,7 @@
     "span": {
       "type": "Span",
       "start": 0,
-      "end": 53
+      "end": 52
     }
   },
   "span": {

tests/syntax/fixtures_structure/resource_comment_trailing_line.json

@@ -8,7 +8,7 @@
     "span": {
       "type": "Span",
       "start": 0,
-      "end": 53
+      "end": 52
     }
   },
   "span": {

tests/syntax/fixtures_structure/standalone_comment.json

@@ -48,7 +48,7 @@
       "span": {
         "type": "Span",
         "start": 13,
-        "end": 45
+        "end": 44
       }
     }
   ],