Merge pull request #502 from logie17/master

Allow macro output to be assigned via `set` tag. Fixes gh-499
paularmstrong · Jul 29, 2014 · 0d465ad · 0d465ad
2 parents 02560d5 + 7ce80b4
commit 0d465ad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/tags/macro.js b/lib/tags/macro.js
@@ -22,12 +22,11 @@ exports.compile = function (compiler, args, content, parents, options, blockName
   return '_ctx.' + fnName + ' = function (' + args.join('') + ') {\n' +
     '  var _output = "";\n' +
     '    __ctx = _utils.extend({}, _ctx),\n' +
-    '    _ctx = _utils.extend({}, __ctx);\n' +
     '  _utils.each(_ctx, function (v, k) {\n' +
     '    if (["' + args.join('","') + '"].indexOf(k) !== -1) { delete _ctx[k]; }\n' +
     '  });\n' +
     compiler(content, parents, options, blockName) + '\n' +
-    ' _ctx = __ctx;\n' +
+    ' _ctx = _utils.extend(_ctx, __ctx);\n' +
     '  return _output;\n' +
     '};\n' +
     '_ctx.' + fnName + '.safe = true;\n';

diff --git a/tests/tags/macro.test.js b/tests/tags/macro.test.js
@@ -31,4 +31,8 @@ describe('Tag: macro', function () {
   it('gh-457: local context is copied and overwritten within macro context', function () {
     expect(swig.render('{% set foo = 1 %}{% set baz = 3 %}{% macro bar(foo) %}{{ foo }}{{ baz }}{% endmacro %}{{ bar(2) }}{{ foo }}')).to.equal('231');
   });
+
+  it('gh-499: a macro can be set to a variable', function () {
+    expect(swig.render('{% macro burrito() %}burrito{% endmacro %}{% set foo = burrito() %}{{foo}}')).to.equal('burrito');
+  });
 });