Merge pull request #18 from jigfox/add-uci

feat: add support for icu message format

README.md

@@ -21,6 +21,7 @@ This parser extends [tree-sitter-html](https://github.com/tree-sitter/tree-sitte
 - [x] For-statements (v17)
 - [x] Switch-statements (v17)
 - [x] Defer-statements (v17)
+- [x] ICU message format
 
 ## Filetype
 

corpus/icu.txt

@@ -0,0 +1,152 @@
+=====
+Basic
+=====
+
+Updated {minutes, plural,
+=0 {just now}
+=1 {one minute ago}
+other {some minutes ago}}
+
+---
+
+(fragment
+  (text)
+  (icu
+    (expression
+      (identifier))
+    (icu_clause)
+    (icu_case
+      (icu_category)
+      (text))
+    (icu_case
+      (icu_category)
+      (text))
+    (icu_case
+      (icu_category)
+      (text))))
+
+
+=====
+With interpolation
+=====
+
+Updated {minutes, plural, =0 {just now} =1 {one minute ago} other {{{minutes}} minutes ago}}
+
+---
+
+(fragment
+  (text)
+  (icu
+    (expression
+      (identifier))
+    (icu_clause)
+    (icu_case
+      (icu_category)
+      (text))
+    (icu_case
+      (icu_category)
+      (text))
+    (icu_case
+      (icu_category)
+      (interpolation
+        (expression
+          (identifier)))
+      (text))))
+
+======
+Select
+======
+
+The author is {gender, select, male {male} female {female} other {other}}
+
+---
+
+(fragment
+  (text)
+  (icu
+    (expression
+      (identifier))
+    (icu_clause)
+    (icu_case
+      (icu_category)
+      (text))
+    (icu_case
+      (icu_category)
+      (text))
+    (icu_case
+      (icu_category)
+      (text))))
+
+=====
+Mixed
+=====
+
+Updated: {minutes, plural,
+    =0 {just now}
+    =1 {one minute ago}
+    other {{{minutes}} minutes ago by {gender, select, male {male} female {female} other {other}}}}
+
+---
+
+(fragment
+  (text)
+  (icu
+    (expression
+      (identifier))
+    (icu_clause)
+    (icu_case
+      (icu_category)
+      (text))
+    (icu_case
+      (icu_category)
+      (text))
+    (icu_case
+      (icu_category)
+      (interpolation
+        (expression
+          (identifier)))
+      (text)
+      (icu
+        (expression
+          (identifier))
+        (icu_clause)
+        (icu_case
+          (icu_category)
+          (text))
+        (icu_case
+          (icu_category)
+          (text))
+        (icu_case
+          (icu_category)
+          (text))))))
+
+=====
+With pipe
+=====
+
+Updated {minutes | async, plural,
+=0 {just now}
+=1 {one minute ago}
+other {some minutes ago}}
+
+---
+
+(fragment
+  (text)
+  (icu
+    (expression
+      (identifier)
+      (pipe_sequence
+        (pipe_operator)
+        (pipe_call
+          (identifier))))
+    (icu_clause)
+    (icu_case
+      (icu_category)
+      (text))
+    (icu_case
+      (icu_category)
+      (text))
+    (icu_case
+      (icu_category)
+      (text))))

examples/test.component.html

@@ -56,6 +56,12 @@ <h1>Hi {{ user.name }}</h1>
   </div>
 </div>
 
+<div class="icu">
+  <span i18n>
+     Updated {minutes, plural, =0 {just now} =1 {one minute ago} other {{{minutes}}}}
+  </span>
+</div>
+
 <div class="event-binding">
   <button (click)="onClick()">Click me</button>
   <button (click)="onClick($event)">Click me</button>

grammar.js

@@ -27,7 +27,7 @@ module.exports = grammar(HTML, {
   rules: {
     // ---------- Root ---------
     _node: ($, original) =>
-      choice(prec(1, $.interpolation), prec(1, $._any_statement), original),
+      choice(prec(1, $.icu), prec(1, $.interpolation), prec(1, $._any_statement), original),
 
     // ---------- Overrides ----------
     attribute_name: (_) => /[^<>\*.\[\]\(\)"'=\s]+/,
@@ -278,6 +278,29 @@ module.exports = grammar(HTML, {
 
     assignment_expression: ($) =>
       seq(field('name', $.identifier), '=', field('value', $._any_expression)),
+
+    // -------- ICU expressions ---------
+    icu: ($) =>
+      seq(
+        '{',
+        choice($._any_expression, $.concatenation_expression),
+        ',',
+        $.icu_clause,
+        ',',
+        repeat1($.icu_case),
+        '}',
+      ),
+
+    icu_clause: () => choice('plural', 'select'),
+
+    icu_case: ($) => seq(
+      $.icu_category,
+      '{',
+      repeat1($._node),
+      '}'
+    ),
+
+    icu_category: () => /[^{}]+/i,
 
     // ---------- Interpolation ---------
     interpolation: ($) =>

src/grammar.json

@@ -41,6 +41,14 @@
     "_node": {
       "type": "CHOICE",
       "members": [
+        {
+          "type": "PREC",
+          "value": 1,
+          "content": {
+            "type": "SYMBOL",
+            "name": "icu"
+          }
+        },
         {
           "type": "PREC",
           "value": 1,
@@ -1757,6 +1765,93 @@
         }
       ]
     },
+    "icu": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "{"
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "_any_expression"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "concatenation_expression"
+            }
+          ]
+        },
+        {
+          "type": "STRING",
+          "value": ","
+        },
+        {
+          "type": "SYMBOL",
+          "name": "icu_clause"
+        },
+        {
+          "type": "STRING",
+          "value": ","
+        },
+        {
+          "type": "REPEAT1",
+          "content": {
+            "type": "SYMBOL",
+            "name": "icu_case"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "}"
+        }
+      ]
+    },
+    "icu_clause": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "plural"
+        },
+        {
+          "type": "STRING",
+          "value": "select"
+        }
+      ]
+    },
+    "icu_case": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "icu_category"
+        },
+        {
+          "type": "STRING",
+          "value": "{"
+        },
+        {
+          "type": "REPEAT1",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_node"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "}"
+        }
+      ]
+    },
+    "icu_category": {
+      "type": "PATTERN",
+      "value": "[^{}]+",
+      "flags": "i"
+    },
     "interpolation": {
       "type": "SEQ",
       "members": [
@@ -3218,4 +3313,3 @@
   "inline": [],
   "supertypes": []
 }
-