fix(intl-messageformat-parser): Escape double-' to a single ' (#103)

* fix(intl-messageformat-parser): Escape double-apostrophes to a single apostrophe * rm unnecessary rule
formatjs · Apr 26, 2020 · f68ad8f · f68ad8f
1 parent a1af97b
commit f68ad8f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/packages/formatjs/packages/intl-messageformat-parser/src/parser.pegjs b/packages/formatjs/packages/intl-messageformat-parser/src/parser.pegjs
@@ -46,8 +46,8 @@ messageTextElement
 
 argument
     = number
-    / $([^ \t\n\r,.+={}#]+)
-
+    / chars:quoteEscapedChar* { return chars.join(''); }
+    
 argumentElement
     = '{' _ id:argument _ format:(',' _ elementFormat)? _ '}' {
         return {
@@ -145,8 +145,17 @@ number = digits:('0' / $([1-9] digit*)) {
     return parseInt(digits, 10);
 }
 
+quoteEscapedChar = 
+  !("'" / [ \t\n\r,.+={}#]) char:. { return char; }
+  / "'" sequence:escape { return sequence; }
+
+apostrophe = "'"
+escape = [ \t\n\r,.+={}#] / apostrophe
+
 char
-    = [^{}\\\0-\x1F\x7f \t\n\r]
+    = 
+    "'" sequence:apostrophe { return sequence; }
+    / [^{}\\\0-\x1F\x7f \t\n\r]
     / '\\\\' { return '\\'; }
     / '\\#'  { return '\\#'; }
     / '\\{'  { return '\u007B'; }

diff --git a/packages/formatjs/packages/intl-messageformat-parser/tests/index.ts b/packages/formatjs/packages/intl-messageformat-parser/tests/index.ts
@@ -492,5 +492,21 @@ describe('parse()', function() {
         '\\'
       );
     });
+
+    /**
+     * @see http://userguide.icu-project.org/formatparse/messages#TOC-Quoting-Escaping
+     * @see https://github.com/formatjs/formatjs/issues/97
+     */
+    it('should escape a pair of ASCII apostrophes to represent one ASCII apostrophe', function() {
+      expect(
+        (parse("This '{isn''t}' obvious").elements[1] as ArgumentElement).id
+      ).to.equal("isn't");
+      expect(
+        (parse("''{name}''").elements[0] as MessageTextElement).value
+      ).to.equal("'");
+      expect(
+        (parse("''{name}''").elements[2] as MessageTextElement).value
+      ).to.equal("'");
+    });
   });
 });