From 715d557f32cf35581ac9d36dc324921756334292 Mon Sep 17 00:00:00 2001
From: Marek Dzikiewicz <marek.dzikiewicz@proligence.pl>
Date: Sun, 22 Nov 2015 18:25:22 +0100
Subject: [PATCH] Fix handling braces in tokens

This brings Tokenizer changes from changeset
423fec90b3494a2482ec186ad521862e9ed7be1e
---
 .../Implementation/Tokenizer.cs               | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Implementation/Tokenizer.cs b/src/Orchard.Web/Modules/Orchard.Tokens/Implementation/Tokenizer.cs
index 86be74bc6..623595560 100644
--- a/src/Orchard.Web/Modules/Orchard.Tokens/Implementation/Tokenizer.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tokens/Implementation/Tokenizer.cs
@@ -59,7 +59,7 @@ namespace Orchard.Tokens.Implementation {
         private static Tuple<string, IEnumerable<string>> Parse(string text, bool hashMode) {
             var tokens = new List<string>();
             if (!String.IsNullOrEmpty(text)) {
-                var inToken = false;
+                var inTokenDepth = 0;
                 var tokenStart = 0;
                 for (var i = 0; i < text.Length; i++) {
                     var c = text[i];
@@ -70,29 +70,32 @@ namespace Orchard.Tokens.Implementation {
                             continue;
                         }
                     }
-                    else if (c == '}' && !(inToken)) {
+                    else if (c == '}' && inTokenDepth == 0) {
                         if (i + 1 < text.Length && text[i + 1] == '}') {
                             text = text.Substring(0, i) + text.Substring(i + 1);
                             continue;
                         }
                     }
 
-                    if (inToken) {
+                    if (inTokenDepth > 0) {
                         if (c == '}') {
-                            inToken = false;
-                            var token = text.Substring(tokenStart + 1, i - tokenStart - 1);
-                            tokens.Add(token);
+                            inTokenDepth--;
+                            if (inTokenDepth == 0) {
+                                var token = text.Substring(tokenStart + 1, i - tokenStart - 1);
+                                tokens.Add(token);
+                            }
                         }
                     }
-                    else if (!hashMode && c == '{') {
-                        inToken = true;
-                        tokenStart = i;
+                    
+                    if (!hashMode && c == '{') {                       
+                        if (inTokenDepth == 0) tokenStart = i;
+                        inTokenDepth++;
                     }
                     else if (hashMode && c == '#' 
                         && i + 1 < text.Length && text[i + 1] == '{'
-                        && (i + 2 > text.Length || text[i + 2] != '{') ) {
-                        inToken = true;
-                        tokenStart = i+1;
+                        && (i + 2 > text.Length || text[i + 2] != '{') ) {          
+                        if (inTokenDepth == 0) tokenStart = i+1;
+                        inTokenDepth++;
                     }
                 }
             }