Forbid the closing brace in text (#198)

Author: stasm

spec/fluent.ebnf

@@ -102,8 +102,9 @@ any_char            ::= [\\u{9}\\u{20}-\\u{D7FF}\\u{E000}-\\u{FFFD}]
  * new line.
  */
 special_text_char   ::= "{"
+                      | "}"
 text_char           ::= any_char - special_text_char
-indented_char       ::= text_char - "}" - "[" - "*" - "."
+indented_char       ::= text_char - "[" - "*" - "."
 
 /* String literals
  *

syntax/grammar.mjs

@@ -397,7 +397,9 @@ let any_char =
  */
 
 let special_text_char =
-    string("{");
+    either(
+        string("{"),
+        string("}"));
 
 let text_char =
     and(
@@ -409,7 +411,6 @@ let indented_char =
         not(string(".")),
         not(string("*")),
         not(string("[")),
-        not(string("}")),
         text_char);
 
 /* -------------------------------------------------------------------------- */

test/fixtures/escaped_characters.ftl

@@ -19,4 +19,4 @@ string-escaped-unicode = {"\\u0041"}
 
 ## Literal braces
 brace-open = An opening {"{"} brace.
-brace-close = A closing } brace.
+brace-close = A closing {"}"} brace.

test/fixtures/escaped_characters.json

@@ -259,7 +259,18 @@
                 "elements": [
                     {
                         "type": "TextElement",
-                        "value": "A closing } brace."
+                        "value": "A closing "
+                    },
+                    {
+                        "type": "Placeable",
+                        "expression": {
+                            "type": "StringLiteral",
+                            "value": "}"
+                        }
+                    },
+                    {
+                        "type": "TextElement",
+                        "value": " brace."
                     }
                 ]
             },

test/fixtures/placeables.ftl

@@ -1,3 +1,15 @@
 nested-placeable = {{{1}}}
 padded-placeable = {  1  }
 sparse-placeable = { { 1 } }
+
+# ERROR Unmatched opening brace
+unmatched-open1 = { 1
+
+# ERROR Unmatched opening brace
+unmatched-open2 = {{ 1 }
+
+# ERROR Unmatched closing brace
+unmatched-close1 = 1 }
+
+# ERROR Unmatched closing brace
+unmatched-close2 = { 1 }}

test/fixtures/placeables.json

@@ -72,6 +72,42 @@
             },
             "attributes": [],
             "comment": null
+        },
+        {
+            "type": "Comment",
+            "content": "ERROR Unmatched opening brace"
+        },
+        {
+            "type": "Junk",
+            "annotations": [],
+            "content": "unmatched-open1 = { 1\n"
+        },
+        {
+            "type": "Comment",
+            "content": "ERROR Unmatched opening brace"
+        },
+        {
+            "type": "Junk",
+            "annotations": [],
+            "content": "unmatched-open2 = {{ 1 }\n"
+        },
+        {
+            "type": "Comment",
+            "content": "ERROR Unmatched closing brace"
+        },
+        {
+            "type": "Junk",
+            "annotations": [],
+            "content": "unmatched-close1 = 1 }\n"
+        },
+        {
+            "type": "Comment",
+            "content": "ERROR Unmatched closing brace"
+        },
+        {
+            "type": "Junk",
+            "annotations": [],
+            "content": "unmatched-close2 = { 1 }}\n"
         }
     ]
 }

test/fixtures/select_expressions.ftl

@@ -34,3 +34,8 @@ nested-variant-list =
           *[two] Value
        }
     }
+
+# ERROR Missing line end after variant list
+missing-line-end =
+    { 1 ->
+        *[one] One}

test/fixtures/select_expressions.json

@@ -257,6 +257,15 @@
             "type": "Junk",
             "annotations": [],
             "content": "nested-variant-list =\n    { 1 ->\n       *[one] {\n          *[two] Value\n       }\n    }\n"
+        },
+        {
+            "type": "Comment",
+            "content": "ERROR Missing line end after variant list"
+        },
+        {
+            "type": "Junk",
+            "annotations": [],
+            "content": "missing-line-end =\n    { 1 ->\n        *[one] One}\n"
         }
     ]
 }