Copy fixtures from fluent.js

stasm · stasm · commit eccbccec070f · 2018-10-15T14:03:27.000+02:00
diff --git a/tests/syntax/fixtures_behavior/attribute_starts_from_nl.ftl b/tests/syntax/fixtures_behavior/attribute_starts_from_nl.ftl
@@ -1,3 +1,2 @@
 foo = Value
 .attr = Value 2
-# ~ERROR E0002, pos 12
diff --git a/tests/syntax/fixtures_behavior/indent.ftl b/tests/syntax/fixtures_behavior/indent.ftl
@@ -3,13 +3,9 @@
 
 key2 = {
 a }
-# ~ERROR E0014, pos 20
-# ~ERROR E0005, pos 23, args "a"
 
 key3 = { a
 }
-# ~ERROR E0003, pos 36, args "}"
 
 key4 = {
 { a }}
-# ~ERROR E0014, pos 48
diff --git a/tests/syntax/fixtures_behavior/placeable_in_placeable.ftl b/tests/syntax/fixtures_behavior/placeable_in_placeable.ftl
@@ -8,7 +8,7 @@ key2 = {  { foo }  }
 #   }
 
 key4 = {  { foo }
-# ~ERROR E0003, pos 93, args "}"
+# ~ERROR E0003, pos 96, args "}"
 
 
 # key5 = { foo } }
diff --git a/tests/syntax/fixtures_behavior/placeable_without_close_bracket.ftl b/tests/syntax/fixtures_behavior/placeable_without_close_bracket.ftl
@@ -1,3 +1,3 @@
 key = { $num
 
-# ~ERROR E0003, pos 12, args "}"
+# ~ERROR E0003, pos 14, args "}"
diff --git a/tests/syntax/fixtures_behavior/second_attribute_starts_from_nl.ftl b/tests/syntax/fixtures_behavior/second_attribute_starts_from_nl.ftl
@@ -1,4 +1,3 @@
 key = Value
     .label = Value
 .accesskey = K
-# ~ERROR E0002, pos 31
diff --git a/tests/syntax/fixtures_behavior/section_with_no_nl_after_it.ftl b/tests/syntax/fixtures_behavior/section_with_no_nl_after_it.ftl
@@ -1 +1 @@
-[[ This is a correct section ]]
+[[ This is a correct section ]]
diff --git a/tests/syntax/fixtures_behavior/selector_expression_ends_abruptly.ftl b/tests/syntax/fixtures_behavior/selector_expression_ends_abruptly.ftl
@@ -1,2 +1,2 @@
 key = { $foo ->
-# ~ERROR E0003, pos 16, args " "
+# ~ERROR E0003, pos 16, args "["
diff --git a/tests/syntax/fixtures_behavior/unclosed_empty_placeable_error.ftl b/tests/syntax/fixtures_behavior/unclosed_empty_placeable_error.ftl
@@ -1,2 +1,2 @@
 bar = Bar {
-# ~ERROR E0014, pos 11
+# ~ERROR E0014, pos 12
diff --git a/tests/syntax/fixtures_behavior/variant_ends_abruptly.ftl b/tests/syntax/fixtures_behavior/variant_ends_abruptly.ftl
@@ -1,3 +1,3 @@
 key = { $foo ->
     *[
-# ~ERROR E0004, pos 22, args "a-zA-Z"
+# ~ERROR E0013, pos 23
diff --git a/tests/syntax/fixtures_behavior/variant_lists.ftl b/tests/syntax/fixtures_behavior/variant_lists.ftl
@@ -1,10 +1,10 @@
-# ~ERROR E0014, pos 16
+# ~ERROR E0014, pos 25
 message1 =
     {
         *[one] One
     }
 
-# ~ERROR E0023, pos 118
+# ~ERROR E0023, pos 123
 message2 =
     { $sel ->
         *[one] {
@@ -24,7 +24,7 @@ message2 =
          }
     }
 
-# ~ERROR E0023, pos 313
+# ~ERROR E0023, pos 318
 -term3 =
     { $sel ->
         *[one] {
diff --git a/tests/syntax/fixtures_behavior/variant_starts_from_nl.ftl b/tests/syntax/fixtures_behavior/variant_starts_from_nl.ftl
@@ -1,4 +1,3 @@
 -term = {
 *[one] Value
     }
-# ~ERROR E0014, pos 9
diff --git a/tests/syntax/fixtures_behavior/variant_with_leading_space_in_name.ftl b/tests/syntax/fixtures_behavior/variant_with_leading_space_in_name.ftl
@@ -1,4 +1,3 @@
 -term = {
         *[  one] Foo
     }
-# ~ERROR E0004, pos 20, args "a-zA-Z"
diff --git a/tests/syntax/fixtures_behavior/variant_with_symbol_with_space.ftl b/tests/syntax/fixtures_behavior/variant_with_symbol_with_space.ftl
@@ -1,3 +1,4 @@
+# ~ERROR E0003, pos 24, args "]"
 -term = {
         *[New York] Nowy Jork
     }
diff --git a/tests/syntax/fixtures_structure/elements_indent.json b/tests/syntax/fixtures_structure/elements_indent.json
@@ -31,34 +31,49 @@
           "end": 9
         }
       },
-      "attributes": [],
-      "comment": null,
-      "span": {
-        "type": "Span",
-        "start": 0,
-        "end": 9
-      }
-    },
-    {
-      "type": "Junk",
-      "annotations": [
+      "attributes": [
         {
-          "type": "Annotation",
-          "code": "E0002",
-          "args": [],
-          "message": "Expected an entry start",
+          "type": "Attribute",
+          "id": {
+            "type": "Identifier",
+            "name": "attr",
+            "span": {
+              "type": "Span",
+              "start": 11,
+              "end": 15
+            }
+          },
+          "value": {
+            "type": "Pattern",
+            "elements": [
+              {
+                "type": "TextElement",
+                "value": "Foo Attr",
+                "span": {
+                  "type": "Span",
+                  "start": 18,
+                  "end": 26
+                }
+              }
+            ],
+            "span": {
+              "type": "Span",
+              "start": 18,
+              "end": 26
+            }
+          },
           "span": {
             "type": "Span",
             "start": 10,
-            "end": 10
+            "end": 26
           }
         }
       ],
-      "content": ".attr = Foo Attr\n\n",
+      "comment": null,
       "span": {
         "type": "Span",
-        "start": 10,
-        "end": 28
+        "start": 0,
+        "end": 26
       }
     },
     {
@@ -127,35 +142,49 @@
             "start": 42,
             "end": 61
           }
-        }
-      ],
-      "comment": null,
-      "span": {
-        "type": "Span",
-        "start": 28,
-        "end": 61
-      }
-    },
-    {
-      "type": "Junk",
-      "annotations": [
+        },
         {
-          "type": "Annotation",
-          "code": "E0002",
-          "args": [],
-          "message": "Expected an entry start",
+          "type": "Attribute",
+          "id": {
+            "type": "Identifier",
+            "name": "attr2",
+            "span": {
+              "type": "Span",
+              "start": 63,
+              "end": 68
+            }
+          },
+          "value": {
+            "type": "Pattern",
+            "elements": [
+              {
+                "type": "TextElement",
+                "value": "Bar Attr 2",
+                "span": {
+                  "type": "Span",
+                  "start": 71,
+                  "end": 81
+                }
+              }
+            ],
+            "span": {
+              "type": "Span",
+              "start": 71,
+              "end": 81
+            }
+          },
           "span": {
             "type": "Span",
             "start": 62,
-            "end": 62
+            "end": 81
           }
         }
       ],
-      "content": ".attr2 = Bar Attr 2\n",
+      "comment": null,
       "span": {
         "type": "Span",
-        "start": 62,
-        "end": 82
+        "start": 28,
+        "end": 81
       }
     }
   ],
diff --git a/tests/syntax/fixtures_structure/leading_dots.json b/tests/syntax/fixtures_structure/leading_dots.json
@@ -745,7 +745,7 @@
                 {
                   "type": "Variant",
                   "key": {
-                    "type": "VariantName",
+                    "type": "Identifier",
                     "name": "one",
                     "span": {
                       "type": "Span",
@@ -782,7 +782,7 @@
                 {
                   "type": "Variant",
                   "key": {
-                    "type": "VariantName",
+                    "type": "Identifier",
                     "name": "other",
                     "span": {
                       "type": "Span",
diff --git a/tests/syntax/fixtures_structure/message_with_empty_pattern.json b/tests/syntax/fixtures_structure/message_with_empty_pattern.json
@@ -46,8 +46,8 @@
           "message": "Expected message \"key2\" to have a value or attributes",
           "span": {
             "type": "Span",
-            "start": 344,
-            "end": 344
+            "start": 343,
+            "end": 343
           }
         }
       ],
diff --git a/tests/syntax/fixtures_structure/sparse-messages.json b/tests/syntax/fixtures_structure/sparse-messages.json
@@ -248,7 +248,7 @@
                 {
                   "type": "Variant",
                   "key": {
-                    "type": "VariantName",
+                    "type": "Identifier",
                     "name": "one",
                     "span": {
                       "type": "Span",
@@ -285,7 +285,7 @@
                 {
                   "type": "Variant",
                   "key": {
-                    "type": "VariantName",
+                    "type": "Identifier",
                     "name": "two",
                     "span": {
                       "type": "Span",
@@ -364,7 +364,7 @@
           {
             "type": "Variant",
             "key": {
-              "type": "VariantName",
+              "type": "Identifier",
               "name": "one",
               "span": {
                 "type": "Span",
@@ -430,7 +430,7 @@
           {
             "type": "Variant",
             "key": {
-              "type": "VariantName",
+              "type": "Identifier",
               "name": "one",
               "span": {
                 "type": "Span",
diff --git a/tests/syntax/fixtures_structure/term.json b/tests/syntax/fixtures_structure/term.json
@@ -18,7 +18,7 @@
           {
             "type": "Variant",
             "key": {
-              "type": "VariantName",
+              "type": "Identifier",
               "name": "nominative",
               "span": {
                 "type": "Span",
@@ -55,7 +55,7 @@
           {
             "type": "Variant",
             "key": {
-              "type": "VariantName",
+              "type": "Identifier",
               "name": "accusative",
               "span": {
                 "type": "Span",
@@ -186,7 +186,7 @@
                 }
               },
               "key": {
-                "type": "VariantName",
+                "type": "Identifier",
                 "name": "accusative",
                 "span": {
                   "type": "Span",
@@ -286,7 +286,7 @@
                 {
                   "type": "Variant",
                   "key": {
-                    "type": "VariantName",
+                    "type": "Identifier",
                     "name": "masculine",
                     "span": {
                       "type": "Span",
@@ -348,7 +348,7 @@
                 {
                   "type": "Variant",
                   "key": {
-                    "type": "VariantName",
+                    "type": "Identifier",
                     "name": "feminine",
                     "span": {
                       "type": "Span",
@@ -410,7 +410,7 @@
                 {
                   "type": "Variant",
                   "key": {
-                    "type": "VariantName",
+                    "type": "Identifier",
                     "name": "other",
                     "span": {
                       "type": "Span",
diff --git a/tests/syntax/fixtures_structure/variant_with_empty_pattern.json b/tests/syntax/fixtures_structure/variant_with_empty_pattern.json
@@ -32,7 +32,7 @@
                 {
                   "type": "Variant",
                   "key": {
-                    "type": "VariantName",
+                    "type": "Identifier",
                     "name": "one",
                     "span": {
                       "type": "Span",

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`foo = Value`
`2`	`2`	`.attr = Value 2`
`3`		`-# ~ERROR E0002, pos 12`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`key = { $num`
`2`	`2`
`3`		`-# ~ERROR E0003, pos 12, args "}"`
	`3`	`+# ~ERROR E0003, pos 14, args "}"`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-[[ This is a correct section ]]`
	`1`	`+[[ This is a correct section ]]`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`key = { $foo ->`
`2`		`-# ~ERROR E0003, pos 16, args " "`
	`2`	`+# ~ERROR E0003, pos 16, args "["`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`bar = Bar {`
`2`		`-# ~ERROR E0014, pos 11`
	`2`	`+# ~ERROR E0014, pos 12`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`		`-# ~ERROR E0014, pos 16`
	`1`	`+# ~ERROR E0014, pos 25`
`2`	`2`	`message1 =`
`3`	`3`	`{`
`4`	`4`	`*[one] One`
`5`	`5`	`}`
`6`	`6`
`7`		`-# ~ERROR E0023, pos 118`
	`7`	`+# ~ERROR E0023, pos 123`
`8`	`8`	`message2 =`
`9`	`9`	`{ $sel ->`
`10`	`10`	`*[one] {`
`@@ -24,7 +24,7 @@ message2 =`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`-# ~ERROR E0023, pos 313`
	`27`	`+# ~ERROR E0023, pos 318`
`28`	`28`	`-term3 =`
`29`	`29`	`{ $sel ->`
`30`	`30`	`*[one] {`