Sync 0.6.0-dev.12

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.6.0-dev.11
+## 0.6.0-dev.12
 - internal changes.
 - `chrome` platform tests.
 - added:

lib/src/renderer.dart

@@ -188,7 +188,11 @@ base class StringSinkRenderer
         if (remaining.remove(key)) {
           derived.set(key, named[key]);
         } else {
-          derived.set(key, defaultValue.accept(this, context));
+          if (defaultValue is Name) {
+            derived.set(key, named[defaultValue.name]);
+          } else {
+            derived.set(key, defaultValue.accept(this, context));
+          }
         }
       }
 

pubspec.yaml

@@ -1,5 +1,5 @@
 name: jinja
-version: 0.6.0-dev.11
+version: 0.6.0-dev.12
 description: >-
   Jinja2 template engine for Dart.
   Variables, expressions, control structures and template inheritance.

test/statements/macro_test.dart

@@ -97,13 +97,12 @@ void main() {
       expect(tmpl.render(), equals('5|4|3|2|1'));
     });
 
-    // TODO(macro): fix this test
     test('macro defaults self ref', () {
       var tmpl = env.fromString('''
 {% set x = 42 %}
 {% macro m(a, b=x, x=23) %}{{ a }}|{{ b }}|{{ x }}{% endmacro -%}
 {{ m(1) }},{{ m(1, b=2) }},{{ m(1, b=2, x=3) }},{{ m(1, x=7) }}''');
-      expect(tmpl.render(), equals('"1||23,1|2|23,1|2|3,1|7|7"'));
-    }, skip: 'Not implemented.');
+      expect(tmpl.render(), equals('1||23,1|2|23,1|2|3,1|7|7'));
+    });
   });
 }

test/statements/set_test.dart

@@ -99,9 +99,7 @@ void main() {
         return value;
       }
 
-      var env = Environment(
-          filters: {'myfilter': myfilter},
-          trimBlocks: true);
+      var env = Environment(filters: {'myfilter': myfilter}, trimBlocks: true);
       var tmpl = env.fromString('{% set a = " xxx " %}'
           '{% set foo | myfilter(a) | trim | length | string %}'
           ' {% set b = " yy " %} 42 {{ a }}{{ b }}   '