Uplift more complete reference test fixtures.

Pike · Pike · commit 89e351b466e9 · 2019-09-09T19:13:50.000+02:00
This loops back to projectfluent/fluent#286.
diff --git a/fluent-bundle/test/fixtures_reference/messages.json b/fluent-bundle/test/fixtures_reference/messages.json
@@ -42,6 +42,20 @@
                 "attr1": "Attribute 1"
             }
         },
+        {
+            "id": "no-whitespace",
+            "value": "Value",
+            "attributes": {
+                "attr1": "Attribute 1"
+            }
+        },
+        {
+            "id": "extra-whitespace",
+            "value": "Value",
+            "attributes": {
+                "attr1": "Attribute 1"
+            }
+        },
         {
             "id": "key06",
             "value": [
diff --git a/fluent-bundle/test/fixtures_reference/select_expressions.json b/fluent-bundle/test/fixtures_reference/select_expressions.json
@@ -123,7 +123,7 @@
             "attributes": {}
         },
         {
-            "id": "invalid-selector-select-expression",
+            "id": "invalid-selector-nested-expression",
             "value": [
                 {
                     "type": "select",
@@ -147,7 +147,7 @@
             "attributes": {}
         },
         {
-            "id": "invalid-selector-nested-expression",
+            "id": "invalid-selector-select-expression",
             "value": [
                 {
                     "type": "select",
@@ -210,6 +210,35 @@
             ],
             "attributes": {}
         },
+        {
+            "id": "reduced-whitespace",
+            "value": [
+                {
+                    "type": "select",
+                    "selector": {
+                        "type": "func",
+                        "name": "FOO",
+                        "args": []
+                    },
+                    "variants": [
+                        {
+                            "key": {
+                                "type": "str",
+                                "value": "key"
+                            },
+                            "value": [
+                                {
+                                    "type": "str",
+                                    "value": ""
+                                }
+                            ]
+                        }
+                    ],
+                    "star": 0
+                }
+            ],
+            "attributes": {}
+        },
         {
             "id": "nested-select",
             "value": [
diff --git a/fluent-bundle/test/fixtures_reference/select_indent.json b/fluent-bundle/test/fixtures_reference/select_indent.json
@@ -85,6 +85,13 @@
                                 "value": "key"
                             },
                             "value": "Value"
+                        },
+                        {
+                            "key": {
+                                "type": "str",
+                                "value": "other"
+                            },
+                            "value": "Other"
                         }
                     ],
                     "star": 0
diff --git a/fluent-bundle/test/fixtures_reference/terms.json b/fluent-bundle/test/fixtures_reference/terms.json
@@ -30,6 +30,20 @@
             "attributes": {
                 "attr1": "Attribute 1"
             }
+        },
+        {
+            "id": "-term08",
+            "value": "Value",
+            "attributes": {
+                "attr": "Attribute"
+            }
+        },
+        {
+            "id": "-term09",
+            "value": "Value",
+            "attributes": {
+                "attr": "Attribute"
+            }
         }
     ]
 }
diff --git a/fluent-bundle/test/fixtures_reference/zero_length.json b/fluent-bundle/test/fixtures_reference/zero_length.json
@@ -0,0 +1,3 @@
+{
+    "body": []
+}
diff --git a/fluent-syntax/test/fixtures_reference/comments.ftl b/fluent-syntax/test/fixtures_reference/comments.ftl
@@ -9,7 +9,12 @@ foo = Foo
 -term = Term
 
 # Another standalone
-#
+# 
 #      with indent
 ## Group Comment
 ### Resource Comment
+
+# Errors
+#error
+##error
+###error
diff --git a/fluent-syntax/test/fixtures_reference/comments.json b/fluent-syntax/test/fixtures_reference/comments.json
@@ -58,6 +58,25 @@
         {
             "type": "ResourceComment",
             "content": "Resource Comment"
+        },
+        {
+            "type": "Comment",
+            "content": "Errors"
+        },
+        {
+            "type": "Junk",
+            "annotations": [],
+            "content": "#error\n"
+        },
+        {
+            "type": "Junk",
+            "annotations": [],
+            "content": "##error\n"
+        },
+        {
+            "type": "Junk",
+            "annotations": [],
+            "content": "###error\n"
         }
     ]
 }
