nullable in MessageTemplateParser (serilog#1722)

Twinki14 · Dec 30, 2023 · 2b40ecb · 2b40ecb
1 parent 9651bf5
commit 2b40ecb
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 37 deletions.
diff --git a/src/Serilog/Parsing/MessageTemplateParser.cs b/src/Serilog/Parsing/MessageTemplateParser.cs
@@ -12,8 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#nullable enable
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using Serilog.Core;
 using Serilog.Events;
@@ -152,7 +154,7 @@ static MessageTemplateToken ParsePropertyToken(int startAt, string messageTempla
                 first);
         }
 
-        static bool TrySplitTagContent(string tagContent, out string propertyNameAndDestructuring, out string format, out string alignment)
+        static bool TrySplitTagContent(string tagContent, [NotNullWhen(true)] out string? propertyNameAndDestructuring, out string? format, out string? alignment)
         {
             var formatDelim = tagContent.IndexOf(':');
             var alignmentDelim = tagContent.IndexOf(',');
@@ -161,47 +163,44 @@ static bool TrySplitTagContent(string tagContent, out string propertyNameAndDest
                 propertyNameAndDestructuring = tagContent;
                 format = null;
                 alignment = null;
+                return true;
             }
-            else
+
+            if (alignmentDelim == -1 || (formatDelim != -1 && alignmentDelim > formatDelim))
+            {
+                propertyNameAndDestructuring = tagContent.Substring(0, formatDelim);
+                format = formatDelim == tagContent.Length - 1 ?
+                    null :
+                    tagContent.Substring(formatDelim + 1);
+                alignment = null;
+                return true;
+            }
+
+            propertyNameAndDestructuring = tagContent.Substring(0, alignmentDelim);
+            if (formatDelim == -1)
             {
-                if (alignmentDelim == -1 || (formatDelim != -1 && alignmentDelim > formatDelim))
+                if (alignmentDelim == tagContent.Length - 1)
                 {
-                    propertyNameAndDestructuring = tagContent.Substring(0, formatDelim);
-                    format = formatDelim == tagContent.Length - 1 ?
-                        null :
-                        tagContent.Substring(formatDelim + 1);
-                    alignment = null;
+                    alignment = format = null;
+                    return false;
                 }
-                else
-                {
-                    propertyNameAndDestructuring = tagContent.Substring(0, alignmentDelim);
-                    if (formatDelim == -1)
-                    {
-                        if (alignmentDelim == tagContent.Length - 1)
-                        {
-                            alignment = format = null;
-                            return false;
-                        }
 
-                        format = null;
-                        alignment = tagContent.Substring(alignmentDelim + 1);
-                    }
-                    else
-                    {
-                        if (alignmentDelim == formatDelim - 1)
-                        {
-                            alignment = format = null;
-                            return false;
-                        }
+                format = null;
+                alignment = tagContent.Substring(alignmentDelim + 1);
+                return true;
+            }
 
-                        alignment = tagContent.Substring(alignmentDelim + 1, formatDelim - alignmentDelim - 1);
-                        format = formatDelim == tagContent.Length - 1 ?
-                            null :
-                            tagContent.Substring(formatDelim + 1);
-                    }
-                }
+            if (alignmentDelim == formatDelim - 1)
+            {
+                alignment = format = null;
+                return false;
             }
 
+            alignment = tagContent.Substring(alignmentDelim + 1, formatDelim - alignmentDelim - 1);
+            format = formatDelim == tagContent.Length - 1 ?
+                null :
+                tagContent.Substring(formatDelim + 1);
+
             return true;
         }
 

diff --git a/test/Serilog.Tests/Parsing/MessageTemplateParserTests.cs b/test/Serilog.Tests/Parsing/MessageTemplateParserTests.cs
@@ -7,7 +7,7 @@ namespace Serilog.Tests.Parsing
 {
     public class MessageTemplateParserTests
     {
-        static MessageTemplateToken[] Parse(string? messageTemplate)
+        static MessageTemplateToken[] Parse(string messageTemplate)
         {
             return new MessageTemplateParser().Parse(messageTemplate).Tokens.ToArray();
         }
@@ -24,7 +24,7 @@ static void AssertParsedAs(string message, params MessageTemplateToken[] message
         [Fact]
         public void MessageTemplateIsRequired()
         {
-            Assert.Throws<ArgumentNullException>(() => Parse(null));
+            Assert.Throws<ArgumentNullException>(() => Parse(null!));
         }
 
         [Fact]
@@ -308,7 +308,7 @@ public void PropertiesCanHaveAlignmentAndFormat()
         }
 
         [Fact]
-        public void FormatInFrontOfAlignmentWillHaveTheAlignmentBeConsidredPartOfTheFormat()
+        public void FormatInFrontOfAlignmentWillHaveTheAlignmentBeConsideredPartOfTheFormat()
         {
             var prop1 = (PropertyToken)Parse("{Hello:000,-5}").Single();
             Assert.Equal("Hello", prop1.PropertyName);