From 6ea19c6fe22726cbf1edad925fa3baa55e443e5a Mon Sep 17 00:00:00 2001 From: Jan Date: Sun, 27 Oct 2019 01:46:20 +0200 Subject: [PATCH] ZoneCodeGenerator: Fix PeekTag and NextTag returning null when no tags exist anymore. It should instead return an empty string --- src/ZoneCodeGenerator/Parsing/Testing/AbstractTokenTest.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ZoneCodeGenerator/Parsing/Testing/AbstractTokenTest.cs b/src/ZoneCodeGenerator/Parsing/Testing/AbstractTokenTest.cs index 3d6b22a6..ae3da312 100644 --- a/src/ZoneCodeGenerator/Parsing/Testing/AbstractTokenTest.cs +++ b/src/ZoneCodeGenerator/Parsing/Testing/AbstractTokenTest.cs @@ -61,12 +61,12 @@ namespace ZoneCodeGenerator.Parsing.Testing protected string PeekTag() { - return lastResult?.MatchedTags.ElementAtOrDefault(tagOffset); + return lastResult?.MatchedTags.ElementAtOrDefault(tagOffset) ?? ""; } protected string NextTag() { - return lastResult?.MatchedTags.ElementAtOrDefault(tagOffset++); + return lastResult?.MatchedTags.ElementAtOrDefault(tagOffset++) ?? ""; } protected bool HasMatcherTokens(string matcherName)