diff --git a/fluent-syntax/test/fixtures_reference/escaped_characters.ftl b/fluent-syntax/test/fixtures_reference/escaped_characters.ftl
@@ -12,6 +12,9 @@ backslash-in-string = {"\\"}
 mismatched-quote = {"\\""}
 # ERROR Unknown escape
 unknown-escape = {"\x"}
+# ERROR Multiline literal
+invalid-multiline-literal = {"
+ "}
 
 ## Unicode escapes
 string-unicode-4digits = {"\u0041"}
diff --git a/fluent-syntax/test/fixtures_reference/escaped_characters.json b/fluent-syntax/test/fixtures_reference/escaped_characters.json
@@ -168,7 +168,16 @@
         {
             "type": "Junk",
             "annotations": [],
-            "content": "unknown-escape = {\"\\x\"}\n\n"
+            "content": "unknown-escape = {\"\\x\"}\n"
+        },
+        {
+            "type": "Comment",
+            "content": "ERROR Multiline literal"
+        },
+        {
+            "type": "Junk",
+            "annotations": [],
+            "content": "invalid-multiline-literal = {\"\n \"}\n\n"
         },
         {
             "type": "GroupComment",
diff --git a/fluent-syntax/test/fixtures_reference/messages.ftl b/fluent-syntax/test/fixtures_reference/messages.ftl
@@ -18,6 +18,12 @@ key04 =
 key05 =                
     .attr1 = Attribute 1
 
+no-whitespace=Value
+    .attr1=Attribute 1
+
+extra-whitespace    =  Value
+    .attr1   =      Attribute 1
+
 key06 = {""}
 
 # JUNK Missing value
diff --git a/fluent-syntax/test/fixtures_reference/messages.json b/fluent-syntax/test/fixtures_reference/messages.json
@@ -205,6 +205,76 @@
                 "content": "     <  whitespace  >"
             }
         },
+        {
+            "type": "Message",
+            "id": {
+                "type": "Identifier",
+                "name": "no-whitespace"
+            },
+            "value": {
+                "type": "Pattern",
+                "elements": [
+                    {
+                        "type": "TextElement",
+                        "value": "Value"
+                    }
+                ]
+            },
+            "attributes": [
+                {
+                    "type": "Attribute",
+                    "id": {
+                        "type": "Identifier",
+                        "name": "attr1"
+                    },
+                    "value": {
+                        "type": "Pattern",
+                        "elements": [
+                            {
+                                "type": "TextElement",
+                                "value": "Attribute 1"
+                            }
+                        ]
+                    }
+                }
+            ],
+            "comment": null
+        },
+        {
+            "type": "Message",
+            "id": {
+                "type": "Identifier",
+                "name": "extra-whitespace"
+            },
+            "value": {
+                "type": "Pattern",
+                "elements": [
+                    {
+                        "type": "TextElement",
+                        "value": "Value"
+                    }
+                ]
+            },
+            "attributes": [
+                {
+                    "type": "Attribute",
+                    "id": {
+                        "type": "Identifier",
+                        "name": "attr1"
+                    },
+                    "value": {
+                        "type": "Pattern",
+                        "elements": [
+                            {
+                                "type": "TextElement",
+                                "value": "Attribute 1"
+                            }
+                        ]
+                    }
+                }
+            ],
+            "comment": null
+        },
         {
             "type": "Message",
             "id": {
diff --git a/fluent-syntax/test/fixtures_reference/select_expressions.ftl b/fluent-syntax/test/fixtures_reference/select_expressions.ftl
@@ -22,13 +22,13 @@ invalid-selector-term-variant =
     }
 
 # ERROR Nested expressions are not valid selectors
-invalid-selector-select-expression =
+invalid-selector-nested-expression =
     { { 3 } ->
         *[key] default
     }
 
 # ERROR Select expressions are not valid selectors
-invalid-selector-nested-expression =
+invalid-selector-select-expression =
     { { $sel ->
         *[key] value
         } ->
@@ -40,6 +40,11 @@ empty-variant =
        *[key] {""}
     }
 
+reduced-whitespace =
+    {FOO()->
+       *[key] {""}
+    }
+
 nested-select =
     { $sel ->
        *[one] { $sel ->
diff --git a/fluent-syntax/test/fixtures_reference/select_expressions.json b/fluent-syntax/test/fixtures_reference/select_expressions.json
@@ -152,7 +152,7 @@
         {
             "type": "Junk",
             "annotations": [],
-            "content": "invalid-selector-select-expression =\n    { { 3 } ->\n        *[key] default\n    }\n\n"
+            "content": "invalid-selector-nested-expression =\n    { { 3 } ->\n        *[key] default\n    }\n\n"
         },
         {
             "type": "Comment",
@@ -161,7 +161,7 @@
         {
             "type": "Junk",
             "annotations": [],
-            "content": "invalid-selector-nested-expression =\n    { { $sel ->\n        *[key] value\n        } ->\n        *[key] default\n    }\n\n"
+            "content": "invalid-selector-select-expression =\n    { { $sel ->\n        *[key] value\n        } ->\n        *[key] default\n    }\n\n"
         },
         {
             "type": "Message",
@@ -212,6 +212,60 @@
             "attributes": [],
             "comment": null
         },
+        {
+            "type": "Message",
+            "id": {
+                "type": "Identifier",
+                "name": "reduced-whitespace"
+            },
+            "value": {
+                "type": "Pattern",
+                "elements": [
+                    {
+                        "type": "Placeable",
+                        "expression": {
+                            "type": "SelectExpression",
+                            "selector": {
+                                "type": "FunctionReference",
+                                "id": {
+                                    "type": "Identifier",
+                                    "name": "FOO"
+                                },
+                                "arguments": {
+                                    "type": "CallArguments",
+                                    "positional": [],
+                                    "named": []
+                                }
+                            },
+                            "variants": [
+                                {
+                                    "type": "Variant",
+                                    "key": {
+                                        "type": "Identifier",
+                                        "name": "key"
+                                    },
+                                    "value": {
+                                        "type": "Pattern",
+                                        "elements": [
+                                            {
+                                                "type": "Placeable",
+                                                "expression": {
+                                                    "value": "",
+                                                    "type": "StringLiteral"
+                                                }
+                                            }
+                                        ]
+                                    },
+                                    "default": true
+                                }
+                            ]
+                        }
+                    }
+                ]
+            },
+            "attributes": [],
+            "comment": null
+        },
         {
             "type": "Message",
             "id": {
diff --git a/fluent-syntax/test/fixtures_reference/select_indent.ftl b/fluent-syntax/test/fixtures_reference/select_indent.ftl
@@ -15,6 +15,7 @@ select-1tbs-indent = {
 select-allman-inline =
 { $selector ->
    *[key] Value
+    [other] Other
 }
 
 select-allman-newline =
diff --git a/fluent-syntax/test/fixtures_reference/select_indent.json b/fluent-syntax/test/fixtures_reference/select_indent.json
diff --git a/fluent-syntax/test/fixtures_reference/terms.ftl b/fluent-syntax/test/fixtures_reference/terms.ftl
diff --git a/fluent-syntax/test/fixtures_reference/terms.json b/fluent-syntax/test/fixtures_reference/terms.json
diff --git a/fluent-syntax/test/fixtures_reference/zero_length.ftl b/fluent-syntax/test/fixtures_reference/zero_length.ftl
diff --git a/fluent-syntax/test/fixtures_reference/zero_length.json b/fluent-syntax/test/fixtures_reference/zero_length.json

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,20 @@`
`30`	`30`	`"attributes": {`
`31`	`31`	`"attr1": "Attribute 1"`
`32`	`32`	`}`
	`33`	`+ },`
	`34`	`+ {`
	`35`	`+ "id": "-term08",`
	`36`	`+ "value": "Value",`
	`37`	`+ "attributes": {`
	`38`	`+ "attr": "Attribute"`
	`39`	`+ }`
	`40`	`+ },`
	`41`	`+ {`
	`42`	`+ "id": "-term09",`
	`43`	`+ "value": "Value",`
	`44`	`+ "attributes": {`
	`45`	`+ "attr": "Attribute"`
	`46`	`+ }`
`33`	`47`	`}`
`34`	`48`	`]`
`35`	`49`	`}`