Merge pull request #140 from stasm/fix-compare-locales

Parser fixes required to update compare-locales to 0.6
projectfluent · Jan 31, 2018 · 7bc49e1 · 7bc49e1
2 parents 24585e6 + 59f8018
commit 7bc49e1
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 26 deletions.
diff --git a/fluent-syntax/src/parser.js b/fluent-syntax/src/parser.js
@@ -46,6 +46,7 @@ export default class FluentParser {
       'getVariant', 'getVariantName', 'getNumber', 'getPattern',
       'getTextElement', 'getPlaceable', 'getExpression',
       'getSelectorExpression', 'getCallArg', 'getString', 'getLiteral',
+      'getGroupCommentFromSection'
     ].forEach(
       name => this[name] = withSpan(this[name])
     );
@@ -133,11 +134,12 @@ export default class FluentParser {
     }
 
     if (ps.currentIs('[')) {
-      this.skipSection(ps);
-      if (comment) {
-        return new AST.GroupComment(comment.content);
+      const groupComment = this.getGroupCommentFromSection(ps, comment);
+      if (comment && this.withSpans) {
+        // The Group Comment should start where the section comment starts.
+        groupComment.span.start = comment.span.start;
       }
-      return null;
+      return groupComment;
     }
 
     if (ps.isEntryIDStart() && (!comment || comment.type === 'Comment')) {
@@ -233,7 +235,7 @@ export default class FluentParser {
     return new Comment(content);
   }
 
-  skipSection(ps) {
+  getGroupCommentFromSection(ps, comment) {
     ps.expectChar('[');
     ps.expectChar('[');
 
@@ -246,8 +248,13 @@ export default class FluentParser {
     ps.expectChar(']');
     ps.expectChar(']');
 
-    ps.skipInlineWS();
-    ps.next();
+    if (comment) {
+      return new 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 new AST.GroupComment('');
   }
 
   getMessage(ps, comment) {
@@ -289,7 +296,6 @@ export default class FluentParser {
   }
 
   getAttribute(ps) {
-    ps.expectIndent();
     ps.expectChar('.');
 
     const key = this.getIdentifier(ps);
@@ -310,6 +316,7 @@ export default class FluentParser {
     const attrs = [];
 
     while (true) {
+      ps.expectIndent();
       const attr = this.getAttribute(ps);
       attrs.push(attr);
 
@@ -353,8 +360,6 @@ export default class FluentParser {
   }
 
   getVariant(ps, hasDefault) {
-    ps.expectIndent();
-
     let defaultIndex = false;
 
     if (ps.currentIs('*')) {
@@ -386,6 +391,7 @@ export default class FluentParser {
     let hasDefault = false;
 
     while (true) {
+      ps.expectIndent();
       const variant = this.getVariant(ps, hasDefault);
 
       if (variant.default) {

diff --git a/fluent-syntax/test/fixtures_structure/elements_indent.json b/fluent-syntax/test/fixtures_structure/elements_indent.json
@@ -126,7 +126,7 @@
           },
           "span": {
             "type": "Span",
-            "start": 37,
+            "start": 42,
             "end": 61
           }
         }

diff --git a/fluent-syntax/test/fixtures_structure/section.json b/fluent-syntax/test/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,

diff --git a/fluent-syntax/test/fixtures_structure/section_with_comment.ftl b/fluent-syntax/test/fixtures_structure/section_with_comment.ftl
@@ -0,0 +1,2 @@
+// Comment
+[[ Section ]]
diff --git a/fluent-syntax/test/fixtures_structure/section_with_comment.json b/fluent-syntax/test/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
+  }
+}
diff --git a/fluent-syntax/test/fixtures_structure/sparse-messages.json b/fluent-syntax/test/fixtures_structure/sparse-messages.json
@@ -86,7 +86,7 @@
           },
           "span": {
             "type": "Span",
-            "start": 23,
+            "start": 30,
             "end": 47
           }
         }
@@ -162,7 +162,7 @@
           },
           "span": {
             "type": "Span",
-            "start": 102,
+            "start": 110,
             "end": 125
           }
         }
@@ -267,7 +267,7 @@
                   "default": false,
                   "span": {
                     "type": "Span",
-                    "start": 152,
+                    "start": 164,
                     "end": 173
                   }
                 },
@@ -304,7 +304,7 @@
                   "default": true,
                   "span": {
                     "type": "Span",
-                    "start": 173,
+                    "start": 186,
                     "end": 196
                   }
                 }

diff --git a/fluent-syntax/test/fixtures_structure/syntax_zero_four.json b/fluent-syntax/test/fixtures_structure/syntax_zero_four.json
@@ -47,7 +47,7 @@
           },
           "span": {
             "type": "Span",
-            "start": 4,
+            "start": 9,
             "end": 24
           }
         }
@@ -105,7 +105,7 @@
           },
           "span": {
             "type": "Span",
-            "start": 30,
+            "start": 35,
             "end": 50
           }
         },
@@ -141,7 +141,7 @@
           },
           "span": {
             "type": "Span",
-            "start": 50,
+            "start": 55,
             "end": 70
           }
         }

diff --git a/fluent-syntax/test/fixtures_structure/term.json b/fluent-syntax/test/fixtures_structure/term.json
@@ -55,7 +55,7 @@
                   "default": true,
                   "span": {
                     "type": "Span",
-                    "start": 19,
+                    "start": 27,
                     "end": 48
                   }
                 },
@@ -92,7 +92,7 @@
                   "default": false,
                   "span": {
                     "type": "Span",
-                    "start": 48,
+                    "start": 57,
                     "end": 78
                   }
                 }
@@ -149,7 +149,7 @@
           },
           "span": {
             "type": "Span",
-            "start": 84,
+            "start": 89,
             "end": 108
           }
         }
@@ -347,7 +347,7 @@
                   "default": false,
                   "span": {
                     "type": "Span",
-                    "start": 220,
+                    "start": 229,
                     "end": 289
                   }
                 },
@@ -409,7 +409,7 @@
                   "default": false,
                   "span": {
                     "type": "Span",
-                    "start": 289,
+                    "start": 298,
                     "end": 358
                   }
                 },
@@ -480,7 +480,7 @@
                   "default": true,
                   "span": {
                     "type": "Span",
-                    "start": 358,
+                    "start": 366,
                     "end": 431
                   }
                 }

diff --git a/fluent-syntax/test/fixtures_structure/variant_with_empty_pattern.json b/fluent-syntax/test/fixtures_structure/variant_with_empty_pattern.json
@@ -71,7 +71,7 @@
                   "default": true,
                   "span": {
                     "type": "Span",
-                    "start": 17,
+                    "start": 25,
                     "end": 36
                   }
                 }

diff --git a/fluent/test/fixtures_structure/section_with_comment.json b/fluent/test/fixtures_structure/section_with_comment.json
@@ -0,0 +1 @@
+{}