template with multiple unknown placeholder -> stripped string : green

ilkerde · Apr 4, 2011 · 215ce8c · 215ce8c
1 parent 758bbe9
commit 215ce8c
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/KataStringReplacer/KataStringReplacer/StringRenderer.cs b/KataStringReplacer/KataStringReplacer/StringRenderer.cs
@@ -18,7 +18,7 @@ public string Render(string template)
 			if (_placeholders != null)
 				foreach (var keyValue in _placeholders)
 					template = template.Replace(GetPlaceholder(keyValue.Key), keyValue.Value);
-			
+
 			template = RemoveUnrecognizedPlaceholders(template);
 
 			return template;
@@ -31,15 +31,21 @@ private string GetPlaceholder(string name)
 
 		private string RemoveUnrecognizedPlaceholders(string text)
 		{
-			int tokenStart = text.IndexOf('$');
+			int tokenStart, tokenEnd = -1;
 
-			if (tokenStart > -1) 
+			do 
 			{
-				int tokenEnd = text.IndexOf('$', tokenStart + 1);
+				tokenStart = text.IndexOf('$');
+
+				if (tokenStart > -1) 
+				{
+					tokenEnd = text.IndexOf('$', tokenStart + 1);
 
-				if (tokenEnd > tokenStart)
-					text = text.Substring(0, tokenStart) + text.Substring(tokenEnd + 1);
+					if (tokenEnd > tokenStart)
+						text = text.Substring(0, tokenStart) + text.Substring(tokenEnd + 1);
+				} 
 			}
+			while (tokenEnd > tokenStart && tokenStart > 0);
 
 			return text;
 		}