[mustache_template] Emoji support

third_party/packages/mustache_template/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.2
+
+* Emoji support.
+
 ## 2.0.1
 
 * Transfers the package source from https://github.com/jonahwilliams/mustache

third_party/packages/mustache_template/lib/src/scanner.dart

@@ -7,7 +7,8 @@ import 'token.dart';
 class Scanner {
   Scanner(String source, this._templateName, String? delimiters)
     : _source = source,
-      _itr = source.runes.iterator {
+      _itr = source.runes.iterator,
+      _runes = source.runes.toList() {
     if (source == '') {
       _c = _EOF;
     } else {
@@ -40,6 +41,7 @@ class Scanner {
   final String _source;
 
   final Iterator<int> _itr;
+  final List<int> _runes;
   int _offset = 0;
   int _c = 0;
 
@@ -130,8 +132,9 @@ class Scanner {
     while (_peek() != _EOF && test(_peek())) {
       _read();
     }
-    final int end = _peek() == _EOF ? _source.length : _offset;
-    return _source.substring(start, end);
+    final int end = _peek() == _EOF ? _runes.length : _offset;
+    final String part = String.fromCharCodes(_runes.sublist(start, end));
+    return part;
   }
 
   void _expect(int expectedCharCode) {

third_party/packages/mustache_template/pubspec.yaml

@@ -2,7 +2,7 @@ name: mustache_template
 description: A templating library that implements the Mustache template specification
 repository: https://github.com/flutter/packages/tree/main/third_party/packages/mustache_template
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+mustache_template%22
-version: 2.0.1
+version: 2.0.2
 
 environment:
   sdk: ^3.7.0

third_party/packages/mustache_template/test/mustache_test.dart

@@ -24,6 +24,12 @@ void main() {
       ).renderString(<dynamic, dynamic>{});
       expect(output, equals('__'));
     });
+    test('Emoji', () {
+      final String output = parse(
+        'Hello! 🖖👍🏽\nBye! 🏳️‍🌈',
+      ).renderString(<dynamic, dynamic>{});
+      expect(output, equals('Hello! 🖖👍🏽\nBye! 🏳️‍🌈'));
+    });
   });
   group('Section', () {
     test('Map', () {

third_party/packages/mustache_template/test/parser_test.dart

@@ -302,6 +302,15 @@ void main() {
       ]);
     });
 
+    test('emoji', () {
+      const String source = 'Hello! 🖖👍🏽🏳️‍🌈\nEmoji';
+      final Parser parser = Parser(source, 'foo', '{{ }}');
+      final List<Node> nodes = parser.parse();
+      expectNodes(nodes, <Node>[
+        TextNode('Hello! 🖖👍🏽🏳️‍🌈\nEmoji', 0, 20), // End offset includes emoji sizes
+      ]);
+    });
+
     test('toString', () {
       TextNode('foo', 1, 3).toString();
       VariableNode('foo', 1, 3).toString();