From 78458488a4944461d9a0509bd8be2bb16314bb32 Mon Sep 17 00:00:00 2001
From: "raymond.lam" <ray@lam-ray.com>
Date: Thu, 16 Aug 2018 09:30:29 -0400
Subject: [PATCH] Reintroduce pull requests #643 and #664, and update
 description for parse method

---
 mustache.js        |  8 +++++---
 test/parse-test.js | 47 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/mustache.js b/mustache.js
index 6f9349826..1b19379d3 100644
--- a/mustache.js
+++ b/mustache.js
@@ -439,15 +439,17 @@
   };
 
   /**
-   * Parses and caches the given `template` and returns the array of tokens
+   * Parses and caches the given `template` according to the given `tags` or
+   * `mustache.tags` if `tags` is omitted,  and returns the array of tokens
    * that is generated from the parse.
    */
   Writer.prototype.parse = function parse (template, tags) {
     var cache = this.cache;
-    var tokens = cache[template];
+    var cacheKey = template + ':' + (tags || mustache.tags).join(':');
+    var tokens = cache[cacheKey];
 
     if (tokens == null)
-      tokens = cache[template] = parseTemplate(template, tags);
+      tokens = cache[cacheKey] = parseTemplate(template, tags);
 
     return tokens;
   };
diff --git a/test/parse-test.js b/test/parse-test.js
index 97c26db94..959699bc2 100644
--- a/test/parse-test.js
+++ b/test/parse-test.js
@@ -53,6 +53,10 @@ var expectations = {
                                             : [ [ '#', 'foo', 0, 8, [ [ '#', 'a', 11, 17, [ [ 'text', '    ', 18, 22 ], [ 'name', 'b', 22, 27 ], [ 'text', '\n', 27, 28 ] ], 30 ] ], 37 ] ]
 };
 
+beforeEach(function (){
+  Mustache.clearCache();
+});
+
 describe('Mustache.parse', function () {
 
   for (var template in expectations) {
@@ -103,4 +107,47 @@ describe('Mustache.parse', function () {
     });
   });
 
+  describe('when parsing a template without tags specified followed by the same template with tags specified', function() {
+    it('returns different tokens for the latter parse', function() {
+      var template = "{{foo}}[bar]";
+      var parsedWithBraces = Mustache.parse(template);
+      var parsedWithBrackets = Mustache.parse(template, ['[', ']']);
+      assert.notDeepEqual(parsedWithBrackets, parsedWithBraces);
+    });
+  });
+
+  describe('when parsing a template with tags specified followed by the same template with different tags specified', function() {
+    it('returns different tokens for the latter parse', function() {
+      var template = "(foo)[bar]";
+      var parsedWithParens = Mustache.parse(template, ['(', ')']);
+      var parsedWithBrackets = Mustache.parse(template, ['[', ']']);
+      assert.notDeepEqual(parsedWithBrackets, parsedWithParens);
+    });
+  });
+
+  describe('when parsing a template after already having parsed that template with a different Mustache.tags', function() {
+    it('returns different tokens for the latter parse', function() {
+      var template = "{{foo}}[bar]";
+      var parsedWithBraces = Mustache.parse(template);
+
+      var oldTags = Mustache.tags;
+      Mustache.tags = ['[', ']'];
+      var parsedWithBrackets = Mustache.parse(template);
+      Mustache.tags = oldTags;
+
+      assert.notDeepEqual(parsedWithBrackets, parsedWithBraces);
+    });
+  });
+
+  describe('when parsing a template with the same tags second time, return the cached tokens', function () {
+    it('returns the same tokens for the latter parse', function () {
+      var template = '{{foo}}[bar]';
+      var parsedResult1 = Mustache.parse(template);
+      var parsedResult2 = Mustache.parse(template);
+
+      assert.deepEqual(parsedResult1, parsedResult2);
+      assert.ok(parsedResult1 === parsedResult2);
+    });
+  });
+
 });